[pkgsrc/trunk]: pkgsrc/mail/nmh XXX: hack around the hack that netbsd-current...

[mrg <mrg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9acf8ac134e1
branches:  trunk
changeset: 474701:9acf8ac134e1
user:      mrg <mrg%pkgsrc.org@localhost>
date:      Tue May 04 06:18:14 2004 +0000

description:
XXX: hack around the hack that netbsd-current <stdio.h> tramples the
XXX: users fgtstr() namespace...

diffstat:

 mail/nmh/distinfo         |   3 +-
 mail/nmh/patches/patch-aa |  61 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletions(-)

diffs (78 lines):

diff -r e8f16a5f9a45 -r 9acf8ac134e1 mail/nmh/distinfo
--- a/mail/nmh/distinfo Tue May 04 04:55:49 2004 +0000
+++ b/mail/nmh/distinfo Tue May 04 06:18:14 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2004/01/02 20:54:17 cjep Exp $
+$NetBSD: distinfo,v 1.8 2004/05/04 06:18:14 mrg Exp $
 
 SHA1 (nmh-1.0.4.tar.gz) = 71441a884d898db2fd9184a92e663682536425f5
 Size (nmh-1.0.4.tar.gz) = 683215 bytes
+SHA1 (patch-aa) = 88e3e0445cb0102bb3748eb2c9503950ae631931
 SHA1 (patch-ca) = 43aaf15dc5d07de03ff912894d7128d03eb1889d
 SHA1 (patch-cb) = 6e498988c08e393fdd4e8e27f2ff6ce457e2c803
 SHA1 (patch-cd) = 13901025ef3a1b7fc07d0c13f8e1aef3e9bee2d6
diff -r e8f16a5f9a45 -r 9acf8ac134e1 mail/nmh/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nmh/patches/patch-aa Tue May 04 06:18:14 2004 +0000
@@ -0,0 +1,61 @@
+$NetBSD: patch-aa,v 1.4 2004/05/04 06:18:14 mrg Exp $
+
+ugh. NetBSD-current (post 2.0) has a new fgetstr() that conflicts...
+
+
+--- uip/mhbuildsbr.c.orig      1999-09-12 23:50:12.000000000 +1000
++++ uip/mhbuildsbr.c   2004-05-04 12:45:13.000000000 +1000
+@@ -174,7 +174,7 @@
+ static int openFTP (CT, char **);
+ static int InitMail (CT);
+ static int openMail (CT, char **);
+-static char *fgetstr (char *, int, FILE *);
++static char *mh_fgetstr (char *, int, FILE *);
+ static int user_content (FILE *, char *, char *, CT *);
+ static void set_id (CT, int);
+ static int compose_content (CT);
+@@ -374,7 +374,7 @@
+      * read and parse the composition file
+      * and the directives it contains.
+      */
+-    while (fgetstr (buf, sizeof(buf) - 1, in)) {
++    while (mh_fgetstr (buf, sizeof(buf) - 1, in)) {
+       struct part *part;
+       CT p;
+ 
+@@ -2829,7 +2829,7 @@
+ 
+ 
+ static char *
+-fgetstr (char *s, int n, FILE *stream)
++mh_fgetstr (char *s, int n, FILE *stream)
+ {
+     char *cp, *ep;
+ 
+@@ -2931,7 +2931,7 @@
+ 
+ again_descr:
+               ct->c_descr = add (buffer + i + 1, ct->c_descr);
+-              if (!fgetstr (buffer, sizeof(buffer) - 1, in))
++              if (!mh_fgetstr (buffer, sizeof(buffer) - 1, in))
+                   adios (NULL, "end-of-file after %s: field in plaintext", DESCR_FIELD);
+               switch (buffer[0]) {
+               case ' ':
+@@ -2954,7 +2954,7 @@
+ rock_and_roll:
+           headers = -1;
+           pos = ftell (in);
+-          if ((cp = fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
++          if ((cp = mh_fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
+               break;
+           if (buffer[0] == '#') {
+               char *bp;
+@@ -3297,7 +3297,7 @@
+       ct->c_ctparams = (void *) m;
+ 
+       pp = &m->mp_parts;
+-      while (fgetstr (buffer, sizeof(buffer) - 1, in)) {
++      while (mh_fgetstr (buffer, sizeof(buffer) - 1, in)) {
+           struct part *part;
+           CT p;
+