pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/shells {,standalone-,static-}tcsh: Update to 6.23.01
details: https://anonhg.NetBSD.org/pkgsrc/rev/50cc27a52ff1
branches: trunk
changeset: 770813:50cc27a52ff1
user: kim <kim%pkgsrc.org@localhost>
date: Thu Dec 09 19:55:39 2021 +0000
description:
{,standalone-,static-}tcsh: Update to 6.23.01
Changes since 6.23.00:
8. V6.23.01 - 20211209
7. add \cc and \Uhhh, and document escape sequences
6. add $'string with escapes' ("dollar-single-quotes") (Kimmo Suominen)
5. don't glob the filetest builtin arguments twice
4. remove the duplicate echo escape parsing code and use parseescape
3. add \x{hh} \xhh \uhhh (H.Merijn Brand)
2. fix and document ln=target
1. Merge in patches from pkgsrc:
- Modernize the installation targets so that they use INSTALL_DATA,
INSTALL_PROGRAM, and MKDIR_P.
- Enable SYSMALLOC and SHORT_STRINGS on NetBSD.
- Enable NO_FIX_MALLOC and SHORT_STRINGS on OpenBSD.
For pkgsrc, items 1, 2, and 5 had already been applied via patches.
diffstat:
shells/standalone-tcsh/Makefile | 3 +-
shells/static-tcsh/Makefile | 3 +-
shells/tcsh/Makefile | 4 +-
shells/tcsh/Makefile.common | 6 +-
shells/tcsh/distinfo | 16 +--
shells/tcsh/patches/patch-Makefile.in | 52 ------------
shells/tcsh/patches/patch-config_f.h | 36 --------
shells/tcsh/patches/patch-nls_Makefile.in | 123 ------------------------------
shells/tcsh/patches/patch-sh.exp.c | 32 -------
shells/tcsh/patches/patch-sh.func.c | 18 ----
shells/tcsh/patches/patch-sh.h | 29 -------
shells/tcsh/patches/patch-tcsh.man | 48 -----------
shells/tcsh/patches/patch-tw.color.c | 28 ------
13 files changed, 10 insertions(+), 388 deletions(-)
diffs (truncated from 487 to 300 lines):
diff -r a820f5854530 -r 50cc27a52ff1 shells/standalone-tcsh/Makefile
--- a/shells/standalone-tcsh/Makefile Thu Dec 09 18:46:38 2021 +0000
+++ b/shells/standalone-tcsh/Makefile Thu Dec 09 19:55:39 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2021/11/18 10:20:47 kim Exp $
+# $NetBSD: Makefile,v 1.38 2021/12/09 19:55:39 kim Exp $
#
# FIXME: This is because of PREFIX=/ below.
@@ -6,7 +6,6 @@
NOT_FOR_UNPRIVILEGED= yes
PKGNAME= standalone-${DISTNAME}
-PKGREVISION= 3
PATCHDIR= ../../shells/tcsh/patches
PKGDIR= ../../shells/tcsh
diff -r a820f5854530 -r 50cc27a52ff1 shells/static-tcsh/Makefile
--- a/shells/static-tcsh/Makefile Thu Dec 09 18:46:38 2021 +0000
+++ b/shells/static-tcsh/Makefile Thu Dec 09 19:55:39 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2021/11/18 10:20:47 kim Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/09 19:55:39 kim Exp $
#
PKGNAME= static-${DISTNAME}
-PKGREVISION= 3
.include "../../shells/tcsh/Makefile.common"
diff -r a820f5854530 -r 50cc27a52ff1 shells/tcsh/Makefile
--- a/shells/tcsh/Makefile Thu Dec 09 18:46:38 2021 +0000
+++ b/shells/tcsh/Makefile Thu Dec 09 19:55:39 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2021/11/18 10:20:47 kim Exp $
+# $NetBSD: Makefile,v 1.104 2021/12/09 19:55:39 kim Exp $
.include "../../shells/tcsh/Makefile.common"
-PKGREVISION= 3
+CONFLICTS= static-tcsh-[0-9]*
.include "../../mk/bsd.pkg.mk"
diff -r a820f5854530 -r 50cc27a52ff1 shells/tcsh/Makefile.common
--- a/shells/tcsh/Makefile.common Thu Dec 09 18:46:38 2021 +0000
+++ b/shells/tcsh/Makefile.common Thu Dec 09 19:55:39 2021 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2021/11/15 17:11:58 kim Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/12/09 19:55:39 kim Exp $
#
# used by shells/standalone-tcsh/Makefile
# used by shells/static-tcsh/Makefile
# used by shells/tcsh/Makefile
-DISTNAME= tcsh-6.23.00
+DISTNAME= tcsh-6.23.01
CATEGORIES= shells
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/
MASTER_SITES+= http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
@@ -14,8 +14,6 @@
COMMENT= Extended C-shell with many useful features
LICENSE= original-bsd
-CONFLICTS= static-tcsh-[0-9]*
-
GNU_CONFIGURE= yes
USE_TOOLS+= autoconf:test perl:test
diff -r a820f5854530 -r 50cc27a52ff1 shells/tcsh/distinfo
--- a/shells/tcsh/distinfo Thu Dec 09 18:46:38 2021 +0000
+++ b/shells/tcsh/distinfo Thu Dec 09 19:55:39 2021 +0000
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.56 2021/11/18 10:20:47 kim Exp $
+$NetBSD: distinfo,v 1.57 2021/12/09 19:55:39 kim Exp $
-BLAKE2s (tcsh-6.23.00.tar.gz) = a61b142efc2ca927cb33ea4eb87c0530cacc0c79ff1c30d5e9022a4404cef72d
-SHA512 (tcsh-6.23.00.tar.gz) = 8ea491e9409f12ab113bf5551398cb827692a50340318b050d0f8278d3cd9c133ba89a407dc692d9c4bd69957ecd6d4d92db7ccfacc7064ace3b09e3bd562f30
-Size (tcsh-6.23.00.tar.gz) = 1010250 bytes
-SHA1 (patch-Makefile.in) = 16ae4c595c8e23be1acbfa0263334df569300a79
-SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939
-SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
-SHA1 (patch-sh.exp.c) = c65aeedf8950d2e298d1d0a5dbe2261eba18ff77
-SHA1 (patch-sh.func.c) = f06cddb996915e79e372d56984f3798a68437e05
-SHA1 (patch-sh.h) = 487282e85cd6f21a703d7d5332c47f113ca2fea8
-SHA1 (patch-tcsh.man) = 1265cc74450170f65c282921859c3b29ef6caa39
-SHA1 (patch-tw.color.c) = 39c1f8a0821b8254c6bb4729b5e1504c6a83feb5
+BLAKE2s (tcsh-6.23.01.tar.gz) = 12d0bc4be33bb8ba40ee5ef8f0a1b0339dbb7f6db6d07d0038c09ad021cffaf6
+SHA512 (tcsh-6.23.01.tar.gz) = 7460d86dfedf3f2728dee8fe5b6cddec20020a2c3af374be3f83cbb0835237153e5456f864a259816e56e88edd9e15bc18df92ebe5471a73bbe9ed70656abf92
+Size (tcsh-6.23.01.tar.gz) = 947240 bytes
diff -r a820f5854530 -r 50cc27a52ff1 shells/tcsh/patches/patch-Makefile.in
--- a/shells/tcsh/patches/patch-Makefile.in Thu Dec 09 18:46:38 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2021/11/13 06:50:03 kim Exp $
-
-- Adjust mandir
-- Use INSTALL_DATA, INSTALL_PROGRAM, and MKDIR_P
-
---- Makefile.in.orig 2021-11-11 09:54:05.000000000 +0000
-+++ Makefile.in 2021-11-13 06:25:54.773703072 +0000
-@@ -9,6 +9,10 @@
- ENVCMD=/usr/bin/env
- VERSION=@PACKAGE_VERSION@
- BUILD=tcsh$(EXEEXT)
-+INSTALL=@INSTALL@
-+INSTALL_DATA=@INSTALL_DATA@
-+INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+MKDIR_P?=$(INSTALL) -d
- VPATH=@srcdir@
- srcdir=@srcdir@
-
-@@ -356,7 +360,8 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
--mandir=@datarootdir@/man
-+datarootdir=@datarootdir@
-+mandir=@mandir@
- MANSECT=1
- DESTBIN=${DESTDIR}${bindir}
- DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
-@@ -596,19 +601,15 @@
- -strip ${DESTBIN}/tcsh$(EXEEXT)
-
- install: tcsh$(EXEEXT) install.catalogs install.man
-- -mkdir -p ${DESTBIN}
-- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old
-- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
-- chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
-+ $(MKDIR_P) ${DESTBIN}
-+ $(INSTALL_PROGRAM) tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
-
- install.catalogs:
- @test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0
-
- install.man: tcsh.man
-- -mkdir -p ${DESTMAN}
-- -rm -f ${DESTMAN}/tcsh.${MANSECT}
-- cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
-- chmod 444 ${DESTMAN}/tcsh.${MANSECT}
-+ $(MKDIR_P) ${DESTMAN}
-+ $(INSTALL_DATA) $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
-
- # Amiga Unix
- #install.man: tcsh.man
diff -r a820f5854530 -r 50cc27a52ff1 shells/tcsh/patches/patch-config_f.h
--- a/shells/tcsh/patches/patch-config_f.h Thu Dec 09 18:46:38 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-config_f.h,v 1.1 2021/11/11 13:20:13 kim Exp $
-
-Special adaptation for different NetBSD versions and for OpenBSD.
-Turn on SYSMALLOC for NetBSD until tc.alloc.c gets better.
-
---- config_f.h.orig 2019-12-04 09:51:54.000000000 -0800
-+++ config_f.h 2020-07-06 15:21:46.122410962 -0700
-@@ -47,7 +47,18 @@
- * of nls...
- *
- */
--#define SHORT_STRINGS
-+#if defined(__NetBSD__)
-+# include <sys/param.h>
-+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 200000000)
-+# define SHORT_STRINGS
-+# else
-+# undef SHORT_STRINGS
-+# endif
-+#elif defined(__OpenBSD__)
-+# undef SHORT_STRINGS
-+#else
-+# define SHORT_STRINGS
-+#endif
-
- /*
- * WIDE_STRINGS Represent strings using wide characters
-@@ -138,7 +149,7 @@
- * This can be much slower and no memory statistics will be
- * provided.
- */
--#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) ||
defined(__APPLE__) || defined (__ANDROID__)
-+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) ||
defined(__APPLE__) || defined (__ANDROID__) || defined(__NetBSD__)
- # define SYSMALLOC
- #else
- # undef SYSMALLOC
diff -r a820f5854530 -r 50cc27a52ff1 shells/tcsh/patches/patch-nls_Makefile.in
--- a/shells/tcsh/patches/patch-nls_Makefile.in Thu Dec 09 18:46:38 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-$NetBSD: patch-nls_Makefile.in,v 1.3 2019/05/09 11:32:36 leot Exp $
-
-Use INSTALL_DATA instead of INSTALL to avoid setting executable bits.
-
---- nls/Makefile.in.orig 2019-05-08 18:39:28.000000000 +0000
-+++ nls/Makefile.in
-@@ -4,7 +4,7 @@ CATALOGS= C.cat et.cat finnish.cat frenc
- italian.cat ja.cat pl.cat russian.cat spanish.cat ukrainian.cat
- LOCALES= ${CATALOGS:.cat=}
- GENCAT= @GENCAT@
--INSTALL= @INSTALL@
-+INSTALL_DATA= @INSTALL_DATA@
- RM?= rm -f
- VPATH=@srcdir@
- srcdir=@srcdir@
-@@ -19,7 +19,7 @@ all: ${CATALOGS}
- INSTALLED+=${localedir}/C/LC_MESSAGES/tcsh.cat
- ${localedir}/C/LC_MESSAGES/tcsh.cat: C.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- C.cat: ${srcdir}/C/charset ${srcdir}/C/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -27,7 +27,7 @@ C.cat: ${srcdir}/C/charset ${srcdir}/C/*
- INSTALLED+=${localedir}/et/LC_MESSAGES/tcsh.cat
- ${localedir}/et/LC_MESSAGES/tcsh.cat: et.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- et.cat: ${srcdir}/et/charset ${srcdir}/et/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -35,7 +35,7 @@ et.cat: ${srcdir}/et/charset ${srcdir}/e
- INSTALLED+=${localedir}/fi/LC_MESSAGES/tcsh.cat
- ${localedir}/fi/LC_MESSAGES/tcsh.cat: finnish.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- finnish.cat: ${srcdir}/finnish/charset ${srcdir}/finnish/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -43,7 +43,7 @@ finnish.cat: ${srcdir}/finnish/charset $
- INSTALLED+=${localedir}/fr/LC_MESSAGES/tcsh.cat
- ${localedir}/fr/LC_MESSAGES/tcsh.cat: french.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- french.cat: ${srcdir}/french/charset ${srcdir}/french/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -51,7 +51,7 @@ french.cat: ${srcdir}/french/charset ${s
- INSTALLED+=${localedir}/de/LC_MESSAGES/tcsh.cat
- ${localedir}/de/LC_MESSAGES/tcsh.cat: german.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- german.cat: ${srcdir}/german/charset ${srcdir}/german/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -59,7 +59,7 @@ german.cat: ${srcdir}/german/charset ${s
- INSTALLED+=${localedir}/gr/LC_MESSAGES/tcsh.cat
- ${localedir}/gr/LC_MESSAGES/tcsh.cat: greek.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- greek.cat: ${srcdir}/greek/charset ${srcdir}/greek/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -67,7 +67,7 @@ greek.cat: ${srcdir}/greek/charset ${src
- INSTALLED+=${localedir}/it/LC_MESSAGES/tcsh.cat
- ${localedir}/it/LC_MESSAGES/tcsh.cat: italian.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- italian.cat: ${srcdir}/italian/charset ${srcdir}/italian/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -75,7 +75,7 @@ italian.cat: ${srcdir}/italian/charset $
- INSTALLED+=${localedir}/ja/LC_MESSAGES/tcsh.cat
- ${localedir}/ja/LC_MESSAGES/tcsh.cat: ja.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- ja.cat: ${srcdir}/ja/charset ${srcdir}/ja/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -83,7 +83,7 @@ ja.cat: ${srcdir}/ja/charset ${srcdir}/j
- INSTALLED+=${localedir}/pl/LC_MESSAGES/tcsh.cat
- ${localedir}/pl/LC_MESSAGES/tcsh.cat: pl.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- pl.cat: ${srcdir}/pl/charset ${srcdir}/pl/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -91,7 +91,7 @@ pl.cat: ${srcdir}/pl/charset ${srcdir}/p
- INSTALLED+=${localedir}/ru/LC_MESSAGES/tcsh.cat
- ${localedir}/ru/LC_MESSAGES/tcsh.cat: russian.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
-
- russian.cat: ${srcdir}/russian/charset ${srcdir}/russian/*set[0-9]*
- @${CATGEN} $(GENCAT) $@ $^ $>
-@@ -99,7 +99,7 @@ russian.cat: ${srcdir}/russian/charset $
- INSTALLED+=${localedir}/es/LC_MESSAGES/tcsh.cat
- ${localedir}/es/LC_MESSAGES/tcsh.cat: spanish.cat
- mkdir -p $(@D)
-- $(INSTALL) $> $^ $@
-+ $(INSTALL_DATA) $> $^ $@
Home |
Main Index |
Thread Index |
Old Index