[pkgsrc/trunk]: pkgsrc/shells {,standalone-,static-}tcsh: Use shells/tcsh/Mak...

[kim <kim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9b7df99306c6
branches:  trunk
changeset: 769302:9b7df99306c6
user:      kim <kim%pkgsrc.org@localhost>
date:      Thu Nov 11 22:47:55 2021 +0000

description:
{,standalone-,static-}tcsh: Use shells/tcsh/Makefile.common

diffstat:

 shells/standalone-tcsh/Makefile |   9 ++++---
 shells/static-tcsh/Makefile     |   9 ++++---
 shells/tcsh/Makefile            |  47 +---------------------------------------
 shells/tcsh/Makefile.common     |  47 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 53 deletions(-)

diffs (168 lines):

diff -r 637ad5e5f166 -r 9b7df99306c6 shells/standalone-tcsh/Makefile
--- a/shells/standalone-tcsh/Makefile   Thu Nov 11 19:53:09 2021 +0000
+++ b/shells/standalone-tcsh/Makefile   Thu Nov 11 22:47:55 2021 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.29 2019/05/09 11:32:36 leot Exp $
+# $NetBSD: Makefile,v 1.30 2021/11/11 22:47:55 kim Exp $
 #
 
+.include "../../shells/tcsh/Makefile.common"
+
 # FIXME: This is because of PREFIX=/ below.
 CHECK_FILES_SUPPORTED= no
 NOT_FOR_UNPRIVILEGED=  yes
 
 PKGNAME=               standalone-${DISTNAME}
-PKGREVISION=           0       # ALWAYS needs to be set; 0 if none.
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
 PATCHDIR=              ${.CURDIR}/../../shells/tcsh/patches
@@ -22,8 +23,6 @@
 NOT_FOR_PLATFORM+=     SunOS-*-*
 .endif
 
-.include "../../shells/tcsh/Makefile"
-
 INSTALLATION_DIRS+=    usr/share/man/man1
 
 COMMENT:=              Standalone version of the Extended C-shell
@@ -43,3 +42,5 @@
 .if ${OPSYS} != "SunOS"
 LDFLAGS+=              -static
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff -r 637ad5e5f166 -r 9b7df99306c6 shells/static-tcsh/Makefile
--- a/shells/static-tcsh/Makefile       Thu Nov 11 19:53:09 2021 +0000
+++ b/shells/static-tcsh/Makefile       Thu Nov 11 22:47:55 2021 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2019/05/09 11:32:36 leot Exp $
+# $NetBSD: Makefile,v 1.12 2021/11/11 22:47:55 kim Exp $
 #
 
+.include "../../shells/tcsh/Makefile.common"
+
 MAINTAINER=            agc%NetBSD.org@localhost
 
 DISTINFO_FILE=         ${.CURDIR}/../../shells/tcsh/distinfo
@@ -11,13 +13,12 @@
 CONFLICTS=             tcsh-[0-9]*
 
 PKGNAME=               static-${DISTNAME}
-PKGREVISION=           0       # ALWAYS needs to be set; 0 if none.
 
 # SunOS 5.10 stopped shipping static libraries.
 NOT_FOR_PLATFORM+=     SunOS-5.1[0-9]-*
 
-.include "../../shells/tcsh/Makefile"
-
 COMMENT:=              Statically-linked version of the ${COMMENT}
 
 LDFLAGS+=              -static
+
+.include "../../mk/bsd.pkg.mk"
diff -r 637ad5e5f166 -r 9b7df99306c6 shells/tcsh/Makefile
--- a/shells/tcsh/Makefile      Thu Nov 11 19:53:09 2021 +0000
+++ b/shells/tcsh/Makefile      Thu Nov 11 22:47:55 2021 +0000
@@ -1,48 +1,5 @@
-# $NetBSD: Makefile,v 1.99 2021/11/11 10:46:04 kim Exp $
-#
-# used by shells/standalone-tcsh/Makefile
-# used by shells/static-tcsh/Makefile
-
-DISTNAME=      tcsh-6.23.00
-PKGREVISION?=  0                       # use ?= to allow for overrides.
-CATEGORIES=    shells
-MASTER_SITES=  ftp://ftp.astron.com/pub/tcsh/
-MASTER_SITES+= http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
-
-MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost       # use ?= to allow for overrides.
-HOMEPAGE=      https://www.tcsh.org/
-COMMENT=       Extended C-shell with many useful features
-LICENSE=       original-bsd
-
-CONFLICTS?=    static-tcsh-[0-9]*      # use ?= to allow for overrides.
-
-GNU_CONFIGURE= yes
-USE_TOOLS+=    autoconf:test perl:test
-
-EGDIR=         ${PREFIX}/share/examples/tcsh
+# $NetBSD: Makefile,v 1.100 2021/11/11 22:47:55 kim Exp $
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-LOWER_OPSYS_VERSUFFIX= ${OS_VERSION:S/5./2./}
-.endif
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-# XXX Should use CONFIGURE_ENV, but the configure script disregards
-# $CC_FOR_GETHOST in the environment and sets it to cc.
-MAKE_FLAGS+=   CC_FOR_GETHOST=${NATIVE_CC:Q}
-.endif
+.include "../../shells/tcsh/Makefile.common"
 
-TEST_TARGET=   check
-
-PKG_SHELL?=    bin/tcsh
-
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
-
-post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/complete.tcsh ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/csh-mode.el ${DESTDIR}${EGDIR}
-
-.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 637ad5e5f166 -r 9b7df99306c6 shells/tcsh/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/tcsh/Makefile.common       Thu Nov 11 22:47:55 2021 +0000
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile.common,v 1.1 2021/11/11 22:47:55 kim Exp $
+#
+# used by shells/standalone-tcsh/Makefile
+# used by shells/static-tcsh/Makefile
+# used by shells/tcsh/Makefile
+
+DISTNAME=      tcsh-6.23.00
+CATEGORIES=    shells
+MASTER_SITES=  ftp://ftp.astron.com/pub/tcsh/
+MASTER_SITES+= http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.tcsh.org/
+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
+
+EGDIR=         ${PREFIX}/share/examples/tcsh
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+LOWER_OPSYS_VERSUFFIX= ${OS_VERSION:S/5./2./}
+.endif
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+# XXX Should use CONFIGURE_ENV, but the configure script disregards
+# $CC_FOR_GETHOST in the environment and sets it to cc.
+MAKE_FLAGS+=   CC_FOR_GETHOST=${NATIVE_CC:Q}
+.endif
+
+TEST_TARGET=   check
+
+PKG_SHELL=     bin/tcsh
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
+
+post-install:
+       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/complete.tcsh ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/csh-mode.el ${DESTDIR}${EGDIR}
+
+.include "../../mk/termcap.buildlink3.mk"