[pkgsrc/trunk]: pkgsrc/mail/elm-me Fix errno. Honour CFLAGS.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fc3690e6352
branches:  trunk
changeset: 506974:7fc3690e6352
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Jan 24 19:01:45 2006 +0000

description:
Fix errno. Honour CFLAGS.

diffstat:

 mail/elm-me/Makefile         |   4 ++-
 mail/elm-me/distinfo         |  56 ++++++++++++++++++++++++++++++++++++++++++-
 mail/elm-me/patches/patch-ad |  15 +++++++++--
 mail/elm-me/patches/patch-af |  13 ++++++++++
 mail/elm-me/patches/patch-ag |  13 ++++++++++
 mail/elm-me/patches/patch-ah |  12 +++++++++
 mail/elm-me/patches/patch-ai |  13 ++++++++++
 mail/elm-me/patches/patch-aj |  12 +++++++++
 mail/elm-me/patches/patch-ak |  12 +++++++++
 mail/elm-me/patches/patch-al |  12 +++++++++
 mail/elm-me/patches/patch-am |  12 +++++++++
 mail/elm-me/patches/patch-an |  12 +++++++++
 mail/elm-me/patches/patch-ao |  12 +++++++++
 mail/elm-me/patches/patch-ap |  12 +++++++++
 mail/elm-me/patches/patch-aq |  12 +++++++++
 mail/elm-me/patches/patch-ar |  12 +++++++++
 mail/elm-me/patches/patch-as |  12 +++++++++
 mail/elm-me/patches/patch-at |  12 +++++++++
 mail/elm-me/patches/patch-au |  13 ++++++++++
 mail/elm-me/patches/patch-av |  13 ++++++++++
 mail/elm-me/patches/patch-aw |  12 +++++++++
 mail/elm-me/patches/patch-ax |  13 ++++++++++
 mail/elm-me/patches/patch-ay |  13 ++++++++++
 mail/elm-me/patches/patch-az |  13 ++++++++++
 mail/elm-me/patches/patch-ba |  12 +++++++++
 mail/elm-me/patches/patch-bb |  20 +++++++++++++++
 mail/elm-me/patches/patch-bc |  13 ++++++++++
 mail/elm-me/patches/patch-bd |  13 ++++++++++
 mail/elm-me/patches/patch-be |  13 ++++++++++
 mail/elm-me/patches/patch-bf |  13 ++++++++++
 mail/elm-me/patches/patch-bg |  12 +++++++++
 mail/elm-me/patches/patch-bh |  12 +++++++++
 mail/elm-me/patches/patch-bi |  13 ++++++++++
 mail/elm-me/patches/patch-bj |  13 ++++++++++
 mail/elm-me/patches/patch-bk |  12 +++++++++
 mail/elm-me/patches/patch-bl |  13 ++++++++++
 mail/elm-me/patches/patch-bm |  12 +++++++++
 mail/elm-me/patches/patch-bn |  13 ++++++++++
 mail/elm-me/patches/patch-bo |  13 ++++++++++
 mail/elm-me/patches/patch-bp |  12 +++++++++
 mail/elm-me/patches/patch-bq |  13 ++++++++++
 mail/elm-me/patches/patch-br |  13 ++++++++++
 mail/elm-me/patches/patch-bs |  12 +++++++++
 mail/elm-me/patches/patch-bt |  13 ++++++++++
 mail/elm-me/patches/patch-bu |  13 ++++++++++
 mail/elm-me/patches/patch-bv |  12 +++++++++
 mail/elm-me/patches/patch-bw |  13 ++++++++++
 mail/elm-me/patches/patch-bx |  21 ++++++++++++++++
 mail/elm-me/patches/patch-by |  19 ++++++++++++++
 mail/elm-me/patches/patch-bz |  21 ++++++++++++++++
 mail/elm-me/patches/patch-ca |  29 ++++++++++++++++++++++
 mail/elm-me/patches/patch-cb |  13 ++++++++++
 mail/elm-me/patches/patch-cc |  13 ++++++++++
 mail/elm-me/patches/patch-cd |  13 ++++++++++
 mail/elm-me/patches/patch-ce |  13 ++++++++++
 55 files changed, 769 insertions(+), 6 deletions(-)

