From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 24 15:11:04 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 4F75A9B3;
 Tue, 24 Sep 2013 15:11:04 +0000 (UTC)
 (envelope-from naddy@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 232B823B1;
 Tue, 24 Sep 2013 15:11:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8OFB4tc053881;
 Tue, 24 Sep 2013 15:11:04 GMT (envelope-from naddy@svn.freebsd.org)
Received: (from naddy@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8OFB3SM053877;
 Tue, 24 Sep 2013 15:11:03 GMT (envelope-from naddy@svn.freebsd.org)
Message-Id: <201309241511.r8OFB3SM053877@svn.freebsd.org>
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Tue, 24 Sep 2013 15:11:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328143 - in head/archivers/gtar: . files
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: Tue, 24 Sep 2013 15:11:04 -0000

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"