diff options
| author | dholland <dholland@pkgsrc.org> | 2014-06-29 05:25:48 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-06-29 05:25:48 +0000 |
| commit | d0ef8f2193e46f990b7f0018bfa08e5219f7125a (patch) | |
| tree | 532a0e07a2ac9ae699e394b281d173a9e127bf76 /mail | |
| parent | 289c511fe5d364dbce06b7f210b7a1dc9a858d25 (diff) | |
| download | pkgsrc-d0ef8f2193e46f990b7f0018bfa08e5219f7125a.tar.gz | |
Instead of trying to make a list of OSes on which to avoid mucking
with sys_nerr, just remove all the references to sys_nerr.
Should fix MacOS build.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/xfmail/distinfo | 5 | ||||
| -rw-r--r-- | mail/xfmail/patches/patch-aa | 28 | ||||
| -rw-r--r-- | mail/xfmail/patches/patch-src_ui_xfmail.cpp | 27 |
3 files changed, 49 insertions, 11 deletions
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo index fc558387275..7b2c4c04306 100644 --- a/mail/xfmail/distinfo +++ b/mail/xfmail/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.12 2013/04/29 21:23:24 joerg Exp $ +$NetBSD: distinfo,v 1.13 2014/06/29 05:25:48 dholland Exp $ SHA1 (xfmail-1.5.5.tar.bz2) = 7a98486d1f8cce956efaf37d9540369d5f327401 RMD160 (xfmail-1.5.5.tar.bz2) = bf3e866d6fa37b7b9959c532b1f4b82fb57eb307 Size (xfmail-1.5.5.tar.bz2) = 1185913 bytes -SHA1 (patch-aa) = 678f14ddf5a9360d82fc09cbc296620fe8c66125 +SHA1 (patch-aa) = ac3689963fc7b4f15136893c8cd13de21d59493f SHA1 (patch-ab) = ca52f1038f190a310d7d3d5f1dece187a2958ce8 SHA1 (patch-ac) = f04aad8c7d44183cf16743c31c1779b42da500a1 SHA1 (patch-ad) = 91d92fb76b5ecf9c07295b942a34628ce212ae3d SHA1 (patch-ae) = 8d1d16f62511b78fc20c47e78eebc83dd8feac8d SHA1 (patch-src_mail_fmail.cpp) = c9e476c93c3ec1a94cb284fa4c5c662c15060729 +SHA1 (patch-src_ui_xfmail.cpp) = 73c9556187580a9f4d94626de419a18416557198 diff --git a/mail/xfmail/patches/patch-aa b/mail/xfmail/patches/patch-aa index bb76b02e874..76b72e050fe 100644 --- a/mail/xfmail/patches/patch-aa +++ b/mail/xfmail/patches/patch-aa @@ -1,13 +1,23 @@ -$NetBSD: patch-aa,v 1.6 2006/02/26 13:44:18 joerg Exp $ +$NetBSD: patch-aa,v 1.7 2014/06/29 05:25:48 dholland Exp $ + +Remove pointless references to sys_nerr. --- src/mail/fmail.h.orig 2004-01-02 03:54:01.000000000 +0000 +++ src/mail/fmail.h -@@ -170,7 +170,7 @@ char *strchr (), *strrchr (); - #define sys_nerr 65535 - #else - #ifndef sys_nerr +@@ -166,16 +166,6 @@ char *strchr (), *strrchr (); + #include <arpa/inet.h> + #include <netdb.h> + +- #ifndef HAVE_SYS_NERR +- #define sys_nerr 65535 +- #else +- #ifndef sys_nerr - #ifndef __FreeBSD__ -+ #if !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__) - extern int sys_nerr; - #endif - #endif +-extern int sys_nerr; +- #endif +- #endif +- #endif +- + #if !defined(errno) + extern int errno; + #endif diff --git a/mail/xfmail/patches/patch-src_ui_xfmail.cpp b/mail/xfmail/patches/patch-src_ui_xfmail.cpp new file mode 100644 index 00000000000..36cf6a6c130 --- /dev/null +++ b/mail/xfmail/patches/patch-src_ui_xfmail.cpp @@ -0,0 +1,27 @@ +$NetBSD: patch-src_ui_xfmail.cpp,v 1.1 2014/06/29 05:25:48 dholland Exp $ + +Remove pointless references to sys_nerr. + +--- src/ui/xfmail.cpp~ 2004-01-02 04:05:37.000000000 +0000 ++++ src/ui/xfmail.cpp +@@ -185,12 +185,6 @@ int display_msg(int flags, char *title, + errno = 0; + } + #else +- #ifdef HAVE_SYS_NERR +- if((errno > 0) && (errno < sys_nerr)) { +- strncpy(errstr, strerror(errno), 63); +- errno = 0; +- } +- #else + if(errno > 0) { + if(strerror(errno)) + strncpy(errstr, strerror(errno), 63); +@@ -198,7 +192,6 @@ int display_msg(int flags, char *title, + sprintf(errstr, "Unknown Error %d", errno); + errno = 0; + } +- #endif + #endif + else + strcpy(errstr, "ERROR"); |