summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorgrant <grant>2004-01-10 06:56:15 +0000
committergrant <grant>2004-01-10 06:56:15 +0000
commit89ff2fa8c3a46d606020188d9e254aecff6cb122 (patch)
tree2f6dfe8e801f074f2ec2c30a2d6287609d9cdda0 /shells
parent37439ad0c4227c9f8e6b70d183ea8cef89245af2 (diff)
downloadpkgsrc-89ff2fa8c3a46d606020188d9e254aecff6cb122.tar.gz
rename standalone-tcsh to tcsh-standalone. the convention in pkgsrc is
for mutations of packages to be named <pkg>-<mutation>. add a CONFLICT on standalone-tcsh for obvious reasons.
Diffstat (limited to 'shells')
-rw-r--r--shells/Makefile4
-rw-r--r--shells/standalone-tcsh/PLIST3
-rw-r--r--shells/tcsh-standalone/DESCR (renamed from shells/standalone-tcsh/DESCR)0
-rw-r--r--shells/tcsh-standalone/Makefile (renamed from shells/standalone-tcsh/Makefile)7
-rw-r--r--shells/tcsh-standalone/PLIST3
5 files changed, 10 insertions, 7 deletions
diff --git a/shells/Makefile b/shells/Makefile
index 27ab5c053ec..a98e887c29d 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/10 06:53:45 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/10 06:56:15 grant Exp $
#
COMMENT= Shells
@@ -14,10 +14,10 @@ SUBDIR+= pdksh
SUBDIR+= perlsh
SUBDIR+= rc
SUBDIR+= scsh
-SUBDIR+= standalone-tcsh
SUBDIR+= static-ast-ksh
SUBDIR+= static-bash2
SUBDIR+= tcsh
+SUBDIR+= tcsh-standalone
SUBDIR+= tcsh-static
SUBDIR+= zsh
SUBDIR+= zsh-current
diff --git a/shells/standalone-tcsh/PLIST b/shells/standalone-tcsh/PLIST
deleted file mode 100644
index 17d26995f3e..00000000000
--- a/shells/standalone-tcsh/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/17 09:02:01 salo Exp $
-bin/tcsh
-usr/share/man/man1/tcsh.1
diff --git a/shells/standalone-tcsh/DESCR b/shells/tcsh-standalone/DESCR
index 6894bee0893..6894bee0893 100644
--- a/shells/standalone-tcsh/DESCR
+++ b/shells/tcsh-standalone/DESCR
diff --git a/shells/standalone-tcsh/Makefile b/shells/tcsh-standalone/Makefile
index 37e5748f645..ea763ddc18c 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/tcsh-standalone/Makefile
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2003/09/18 22:59:38 grant Exp $
+# $NetBSD: Makefile,v 1.1 2004/01/10 06:56:15 grant Exp $
#
NO_MTREE= YES
-PKGNAME= standalone-${DISTNAME}
+PKGNAME= ${DISTNAME:C|-.*||}-standalone${DISTNAME:C|[^-]*||}
WRKSRC= ${WRKDIR}/${DISTNAME}
+# this package used to be called 'standalone-tcsh'
+CONFLICTS+= standalone-tcsh-[0-9]*
+
PKG_SHELL= /bin/tcsh
.include "../../shells/tcsh/Makefile"
diff --git a/shells/tcsh-standalone/PLIST b/shells/tcsh-standalone/PLIST
new file mode 100644
index 00000000000..d204af76258
--- /dev/null
+++ b/shells/tcsh-standalone/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2004/01/10 06:56:15 grant Exp $
+bin/tcsh
+usr/share/man/man1/tcsh.1