From d9dc19c55ee86a8a12d6d7875d8704e20c0a0aa6 Mon Sep 17 00:00:00 2001 From: brad Date: Sat, 21 Aug 1999 17:31:45 +0000 Subject: [PATCH] upgrade to tcsh 6.09.00 --- shells/tcsh/Makefile | 33 +++++------ shells/tcsh/files/md5 | 6 +- shells/tcsh/patches/patch-aa | 56 ------------------- shells/tcsh/patches/patch-ac | 30 ++++------ shells/tcsh/patches/patch-af | 105 +++++++++++++---------------------- shells/tcsh/patches/patch-ah | 30 ++++------ shells/tcsh/patches/patch-ai | 76 ++++++++++++------------- 7 files changed, 112 insertions(+), 224 deletions(-) delete mode 100644 shells/tcsh/patches/patch-aa diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index b8a9dfa010d..8c4f203f74c 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,39 +1,32 @@ -# OpenBSD makefile for: tcsh -# Version required: 6.07.02 -# Date created: 17 November 1997 -# Whom: gene -# -# $OpenBSD: Makefile,v 1.11 1999/04/08 15:53:29 marc Exp $ -# +# $OpenBSD: Makefile,v 1.12 1999/08/21 17:31:45 brad Exp $ -DISTNAME= tcsh-6.08 -PKGNAME= tcsh-6.08.00 +DISTNAME= tcsh-6.09 +PKGNAME= tcsh-6.09.00 CATEGORIES= shells -MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ +MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ -MAINTAINER= gene@OpenBSD.ORG +MAINTAINER= gene@OpenBSD.ORG -GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PKGNAME} -ALL_TARGET= all catalogs +GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/${PKGNAME} +ALL_TARGET= all catalogs #INSTALL_TARGET= install install.man -MAN1= tcsh.1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcsh ${PREFIX}/bin/tcsh ${INSTALL_MAN} ${WRKSRC}/tcsh.man ${PREFIX}/man/man1/tcsh.1 ${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat ${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat - ${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \ + @${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \ ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat - ${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \ + @${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \ ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat - ${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \ + @${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat \ ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat ${INSTALL_DATA} ${WRKSRC}/tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat - ${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \ + @${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \ ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat - ${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \ + @${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat \ ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat ${INSTALL_DATA_DIR} ${PREFIX}/share/nls/el_GR.ISO_8859-7 ${INSTALL_DATA} ${WRKSRC}/tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat diff --git a/shells/tcsh/files/md5 b/shells/tcsh/files/md5 index a6b4acc1717..7c122573817 100644 --- a/shells/tcsh/files/md5 +++ b/shells/tcsh/files/md5 @@ -1,3 +1,3 @@ -MD5 (tcsh-6.08.tar.gz) = e16e0f08b324e67f654ecab554042967 -RMD160 (tcsh-6.08.tar.gz) = 39dab7cfa7adfd8c1dbde22ef209997eba26507d -SHA1 (tcsh-6.08.tar.gz) = 59fa6a2330825c74fffc861914e6d4e130e8ce49 +MD5 (tcsh-6.09.tar.gz) = 33511c75037cd4948ed6f1627d1793aa +RMD160 (tcsh-6.09.tar.gz) = ceb86486e1e59fa62e675715c63435689fac26ac +SHA1 (tcsh-6.09.tar.gz) = 3ae7c5e08a32b3fa5a95f77d5d50e339ae57cf55 diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa deleted file mode 100644 index 8fd83b85818..00000000000 --- a/shells/tcsh/patches/patch-aa +++ /dev/null @@ -1,56 +0,0 @@ -*** config.guess.orig Thu Dec 17 04:34:33 1998 ---- config.guess Thu Dec 17 04:37:18 1998 -*************** -*** 65,70 **** ---- 65,73 ---- - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; -+ amiga:OpenBSD:*:*) -+ echo m68k-cbm-openbsd${UNAME_RELEASE} -+ exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; -*************** -*** 108,113 **** ---- 111,125 ---- - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; -+ atari*:OpenBSD:*:*) -+ echo m68k-atari-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ sun3*:OpenBSD:*:*) -+ echo m68k-sun-openbsd${UNAME_RELEASE} -+ exit 0 ;; -+ mac68k:OpenBSD:*:*) -+ echo m68k-apple-openbsd${UNAME_RELEASE} -+ exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; -*************** -*** 307,312 **** ---- 319,327 ---- - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; -+ hp3[0-9][05]:OpenBSD:*:*) -+ echo m68k-hp-openbsd${UNAME_RELEASE} -+ exit 0 ;; - i[34]86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; -*************** -*** 315,320 **** ---- 330,338 ---- - exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ exit 0 ;; -+ *:OpenBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac index 621eea04cf3..61863ee91bf 100644 --- a/shells/tcsh/patches/patch-ac +++ b/shells/tcsh/patches/patch-ac @@ -1,19 +1,11 @@ -*** sh.h.orig Fri Sep 18 23:09:13 1998 ---- sh.h Thu Dec 17 04:30:06 1998 -*************** -*** 268,274 **** - * redefines malloc(), so we define the following - * to avoid it. - */ -! # if defined(linux) || defined(sgi) - # define NO_FIX_MALLOC - # include - # else /* linux */ ---- 268,274 ---- - * redefines malloc(), so we define the following - * to avoid it. - */ -! # if defined(linux) || defined(sgi) || defined(__FreeBSD__) || defined(__OpenBSD__) - # define NO_FIX_MALLOC - # include - # else /* linux */ +--- sh.h.orig Sat Aug 21 12:49:57 1999 ++++ sh.h Sat Aug 21 12:51:38 1999 +@@ -279,7 +279,7 @@ + * redefines malloc(), so we define the following + * to avoid it. + */ +-# if defined(linux) || defined(sgi) || defined(_OSD_POSIX) ++# if defined(linux) || defined(sgi) || defined(_OSD_POSIX) || defined(__FreeBSD__) || defined(__OpenBSD__) + # define NO_FIX_MALLOC + # include + # else /* linux */ diff --git a/shells/tcsh/patches/patch-af b/shells/tcsh/patches/patch-af index 26392ab14c3..9215ddbcf09 100644 --- a/shells/tcsh/patches/patch-af +++ b/shells/tcsh/patches/patch-af @@ -1,67 +1,38 @@ -*** config_f.h.orig Sat Sep 19 21:48:08 1998 ---- config_f.h Thu Dec 17 05:18:51 1998 -*************** -*** 65,71 **** - * if you don't have , you don't want - * to define this. - */ -! #undef NLS_CATALOGS - - /* - * LOGINFIRST Source ~/.login before ~/.cshrc ---- 65,75 ---- - * if you don't have , you don't want - * to define this. - */ -! #ifdef __OpenBSD__ -! # define NLS_CATALOGS -! #else -! # undef NLS_CATALOGS -! #endif - - /* - * LOGINFIRST Source ~/.login before ~/.cshrc -*************** -*** 92,103 **** - /* - * DOTLAST put "." last in the default path, for security reasons - */ -! #define DOTLAST - - /* - * NODOT Don't put "." in the default path, for security reasons - */ -! #undef NODOT - - /* - * AUTOLOGOUT tries to determine if it should set autologout depending ---- 96,107 ---- - /* - * DOTLAST put "." last in the default path, for security reasons - */ -! #undef DOTLAST - - /* - * NODOT Don't put "." in the default path, for security reasons - */ -! #define NODOT - - /* - * AUTOLOGOUT tries to determine if it should set autologout depending -*************** -*** 142,148 **** - * This can be much slower and no memory statistics will be - * provided. - */ -! #if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) - # define SYSMALLOC - #else - # undef SYSMALLOC ---- 146,152 ---- - * This can be much slower and no memory statistics will be - * provided. - */ -! #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) - # define SYSMALLOC - #else - # undef SYSMALLOC +--- config_f.h.orig Sat Aug 21 12:52:48 1999 ++++ config_f.h Sat Aug 21 12:55:38 1999 +@@ -65,7 +65,11 @@ + * if you don't have , you don't want + * to define this. + */ ++#ifdef __OpenBSD__ ++#define NLS_CATALOGS ++#else + #undef NLS_CATALOGS ++#endif + + /* + * LOGINFIRST Source ~/.login before ~/.cshrc +@@ -92,12 +96,12 @@ + /* + * DOTLAST put "." last in the default path, for security reasons + */ +-#define DOTLAST ++#undef DOTLAST + + /* + * NODOT Don't put "." in the default path, for security reasons + */ +-#undef NODOT ++#define NODOT + + /* + * AUTOLOGOUT tries to determine if it should set autologout depending +@@ -143,7 +147,7 @@ + * This can be much slower and no memory statistics will be + * provided. + */ +-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) ++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__FreeBSD__) || defined(__OpenBSD__) + # define SYSMALLOC + #else + # undef SYSMALLOC diff --git a/shells/tcsh/patches/patch-ah b/shells/tcsh/patches/patch-ah index 638262369a3..3c48806c005 100644 --- a/shells/tcsh/patches/patch-ah +++ b/shells/tcsh/patches/patch-ah @@ -1,19 +1,11 @@ -*** sh.exp.c.orig Thu Dec 17 09:41:49 1998 ---- sh.exp.c Thu Dec 17 09:42:41 1998 -*************** -*** 155,161 **** - * and they define _SC_NGROUPS_MAX without having sysconf - */ - # undef _SC_NGROUPS_MAX -! # if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) - # define GID_T gid_t - # else - # define GID_T int ---- 155,161 ---- - * and they define _SC_NGROUPS_MAX without having sysconf - */ - # undef _SC_NGROUPS_MAX -! # if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__bsdi__) - # define GID_T gid_t - # else - # define GID_T int +--- sh.exp.c.orig Sat Aug 21 12:57:18 1999 ++++ sh.exp.c Sat Aug 21 12:57:50 1999 +@@ -155,7 +155,7 @@ + * and they define _SC_NGROUPS_MAX without having sysconf + */ + # undef _SC_NGROUPS_MAX +-# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) ++# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__bsdi__) + # define GID_T gid_t + # else + # define GID_T int diff --git a/shells/tcsh/patches/patch-ai b/shells/tcsh/patches/patch-ai index f77e2738193..20acef5e177 100644 --- a/shells/tcsh/patches/patch-ai +++ b/shells/tcsh/patches/patch-ai @@ -1,40 +1,36 @@ -*** host.defs.orig Wed Apr 22 11:26:00 1998 ---- host.defs Wed Apr 22 11:24:47 1998 -*************** -*** 484,489 **** ---- 484,518 ---- - enddef : - - -+ newdef : defined(__OpenBSD__) -+ comment : OpenBSD -+ vendor : defined(alpha) : "digital" -+ vendor : defined(amiga) : "commodore" -+ vendor : defined(atari) : "atari" -+ vendor : defined(hp300) : "hp" -+ vendor : defined(M_intel) : "intel" -+ vendor : defined(m68k) : "motorola" -+ vendor : defined(mac68k) : "apple" -+ vendor : defined(pc532) : "national-semi" -+ vendor : defined(pmax) || defined(mips) : "dec" -+ vendor : defined(M_mipsel) : "dec" -+ vendor : defined(sparc) : "sun" -+ vendor : defined(sun3) : "sun" -+ vendor : defined(vax) : "digital" -+ hosttype: : "OpenBSD" -+ ostype : : "OpenBSD" -+ machtype: defined(sparc) : "sparc" -+ machtype: defined(mc68020) : "m68k" -+ machtype: defined(M_i386) : "i386" -+ machtype: defined(M_mipsel) : "mipsel" -+ machtype: defined(M_mipseb) : "mipseb" -+ machtype: defined(mips) : "mips" -+ machtype: defined(pc532) : "pc532" -+ machtype: defined(vax) : "vax" -+ machtype: defined(alpha) : "alpha" -+ enddef : -+ -+ - newdef : defined(__FreeBSD__) - comment : FreeBSD - vendor : defined(M_intel) : "intel" +--- host.defs.orig Sat Aug 21 12:59:46 1999 ++++ host.defs Sat Aug 21 13:08:16 1999 +@@ -491,6 +491,33 @@ + machtype: defined(alpha) : "alpha" + enddef : + ++newdef : defined(__OpenBSD__) ++comment : OpenBSD ++vendor : defined(alpha) : "digital" ++vendor : defined(amiga) : "commodore" ++vendor : defined(atari) : "atari" ++vendor : defined(hp300) : "hp" ++vendor : defined(M_intel) : "intel" ++vendor : defined(m68k) : "motorola" ++vendor : defined(mac68k) : "apple" ++vendor : defined(pc532) : "national-semi" ++vendor : defined(pmax) || defined(mips) : "dec" ++vendor : defined(M_mipsel) : "dec" ++vendor : defined(sparc) : "sun" ++vendor : defined(sun3) : "sun" ++vendor : defined(vax) : "digital" ++hosttype: : "OpenBSD" ++ostype : : "OpenBSD" ++machtype: defined(sparc) : "sparc" ++machtype: defined(mc68020) : "m68k" ++machtype: defined(M_i386) : "i386" ++machtype: defined(M_mipsel) : "mipsel" ++machtype: defined(M_mipseb) : "mipseb" ++machtype: defined(mips) : "mips" ++machtype: defined(pc532) : "pc532" ++machtype: defined(vax) : "vax" ++machtype: defined(alpha) : "alpha" ++enddef : + + newdef : defined(__FreeBSD__) + comment : FreeBSD