summaryrefslogtreecommitdiff
path: root/news/sabnzbdplus
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2011-03-11 02:21:51 +0000
committerWen Heping <wen@FreeBSD.org>2011-03-11 02:21:51 +0000
commit537f7f7a6d0fdbf2176a1097f2f8b110e61b7800 (patch)
tree7f6d468671810dc41aaba922ebb8679778c0142a /news/sabnzbdplus
parent- Update to 2.019 (diff)
- Fix build with cherrypy-3.2.0
PR: ports/155387 Submitted by: Spil <spil.oss@gmail.com> Approved by: maintainer
Notes
Notes: svn path=/head/; revision=270640
Diffstat (limited to 'news/sabnzbdplus')
-rw-r--r--news/sabnzbdplus/Makefile2
-rw-r--r--news/sabnzbdplus/files/patch-SABnzbd.py11
2 files changed, 1 insertions, 12 deletions
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 91fe48a66f09..333f1ab8ab1a 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= daniel@netwalk.org
COMMENT= A web-interface based binary newsgrabber in python, with nzb support
RUN_DEPENDS= cheetah:${PORTSDIR}/devel/py-cheetah \
- cherryd:${PORTSDIR}/www/py-cherrypy \
+ ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.0:${PORTSDIR}/www/py-cherrypy \
${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
diff --git a/news/sabnzbdplus/files/patch-SABnzbd.py b/news/sabnzbdplus/files/patch-SABnzbd.py
index ec06438d06bf..d20e780bed48 100644
--- a/news/sabnzbdplus/files/patch-SABnzbd.py
+++ b/news/sabnzbdplus/files/patch-SABnzbd.py
@@ -1,16 +1,5 @@
--- SABnzbd.py.orig 2010-06-26 13:24:26.000000000 -0400
+++ SABnzbd.py 2010-08-17 23:46:04.347483234 -0400
-@@ -42,8 +42,8 @@
- sys.exit(1)
-
- import cherrypy
--if not cherrypy.__version__.startswith("3.2"):
-- print "Sorry, requires Python module Cherrypy 3.2 (use the included version)"
-+if not cherrypy.__version__.startswith("3.1"):
-+ print "Sorry, requires Python module Cherrypy 3.1 (use the included version)"
- sys.exit(1)
-
- from cherrypy import _cpserver
@@ -214,7 +214,7 @@
print "fork() failed"
sys.exit(1)