Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jun 2015 22:19:25 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390607 - head/net-p2p/libtorrent
Message-ID:  <201506252219.t5PMJPmt069326@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506252219.t5PMJPmt069326>