CVS commit: pkgsrc/shells/tcsh

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

Module Name:    pkgsrc
Committed By:   kim
Date:           Sat Nov 13 06:50:04 UTC 2021

Modified Files:
        pkgsrc/shells/tcsh: distinfo
        pkgsrc/shells/tcsh/patches: patch-Makefile.in

Log Message:
{,standalone-,static-}tcsh: Bring back creating install directories

Installing into DESTDIR failed in standalone-tcsh while it used to work
thanks to the tcsh Makefile creating install directories.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/shells/tcsh/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/tcsh/patches/patch-Makefile.in

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.52 pkgsrc/shells/tcsh/distinfo:1.53
--- pkgsrc/shells/tcsh/distinfo:1.52    Thu Nov 11 14:10:25 2021
+++ pkgsrc/shells/tcsh/distinfo Sat Nov 13 06:50:03 2021
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.52 2021/11/11 14:10:25 kim Exp $
+$NetBSD: distinfo,v 1.53 2021/11/13 06:50:03 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) = 6ec2bcee6029e733743a73d267aa51bfcc898843
+SHA1 (patch-Makefile.in) = 16ae4c595c8e23be1acbfa0263334df569300a79
 SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939
 SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
 SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e

Index: pkgsrc/shells/tcsh/patches/patch-Makefile.in
diff -u pkgsrc/shells/tcsh/patches/patch-Makefile.in:1.1 pkgsrc/shells/tcsh/patches/patch-Makefile.in:1.2
--- pkgsrc/shells/tcsh/patches/patch-Makefile.in:1.1    Thu Nov 11 13:20:13 2021
+++ pkgsrc/shells/tcsh/patches/patch-Makefile.in        Sat Nov 13 06:50:03 2021
@@ -1,20 +1,32 @@
-$NetBSD: patch-Makefile.in,v 1.1 2021/11/11 13:20:13 kim Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2021/11/13 06:50:03 kim Exp $
 
 - Adjust mandir
-- Use BSD_INSTALL_*
+- Use INSTALL_DATA, INSTALL_PROGRAM, and MKDIR_P
 
---- 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 @@
+--- 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}
-@@ -597,19 +597,13 @@
+@@ -596,19 +601,15 @@
        -strip ${DESTBIN}/tcsh$(EXEEXT)
  
  install: tcsh$(EXEEXT) install.catalogs install.man
@@ -22,7 +34,8 @@ $NetBSD: patch-Makefile.in,v 1.1 2021/11
 -      -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}
++      $(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
@@ -32,7 +45,8 @@ $NetBSD: patch-Makefile.in,v 1.1 2021/11
 -      -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}
++      $(MKDIR_P) ${DESTMAN}
++      $(INSTALL_DATA) $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
  
  # Amiga Unix
  #install.man: tcsh.man