pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/ja-mh Add DragonFly support. Fix errno usage. Rem...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1336f60f2ed0
branches:  trunk
changeset: 511204:1336f60f2ed0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 11 15:08:38 2006 +0000

description:
Add DragonFly support. Fix errno usage. Remove special-casing
of FreeBSD-like systems with objformat, we want minor shared library
numbers.

diffstat:

 mail/ja-mh/distinfo         |   33 ++++++++++++-
 mail/ja-mh/patches/patch-ab |   21 ++++++++
 mail/ja-mh/patches/patch-ac |   24 +++++++++
 mail/ja-mh/patches/patch-ad |   13 +++++
 mail/ja-mh/patches/patch-ae |   14 +++++
 mail/ja-mh/patches/patch-af |   14 +++++
 mail/ja-mh/patches/patch-ag |  110 ++++++++++++++++++++++++++++++++++++++++++++
 mail/ja-mh/patches/patch-ah |   26 ++++++++++
 mail/ja-mh/patches/patch-ai |   25 ++++++++++
 mail/ja-mh/patches/patch-aj |   15 ++++++
 mail/ja-mh/patches/patch-ak |   12 ++++
 mail/ja-mh/patches/patch-al |   44 ++++++++++++----
 mail/ja-mh/patches/patch-am |   15 ++++++
 mail/ja-mh/patches/patch-ao |   15 ++++++
 mail/ja-mh/patches/patch-ap |   22 ++++++++
 mail/ja-mh/patches/patch-aq |   13 +++++
 mail/ja-mh/patches/patch-ar |   25 ++++++++++
 mail/ja-mh/patches/patch-av |   15 ++++-
 mail/ja-mh/patches/patch-ax |   15 ++++++
 mail/ja-mh/patches/patch-ay |   12 ++++
 mail/ja-mh/patches/patch-az |   15 ++++++
 mail/ja-mh/patches/patch-ba |   22 ++++++++
 mail/ja-mh/patches/patch-bb |   15 ++++++
 mail/ja-mh/patches/patch-bc |   14 +++++
 mail/ja-mh/patches/patch-bd |   14 +++++
 mail/ja-mh/patches/patch-be |   14 +++++
 mail/ja-mh/patches/patch-bf |   12 ++++
 mail/ja-mh/patches/patch-bg |   15 ++++++
 mail/ja-mh/patches/patch-bh |   13 +++++
 mail/ja-mh/patches/patch-bi |   16 ++++++
 30 files changed, 615 insertions(+), 18 deletions(-)

diffs (truncated from 841 to 300 lines):

diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/distinfo
--- a/mail/ja-mh/distinfo       Tue Apr 11 14:47:32 2006 +0000
+++ b/mail/ja-mh/distinfo       Tue Apr 11 15:08:38 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/12/05 20:50:32 rillig Exp $
+$NetBSD: distinfo,v 1.9 2006/04/11 15:08:38 joerg Exp $
 
 SHA1 (mh-6.8.4-JP-3.05.tar.gz) = cb531f80be4326cd56d33d6fa9efba4d2d63d0ce
 RMD160 (mh-6.8.4-JP-3.05.tar.gz) = a092a9447370a09f770121baa2ae7eced130ff0f
@@ -16,9 +16,36 @@
 RMD160 (mh-6.8.4-JP-3.05-20031106.patch.gz) = b0585c5c5aebdafa619e129917f0b7d7db987b02
 Size (mh-6.8.4-JP-3.05-20031106.patch.gz) = 311 bytes
 SHA1 (patch-aa) = 59b734fb27a8a5ccea529044bf5bd2f09965be85
-SHA1 (patch-al) = 59bd51d6b67beb0492b3a3d3acc05242474bac7b
+SHA1 (patch-ab) = d322f0400d065bc4152f681969ea858dfc2d87a9
+SHA1 (patch-ac) = ea10c3b0b230932a256fd9069b0aab34c7de92bb
+SHA1 (patch-ad) = 64d97e58ae75179f4be6222279aa6a470e37ac00
+SHA1 (patch-ae) = 7b39981a32d4a74bc7bd7c4b9a51300c73ff381a
+SHA1 (patch-af) = 3d477e8febb0af5605b8570bf03d77e1dbf64ab8
+SHA1 (patch-ag) = 863812f108d4d25b44c62996a50aafa8dbed2880
+SHA1 (patch-ah) = 6dcd2fffe854da65ecbf2ec4817d5f66ec7ca92e
+SHA1 (patch-ai) = 4f6e6ff7fa4b331d16edd27cff565eb022813443
+SHA1 (patch-aj) = 3fb227132f1556a864bd892fea30a2cdf99968e8
+SHA1 (patch-ak) = 97f021754702266996a05f8a665cd5dcc9168f60
+SHA1 (patch-al) = b91ccc3db1f1b889c9cd7d9c74b31a9c8f1b8993
+SHA1 (patch-am) = 5b94f3831692c3a23dd86b0a5cc4842712318ff2
+SHA1 (patch-ao) = 903d65929397ee283beb6aec93e08c32794dc709
+SHA1 (patch-ap) = 7c4069eb87ddca9d1d294b57681d51a393eab3f0
+SHA1 (patch-aq) = 7410ea8359575a89fb489403ab0ab76ff0c24a26
+SHA1 (patch-ar) = 7b3f65a4ff93c428dc4def0d4e3fe993bae7266b
 SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54
 SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb
 SHA1 (patch-au) = 3788f6ca9362a97323cc6bf0f942f2ba949e1c46
