kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Always add PREFIX/bin to procmail path

Browse source 
- 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>
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2016-11-29 18:51:20 +00:00
parent 703ff6d361
commit 745407be1b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427390
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mail/procmail/Makefile
View file

@ -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|'

4
mail/procmail/files/patch-config.h
View file

@ -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

12
mail/procmail/files/patch-src-autoconf
View file

@ -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