From owner-svn-ports-head@freebsd.org  Thu Jun 25 22:19:25 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC0D798C5D0;
 Thu, 25 Jun 2015 22:19:25 +0000 (UTC)
 (envelope-from amdmi3@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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D4CEA1DE1;
 Thu, 25 Jun 2015 22:19:25 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PMJPv9069327;
 Thu, 25 Jun 2015 22:19:25 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PMJPmt069326;
 Thu, 25 Jun 2015 22:19:25 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201506252219.t5PMJPmt069326@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 25 Jun 2015 22:19:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r390607 - head/net-p2p/libtorrent
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jun 2015 22:19:26 -0000

Author: amdmi3
Date: Thu Jun 25 22:19:25 2015
New Revision: 390607
URL: https://svnweb.freebsd.org/changeset/ports/390607

Log:
  - Use OPTIONS helpers
  - Add LICENSE
  - Remove obsolete CONFLICTS: rblibtorrent was renamed to libtorrent-rasterbar which doesn't conflict with this port

Modified:
  head/net-p2p/libtorrent/Makefile

Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile	Thu Jun 25 22:06:10 2015	(r390606)
+++ head/net-p2p/libtorrent/Makefile	Thu Jun 25 22:19:25 2015	(r390607)
@@ -9,8 +9,8 @@ MASTER_SITES=	http://libtorrent.rakshasa
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BitTorrent Library written in C++
 
-CONFLICTS=	rblibtorrent-[0-9]* \
-		rblibtorrent-devel-[0-9]*
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang libtool pathfix pkgconfig
 USE_OPENSSL=	yes
@@ -23,6 +23,8 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	KQUEUE IPV6
 OPTIONS_DEFAULT=	KQUEUE
 KQUEUE_DESC=	Use kqueue(2) support
+KQUEUE_CONFIGURE_ON=	--with-kqueue
+IPV6_CONFIGURE_ON=	--enable-ipv6
 
 .include <bsd.port.pre.mk>
 
@@ -39,14 +41,6 @@ CXXFLAGS+=	-std=c++11
 EXTRA_PATCHES+=	${FILESDIR}/extra-clang
 .endif
 
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=	--with-kqueue
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000