From owner-svn-ports-head@freebsd.org  Tue Jun 28 11:56:04 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6973CB84829;
 Tue, 28 Jun 2016 11:56:04 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 36ADF285C;
 Tue, 28 Jun 2016 11:56:04 +0000 (UTC)
 (envelope-from ehaupt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5SBu3P0044947;
 Tue, 28 Jun 2016 11:56:03 GMT (envelope-from ehaupt@FreeBSD.org)
Received: (from ehaupt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5SBu3lj044946;
 Tue, 28 Jun 2016 11:56:03 GMT (envelope-from ehaupt@FreeBSD.org)
Message-Id: <201606281156.u5SBu3lj044946@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to
 ehaupt@FreeBSD.org using -f
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 28 Jun 2016 11:56:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417709 - head/shells/bash
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jun 2016 11:56:04 -0000

Author: ehaupt
Date: Tue Jun 28 11:56:03 2016
New Revision: 417709
URL: https://svnweb.freebsd.org/changeset/ports/417709

Log:
  Remove stray ICONV patch that breaks unicode support if NLS is disabled.
  
  PR:             210654
  Submitted by:   yuri@rawbw.com

Modified:
  head/shells/bash/Makefile

Modified: head/shells/bash/Makefile
==============================================================================
--- head/shells/bash/Makefile	Tue Jun 28 09:41:48 2016	(r417708)
+++ head/shells/bash/Makefile	Tue Jun 28 11:56:03 2016	(r417709)
@@ -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
 
 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