pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/nmh Add DragonFly support. Fix errno.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/abd148daad05
branches:  trunk
changeset: 509078:abd148daad05
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Mar 02 21:28:23 2006 +0000

description:
Add DragonFly support. Fix errno.

diffstat:

 mail/nmh/distinfo         |   38 ++++++++++++++-
 mail/nmh/patches/patch-aa |   30 +++++++----
 mail/nmh/patches/patch-ab |   13 +++++
 mail/nmh/patches/patch-ac |   13 +++++
 mail/nmh/patches/patch-ad |   13 +++++
 mail/nmh/patches/patch-ae |   14 +++++
 mail/nmh/patches/patch-af |  115 ++++++++++++++++++++++++++++++++++++++++++++++
 mail/nmh/patches/patch-ag |   13 +++++
 mail/nmh/patches/patch-ah |   12 ++++
 mail/nmh/patches/patch-ai |   13 +++++
 mail/nmh/patches/patch-aj |   13 +++++
 mail/nmh/patches/patch-ak |   13 +++++
 mail/nmh/patches/patch-al |   12 ++++
 mail/nmh/patches/patch-am |   13 +++++
 mail/nmh/patches/patch-an |   12 ++++
 mail/nmh/patches/patch-ao |   12 ++++
 mail/nmh/patches/patch-ap |   13 +++++
 mail/nmh/patches/patch-aq |   13 +++++
 mail/nmh/patches/patch-ar |   12 ++++
 mail/nmh/patches/patch-as |   13 +++++
 mail/nmh/patches/patch-at |   12 ++++
 mail/nmh/patches/patch-au |   13 +++++
 mail/nmh/patches/patch-av |   13 +++++
 mail/nmh/patches/patch-aw |   13 +++++
 mail/nmh/patches/patch-ax |   21 ++++++++
 mail/nmh/patches/patch-ay |   24 +++++++++
 mail/nmh/patches/patch-az |   13 +++++
 mail/nmh/patches/patch-ba |   13 +++++
 mail/nmh/patches/patch-bb |   13 +++++
 mail/nmh/patches/patch-bc |   13 +++++
 mail/nmh/patches/patch-bd |   13 +++++
 mail/nmh/patches/patch-be |   13 +++++
 mail/nmh/patches/patch-bf |   12 ++++
 mail/nmh/patches/patch-bg |   13 +++++
 mail/nmh/patches/patch-bh |   13 +++++
 mail/nmh/patches/patch-bi |   13 +++++
 36 files changed, 611 insertions(+), 14 deletions(-)

diffs (truncated from 815 to 300 lines):

diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/distinfo
--- a/mail/nmh/distinfo Thu Mar 02 21:12:15 2006 +0000
+++ b/mail/nmh/distinfo Thu Mar 02 21:28:23 2006 +0000
@@ -1,9 +1,43 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 09:59:25 agc Exp $
+$NetBSD: distinfo,v 1.11 2006/03/02 21:28:23 joerg Exp $
 
 SHA1 (nmh-1.0.4.tar.gz) = 71441a884d898db2fd9184a92e663682536425f5
 RMD160 (nmh-1.0.4.tar.gz) = 32f0a0cb7aa76f7d7efc59d99b6e5aeeea519037
 Size (nmh-1.0.4.tar.gz) = 683215 bytes
