diff options
author | grant <grant@pkgsrc.org> | 2004-01-10 07:04:02 +0000 |
---|---|---|
committer | grant <grant@pkgsrc.org> | 2004-01-10 07:04:02 +0000 |
commit | 2a77c2bb84785155857285a87cab0760b3b224b2 (patch) | |
tree | f094042ace731f5a153a7d36a9012eb7ae242607 /shells | |
parent | 826e119b6dfad51d944fb825af5a101e0e797ce0 (diff) | |
download | pkgsrc-2a77c2bb84785155857285a87cab0760b3b224b2.tar.gz |
rename static-ast-ksh to ast-ksh-static. the convention in pkgsrc is
for mutations of packages to be named <pkg>-<mutation>.
add a CONFLICT on static-ast-ksh for obvious reasons.
Diffstat (limited to 'shells')
-rw-r--r-- | shells/Makefile | 4 | ||||
-rw-r--r-- | shells/ast-ksh-static/Makefile (renamed from shells/static-ast-ksh/Makefile) | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/shells/Makefile b/shells/Makefile index a98e887c29d..e14a4c38326 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.25 2004/01/10 06:56:15 grant Exp $ +# $NetBSD: Makefile,v 1.26 2004/01/10 07:04:02 grant Exp $ # COMMENT= Shells SUBDIR+= ast-ksh +SUBDIR+= ast-ksh-static SUBDIR+= bash2 SUBDIR+= bash2-doc SUBDIR+= es @@ -14,7 +15,6 @@ SUBDIR+= pdksh SUBDIR+= perlsh SUBDIR+= rc SUBDIR+= scsh -SUBDIR+= static-ast-ksh SUBDIR+= static-bash2 SUBDIR+= tcsh SUBDIR+= tcsh-standalone diff --git a/shells/static-ast-ksh/Makefile b/shells/ast-ksh-static/Makefile index b8671810ad3..4ed2d840373 100644 --- a/shells/static-ast-ksh/Makefile +++ b/shells/ast-ksh-static/Makefile @@ -1,14 +1,16 @@ -# $NetBSD: Makefile,v 1.2 2003/08/11 17:27:58 wiz Exp $ +# $NetBSD: Makefile,v 1.1 2004/01/10 07:04:02 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 -PKGNAME:= static-${PKGNAME} +PKGVERSION:= ${PKGNAME:C|^.*-||} +PKGNAME:= ast-ksh-static-${PKGVERSION} COMMENT:= Statically-linked version of the ${COMMENT} KSH93_MAKEFLAGS=LDFLAGS=-static |