diff options
| author | grant <grant@pkgsrc.org> | 2004-01-10 07:06:44 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-01-10 07:06:44 +0000 |
| commit | acdf426191e0dba6edff7e7e5647e8f021061975 (patch) | |
| tree | 88ddb6b2202407aec47e778911d7a17794ac9d0d /shells | |
| parent | 92212063fd73f4641b8618049409cb8048f43cca (diff) | |
| download | pkgsrc-acdf426191e0dba6edff7e7e5647e8f021061975.tar.gz | |
rename static-bash to bash-static. the convention in pkgsrc is
for mutations of packages to be named <pkg>-<mutation>.
add a CONFLICT on static-bash for obvious reasons.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/Makefile | 4 | ||||
| -rw-r--r-- | shells/bash2-static/Makefile (renamed from shells/static-bash2/Makefile) | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/shells/Makefile b/shells/Makefile index e14a4c38326..cf29294c51c 100644 --- a/shells/Makefile +++ b/shells/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/01/10 07:04:02 grant Exp $ +# $NetBSD: Makefile,v 1.27 2004/01/10 07:06:44 grant Exp $ # COMMENT= Shells @@ -7,6 +7,7 @@ SUBDIR+= ast-ksh SUBDIR+= ast-ksh-static SUBDIR+= bash2 SUBDIR+= bash2-doc +SUBDIR+= bash2-static SUBDIR+= es SUBDIR+= esh SUBDIR+= mudsh @@ -15,7 +16,6 @@ SUBDIR+= pdksh SUBDIR+= perlsh SUBDIR+= rc SUBDIR+= scsh -SUBDIR+= static-bash2 SUBDIR+= tcsh SUBDIR+= tcsh-standalone SUBDIR+= tcsh-static diff --git a/shells/static-bash2/Makefile b/shells/bash2-static/Makefile index 9f4b8df8260..34a5780c971 100644 --- a/shells/static-bash2/Makefile +++ b/shells/bash2-static/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/30 07:59:32 martti Exp $ +# $NetBSD: Makefile,v 1.1 2004/01/10 07:06:44 grant Exp $ # DISTINFO_FILE= ${.CURDIR}/../../shells/bash2/distinfo @@ -6,11 +6,12 @@ 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:= static-${DISTNAME} +PKGNAME:= ${PKGBASE}-static-${PKGVERSION} COMMENT:= Statically-linked version of the ${COMMENT} LDFLAGS+= -static |