Fix errno. Honour CFLAGS.

55 files changed, 769 insertions, 6 deletions

diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index dd297effbd5..c10af48abff 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -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 @@ INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/nls
 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 --git a/mail/elm-me/distinfo b/mail/elm-me/distinfo
index b66bf63db34..d21a5df8124 100644
--- a/mail/elm-me/distinfo
+++ b/mail/elm-me/distinfo
@@ -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 @@ Size (elm-2.4ME+93.tar.gz) = 1569204 bytes
 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 --git a/mail/elm-me/patches/patch-ad b/mail/elm-me/patches/patch-ad
index 8555a7163fd..492a180f859 100644
--- a/mail/elm-me/patches/patch-ad
+++ b/mail/elm-me/patches/patch-ad
@@ -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 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
  		      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 --git a/mail/elm-me/patches/patch-af b/mail/elm-me/patches/patch-af
new file mode 100644
index 00000000000..e807f56c7da
--- /dev/null
+++ b/mail/elm-me/patches/patch-af
@@ -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 --git a/mail/elm-me/patches/patch-ag b/mail/elm-me/patches/patch-ag
new file mode 100644
index 00000000000..e7bc23a3b1d
--- /dev/null
+++ b/mail/elm-me/patches/patch-ag
@@ -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 --git a/mail/elm-me/patches/patch-ah b/mail/elm-me/patches/patch-ah
new file mode 100644
index 00000000000..1cf8d20279a
--- /dev/null
+++ b/mail/elm-me/patches/patch-ah
@@ -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 --git a/mail/elm-me/patches/patch-ai b/mail/elm-me/patches/patch-ai
new file mode 100644
index 00000000000..cf94b603d23
--- /dev/null
+++ b/mail/elm-me/patches/patch-ai
@@ -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 --git a/mail/elm-me/patches/patch-aj b/mail/elm-me/patches/patch-aj
new file mode 100644
index 00000000000..ffa8f748a8a
--- /dev/null
+++ b/mail/elm-me/patches/patch-aj
@@ -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 --git a/mail/elm-me/patches/patch-ak b/mail/elm-me/patches/patch-ak
new file mode 100644
index 00000000000..563058213a3
--- /dev/null
+++ b/mail/elm-me/patches/patch-ak
@@ -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 --git a/mail/elm-me/patches/patch-al b/mail/elm-me/patches/patch-al
new file mode 100644
index 00000000000..006d873cc73
--- /dev/null
+++ b/mail/elm-me/patches/patch-al
@@ -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 --git a/mail/elm-me/patches/patch-am b/mail/elm-me/patches/patch-am
new file mode 100644
index 00000000000..7412f221e2d
--- /dev/null
+++ b/mail/elm-me/patches/patch-am
@@ -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 --git a/mail/elm-me/patches/patch-an b/mail/elm-me/patches/patch-an
new file mode 100644
index 00000000000..bea2f2125ec
--- /dev/null
+++ b/mail/elm-me/patches/patch-an
@@ -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 --git a/mail/elm-me/patches/patch-ao b/mail/elm-me/patches/patch-ao
new file mode 100644
index 00000000000..529af6c4755
--- /dev/null
+++ b/mail/elm-me/patches/patch-ao
@@ -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 --git a/mail/elm-me/patches/patch-ap b/mail/elm-me/patches/patch-ap
new file mode 100644
index 00000000000..6ebc20971ab
--- /dev/null
+++ b/mail/elm-me/patches/patch-ap
@@ -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 --git a/mail/elm-me/patches/patch-aq b/mail/elm-me/patches/patch-aq
new file mode 100644
index 00000000000..363c6dc1518
--- /dev/null
+++ b/mail/elm-me/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/service_list.c.orig	2006-01-24 15:58:10.000000000 +0000
++++ lib/service_list.c
+@@ -23,7 +23,6 @@ extern int h_errno;
+ #endif
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static int valid_option_type P_((struct SE_option_type *t));
+ static int valid_option_type(t)
diff --git a/mail/elm-me/patches/patch-ar b/mail/elm-me/patches/patch-ar
new file mode 100644
index 00000000000..ed625e640a2
--- /dev/null
+++ b/mail/elm-me/patches/patch-ar
@@ -0,0 +1,12 @@
+$NetBSD: patch-ar,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/streamsched.c.orig	2006-01-24 15:58:37.000000000 +0000
++++ lib/streamsched.c
+@@ -15,7 +15,6 @@ static char rcsid[] = "@(#)$Id: streamsc
+ DEBUG_VAR(Debug,__FILE__,"net");
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ #ifdef POLL_METHOD
+ 
diff --git a/mail/elm-me/patches/patch-as b/mail/elm-me/patches/patch-as
new file mode 100644
index 00000000000..ab4377aefe7
--- /dev/null
+++ b/mail/elm-me/patches/patch-as
@@ -0,0 +1,12 @@
+$NetBSD: patch-as,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/stringbuffer.c.orig	2006-01-24 15:59:05.000000000 +0000
++++ lib/stringbuffer.c
+@@ -13,7 +13,6 @@ static char rcsid[] = "@(#)$Id: stringbu
+ DEBUG_VAR(Debug,__FILE__,"charset");
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static int valid_magic P_((struct sb_type *magic));
+ 
diff --git a/mail/elm-me/patches/patch-at b/mail/elm-me/patches/patch-at
new file mode 100644
index 00000000000..306aa22be65
--- /dev/null
+++ b/mail/elm-me/patches/patch-at
@@ -0,0 +1,12 @@
+$NetBSD: patch-at,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/terminal.c.orig	2006-01-24 15:59:30.000000000 +0000
++++ lib/terminal.c
+@@ -13,7 +13,6 @@ static char rcsid[] = "@(#)$Id: terminal
+ DEBUG_VAR(Debug,__FILE__,"charset");
+ 
+ #include <errno.h>
+-extern int errno;
+ 
+ static enum terminal_map_keyword get_keyword P_((const char *word));
+ 
diff --git a/mail/elm-me/patches/patch-au b/mail/elm-me/patches/patch-au
new file mode 100644
index 00000000000..fa2b7a5b9b6
--- /dev/null
+++ b/mail/elm-me/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- melib/pgp_decode.c.orig	2006-01-24 17:07:43.000000000 +0000
++++ melib/pgp_decode.c
+@@ -19,8 +19,6 @@ DEBUG_VAR(Debug,__FILE__,"pgp");
+ #include <sys/time.h>
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ extern int pgp_keeppassfor; /* 5 minutes */
+ char pgp_passphrase[PGP_NUM][STRING];
+ int pgp_expires;
diff --git a/mail/elm-me/patches/patch-av b/mail/elm-me/patches/patch-av
new file mode 100644
index 00000000000..fd44919fed9
--- /dev/null
+++ b/mail/elm-me/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/alias.c.orig	2006-01-24 17:08:31.000000000 +0000
++++ src/alias.c
+@@ -67,8 +67,6 @@ static int get_one_alias P_((DBZ *db, in
+ 
+ extern int  is_system;		/* system file updating?     */
+ 
+-extern int errno;
+-
+ int current_mail_message;
+ int num_duplicates;
+ DBZ *system_hash = NULL, *user_hash = NULL;
diff --git a/mail/elm-me/patches/patch-aw b/mail/elm-me/patches/patch-aw
new file mode 100644
index 00000000000..3f8e17b3978
--- /dev/null
+++ b/mail/elm-me/patches/patch-aw
@@ -0,0 +1,12 @@
+$NetBSD: patch-aw,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/attach_menu.c.orig	2006-01-24 17:09:31.000000000 +0000
++++ src/attach_menu.c
+@@ -17,7 +17,6 @@ DEBUG_VAR(Debug,__FILE__,"mime");
+ 
+ #include <sys/errno.h>
+ 
+-extern int errno;
+ extern int elm_COLUMNS;
+ 
+ static unsigned char *s2us P_((char *str));
diff --git a/mail/elm-me/patches/patch-ax b/mail/elm-me/patches/patch-ax
new file mode 100644
index 00000000000..f145951e5f7
--- /dev/null
+++ b/mail/elm-me/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/a_quit.c.orig	2006-01-24 17:10:04.000000000 +0000
++++ src/a_quit.c
+@@ -23,8 +23,6 @@ static char rcsid[] = "@(#)$Id: a_quit.c
+ DEBUG_VAR(Debug,__FILE__,"alias");
+ 
+ 
+-extern int errno;		/* system error number on failure */
+-
+ int delete_aliases(newaliases, prompt)
+      int newaliases, prompt;
+ {
diff --git a/mail/elm-me/patches/patch-ay b/mail/elm-me/patches/patch-ay
new file mode 100644
index 00000000000..aab188d4875
--- /dev/null
+++ b/mail/elm-me/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/calendar.c.orig	2006-01-24 17:10:37.000000000 +0000
++++ src/calendar.c
+@@ -34,8 +34,6 @@ DEBUG_VAR(Debug,__FILE__,"misc");
+ #include <errno.h>
+ #include <s_error.h>
+ 
+-extern int errno;
+-
+ char *error_description();
+ 
+ static int extract_info P_((FILE *save_to_fd));
diff --git a/mail/elm-me/patches/patch-az b/mail/elm-me/patches/patch-az
new file mode 100644
index 00000000000..52302b9b31d
--- /dev/null
+++ b/mail/elm-me/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/edit.c.orig	2006-01-24 17:17:56.000000000 +0000
++++ src/edit.c
+@@ -21,8 +21,6 @@ static char rcsid[] = "@(#)$Id: edit.c,v
+ #include <errno.h>
+ #include "me.h"
+ 
+-extern int errno;
+-
+ char   *error_description();
+ long   bytes();
+ 
diff --git a/mail/elm-me/patches/patch-ba b/mail/elm-me/patches/patch-ba
new file mode 100644
index 00000000000..fb046e21da6
--- /dev/null
+++ b/mail/elm-me/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/editmsg.c.orig	2006-01-24 17:18:32.000000000 +0000
++++ src/editmsg.c
+@@ -28,7 +28,6 @@ long  fsize();
+ /* The built-in editor is not re-entrant! */
+ static int	builtin_editor_active = FALSE;
+ static char *simple_continue = NULL;
+-extern int errno;
+ 
+ int      interrupts_while_editing;	/* keep track 'o dis stuff         */
+ JMP_BUF  edit_location;			/* for getting back from interrupt */
diff --git a/mail/elm-me/patches/patch-bb b/mail/elm-me/patches/patch-bb
new file mode 100644
index 00000000000..e6c49892cf3
--- /dev/null
+++ b/mail/elm-me/patches/patch-bb
@@ -0,0 +1,20 @@
+$NetBSD: patch-bb,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/elm.c.orig	2006-01-24 17:18:55.000000000 +0000
++++ src/elm.c
+@@ -15,6 +15,7 @@ static char rcsid[] = "@(#)$Id: elm.c,v 
+ /* Main program of the ELM mail system! 
+ */
+ 
++#include <errno.h>
+ #include "patchlevel.h"
+ #include "elm.h"
+ #include "s_elm.h"
+@@ -90,7 +91,6 @@ int main(argc, argv)
+ 	char **to_whom = NULL;
+ 	int bytes;
+ 	int  i,j;      		/** Random counting variables (etc)          **/
+-	extern int errno;
+ 
+ 	set_panic_prepare(elm_panic_prepare);
+ 	set_panic_exit(elm_panic_exit);
diff --git a/mail/elm-me/patches/patch-bc b/mail/elm-me/patches/patch-bc
new file mode 100644
index 00000000000..957299636ce
--- /dev/null
+++ b/mail/elm-me/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/file.c.orig	2006-01-24 17:19:36.000000000 +0000
++++ src/file.c
+@@ -28,8 +28,6 @@ static char rcsid[] = "@(#)$Id: file.c,v
+ 
+ DEBUG_VAR(Debug,__FILE__,"mbox");
+ 
+-extern int errno;
+-
+ static int save_message P_((int number, 
+ 			    struct folder_browser * XXX,
+ 			    struct string         * name,
diff --git a/mail/elm-me/patches/patch-bd b/mail/elm-me/patches/patch-bd
new file mode 100644
index 00000000000..e4baef96ed4
--- /dev/null
+++ b/mail/elm-me/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/file_util.c.orig	2006-01-24 17:20:01.000000000 +0000
++++ src/file_util.c
+@@ -22,8 +22,6 @@ static char rcsid[] = "@(#)$Id: file_uti
+ 
+ DEBUG_VAR(Debug,__FILE__,"mbox");
+ 
+-extern int errno;		/* system error number */
+-
+ char *error_description(), *getlogin();
+ long  fsize();
+ 
diff --git a/mail/elm-me/patches/patch-be b/mail/elm-me/patches/patch-be
new file mode 100644
index 00000000000..fbf19e1e2cc
--- /dev/null
+++ b/mail/elm-me/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/fileio.c.orig	2006-01-24 17:22:00.000000000 +0000
++++ src/fileio.c
+@@ -25,8 +25,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
+ DEBUG_VAR(PgpDebug,__FILE__,"pgp");
+ DEBUG_VAR(MimeDebug,__FILE__,"mime");
+ 
+-extern int errno;
+-
+ char *error_description();
+ 
+ #ifdef USE_PGP
diff --git a/mail/elm-me/patches/patch-bf b/mail/elm-me/patches/patch-bf
new file mode 100644
index 00000000000..7b5c18a3e0e
--- /dev/null
+++ b/mail/elm-me/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/forms.c.orig	2006-01-24 17:26:00.000000000 +0000
++++ src/forms.c
+@@ -44,8 +44,6 @@ static char rcsid[] = "@(#)$Id: forms.c,
+ 
+ DEBUG_VAR(Debug,__FILE__,"misc");
+ 
+-extern int errno;
+-
+ char *error_description();
+ 
+ static void prompt_for_sized_entry P_((char *prompt, char *buffer,
diff --git a/mail/elm-me/patches/patch-bg b/mail/elm-me/patches/patch-bg
new file mode 100644
index 00000000000..a2af8c7db25
--- /dev/null
+++ b/mail/elm-me/patches/patch-bg
@@ -0,0 +1,12 @@
+$NetBSD: patch-bg,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/in_utils.c.orig	2006-01-24 17:27:11.000000000 +0000
++++ src/in_utils.c
+@@ -35,7 +35,6 @@ static char *us2s(str) 
+     return (char *)str;
+ }
+ 
+-extern int errno;		/* system error number */
+ extern int tabspacing;
+ 
+ unsigned alarm();
diff --git a/mail/elm-me/patches/patch-bh b/mail/elm-me/patches/patch-bh
new file mode 100644
index 00000000000..40e28f473df
--- /dev/null
+++ b/mail/elm-me/patches/patch-bh
@@ -0,0 +1,12 @@
+$NetBSD: patch-bh,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/init.c.orig	2006-01-24 17:29:29.000000000 +0000
++++ src/init.c
+@@ -62,7 +62,6 @@ static int tcgetattr P_((int,term_buff *
+ 
+ #include <errno.h>
+ 
+-extern int errno;		/* system error number on failure */
+ extern char version_buff[];
+ 
+ char *error_description();
diff --git a/mail/elm-me/patches/patch-bi b/mail/elm-me/patches/patch-bi
new file mode 100644
index 00000000000..a702484bd60
--- /dev/null
+++ b/mail/elm-me/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/leavembox.c.orig	2006-01-24 17:29:55.000000000 +0000
++++ src/leavembox.c
+@@ -34,8 +34,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
+ #endif
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ char *error_description();
+ 
+ static void block_signals P_((void));
diff --git a/mail/elm-me/patches/patch-bj b/mail/elm-me/patches/patch-bj
new file mode 100644
index 00000000000..c9165d5366c
--- /dev/null
+++ b/mail/elm-me/patches/patch-bj
@@ -0,0 +1,13 @@
+$NetBSD: patch-bj,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/lock.c.orig	2006-01-24 17:30:18.000000000 +0000
++++ src/lock.c
+@@ -27,8 +27,6 @@ static char rcsid[] = "@(#)$Id: lock.c,v
+ #endif
+ #include <errno.h>
+ 
+-extern int errno;
+-
+ char *error_description();
+ 
+ extern char *mk_lockname();
diff --git a/mail/elm-me/patches/patch-bk b/mail/elm-me/patches/patch-bk
new file mode 100644
index 00000000000..ca592a7e2ab
--- /dev/null
+++ b/mail/elm-me/patches/patch-bk
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/mailmsg2.c.orig	2006-01-24 17:30:38.000000000 +0000
++++ src/mailmsg2.c
+@@ -38,7 +38,6 @@ static unsigned char *s2us(str) 
+ }
+ 
+ 
+-extern int errno;
+ extern char version_buff[];
+ 
+ char *error_description();
diff --git a/mail/elm-me/patches/patch-bl b/mail/elm-me/patches/patch-bl
new file mode 100644
index 00000000000..fd4bd93efc1
--- /dev/null
+++ b/mail/elm-me/patches/patch-bl
@@ -0,0 +1,13 @@
+$NetBSD: patch-bl,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/metapager.c.orig	2006-01-24 17:31:10.000000000 +0000
++++ src/metapager.c
+@@ -15,8 +15,6 @@ static char rcsid[] = "@(#)$Id: metapage
+ 
+ DEBUG_VAR(Debug,__FILE__,"ui");
+ 
+-extern int errno;
+-
+ static unsigned char *s2us P_((char *str));
+ static unsigned char *s2us(str) 
+      char *str;
diff --git a/mail/elm-me/patches/patch-bm b/mail/elm-me/patches/patch-bm
new file mode 100644
index 00000000000..8113cbea62d
--- /dev/null
+++ b/mail/elm-me/patches/patch-bm
@@ -0,0 +1,12 @@
+$NetBSD: patch-bm,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/newmbox.c.orig	2006-01-24 17:31:39.000000000 +0000
++++ src/newmbox.c
+@@ -21,7 +21,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
+ #include <errno.h>
+ 
+ #include "me.h"   /* for defination of null_decode and text_decode */
+-extern int errno;
+ 
+ char *error_description();
+ long bytes();
diff --git a/mail/elm-me/patches/patch-bn b/mail/elm-me/patches/patch-bn
new file mode 100644
index 00000000000..f3100713da8
--- /dev/null
+++ b/mail/elm-me/patches/patch-bn
@@ -0,0 +1,13 @@
+$NetBSD: patch-bn,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/pattern.c.orig	2006-01-24 17:32:44.000000000 +0000
++++ src/pattern.c
+@@ -31,8 +31,6 @@ static unsigned char *s2us(str) 
+ static char pattern[SLEN] = { "" };
+ static char alt_pattern[SLEN] = { "" };
+ 
+-extern int errno;
+-
+ char *error_description(), *shift_lower();
+ static char *tag_word = NULL;
+ static char *tagged_word = NULL;
diff --git a/mail/elm-me/patches/patch-bo b/mail/elm-me/patches/patch-bo
new file mode 100644
index 00000000000..6ef1f9a16b8
--- /dev/null
+++ b/mail/elm-me/patches/patch-bo
@@ -0,0 +1,13 @@
+$NetBSD: patch-bo,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/quit.c.orig	2006-01-24 17:33:28.000000000 +0000
++++ src/quit.c
+@@ -29,8 +29,6 @@ static char *us2s(str) 
+     return (char *)str;
+ }
+ 
+-extern int errno;		/* system error number on failure */
+-
+ long bytes();
+ char *error_description();
+ 
diff --git a/mail/elm-me/patches/patch-bp b/mail/elm-me/patches/patch-bp
new file mode 100644
index 00000000000..8a9540b5711
--- /dev/null
+++ b/mail/elm-me/patches/patch-bp
@@ -0,0 +1,12 @@
+$NetBSD: patch-bp,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/read_rc.c.orig	2006-01-24 17:34:34.000000000 +0000
++++ src/read_rc.c
+@@ -96,7 +96,6 @@ OR:
+ DEBUG_VAR(Debug,__FILE__,"config");
+ 
+ extern opts_menu *find_cfg_opts();
+-extern int errno;
+ 
+ char  *error_description(), *shift_lower(), *mode_to_str();
+ 
diff --git a/mail/elm-me/patches/patch-bq b/mail/elm-me/patches/patch-bq
new file mode 100644
index 00000000000..93746576ada
--- /dev/null
+++ b/mail/elm-me/patches/patch-bq
@@ -0,0 +1,13 @@
+$NetBSD: patch-bq,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/remail.c.orig	2006-01-24 17:35:37.000000000 +0000
++++ src/remail.c
+@@ -24,8 +24,6 @@ static char rcsid[] = "@(#)$Id: remail.c
+ 
+ DEBUG_VAR(Debug,__FILE__,"mail");
+ 
+-extern int errno;
+-
+ char *error_description();
+ extern void display_to();
+ 
diff --git a/mail/elm-me/patches/patch-br b/mail/elm-me/patches/patch-br
new file mode 100644
index 00000000000..278f382c975
--- /dev/null
+++ b/mail/elm-me/patches/patch-br
@@ -0,0 +1,13 @@
+$NetBSD: patch-br,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/reply.c.orig	2006-01-24 17:36:10.000000000 +0000
++++ src/reply.c
+@@ -37,8 +37,6 @@ static char *us2s(str) 
+ 
+ char *get_token();
+ 
+-extern int errno;
+-
+ char *error_description();
+ 
+ /* Prototype */
diff --git a/mail/elm-me/patches/patch-bs b/mail/elm-me/patches/patch-bs
new file mode 100644
index 00000000000..4fa39cb5e3b
--- /dev/null
+++ b/mail/elm-me/patches/patch-bs
@@ -0,0 +1,12 @@
+$NetBSD: patch-bs,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/save_opts.c.orig	2006-01-24 17:36:31.000000000 +0000
++++ src/save_opts.c
+@@ -30,7 +30,6 @@ DEBUG_VAR(Debug,__FILE__,"config");
+ 
+ #define absolute(x)		((x) < 0? -(x) : (x))
+ 
+-extern  int errno;
+ extern char version_buff[];
+ 
+ char *error_description(), *sort_name(), *alias_sort_name(), *level_name();
diff --git a/mail/elm-me/patches/patch-bt b/mail/elm-me/patches/patch-bt
new file mode 100644
index 00000000000..2a88be78806
--- /dev/null
+++ b/mail/elm-me/patches/patch-bt
@@ -0,0 +1,13 @@
+$NetBSD: patch-bt,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/savecopy.c.orig	2006-01-24 17:36:52.000000000 +0000
++++ src/savecopy.c
+@@ -26,8 +26,6 @@ DEBUG_VAR(Debug,__FILE__,"mbox");
+ 
+ char *error_description(), *ctime();
+ 
+-extern int errno;
+-
+ static unsigned char * s2us P_((char *str));
+ static unsigned char * s2us(str)
+      char *str;
diff --git a/mail/elm-me/patches/patch-bu b/mail/elm-me/patches/patch-bu
new file mode 100644
index 00000000000..9295cc729ca
--- /dev/null
+++ b/mail/elm-me/patches/patch-bu
@@ -0,0 +1,13 @@
+$NetBSD: patch-bu,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/showmsg.c.orig	2006-01-24 17:37:17.000000000 +0000
++++ src/showmsg.c
+@@ -22,8 +22,6 @@ static char rcsid[] = "@(#)$Id: showmsg.
+ 
+ DEBUG_VAR(Debug,__FILE__,"ui");
+ 
+-extern int errno;
+-
+ int pipe_abort = FALSE; /* not used anymore, but won't compile without it */
+ 
+ static int need_meta (hdr)
diff --git a/mail/elm-me/patches/patch-bv b/mail/elm-me/patches/patch-bv
new file mode 100644
index 00000000000..4fd19c85e66
--- /dev/null
+++ b/mail/elm-me/patches/patch-bv
@@ -0,0 +1,12 @@
+$NetBSD: patch-bv,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/syscall.c.orig	2006-01-24 17:39:48.000000000 +0000
++++ src/syscall.c
+@@ -164,7 +164,6 @@ int system_call(string, options)
+ #ifdef SIGTSTP
+     register SIGHAND_TYPE (*oldstop)(), (*oldstart)();
+ #endif
+-    extern int errno;
+     
+     /* flush any pending output */
+     FlushBuffer();
diff --git a/mail/elm-me/patches/patch-bw b/mail/elm-me/patches/patch-bw
new file mode 100644
index 00000000000..89c8cca3b46
--- /dev/null
+++ b/mail/elm-me/patches/patch-bw
@@ -0,0 +1,13 @@
+$NetBSD: patch-bw,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/utils.c.orig	2006-01-24 17:40:08.000000000 +0000
++++ src/utils.c
+@@ -22,8 +22,6 @@ static char rcsid[] = "@(#)$Id: utils.c,
+ 
+ DEBUG_VAR(Debug,__FILE__,"ELM");
+ 
+-extern int errno;
+-
+ void create_new_folders()
+ {
+ 	/* this creates a new folders directory */
diff --git a/mail/elm-me/patches/patch-bx b/mail/elm-me/patches/patch-bx
new file mode 100644
index 00000000000..aeaf7bd1684
--- /dev/null
+++ b/mail/elm-me/patches/patch-bx
@@ -0,0 +1,21 @@
+$NetBSD: patch-bx,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/mime.c.orig	2006-01-24 17:41:13.000000000 +0000
++++ src/mime.c
+@@ -11,15 +11,13 @@ static char rcsid[] = "@(#)$Id: mime.c,v
+  *			Copyright (c) 1986,1987 Dave Taylor
+  *****************************************************************************/
+ 
+-
++#include <errno.h>
+ #include "headers.h"
+ #include "s_elm.h"
+ #include "me.h"
+ 
+ DEBUG_VAR(Debug,__FILE__,"mime");
+ 
+-extern int errno;
+-
+ static unsigned char *s2us P_((char *str));
+ static unsigned char *s2us(str) 
+      char *str;
diff --git a/mail/elm-me/patches/patch-by b/mail/elm-me/patches/patch-by
new file mode 100644
index 00000000000..207d8a90574
--- /dev/null
+++ b/mail/elm-me/patches/patch-by
@@ -0,0 +1,19 @@
+$NetBSD: patch-by,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/builtin++.c.orig	2006-01-24 17:40:58.000000000 +0000
++++ src/builtin++.c
+@@ -8,13 +8,13 @@ static char rcsid[] = "@(#)$Id: builtin+
+  *  Initially written by: Michael Elkins <elkins@aero.org>, 1995
+  *****************************************************************************/
+ 
++#include <errno.h>
+ #include "headers.h"
+ #include "me.h"
+ #include "s_elm.h"
+ 
+ DEBUG_VAR(Debug,__FILE__,"ui");
+ 
+-extern int errno;
+ extern int tabspacing;
+ 
+ static void builtin_help P_((void));
diff --git a/mail/elm-me/patches/patch-bz b/mail/elm-me/patches/patch-bz
new file mode 100644
index 00000000000..bc5f81a2e0b
--- /dev/null
+++ b/mail/elm-me/patches/patch-bz
@@ -0,0 +1,21 @@
+$NetBSD: patch-bz,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/posixsig.c.orig	2006-01-24 17:44:47.000000000 +0000
++++ lib/posixsig.c
+@@ -15,6 +15,7 @@ static char rcsid[] = "@(#)$Id: posixsig
+ 
+ **/
+ 
++#include <errno.h>
+ #include "headers.h"
+ 
+ DEBUG_VAR(Debug,__FILE__,"signal");
+@@ -67,8 +68,6 @@ SIGHAND_TYPE
+ }
+ #endif /* POSIX_SIGNALS */
+ 
+-extern int errno;
+-
+ #ifdef BACKGROUD_PROCESSES       /* We assume POSIX in here */
+ 
+ int my_wait (pid,statptr)
diff --git a/mail/elm-me/patches/patch-ca b/mail/elm-me/patches/patch-ca
new file mode 100644
index 00000000000..d7f8847d20d
--- /dev/null
+++ b/mail/elm-me/patches/patch-ca
@@ -0,0 +1,29 @@
+$NetBSD: patch-ca,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- utils/newmail.c.orig	2006-01-24 17:45:56.000000000 +0000
++++ utils/newmail.c
+@@ -61,6 +61,7 @@ static char rcsid[] = "@(#)$Id: newmail.
+ 
+ DEBUG_VAR(Debug,__FILE__,"util");
+ 
++#include <errno.h>
+ #ifdef PWDINSYS
+ #  include <sys/pwd.h>
+ #else
+@@ -141,8 +142,6 @@ int  interval_time,		/* how long to slee
+ int  parent_pid;		/* See if sucide should be attempt  */
+ #endif /* PIDCHECK */
+ 
+-extern int errno;
+-
+ #if defined(BSD_TYPE) && !defined(UTIMBUF)
+         time_t utime_buffer[2];         /* utime command */
+ 
+@@ -780,7 +779,6 @@ static void save_acc(name)
+     /** return the number of bytes in the specified file.  This
+ 	is to check to see if new mail has arrived....  **/
+ 
+-    extern int errno;	/* system error number! */
+     struct stat buffer;
+ 
+     if (stat(name, &buffer) != 0)
diff --git a/mail/elm-me/patches/patch-cb b/mail/elm-me/patches/patch-cb
new file mode 100644
index 00000000000..27885b921cb
--- /dev/null
+++ b/mail/elm-me/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- lib/Makefile.SH.orig	2006-01-24 18:04:57.000000000 +0000
++++ lib/Makefile.SH
+@@ -121,7 +121,7 @@ fi
+ $cat >>Makefile <<'!NO!SUBS!'
+ 
+ #	Other general variables
+-CFLAGS		=	-I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE) 
++CFLAGS		+=	-I$(INCLDIR) $(CCFLAGS)
+ INCLDIR		=	../hdrs
+ LINTFLAGS	=	-I$(INCLDIR)
+ SHELL		=	/bin/sh
diff --git a/mail/elm-me/patches/patch-cc b/mail/elm-me/patches/patch-cc
new file mode 100644
index 00000000000..390b32bd01e
--- /dev/null
+++ b/mail/elm-me/patches/patch-cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-cc,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- melib/Makefile.SH.orig	2006-01-24 18:05:16.000000000 +0000
++++ melib/Makefile.SH
+@@ -35,7 +35,7 @@ TAGS		=	ctags
+ 
+ cat >>Makefile <<'!NO!SUBS!'
+ #	Other general variables
+-CFLAGS		=	-I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE) $(DEBUG) 
++CFLAGS		+=	-I$(INCLDIR) $(CCFLAGS) $(DEBUG)
+ INCLDIR		=	../hdrs
+ LINTFLAGS	=	-I$(INCLDIR)
+ SHELL		=	/bin/sh
diff --git a/mail/elm-me/patches/patch-cd b/mail/elm-me/patches/patch-cd
new file mode 100644
index 00000000000..846b2fdfd88
--- /dev/null
+++ b/mail/elm-me/patches/patch-cd
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- src/Makefile.SH.orig	2006-01-24 18:05:41.000000000 +0000
++++ src/Makefile.SH
+@@ -83,7 +83,7 @@ cat >>Makefile <<'!NO!SUBS!'
+ 
+ #	Other general variables
+ BIN		=	../bin
+-CFLAGS		=	-I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE)
++CFLAGS		+=	-I$(INCLDIR) $(CCFLAGS)
+ INCLDIR		=	../hdrs
+ LINTFLAGS	=	-I$(INCLDIR)
+ SHELL		=	/bin/sh
diff --git a/mail/elm-me/patches/patch-ce b/mail/elm-me/patches/patch-ce
new file mode 100644
index 00000000000..70af08b7da4
--- /dev/null
+++ b/mail/elm-me/patches/patch-ce
@@ -0,0 +1,13 @@
+$NetBSD: patch-ce,v 1.1 2006/01/24 19:01:45 joerg Exp $
+
+--- utils/Makefile.SH.orig	2006-01-24 18:05:58.000000000 +0000
++++ utils/Makefile.SH
+@@ -74,7 +74,7 @@ fi
+ cat >>Makefile <<'!NO!SUBS!'
+ #	Other general variables
+ BIN		=	../bin
+-CFLAGS		=	-I$(INCLDIR) $(CCFLAGS) $(OPTIMIZE)
++CFLAGS		+=	-I$(INCLDIR) $(CCFLAGS)
+ INCLDIR		=	../hdrs
+ LINTFLAGS	=	-I$(INCLDIR)
+ SHELL		=	/bin/sh