Fix errno in library files. Never generate extern errno directly.

Bump revision.

16 files changed, 192 insertions, 5 deletions

diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile
index 89d129c2d9e..dae9c52f898 100644
--- a/devel/mkcmd/Makefile
+++ b/devel/mkcmd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/11/02 20:11:03 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/25 15:19:16 joerg Exp $
 #
 
 DISTNAME=		mkcmd-8.14
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://archive.progeny.com/pundits/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/mkcmd/distinfo b/devel/mkcmd/distinfo
index 6d1656ac0c9..ab9276e395d 100644
--- a/devel/mkcmd/distinfo
+++ b/devel/mkcmd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/01/15 17:50:53 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/01/25 15:19:16 joerg Exp $
 
 SHA1 (mkcmd-8.14.tgz) = 33342afc845db84a040f116202b880d37b9f626f
 RMD160 (mkcmd-8.14.tgz) = e7e17759c936c35a810d814cf3c442a2fc5271a2
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = ff30b9b4818fcd105d433e0b2c943d27d698f18c
 SHA1 (patch-ac) = 6ee5e497e09157fbcf4d158966af8ee86e768bcb
 SHA1 (patch-ad) = cf3acdaf22930d577f13d28f2627515d78b8075b
 SHA1 (patch-ae) = 8610cbecca38033386bb2427647f18c80120591e
-SHA1 (patch-af) = 03f13f98dc52c467c8ae60dddcbcf7d9818adf33
+SHA1 (patch-af) = 7ed867fbf9b8397ba56198a919d39700bc19b16c
 SHA1 (patch-ag) = 99e4ede7f0784bd343e181754de0608d65023b9f
 SHA1 (patch-ah) = 1738f8042db33232455d8cea0b033883312800df
 SHA1 (patch-ai) = 0ce87f6636e545c5a27c3a165de32b7b39bbd664
@@ -16,3 +16,16 @@ SHA1 (patch-aj) = 1c0a9f177a8735f02cdec9f08f7311b03152c9f3
 SHA1 (patch-ak) = ed44815d12931845ab675ded6b32bda159d57af6
 SHA1 (patch-al) = 27a7b986803e7392852eaa59ba7e28cf84df3be0
 SHA1 (patch-am) = 87f3debc0efd4393d8ad342f39a5e0b981147cad
+SHA1 (patch-ao) = 8b19aba8505123661b86d4001584811785b4d7cd
+SHA1 (patch-ap) = cb9d80ff16d16253e4a455c28bf800102fc15116
+SHA1 (patch-aq) = 1153b3ed3a127fb67f169d251b2375962a3f6afd
+SHA1 (patch-ar) = 8bc13f851987155e46a3621145ac7e63df4c7a57
+SHA1 (patch-as) = 7e75feec21e62db4ae5c3a2f5ed5348682743be5
+SHA1 (patch-at) = e4f5a2000d046731a4cbc49adf8baf48c14fcdff
+SHA1 (patch-au) = b25b13d4808cf4a117a10c7fd94d6ca0217ff273
+SHA1 (patch-av) = 7472cf94fb70dffb04d81b2f8a0db52f99d43e15
+SHA1 (patch-aw) = 2161ec4980b54ba8920dfc96230c4a5ff369510e
+SHA1 (patch-ax) = 68c2cbf9164b5b444bf5dcf263df995a16c2e58c
+SHA1 (patch-ay) = ecf2852b9d6cd74f15f94f824bfc283225235b46
+SHA1 (patch-az) = 415373584b240217072b0969c7c817ba1b481541
+SHA1 (patch-ba) = 0205a467bd01903c8b03f6f6304ebd770d0a3bbb
diff --git a/devel/mkcmd/patches/patch-af b/devel/mkcmd/patches/patch-af
index 4f56f60f404..f54f5a5af9f 100644
--- a/devel/mkcmd/patches/patch-af
+++ b/devel/mkcmd/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2004/11/10 16:43:50 epg Exp $
+$NetBSD: patch-af,v 1.2 2006/01/25 15:19:17 joerg Exp $
 
 --- bin/mkcmd/mkcmd.c.orig	2000-07-30 17:56:23.000000000 -0400
 +++ bin/mkcmd/mkcmd.c
@@ -17,3 +17,18 @@ $NetBSD: patch-af,v 1.1 2004/11/10 16:43:50 epg Exp $
  LIST
  	LIComm,			/* header comments			*/
  	aLIExits[11],		/* user hooks jusr before exit		*/
