Sat Nov 13 06:50:04 2021 UTC ()
{,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.


(kim)
diff -r1.52 -r1.53 pkgsrc/shells/tcsh/distinfo
diff -r1.1 -r1.2 pkgsrc/shells/tcsh/patches/patch-Makefile.in
cvs diff -r1.52 -r1.53 pkgsrc/shells/tcsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/distinfo 2021/11/11 14:10:25 1.52
+++ pkgsrc/shells/tcsh/distinfo 2021/11/13 06:50:03 1.53
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.52 2021/11/11 14:10:25 kim Exp $ 1$NetBSD: distinfo,v 1.53 2021/11/13 06:50:03 kim Exp $
2 2
3BLAKE2s (tcsh-6.23.00.tar.gz) = a61b142efc2ca927cb33ea4eb87c0530cacc0c79ff1c30d5e9022a4404cef72d 3BLAKE2s (tcsh-6.23.00.tar.gz) = a61b142efc2ca927cb33ea4eb87c0530cacc0c79ff1c30d5e9022a4404cef72d
4SHA512 (tcsh-6.23.00.tar.gz) = 8ea491e9409f12ab113bf5551398cb827692a50340318b050d0f8278d3cd9c133ba89a407dc692d9c4bd69957ecd6d4d92db7ccfacc7064ace3b09e3bd562f30 4SHA512 (tcsh-6.23.00.tar.gz) = 8ea491e9409f12ab113bf5551398cb827692a50340318b050d0f8278d3cd9c133ba89a407dc692d9c4bd69957ecd6d4d92db7ccfacc7064ace3b09e3bd562f30
5Size (tcsh-6.23.00.tar.gz) = 1010250 bytes 5Size (tcsh-6.23.00.tar.gz) = 1010250 bytes
6SHA1 (patch-Makefile.in) = 6ec2bcee6029e733743a73d267aa51bfcc898843 6SHA1 (patch-Makefile.in) = 16ae4c595c8e23be1acbfa0263334df569300a79
7SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939 7SHA1 (patch-config_f.h) = 715d939e8a8f4917bd219dccd91d5c49ae502939
8SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7 8SHA1 (patch-nls_Makefile.in) = 58d859e8a50e6436b9bc6514497eb876426d92d7
9SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e 9SHA1 (patch-sh.h) = ac6211ddd5e552e9baec2d35aed5e7e573cab04e
cvs diff -r1.1 -r1.2 pkgsrc/shells/tcsh/patches/Attic/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/patches/Attic/patch-Makefile.in 2021/11/11 13:20:13 1.1
+++ pkgsrc/shells/tcsh/patches/Attic/patch-Makefile.in 2021/11/13 06:50:03 1.2
@@ -1,38 +1,52 @@ @@ -1,38 +1,52 @@
1$NetBSD: patch-Makefile.in,v 1.1 2021/11/11 13:20:13 kim Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2021/11/13 06:50:03 kim Exp $
2 2
3- Adjust mandir 3- Adjust mandir
4- Use BSD_INSTALL_* 4- Use INSTALL_DATA, INSTALL_PROGRAM, and MKDIR_P
5 5
6--- Makefile.in.orig 2015-08-24 16:09:04.000000000 -0400 6--- Makefile.in.orig 2021-11-11 09:54:05.000000000 +0000
7+++ Makefile.in 2016-11-24 10:43:07.000000000 -0500 7+++ Makefile.in 2021-11-13 06:25:54.773703072 +0000
8@@ -357,7 +357,7 @@ 8@@ -9,6 +9,10 @@
 9 ENVCMD=/usr/bin/env
 10 VERSION=@PACKAGE_VERSION@
 11 BUILD=tcsh$(EXEEXT)
 12+INSTALL=@INSTALL@
 13+INSTALL_DATA=@INSTALL_DATA@
 14+INSTALL_PROGRAM=@INSTALL_PROGRAM@
 15+MKDIR_P?=$(INSTALL) -d
 16 VPATH=@srcdir@
 17 srcdir=@srcdir@
 18
 19@@ -356,7 +360,8 @@
9 prefix=@prefix@ 20 prefix=@prefix@
10 exec_prefix=@exec_prefix@ 21 exec_prefix=@exec_prefix@
11 bindir=@bindir@ 22 bindir=@bindir@
12-mandir=@datarootdir@/man 23-mandir=@datarootdir@/man
 24+datarootdir=@datarootdir@
13+mandir=@mandir@ 25+mandir=@mandir@
14 MANSECT=1 26 MANSECT=1
15 DESTBIN=${DESTDIR}${bindir} 27 DESTBIN=${DESTDIR}${bindir}
16 DESTMAN=${DESTDIR}${mandir}/man${MANSECT} 28 DESTMAN=${DESTDIR}${mandir}/man${MANSECT}
17@@ -597,19 +597,13 @@ 29@@ -596,19 +601,15 @@
18 -strip ${DESTBIN}/tcsh$(EXEEXT) 30 -strip ${DESTBIN}/tcsh$(EXEEXT)
19  31
20 install: tcsh$(EXEEXT) install.catalogs install.man 32 install: tcsh$(EXEEXT) install.catalogs install.man
21- -mkdir -p ${DESTBIN} 33- -mkdir -p ${DESTBIN}
22- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old 34- -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old
23- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) 35- cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
24- chmod 755 ${DESTBIN}/tcsh$(EXEEXT) 36- chmod 755 ${DESTBIN}/tcsh$(EXEEXT)
25+ ${BSD_INSTALL_PROGRAM} tcsh${EXEEXT} ${DESTBIN}/tcsh${EXEEXT} 37+ $(MKDIR_P) ${DESTBIN}
 38+ $(INSTALL_PROGRAM) tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT)
26  39
27 install.catalogs: 40 install.catalogs:
28 @test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0 41 @test "x${BUILD_CATALOGS}" = "xyes" && (cd nls; ${MAKE} install DESTDIR=${DESTDIR}) || exit 0
29  42
30 install.man: tcsh.man 43 install.man: tcsh.man
31- -mkdir -p ${DESTMAN} 44- -mkdir -p ${DESTMAN}
32- -rm -f ${DESTMAN}/tcsh.${MANSECT} 45- -rm -f ${DESTMAN}/tcsh.${MANSECT}
33- cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT} 46- cp $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
34- chmod 444 ${DESTMAN}/tcsh.${MANSECT} 47- chmod 444 ${DESTMAN}/tcsh.${MANSECT}
35+ ${BSD_INSTALL_MAN} tcsh.man ${DESTMAN}/tcsh.${MANSECT} 48+ $(MKDIR_P) ${DESTMAN}
 49+ $(INSTALL_DATA) $(srcdir)/tcsh.man ${DESTMAN}/tcsh.${MANSECT}
36  50
37 # Amiga Unix 51 # Amiga Unix
38 #install.man: tcsh.man 52 #install.man: tcsh.man