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

4 files changed, 59 insertions, 53 deletions

diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index d65aff941c7..70c774167a5 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -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 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-* OpenBSD-*-* SunOS-*-*
 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 @@ DISTINFO_FILE=		${.CURDIR}/../../shells/tcsh/distinfo
 .if ${OPSYS} != "SunOS"
 LDFLAGS+=		-static
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/static-tcsh/Makefile b/shells/static-tcsh/Makefile
index 6fe8d7bb44e..684148b11f1 100644
--- a/shells/static-tcsh/Makefile
+++ b/shells/static-tcsh/Makefile
@@ -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
 
 DISTINFO_FILE=		${.CURDIR}/../../shells/tcsh/distinfo
@@ -11,13 +13,12 @@ DESCR_SRC=		${.CURDIR}/../../shells/tcsh/DESCR ${.CURDIR}/DESCR
 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 --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index b3943cfe736..89e9d695766 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -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
+# $NetBSD: Makefile,v 1.100 2021/11/11 22:47:55 kim Exp $
 
-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/
+.include "../../shells/tcsh/Makefile.common"
 
-MAINTAINER?=	pkgsrc-users@NetBSD.org	# 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
-
-.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"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/tcsh/Makefile.common b/shells/tcsh/Makefile.common
new file mode 100644
index 00000000000..c83ea005eee
--- /dev/null
+++ b/shells/tcsh/Makefile.common
@@ -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
+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"