svn commit: r328143 - in head/archivers/gtar: . files
Christian Weisgerber
naddy at FreeBSD.org
Tue Sep 24 15:11:04 UTC 2013
Author: naddy
Date: Tue Sep 24 15:11:03 2013
New Revision: 328143
URL: http://svnweb.freebsd.org/changeset/ports/328143
Log:
Convert to stage and option helpers.
Fix combination of NLS and STATIC options.
Added:
head/archivers/gtar/files/patch-configure (contents, props changed)
Modified:
head/archivers/gtar/Makefile
Modified: head/archivers/gtar/Makefile
==============================================================================
--- head/archivers/gtar/Makefile Tue Sep 24 15:07:19 2013 (r328142)
+++ head/archivers/gtar/Makefile Tue Sep 24 15:11:03 2013 (r328143)
@@ -13,7 +13,6 @@ COMMENT= GNU version of the traditional
INFO= tar
-NO_STAGE= yes
USES= iconv
USE_AUTOTOOLS= autoconf:env # autom4te
USE_XZ= yes
@@ -21,30 +20,20 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g \
--disable-silent-rules
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib ${LDSTATIC}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= DEFAULT_ARCHIVE=/dev/sa0 \
DEFAULT_RMT_COMMAND=/etc/rmt
# supply result to skip a test that will abort configure if run as root
CONFIGURE_ENV+= gl_cv_func_mknod_works=yes
-OPTIONS_DEFINE= STATIC
+OPTIONS_DEFINE= NLS STATIC
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
-.if ${PORT_OPTIONS:MSTATIC}
-LDSTATIC= -static
-MAKE_ARGS+= LIBINTL='$$(LTLIBINTL)' LIBICONV='$$(LTLIBICONV)'
-.else
-LDSTATIC=
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+STATIC_LDFLAGS= -static
+STATIC_CONFIGURE_ENV= SHLIBEXT=""
regression-test: build
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
Added: head/archivers/gtar/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/archivers/gtar/files/patch-configure Tue Sep 24 15:11:03 2013 (r328143)
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+Hack to disable shared library detection, so configure won't try
+to link with "/usr/local/lib/libiconv.so -static".
+
+--- configure.orig
++++ configure
+@@ -53560,7 +53560,7 @@
+ $as_echo "$acl_cv_rpath" >&6; }
+ wl="$acl_cv_wl"
+ acl_libext="$acl_cv_libext"
+- acl_shlibext="$acl_cv_shlibext"
++ acl_shlibext="${SHLIBEXT-$acl_cv_shlibext}"
+ acl_libname_spec="$acl_cv_libname_spec"
+ acl_library_names_spec="$acl_cv_library_names_spec"
+ acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
More information about the svn-ports-all
mailing list