- Removed Python 2.5 requirement introduced by recent commit, since the

  application appears to work correctly (w/ warnings) under Python 2.6. [1]
- Removed the corresponding entry in UPDATING

PR:		ports/138976
Reported by:	Lee Packham <lpackham@leenux.org.uk>, Thomas Maack Nielsen <tmn@concare.net> [1]

1 files changed, 2 insertions, 18 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 0c94299c80fa..0cb25bd81bc0 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sabnzbdplus
 PORTVERSION=	0.4.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
 DISTNAME=	SABnzbd-${PORTVERSION}-src
@@ -20,7 +20,7 @@ RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USE_PYTHON=	-2.5
+USE_PYTHON=	2.4+
 
 PYVERSION=	${PYTHON_VERSION:S/^python//}
 
@@ -37,22 +37,6 @@ 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