summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
Diffstat (limited to 'shells')
-rw-r--r--shells/Makefile10
-rw-r--r--shells/standalone-tcsh/DESCR (renamed from shells/tcsh-standalone/DESCR)0
-rw-r--r--shells/standalone-tcsh/Makefile (renamed from shells/tcsh-standalone/Makefile)7
-rw-r--r--shells/standalone-tcsh/PLIST3
-rw-r--r--shells/static-ast-ksh/Makefile (renamed from shells/ast-ksh-static/Makefile)6
-rw-r--r--shells/static-bash2/Makefile (renamed from shells/bash2-static/Makefile)5
-rw-r--r--shells/static-tcsh/Makefile (renamed from shells/tcsh-static/Makefile)5
-rw-r--r--shells/tcsh-standalone/PLIST3
8 files changed, 16 insertions, 23 deletions
diff --git a/shells/Makefile b/shells/Makefile
index 7516faabd03..a727ccd02ae 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2004/01/10 17:06:37 cjep Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/11 23:06:54 grant Exp $
#
COMMENT= Shells
SUBDIR+= ast-ksh
-SUBDIR+= ast-ksh-static
SUBDIR+= bash2
SUBDIR+= bash2-doc
-SUBDIR+= bash2-static
SUBDIR+= es
SUBDIR+= esh
SUBDIR+= mudsh
@@ -17,9 +15,11 @@ SUBDIR+= pdksh
SUBDIR+= perlsh
SUBDIR+= rc
SUBDIR+= scsh
+SUBDIR+= standalone-tcsh
+SUBDIR+= static-ast-ksh
+SUBDIR+= static-bash2
+SUBDIR+= static-tcsh
SUBDIR+= tcsh
-SUBDIR+= tcsh-standalone
-SUBDIR+= tcsh-static
SUBDIR+= zsh
SUBDIR+= zsh-current
SUBDIR+= zsh3
diff --git a/shells/tcsh-standalone/DESCR b/shells/standalone-tcsh/DESCR
index 6894bee0893..6894bee0893 100644
--- a/shells/tcsh-standalone/DESCR
+++ b/shells/standalone-tcsh/DESCR
diff --git a/shells/tcsh-standalone/Makefile b/shells/standalone-tcsh/Makefile
index ea763ddc18c..bd3bd4f67c1 100644
--- a/shells/tcsh-standalone/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2004/01/10 06:56:15 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/11 23:06:54 grant Exp $
#
NO_MTREE= YES
-PKGNAME= ${DISTNAME:C|-.*||}-standalone${DISTNAME:C|[^-]*||}
+PKGNAME= standalone-${DISTNAME}
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/standalone-tcsh/PLIST b/shells/standalone-tcsh/PLIST
new file mode 100644
index 00000000000..287e8ac8b91
--- /dev/null
+++ b/shells/standalone-tcsh/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.4 2004/01/11 23:06:54 grant Exp $
+bin/tcsh
+usr/share/man/man1/tcsh.1
diff --git a/shells/ast-ksh-static/Makefile b/shells/static-ast-ksh/Makefile
index 9d6889fd655..811e82b37f6 100644
--- a/shells/ast-ksh-static/Makefile
+++ b/shells/static-ast-ksh/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2004/01/10 07:09:26 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/11 23:06:54 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:= ${PKGBASE}-static-${PKGVERSION}
+PKGNAME:= static-${PKGNAME}
COMMENT:= Statically-linked version of the ${COMMENT}
KSH93_MAKEFLAGS=LDFLAGS=-static
diff --git a/shells/bash2-static/Makefile b/shells/static-bash2/Makefile
index 34a5780c971..cf238b0c2a9 100644
--- a/shells/bash2-static/Makefile
+++ b/shells/static-bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/01/10 07:06:44 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/11 23:06:54 grant Exp $
#
DISTINFO_FILE= ${.CURDIR}/../../shells/bash2/distinfo
@@ -6,12 +6,11 @@ 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}
+PKGNAME:= static-${DISTNAME}
COMMENT:= Statically-linked version of the ${COMMENT}
LDFLAGS+= -static
diff --git a/shells/tcsh-static/Makefile b/shells/static-tcsh/Makefile
index 856a45832ea..b90fae33c92 100644
--- a/shells/tcsh-static/Makefile
+++ b/shells/static-tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/01/10 06:53:45 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/11 23:06:54 grant Exp $
#
DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo
@@ -6,12 +6,11 @@ PATCHDIR= ${.CURDIR}/../../shells/tcsh/patches
PKGDIR= ${.CURDIR}/../../shells/tcsh
CONFLICTS= tcsh-[0-9]*
-CONFLICTS+= static-tcsh-[0-9]*
.include "../../shells/tcsh/Makefile"
WRKSRC:= ${WRKDIR}/${DISTNAME}
-PKGNAME:= ${DISTNAME:C|-.*||}-static${DISTNAME:C|[^-]*||}
+PKGNAME:= static-${DISTNAME}
COMMENT:= Statically-linked version of the ${COMMENT}
LDFLAGS+= -static
diff --git a/shells/tcsh-standalone/PLIST b/shells/tcsh-standalone/PLIST
deleted file mode 100644
index d204af76258..00000000000
--- a/shells/tcsh-standalone/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/01/10 06:56:15 grant Exp $
-bin/tcsh
-usr/share/man/man1/tcsh.1