Index: head/news/sabnzbdplus/Makefile =================================================================== --- head/news/sabnzbdplus/Makefile (revision 416897) +++ head/news/sabnzbdplus/Makefile (revision 416898) @@ -1,78 +1,78 @@ # $FreeBSD$ PORTNAME= sabnzbdplus -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= news MASTER_SITES= SF DISTNAME= SABnzbd-${PORTVERSION}-src MAINTAINER= joshruehlig@gmail.com COMMENT= Web-interface based binary newsgrabber in python, with nzb support LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL LICENSE_COMB= multi RUN_DEPENDS= cheetah:devel/py-cheetah \ ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 USES= gettext python:2.6-2.7 NO_BUILD= yes WRKSRC= ${WRKDIR}/SABnzbd-${PORTVERSION} PLIST_SUB= PORTNAME=${PORTNAME} SUB_LIST= PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD} SUB_FILES= pkg-message USE_RC_SUBR= sabnzbd PORTDOCS= ABOUT.txt \ COPYRIGHT.txt \ INSTALL.txt \ ISSUES.txt \ README.txt USERS= _sabnzbd GROUPS= _sabnzbd OPTIONS_DEFINE= PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC OPENSSL DOCS OPTIONS_DEFAULT= PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC OPENSSL PAR2CMDLINE_DESC= Required for postprocessing of par files UNRAR_DESC= Often required for unpacking many downloads 7ZIP_DESC= Needed for unpacking 7-Zip posts FEEDPARSER_DESC= rss-feed support YENC_DESC= yenc support PAR2CMDLINE_RUN_DEPENDS= par2repair:archivers/par2cmdline-tbb FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl UNRAR_RUN_DEPENDS= unrar:archivers/unrar 7ZIP_RUN_DEPENDS= 7za:archivers/p7zip .include post-patch: @${REINPLACE_CMD} -e "s:/usr/bin/python:${PYTHON_CMD}:g" \ ${WRKSRC}/SABnzbd.py @${REINPLACE_CMD} -e "s:%%DATADIR%%:'${DATADIR}':g" \ ${WRKSRC}/SABnzbd.py # the NO_BUILD option stops execution after configure. This should really be # post-build do-install: ${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${STAGEDIR}${PREFIX}/bin ${INSTALL} -d ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd ${INSTALL} -d ${STAGEDIR}${DATADIR} .for i in cherrypy gntp interfaces locale po tools util ${MKDIR} ${STAGEDIR}${DATADIR}/${i} cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i} .endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/news/sabnzbdplus/distinfo =================================================================== --- head/news/sabnzbdplus/distinfo (revision 416897) +++ head/news/sabnzbdplus/distinfo (revision 416898) @@ -1,2 +1,3 @@ -SHA256 (SABnzbd-1.0.2-src.tar.gz) = 9ced2f4b9486674e8b0a920769710b16e7d96a9981d5aa47b6584f2c3a1e0b62 -SIZE (SABnzbd-1.0.2-src.tar.gz) = 2974940 +TIMESTAMP = 1465600692 +SHA256 (SABnzbd-1.0.3-src.tar.gz) = cf87d3f17fc03e8b3a4b3010261115c2ad7e2f773b5ede95a80025b340dbbd35 +SIZE (SABnzbd-1.0.3-src.tar.gz) = 2975111 Index: head/news/sabnzbdplus/files/patch-SABnzbd.py =================================================================== --- head/news/sabnzbdplus/files/patch-SABnzbd.py (revision 416897) +++ head/news/sabnzbdplus/files/patch-SABnzbd.py (revision 416898) @@ -1,21 +1,21 @@ ---- SABnzbd.py.orig 2012-07-23 23:26:14.000000000 -0400 -+++ SABnzbd.py 2012-07-23 23:28:04.000000000 -0400 -@@ -40,6 +40,9 @@ +--- SABnzbd.py.orig 2016-06-04 11:45:01 UTC ++++ SABnzbd.py +@@ -51,6 +51,9 @@ except: print "The Python module Cheetah is required" sys.exit(1) +# Force python to load the patched version of cherrypy included with the port, +# instead of any version that may be installed otherwise. +sys.path.insert(0,%%DATADIR%%) import cherrypy - if not cherrypy.__version__.startswith("3.2"): - print "Sorry, requires Python module Cherrypy 3.2 (use the included version)" -@@ -1011,7 +1014,7 @@ - + if [int(n) for n in cherrypy.__version__.split('.')] < [3, 8, 0]: + print 'Sorry, requires Python module Cherrypy 3.8.0+ (use the included version)' +@@ -1006,7 +1009,7 @@ def main(): + sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME)) sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME) - sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME) + sabnzbd.DIR_PROG = %%DATADIR%% sabnzbd.DIR_INTERFACES = real_path(sabnzbd.DIR_PROG, DEF_INTERFACES) sabnzbd.DIR_LANGUAGE = real_path(sabnzbd.DIR_PROG, DEF_LANGUAGE) org_dir = os.getcwd()