Imagine my surprise when this failed to build on my -current shark.

    Rather than require that _every_ new port update config.guess,
    fall back to using `uname -p`-unknown-netbsd on >= 1.4,
    so we only need to patch for each new machine_arch.

9 files changed, 113 insertions, 95 deletions

diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 884b508d41f..d83ad7a68c1 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.7 2002/01/31 15:02:22 minoura Exp $
+$NetBSD: distinfo,v 1.8 2002/04/11 15:26:19 abs Exp $
 
 SHA1 (tcsh-6.11.tar.gz) = bfc2ccd2d9e04975308cdf0a50b7383e580594b6
 Size (tcsh-6.11.tar.gz) = 716863 bytes
-SHA1 (patch-aa) = d133152687288556ab9ea2b3ed8d0c7c4363d4fd
-SHA1 (patch-ac) = 5e7424ad50ddcd7e75c04d3c64c2136cc360bbdf
-SHA1 (patch-af) = 8db810383f043e65858b5925988cac5fd193c948
-SHA1 (patch-ag) = e71ea3d9dd4ea70040ab18702260d3c8890b9da9
-SHA1 (patch-aj) = e06125ea332549c4f72b08b72e4f9aae8778209a
-SHA1 (patch-ak) = fddc3b0d20f7012b8486a845c3e4a9ad5bf7b7ff
+SHA1 (patch-aa) = 51b96fff19fcfb55e6c841460c7a771c4678978f
+SHA1 (patch-ab) = beb167a266e96ac84325615d437ef8474763756d
+SHA1 (patch-ac) = 3d2ed4818c3dce640fd754ee54af1e4c51be694d
+SHA1 (patch-ad) = aa39de839e228bb1da8c38f67aa6f7019f040040
+SHA1 (patch-ae) = e7a00876ac67d836833f6c1145f2b03086f91a6f
+SHA1 (patch-af) = 7c367f927f0207baa174a7eaa76db329e19a0e6c
+SHA1 (patch-ag) = 2a2cc3052a2459b599df5b7511fa54f3a2838a92
diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa
index 1916c531586..6d1cf3a871e 100644
--- a/shells/tcsh/patches/patch-aa
+++ b/shells/tcsh/patches/patch-aa
@@ -1,29 +1,24 @@
-$NetBSD: patch-aa,v 1.6 2001/12/17 19:26:25 tron Exp $
+$NetBSD: patch-aa,v 1.7 2002/04/11 15:26:20 abs Exp $
 
---- sh.func.c.orig	Tue Mar 13 13:53:50 2001
-+++ sh.func.c	Mon Dec 17 20:23:03 2001
-@@ -2143,6 +2143,9 @@
-     else
- 	rlim.rlim_cur = limit;
+--- Makefile.in.orig	Sun Sep  2 22:16:25 2001
++++ Makefile.in
+@@ -475,17 +475,10 @@
+ install-strip: install
  
-+    if (rlim.rlim_cur > rlim.rlim_max)
-+	rlim.rlim_max = rlim.rlim_cur;
-+
-     if (setrlimit(lp->limconst, &rlim) < 0) {
- # else /* BSDLIMIT */
-     if (limit != RLIM_INFINITY && lp->limconst == RLIMIT_FSIZE)
-@@ -2153,10 +2156,10 @@
- # endif /* aiws */
-     if (ulimit(toset(lp->limconst), limit) < 0) {
- # endif /* BSDLIMIT */
--	xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit\n"), bname, lp->limname,
--		limit == RLIM_INFINITY ? CGETS(15, 2, "remove") :
--		CGETS(15, 3, "set"),
--		hard ? CGETS(14, 4, " hard") : "");
-+	xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname,
-+	    lp->limname, limit == RLIM_INFINITY ? CGETS(15, 2, "remove") :
-+	    CGETS(15, 3, "set"), hard ? CGETS(14, 4, " hard") : "",
-+	    strerror(errno));
- 	return (-1);
-     }
-     return (0);
+ install: tcsh 
+-	-mkdir -p ${DESTBIN}
+-	-mv -f ${DESTBIN}/tcsh  ${DESTBIN}/tcsh.old
+-	cp tcsh ${DESTBIN}/tcsh
+-	-strip ${DESTBIN}/tcsh
+-	chmod 555 ${DESTBIN}/tcsh
++	${BSD_INSTALL_PROGRAM} tcsh ${DESTBIN}/tcsh
+ 
+ install.man: tcsh.man
+-	-mkdir -p ${DESTMAN}
+-	-rm -f ${DESTMAN}/tcsh.${MANSECT}
+-	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
+-	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
++	${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
+ 
+ # Amiga Unix
+ #install.man: tcsh.man
diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab
new file mode 100644
index 00000000000..6234ee1fe1f
--- /dev/null
+++ b/shells/tcsh/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.7 2002/04/11 15:26:46 abs Exp $
+
+--- config.guess.orig	Sun Mar 18 19:06:27 2001
++++ config.guess
+@@ -593,8 +593,11 @@
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit 0 ;;
+-    *:NetBSD:*:*)
++    *:NetBSD:0.*:* | *:NetBSD:1.[0123]*:*)
+ 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
++	exit 0 ;;
++    *:NetBSD:*:*)
++	echo `uname -p`-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+ 	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac
index 050668b872c..8fe79df8305 100644
--- a/shells/tcsh/patches/patch-ac
+++ b/shells/tcsh/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.6 2001/09/03 01:57:21 kim Exp $
+$NetBSD: patch-ac,v 1.7 2002/04/11 15:26:20 abs Exp $
 
---- config.sub.orig	Sun Mar 18 14:06:28 2001
-+++ config.sub	Sun Sep  2 20:46:48 2001
+--- config.sub.orig	Sun Mar 18 19:06:28 2001
++++ config.sub
 @@ -172,7 +172,8 @@
  		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
  		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad
