svn commit: r427390 - in head/mail/procmail: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Tue Nov 29 18:51:22 UTC 2016
Author: sunpoet
Date: Tue Nov 29 18:51:20 2016
New Revision: 427390
URL: https://svnweb.freebsd.org/changeset/ports/427390
Log:
- Always add PREFIX/bin to procmail path
- Bump PORTREVISION for package change
- While I'm here, respect PREFIX and adjust config.h patch
PR: 214219
Submitted by: Armin Gruner <ag-freebsd at muc.de>
Modified:
head/mail/procmail/Makefile
head/mail/procmail/files/patch-config.h
head/mail/procmail/files/patch-src-autoconf
Modified: head/mail/procmail/Makefile
==============================================================================
--- head/mail/procmail/Makefile Tue Nov 29 18:46:21 2016 (r427389)
+++ head/mail/procmail/Makefile Tue Nov 29 18:51:20 2016 (r427390)
@@ -3,7 +3,7 @@
PORTNAME= procmail
PORTVERSION= 3.22
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \
@@ -30,7 +30,7 @@ PORTEXAMPLES= 1procmailrc 1rmail 2procma
advanced dirname forward local_procmail_lmtp.m4 mailstat
post-patch:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
+ @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/config.h ${WRKSRC}/src/autoconf
# Allow parallel builds (-jX) to work
@${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|'
Modified: head/mail/procmail/files/patch-config.h
==============================================================================
--- head/mail/procmail/files/patch-config.h Tue Nov 29 18:46:21 2016 (r427389)
+++ head/mail/procmail/files/patch-config.h Tue Nov 29 18:51:20 2016 (r427390)
@@ -26,12 +26,12 @@
system mailbox. This also must be an absolute path */
-#define ETCRC "/etc/procmailrc" /* optional global procmailrc startup
-+#define ETCRC "%%PREFIX%%/etc/procmailrc" /* optional global procmailrc startup
++#define ETCRC "/usr/local/etc/procmailrc" /* optional global procmailrc startup
file (will only be read if procmail
is started with no rcfile on the command line). */
-#define ETCRCS "/etc/procmailrcs/" /* optional trusted path prefix for
-+#define ETCRCS "%%PREFIX%%/etc/procmailrcs/" /* optional trusted path prefix for
++#define ETCRCS "/usr/local/etc/procmailrcs/" /* optional trusted path prefix for
rcfiles which will be executed with
the uid of the owner of the rcfile (this only happens if procmail is
called with the -m option, without variable assignments on the command
Modified: head/mail/procmail/files/patch-src-autoconf
==============================================================================
--- head/mail/procmail/files/patch-src-autoconf Tue Nov 29 18:46:21 2016 (r427389)
+++ head/mail/procmail/files/patch-src-autoconf Tue Nov 29 18:51:20 2016 (r427390)
@@ -18,3 +18,15 @@
if $MAKE _autotst >$DEVNULL 2>&1
test -f _autotst
then
+@@ -1491,6 +1493,11 @@
+ fi
+ done
+
++case ":$lpath:" in
++ *:/usr/local/bin:*) ;;
++ *) lpath="$lpath:/usr/local/bin" ;;
++esac
++
+ echo "#define defPATH \"PATH=\$HOME/bin:$lpath\"" >>$ACONF
+ echo "#define defSPATH \"PATH=$lpath\"" >>$ACONF
+
More information about the svn-ports-all
mailing list