cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pgpsendmail respect CC & CFLAGS (fixes build on alpha)

Browse Source 
Don't hardcode /usr/local in patch-*

help and ok naddy@
This commit is contained in:
merdely 2008-01-24 18:31:24 +00:00
parent fde7d6b59a
commit 047e56855a
4 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/pgpsendmail/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2007/09/16 00:17:06 merdely Exp $
# $OpenBSD: Makefile,v 1.22 2008/01/24 18:31:24 merdely Exp $
COMMENT= PGP sign/encrypt/decrypt messages automatically
DISTNAME= PGPsendmail-v1.4.5
PKGNAME= pgpsendmail-1.4.5
V=1.4.5
DISTNAME= PGPsendmail-v$V
PKGNAME= pgpsendmail-$Vp0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/people/rgooch/ \

36
mail/pgpsendmail/patches/patch-Makefile
View File

@ -1,16 +1,40 @@
$OpenBSD: patch-Makefile,v 1.1 2000/06/05 00:04:02 espie Exp $
--- Makefile.orig Tue Oct 21 00:58:19 1997
+++ Makefile Mon Jun 5 01:29:48 2000
$OpenBSD: patch-Makefile,v 1.2 2008/01/24 18:31:24 merdely Exp $
--- Makefile.orig Mon Oct 20 18:58:19 1997
+++ Makefile Wed Jan 23 23:08:34 2008
@@ -30,7 +30,7 @@ DEFINES =
# Where do your manpages reside?
#
-MANDIR = /usr/man
+MANDIR = /usr/local/man
+MANDIR = ${PREFIX}/man
# Various compilers: if you have problems compiling, you may comment out the
@@ -112,8 +112,8 @@ match-email-addr: match-email-addr.o lib
@@ -38,7 +38,7 @@ MANDIR = /usr/man
# please send me a patch
# Generic ANSI compiler
-CC = cc
+CC ?= cc
# HP/UX compiler
#CC = cc -Aa -D_HPUX_SOURCE
@@ -48,12 +48,12 @@ CC = cc
# Maybe you want debugging instead, or more optimisation?
-COPTIMISE = -O
+# COPTIMISE = -O
###############################################################################
# No user servicable parts below
#
-CFLAGS = $(DEFINES) -Iinclude $(COPTIMISE) $(NO_PATH_H) $(PATH_SENDMAIL) \
+CFLAGS += $(DEFINES) -Iinclude $(COPTIMISE) $(NO_PATH_H) $(PATH_SENDMAIL) \
$(PATH_MAILDIR)
LDFLAGS = -s $(COPTIMISE) -Llib -lpgpsendmail
@@ -112,8 +112,8 @@ match-email-addr: match-email-addr.o lib/libpgpsendmai
$(CC) -o match-email-addr match-email-addr.o $(LDFLAGS)
@ -21,7 +45,7 @@ $OpenBSD: patch-Makefile,v 1.1 2000/06/05 00:04:02 espie Exp $
./install pgpsendmail $(SENDMAIL)
./install pgpdaemon
./install sendpgppass
@@ -123,8 +123,7 @@ install: dummy pgpsendmail pgpdaemon sen
@@ -123,8 +123,7 @@ install: dummy pgpsendmail pgpdaemon sendpgppass pgppi
./install match-email-addr
install.man: clean

4
mail/pgpsendmail/patches/patch-install
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-install,v 1.2 2001/10/14 17:14:43 espie Exp $
$OpenBSD: patch-install,v 1.3 2008/01/24 18:31:25 merdely Exp $
--- install.orig Thu Oct 9 14:58:17 1997
+++ install Sun Oct 14 18:55:43 2001
@@ -1,5 +1,7 @@
#! /bin/csh -f
+set USRBINPATH=${DESTDIR}/usr/local/bin
+set USRBINPATH=${PREFIX}/bin
+
if ("$#argv" < "1") then
echo "Usage: install binary"

15
mail/pgpsendmail/patches/patch-lib_Makefile Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-lib_Makefile,v 1.1 2008/01/24 18:31:25 merdely Exp $
--- lib/Makefile.orig Wed Oct 8 22:53:19 1997
+++ lib/Makefile Wed Jan 23 23:08:37 2008
@@ -1,8 +1,8 @@
DEFINES =
-CC = cc
-COPTIMISE = -O
-CFLAGS = $(DEFINES) -I../include $(COPTIMISE)
+CC ?= cc
+#COPTIMISE = -O
+CFLAGS += $(DEFINES) -I../include $(COPTIMISE)
TARGETS = libpgpsendmail.a