From 2a77c2bb84785155857285a87cab0760b3b224b2 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sat, 10 Jan 2004 07:04:02 +0000
Subject: rename static-ast-ksh to ast-ksh-static. the convention in pkgsrc is
 for mutations of packages to be named <pkg>-<mutation>.

add a CONFLICT on static-ast-ksh for obvious reasons.
---
 shells/Makefile                |  4 ++--
 shells/ast-ksh-static/Makefile | 18 ++++++++++++++++++
 shells/static-ast-ksh/Makefile | 16 ----------------
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 shells/ast-ksh-static/Makefile
 delete mode 100644 shells/static-ast-ksh/Makefile

(limited to 'shells')

diff --git a/shells/Makefile b/shells/Makefile
index a98e887c29d..e14a4c38326 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2004/01/10 06:56:15 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/10 07:04:02 grant Exp $
 #
 
 COMMENT=	Shells
 
 SUBDIR+=	ast-ksh
+SUBDIR+=	ast-ksh-static
 SUBDIR+=	bash2
 SUBDIR+=	bash2-doc
 SUBDIR+=	es
@@ -14,7 +15,6 @@ SUBDIR+=	pdksh
 SUBDIR+=	perlsh
 SUBDIR+=	rc
 SUBDIR+=	scsh
-SUBDIR+=	static-ast-ksh
 SUBDIR+=	static-bash2
 SUBDIR+=	tcsh
 SUBDIR+=	tcsh-standalone
diff --git a/shells/ast-ksh-static/Makefile b/shells/ast-ksh-static/Makefile
new file mode 100644
index 00000000000..4ed2d840373
--- /dev/null
+++ b/shells/ast-ksh-static/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2004/01/10 07:04:02 grant Exp $
+#
+.include "../../shells/ast-ksh/Makefile.common"
+
+CONFLICTS=	ast-ksh-[0-9]*	# Override.
+CONFLICTS+=	static-ast-ksh-[0-9]*
+
+DISTINFO_FILE=	${.CURDIR}/../../shells/ast-ksh/distinfo
+PATCHDIR=	${.CURDIR}/../../shells/ast-ksh/patches
+PKGDIR=		${.CURDIR}/../../shells/ast-ksh
+
+PKGVERSION:=	${PKGNAME:C|^.*-||}
+PKGNAME:=	ast-ksh-static-${PKGVERSION}
+COMMENT:=	Statically-linked version of the ${COMMENT}
+
+KSH93_MAKEFLAGS=LDFLAGS=-static
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/shells/static-ast-ksh/Makefile b/shells/static-ast-ksh/Makefile
deleted file mode 100644
index b8671810ad3..00000000000
--- a/shells/static-ast-ksh/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/08/11 17:27:58 wiz 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 "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3