summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING26
-rw-r--r--news/sabnzbdplus/Makefile31
-rw-r--r--news/sabnzbdplus/pkg-descr8
-rw-r--r--news/sabnzbdplus/pkg-message14
4 files changed, 72 insertions, 7 deletions
diff --git a/UPDATING b/UPDATING
index b8f14e1..53ba71d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,32 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20100118:
+ AFFECTS: users of news/sabnzbdplus
+ AUTHOR: glarkin@FreeBSD.org
+
+ SABnzbd only works with Python 2.5 and will not install if certain
+ ports were previously installed against Python 2.6, such as
+ py-setuptools.
+
+ In some cases, the installation may succeed by issuing the command:
+
+ make PYTHON_DEFAULT_VERSION=python2.5 install clean
+
+ If installation still fails, then one or more of the following ports
+ has been built against Python 2.6 and will not allow the same port
+ built against Python 2.5 to be installed:
+
+ devel/py-cheetah
+ devel/py-setuptools
+ devel/py-utils
+ security/py-openssltextproc/py-chardet
+ textproc/py-feedparsertextproc/py-markdown
+ www/py-cherrypy-old
+
+ Either remove the py26- ports or install SABnzbd on a machine without
+ Python 2.6.
+
20100113:
AFFECTS: users of emulators/virtualbox
AUTHOR: beat@FreeBSD.org
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 844c810..0c94299 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 8baf015..81433e1 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 0000000..17128e9
--- /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/
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
OpenPOWER on IntegriCloud