getline, regen plist

mail/procmail/Makefile

@@ -1,20 +1,18 @@
-# $OpenBSD: Makefile,v 1.36 2010/11/19 07:23:09 espie Exp $
+# $OpenBSD: Makefile,v 1.37 2012/03/17 10:47:19 sthen Exp $
 
 COMMENT=	filtering local mail delivery agent
 
 DISTNAME=	procmail-3.22
 CATEGORIES=	mail
-REVISION =	3
+REVISION=	4
 
 MASTER_SITES=	${HOMEPAGE} \
-		ftp://ftp.psg.com/pub/unix/procmail/ \
-		ftp://ftp.ucsb.edu/pub/mirrors/procmail/ \
+		http://mirror.switch.ch/ftp/mirror/procmail/ \
+		http://ftp.kfki.hu/packages/mail/procmail/ \
+		http://ftp.ucsb.edu/pub/mirrors/procmail/ \
+		http://www.ring.gr.jp/archives/net/mail/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/ \
-		ftp://ftp.net.ohio-state.edu/pub/networking/mail/procmail/ \
-		ftp://ftp.kfki.hu/pub/packages/mail/procmail/ \
-		ftp://ftp.ring.gr.jp/pub/net/mail/procmail/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/procmail/ 
+		ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/
 
 HOMEPAGE=	http://www.procmail.org/
 

mail/procmail/patches/patch-src_fields_c

@@ -0,0 +1,23 @@
+$OpenBSD: patch-src_fields_c,v 1.1 2012/03/17 10:47:19 sthen Exp $
+--- src/fields.c.orig	Sat Mar 17 10:43:03 2012
++++ src/fields.c	Sat Mar 17 10:43:14 2012
+@@ -110,16 +110,16 @@ void dispfield(p)register const struct field*p;
+ 		    /* 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;

mail/procmail/patches/patch-src_formail_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_formail_c,v 1.1 2012/03/17 10:47:19 sthen Exp $
+--- src/formail.c.orig	Sat Mar 17 10:43:03 2012
++++ src/formail.c	Sat Mar 17 10:43:10 2012
+@@ -819,7 +819,7 @@ splitit:       { if(!lnl)   /* did the previous mail e
+       { 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;

mail/procmail/patches/patch-src_formisc_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_formisc_c,v 1.1 2012/03/17 10:47:19 sthen Exp $
+--- src/formisc.c.orig	Sat Mar 17 10:43:03 2012
++++ src/formisc.c	Sat Mar 17 10:43:20 2012
+@@ -115,7 +115,7 @@ void loadchar(c)const int c;		      /* append one char
+   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 */

mail/procmail/patches/patch-src_formisc_h

@@ -0,0 +1,9 @@
+$OpenBSD: patch-src_formisc_h,v 1.1 2012/03/17 10:47:19 sthen Exp $
+--- src/formisc.h.orig	Sat Mar 17 10:43:03 2012
++++ src/formisc.h	Sat Mar 17 10:43:17 2012
+@@ -17,4 +17,4 @@ void
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ get_line P((void));

mail/procmail/pkg/PLIST

@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 09:09:44 espie Exp $
-bin/formail
-bin/lockfile
+@comment $OpenBSD: PLIST,v 1.7 2012/03/17 10:47:19 sthen Exp $
+@bin bin/formail
+@bin bin/lockfile
 bin/mailstat
-bin/procmail
+@bin bin/procmail
 @man man/man1/formail.1
 @man man/man1/lockfile.1
 @man man/man1/procmail.1