summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmb <smb>2009-07-18 03:15:18 +0000
committersmb <smb>2009-07-18 03:15:18 +0000
commit95b17189970cd96af3335808acc6d62ee70f1f1a (patch)
tree64ec4bedb8144ffbca51bfb2a74871a669288509
parent0f8dfdeb3ba78dc9d5ee2eabb0e8519f220f6d2f (diff)
downloadpkgsrc-95b17189970cd96af3335808acc6d62ee70f1f1a.tar.gz
Changet getline() to get_line()
-rw-r--r--mail/procmail/Makefile4
-rw-r--r--mail/procmail/distinfo6
-rw-r--r--mail/procmail/patches/patch-ba11
-rw-r--r--mail/procmail/patches/patch-bb22
-rw-r--r--mail/procmail/patches/patch-bc8
-rw-r--r--mail/procmail/patches/patch-bd11
6 files changed, 59 insertions, 3 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 86383f1690a..be436630a1b 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2008/02/08 03:14:18 gdt Exp $
+# $NetBSD: Makefile,v 1.43 2009/07/18 03:15:18 smb Exp $
#
DISTNAME= procmail-3.22
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail
MASTER_SITES= ftp://ftp.procmail.org/pub/procmail/
diff --git a/mail/procmail/distinfo b/mail/procmail/distinfo
index 6ab2624d432..cde142dca23 100644
--- a/mail/procmail/distinfo
+++ b/mail/procmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/03/16 22:05:01 tnn Exp $
+$NetBSD: distinfo,v 1.12 2009/07/18 03:15:18 smb Exp $
SHA1 (procmail-3.22.tar.gz) = cd4e44c15559816453fd60349e5a32289f6f2965
RMD160 (procmail-3.22.tar.gz) = e609ec94ea9ab3b93629c62b3e29add497806483
@@ -10,3 +10,7 @@ SHA1 (patch-ad) = 569d357c6afb9d7644c8094878aec08d22ae609d
SHA1 (patch-ae) = 91a3f83d41ba84e218a14c8bfc262fdbb1bc252c
SHA1 (patch-af) = 889f937f50561308c644d5a4bd836eccabbb2938
SHA1 (patch-ag) = 66ae907f1b7ccfa10b5278443a9d9b0277923e61
+SHA1 (patch-ba) = 5b0d2513e5320de26696cfaad9475f462579dae3
+SHA1 (patch-bb) = fd96d7c5adf02d0c264dfa080268c1f27e9f0f10
+SHA1 (patch-bc) = 663b92c51f875fb5b55eba6aa056c91aa0fb5a97
+SHA1 (patch-bd) = cba78a1551d850f5ab8507949265f4c4d1215545
diff --git a/mail/procmail/patches/patch-ba b/mail/procmail/patches/patch-ba
new file mode 100644
index 00000000000..51556387da0
--- /dev/null
+++ b/mail/procmail/patches/patch-ba
@@ -0,0 +1,11 @@
+--- src/formail.c.orig 2009-07-17 23:04:16.000000000 -0400
++++ src/formail.c 2009-07-17 23:04:16.000000000 -0400
+@@ -819,7 +819,7 @@
+ { 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 --git a/mail/procmail/patches/patch-bb b/mail/procmail/patches/patch-bb
new file mode 100644
index 00000000000..db79d4721fd
--- /dev/null
+++ b/mail/procmail/patches/patch-bb
@@ -0,0 +1,22 @@
+--- src/fields.c.orig 2009-07-17 23:04:16.000000000 -0400
++++ src/fields.c 2009-07-17 23:04:16.000000000 -0400
+@@ -110,16 +110,16 @@
+ /* 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 --git a/mail/procmail/patches/patch-bc b/mail/procmail/patches/patch-bc
new file mode 100644
index 00000000000..a7da9051a56
--- /dev/null
+++ b/mail/procmail/patches/patch-bc
@@ -0,0 +1,8 @@
+--- src/formisc.h.orig 2009-07-17 23:04:16.000000000 -0400
++++ src/formisc.h 2009-07-17 23:04:16.000000000 -0400
+@@ -17,4 +17,4 @@
+ char*
+ skipwords P((char*start));
+ int
+- getline P((void));
++ get_line P((void));
diff --git a/mail/procmail/patches/patch-bd b/mail/procmail/patches/patch-bd
new file mode 100644
index 00000000000..6978eec82a0
--- /dev/null
+++ b/mail/procmail/patches/patch-bd
@@ -0,0 +1,11 @@
+--- src/formisc.c.orig 2009-07-17 23:04:16.000000000 -0400
++++ src/formisc.c 2009-07-17 23:04:16.000000000 -0400
+@@ -115,7 +115,7 @@
+ 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 */