-SHA1 (patch-aa) = 88e3e0445cb0102bb3748eb2c9503950ae631931
+SHA1 (patch-aa) = 9bb5d1f8344751fc5414751cddfecaacd044c925
+SHA1 (patch-ab) = e6d0ef2fbd549bacd160972f45e66067f443e6fb
+SHA1 (patch-ac) = 110189a119fcdbfd78a1becd1d3b83482d156192
+SHA1 (patch-ad) = f1dcbd4ef8ffdff07d12dc1fa6036a7a7164af34
+SHA1 (patch-ae) = e8faef23ca86c5a838e1d0deef1696cb5aace084
+SHA1 (patch-af) = 90464f24d1b0b4887ee91dcd0d5be0fd82e714e2
+SHA1 (patch-ag) = c40467987ed6ae34bc59729003b2561541552117
+SHA1 (patch-ah) = 00c12fcc73ce630879688bd3628208755efc0a85
+SHA1 (patch-ai) = bb6ce79960d022b13bf3060d6dd4121dc0ce9a18
+SHA1 (patch-aj) = 32c6e81b02bc6888f719c8b9cfdca13838dd8130
+SHA1 (patch-ak) = 82d517241594920a21e514cfa7ae646f44c89d87
+SHA1 (patch-al) = 31407afcb1687fb5c29cecda3d9c078890ae3157
+SHA1 (patch-am) = 27e6c13ee80a5b907696c87ea261675661a176da
+SHA1 (patch-an) = e76f9a32b98e4e33325b04afff5209fa5e452f43
+SHA1 (patch-ao) = f9072835d2f2faac018803784a8deac56a694f93
+SHA1 (patch-ap) = 6ce802de091a1fa5d8fd2086d20597334bd39db9
+SHA1 (patch-aq) = eac9f24e310a64cb2a9e471f813e099acaab624a
+SHA1 (patch-ar) = 5e684c49b99e5ab3ef651bad35b966d1ebb2ad9e
+SHA1 (patch-as) = 017aa17dfee30429e11ade6486ca11a7cb01a971
+SHA1 (patch-at) = a6ecaa1ea5b03958fa02aebd1477d33be9b659e9
+SHA1 (patch-au) = e6e9604422cc7e17c1a543ce93265ed79359d379
+SHA1 (patch-av) = 265b73b22d62c34031b0554bcd5aed3372a89daf
+SHA1 (patch-aw) = b89b413b9c48050986dd278834a2839e957cfc82
+SHA1 (patch-ax) = d63d97b1bc0f8ba73061da09256d4f728b1066ef
+SHA1 (patch-ay) = 70da99e2192917180376f78e5452342df9440213
+SHA1 (patch-az) = 04704392993194936c300220f8b13bd5143f0b59
+SHA1 (patch-ba) = cf2098d7124bd6bbd1da09acf467196570dee044
+SHA1 (patch-bb) = 75bce49233ced39551f5b145ff44d4a04b996589
+SHA1 (patch-bc) = 86d8906800e4a0621366b3a19736b90bcb99a270
+SHA1 (patch-bd) = 994b773c80508891d744b39784094108fdb5ca51
+SHA1 (patch-be) = 1e244675d7a6b4279924599f55e89d78f765c144
+SHA1 (patch-bf) = f30740c6ec201c66493f26f9e0cbf88023323a4a
+SHA1 (patch-bg) = 0bdf466cf238d431b49d3b16aad55e988c13f646
+SHA1 (patch-bh) = f6d5371d0366e9fd7b432208beec399c05ade010
+SHA1 (patch-bi) = 3ad7237c2331bf957aa1736cf2182f6a14d45ed1
 SHA1 (patch-ca) = 126d53b3af216754c40b828d7c444a6ee077073f
 SHA1 (patch-cb) = 6e498988c08e393fdd4e8e27f2ff6ce457e2c803
 SHA1 (patch-cd) = 13901025ef3a1b7fc07d0c13f8e1aef3e9bee2d6
diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/patches/patch-aa
--- a/mail/nmh/patches/patch-aa Thu Mar 02 21:12:15 2006 +0000
+++ b/mail/nmh/patches/patch-aa Thu Mar 02 21:28:23 2006 +0000
@@ -1,11 +1,17 @@
-$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...
+$NetBSD: patch-aa,v 1.5 2006/03/02 21:28:23 joerg Exp $
 
-
---- 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 @@
+--- uip/mhbuildsbr.c.orig      1999-09-12 13:50:12.000000000 +0000
++++ uip/mhbuildsbr.c
+@@ -40,8 +40,6 @@
+ #endif
+ 
+ 
+-extern int errno;
+-
+ extern int debugsw;
+ extern int verbosw;
+ 
+@@ -174,7 +172,7 @@ static int InitFTP (CT);
  static int openFTP (CT, char **);
  static int InitMail (CT);
  static int openMail (CT, char **);
@@ -14,7 +20,7 @@
  static int user_content (FILE *, char *, char *, CT *);
  static void set_id (CT, int);
  static int compose_content (CT);
-@@ -374,7 +374,7 @@
+@@ -374,7 +372,7 @@ finish_field:
       * read and parse the composition file
       * and the directives it contains.
       */
@@ -23,7 +29,7 @@
        struct part *part;
        CT p;
  
-@@ -2829,7 +2829,7 @@
+@@ -2829,7 +2827,7 @@ openMail (CT ct, char **file)
  
  
  static char *
