net-p2p/libtorrent-rasterbar

- Update to 0.16.12
- Rename from net-p2p/libtorrent-rasterbar-16 to net-p2p/libtorrent-rasterbar
- Remove conflict with deprecated Port
- Add pkg-message
- Support STAGEDIR

net-p2p/libtorrent-rasterbar-python

- Rename from net-p2p/libtorrent-rasterbar-python-16 to net-p2p/libtorrent-rasterbar-python
- Change comment and MASTERDIR
- Change dependency to net-p2p/libtorrent-rasterbar
- Add SLAVE_PORT=yes

Approved by:	wg (mentor)

7 files changed, 27 insertions, 25 deletions

diff --git a/net-p2p/libtorrent-rasterbar-16/distinfo b/net-p2p/libtorrent-rasterbar-16/distinfo
deleted file mode 100644
index 4d67346aeb67..000000000000
--- a/net-p2p/libtorrent-rasterbar-16/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libtorrent-rasterbar-0.16.11.tar.gz) = 09dc00f8ab9c90327cdfa46c4a68b59ebd3a949c8bfb641b4a99e974d49ad2e5
-SIZE (libtorrent-rasterbar-0.16.11.tar.gz) = 2989445
diff --git a/net-p2p/libtorrent-rasterbar-16-python/Makefile b/net-p2p/libtorrent-rasterbar-python/Makefile
index 837502e4fc13..e8d51c2d0c9b 100644
--- a/net-p2p/libtorrent-rasterbar-16-python/Makefile
+++ b/net-p2p/libtorrent-rasterbar-python/Makefile
@@ -4,16 +4,17 @@
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-COMMENT=	Python bindings for libtorrent-rasterbar-16
+COMMENT=	Python bindings for libtorrent-rasterbar
 
-LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16 \
+LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \
 		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
 
-MASTERDIR=	${.CURDIR}/../libtorrent-rasterbar-16
+MASTERDIR=	${.CURDIR}/../libtorrent-rasterbar
 
 BUILD_WRKSRC=	${WRKSRC}/bindings/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
+SLAVE_PORT=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	python_libtorrent
@@ -27,5 +28,4 @@ OPTIONS_EXCLUDE=	DOCS EXAMPLES
 CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 		PYTHON_VERSION="${PYTHON_VERSION}"
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/libtorrent-rasterbar-16/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index d5fe76f259a1..e8c6ca729047 100644
--- a/net-p2p/libtorrent-rasterbar-16/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	0.16.11
+PORTVERSION=	0.16.12
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	libtorrent
@@ -20,9 +20,6 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFLICTS+=	libtorrent-rasterbar-0.1[45789].*
-NO_LATEST_LINK=	yes
-
 CONFIGURE_ARGS+=	--disable-debug \
 		--disable-static \
 		--enable-dht \
@@ -36,6 +33,8 @@ CONFIGURE_ARGS+=	--disable-debug \
 		--with-libiconv \
 		--with-openssl=${OPENSSLBASE}
 
+SUB_FILES=	pkg-message
+
 PORTDOCS=	*
 
 DOCSRCDIR1=	${WRKSRC}
@@ -49,9 +48,6 @@ PORTEXAMPLES=	*.cpp
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "yes" && defined(USE_PYTHON)
 CONFIGURE_ARGS+=	--enable-python-binding \
 			--with-boost-python=boost_python
@@ -64,15 +60,12 @@ post-patch:
 		${WRKSRC}/Jamfile
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR2}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo
new file mode 100644
index 000000000000..305ad37281b5
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libtorrent-rasterbar-0.16.12.tar.gz) = e8b1cb35d4642e77ac2ab0c73773455c1d0c517cae42060d657da4463eec5668
+SIZE (libtorrent-rasterbar-0.16.12.tar.gz) = 3002825
diff --git a/net-p2p/libtorrent-rasterbar/files/pkg-message.in b/net-p2p/libtorrent-rasterbar/files/pkg-message.in
new file mode 100644
index 000000000000..511c2714a3b7
--- /dev/null
+++ b/net-p2p/libtorrent-rasterbar/files/pkg-message.in
@@ -0,0 +1,9 @@
+===============================================================================
+
+libtorrent-rasterbar has been installed.
+
+When you have problems please reinstall
+
+devel/boost-libs
+
+===============================================================================
diff --git a/net-p2p/libtorrent-rasterbar-16/pkg-descr b/net-p2p/libtorrent-rasterbar/pkg-descr
index 7d77d3d54b63..7d77d3d54b63 100644
--- a/net-p2p/libtorrent-rasterbar-16/pkg-descr
+++ b/net-p2p/libtorrent-rasterbar/pkg-descr
diff --git a/net-p2p/libtorrent-rasterbar-16/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 4dda877b87a9..8badb60d3957 100644
--- a/net-p2p/libtorrent-rasterbar-16/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -137,7 +137,7 @@ lib/libtorrent-rasterbar.la
 lib/libtorrent-rasterbar.so
 lib/libtorrent-rasterbar.so.7
 libdata/pkgconfig/libtorrent-rasterbar.pc
-@dirrm include/libtorrent/aux_
-@dirrm include/libtorrent/extensions
 @dirrm include/libtorrent/kademlia
+@dirrm include/libtorrent/extensions
+@dirrm include/libtorrent/aux_
 @dirrm include/libtorrent