diffs (truncated from 1026 to 300 lines):

diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/Makefile
--- a/mail/elm-me/Makefile      Tue Jan 24 18:56:23 2006 +0000
+++ b/mail/elm-me/Makefile      Tue Jan 24 19:01:45 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/29 06:21:48 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/01/24 19:01:45 joerg Exp $
 
 DISTNAME=              elm-2.4ME+93
 PKGNAME=               elm-me-2.4.93
@@ -25,6 +25,8 @@
 CONF_FILES=            ${PREFIX}/lib/elm.mimetypes-dist                \
                        ${PREFIX}/lib/elm.mimetypes
 
+USE_TOOLS+=    ksh
+
 pre-configure:
        ${CP} ${FILESDIR}/config.sh ${WRKSRC}/
        ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/distinfo
--- a/mail/elm-me/distinfo      Tue Jan 24 18:56:23 2006 +0000
+++ b/mail/elm-me/distinfo      Tue Jan 24 19:01:45 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:21 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/01/24 19:01:45 joerg Exp $
 
 SHA1 (elm-2.4ME+93.tar.gz) = 2ce3cee8eb7af9b73e11fb99b901357b1bd5cd4d
 RMD160 (elm-2.4ME+93.tar.gz) = 46b36b2fdc78924ffbbced66c93defa431508e29
@@ -6,5 +6,57 @@
 SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
 SHA1 (patch-ab) = 288893a202522d3197cd5092273c1dfbcd31f3da
 SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
-SHA1 (patch-ad) = d78052955bf84a156f5de4ec7a1a08d01e270e3e
+SHA1 (patch-ad) = 98ee3d32f14b3bd8709137a25c598d6799973fbf
 SHA1 (patch-ae) = 600dbb380442dcbaef51c69d81847b400538bf0f
