diff options
| author | grant <grant@pkgsrc.org> | 2004-01-10 06:53:45 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-01-10 06:53:45 +0000 |
| commit | f7839fa488971bece466b15ffae15157f4a4ec4f (patch) | |
| tree | 035d5c0d865aaa6936e47c1f30677ae9da24e42d /shells | |
| parent | eee6ee1140f4e0648dfdc44b8afbffe1a5487687 (diff) | |
| download | pkgsrc-f7839fa488971bece466b15ffae15157f4a4ec4f.tar.gz | |
rename static-tcsh to tcsh-static. the convention in pkgsrc is for
mutations of packages to be named <pkg>-<mutation>.
add a CONFLICT on static-tcsh for obvious reasons.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/Makefile | 4 | ||||
| -rw-r--r-- | shells/tcsh-static/Makefile (renamed from shells/static-tcsh/Makefile) | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/shells/Makefile b/shells/Makefile index b50607e626c..27ab5c053ec 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2003/06/29 08:04:18 uebayasi Exp $ +# $NetBSD: Makefile,v 1.24 2004/01/10 06:53:45 grant Exp $ # COMMENT= Shells @@ -17,8 +17,8 @@ SUBDIR+= scsh SUBDIR+= standalone-tcsh SUBDIR+= static-ast-ksh SUBDIR+= static-bash2 -SUBDIR+= static-tcsh SUBDIR+= tcsh +SUBDIR+= tcsh-static SUBDIR+= zsh SUBDIR+= zsh-current SUBDIR+= zsh3 diff --git a/shells/static-tcsh/Makefile b/shells/tcsh-static/Makefile index ec1f02f3921..856a45832ea 100644 --- a/shells/static-tcsh/Makefile +++ b/shells/tcsh-static/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/07/25 11:05:02 kim Exp $ +# $NetBSD: Makefile,v 1.1 2004/01/10 06:53:45 grant Exp $ # DISTINFO_FILE= ${.CURDIR}/../../shells/tcsh/distinfo @@ -6,11 +6,12 @@ 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:= static-${DISTNAME} +PKGNAME:= ${DISTNAME:C|-.*||}-static${DISTNAME:C|[^-]*||} COMMENT:= Statically-linked version of the ${COMMENT} LDFLAGS+= -static |