From owner-svn-ports-all@FreeBSD.ORG  Fri Sep 13 00:41:40 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0AC3060F;
 Fri, 13 Sep 2013 00:41:40 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ED1672A14;
 Fri, 13 Sep 2013 00:41:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8D0fdm9043893;
 Fri, 13 Sep 2013 00:41:39 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8D0fdj4043892;
 Fri, 13 Sep 2013 00:41:39 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201309130041.r8D0fdj4043892@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Fri, 13 Sep 2013 00:41:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r327120 - head/sysutils/e2fsprogs
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Sep 2013 00:41:40 -0000

Author: mandree
Date: Fri Sep 13 00:41:39 2013
New Revision: 327120
URL: http://svnweb.freebsd.org/changeset/ports/327120

Log:
  Fix fallout from 10-CURRENT WITH_ICONV flip.
  
  While here, remove excess whitespace to appease portlint.

Modified:
  head/sysutils/e2fsprogs/Makefile

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Fri Sep 13 00:32:17 2013	(r327119)
+++ head/sysutils/e2fsprogs/Makefile	Fri Sep 13 00:41:39 2013	(r327120)
@@ -44,7 +44,6 @@ post-extract:
 
 PKGDEINSTALL=	${PKGINSTALL}
 
-
 # get more details into tinderbox logs
 .if defined(PACKAGE_BUILDING)
 MAKE_ARGS+=	V=1
@@ -55,7 +54,11 @@ MAKE_ARGS+=	V=1
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB=	NLS=""
+. if ${OSVERSION} >= 1000043
+libintl=	"${LOCALBASE}/lib/libintl.a"
+. else
 libintl=	"${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
+. endif
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB=	NLS="@comment "
@@ -76,7 +79,7 @@ post-patch::
 # disable f_mmp_garbage, fails on FreeBSD, and the resize*big_expand tests,
 # which are too unwieldy to run automatically (need too much free space).
 # f_extent_oobounds fails in Tinderbox and is fine outside, reason unclear.
-.for i in f_mmp_garbage f_extent_oobounds r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand 
+.for i in f_mmp_garbage f_extent_oobounds r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand
 	@${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i}
 .endfor