ports/149981: patch: shells/bash remove iconv dependency if WITHOUT_NLS is defined

[Emanuel Haupt]

>Number:         149981
>Category:       ports
>Synopsis:       patch: shells/bash remove iconv dependency if WITHOUT_NLS is defined
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 26 07:20:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Emanuel Haupt
>Release:        FreeBSD 8.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #44 r209978: Tue Jul 13 08:42:03 UTC 2010 simon at freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386


	
>Description:
Remove iconv dependency if WITHOUT_NLS is defined. Full summary:
http://www.freebsd.org/cgi/getmsg.cgi?fetch=148622+0+current/freebsd-ports

>How-To-Repeat:
	
>Fix:

	

--- bash-iconv.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/bash/Makefile,v
retrieving revision 1.123
diff -u -r1.123 Makefile
--- Makefile	6 Aug 2010 08:48:46 -0000	1.123
+++ Makefile	26 Aug 2010 07:09:55 -0000
@@ -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 @@
 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 @@
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .else
+USE_ICONV=		yes
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .endif
@@ -100,10 +100,16 @@
 
 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
--- bash-iconv.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: