From owner-svn-ports-all@FreeBSD.ORG  Wed Jan  8 18:01:21 2014
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 ESMTPS id 8C9822A3;
 Wed,  8 Jan 2014 18:01:21 +0000 (UTC)
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 78AC711D8;
 Wed,  8 Jan 2014 18:01:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s08I1LHT095149;
 Wed, 8 Jan 2014 18:01:21 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s08I1Lsx095148;
 Wed, 8 Jan 2014 18:01:21 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201401081801.s08I1Lsx095148@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Wed, 8 Jan 2014 18:01:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339160 - head/net/net6
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.17
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: Wed, 08 Jan 2014 18:01:21 -0000

Author: antoine
Date: Wed Jan  8 18:01:20 2014
New Revision: 339160
URL: http://svnweb.freebsd.org/changeset/ports/339160

Log:
  - Use new LIB_DEPENDS syntax
  - Use OPTIONS_HELPERS
  The PR also included a fix for build with clang but this got already fixed
  
  PR:		ports/185517
  Submitted by:	KATO Tsuguru

Modified:
  head/net/net6/Makefile

Modified: head/net/net6/Makefile
==============================================================================
--- head/net/net6/Makefile	Wed Jan  8 17:38:02 2014	(r339159)
+++ head/net/net6/Makefile	Wed Jan  8 18:01:20 2014	(r339160)
@@ -12,23 +12,19 @@ COMMENT=	Network access framework for IP
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libgnutls.so:${PORTSDIR}/security/gnutls
 
 USES=		pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+NLS_CPPFLAGS=	-I${LOCALBASE}/include
+NLS_LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>