[92692] trunk/dports/mail/procmail

[jmr at macports.org]

Revision: 92692
          https://trac.macports.org/changeset/92692
Author:   jmr at macports.org
Date:     2012-05-03 17:31:33 -0700 (Thu, 03 May 2012)
Log Message:
-----------
procmail: rename internal getline function to procmail_getline (#30353)

Modified Paths:
--------------
    trunk/dports/mail/procmail/Portfile

Added Paths:
-----------
    trunk/dports/mail/procmail/files/
    trunk/dports/mail/procmail/files/getline.patch

Modified: trunk/dports/mail/procmail/Portfile
===================================================================
--- trunk/dports/mail/procmail/Portfile	2012-05-03 23:52:23 UTC (rev 92691)
+++ trunk/dports/mail/procmail/Portfile	2012-05-04 00:31:33 UTC (rev 92692)
@@ -68,6 +68,7 @@
     move ${worksrcpath}/INSTALL ${worksrcpath}/INSTALL.README
 }
 
+patchfiles          getline.patch
 post-patch {
     reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin\"%" ${worksrcpath}/config.h
     reinplace "s%/etc/procmailrc%${prefix}/etc/procmailrc%" ${worksrcpath}/config.h

Added: trunk/dports/mail/procmail/files/getline.patch
===================================================================
--- trunk/dports/mail/procmail/files/getline.patch	                        (rev 0)
+++ trunk/dports/mail/procmail/files/getline.patch	2012-05-04 00:31:33 UTC (rev 92692)
@@ -0,0 +1,52 @@
+--- src/fields.c.orig	2001-09-11 14:57:08.000000000 +1000
++++ src/fields.c	2012-05-04 10:24:17.000000000 +1000
+@@ -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();
++  procmail_getline();
+   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=='>';procmail_getline());	    /* gather continued >From_ lines */
+    }
+   else
+-     for(;;getline())		      /* get the rest of the continued field */
++     for(;;procmail_getline())		      /* get the rest of the continued field */
+       { switch(buflast)			     /* will this line be continued? */
+ 	 { case ' ':case '\t':				  /* yep, it sure is */
+ 	      continue;
+--- src/formail.c.orig	2001-09-11 14:57:32.000000000 +1000
++++ src/formail.c	2012-05-04 10:24:35.000000000 +1000
+@@ -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 */
++	   procmail_getline();buffilled=0;		 /* but only if it's defined */
+ #endif
+ 	   if(buflast!=EOF)					   /* if any */
+ 	      goto splitit;
+--- src/formisc.c.orig	2001-06-29 12:20:45.000000000 +1000
++++ src/formisc.c	2012-05-04 10:24:55.000000000 +1000
+@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* a
+   buf[buffilled++]=c;
+ }
+ 
+-int getline P((void))			   /* read a newline-terminated line */
++int procmail_getline 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 */
+--- src/formisc.h.orig	1999-04-19 16:42:15.000000000 +1000
++++ src/formisc.h	2012-05-04 10:27:11.000000000 +1000
+@@ -17,4 +17,4 @@ void
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ procmail_getline P((void));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120503/365d6a58/attachment.html>