aboutsummaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2013-09-13 00:41:39 +0000
committerMatthias Andree <mandree@FreeBSD.org>2013-09-13 00:41:39 +0000
commitbdb0170c9120463aca07474c20e4eb08092a85b9 (patch)
treef7a2d42f8b7d5b67b10b96c80fbd0f23f5725d19 /sysutils
parente487af5f22219541dbd65d15c875e14454d2fc85 (diff)
downloadports-bdb0170c9120463aca07474c20e4eb08092a85b9.tar.gz
ports-bdb0170c9120463aca07474c20e4eb08092a85b9.zip
Notes
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/e2fsprogs/Makefile7
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