diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2010-09-09 13:24:39 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2010-09-09 13:24:39 +0000 |
| commit | 135815e4ab57932aa549d962f71f10f73470ed27 (patch) | |
| tree | 25a818b46adb190d5a11477149c8a7bd892c05bb /shells | |
| parent | - Update to 0.9.95 (diff) | |
- Remove iconv dependency if WITHOUT_NLS is defined
- Bump PORTREVISION
PR: 149981
Submitted by: Jeremy Chadwick <freebsd@jdc.parodius.com> (via ports)
Approved by: obrien (maintainer-timeout; 14 days)
Notes
Notes:
svn path=/head/; revision=260845
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash/Makefile | 10 | ||||
| -rw-r--r-- | shells/bash/files/patch-Makefile.in | 11 |
2 files changed, 8 insertions, 13 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 611a03fcaf5c..79351c9d7634 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -9,7 +9,7 @@ PORTNAME= bash PATCHLEVEL= 7 PORTVERSION= 4.1.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:S/$/:bash/} \ ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq @@ -45,7 +45,6 @@ INFO= bash MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes USE_BISON= build -USE_ICONV= yes .if !defined(NOPORTDOCS) .if !defined(WITH_INCLUDED_FAQ) @@ -84,6 +83,7 @@ PLIST_SUB+= HELP="" CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .else +USE_ICONV= yes USE_GETTEXT= yes PLIST_SUB+= NLS="" .endif @@ -100,10 +100,16 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 +.if defined(WITHOUT_NLS) + @${REINPLACE_CMD} -e "s|@LIBICONV@||g" ${WRKSRC}/Makefile.in +.endif post-configure: @${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" +.if defined(WITHOUT_NLS) + @${REINPLACE_CMD} -e "s|#define HAVE_ICONV 1|#undef HAVE_ICONV|g" ${WRKSRC}/config.h +.endif pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build diff --git a/shells/bash/files/patch-Makefile.in b/shells/bash/files/patch-Makefile.in deleted file mode 100644 index 4aba4ab176c0..000000000000 --- a/shells/bash/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2010-05-10 21:44:45.000000000 +0200 -+++ ./Makefile.in 2010-05-10 21:44:59.000000000 +0200 -@@ -349,7 +349,7 @@ - LIBINTL_H = @LIBINTL_H@ - - # libiconv --LIBICONV = @LIBICONV@ -+LIBICONV = -liconv - - # tests - LIBINTL = @LIBINTL@ |