@@ -32,7 +38,7 @@
  {
      char *cp, *ep;
  
-@@ -2931,7 +2931,7 @@
+@@ -2931,7 +2929,7 @@ user_content (FILE *in, char *file, char
  
  again_descr:
                ct->c_descr = add (buffer + i + 1, ct->c_descr);
@@ -41,7 +47,7 @@
                    adios (NULL, "end-of-file after %s: field in plaintext", DESCR_FIELD);
                switch (buffer[0]) {
                case ' ':
-@@ -2954,7 +2954,7 @@
+@@ -2954,7 +2952,7 @@ again_descr:
  rock_and_roll:
            headers = -1;
            pos = ftell (in);
@@ -50,7 +56,7 @@
                break;
            if (buffer[0] == '#') {
                char *bp;
-@@ -3297,7 +3297,7 @@
+@@ -3297,7 +3295,7 @@ use_forw:
        ct->c_ctparams = (void *) m;
  
        pp = &m->mp_parts;
diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nmh/patches/patch-ab Thu Mar 02 21:28:23 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2006/03/02 21:28:23 joerg Exp $
+
+--- sbr/context_read.c.orig    2006-03-02 16:47:03.000000000 +0000
++++ sbr/context_read.c
+@@ -9,8 +9,6 @@
+ #include <errno.h>
+ #include <pwd.h>
+ 
+-extern int errno;
+-
+ void
+ context_read (void)
+ {
diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nmh/patches/patch-ac Thu Mar 02 21:28:23 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.6 2006/03/02 21:28:23 joerg Exp $
+
+--- sbr/discard.c.orig 2006-03-02 20:24:08.000000000 +0000
++++ sbr/discard.c
+@@ -51,7 +51,7 @@ discard (FILE *io)
+ # endif
+ #endif
+ 
+-#ifdef _FSTDIO
++#if defined(_FSTDIO) || defined(__DragonFly__)
+     fpurge (io);
+ #else
+ # ifdef LINUX_STDIO
diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nmh/patches/patch-ad Thu Mar 02 21:28:23 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2006/03/02 21:28:23 joerg Exp $
+
+--- sbr/lock_file.c.orig       2006-03-02 20:27:38.000000000 +0000
++++ sbr/lock_file.c
+@@ -40,8 +40,6 @@
+ 
+ #include <signal.h>
+ 
+-extern int errno;
+-
+ #ifdef LOCKDIR
+ char *lockdir = LOCKDIR;
+ #endif
diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nmh/patches/patch-ae Thu Mar 02 21:28:23 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2006/03/02 21:28:23 joerg Exp $
+
+--- sbr/m_draft.c.orig 2006-03-02 20:28:13.000000000 +0000
++++ sbr/m_draft.c
+@@ -8,9 +8,6 @@
+ #include <h/mh.h>
+ #include <errno.h>
+ 
+-extern int errno;
+-
+-
+ char *
+ m_draft (char *folder, char *msg, int use, int *isdf)
+ {
diff -r 9abb8ab63bf7 -r abd148daad05 mail/nmh/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/nmh/patches/patch-af Thu Mar 02 21:28:23 2006 +0000
@@ -0,0 +1,115 @@
+$NetBSD: patch-af,v 1.1 2006/03/02 21:28:23 joerg Exp $
+
+--- sbr/m_getfld.c.orig        2006-03-02 20:29:22.000000000 +0000
++++ sbr/m_getfld.c
+@@ -261,6 +261,9 @@ m_getfld (int state, unsigned char *name
+               bp = sp = (unsigned char *) iob->_IO_read_ptr - 1;
+               j = (cnt = ((long) iob->_IO_read_end -
+                       (long) iob->_IO_read_ptr)  + 1) < i ? cnt : i;
++#elif defined(__DragonFly__)
++              bp = sp = (unsigned char *) ((struct __FILE_public *)iob)->_p - 1;
++              j = (cnt = ((struct __FILE_public *)iob)->_r+1) < i ? cnt : i;
+ #else
+               bp = sp = (unsigned char *) iob->_ptr - 1;
+               j = (cnt = iob->_cnt+1) < i ? cnt : i;
+@@ -273,6 +276,8 @@ m_getfld (int state, unsigned char *name
+ #ifdef LINUX_STDIO
+                   iob->_IO_read_ptr = iob->_IO_read_end;
+                   if (__underflow(iob) == EOF) {
++#elif defined(__DragonFly__)
++                  if (__srget(iob) == EOF) {
+ #else
+                   if (_filbuf(iob) == EOF) {
+ #endif
+@@ -286,6 +291,9 @@ m_getfld (int state, unsigned char *name
+               } else {
+ #ifdef LINUX_STDIO
+                   iob->_IO_read_ptr = bp + 1;
++#elif defined(__DragonFly__)
++                  ((struct __FILE_public *)iob)->_p = bp + 1;
++                  ((struct __FILE_public *)iob)->_r = cnt - 1;
+ #else
+                   iob->_ptr = bp + 1;
+                   iob->_cnt = cnt - 1;
+@@ -330,6 +338,9 @@ m_getfld (int state, unsigned char *name
+ #ifdef LINUX_STDIO
+               cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
+               bp = (unsigned char *) --iob->_IO_read_ptr;
++#elif defined(__DragonFly__)
++              cnt = ((struct __FILE_public *)iob)->_r++;
++              bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
+ #else
+               cnt = iob->_cnt++;
+               bp = (unsigned char *) --iob->_ptr;
+@@ -344,6 +355,11 @@ m_getfld (int state, unsigned char *name
+                       j = ep - (unsigned char *) iob->_IO_read_ptr;
+                       memcpy (cp, iob->_IO_read_ptr, j);
+                       iob->_IO_read_ptr = ep;
++#elif defined(__DragonFly__)
++                      j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
++                      memcpy (cp, ((struct __FILE_public *)iob)->_p, j);
++                      ((struct __FILE_public *)iob)->_p = ep;
++                      ((struct __FILE_public *)iob)->_r -= j;
+ #else
+                       j = ep - (unsigned char *) iob->_ptr;
+                       memcpy (cp, iob->_ptr, j);
+@@ -363,6 +379,9 @@ m_getfld (int state, unsigned char *name
+ #ifdef LINUX_STDIO
+               c += bp - (unsigned char *) iob->_IO_read_ptr;
+               memcpy( cp, iob->_IO_read_ptr, c);
++#elif defined(__DragonFly__)
++              c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
++              memcpy( cp, ((struct __FILE_public *)iob)->_p, c);
+ #else
+               c += bp - (unsigned char *) iob->_ptr;
+               memcpy( cp, iob->_ptr, c);
+@@ -373,6 +392,9 @@ m_getfld (int state, unsigned char *name
+                   /* the dest buffer is full */
+ #ifdef LINUX_STDIO
+                   iob->_IO_read_ptr += c;
++#elif defined(__DragonFly__)
++                  ((struct __FILE_public *)iob)->_r -= c;
++                  ((struct __FILE_public *)iob)->_p += c;
+ #else
+                   iob->_cnt -= c;
+                   iob->_ptr += c;
+@@ -392,6 +414,9 @@ m_getfld (int state, unsigned char *name
+               iob->_IO_read_ptr = iob->_IO_read_end;
+               c = __underflow(iob);
+               iob->_IO_read_ptr++;    /* NOT automatic! */
++#elif defined(__DragonFly__)
++              *cp++ =j = *(((struct __FILE_public *)iob)->_p + c);
++              c = __srget(iob);
+ #else
+               *cp++ = j = *(iob->_ptr + c);
+               c = _filbuf(iob);
+@@ -401,6 +426,9 @@ m_getfld (int state, unsigned char *name
+                   if (c != EOF) {
+ #ifdef LINUX_STDIO
+                       --iob->_IO_read_ptr;
++#elif defined(__DragonFly__)
++                      --((struct __FILE_public *)iob)->_p;
++                      ++((struct __FILE_public *)iob)->_r;
+ #else
+                       --iob->_ptr;
+                       ++iob->_cnt;
+@@ -424,6 +452,9 @@ m_getfld (int state, unsigned char *name
+ #ifdef LINUX_STDIO
+           bp = (unsigned char *) --iob->_IO_read_ptr;
+           cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
++#elif defined(__DragonFly__)
++          bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
++          cnt = ++((struct __FILE_public *)iob)->_r;
+ #else
+           bp = (unsigned char *) --iob->_ptr;
+           cnt = ++iob->_cnt;



Home | Main Index | Thread Index | Old Index