- drop python25 support

- apply patch for python26 uncoditionally (drop corresponding option too)
- raise python version in USE_PYTHON (tested with python27)

2 files changed, 4 insertions, 17 deletions

diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index 4b783806beec..03beac823392 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spambayes
 PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,12 +15,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Bayesian anti-spam filter written in Python
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
-OPTIONS=	PYTHON26	"Build with Python 2.6 (with unofficial patch)"	off
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
 
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=yes
+USE_PYTHON=	-2.7
 USE_RC_SUBR=	pyspamd
 LOCALSTATDIR?=	/var/db/spambayes
 DBDIR?=		${LOCALSTATDIR}/dbs
@@ -79,15 +77,4 @@ post-install:
 	@${MKDIR} ${CACHEDIR}
 	@${MKDIR} ${DBDIR}
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_PYTHON26)
-USE_PYTHON=		2.6
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-python26
-.else
-USE_PYTHON=		2.5
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py25-bsddb
-.endif
-
 .include <bsd.port.mk>
diff --git a/mail/py-spambayes/files/extra-patch-python26 b/mail/py-spambayes/files/patch-spambayes_Dibbler.py
index a2ab6a17175d..a2ab6a17175d 100644
--- a/mail/py-spambayes/files/extra-patch-python26
+++ b/mail/py-spambayes/files/patch-spambayes_Dibbler.py