3 files changed, 46 insertions, 7 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 844c81040591..0c94299c80fa 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sabnzbdplus
 PORTVERSION=	0.4.12
+PORTREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
 DISTNAME=	SABnzbd-${PORTVERSION}-src
@@ -16,11 +17,13 @@ COMMENT=	A web-interface based binary newsgrabber in python, with nzb support
 
 RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/cherrypy/__init__.py:${PORTSDIR}/www/py-cherrypy-old \
-		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
-		${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree
+		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USE_PYTHON=	2.4+
+USE_PYTHON=	-2.5
+
+PYVERSION=	${PYTHON_VERSION:S/^python//}
+
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/SABnzbd-${PORTVERSION}
 PLIST_SUB=	PORTNAME=${PORTNAME}
@@ -34,6 +37,26 @@ OPTIONS=	PAR2CMDLINE "Required for postprocessing of par files." on \
 
 .include <bsd.port.pre.mk>
 
+#
+# Make sure that we build with the correct version of Python.
+#
+# The following variables may need to be added to /etc/make.conf or to
+# a build-specific environment file when building under Tinderbox:
+#
+#    PYTHON_VERSION=python2.5
+#    PYTHON_DEFAULT_VERSION=python2.5
+#
+# Ref: http://www.marcuscom.com/pipermail/tinderbox-list/2007-October/000948.html
+#
+.if defined(PACKAGE_BUILDING) && \
+	${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
+IGNORE=	needs Python ${PYTHON_VERSION} instead of ${PYTHON_DEFAULT_VERSION}
+.endif
+
+.if defined(PYTHON_VERSION) && ${PYVERSION:S/.//} < 25
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree
+.endif
+
 .if !defined(WITHOUT_PAR2CMDLINE)
 RUN_DEPENDS+=	par2repair:${PORTSDIR}/archivers/par2cmdline
 .endif
@@ -72,5 +95,5 @@ post-install:
 	${CP} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
-
+	@${CAT} pkg-message
 .include <bsd.port.post.mk>
diff --git a/news/sabnzbdplus/pkg-descr b/news/sabnzbdplus/pkg-descr
index 8baf015b7b51..81433e1d9ea4 100644
--- a/news/sabnzbdplus/pkg-descr
+++ b/news/sabnzbdplus/pkg-descr
@@ -1,4 +1,6 @@
-A web-interface based standalone binary newsgrabber written in python, supports
-.nzb files
+SABnzbd is a cross-platform binary newsreader. It makes downloading
+from Usenet easy by automating the whole thing. You give it an NZB
+file or an RSS feed, it does the rest. Has a web-browser based UI
+and an API for 3rd-party apps. Ideal for servers too.
 
-WWW: http://sourceforge.net/projects/sabnzbdplus
+WWW: http://sabnzbd.org/
diff --git a/news/sabnzbdplus/pkg-message b/news/sabnzbdplus/pkg-message
new file mode 100644
index 000000000000..17128e960083
--- /dev/null
+++ b/news/sabnzbdplus/pkg-message
@@ -0,0 +1,14 @@
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+Due to the version of devel/py-cheetah in ports api keys do
+not work. To get around the error modify the following line 
+in your sabnzbd.ini file:
+
+    disable_api_key = 1
+
+Note however that by disabling the api key feature you may
+be at risk of the Cross-site Request Vulnerability described
+here: http://sabnzbd.wikidot.com/cross-site-vulnerability/
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *