diff options
| -rw-r--r-- | shells/tcsh/Makefile | 5 | ||||
| -rw-r--r-- | shells/tcsh/distinfo | 13 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-aa | 24 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-ad | 27 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-al | 13 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-am | 13 | ||||
| -rw-r--r-- | shells/tcsh/patches/patch-an | 18 |
7 files changed, 20 insertions, 93 deletions
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index de4ab3e6103..df60db18cde 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2004/04/18 04:34:14 snj Exp $ +# $NetBSD: Makefile,v 1.46 2004/05/19 17:42:35 kim Exp $ # -DISTNAME= tcsh-6.12.00 -PKGREVISION= 1 +DISTNAME= tcsh-6.13.00 CATEGORIES= shells MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \ ftp://ftp.gw.com/pub/unix/tcsh/ \ diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index 2b93d2dd4f9..4190a50b5b1 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.11 2002/09/15 19:16:44 kim Exp $ +$NetBSD: distinfo,v 1.12 2004/05/19 17:42:35 kim Exp $ -SHA1 (tcsh-6.12.00.tar.gz) = c54fd7a6823a4d30a4195f0fb9f31c6e2ddbd8e5 -Size (tcsh-6.12.00.tar.gz) = 824297 bytes -SHA1 (patch-aa) = 51b96fff19fcfb55e6c841460c7a771c4678978f -SHA1 (patch-ad) = 8cc4426557057c347525f384d862f6820e165fe7 -SHA1 (patch-al) = abb131d38e0dc0e4970f3aaa0a026783949cd574 -SHA1 (patch-am) = f605aa65d75732c3950b8ba6c51eb5dfcc16d717 -SHA1 (patch-an) = faf86b1e81693d14cd9bd33839fa50bb91662ed6 +SHA1 (tcsh-6.13.00.tar.gz) = 0980ac5765fffc48bd3abf7c685c848af88c4596 +Size (tcsh-6.13.00.tar.gz) = 844755 bytes +SHA1 (patch-aa) = 98ab704908a6fe2f570d2688c2a9bdb600f630eb +SHA1 (patch-ad) = 4eee34eb2f8ce3ddc3f6b4177510945a00f66f15 diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa index 6d1cf3a871e..bfb9d0aef75 100644 --- a/shells/tcsh/patches/patch-aa +++ b/shells/tcsh/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.7 2002/04/11 15:26:20 abs Exp $ +$NetBSD: patch-aa,v 1.8 2004/05/19 17:42:35 kim Exp $ ---- Makefile.in.orig Sun Sep 2 22:16:25 2001 -+++ Makefile.in -@@ -475,17 +475,10 @@ +--- Makefile.in.orig 2003-03-12 14:14:50.000000000 -0500 ++++ Makefile.in 2004-02-21 16:28:51.000000000 -0500 +@@ -476,17 +476,10 @@ install-strip: install - install: tcsh + install: tcsh$(EXEEXT) - -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 +- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old +- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) +- -strip ${DESTBIN}/tcsh$(EXEEXT) +- chmod 755 ${DESTBIN}/tcsh$(EXEEXT) ++ ${BSD_INSTALL_PROGRAM} tcsh${EXEEXT} ${DESTBIN}/tcsh${EXEEXT} install.man: tcsh.man - -mkdir -p ${DESTMAN} @@ -20,5 +20,5 @@ $NetBSD: patch-aa,v 1.7 2002/04/11 15:26:20 abs Exp $ - chmod 444 ${DESTMAN}/tcsh.${MANSECT} + ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT} - # Amiga Unix - #install.man: tcsh.man + install.cygwin: install install.man + -mkdir -p ${DESTDIR}${prefix}/doc/tcsh diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad index 469132c5669..92014f64ba4 100644 --- a/shells/tcsh/patches/patch-ad +++ b/shells/tcsh/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.6 2002/08/11 05:11:18 kim Exp $ +$NetBSD: patch-ad,v 1.7 2004/05/19 17:42:35 kim Exp $ --- config_f.h.orig Fri Mar 8 12:36:45 2002 +++ config_f.h Sun Aug 11 00:19:17 2002 @@ -15,28 +15,3 @@ $NetBSD: patch-ad,v 1.6 2002/08/11 05:11:18 kim Exp $ /* * LOGINFIRST Source ~/.login before ~/.cshrc -@@ -113,14 +117,22 @@ - * be used with SHORT_STRINGS - * - */ --#undef KANJI -+#if defined(__NetBSD__) -+# define KANJI -+#else -+# undef KANJI -+#endif - - /* - * DSPMBYTE add variable "dspmbyte" and display multi-byte string at - * only output, when "dspmbyte" is set. Should be used with - * KANJI - */ --#undef DSPMBYTE -+#if defined(__NetBSD__) -+# define DSPMBYTE -+#else -+# undef DSPMBYTE -+#endif - - /* - * MBYTEDEBUG when "dspmbyte" is changed, set multi-byte checktable to diff --git a/shells/tcsh/patches/patch-al b/shells/tcsh/patches/patch-al deleted file mode 100644 index 9038e168b03..00000000000 --- a/shells/tcsh/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2002/08/11 05:11:18 kim Exp $ - ---- tc.const.c.orig Sat Jul 6 18:21:07 2002 -+++ tc.const.c Sun Aug 11 00:31:39 2002 -@@ -157,7 +157,7 @@ - '\0' }; - Char STRLANGEUCZH[] = { '\0' }; - Char STRLANGEUCZHB[] = { '\0' }; --# elif defined(__FreeBSD__) -+# elif (defined(__FreeBSD__) || defined(__NetBSD__)) - Char STRLANGEUCJP[] = { 'j', 'a', '_', 'J', 'P', '.', 'e', 'u', 'c', 'J', - 'P', '\0' }; - Char STRLANGEUCJPB[] = { 'j', 'a', '_', 'J', 'P', '.', 'E', 'U', 'C', '\0' }; diff --git a/shells/tcsh/patches/patch-am b/shells/tcsh/patches/patch-am deleted file mode 100644 index 01ddde3d79e..00000000000 --- a/shells/tcsh/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.1 2002/09/15 19:16:45 kim Exp $ - ---- tc.who.c.orig Mon Jul 1 17:12:04 2002 -+++ tc.who.c Sun Sep 15 15:05:29 2002 -@@ -52,6 +52,8 @@ - # ifndef _PATH_UTMP - # if defined(__UTMPX_FILE) && !defined(UTMPX_FILE) - # define _PATH_UTMP __UTMPX_FILE -+# elif defined(_PATH_UTMPX) -+# define _PATH_UTMP _PATH_UTMPX - # else - # define _PATH_UTMP UTMPX_FILE - # endif /* __UTMPX_FILE && !UTMPX_FILE */ diff --git a/shells/tcsh/patches/patch-an b/shells/tcsh/patches/patch-an deleted file mode 100644 index 3918a615198..00000000000 --- a/shells/tcsh/patches/patch-an +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-an,v 1.1 2002/09/15 19:16:46 kim Exp $ - ---- config/bsd4.4.orig Tue Feb 12 17:36:50 2002 -+++ config/bsd4.4 Sun Sep 15 15:06:13 2002 -@@ -125,6 +125,13 @@ - #define BSD_STYLE_COLORLS - #endif - -+#if defined(__NetBSD__) -+#include <sys/param.h> -+#if __NetBSD_Version__ >= 106030000 /* NetBSD 1.6C */ -+#define HAVEUTMPX -+#endif -+#endif -+ - #if defined(__bsdi__) - /* - * _PATH_TCSHELL if you've change the installation location (vix) |