Re: mail/metamail fails to build - conflicting types for getline()

[Paul Goyette <paul%whooppee.com@localhost>]

The attached patch adds an addition patch-at file to the metamail pkgsrc 
distribution.  patch-at renames the definition and both invocations of 
metamail's local getline() function (all in uue.c source file) to 
uue_getline()

Since I'm not really an expert on pkgsrc, I'd appreciate if someone 
could have a look and review the attached, and commit if it is OK.


On Fri, 16 Oct 2009, Paul Goyette wrote:

> On a nearly-current 5.99.18 machine, I'm trying to update my packages
> and mail/metamail fails.  The install log is attached.

-------------------------------------------------------------------------
|   Paul Goyette   | PGP DSS Key fingerprint: |  E-mail addresses:      |
| Customer Service | FA29 0E3B 35AF E8AE 6651 |  paul at whooppee.com   |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/metamail/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo    10 May 2008 11:52:14 -0000      1.22
+++ distinfo    16 Oct 2009 22:23:31 -0000
@@ -22,3 +22,4 @@ SHA1 (patch-ap) = ade6fba2254e7db3f9cf52
 SHA1 (patch-aq) = 90f84381aaf91db03cecef84d9433c3ffd1152db
 SHA1 (patch-ar) = 21e137edd2bb1dc09048f7ef23e86859d698d848
 SHA1 (patch-as) = 8d8c31f1ff508e9d7fc73a03a5f7ba63faa118ef
+SHA1 (patch-at) = 762e66da70a6abbaeb84932d388abde4cb38f327
Index: patches/patch-at
===================================================================
RCS file: patches/patch-at
diff -N patches/patch-at
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-at    16 Oct 2009 22:23:31 -0000
@@ -0,0 +1,29 @@
+--- uue.c.orig 2009-10-16 15:17:32.000000000 -0700
++++ uue.c      2009-10-16 15:14:38.000000000 -0700
+@@ -30,7 +30,7 @@
+ }
+ 
+ 
+-getline (buf, size, fp)
++uue_getline (buf, size, fp)
+ char *buf;
+ int size;
+ FILE *fp;
+@@ -70,7 +70,7 @@
+     char buf[63];
+ 
+     while (1) {
+-      if (getline (buf, sizeof buf, infp) < 0) {
++      if (uue_getline (buf, sizeof buf, infp) < 0) {
+           fprintf (stderr, "Premature EOF!\n");
+           return;
+       }
+@@ -82,7 +82,7 @@
+       }
+     } 
+     while (1) {
+-      if (getline (buf, sizeof buf, infp) < 0) {
++      if (uue_getline (buf, sizeof buf, infp) < 0) {
+           fprintf (stderr, "Premature EOF!\n");
+           return;
+       }