-SHA1 (patch-av) = 2f25ebe4272bbad270b6286d2eb1dce5ddae690e
+SHA1 (patch-av) = 14d79f16dcc7f5fe76caec499c9043fbc6874d06
 SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230
+SHA1 (patch-ax) = d0b559c1d9f72c413ca8764ddf0794a086c19307
+SHA1 (patch-ay) = f62ad194e1bf70054ff833c094206f7754478a6f
+SHA1 (patch-az) = de12b9fc05d022a9850108541378f25249918182
+SHA1 (patch-ba) = 4e0880360e484f6b74c45870e97f6f89d3a87a76
+SHA1 (patch-bb) = a7ec0a5f4f96ca2e945dc1d133322852ec1d46dd
+SHA1 (patch-bc) = 44fc56c7bccca8c8d7c77a1a7eecfd2391228402
+SHA1 (patch-bd) = 448da6011564280649930b43fbf0d793030012b7
+SHA1 (patch-be) = a72a8a4e251a1329cc86d60b24cf7977c5f5482b
+SHA1 (patch-bf) = 6510f0ac0b88c1f08622948ba070f450cbcf02e1
+SHA1 (patch-bg) = 46a1d43ad4496ee2f4d031751f13ba48c4e492d4
+SHA1 (patch-bh) = f40cc4c0859f5e1bad7daabab99a33249561c061
+SHA1 (patch-bi) = c00381964adedd04613429c6adc9d9a91aac50b7
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-ab       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- zotnet/mts/client.c.orig   2006-04-11 13:04:19.000000000 +0000
++++ zotnet/mts/client.c
+@@ -52,7 +52,6 @@ static Key_schedule schedule;
+ 
+ /*  */
+ 
+-extern int errno;
+ #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
+ extern int  sys_nerr;
+ extern char *sys_errlist[];
+@@ -361,7 +360,7 @@ int        net;
+ 
+ #if !defined(SOLARIS) && !defined(linux) && !defined(__bsdi__) && \
+       !defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__) && \
+-      !defined(__NetBSD__) && !defined(__OpenBSD__)
++      !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #ifndef       DG
+ #ifndef __alpha
+ u_long        inet_addr ();
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-ac       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- configure.orig     2001-06-14 16:41:51.000000000 +0000
++++ configure
+@@ -1393,18 +1393,10 @@ case "$host_os" in
+     SOLARIS=`echo "$host_os" | $AWK -F. '{printf "SOLARIS=2%02d%02d",$2,$3}'`
+     SETEUID=`echo "$host_os" | $AWK -F. '$2>=3{printf "SETEUID"}'`
+     ;;
+-  freebsd* | netbsd*)
++  freebsd* | netbsd* | dragonfly*)
+     if test "$use_sharedlib" != no
+     then
+       sharedlib=fbsd
+-      if test -x /usr/bin/objformat
+-      then
+-      if test x`/usr/bin/objformat` = xelf
+-      then
+-        sharedlib=gnuelf
+-        make_mhconfig='CFLAGS="-O -DMHSLIB_NOMINVER"'
+-      fi
+-      fi
+       echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
+       slflags="-fpic"
+       slibdir=$libdir
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-ad       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- sbr/discard.c.orig 2006-04-11 13:20:41.000000000 +0000
++++ sbr/discard.c
+@@ -61,7 +61,7 @@ FILE   *io;
+ #endif        /* SYS5 */
+ #endif        /* POSIX */
+ 
+-#ifdef _FSTDIO
++#if defined(_FSTDIO) || defined(__DragonFly__)
+     fpurge (io);
+ #else
+ #ifdef _STDIO_USES_IOSTREAM
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-ae       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- sbr/m_draft.c.orig 2006-04-11 13:13:52.000000000 +0000
++++ sbr/m_draft.c
+@@ -10,9 +10,6 @@ static char ident[] = "@(#)$Id: m_draft.
+ #include <sys/stat.h>
+ 
+ 
+-extern int errno;
+-
+-
+ char   *m_draft (folder, msg, use, isdf)
+ register char  *folder,
+                *msg;
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-af       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- sbr/m_getdefs.c.orig       2006-04-11 13:14:22.000000000 +0000
++++ sbr/m_getdefs.c
+@@ -13,9 +13,6 @@ static char ident[] = "@(#)$Id: m_getdef
+ #include <sys/stat.h>
+ #include <pwd.h>
+ 
+-
+-extern int errno;
+-
+ #ifndef __STDC__
+ #ifdef        SYS5
+ struct        passwd  *getpwuid ();
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-ag       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,110 @@
+$NetBSD: patch-ag,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- sbr/m_getfld.c.orig        2001-06-13 14:21:02.000000000 +0000
++++ sbr/m_getfld.c
+@@ -186,6 +186,9 @@ static int  (*eom_action) () = NULL;
+ #define       _cnt    _r              /* Retch */
+ #define       _filbuf __srget         /* Puke */
+ #endif
++#ifdef __DragonFly__)
++#define       _filbuf __srget         /* Puke */
++#endif
+ 
+ /*  */
+ 
+@@ -302,6 +305,9 @@ register FILE      *iob;
+               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;
+@@ -332,6 +338,9 @@ register FILE      *iob;
+               } else {
+ #ifdef _STDIO_USES_IOSTREAM
+                   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;
+@@ -377,6 +386,8 @@ register FILE      *iob;
+ #ifdef _STDIO_USES_IOSTREAM
+               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;
+ #endif
+@@ -390,6 +401,10 @@ register FILE     *iob;
+                       j = ep - (unsigned char *) iob->_IO_read_ptr;
+                       (void) bcopy( iob->_IO_read_ptr, cp, j);
+                       iob->_IO_read_ptr = ep;
++#elif defined(__DragonFly__)
++                      j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
++                      (void) bcopy( ((struct __FILE_public *)iob)->_p, cp, j);
++                      ((struct __FILE_public *)iob)->_p = ep; ((struct __FILE_public *)iob)->_r -= j;
+ #else
+                       j = ep - (unsigned char *) iob->_ptr;
+                       (void) bcopy( iob->_ptr, cp, j);
+@@ -407,6 +422,9 @@ register FILE      *iob;
+ #ifdef _STDIO_USES_IOSTREAM
+               c += bp - (unsigned char *) iob->_IO_read_ptr;
+               (void) bcopy( iob->_IO_read_ptr, cp, c);
++#elif defined(__DragonFly__)
++              c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
++              (void) bcopy( ((struct __FILE_public *)iob)->_p, cp, c);
+ #else
+               c += bp - (unsigned char *) iob->_ptr;
+               (void) bcopy( iob->_ptr, cp, c);
+@@ -416,6 +434,8 @@ register FILE      *iob;
+                   /* the dest buffer is full */
+ #ifdef _STDIO_USES_IOSTREAM
+                   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;
+ #endif
+@@ -434,6 +454,8 @@ register FILE      *iob;
+               iob->_IO_read_ptr = iob->_IO_read_end;
+               c = __underflow((struct _IO_FILE *) iob);
+               iob->_IO_read_ptr++;   /* NOT automatic! */
++#elif defined(__DragonFly__)
++              *cp++ = j = *(((struct __FILE_public *)iob)->_p + c);
+ #else
+               *cp++ = j = *(iob->_ptr + c);
+ #ifdef FILBUF_ADJ
+@@ -467,6 +489,8 @@ register FILE      *iob;
+                   if (c != EOF)
+ #ifdef _STDIO_USES_IOSTREAM
+                       --iob->_IO_read_ptr;
++#elif defined(__DragonFly__)
++                      --((struct __FILE_public *)iob)->_p, ++((struct __FILE_public *)iob)->_r;
+ #else
+                       --iob->_ptr, ++iob->_cnt;
+ #endif
+@@ -488,6 +512,8 @@ register FILE      *iob;
+ #ifdef _STDIO_USES_IOSTREAM
+           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;
+ #endif
+@@ -549,6 +575,9 @@ register FILE      *iob;
+           (void) bcopy( bp, buf, c );
+ #ifdef _STDIO_USES_IOSTREAM
+           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;
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ja-mh/patches/patch-ah       Tue Apr 11 15:08:38 2006 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.3 2006/04/11 15:08:38 joerg Exp $
+
+--- sbr/makedir.c.orig 2006-04-11 13:36:24.000000000 +0000
++++ sbr/makedir.c
+@@ -14,10 +14,11 @@ static char ident[] = "@(#)$Id: makedir.
+ #include "../h/mh.h"
+ #include <stdio.h>
+ 
++#include <errno.h>
++
+ #if defined (BSD42) || defined(SVR4) || \
+   defined (hpux) || defined(sgi) || defined(__osf__) || defined(ncr) || \
+   defined (_AIX) || defined(AUX) || defined(linux) || defined(__CYGWIN32__)
+-#include <errno.h>
+ #include <sys/param.h>
+ #include <sys/file.h>
+ #endif /* BSD42 ... */
+@@ -29,8 +30,6 @@ static char ident[] = "@(#)$Id: makedir.
+ #include <unistd.h>
+ #endif
+ 
+-extern int  errno;
+-      
+ makedir (dir)
+ register char *dir;
+ {
diff -r cb7fd6cf0c08 -r 1336f60f2ed0 mail/ja-mh/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000



Home | Main Index | Thread Index | Old Index