+SHA1 (patch-af) = 151dff5495f622431d288da0e9b7aa0f1ae5a241
+SHA1 (patch-ag) = 316a97abe0ee2d49fd5e776c3db59caca4057b41
+SHA1 (patch-ah) = 97c196e30e3136d72c832bacc517610cc242c685
+SHA1 (patch-ai) = edfd73e58d16496ab4ffd49d04db629406c78e82
+SHA1 (patch-aj) = 5acad9a35bb82dfea4ee344004c7b554e5badeba
+SHA1 (patch-ak) = 18895f7cae925d582799f87d3bcab36d9a6f4f84
+SHA1 (patch-al) = 819b52ce87a85cc99139bce38376b2812438514c
+SHA1 (patch-am) = 0e368c7ec8f51d1847199691d97f3d29b7568937
+SHA1 (patch-an) = 6b01f3b01fc041adcc8b7d3a81f5b9a60cc58c6a
+SHA1 (patch-ao) = 95d5825723593af0612a012879daca3d54a9ac2b
+SHA1 (patch-ap) = 2b5b25795a9c223d59ede31eeae77baccee9f6cf
+SHA1 (patch-aq) = ff2b66985c4bacbccd6141a85f8321cac0ce33b0
+SHA1 (patch-ar) = fe4f39fc8d5833f202cc1cee59cccd6a39f5f8e1
+SHA1 (patch-as) = 25c5d00d4cb82c317c7c13f5132774a1cf1b41d8
+SHA1 (patch-at) = 0b3356cde820c45a7f2e3381b44b84459ff7e719
+SHA1 (patch-au) = 0b42703ed5d2aa1984e3ea37c0e65ac5b0a78a57
+SHA1 (patch-av) = 7aa7e486dbc8cdf030af84f96f58357154bdc41b
+SHA1 (patch-aw) = 52995929a717075e85b8950f9a7731d43744dd19
+SHA1 (patch-ax) = 47d3ecfc7e17e53fe7f6d7a1638381bf613939ca
+SHA1 (patch-ay) = 549b87f8f524f4ab5a743f17f70f5fa9b8ec309a
+SHA1 (patch-az) = 0f046bccf49c33121bf5e838df8115dfba3f5206
+SHA1 (patch-ba) = 86c300c228dcf8a60c3fae86a8118809ad9185ae
+SHA1 (patch-bb) = ba9a5645f5dbc66723e8a6b21666b4009fe31f66
+SHA1 (patch-bc) = f59e857f03ed61f7f8f0eca25ab510d21acc8765
+SHA1 (patch-bd) = d9c0b19336d3363f6ce1a840b7c10f86ad45b753
+SHA1 (patch-be) = 3d0ae68383c0e538d658dc67276d930468d614b7
+SHA1 (patch-bf) = 667192bee7105820fc046502e19da0fbac2a3b8f
+SHA1 (patch-bg) = 2cad34e20f4a38a9835f241c7aac82d5b320e566
+SHA1 (patch-bh) = 4586113e27241df73c1acf834da54a41bc865f3d
+SHA1 (patch-bi) = 47412cc55ba2d606df33695c14a5b19320e09d62
+SHA1 (patch-bj) = 443893dcd5a8cec17113006be1370d83bf1701a9
+SHA1 (patch-bk) = f1c742b8ce22b4d6b70e480fb18b15fb08fb4c0d
+SHA1 (patch-bl) = af5354cf321016ce71a553ad4c654934085290a7
+SHA1 (patch-bm) = cf1c3728221b710c8d2b59c113688da92834554c
+SHA1 (patch-bn) = a9b834397937f3f019df6a910a8605ae7524c5d3
+SHA1 (patch-bo) = 05c76ccee71e5ef1dc5fe605f1482a05c0764031
+SHA1 (patch-bp) = 7ed6e52d0da61a373a4c8b112ad68fb7e2ce744e
+SHA1 (patch-bq) = 66eaab4619f41f40e97b5a314516a8432488c3b2
+SHA1 (patch-br) = da014af91c9aec10f0316e5b0356399cec095c07
+SHA1 (patch-bs) = 575dc1b1f0129dfe259e41c3cfa8f67cfaf53cd9
+SHA1 (patch-bt) = 3ea76a3f45fa1f829456b5ef4538a8c3bafa29de
+SHA1 (patch-bu) = a8994b51e0f38f764b8fae680b7b7c216af1220e
+SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
+SHA1 (patch-bw) = 6c8137077208222b8bc7d2bf82263f97b9c3174f
+SHA1 (patch-bx) = d27f3d8751b6eb1c1df5407da321f73d629d316b
+SHA1 (patch-by) = 0baf2c89ebb8117b989a8e5e2f96df4e9e2c0d6c
+SHA1 (patch-bz) = 68063c8a1e11844ec917d56b5e614ed8a357a212
+SHA1 (patch-ca) = df5ea5f20ffc2c26f8ba2cd5d3a341fbd0ec6f54
+SHA1 (patch-cb) = 2f9dde23fbe375be32d91b6df60c81427c7bf3d0
+SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97
+SHA1 (patch-cd) = 63f9d58211888d9383e0b2b3d62c0d08ff94d78b
+SHA1 (patch-ce) = 3b692fb3814ceca41c3ba192398468166b46d64b
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ad
--- a/mail/elm-me/patches/patch-ad      Tue Jan 24 18:56:23 2006 +0000
+++ b/mail/elm-me/patches/patch-ad      Tue Jan 24 19:01:45 2006 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
+$NetBSD: patch-ad,v 1.2 2006/01/24 19:01:45 joerg Exp $
 
 --- src/pgp.c.orig     Tue Jun 19 19:03:47 2001
 +++ src/pgp.c  Wed Jul 18 19:22:05 2001
-@@ -161,7 +161,7 @@
+@@ -19,8 +19,6 @@ DEBUG_VAR(Debug,__FILE__,"pgp");
+ #include <errno.h>
+ #include "menu.h"
+ 
+-extern int errno;
+-
+ /* the column in which the userid begins in the 'pgp -kv' command output */
+ #define PGP2_USERID_OFFSET 30
+ #define PGP5_USERID_OFFSET 5
+@@ -161,7 +159,7 @@ static int GetPGPKey (name, target, targ
                char *path;
            case pgp2:  
                
@@ -11,7 +20,7 @@
                      pgp2_path,"+verbose=0", "+language=en", "-kv", c, 
                      (char *)0);
                tmp = errno;
