diff options
| author | mandree <mandree@FreeBSD.org> | 2013-09-13 08:41:39 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2013-09-13 08:41:39 +0800 |
| commit | 21f79cfd281b453412cda80105dcd9d839657f22 (patch) | |
| tree | f7a2d42f8b7d5b67b10b96c80fbd0f23f5725d19 /sysutils | |
| parent | 2ab5dc249b59d989f331747c29995c4246775a2c (diff) | |
| download | freebsd-ports-gnome-21f79cfd281b453412cda80105dcd9d839657f22.tar.gz freebsd-ports-gnome-21f79cfd281b453412cda80105dcd9d839657f22.tar.zst freebsd-ports-gnome-21f79cfd281b453412cda80105dcd9d839657f22.zip | |
Fix fallout from 10-CURRENT WITH_ICONV flip.
While here, remove excess whitespace to appease portlint.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 99e7530526bc..9775b67db89e 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -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 |