+@@ -119,14 +111,6 @@ LIST *pLITop;
+ 		Emit(fp, "#include %a\n", nilOR, *ppcComm, 0);
+ 	}
+ 
+-#if HAVE_SIMPLE_ERRNO
+-	if (fWeGuess) {
+-		if (IS_USED(CvtType('F')) || IS_USED(CvtType('D'))) {
+-			Emit(fp, "extern int errno;\n", nilOR, nil, 0);
+-		}
+-	}
+-#endif
+-
+ #if !HAVE_STRERROR
+ 	if (fWeGuess) {
+ 		Emit(fp, "extern char *sys_errlist[];#define strerror(Me) (sys_errlist[Me])\n", nilOR, nil, 0);
diff --git a/devel/mkcmd/patches/patch-ao b/devel/mkcmd/patches/patch-ao
new file mode 100644
index 00000000000..1802651fe38
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ao
@@ -0,0 +1,12 @@
+$NetBSD: patch-ao,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/cmd_source.mc.orig	2006-01-25 15:08:34.000000000 +0000
++++ lib/mkcmd/cmd_source.mc
+@@ -12,7 +12,6 @@ CMDSET *pCS;
+ {
+ 	register FILE *fpCmds;
+ 	register int iRet;
+-	extern int errno;
+ 
+ 	iRet = 0;
+ 	while (0 != --argc) {
diff --git a/devel/mkcmd/patches/patch-ap b/devel/mkcmd/patches/patch-ap
new file mode 100644
index 00000000000..f80827d8250
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/group.mc.orig	2006-01-25 15:00:29.000000000 +0000
++++ lib/mkcmd/group.mc
+@@ -13,7 +13,6 @@ char *pcName, *pcParam;
+ {
+ 	register struct group *pGEFound;
+ 	register char *pcScan;
+-	extern int errno;
+ 
+ 	for (pcScan = pcName; '\000' != *pcScan; ++pcScan) {
+ 		if (!isdigit(*pcScan)) {
diff --git a/devel/mkcmd/patches/patch-aq b/devel/mkcmd/patches/patch-aq
new file mode 100644
index 00000000000..0d18b23d4ec
--- /dev/null
+++ b/devel/mkcmd/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/host.mc.orig	2006-01-25 15:00:46.000000000 +0000
++++ lib/mkcmd/host.mc
+@@ -19,7 +19,6 @@ char *pcName, *pcParam;
+ 	register int iC;
+ 	auto struct in_addr IATemp;
+ 	auto int iDec;
+-	extern int errno;
+ 
+ 	for (pcScan = pcName; '\000' != *pcScan; ++pcScan) {
+ 		if ('.' != *pcScan && !isdigit(*pcScan)) {
diff --git a/devel/mkcmd/patches/patch-ar b/devel/mkcmd/patches/patch-ar
new file mode 100644
index 00000000000..8083e95fdc3
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ar
@@ -0,0 +1,12 @@
+$NetBSD: patch-ar,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/login.mc.orig	2006-01-25 15:01:16.000000000 +0000
++++ lib/mkcmd/login.mc
+@@ -13,7 +13,6 @@ char *pcName, *pcParam;
+ {
+ 	register struct passwd *pPWFound;
+ 	register char *pcScan;
+-	extern int errno;
+ 
+ 	for (pcScan = pcName; '\000' != *pcScan; ++pcScan) {
+ 		if (!isdigit(*pcScan)) {
diff --git a/devel/mkcmd/patches/patch-as b/devel/mkcmd/patches/patch-as
new file mode 100644
index 00000000000..31e0a0cb872
--- /dev/null
+++ b/devel/mkcmd/patches/patch-as
@@ -0,0 +1,12 @@
+$NetBSD: patch-as,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/protocol.mc.orig	2006-01-25 15:01:29.000000000 +0000
++++ lib/mkcmd/protocol.mc
+@@ -16,7 +16,6 @@ char *pcName, *pcParam;
+ 	register char *pcStack;
+ 	register int iFudge = sizeof(long int) - 1;
+ 	register void *pvMem;
+-	extern int errno;
+ 
+ 	for (pcStack = pcName; '\000' != *pcStack; ++pcStack) {
+ 		if (!isdigit(*pcStack))
diff --git a/devel/mkcmd/patches/patch-at b/devel/mkcmd/patches/patch-at
new file mode 100644
index 00000000000..a4ed70e3d43
--- /dev/null
+++ b/devel/mkcmd/patches/patch-at
@@ -0,0 +1,12 @@
+$NetBSD: patch-at,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/service.mc.orig	2006-01-25 15:01:49.000000000 +0000
++++ lib/mkcmd/service.mc
+@@ -19,7 +19,6 @@ char *pcName, *pcParam;
+ 	register char *pcScan, *pcProto, *pcTemp;
+ 	register int iFudge = sizeof(long int) - 1;
+ %	static char acDefProto[] = "%qK<service_cvt>2v"%;
+-	extern int errno;
+ 
+ 	pcTemp = calloc((strlen(pcName)|iFudge)+1, sizeof(char));
+ 	(void)strcpy(pcTemp, pcName);
diff --git a/devel/mkcmd/patches/patch-au b/devel/mkcmd/patches/patch-au
new file mode 100644
index 00000000000..32ec77f4377
--- /dev/null
+++ b/devel/mkcmd/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/std_lex.mc.orig	2006-01-25 15:02:04.000000000 +0000
++++ lib/mkcmd/std_lex.mc
+@@ -11,7 +11,6 @@ yywrap()
+ {
+ 	register char *pcGot;
+ 	extern FILE *yyin;
+-	extern int errno;
+ 
+ 	if (stdin == yyin) {
+ 		clearerr(stdin);
diff --git a/devel/mkcmd/patches/patch-av b/devel/mkcmd/patches/patch-av
new file mode 100644
index 00000000000..08e3ef6d8ae
--- /dev/null
+++ b/devel/mkcmd/patches/patch-av
@@ -0,0 +1,10 @@
+$NetBSD: patch-av,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/util_errno.m.orig	2006-01-25 15:02:22.000000000 +0000
++++ lib/mkcmd/util_errno.m
+@@ -5,5 +5,4 @@
+ from '<errno.h>'
+ 
+ %i
+-extern int errno;
+ %%
diff --git a/devel/mkcmd/patches/patch-aw b/devel/mkcmd/patches/patch-aw
new file mode 100644
index 00000000000..fb09609c7df
--- /dev/null
+++ b/devel/mkcmd/patches/patch-aw
@@ -0,0 +1,17 @@
+$NetBSD: patch-aw,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/util_fts.mc.orig	2006-01-25 15:02:43.000000000 +0000
++++ lib/mkcmd/util_fts.mc
+@@ -3,4 +3,6 @@
+  */
+ 
++#include <errno.h>
++
+ /* example fts_walk routine for the fts interface			(ksb)
+  * by default scan key "fts_path" (if no nodes were presented)
+@@ -13,5 +15,4 @@ int fts_opts;
+ 	register FTS *u_ftsp;
+ 	register FTSENT *p;
+-	extern int errno;
+ 
+ 	if ((char **)0 == argv || (char *)0 == *argv) {
diff --git a/devel/mkcmd/patches/patch-ax b/devel/mkcmd/patches/patch-ax
new file mode 100644
index 00000000000..585a1dbdd28
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ax
@@ -0,0 +1,12 @@
+$NetBSD: patch-ax,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/util_savegrent.mc.orig	2006-01-25 15:03:11.000000000 +0000
++++ lib/mkcmd/util_savegrent.mc
+@@ -10,7 +10,6 @@ struct group *pGRFound;
+ 	register void *pvMem;
+ 	register char *pcStack;
+ 	register int iFudge = sizeof(int) - 1;
+-	extern int errno;
+ %@if group_argvs[1]
+ 	register int i;
+ 	register char *pcScan;
diff --git a/devel/mkcmd/patches/patch-ay b/devel/mkcmd/patches/patch-ay
new file mode 100644
index 00000000000..acf072179e9
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ay
@@ -0,0 +1,12 @@
+$NetBSD: patch-ay,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/util_savehostent.mc.orig	2006-01-25 15:03:27.000000000 +0000
++++ lib/mkcmd/util_savehostent.mc
+@@ -14,7 +14,6 @@ char *pcParam;
+ 	register char *pcStack;
+ 	register int iFudge = sizeof(long int) - 1;
+ 	register void *pvMem;
+-	extern int errno;
+ 
+ 	if ((struct hostent *)0 == pHESource) {
+ 		return (struct hostent *)0;
diff --git a/devel/mkcmd/patches/patch-az b/devel/mkcmd/patches/patch-az
new file mode 100644
index 00000000000..755167fddc3
--- /dev/null
+++ b/devel/mkcmd/patches/patch-az
@@ -0,0 +1,12 @@
+$NetBSD: patch-az,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/util_savepwent.mc.orig	2006-01-25 15:03:38.000000000 +0000
++++ lib/mkcmd/util_savepwent.mc
+@@ -10,7 +10,6 @@ struct passwd *pPWFound;
+ 	register void *pvMem;
+ 	register char *pcStack;
+ 	register int iFudge = sizeof(int) - 1;
+-	extern int errno;
+ 
+ 	if ((struct passwd *)0 == pPWFound) {
+ 		return (struct passwd *)0;
diff --git a/devel/mkcmd/patches/patch-ba b/devel/mkcmd/patches/patch-ba
new file mode 100644
index 00000000000..892da91bf37
--- /dev/null
+++ b/devel/mkcmd/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.1 2006/01/25 15:19:17 joerg Exp $
+
+--- lib/mkcmd/util_saveservent.mc.orig	2006-01-25 15:03:49.000000000 +0000
++++ lib/mkcmd/util_saveservent.mc
+@@ -13,7 +13,6 @@ struct servent *pSEFound;
+ 	register char *pcStack;
+ 	register int iFudge = sizeof(long int) - 1;
+ 	register void *pvMem;
+-	extern int errno;
+ 
+ 	if ((struct servent *)0 == pSEFound) {
+ 		return (struct servent *)0;