From 826e119b6dfad51d944fb825af5a101e0e797ce0 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sat, 10 Jan 2004 06:56:15 +0000
Subject: 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.
---
 shells/Makefile                 |  4 ++--
 shells/standalone-tcsh/DESCR    |  5 -----
 shells/standalone-tcsh/Makefile | 28 ----------------------------
 shells/standalone-tcsh/PLIST    |  3 ---
 shells/tcsh-standalone/DESCR    |  5 +++++
 shells/tcsh-standalone/Makefile | 31 +++++++++++++++++++++++++++++++
 shells/tcsh-standalone/PLIST    |  3 +++
 7 files changed, 41 insertions(+), 38 deletions(-)
 delete mode 100644 shells/standalone-tcsh/DESCR
 delete mode 100644 shells/standalone-tcsh/Makefile
 delete mode 100644 shells/standalone-tcsh/PLIST
 create mode 100644 shells/tcsh-standalone/DESCR
 create mode 100644 shells/tcsh-standalone/Makefile
 create mode 100644 shells/tcsh-standalone/PLIST

(limited to 'shells')

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/DESCR b/shells/standalone-tcsh/DESCR
deleted file mode 100644
index 6894bee0893..00000000000
--- a/shells/standalone-tcsh/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-TCSH is an extended C-shell with many useful features like
-filename completion, history editing, etc.
-
-This version installs a statically-linked version of tcsh into
-/bin, for use as a standalone shell.
diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
deleted file mode 100644
index 37e5748f645..00000000000
--- a/shells/standalone-tcsh/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/09/18 22:59:38 grant Exp $
-#
-
-NO_MTREE=		YES
-
-PKGNAME=		standalone-${DISTNAME}
-WRKSRC=			${WRKDIR}/${DISTNAME}
-
-PKG_SHELL=		/bin/tcsh
-
-.include "../../shells/tcsh/Makefile"
-
-COMMENT:=		Standalone version of the Extended C-shell
-
-PATCH:=			${PATCH}
-PKG_INFO:=		${PKG_INFO}
-PKG_CREATE:=		${PKG_CREATE}
-PREFIX=			/
-NLSDIR=			usr/share/nls
-CONFIGURE_ARGS=		--prefix=${PREFIX} --bindir=/bin
-CONFIGURE_ARGS+=	--mandir=/usr/share/man
-
-DISTINFO_FILE=		${.CURDIR}/../../shells/tcsh/distinfo
-PATCHDIR=		${.CURDIR}/../../shells/tcsh/patches
-
-.if ${OPSYS} != "SunOS"
-LDFLAGS+=		-static
-.endif
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/tcsh-standalone/DESCR b/shells/tcsh-standalone/DESCR
new file mode 100644
index 00000000000..6894bee0893
--- /dev/null
+++ b/shells/tcsh-standalone/DESCR
@@ -0,0 +1,5 @@
+TCSH is an extended C-shell with many useful features like
+filename completion, history editing, etc.
+
+This version installs a statically-linked version of tcsh into
+/bin, for use as a standalone shell.
diff --git a/shells/tcsh-standalone/Makefile b/shells/tcsh-standalone/Makefile
new file mode 100644
index 00000000000..ea763ddc18c
--- /dev/null
+++ b/shells/tcsh-standalone/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2004/01/10 06:56:15 grant Exp $
+#
+
+NO_MTREE=		YES
+
+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"
+
+COMMENT:=		Standalone version of the Extended C-shell
+
+PATCH:=			${PATCH}
+PKG_INFO:=		${PKG_INFO}
+PKG_CREATE:=		${PKG_CREATE}
+PREFIX=			/
+NLSDIR=			usr/share/nls
+CONFIGURE_ARGS=		--prefix=${PREFIX} --bindir=/bin
+CONFIGURE_ARGS+=	--mandir=/usr/share/man
+
+DISTINFO_FILE=		${.CURDIR}/../../shells/tcsh/distinfo
+PATCHDIR=		${.CURDIR}/../../shells/tcsh/patches
+
+.if ${OPSYS} != "SunOS"
+LDFLAGS+=		-static
+.endif
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
-- 
cgit v1.2.3