CVS commit: pkgsrc/shells/tcsh

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Thu Nov 11 13:20:13 UTC 2021

Modified Files:
        pkgsrc/shells/tcsh: distinfo
Added Files:
        pkgsrc/shells/tcsh/patches: patch-Makefile.in patch-config_f.h
Removed Files:
        pkgsrc/shells/tcsh/patches: patch-aa patch-ab

Log Message:
Rename legacy patch file names

* patch-aa --> patch-Makefile.in
* patch-ab --> patch-config_f.h


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/shells/tcsh/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/tcsh/patches/patch-Makefile.in \
    pkgsrc/shells/tcsh/patches/patch-config_f.h
cvs rdiff -u -r1.16 -r0 pkgsrc/shells/tcsh/patches/patch-aa
cvs rdiff -u -r1.13 -r0 pkgsrc/shells/tcsh/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/tcsh/distinfo
diff -u pkgsrc/shells/tcsh/distinfo:1.49 pkgsrc/shells/tcsh/distinfo:1.50
--- pkgsrc/shells/tcsh/distinfo:1.49    Thu Nov 11 10:46:04 2021
+++ pkgsrc/shells/tcsh/distinfo Thu Nov 11 13:20:12 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.49 2021/11/11 10:46:04 kim Exp $
+$NetBSD: distinfo,v 1.50 2021/11/11 13:20:12 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-aa) = 6ec2bcee6029e733743a73d267aa51bfcc898843
-SHA1 (patch-ab) = 715d939e8a8f4917bd219dccd91d5c49ae502939
+SHA1 (patch-Makefile.in) = 6ec2bcee6029e733743a73d267aa51bfcc898843
+SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939
 SHA1 (patch-configure) = 6970c041a66910325d1fb53ebf8ab3627d764778
 SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e

Added files:

Index: pkgsrc/shells/tcsh/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-Makefile.in:1.1
--- /dev/null   Thu Nov 11 13:20:13 2021
+++ pkgsrc/shells/tcsh/patches/patch-Makefile.in        Thu Nov 11 13:20:13 2021
@@ -0,0 +1,38 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/11/11 13:20:13 kim Exp $
+
+- Adjust mandir
+- Use BSD_INSTALL_*
+
+--- Makefile.in.orig   2015-08-24 16:09:04.000000000 -0400
++++ Makefile.in        2016-11-24 10:43:07.000000000 -0500
+@@ -357,7 +357,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+-mandir=@datarootdir@/man
++mandir=@mandir@
+ MANSECT=1
+ DESTBIN=${DESTDIR}${bindir}
+ DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
+@@ -597,19 +597,13 @@
+       -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)
++      ${BSD_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}
++      ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT}
+ 
+ # Amiga Unix
+ #install.man: tcsh.man
Index: pkgsrc/shells/tcsh/patches/patch-config_f.h
diff -u /dev/null pkgsrc/shells/tcsh/patches/patch-config_f.h:1.1
--- /dev/null   Thu Nov 11 13:20:13 2021
+++ pkgsrc/shells/tcsh/patches/patch-config_f.h Thu Nov 11 13:20:13 2021
@@ -0,0 +1,36 @@
+$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