svn commit: r345804 - in head/mail/procmail: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Mon Feb 24 10:40:30 UTC 2014
Author: sunpoet
Date: Mon Feb 24 10:40:29 2014
New Revision: 345804
URL: http://svnweb.freebsd.org/changeset/ports/345804
QAT: https://qat.redports.org/buildarchive/r345804/
Log:
- Simplify Makefile
- Pet portlint: rename patch files
- Support STAGEDIR
Added:
head/mail/procmail/files/patch-src-autoconf
- copied unchanged from r345753, head/mail/procmail/files/patch-src:autoconf
head/mail/procmail/files/patch-src-mailfold.c
- copied unchanged from r342447, head/mail/procmail/files/patch-src:mailfold.c
Deleted:
head/mail/procmail/files/patch-src:autoconf
head/mail/procmail/files/patch-src:mailfold.c
Modified:
head/mail/procmail/Makefile
Modified: head/mail/procmail/Makefile
==============================================================================
--- head/mail/procmail/Makefile Mon Feb 24 10:38:50 2014 (r345803)
+++ head/mail/procmail/Makefile Mon Feb 24 10:40:29 2014 (r345804)
@@ -17,6 +17,8 @@ MASTER_SITES= ftp://ftp.ucsb.edu/pub/mir
MAINTAINER= sunpoet at FreeBSD.org
COMMENT= Local mail delivery agent
+OPTIONS_DEFINE= DOCS EXAMPLES
+
INSTALL_TARGET= install-suid install.man
PLIST_FILES= bin/formail bin/lockfile bin/mailstat bin/procmail \
@@ -27,20 +29,14 @@ PORTDOCS= FAQ FEATURES HISTORY KNOWN_BUG
PORTEXAMPLES= 1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
advanced dirname forward local_procmail_lmtp.m4 mailstat
-OPTIONS_DEFINE= DOCS EXAMPLES
-
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/config.h
# Allow parallel builds (-jX) to work
- @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} \
- -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|'
+ @${FIND} ${WRKSRC} -name 'Makefile*' | ${XARGS} ${REINPLACE_CMD} -E 's|cd (.+); (\$$\(MAKE\))|\2 -C \1|'
post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${EXAMPLESDIR}/
+ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+ cd ${WRKSRC}/examples/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
.include <bsd.port.mk>
Copied: head/mail/procmail/files/patch-src-autoconf (from r345753, head/mail/procmail/files/patch-src:autoconf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/procmail/files/patch-src-autoconf Mon Feb 24 10:40:29 2014 (r345804, copy of r345753, head/mail/procmail/files/patch-src:autoconf)
@@ -0,0 +1,20 @@
+--- src/autoconf.orig 2001-09-10 21:55:46.000000000 -0700
++++ src/autoconf 2010-12-23 11:53:07.000000000 -0800
+@@ -230,7 +230,8 @@
+ echo ""
+ if test -z "$LOCKINGTEST"
+ then
+- read b
++ #read b
++ b=""
+ elif test dummy = "$LOCKINGTEST"
+ then
+ b=""
+@@ -977,6 +978,7 @@
+
+ echo 'Checking realloc implementation'
+
++$RM -f _autotst
+ if $MAKE _autotst >$DEVNULL 2>&1
+ test -f _autotst
+ then
Copied: head/mail/procmail/files/patch-src-mailfold.c (from r342447, head/mail/procmail/files/patch-src:mailfold.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/procmail/files/patch-src-mailfold.c Mon Feb 24 10:40:29 2014 (r345804, copy of r342447, head/mail/procmail/files/patch-src:mailfold.c)
@@ -0,0 +1,12 @@
+--- src/mailfold.c.orig 2001-09-11 08:58:34.000000000 +0400
++++ src/mailfold.c 2010-12-06 12:55:44.000000000 +0300
+@@ -378,7 +378,8 @@
+ dfilled=mailread=0;
+ else if(rhead) /* only read in a new header */
+ { memblk new;
+- dfilled=mailread=0;makeblock(&new,0);readdyn(&new,&dfilled,0);
++ dfilled=mailread=0;makeblock(&new,0);
++ readdyn(&new,&dfilled,thebody-themail.p);
+ if(tobesent>dfilled&&isprivate) /* put it in place here */
+ { tmemmove(themail.p+dfilled,thebody,filled-=tobesent);
+ tmemmove(themail.p,new.p,dfilled);
More information about the svn-ports-head
mailing list