new file mode 100644
index 00000000000..eb433c15c18
--- /dev/null
+++ b/shells/tcsh/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.5 2002/04/11 15:26:47 abs Exp $
+
+--- config_f.h.orig	Sun Jun 11 03:14:10 2000
++++ config_f.h
+@@ -65,7 +65,11 @@
+  *		if you don't have <nl_types.h>, you don't want
+  *		to define this.
+  */
+-#undef NLS_CATALOGS
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++# define NLS_CATALOGS
++#else
++# undef NLS_CATALOGS
++#endif
+ 
+ /*
+  * LOGINFIRST   Source ~/.login before ~/.cshrc
diff --git a/shells/tcsh/patches/patch-aj b/shells/tcsh/patches/patch-ae
index 846e7c31c95..7dc93e8a3f0 100644
--- a/shells/tcsh/patches/patch-aj
+++ b/shells/tcsh/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2001/09/03 01:57:21 kim Exp $
+$NetBSD: patch-ae,v 1.5 2002/04/11 15:26:48 abs Exp $
 
---- nls/Makefile.orig	Mon Aug  6 19:48:45 2001
-+++ nls/Makefile	Sun Sep  2 21:48:46 2001
+--- nls/Makefile.orig	Tue Aug  7 00:48:45 2001
++++ nls/Makefile
 @@ -1,5 +1,5 @@
  
 -SUBDIRS=	C et finnish french german greek italian ja pl russian \
diff --git a/shells/tcsh/patches/patch-af b/shells/tcsh/patches/patch-af
index 0dc6d7fc565..5727a78c7b8 100644
--- a/shells/tcsh/patches/patch-af
+++ b/shells/tcsh/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.7 1998/09/13 19:12:05 kim Exp $
+$NetBSD: patch-af,v 1.8 2002/04/11 15:26:20 abs Exp $
 
---- config_f.h.orig	Fri Apr 26 21:17:30 1996
-+++ config_f.h	Wed Sep  9 00:18:23 1998
-@@ -65,7 +65,11 @@
-  *		if you don't have <nl_types.h>, you don't want
-  *		to define this.
-  */
--#undef NLS_CATALOGS
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+# define NLS_CATALOGS
-+#else
-+# undef NLS_CATALOGS
-+#endif
- 
- /*
-  * LOGINFIRST   Source ~/.login before ~/.cshrc
+--- sh.dol.c.orig	Wed Jul 25 16:48:04 2001
++++ sh.dol.c
+@@ -585,10 +585,8 @@
+ 		c = DgetC(0);
+ 	    } while (Isdigit(c));
+ 	    unDredc(c);
+-	    if (subscr < 0) {
+-		dolerror(vp->v_name);
+-		return;
+-	    }
++	    if (subscr < 0)
++		stderror(ERR_RANGE);
+ 	    if (subscr == 0) {
+ 		if (bitset) {
+ 		    dolp = dolzero ? STR1 : STR0;
diff --git a/shells/tcsh/patches/patch-ag b/shells/tcsh/patches/patch-ag
index 21326022187..8ef8ec2aaec 100644
--- a/shells/tcsh/patches/patch-ag
+++ b/shells/tcsh/patches/patch-ag
@@ -1,24 +1,29 @@
-$NetBSD: patch-ag,v 1.7 2000/11/19 21:40:43 christos Exp $
+$NetBSD: patch-ag,v 1.8 2002/04/11 15:26:21 abs Exp $
 
---- Makefile.in.orig	Tue Nov 24 13:17:08 1998
-+++ Makefile.in	Mon Aug 16 18:48:47 1999
-@@ -463,17 +463,10 @@
- install-strip: install
+--- sh.func.c.orig	Tue Mar 13 12:53:50 2001
++++ sh.func.c
+@@ -2143,6 +2143,9 @@
+     else
+ 	rlim.rlim_cur = limit;
  
- install: tcsh 
--	-mkdir -p ${DESTBIN}
--	-mv -f ${DESTBIN}/tcsh  ${DESTBIN}/tcsh.old
--	cp tcsh ${DESTBIN}/tcsh
--	-strip ${DESTBIN}/tcsh
--	chmod 555 ${DESTBIN}/tcsh
-+	${BSD_INSTALL_PROGRAM} tcsh ${DESTBIN}/tcsh
- 
- install.man: tcsh.man
--	-mkdir -p ${DESTMAN}
--	-rm -f ${DESTMAN}/tcsh.${MANSECT}
--	cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
--	chmod 444 ${DESTMAN}/tcsh.${MANSECT}
-+	${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
- 
- # Amiga Unix
- #install.man: tcsh.man
++    if (rlim.rlim_cur > rlim.rlim_max)
++	rlim.rlim_max = rlim.rlim_cur;
++
+     if (setrlimit(lp->limconst, &rlim) < 0) {
+ # else /* BSDLIMIT */
+     if (limit != RLIM_INFINITY && lp->limconst == RLIMIT_FSIZE)
+@@ -2153,10 +2156,10 @@
+ # endif /* aiws */
+     if (ulimit(toset(lp->limconst), limit) < 0) {
+ # endif /* BSDLIMIT */
+-	xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit\n"), bname, lp->limname,
+-		limit == RLIM_INFINITY ? CGETS(15, 2, "remove") :
+-		CGETS(15, 3, "set"),
+-		hard ? CGETS(14, 4, " hard") : "");
++	xprintf(CGETS(15, 1, "%s: %s: Can't %s%s limit (%s)\n"), bname,
++	    lp->limname, limit == RLIM_INFINITY ? CGETS(15, 2, "remove") :
++	    CGETS(15, 3, "set"), hard ? CGETS(14, 4, " hard") : "",
++	    strerror(errno));
+ 	return (-1);
+     }
+     return (0);
diff --git a/shells/tcsh/patches/patch-ak b/shells/tcsh/patches/patch-ak
deleted file mode 100644
index decec9a87ea..00000000000
--- a/shells/tcsh/patches/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/01/31 15:02:23 minoura Exp $
-
---- sh.dol.c.orig	Thu Jul 26 00:48:04 2001
-+++ sh.dol.c	Thu Jan 31 16:09:37 2002
-@@ -585,10 +585,8 @@
- 		c = DgetC(0);
- 	    } while (Isdigit(c));
- 	    unDredc(c);
--	    if (subscr < 0) {
--		dolerror(vp->v_name);
--		return;
--	    }
-+	    if (subscr < 0)
-+		stderror(ERR_RANGE);
- 	    if (subscr == 0) {
- 		if (bitset) {
- 		    dolp = dolzero ? STR1 : STR0;