From owner-svn-ports-branches@freebsd.org  Mon Jul  4 16:07:11 2016
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@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 1608AB91B45;
 Mon,  4 Jul 2016 16:07:11 +0000 (UTC)
 (envelope-from junovitch@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 DA10D28D4;
 Mon,  4 Jul 2016 16:07:10 +0000 (UTC)
 (envelope-from junovitch@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u64G7Axa066770;
 Mon, 4 Jul 2016 16:07:10 GMT (envelope-from junovitch@FreeBSD.org)
Received: (from junovitch@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u64G7A1R066769;
 Mon, 4 Jul 2016 16:07:10 GMT (envelope-from junovitch@FreeBSD.org)
Message-Id: <201607041607.u64G7A1R066769@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: junovitch set sender to
 junovitch@FreeBSD.org using -f
From: Jason Unovitch <junovitch@FreeBSD.org>
Date: Mon, 4 Jul 2016 16:07:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r418041 - branches/2016Q3/shells/bash
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2016 16:07:11 -0000

Author: junovitch
Date: Mon Jul  4 16:07:09 2016
New Revision: 418041
URL: https://svnweb.freebsd.org/changeset/ports/418041

Log:
  MFH: r418029
  
  Fix build on FreeBSD 9 WITHOUT=NLS.
  
  Sponsored by:	Absolight
  Approved by:	ports-secteam (build fix blanket)

Modified:
  branches/2016Q3/shells/bash/Makefile
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/shells/bash/Makefile
==============================================================================
--- branches/2016Q3/shells/bash/Makefile	Mon Jul  4 15:59:46 2016	(r418040)
+++ branches/2016Q3/shells/bash/Makefile	Mon Jul  4 16:07:09 2016	(r418041)
@@ -90,9 +90,6 @@ post-patch:
 	    -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \
 	    ${WRKSRC}/config-top.h
 .endif
-.if empty(PORT_OPTIONS:MNLS)
-	@${REINPLACE_CMD} -e "s|@LIBICONV@||g" ${WRKSRC}/Makefile.in
-.endif
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \