diff -ruN sabnzbdplus-old/Makefile sabnzbdplus/Makefile --- sabnzbdplus-old/Makefile 2016-11-23 08:51:38.245165129 -0800 +++ sabnzbdplus/Makefile 2017-01-29 18:03:05.370690874 -0800 @@ -1,11 +1,12 @@ # $FreeBSD: head/news/sabnzbdplus/Makefile 422633 2016-09-22 16:14:31Z amdmi3 $ PORTNAME= sabnzbdplus -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= news -MASTER_SITES= SF -DISTNAME= SABnzbd-${PORTVERSION}-src + +USE_GITHUB= yes +GH_ACCOUNT= sabnzbd +GH_PROJECT= sabnzbd MAINTAINER= joshruehlig@gmail.com COMMENT= Web-interface based binary newsgrabber in python, with nzb support @@ -19,9 +20,7 @@ USES= python:2.7 -NO_BUILD= yes NO_ARCH= yes -WRKSRC= ${WRKDIR}/SABnzbd-${PORTVERSION} PLIST_SUB= PORTNAME=${PORTNAME} SUB_LIST= PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD} SUB_FILES= pkg-message @@ -31,13 +30,13 @@ COPYRIGHT.txt \ INSTALL.txt \ ISSUES.txt \ - README.txt + README.mkd USERS= _sabnzbd GROUPS= _sabnzbd -OPTIONS_DEFINE= PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC OPENSSL DOCS -OPTIONS_DEFAULT= PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC OPENSSL +OPTIONS_DEFINE= PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC SSL DOCS +OPTIONS_DEFAULT= PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC SSL PAR2CMDLINE_DESC= Required for postprocessing of par files UNRAR_DESC= Often required for unpacking many downloads 7ZIP_DESC= Needed for unpacking 7-Zip posts @@ -47,7 +46,7 @@ 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 +SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography UNRAR_RUN_DEPENDS= unrar:archivers/unrar 7ZIP_RUN_DEPENDS= 7za:archivers/p7zip @@ -57,8 +56,12 @@ @${REINPLACE_CMD} -e "s:%%DATADIR%%:'${DATADIR}':g" \ ${WRKSRC}/SABnzbd.py -# the NO_BUILD option stops execution after configure. This should really be -# post-build +# Generate locale files +do-build: + @${REINPLACE_CMD} -e "s:/usr/bin/env[[:space:]]python:${PYTHON_CMD}:g" \ + ${WRKSRC}/tools/msgfmt.py + cd ${WRKSRC} && ${PYTHON_CMD} tools/make_mo.py + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd diff -ruN sabnzbdplus-old/distinfo sabnzbdplus/distinfo --- sabnzbdplus-old/distinfo 2016-11-22 22:34:28.674302989 -0800 +++ sabnzbdplus/distinfo 2017-01-21 21:23:53.168166173 -0800 @@ -1,3 +1,3 @@ -TIMESTAMP = 1474366255 -SHA256 (SABnzbd-1.1.0-src.tar.gz) = 3e86a897dea1c276c54ee38667a980f644f16d57df75612fe9eefa84b339ce9a -SIZE (SABnzbd-1.1.0-src.tar.gz) = 2736977 +TIMESTAMP = 1485062633 +SHA256 (sabnzbd-sabnzbd-1.2.0_GH0.tar.gz) = 97d0ac8afd2c8f3db3e1fc965a74b6060c40bd4e03cbd16aa9d18845bf197b20 +SIZE (sabnzbd-sabnzbd-1.2.0_GH0.tar.gz) = 5312602 diff -ruN sabnzbdplus-old/pkg-plist sabnzbdplus/pkg-plist --- sabnzbdplus-old/pkg-plist 2016-11-22 22:34:28.763913465 -0800 +++ sabnzbdplus/pkg-plist 2017-01-21 21:25:59.715809653 -0800 @@ -46,7 +46,6 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/utils/json.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/listquote.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/ordered.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pathbrowser.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pybonjour.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pystone.py @@ -54,19 +53,16 @@ %%PYTHON_SITELIBDIR%%/sabnzbd/utils/rsslib.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/servertests.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/sslinfo.py -%%PYTHON_SITELIBDIR%%/sabnzbd/utils/ssmtplib.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/systrayiconthread.py %%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py %%PYTHON_SITELIBDIR%%/sabnzbd/version.py %%PYTHON_SITELIBDIR%%/sabnzbd/wizard.py %%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py -%%DATADIR%%/cherrypy/LICENSE.txt %%DATADIR%%/cherrypy/VERSION.txt %%DATADIR%%/cherrypy/__init__.py %%DATADIR%%/cherrypy/__main__.py %%DATADIR%%/cherrypy/_cpchecker.py %%DATADIR%%/cherrypy/_cpcompat.py -%%DATADIR%%/cherrypy/_cpcompat_subprocess.py %%DATADIR%%/cherrypy/_cpconfig.py %%DATADIR%%/cherrypy/_cpdispatch.py %%DATADIR%%/cherrypy/_cperror.py @@ -76,7 +72,6 @@ %%DATADIR%%/cherrypy/_cpreqbody.py %%DATADIR%%/cherrypy/_cprequest.py %%DATADIR%%/cherrypy/_cpserver.py -%%DATADIR%%/cherrypy/_cpthreadinglocal.py %%DATADIR%%/cherrypy/_cptools.py %%DATADIR%%/cherrypy/_cptree.py %%DATADIR%%/cherrypy/_cpwsgi.py @@ -95,7 +90,6 @@ %%DATADIR%%/cherrypy/lib/cptools.py %%DATADIR%%/cherrypy/lib/encoding.py %%DATADIR%%/cherrypy/lib/gctools.py -%%DATADIR%%/cherrypy/lib/http.py %%DATADIR%%/cherrypy/lib/httpauth.py %%DATADIR%%/cherrypy/lib/httputil.py %%DATADIR%%/cherrypy/lib/jsontools.py @@ -114,8 +108,7 @@ %%DATADIR%%/cherrypy/wsgiserver/__init__.py %%DATADIR%%/cherrypy/wsgiserver/ssl_builtin.py %%DATADIR%%/cherrypy/wsgiserver/ssl_pyopenssl.py -%%DATADIR%%/cherrypy/wsgiserver/wsgiserver2.py -%%DATADIR%%/cherrypy/wsgiserver/wsgiserver3.py +%%DATADIR%%/cherrypy/wsgiserver/test_wsgiserver.py %%DATADIR%%/gntp/__init__.py %%DATADIR%%/gntp/notifier.py %%DATADIR%%/interfaces/Config/README.txt @@ -151,7 +144,9 @@ %%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo-arrow.svg %%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo-full.svg %%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo-small.svg -%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-1.11.2.min.js +%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-3.1.1.min.js +%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-ui.min.js +%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery.tablesort.min.js %%DATADIR%%/interfaces/Config/templates/staticcfg/js/script.js %%DATADIR%%/interfaces/Glitter/licenses/LICENSE-Apache.txt %%DATADIR%%/interfaces/Glitter/licenses/LICENSE-CC.txt @@ -311,8 +306,6 @@ %%DATADIR%%/interfaces/wizard/index.html %%DATADIR%%/interfaces/wizard/one.html %%DATADIR%%/interfaces/wizard/static/javascript/checkserver.js -%%DATADIR%%/interfaces/wizard/static/javascript/jquery.js -%%DATADIR%%/interfaces/wizard/static/javascript/restart.js %%DATADIR%%/interfaces/wizard/static/style.css %%DATADIR%%/interfaces/wizard/two.html %%DATADIR%%/locale/da/LC_MESSAGES/SABnzbd.mo @@ -378,6 +371,7 @@ %%DATADIR%%/po/nsis/sr.po %%DATADIR%%/po/nsis/sv.po %%DATADIR%%/po/nsis/zh_CN.po +%%DATADIR%%/tools/extract_pot.py %%DATADIR%%/tools/make_mo.py %%DATADIR%%/tools/msgfmt.py %%DATADIR%%/util/__init__.py