diff options
author | tv <tv@pkgsrc.org> | 1998-08-04 20:19:51 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 1998-08-04 20:19:51 +0000 |
commit | a5835a59654978f5436839034ae8988f7f04ec38 (patch) | |
tree | 7f14a8aec9ab9a34d70545b39c01bdac1bd0f5fc /shells/tcsh | |
parent | 9e9138f2db3e46607479bcdcea86401bbe92a228 (diff) | |
download | pkgsrc-a5835a59654978f5436839034ae8988f7f04ec38.tar.gz |
Use BSD_INSTALL_{PROGRAM,DATA} in the Makefile instead of "chown"ing after
install. Remove patches relevant to FreeBSD but not NetBSD. Split
patches up into dsingle files and use kunified diff format.
Diffstat (limited to 'shells/tcsh')
-rw-r--r-- | shells/tcsh/Makefile | 4 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-aa | 56 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-ab | 30 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-ac | 60 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-ad | 105 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-ae | 93 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-af | 38 | ||||
-rw-r--r-- | shells/tcsh/patches/patch-ag | 66 |
8 files changed, 136 insertions, 316 deletions
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index bebf0abd2d5..ae7efceba6a 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/06/21 02:35:53 tv Exp $ +# $NetBSD: Makefile,v 1.11 1998/08/04 20:19:51 tv Exp $ # FreeBSD Id: Makefile,v 1.17 1996/12/17 05:18:09 asami Exp # @@ -18,8 +18,6 @@ post-patch: ( cd ${WRKSRC}/nls/greek ; for i in * ; do ${ECHO} $$i ; ${MV} $$i $$i.BAK ; ${SED} -e 's/\\"/"/g' -e "s/\\\'/'/g" <$$i.BAK >$$i ; done ) post-install: - chown bin.bin ${PREFIX}/bin/tcsh - chown bin.bin ${PREFIX}/man/man1/tcsh.1 cd ${WRKSRC}; ${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat cd ${WRKSRC}; ${INSTALL_DATA} tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ln -f ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat diff --git a/shells/tcsh/patches/patch-aa b/shells/tcsh/patches/patch-aa deleted file mode 100644 index 00182738a6a..00000000000 --- a/shells/tcsh/patches/patch-aa +++ /dev/null @@ -1,56 +0,0 @@ -*** configure.in.orig Sun Oct 27 08:58:56 1996 ---- configure.in Sat Apr 19 21:37:17 1997 -*************** -*** 76,81 **** ---- 76,91 ---- - tcsh_config_file=sysV88 - ;; - -+ ## FreeBSD -+ *-*-freebsd*) -+ tcsh_config_file=bsd4.4 -+ ;; -+ -+ ## OpenBSD -+ *-*-openbsd*) -+ tcsh_config_file=bsd4.4 -+ ;; -+ - ## NetBSD systems - *-*-netbsd*) - tcsh_config_file=bsd4.4 -*** configure.orig Sun Oct 27 08:58:55 1996 ---- configure Sat Apr 19 21:39:29 1997 -*************** -*** 582,587 **** ---- 582,597 ---- - tcsh_config_file=sysV88 - ;; - -+ ## FreeBSD -+ *-*-freebsd*) -+ tcsh_config_file=bsd4.4 -+ ;; -+ -+ ## OpenBSD -+ *-*-openbsd*) -+ tcsh_config_file=bsd4.4 -+ ;; -+ - ## NetBSD systems - *-*-netbsd*) - tcsh_config_file=bsd4.4 -*** config.guess.dist Sat Oct 19 10:54:43 1996 ---- config.guess Sat Apr 19 22:52:46 1997 -*************** -*** 308,313 **** ---- 308,316 ---- - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; -+ *:OpenBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; diff --git a/shells/tcsh/patches/patch-ab b/shells/tcsh/patches/patch-ab index 666000918fe..bbcdf527adb 100644 --- a/shells/tcsh/patches/patch-ab +++ b/shells/tcsh/patches/patch-ab @@ -1,19 +1,11 @@ -*** nls/greek/set20.bak Fri Apr 26 23:24:30 1996 ---- nls/greek/set20 Mon Dec 16 02:56:43 1996 -*************** -*** 13,19 **** - 10 %-15s-> δεν έχει οριστεί\n - 11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n - 12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n -! 13 -a εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\ν - 14 -b ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n - 15 -s ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n - 16 -c ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n ---- 13,19 ---- - 10 %-15s-> δεν έχει οριστεί\n - 11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n - 12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n -! 13 -a εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\n - 14 -b ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n - 15 -s ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n - 16 -c ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n +--- nls/greek/set20.orig Tue Aug 4 10:15:45 1998 ++++ nls/greek/set20 Tue Aug 4 10:15:45 1998 +@@ -13,7 +13,7 @@ + 10 %-15s-> δεν έχει οριστεί\n + 11 BUG!!! το %s δεν είναι συσχετισμένο με τίποτα.\n + 12 Χρήση: bindkey [επιλογές] [--] [ΠΛΗΚΤΡΟ [ΕΝΤΟΛΗ]]\n +-13 -a εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\ν ++13 -a εμφάνιση ή συσχέτιση ΠΛΗΚΤΡΟυ στον εναλλακτικό χάρτη πλήκτρων\n + 14 -b ερμηνεία ΠΛΗΚΤΡΟυ ως C-, M-, F- or X- όνομα πλήκτρου\n + 15 -s ερμηνεία ΕΝΤΟΛΗς ως κυριολεκτικού string γιά εμφάνιση\n + 16 -c ερμηνεία ΕΝΤΟΛΗς ως εσωτερικής ή εξωτερικής εντολής\n diff --git a/shells/tcsh/patches/patch-ac b/shells/tcsh/patches/patch-ac index 32a0e6c9522..28b8df9365d 100644 --- a/shells/tcsh/patches/patch-ac +++ b/shells/tcsh/patches/patch-ac @@ -1,19 +1,41 @@ -*** sh.h.bak Sat Oct 19 21:54:12 1996 ---- sh.h Mon Dec 16 03:02:35 1996 -*************** -*** 1085,1091 **** - /* - * To print system call errors... - */ -! #ifdef __NetBSD__ - # include <errno.h> - #else - # ifndef linux ---- 1085,1091 ---- - /* - * To print system call errors... - */ -! #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) - # include <errno.h> - #else - # ifndef linux +--- glob.c.orig Fri Nov 12 19:40:56 1993 ++++ glob.c Tue Aug 4 10:15:40 1998 +@@ -139,6 +139,27 @@ + #define M_SET META('[') + #define ismeta(c) (((c)&M_META) != 0) + ++int collate_range_cmp (c1, c2) ++ int c1, c2; ++{ ++#if defined(NLS) && defined(LC_COLLATE) ++ static char s1[2], s2[2]; ++ int ret; ++#endif ++ ++ c1 &= 0xFF; ++ c2 &= 0xFF; ++#if defined(NLS) && defined(LC_COLLATE) ++ if (c1 == c2) ++ return (0); ++ s1[0] = c1; ++ s2[0] = c2; ++ if ((ret = strcoll(s1, s2)) != 0) ++ return (ret); ++#endif ++ return (c1 - c2); ++} ++ + /* + * Need to dodge two kernel bugs: + * opendir("") != opendir(".") +@@ -646,7 +667,9 @@ + ++pat; + while (((c = *pat++) & M_MASK) != M_END) { + if ((*pat & M_MASK) == M_RNG) { +- if (c <= k && k <= pat[1]) ++ if ( collate_range_cmp(CHAR(c), CHAR(k)) <= 0 ++ && collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0 ++ ) + ok = 1; + pat += 2; + } diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad index 490b9f6b044..b947a0d0051 100644 --- a/shells/tcsh/patches/patch-ad +++ b/shells/tcsh/patches/patch-ad @@ -1,83 +1,22 @@ -*** glob.c.orig Sat Nov 13 03:40:56 1993 ---- glob.c Mon Dec 16 03:09:07 1996 -*************** -*** 139,144 **** ---- 139,165 ---- - #define M_SET META('[') - #define ismeta(c) (((c)&M_META) != 0) - -+ int collate_range_cmp (c1, c2) -+ int c1, c2; -+ { -+ #if defined(NLS) && defined(LC_COLLATE) -+ static char s1[2], s2[2]; -+ int ret; -+ #endif -+ -+ c1 &= 0xFF; -+ c2 &= 0xFF; -+ #if defined(NLS) && defined(LC_COLLATE) -+ if (c1 == c2) -+ return (0); -+ s1[0] = c1; -+ s2[0] = c2; -+ if ((ret = strcoll(s1, s2)) != 0) -+ return (ret); -+ #endif -+ return (c1 - c2); -+ } -+ - /* - * Need to dodge two kernel bugs: - * opendir("") != opendir(".") -*************** -*** 646,652 **** - ++pat; - while (((c = *pat++) & M_MASK) != M_END) { - if ((*pat & M_MASK) == M_RNG) { -! if (c <= k && k <= pat[1]) - ok = 1; - pat += 2; - } ---- 667,675 ---- - ++pat; - while (((c = *pat++) & M_MASK) != M_END) { - if ((*pat & M_MASK) == M_RNG) { -! if ( collate_range_cmp(CHAR(c), CHAR(k)) <= 0 -! && collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0 -! ) - ok = 1; - pat += 2; - } -*** sh.glob.c.orig Sun May 14 00:49:17 1995 ---- sh.glob.c Thu Oct 31 18:04:28 1996 -*************** -*** 85,90 **** ---- 85,91 ---- - static void pword __P((int)); - static void psave __P((int)); - static void backeval __P((Char *, bool)); -+ extern int collate_range_cmp __P((int, int)); - - static Char * - globtilde(nv, s) -*************** -*** 1038,1045 **** - if (match) - continue; - if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { -! match = (stringc <= (*pattern & TRIM) && -! (*(pattern-2) & TRIM) <= stringc); - pattern++; - } - else ---- 1039,1047 ---- - if (match) - continue; - if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { -! match = ( collate_range_cmp(stringc, *pattern & TRIM) <= 0 -! && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0 -! ); - pattern++; - } - else +--- sh.glob.c.orig Fri Apr 26 15:19:30 1996 ++++ sh.glob.c Tue Aug 4 10:15:41 1998 +@@ -85,6 +85,7 @@ + static void pword __P((int)); + static void psave __P((int)); + static void backeval __P((Char *, bool)); ++extern int collate_range_cmp __P((int, int)); + + static Char * + globtilde(nv, s) +@@ -1038,8 +1039,9 @@ + if (match) + continue; + if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { +- match = (stringc <= (*pattern & TRIM) && +- (*(pattern-2) & TRIM) <= stringc); ++ match = ( collate_range_cmp(stringc, *pattern & TRIM) <= 0 ++ && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0 ++ ); + pattern++; + } + else diff --git a/shells/tcsh/patches/patch-ae b/shells/tcsh/patches/patch-ae index 51d93eddeb1..2e39b176c97 100644 --- a/shells/tcsh/patches/patch-ae +++ b/shells/tcsh/patches/patch-ae @@ -1,67 +1,26 @@ -*** tc.os.h.old Sun May 14 00:49:26 1995 ---- tc.os.h Sat Jun 17 06:02:53 1995 -*************** -*** 417,423 **** - # define NEEDgethostname - #endif /* _SEQUENT_ */ - -! #if defined(BSD) && defined(POSIXJOBS) && !defined(__hp_osf) - # define setpgid(pid, pgrp) setpgrp(pid, pgrp) - #endif /* BSD && POSIXJOBS && !__hp_osf */ - ---- 417,423 ---- - # define NEEDgethostname - #endif /* _SEQUENT_ */ - -! #if defined(BSD) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && defined(POSIXJOBS) && !defined(__hp_osf) - # define setpgid(pid, pgrp) setpgrp(pid, pgrp) - #endif /* BSD && POSIXJOBS && !__hp_osf */ - -*************** -*** 468,474 **** - #ifndef POSIX - # define mygetpgrp() getpgrp(0) - #else /* POSIX */ -! # if defined(BSD) || defined(SUNOS4) || defined(IRIS4D) || defined(DGUX) - # define mygetpgrp() getpgrp(0) - # else /* !(BSD || SUNOS4 || IRIS4D || DGUX) */ - # define mygetpgrp() getpgrp() ---- 468,474 ---- - #ifndef POSIX - # define mygetpgrp() getpgrp(0) - #else /* POSIX */ -! # if (defined(BSD) && !defined(__FreeBSD__)) || defined(SUNOS4) || defined(IRIS4D) || defined(DGUX) - # define mygetpgrp() getpgrp(0) - # else /* !(BSD || SUNOS4 || IRIS4D || DGUX) */ - # define mygetpgrp() getpgrp() -*************** -*** 657,670 **** - # endif /* REMOTEHOST */ - #endif /* SUNOS4 && __GNUC__ == 2 */ - -! #if (defined(BSD) && !defined(__386BSD__)) || defined(SUNOS4) - # if defined(__alpha) && defined(__osf__) && DECOSF1 < 200 - extern void bcopy __P((const void *, void *, size_t)); - # define memmove(a, b, c) (bcopy((char *) (b), (char *) (a), (int) (c)), a) - # endif /* __alpha && __osf__ && DECOSF1 < 200 */ - #endif /* (BSD && !__386BSD__) || SUNOS4 */ - -! #if !defined(hpux) && !defined(COHERENT) && ((SYSVREL < 4) || defined(_SEQUENT_)) && !defined(__386BSD__) && !defined(memmove) - # define NEEDmemmove - #endif /* !hpux && !COHERENT && (SYSVREL < 4 || _SEQUENT_) && !__386BSD__ && !memmove */ - ---- 657,670 ---- - # endif /* REMOTEHOST */ - #endif /* SUNOS4 && __GNUC__ == 2 */ - -! #if (defined(BSD) && !defined(__386BSD__) && !defined(__FreeBSD__)) || defined(SUNOS4) - # if defined(__alpha) && defined(__osf__) && DECOSF1 < 200 - extern void bcopy __P((const void *, void *, size_t)); - # define memmove(a, b, c) (bcopy((char *) (b), (char *) (a), (int) (c)), a) - # endif /* __alpha && __osf__ && DECOSF1 < 200 */ - #endif /* (BSD && !__386BSD__) || SUNOS4 */ - -! #if !defined(hpux) && !defined(COHERENT) && ((SYSVREL < 4) || defined(_SEQUENT_)) && !defined(__386BSD__) && !defined(__FreeBSD__) && !defined(memmove) - # define NEEDmemmove - #endif /* !hpux && !COHERENT && (SYSVREL < 4 || _SEQUENT_) && !__386BSD__ && !memmove */ - +--- sh.func.c.orig Sat Oct 5 13:39:10 1996 ++++ sh.func.c Tue Aug 4 10:15:42 1998 +@@ -1312,8 +1312,10 @@ + # ifdef LC_COLLATE + (void) setlocale(LC_COLLATE, ""); + # endif +-# if defined(NLS_CATALOGS) && defined(LC_MESSAGES) ++# ifdef NLS_CATALOGS ++# ifdef LC_MESSAGES + (void) setlocale(LC_MESSAGES, ""); ++# endif + (void) catclose(catd); + nlsinit(); + # endif /* NLS_CATALOGS && LC_MESSAGES */ +@@ -1475,8 +1477,10 @@ + # ifdef LC_COLLATE + (void) setlocale(LC_COLLATE, ""); + # endif +-# if defined(NLS_CATALOGS) && defined(LC_MESSAGES) ++# ifdef NLS_CATALOGS ++# ifdef LC_MESSAGES + (void) setlocale(LC_MESSAGES, ""); ++# endif + (void) catclose(catd); + nlsinit(); + # endif /* NLS_CATALOGS && LC_MESSAGES */ diff --git a/shells/tcsh/patches/patch-af b/shells/tcsh/patches/patch-af index b451008f630..7ee8314fbf4 100644 --- a/shells/tcsh/patches/patch-af +++ b/shells/tcsh/patches/patch-af @@ -1,23 +1,15 @@ -*** config_f.h.bak Fri Apr 26 23:17:30 1996 ---- config_f.h Mon Dec 16 03:53:59 1996 -*************** -*** 65,71 **** - * if you don't have <nl_types.h>, you don't want - * to define this. - */ -! #undef NLS_CATALOGS - - /* - * LOGINFIRST Source ~/.login before ~/.cshrc ---- 65,75 ---- - * if you don't have <nl_types.h>, you don't want - * to define this. - */ -! #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -! # define NLS_CATALOGS -! #else -! # undef NLS_CATALOGS -! #endif - - /* - * LOGINFIRST Source ~/.login before ~/.cshrc +--- config_f.h.orig Fri Apr 26 15:17:30 1996 ++++ config_f.h Tue Aug 4 10:15:41 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 diff --git a/shells/tcsh/patches/patch-ag b/shells/tcsh/patches/patch-ag index f21bec1813d..f2f5ebfcbca 100644 --- a/shells/tcsh/patches/patch-ag +++ b/shells/tcsh/patches/patch-ag @@ -1,49 +1,5 @@ -*** sh.func.c.bak Sat Oct 5 21:39:10 1996 ---- sh.func.c Mon Dec 16 04:25:04 1996 -*************** -*** 1312,1319 **** - # ifdef LC_COLLATE - (void) setlocale(LC_COLLATE, ""); - # endif -! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES) - (void) setlocale(LC_MESSAGES, ""); - (void) catclose(catd); - nlsinit(); - # endif /* NLS_CATALOGS && LC_MESSAGES */ ---- 1312,1321 ---- - # ifdef LC_COLLATE - (void) setlocale(LC_COLLATE, ""); - # endif -! # ifdef NLS_CATALOGS -! # ifdef LC_MESSAGES - (void) setlocale(LC_MESSAGES, ""); -+ # endif - (void) catclose(catd); - nlsinit(); - # endif /* NLS_CATALOGS && LC_MESSAGES */ -*************** -*** 1475,1482 **** - # ifdef LC_COLLATE - (void) setlocale(LC_COLLATE, ""); - # endif -! # if defined(NLS_CATALOGS) && defined(LC_MESSAGES) - (void) setlocale(LC_MESSAGES, ""); - (void) catclose(catd); - nlsinit(); - # endif /* NLS_CATALOGS && LC_MESSAGES */ ---- 1477,1486 ---- - # ifdef LC_COLLATE - (void) setlocale(LC_COLLATE, ""); - # endif -! # ifdef NLS_CATALOGS -! # ifdef LC_MESSAGES - (void) setlocale(LC_MESSAGES, ""); -+ # endif - (void) catclose(catd); - nlsinit(); - # endif /* NLS_CATALOGS && LC_MESSAGES */ ---- Makefile.in 1997/10/24 15:41:23 1.1 -+++ Makefile.in 1997/10/24 15:41:34 +--- Makefile.in.orig Fri Oct 11 13:31:59 1996 ++++ Makefile.in Tue Aug 4 10:19:30 1998 @@ -261,7 +261,7 @@ PARALLEL=12 # Make the multi-max run fast. #P=& # Use Sequent's parallel make @@ -53,3 +9,21 @@ MANSECT=1 DESTBIN=${DESTDIR}/bin DESTMAN=${DESTDIR}/man/man${MANSECT} +@@ -452,15 +452,10 @@ + @vgrind -t -x -h Index index >/crp/bill/csh/index.t + + install: tcsh +- -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 +- -rm -f ${DESTMAN}/tcsh.${MANSECT} +- cp tcsh.man ${DESTMAN}/tcsh.${MANSECT} +- chmod 444 ${DESTMAN}/tcsh.${MANSECT} ++ ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT} + + # Amiga Unix + #install.man: tcsh.man |