[pkgsrc/trunk]: pkgsrc/shells rename static-bash to bash-static. the conventi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e43e90dfb85
branches:  trunk
changeset: 466010:8e43e90dfb85
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jan 10 07:06:44 2004 +0000

description:
rename static-bash to bash-static. the convention in pkgsrc is
for mutations of packages to be named <pkg>-<mutation>.

add a CONFLICT on static-bash for obvious reasons.

diffstat:

 shells/Makefile              |   4 ++--
 shells/bash2-static/Makefile |  17 +++++++++++++++++
 shells/static-bash2/Makefile |  16 ----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diffs (66 lines):

diff -r 33761046d6ec -r 8e43e90dfb85 shells/Makefile
--- a/shells/Makefile   Sat Jan 10 07:04:02 2004 +0000
+++ b/shells/Makefile   Sat Jan 10 07:06:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/10 07:04:02 grant Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/10 07:06:44 grant Exp $
 #
 
 COMMENT=       Shells
@@ -7,6 +7,7 @@
 SUBDIR+=       ast-ksh-static
 SUBDIR+=       bash2
 SUBDIR+=       bash2-doc
+SUBDIR+=       bash2-static
 SUBDIR+=       es
 SUBDIR+=       esh
 SUBDIR+=       mudsh
@@ -15,7 +16,6 @@
 SUBDIR+=       perlsh
 SUBDIR+=       rc
 SUBDIR+=       scsh
-SUBDIR+=       static-bash2
 SUBDIR+=       tcsh
 SUBDIR+=       tcsh-standalone
 SUBDIR+=       tcsh-static
diff -r 33761046d6ec -r 8e43e90dfb85 shells/bash2-static/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/bash2-static/Makefile      Sat Jan 10 07:06:44 2004 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2004/01/10 07:06:44 grant Exp $
+#
+
+DISTINFO_FILE=         ${.CURDIR}/../../shells/bash2/distinfo
+PATCHDIR=              ${.CURDIR}/../../shells/bash2/patches
+PKGDIR=                        ${.CURDIR}/../../shells/bash2
+
+CONFLICTS=             bash-[0-9]*
+CONFLICTS+=            static-bash-[0-9]*
+
+.include "../../shells/bash2/Makefile"
+
+WRKSRC:=               ${WRKDIR}/${DISTNAME}
+PKGNAME:=              ${PKGBASE}-static-${PKGVERSION}
+COMMENT:=              Statically-linked version of the ${COMMENT}
+
+LDFLAGS+=              -static
diff -r 33761046d6ec -r 8e43e90dfb85 shells/static-bash2/Makefile
--- a/shells/static-bash2/Makefile      Sat Jan 10 07:04:02 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2002/09/30 07:59:32 martti Exp $
-#
-
-DISTINFO_FILE=         ${.CURDIR}/../../shells/bash2/distinfo
-PATCHDIR=              ${.CURDIR}/../../shells/bash2/patches
-PKGDIR=                        ${.CURDIR}/../../shells/bash2
-
-CONFLICTS=             bash-[0-9]*
-
-.include "../../shells/bash2/Makefile"
-
-WRKSRC:=               ${WRKDIR}/${DISTNAME}
-PKGNAME:=              static-${DISTNAME}
-COMMENT:=              Statically-linked version of the ${COMMENT}
-
-LDFLAGS+=              -static