1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00

- Add a patch for working with Python 2.6

PR:		ports/136644 (based on)
Submitted by:	Martin Dieringer <martin.dieringer AT gmx.de>
This commit is contained in:
Li-Wen Hsu 2009-07-23 07:03:15 +00:00
parent 3b4eeab907
commit 789806859c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=238233
2 changed files with 26 additions and 2 deletions

View File

@ -16,9 +16,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Bayesian anti-spam filter written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py25-bsddb
# bypass infrastructure bug
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
OPTIONS= PYTHON26 "Build with Python 2.6 (with unofficial patch)" off
USE_PYTHON= 2.5
USE_PYDISTUTILS= yes
USE_RC_SUBR= pyspamd
LOCALSTATDIR?= /var/db/spambayes
@ -78,4 +80,15 @@ 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>

View File

@ -0,0 +1,11 @@
--- spambayes/Dibbler.py~ 2009-07-10 21:43:59.000000000 +0200
+++ spambayes/Dibbler.py 2009-07-10 21:44:37.655326444 +0200
@@ -218,7 +218,7 @@
# self.initiate_send() raises an exception, causing self.close()
# to be called. If we didn't check, we could end up in an infinite
# loop.
- while (self.producer_fifo or self.ac_out_buffer) and not self._closed:
+ while (self.producer_fifo) and not self._closed:
self.initiate_send()
def close(self):