- fix runtime with decent Twisted [1]

- install license via license framework, not manually
- use USE_TWISTED_RUN instead of direct depends
- strict python version (will not work with 3.x)

PR:		163975 [1]
Submitted by:	W.Scholten <w-info at xs4all dot nl>
Approved by:    maintainer (timeout; 2 weeks)

4 files changed, 42 insertions, 8 deletions

diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 0a62ac8d34fa..9d2b998d1e0d 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -8,22 +8,24 @@
 
 PORTNAME=	hellanzb
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	http://www.hellanzb.com/distfiles/
 
 MAINTAINER=	pjenvey@groovie.org
 COMMENT=	Nzb downloader and post processor
 
+LICENSE=	BSD
+
 RUN_DEPENDS=	par2:${PORTSDIR}/archivers/par2cmdline \
 		flac:${PORTSDIR}/audio/flac \
 		shorten:${PORTSDIR}/audio/shorten \
-		${PYTHON_SITELIBDIR}/yenc.py:${PORTSDIR}/news/py-yenc \
-		${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \
-		${PYTHON_SITELIBDIR}/twisted/web:${PORTSDIR}/www/py-twistedWeb \
+		${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc \
 		mac:${PORTSDIR}/audio/mac
 
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
+USE_TWISTED_RUN=	web
 
 .include <bsd.port.pre.mk>
 
@@ -34,18 +36,17 @@ RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
 RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
 .endif
 
-.ifndef(NOPORTDOCS)
-PORTDOCS=	CHANGELOG CREDITS README LICENSE
+.if !defined(NOPORTDOCS)
+PORTDOCS=	CHANGELOG CREDITS README
 .endif
 
 post-install:
-
 	@if [ ! -f ${PREFIX}/etc/hellanzb.conf ]; then \
 		${ECHO} "Installing default configuration file."; \
 		${INSTALL_DATA} ${WRKSRC}/etc/hellanzb.conf.sample ${PREFIX}/etc/hellanzb.conf; \
 	fi
 
-.ifndef(NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
diff --git a/news/hellanzb/files/patch-Hellanzb-HellaXMLRPC_HtPasswdAuth.py b/news/hellanzb/files/patch-Hellanzb-HellaXMLRPC_HtPasswdAuth.py
new file mode 100644
index 000000000000..27d38f94eb03
--- /dev/null
+++ b/news/hellanzb/files/patch-Hellanzb-HellaXMLRPC_HtPasswdAuth.py
@@ -0,0 +1,11 @@
+--- Hellanzb/HellaXMLRPC/HtPasswdAuth.py.orig	2007-03-27 08:20:43.000000000 +0400
++++ Hellanzb/HellaXMLRPC/HtPasswdAuth.py	2012-01-21 20:30:13.000000000 +0400
+@@ -13,7 +13,7 @@
+ from twisted.web.resource import Resource
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.web import http
+ else:
+     from twisted.protocols import http
diff --git a/news/hellanzb/files/patch-Hellanzb-HellaXMLRPC_xmlrpc.py b/news/hellanzb/files/patch-Hellanzb-HellaXMLRPC_xmlrpc.py
new file mode 100644
index 000000000000..5684bbbd34af
--- /dev/null
+++ b/news/hellanzb/files/patch-Hellanzb-HellaXMLRPC_xmlrpc.py
@@ -0,0 +1,11 @@
+--- Hellanzb/HellaXMLRPC/xmlrpc.py.orig	2007-03-27 08:20:43.000000000 +0400
++++ Hellanzb/HellaXMLRPC/xmlrpc.py	2012-01-21 20:31:29.000000000 +0400
+@@ -31,7 +31,7 @@
+ from twisted.python import log, reflect
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.web import http
+ else:
+     from twisted.protocols import http
diff --git a/news/hellanzb/files/patch-Hellanzb_HellaReactor.py b/news/hellanzb/files/patch-Hellanzb_HellaReactor.py
new file mode 100644
index 000000000000..4f63fe64e971
--- /dev/null
+++ b/news/hellanzb/files/patch-Hellanzb_HellaReactor.py
@@ -0,0 +1,11 @@
+--- Hellanzb/HellaReactor.py.orig	2007-03-27 08:20:43.000000000 +0400
++++ Hellanzb/HellaReactor.py	2012-01-21 20:33:18.000000000 +0400
+@@ -9,7 +9,7 @@
+ import Hellanzb, sys, time
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if twisted.copyright.version >= '2.0.0' or twisted.copyright.version >= '10.0.0':
+     from twisted.internet.selectreactor import SelectReactor
+     from twisted.internet.selectreactor import _NO_FILENO
+     from twisted.internet.selectreactor import _NO_FILEDESC