cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove stray ICONV patch that breaks unicode support if NLS is disabled.

Browse Source 
PR:             210654
Submitted by:   yuri@rawbw.com
This commit is contained in:
Emanuel Haupt 2016-06-28 11:56:03 +00:00
parent 22197dfcb8
commit ab750f3abc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=417709
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shells/bash/Makefile
View File

@ -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