Add static version of ast-ksh.

Requested by Steven M. Bellovin <smb at netbsd dot org> on
netbsd-users@netbsd.org.

5 files changed, 87 insertions, 59 deletions

diff --git a/shells/Makefile b/shells/Makefile
index 8943afd857b..0c4448811a2 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/04/20 16:28:24 cjep Exp $
+# $NetBSD: Makefile,v 1.22 2003/05/31 16:14:47 uebayasi Exp $
 #
 
 COMMENT=	Shells
@@ -15,6 +15,7 @@ SUBDIR+=	perlsh
 SUBDIR+=	rc
 SUBDIR+=	scsh
 SUBDIR+=	standalone-tcsh
+SUBDIR+=	static-ast-ksh
 SUBDIR+=	static-bash2
 SUBDIR+=	static-tcsh
 SUBDIR+=	tcsh
diff --git a/shells/ast-ksh/Makefile b/shells/ast-ksh/Makefile
index b80bb91b432..b484665d4b2 100644
--- a/shells/ast-ksh/Makefile
+++ b/shells/ast-ksh/Makefile
@@ -1,59 +1,5 @@
-# $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
-# $NetBSD: Makefile,v 1.9 2003/05/28 01:22:43 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/31 16:14:47 uebayasi Exp $
+#
+.include "Makefile.common"
 
-DISTNAME=	ast-ksh-${ASTKSH_VERSION}
-PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
-WRKSRC=		${WRKDIR}
-CATEGORIES=	shells
-MASTER_SITES=	http://www.research.att.com/~gsf/download/tgz/
-DISTFILES=	INIT.${ASTKSH_VERSION}.tgz ast-ksh.${ASTKSH_VERSION}.tgz
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.kornshell.com/
-COMMENT=	official AT&T release of KornShell 93
-
-RESTRICTED=	"Terms for redistribution are not yet clear."
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-
-# needs pdksh
-ONLY_FOR_PLATFORM=	NetBSD-*
-
-ASTKSH_VERSION=	2003-04-22
-
-USE_BUILDLINK2=	YES
-USE_PKGINSTALL=	YES
-MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS}"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PDKSH=		/bin/ksh
-.endif
-
-PKG_SHELL=	${PREFIX}/bin/ksh93
-
-# XXX Note that this 'make' is not an executable command, but a target name
-# ./bin/package uses.
-do-build:
-	@cd ${WRKSRC}; \
-		${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package make
-
-do-install:
-	@arch=`${WRKSRC}/bin/package host`; \
-		${INSTALL_PROGRAM} ${WRKSRC}/arch/$${arch}/bin/ksh \
-			${PREFIX}/bin/ksh93; \
-		${INSTALL_MAN} ${WRKSRC}/arch/$${arch}/man/man1/sh.1 \
-			${PREFIX}/man/man1/ksh93.1
-
-# Part of regression test
-do-test:
-	@cd ${WRKSRC}/src/cmd/ksh93/tests && \
-		${SETENV} SHELL=${PREFIX}/bin/ksh93 ${PREFIX}/bin/ksh93 shtests
-# XXX Their 'test' target needs nmake (Korn's another tool)
-#	@cd ${WRKSRC}; \
-#		${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package test
-
-.include "../../mk/bsd.pkg.mk"
+.include "Makefile.include"
diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
new file mode 100644
index 00000000000..552363acd1c
--- /dev/null
+++ b/shells/ast-ksh/Makefile.common
@@ -0,0 +1,64 @@
+# $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
+# $NetBSD: Makefile.common,v 1.1 2003/05/31 16:14:47 uebayasi Exp $
+
+DISTNAME=	ast-ksh-${ASTKSH_VERSION}
+PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
+WRKSRC=		${WRKDIR}
+CATEGORIES=	shells
+MASTER_SITES=	http://www.research.att.com/~gsf/download/tgz/
+DISTFILES=	INIT.${ASTKSH_VERSION}.tgz ast-ksh.${ASTKSH_VERSION}.tgz
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.kornshell.com/
+COMMENT=	official AT&T release of KornShell 93
+
+CONFLICTS=	static-ast-ksh-[0-9]*
+KSH93_MAKEFLAGS=
+
+RESTRICTED=	"Terms for redistribution are not yet clear."
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+NO_SRC_ON_CDROM=${RESTRICTED}
+NO_SRC_ON_FTP=	${RESTRICTED}
+
+# needs pdksh
+ONLY_FOR_PLATFORM=	NetBSD-*
+
+ASTKSH_VERSION=	2003-04-22
+
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS}"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+PDKSH=		/bin/ksh
+.endif
+
+PKG_SHELL=	${PREFIX}/bin/ksh93
+
+# ${KSH93_MAKEFLAGS} is set as "LDFLAGS=-static" only when built as a
+# static binary.
+#
+# XXX Note that 'make' here is not an executable command name, but a target
+# name which the ./bin/package script uses.
+do-build:
+	@cd ${WRKSRC}; \
+		${SETENV} SHELL=${PDKSH} \
+			${PDKSH} ./bin/package make ${KSH93_MAKEFLAGS}
+
+do-install:
+	@arch=`${WRKSRC}/bin/package host`; \
+		${INSTALL_PROGRAM} ${WRKSRC}/arch/$${arch}/bin/ksh \
+			${PREFIX}/bin/ksh93; \
+		${INSTALL_MAN} ${WRKSRC}/arch/$${arch}/man/man1/sh.1 \
+			${PREFIX}/man/man1/ksh93.1
+
+# Part of regression test
+do-test:
+	@cd ${WRKSRC}/src/cmd/ksh93/tests && \
+		${SETENV} SHELL=${PREFIX}/bin/ksh93 ${PREFIX}/bin/ksh93 shtests
+# XXX Their 'test' target needs nmake (Korn's another tool)
+#	@cd ${WRKSRC}; \
+#		${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package test
diff --git a/shells/ast-ksh/Makefile.include b/shells/ast-ksh/Makefile.include
new file mode 100644
index 00000000000..4a7ea41fe5b
--- /dev/null
+++ b/shells/ast-ksh/Makefile.include
@@ -0,0 +1 @@
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile
new file mode 100644
index 00000000000..695c2bd1d7d
--- /dev/null
+++ b/shells/static-ast-ksh/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2003/05/31 16:14:47 uebayasi Exp $
+#
+.include "../../shells/ast-ksh/Makefile.common"
+
+CONFLICTS=	ast-ksh-[0-9]*	# Override.
+
+DISTINFO_FILE=	${.CURDIR}/../../shells/ast-ksh/distinfo
+PATCHDIR=	${.CURDIR}/../../shells/ast-ksh/patches
+PKGDIR=		${.CURDIR}/../../shells/ast-ksh
+
+PKGNAME:=	static-${PKGNAME}
+COMMENT:=	Statically-linked version of the ${COMMENT}
+
+KSH93_MAKEFLAGS=LDFLAGS=-static
+
+.include "../../shells/ast-ksh/Makefile.include"