aboutsummaryrefslogtreecommitdiff
path: root/shells/bash
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2016-06-28 11:56:03 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2016-06-28 11:56:03 +0000
commitab750f3abca208a3c59df5bb8fa9e64da1449b16 (patch)
tree1299cb471fd91f8fdb61e47bff484f1d8fed40fa /shells/bash
parent22197dfcb8e92bc4ece37869e756cac5c526e545 (diff)
Notes
Diffstat (limited to 'shells/bash')
-rw-r--r--shells/bash/Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index dde03018d86d..50abc1563fac 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -4,7 +4,7 @@
PORTNAME= bash
PATCHLEVEL= 46
PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= shells
MASTER_SITES= GNU/${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
@@ -52,7 +52,8 @@ PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \
CONFIGURE_ARGS+= --without-bash-malloc \
--disable-rpath \
- --enable-disabled-builtins
+ --enable-disabled-builtins \
+ --with-libiconv-prefix=${ICONV_PREFIX}
CFLAGS+= -DUSE_MKTEMP=1 -DUSE_MKSTEMP=1
@@ -96,10 +97,6 @@ post-patch:
post-configure:
@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \
${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|"
-.if empty(PORT_OPTIONS:MNLS)
- @${REINPLACE_CMD} -e "s|#define HAVE_ICONV 1|#undef HAVE_ICONV|g" \
- ${WRKSRC}/config.h
-.endif
pre-build:
@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build