diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2016-11-30 02:51:20 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2016-11-30 02:51:20 +0800 |
| commit | 4bdc424f28294532559918905d76bf1d0d1e00ac (patch) | |
| tree | f07a33a599595158bf83b082bdf09258f4185dd8 /mail | |
| parent | a9fb43731f13f4ddbe4e900c6673e591c40399db (diff) | |
| download | freebsd-ports-graphics-4bdc424f28294532559918905d76bf1d0d1e00ac.tar.gz freebsd-ports-graphics-4bdc424f28294532559918905d76bf1d0d1e00ac.tar.zst freebsd-ports-graphics-4bdc424f28294532559918905d76bf1d0d1e00ac.zip | |
- 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@muc.de>
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/procmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/procmail/files/patch-config.h | 4 | ||||
| -rw-r--r-- | mail/procmail/files/patch-src-autoconf | 12 |
3 files changed, 16 insertions, 4 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index cee9c152b41..6eaf051c3f1 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -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 2procmailrc 2rmail 3procmailrc 3rmail \ 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|' diff --git a/mail/procmail/files/patch-config.h b/mail/procmail/files/patch-config.h index b5bc1b48f42..7c54253b1c1 100644 --- a/mail/procmail/files/patch-config.h +++ b/mail/procmail/files/patch-config.h @@ -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 diff --git a/mail/procmail/files/patch-src-autoconf b/mail/procmail/files/patch-src-autoconf index ef615cb599b..41ab653bd40 100644 --- a/mail/procmail/files/patch-src-autoconf +++ b/mail/procmail/files/patch-src-autoconf @@ -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 + |