aboutsummaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2009-11-01 21:31:27 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2009-11-01 21:31:27 +0000
commitfbb80c4908a55e83c9b21bd6c02a3f94f960d0fd (patch)
tree7a630a998b4cddb415628e8b705a9aa062c17fe1 /shells
parentb794ff3809c437edc56db76bb14728adc382eb9c (diff)
downloadports-fbb80c4908a55e83c9b21bd6c02a3f94f960d0fd.tar.gz
ports-fbb80c4908a55e83c9b21bd6c02a3f94f960d0fd.zip
Notes
Diffstat (limited to 'shells')
-rw-r--r--shells/bash/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index ef9f21f562eb..1e0656653e64 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -9,7 +9,7 @@
PORTNAME= bash
PATCHLEVEL= 33
PORTVERSION= 4.0.${PATCHLEVEL:S/^0//g}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:S/$/:bash/} \
ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
@@ -30,7 +30,6 @@ MAINTAINER= obrien@FreeBSD.org
COMMENT= The GNU Project's Bourne Again SHell
IGNOREFILES= FAQ
-CONFLICTS= bash-[0-35-9].*
.if !defined(WITHOUT_IMPLICITCD)
EXTRA_PATCHES+= ${PATCHDIR}/xpatch-implicitcd
@@ -64,10 +63,10 @@ WITHOUT_NLS=yes
.endif
CONFIGURE_ARGS+= --enable-static-link
PKGNAMESUFFIX= -static
-CONFLICTS+= bash-[0-9]*
+CONFLICTS+= bash-[0-9]* bash3-[0-9]* bash3-static-[0-9]*
.else
CONFIGURE_ARGS+= --enable-static-link=no
-CONFLICTS+= bash-static-[0-9]*
+CONFLICTS+= bash-static-[0-9]* bash3-[0-9]* bash3-static-[0-9]*
.endif
.if defined(WITHOUT_HELP)