Beat some tests with a (non python literate) stick so we run under

python 2.6. Bump pkgrevision

6 files changed, 56 insertions, 8 deletions

diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 845924900e4..51a05fefac7 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/27 13:51:24 abs Exp $
 #
 .include "../../news/hellanzb/Makefile.version"
 
 DISTNAME=		hellanzb-${HELLANZB_VERSION}.${HELLANZB_SVN_REV}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		news
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		bjs@NetBSD.org
-HOMEPAGE=		http://www.hellanzb.com:8080/trac
+HOMEPAGE=		http://www.hellanzb.com/trac
 COMMENT=		Command line nntp file grabber
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -19,7 +19,7 @@ DEPENDS+=	unrar>=3.5.4:../../archivers/unrar
 
 PYDISTUTILSPKG=	yes
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 WRKSRC=		${WRKDIR}/hellanzb-${HELLANZB_VERSION}-trunk
diff --git a/news/hellanzb/distinfo b/news/hellanzb/distinfo
index 79ba6df1578..cdc4a156b46 100644
--- a/news/hellanzb/distinfo
+++ b/news/hellanzb/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/07/30 13:26:39 bjs Exp $
+$NetBSD: distinfo,v 1.2 2010/11/27 13:51:24 abs Exp $
 
 SHA1 (hellanzb-0.14.1087.tar.gz) = ddc698fa53ff0e9c2ef0499bd9e6ce53c3c504d7
 RMD160 (hellanzb-0.14.1087.tar.gz) = dde0eec93172c18226e91d2bfdcd8c36f56be1f4
 Size (hellanzb-0.14.1087.tar.gz) = 164628 bytes
-SHA1 (patch-aa) = 71c5766f5198898a2e957e82db195e81479477c1
+SHA1 (patch-aa) = 18e32e534743063479e9361b3411599a35162c2c
+SHA1 (patch-ab) = 1297c10facb93faa3cb384411bead7737019ad2e
+SHA1 (patch-ac) = bcae6a33c8b792be5f3a4d3d60cb431eb0d498e9
+SHA1 (patch-ad) = 79ecb3c8f2c1a5bdd25e57bc003b2bfd70edb4cc
diff --git a/news/hellanzb/patches/patch-aa b/news/hellanzb/patches/patch-aa
index 2dc66a600f5..6d127c0a1c9 100644
--- a/news/hellanzb/patches/patch-aa
+++ b/news/hellanzb/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/07/30 13:26:39 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/27 13:51:24 abs Exp $
 
---- setup.py.orig	2008-07-30 08:30:03.000000000 -0400
+--- setup.py.orig	2008-07-30 12:30:03.000000000 +0000
 +++ setup.py
 @@ -38,9 +38,7 @@ def runSetup():
          packages = [ 'Hellanzb', 'Hellanzb.NZBLeecher', 'Hellanzb.HellaXMLRPC',
diff --git a/news/hellanzb/patches/patch-ab b/news/hellanzb/patches/patch-ab
new file mode 100644
index 00000000000..cd0df576e88
--- /dev/null
+++ b/news/hellanzb/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/11/27 13:51:24 abs Exp $
+
+Handle twisted.copyright.versions such as 10.0.0
+
+--- Hellanzb/HellaReactor.py.orig	2008-07-30 12:30:03.000000000 +0000
++++ Hellanzb/HellaReactor.py
+@@ -9,7 +9,7 @@ reactor system so it can catch signals, 
+ import Hellanzb, sys, time
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if int(twisted.copyright.version.partition('.')[0]) >= 2:
+     from twisted.internet.selectreactor import SelectReactor
+     from twisted.internet.selectreactor import _NO_FILENO
+     from twisted.internet.selectreactor import _NO_FILEDESC
diff --git a/news/hellanzb/patches/patch-ac b/news/hellanzb/patches/patch-ac
new file mode 100644
index 00000000000..2547824e689
--- /dev/null
+++ b/news/hellanzb/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2010/11/27 13:51:24 abs Exp $
+
+Handle twisted.copyright.versions such as 10.0.0
+
+--- Hellanzb/HellaXMLRPC/HtPasswdAuth.py.orig	2008-07-30 12:30:03.000000000 +0000
++++ Hellanzb/HellaXMLRPC/HtPasswdAuth.py
+@@ -13,7 +13,7 @@ from twisted.web import static
+ from twisted.web.resource import Resource
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if int(twisted.copyright.version.partition('.')[0]) >= 2:
+     from twisted.web import http
+ else:
+     from twisted.protocols import http
diff --git a/news/hellanzb/patches/patch-ad b/news/hellanzb/patches/patch-ad
new file mode 100644
index 00000000000..b04d23afd86
--- /dev/null
+++ b/news/hellanzb/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/11/27 13:51:24 abs Exp $
+
+Handle twisted.copyright.versions such as 10.0.0
+
+--- Hellanzb/HellaXMLRPC/xmlrpc.py.orig	2008-07-30 12:30:03.000000000 +0000
++++ Hellanzb/HellaXMLRPC/xmlrpc.py
+@@ -31,7 +31,7 @@ from twisted.internet import defer, prot
+ from twisted.python import log, reflect
+ 
+ import twisted.copyright
+-if twisted.copyright.version >= '2.0.0':
++if int(twisted.copyright.version.partition('.')[0]) >= 2:
+     from twisted.web import http
+ else:
+     from twisted.protocols import http