-@@ -169,14 +169,14 @@
+@@ -169,14 +167,14 @@ static int GetPGPKey (name, target, targ
                break;
            case pgp5:
                path = elm_message(FRM("%s/pgpk"),pgp5_dir);
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-af      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/can_access.c.orig      2006-01-20 03:26:03.000000000 +0000
++++ lib/can_access.c
+@@ -29,8 +29,6 @@ static char rcsid[] = "@(#)$Id: can_acce
+ void _exit();
+ #endif
+ 
+-extern int errno;             /* system error number */
+-
+ int can_access(file, mode)
+      char *file; 
+      int   mode;
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-ag      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/can_open.c.orig        2006-01-24 15:09:07.000000000 +0000
++++ lib/can_open.c
+@@ -24,8 +24,6 @@ DEBUG_VAR(Debug,__FILE__,"file");
+ void _exit();
+ #endif
+ 
+-extern int errno;             /* system error number */
+-
+ int can_open(file, mode)
+      CONST char *file, *mode;
+ {
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-ah      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/cs_binary.c.orig       2006-01-24 15:20:56.000000000 +0000
++++ lib/cs_binary.c
+@@ -27,7 +27,6 @@ static char rcsid[] = "@(#)$Id: cs_binar
+ DEBUG_VAR(Debug,__FILE__,"charset");
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static unsigned char *s2us P_((char *str));
+ static unsigned char *s2us(str) 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-ai      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/imap.c.orig    2006-01-24 15:23:12.000000000 +0000
++++ lib/imap.c
+@@ -44,8 +44,6 @@ static CONST unsigned char *cs2us(str) 
+ 
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ static void  cache_zero_imap P_((struct connection_cache *c));
+ static void  cache_free_imap P_((struct connection_cache *c));
+ static int  cache_open_imap P_((struct connection_cache *c));
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-aj      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/localmbx.c.orig        2006-01-24 15:24:32.000000000 +0000
++++ lib/localmbx.c
+@@ -52,7 +52,6 @@ static char *us2s(str) 
+ #endif
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static int GrabRead_the_file P_((int flock_fd));
+ 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-ak      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/mbox.c.orig    2006-01-24 15:25:06.000000000 +0000
++++ lib/mbox.c
+@@ -23,7 +23,6 @@ static char rcsid[] = "@(#)$Id: mbox.c,v
+ DEBUG_VAR(Debug,__FILE__,"mbox");
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static unsigned char *s2us P_((char *str));
+ static unsigned char *s2us(str) 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-al      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/pop.c.orig     2006-01-24 15:29:13.000000000 +0000
++++ lib/pop.c
+@@ -22,7 +22,6 @@ extern int h_errno;
+ #endif
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ #define POP_TIMEOUT  25
+ 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-am      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/remote_mbx.c.orig      2006-01-24 15:29:50.000000000 +0000
++++ lib/remote_mbx.c
+@@ -171,7 +171,6 @@ extern int h_errno;
+ #endif
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ void zero_remote_account(ra)
+      struct remote_account *ra;
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-an      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/savefolder.c.orig      2006-01-24 15:32:41.000000000 +0000
++++ lib/savefolder.c
+@@ -45,7 +45,6 @@ static int change_type P_((struct folder
+ /* Dummy browser */
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static  void browser_zero_dummy P_((struct folder_browser *dir));
+ static  void browser_zero_dummy(dir) 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-ao      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/sb_file.c.orig 2006-01-24 15:55:42.000000000 +0000
++++ lib/sb_file.c
+@@ -11,7 +11,6 @@ static char rcsid[] = "@(#)$Id: sb_file.
+ #include "sb_imp.h"
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ DEBUG_VAR(Debug,__FILE__,"charset");
+ 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-ap      Tue Jan 24 19:01:45 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/schedule.c.orig        2006-01-24 15:57:40.000000000 +0000
++++ lib/schedule.c
+@@ -11,7 +11,6 @@ static char rcsid[] = "@(#)$Id: schedule
+ DEBUG_VAR(Debug,__FILE__,"net");
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ VOLATILE int wait_can_signal = 0;
+ 
diff -r 8f02c656d1c3 -r 7fc3690e6352 mail/elm-me/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm-me/patches/patch-aq      Tue Jan 24 19:01:45 2006 +0000