Date: Fri, 13 Sep 2013 00:41:39 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327120 - head/sysutils/e2fsprogs Message-ID: <201309130041.r8D0fdj4043892@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309130041.r8D0fdj4043892>