[Midnightbsd-cvs] mports [21899] trunk/mail/procmail: make the procmail port suck less.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 14 08:21:06 EDT 2016
Revision: 21899
http://svnweb.midnightbsd.org/mports/?rev=21899
Author: laffer1
Date: 2016-09-14 08:21:06 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
make the procmail port suck less.
Modified Paths:
--------------
trunk/mail/procmail/Makefile
trunk/mail/procmail/files/patch-src-autoconf
trunk/mail/procmail/pkg-plist
Added Paths:
-----------
trunk/mail/procmail/files/patch-Makefile.1
trunk/mail/procmail/files/patch-src-formisc.c
trunk/mail/procmail/files/procmail-3.22-getline.patch
Modified: trunk/mail/procmail/Makefile
===================================================================
--- trunk/mail/procmail/Makefile 2016-09-14 12:15:18 UTC (rev 21898)
+++ trunk/mail/procmail/Makefile 2016-09-14 12:21:06 UTC (rev 21899)
@@ -2,7 +2,7 @@
PORTNAME= procmail
PORTVERSION= 3.22
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \
@@ -14,64 +14,28 @@
FREEBSD_LOCAL/sunpoet
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A local mail delivery agent
-LICENSE= perl
+COMMENT= Local mail delivery agent
-MAKE_JOBS_UNSAFE= yes
+LICENSE= gpl2
-#.if defined(WITH_COURIER_MAILDIR_KLUDGE)
-#PATCH_SITES= http://www.john.net.au/pub/procmail-courier/
-#PATCHFILES= procmail-authenticate.c-userMaildir.patch
-#PATCH_DIST_STRIP=-p
-#.endif
+OPTIONS_DEFINE= DOCS EXAMPLES
-# It asks for list of directories to do test for file locking
-# (defaults to /tmp and ".", so return should suffice in most cases).
-.if defined(BATCH) # handled in patch-aa
-MAKE_ARGS+= -DBATCH
-.else
-IS_INTERACTIVE= yes
-.endif
+INSTALL_TARGET= install.bin install.man
+USES= cpe
+EXTRA_PATCHES= ${FILESDIR}/procmail-3.22-getline.patch:-p1
-INSTALL_TARGET= install-suid install.man
-
-MAN1= formail.1 lockfile.1 procmail.1
-MAN5= procmailex.5 procmailrc.5 procmailsc.5
-
-# Local variables
-#
-
-DOC_FILES= FAQ FEATURES HISTORY KNOWN_BUGS README
-
-SAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}
-SAMPLE_FILES= 1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
+PORTDOCS= FAQ FEATURES HISTORY KNOWN_BUGS README
+PORTEXAMPLES= 1procmailrc 1rmail 2procmailrc 2rmail 3procmailrc 3rmail \
advanced dirname forward local_procmail_lmtp.m4 mailstat
-# Post-configure
-#
-
-post-configure: patch-config
-
-patch-config:
+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|'
-# Post-install
-#
+post-install:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${EXAMPLESDIR}/
+ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
+ cd ${WRKSRC}/examples/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
-post-install: install-sample install-doc
-
-install-sample:
- @${MKDIR} ${SAMPLESDIR}
-.for file in ${SAMPLE_FILES}
- @${INSTALL_DATA} ${WRKSRC}/examples/${file} ${SAMPLESDIR}
-.endfor
-
-install-doc:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
.include <bsd.port.mk>
Added: trunk/mail/procmail/files/patch-Makefile.1
===================================================================
--- trunk/mail/procmail/files/patch-Makefile.1 (rev 0)
+++ trunk/mail/procmail/files/patch-Makefile.1 2016-09-14 12:21:06 UTC (rev 21899)
@@ -0,0 +1,15 @@
+--- Makefile.1.orig Tue Dec 28 10:33:26 1999
++++ Makefile.1 Tue Dec 28 10:33:55 1999
+@@ -60,12 +60,7 @@
+ sed -n 's/.*\(Mlocal.*procmail.*F=[a-zA-Z]*\)u/\1/p' `if test -f \
+ /etc/sendmail.cf; then echo /etc/sendmail.cf; else \
+ echo /usr/lib/sendmail.cf; fi`; fi
+- @echo
+- @echo \
+- "Also, HIGHLY RECOMMENDED (type 'make install-suid' to execute it):"
+- @echo
+ @src/$@ $(BINDIR)/procmail $(BINDIR)/lockfile >suid.sh
+- @src/$@ $(BINDIR)/procmail $(BINDIR)/lockfile
+ @echo ================================================================\
+ ===============
+
Property changes on: trunk/mail/procmail/files/patch-Makefile.1
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/procmail/files/patch-src-autoconf
===================================================================
--- trunk/mail/procmail/files/patch-src-autoconf 2016-09-14 12:15:18 UTC (rev 21898)
+++ trunk/mail/procmail/files/patch-src-autoconf 2016-09-14 12:21:06 UTC (rev 21899)
@@ -1,6 +1,16 @@
---- src/autoconf.ORI Sun Oct 30 10:01:45 2005
-+++ src/autoconf Sun Oct 30 10:03:56 2005
-@@ -978,6 +978,7 @@
+--- 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'
@@ -8,4 +18,3 @@
if $MAKE _autotst >$DEVNULL 2>&1
test -f _autotst
then
-
Added: trunk/mail/procmail/files/patch-src-formisc.c
===================================================================
--- trunk/mail/procmail/files/patch-src-formisc.c (rev 0)
+++ trunk/mail/procmail/files/patch-src-formisc.c 2016-09-14 12:21:06 UTC (rev 21899)
@@ -0,0 +1,16 @@
+--- src/formisc.c.orig 2001-06-29 10:20:45.000000000 +0800
++++ src/formisc.c 2014-09-12 00:58:12.989105253 +0800
+@@ -84,12 +84,11 @@
+ case '"':*target++=delim='"';start++;
+ }
+ ;{ int i;
+- do
++ while(*start)
+ if((i= *target++= *start++)==delim) /* corresponding delimiter? */
+ break;
+ else if(i=='\\'&&*start) /* skip quoted character */
+ *target++= *start++;
+- while(*start); /* anything? */
+ }
+ hitspc=2;
+ }
Property changes on: trunk/mail/procmail/files/patch-src-formisc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/mail/procmail/files/procmail-3.22-getline.patch
===================================================================
--- trunk/mail/procmail/files/procmail-3.22-getline.patch (rev 0)
+++ trunk/mail/procmail/files/procmail-3.22-getline.patch 2016-09-14 12:21:06 UTC (rev 21899)
@@ -0,0 +1,56 @@
+diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
+--- procmail-3.22/src/fields.c.getline 2001-09-11 06:57:08.000000000 +0200
++++ procmail-3.22/src/fields.c 2009-06-30 16:10:36.000000000 +0200
+@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
+ /* try and append one valid field to rdheader from stdin */
+ int readhead P((void))
+ { int idlen;
+- getline();
++ get_line();
+ if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
+ return 0;
+ if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
+ { if(rdheader)
+ return 0; /* the From_ line was a fake! */
+- for(;buflast=='>';getline()); /* gather continued >From_ lines */
++ for(;buflast=='>';get_line()); /* gather continued >From_ lines */
+ }
+ else
+- for(;;getline()) /* get the rest of the continued field */
++ for(;;get_line()) /* get the rest of the continued field */
+ { switch(buflast) /* will this line be continued? */
+ { case ' ':case '\t': /* yep, it sure is */
+ continue;
+diff -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
+--- procmail-3.22/src/formail.c.getline 2009-06-30 16:00:40.000000000 +0200
++++ procmail-3.22/src/formail.c 2009-06-30 16:10:49.000000000 +0200
+@@ -819,7 +819,7 @@ splitit: { if(!lnl) /* did the p
+ { if(split) /* gobble up the next start separator */
+ { buffilled=0;
+ #ifdef sMAILBOX_SEPARATOR
+- getline();buffilled=0; /* but only if it's defined */
++ get_line();buffilled=0; /* but only if it's defined */
+ #endif
+ if(buflast!=EOF) /* if any */
+ goto splitit;
+diff -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
+--- procmail-3.22/src/formisc.c.getline 2001-06-29 04:20:45.000000000 +0200
++++ procmail-3.22/src/formisc.c 2009-06-30 16:12:20.000000000 +0200
+@@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a
+ buf[buffilled++]=c;
+ }
+
+-int getline P((void)) /* read a newline-terminated line */
++int get_line P((void)) /* read a newline-terminated line */
+ { if(buflast==EOF) /* at the end of our Latin already? */
+ { loadchar('\n'); /* fake empty line */
+ return EOF; /* spread the word */
+diff -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
+--- procmail-3.22/src/formisc.h.getline 1999-04-19 08:42:15.000000000 +0200
++++ procmail-3.22/src/formisc.h 2009-06-30 16:10:02.000000000 +0200
+@@ -17,4 +17,4 @@ void
+ char*
+ skipwords P((char*start));
+ int
+- getline P((void));
++ get_line P((void));
Property changes on: trunk/mail/procmail/files/procmail-3.22-getline.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/mail/procmail/pkg-plist
===================================================================
--- trunk/mail/procmail/pkg-plist 2016-09-14 12:15:18 UTC (rev 21898)
+++ trunk/mail/procmail/pkg-plist 2016-09-14 12:21:06 UTC (rev 21899)
@@ -1,23 +1,10 @@
- at comment $FreeBSD: ports/mail/procmail/pkg-plist,v 1.7 2003/07/10 16:05:02 osa Exp $
-bin/procmail
bin/formail
-bin/lockfile
+@(,mail,2755) bin/lockfile
bin/mailstat
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/FEATURES
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/README
-share/examples/procmail/1procmailrc
-share/examples/procmail/1rmail
-share/examples/procmail/2procmailrc
-share/examples/procmail/2rmail
-share/examples/procmail/3procmailrc
-share/examples/procmail/3rmail
-share/examples/procmail/advanced
-share/examples/procmail/dirname
-share/examples/procmail/forward
-share/examples/procmail/local_procmail_lmtp.m4
-share/examples/procmail/mailstat
- at dirrm share/examples/procmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@(,mail,6755) bin/procmail
+man/man1/formail.1.gz
+man/man1/lockfile.1.gz
+man/man1/procmail.1.gz
+man/man5/procmailex.5.gz
+man/man5/procmailrc.5.gz
+man/man5/procmailsc.5.gz
More information about the Midnightbsd-cvs
mailing list