[Midnightbsd-cvs] mports: mail/pine-pgp-filters: I did something stupid with this port and

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jun 18 18:09:48 EDT 2008


Log Message:
-----------
I did something stupid with this port and passed the fake dir with configure.  Add DESTDIR to Makefile.in so this port works properly.  This may help with magus.  Either way, it's much more correct.

Modified Files:
--------------
    mports/mail/pine-pgp-filters:
        Makefile (r1.7 -> r1.8)

Added Files:
-----------
    mports/mail/pine-pgp-filters/files:
        patch-Makefile.in (r1.1)

Removed Files:
-------------
    mports/mail/pine-pgp-filters/files:
        patch-configure

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/pine-pgp-filters/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L mail/pine-pgp-filters/Makefile -L mail/pine-pgp-filters/Makefile -u -r1.7 -r1.8
--- mail/pine-pgp-filters/Makefile
+++ mail/pine-pgp-filters/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pine-pgp-filters
 PORTVERSION=	1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail security
 MASTER_SITES=	http://dougbarton.us/PGP/scripts/ppf/ \
 		${MASTER_SITE_FREEBSD_LOCAL}
@@ -36,7 +36,7 @@
 
 do-configure:
 	@${MKDIR} ${FAKE_DESTDIR}${PREFIX}/libexec
-	@(cd ${WRKSRC} && ./configure --prefix=${FAKE_DESTDIR}${PREFIX}) 
+	@(cd ${WRKSRC} && ./configure )
 
 post-install:
 .if !defined(NOPORTDOCS)
--- mail/pine-pgp-filters/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun May 11 10:46:16 2008
-+++ configure	Sun May 11 10:48:00 2008
-@@ -40,7 +40,7 @@
- fi
- 
- for bin in gpg2 gpg; do
--	for dir in ${PREFIX}/bin /usr/bin /bin; do
-+	for dir in ${PREFIX}/bin /usr/local/bin /usr/bin /bin; do
- 		if [ -x "${dir}/${bin}" ]; then
- 			if ${dir}/${bin} --version >/dev/null 2>&1; then
- 				gpg="${dir}/${bin}"
--- /dev/null
+++ mail/pine-pgp-filters/files/patch-Makefile.in
@@ -0,0 +1,28 @@
+--- Makefile.in.orig	Wed Jun 18 18:05:17 2008
++++ Makefile.in	Wed Jun 18 18:06:29 2008
+@@ -9,18 +9,18 @@
+ 	done
+ 
+ install:
+-	@if [ ! -d @@PREFIX@@/libexec ]; then \
+-		install -d -m 755 @@PREFIX@@/libexec; \
++	@if [ ! -d ${DESTDIR}@@PREFIX@@/libexec ]; then \
++		install -d -m 755 ${DESTDIR}@@PREFIX@@/libexec; \
+ 	fi
+ 
+-	install -m 555 $$PWD/out/ppf_* @@PREFIX@@/libexec
++	install -m 555 $$PWD/out/ppf_* ${DESTDIR}@@PREFIX@@/libexec
+ 
+-	@if [ ! -d @@PREFIX@@/bin ]; then \
+-		install -d -m 755 @@PREFIX@@/bin; \
++	@if [ ! -d ${DESTDIR}@@PREFIX@@/bin ]; then \
++		install -d -m 755 ${DESTDIR}@@PREFIX@@/bin; \
+ 	fi
+ 
+-	ln -sf @@PREFIX@@/libexec/ppf_mime @@PREFIX@@/bin/ppf_mime
+-	ln -sf @@PREFIX@@/libexec/ppf_mime_decrypt @@PREFIX@@/bin/ppf_mime_decrypt
++	ln -sf ${DESTDIR}@@PREFIX@@/libexec/ppf_mime ${DESTDIR}@@PREFIX@@/bin/ppf_mime
++	ln -sf ${DESTDIR}@@PREFIX@@/libexec/ppf_mime_decrypt ${DESTDIR}@@PREFIX@@/bin/ppf_mime_decrypt
+ 
+ clean:
+ 	@if [ -d "$$PWD/out" ]; then \


More information about the Midnightbsd-cvs mailing list