Index: head/net-p2p/libtorrent-rasterbar-15/Makefile
===================================================================
--- head/net-p2p/libtorrent-rasterbar-15/Makefile	(revision 308112)
+++ head/net-p2p/libtorrent-rasterbar-15/Makefile	(revision 308113)
@@ -1,81 +1,81 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
 PORTVERSION=	0.15.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	libtorrent
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	C++ library implementing a BitTorrent client
 
 MAKE_JOBS_SAFE=	yes
 
 CONFLICTS+=	libtorrent-rasterbar-0.1[46789].*
 
 NO_LATEST_LINK=	yes
 
 BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS+=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
 		GeoIP.5:${PORTSDIR}/net/GeoIP
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-debug \
 		--disable-static \
 		--enable-dht \
 		--enable-encryption \
 		--enable-pool-allocators \
 		--enable-deprecated-functions \
 		--with-boost=${LOCALBASE} \
 		--with-boost-system=boost_system \
 		--with-boost-filesystem=boost_filesystem \
 		--with-boost-thread=boost_thread \
 		--enable-geoip \
 		--with-libgeoip \
 		--with-openssl=${OPENSSLBASE} \
 		--with-zlib=system
 
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes" && defined(USE_PYTHON)
 CONFIGURE_ARGS+=	--enable-python-binding \
 			--with-boost-python=boost_python
 .else
 CONFIGURE_ARGS+=	--disable-python-binding
 .endif
 
 pre-patch:
 	@${MV} ${WRKSRC}/include/libtorrent/alloca.hpp \
 	    ${WRKSRC}/include/libtorrent/alloca.hpp.Dist
 	@${SED} -e 's#alloca.h#stdlib.h#g' \
 	    ${WRKSRC}/include/libtorrent/alloca.hpp.Dist > \
 	    ${WRKSRC}/include/libtorrent/alloca.hpp
 	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Dist
 	@${SED} -e 's#COMPILETIME_OPTIONS+="#COMPILETIME_OPTIONS="$$COMPILETIME_OPTIONS #g' \
 	    ${WRKSRC}/configure.Dist > ${WRKSRC}/configure
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes"
 post-patch: slave-post-patch
 .endif
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes"
 post-install: slave-post-install
 .else
 post-install:
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.css ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-p2p/libtorrent-rasterbar-15-python/Makefile
===================================================================
--- head/net-p2p/libtorrent-rasterbar-15-python/Makefile	(revision 308112)
+++ head/net-p2p/libtorrent-rasterbar-15-python/Makefile	(revision 308113)
@@ -1,41 +1,38 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python bindings for libtorrent-rasterbar-15
 CATEGORIES=	net-p2p python
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools
 LIB_DEPENDS+=	boost_python.4:${PORTSDIR}/devel/boost-python-libs \
 		torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15
 
 BUILD_WRKSRC=	${WRKSRC}/bindings/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 PLIST=		${.CURDIR}/pkg-plist
 
 INSTALLS_EGGINFO=	yes
-PYDISTUTILS_EGGINFO=	python_libtorrent-${PORTVERSION}-py${PYTHON_VER}.egg-info
+PYDISTUTILS_PKGNAME=	python_libtorrent
 
 NOPORTDOCS=	yes
 
 slave-post-patch:
 	@${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/bindings/python/setup.py.in
 
 slave-post-install:
 # fix installation permissions
 	@${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/libtorrent.so
 
 MASTERDIR=	${.CURDIR}/../libtorrent-rasterbar-15
 .include "${MASTERDIR}/Makefile"
 
 ##
 # information available after <bsd.port.pre.mk>
 ##
 # insure python paths are correctly identified
 CONFIGURE_ENV+=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 		PYTHON_VERSION="${PYTHON_VERSION}"
-# prefix PKGNAME with python- so that the egg info file is properly named.
-PYDISTUTILS_PKGNAME=	python-${PORTNAME}
Index: head/net-p2p/libtorrent-rasterbar-16/Makefile
===================================================================
--- head/net-p2p/libtorrent-rasterbar-16/Makefile	(revision 308112)
+++ head/net-p2p/libtorrent-rasterbar-16/Makefile	(revision 308113)
@@ -1,74 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
 PORTVERSION=	0.16.4
+PORTREVISION?=	1
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	libtorrent
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	C++ library implementing a BitTorrent client
 
 MAKE_JOBS_SAFE=	yes
 
 CONFLICTS+=	libtorrent-rasterbar-0.1[45789].*
 
 NO_LATEST_LINK=	yes
 
 BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS+=	boost_date_time.4:${PORTSDIR}/devel/boost-libs \
 		GeoIP.5:${PORTSDIR}/net/GeoIP
 
 USE_GNOME=	gnomehack
 USE_OPENSSL=	yes
 USE_ICONV=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-debug \
 		--disable-static \
 		--enable-dht \
 		--enable-encryption \
 		--enable-pool-allocators \
 		--enable-deprecated-functions \
 		--with-boost=${LOCALBASE} \
 		--with-boost-system=boost_system \
 		--enable-geoip \
 		--with-libgeoip \
 		--with-openssl=${OPENSSLBASE}
 
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes" && defined(USE_PYTHON)
 CONFIGURE_ARGS+=	--enable-python-binding \
 			--with-boost-python=boost_python
 .else
 CONFIGURE_ARGS+=	--disable-python-binding
 .endif
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes"
 post-patch: slave-post-patch
 .else
 post-patch:
 	@${CP} ${WRKSRC}/Jamfile ${WRKSRC}/Jamfile.presed
 	@${SED} -e 's#<include>/usr/local/include#<include>${LOCALBASE}/include#' \
 		${WRKSRC}/Jamfile.presed > ${WRKSRC}/Jamfile
 .endif
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes"
 post-install: slave-post-install
 .else
 post-install:
 .endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.css ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.gif ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.jpg ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}
 PORTDOCS=	*
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-p2p/libtorrent-rasterbar-16-python/Makefile
===================================================================
--- head/net-p2p/libtorrent-rasterbar-16-python/Makefile	(revision 308112)
+++ head/net-p2p/libtorrent-rasterbar-16-python/Makefile	(revision 308113)
@@ -1,41 +1,38 @@
 # $FreeBSD$
 
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python bindings for libtorrent-rasterbar-16
 CATEGORIES=	net-p2p python
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setuptools>=0.6:${PORTSDIR}/devel/py-setuptools
 LIB_DEPENDS+=	boost_python.4:${PORTSDIR}/devel/boost-python-libs \
 		torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16
 
 BUILD_WRKSRC=	${WRKSRC}/bindings/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 PLIST=		${.CURDIR}/pkg-plist
 
 INSTALLS_EGGINFO=	yes
-PYDISTUTILS_EGGINFO=	python_libtorrent-${PORTVERSION}-py${PYTHON_VER}.egg-info
+PYDISTUTILS_PKGNAME=	python_libtorrent
 
 NOPORTDOCS=	yes
 
 slave-post-patch:
 	@${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/bindings/python/setup.py.in
 
 slave-post-install:
 # fix installation permissions
 	@${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/libtorrent.so
 
 MASTERDIR=	${.CURDIR}/../libtorrent-rasterbar-16
 .include "${MASTERDIR}/Makefile"
 
 ##
 # information available after <bsd.port.pre.mk>
 ##
 # insure python paths are correctly identified
 CONFIGURE_ENV+=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 		PYTHON_VERSION="${PYTHON_VERSION}"
-# prefix PKGNAME with python- so that the egg info file is properly named.
-PYDISTUTILS_PKGNAME=	python-${PORTNAME}