- Update to 5.8.11

- Fix MASTER_SITES
- Add a knob to enable the optimizing Python compiler

PR:		ports/63765
Submitted by:	maintainer

6 files changed, 48 insertions, 14 deletions

diff --git a/net/py-bittornado/Makefile b/net/py-bittornado/Makefile
index f52f1e29ff42..8ba0fdc81925 100644
--- a/net/py-bittornado/Makefile
+++ b/net/py-bittornado/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	shadow-BitTorrent
-PORTVERSION=	5.8.10
+PORTVERSION=	5.8.11
 CATEGORIES?=	net python
-MASTER_SITES=	http://home.elp.rr.com/tur/
+MASTER_SITES=	http://mediahost.inetsalestech.com/shadow/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	BitTorrent-experimental-S-${PORTVERSION}
 
@@ -17,12 +17,15 @@ COMMENT?=	Experimental BitTorrent client with enhanced features
 
 CONFLICTS=	py??-BitTorrent-*
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=yes
+USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/bittorrent-CVS-shadowsclient
 
-DOC_FILES=	BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \
-		README.txt README-experimental.txt credits.txt
+DOC_FILES=	BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
+		INSTALL.unix.txt LICENSE.txt README.txt \
+		README-experimental.txt credits.txt multitracker-spec.txt \
+		webseed-spec.txt
 
 # required for GUI
 .ifndef(WITHOUT_GUI)
@@ -33,10 +36,20 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-nogui-patch-setup.py
 PLIST_SUB+=	GUI='@comment '
 .endif
 
+.ifdef(WITH_PSYCO)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
+post-patch:
+	@${REINPLACE_CMD} -e "s/^psyco = 0/psyco = 1/g" \
+		${WRKSRC}/BitTorrent/PSYCO.py
+.endif
+
 pre-everything::
 .ifndef(WITHOUT_GUI)
 	@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
 .endif
+.ifndef(WITH_PSYCO)
+	@${ECHO_MSG} '===> Define WITH_PSYCO to enable the optimizing Python compiler'
+.endif
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/net/py-bittornado/distinfo b/net/py-bittornado/distinfo
index 73d6dda1e4c2..a1812912e0fb 100644
--- a/net/py-bittornado/distinfo
+++ b/net/py-bittornado/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTorrent-experimental-S-5.8.10.tar.gz) = 675b1980f8fcdcf9e52d4ec4c3a82c13
-SIZE (BitTorrent-experimental-S-5.8.10.tar.gz) = 146004
+MD5 (BitTorrent-experimental-S-5.8.11.tar.gz) = 1549187bd26f574127c444d272cc5881
+SIZE (BitTorrent-experimental-S-5.8.11.tar.gz) = 143004
diff --git a/net/py-bittornado/pkg-plist b/net/py-bittornado/pkg-plist
index 3efd951f2eed..30c96eceff50 100644
--- a/net/py-bittornado/pkg-plist
+++ b/net/py-bittornado/pkg-plist
@@ -116,10 +116,14 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
 %%PORTDOCS%%%%DOCSDIR%%/BUILD.windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT-multitracker-readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.unix.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-experimental.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/credits.txt
+%%PORTDOCS%%%%DOCSDIR%%/multitracker-spec.txt
+%%PORTDOCS%%%%DOCSDIR%%/webseed-spec.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
diff --git a/net/py-shadow-bittorrent/Makefile b/net/py-shadow-bittorrent/Makefile
index f52f1e29ff42..8ba0fdc81925 100644
--- a/net/py-shadow-bittorrent/Makefile
+++ b/net/py-shadow-bittorrent/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	shadow-BitTorrent
-PORTVERSION=	5.8.10
+PORTVERSION=	5.8.11
 CATEGORIES?=	net python
-MASTER_SITES=	http://home.elp.rr.com/tur/
+MASTER_SITES=	http://mediahost.inetsalestech.com/shadow/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	BitTorrent-experimental-S-${PORTVERSION}
 
@@ -17,12 +17,15 @@ COMMENT?=	Experimental BitTorrent client with enhanced features
 
 CONFLICTS=	py??-BitTorrent-*
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=yes
+USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/bittorrent-CVS-shadowsclient
 
-DOC_FILES=	BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \
-		README.txt README-experimental.txt credits.txt
+DOC_FILES=	BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
+		INSTALL.unix.txt LICENSE.txt README.txt \
+		README-experimental.txt credits.txt multitracker-spec.txt \
+		webseed-spec.txt
 
 # required for GUI
 .ifndef(WITHOUT_GUI)
@@ -33,10 +36,20 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-nogui-patch-setup.py
 PLIST_SUB+=	GUI='@comment '
 .endif
 
+.ifdef(WITH_PSYCO)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
+post-patch:
+	@${REINPLACE_CMD} -e "s/^psyco = 0/psyco = 1/g" \
+		${WRKSRC}/BitTorrent/PSYCO.py
+.endif
+
 pre-everything::
 .ifndef(WITHOUT_GUI)
 	@${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation'
 .endif
+.ifndef(WITH_PSYCO)
+	@${ECHO_MSG} '===> Define WITH_PSYCO to enable the optimizing Python compiler'
+.endif
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/net/py-shadow-bittorrent/distinfo b/net/py-shadow-bittorrent/distinfo
index 73d6dda1e4c2..a1812912e0fb 100644
--- a/net/py-shadow-bittorrent/distinfo
+++ b/net/py-shadow-bittorrent/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTorrent-experimental-S-5.8.10.tar.gz) = 675b1980f8fcdcf9e52d4ec4c3a82c13
-SIZE (BitTorrent-experimental-S-5.8.10.tar.gz) = 146004
+MD5 (BitTorrent-experimental-S-5.8.11.tar.gz) = 1549187bd26f574127c444d272cc5881
+SIZE (BitTorrent-experimental-S-5.8.11.tar.gz) = 143004
diff --git a/net/py-shadow-bittorrent/pkg-plist b/net/py-shadow-bittorrent/pkg-plist
index 3efd951f2eed..30c96eceff50 100644
--- a/net/py-shadow-bittorrent/pkg-plist
+++ b/net/py-shadow-bittorrent/pkg-plist
@@ -116,10 +116,14 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc
 %%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo
 %%PORTDOCS%%%%DOCSDIR%%/BUILD.windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT-multitracker-readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.unix.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-experimental.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/credits.txt
+%%PORTDOCS%%%%DOCSDIR%%/multitracker-spec.txt
+%%PORTDOCS%%%%DOCSDIR%%/webseed-spec.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent