Merge branch 'master' into mate-1.16mate-1.16

3 files changed, 23 insertions, 26 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 05db566883c1..39f79cfe2195 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	sabnzbdplus
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	news
-MASTER_SITES=	SF
-DISTNAME=	SABnzbd-${PORTVERSION}-src
 
 MAINTAINER=	joshruehlig@gmail.com
 COMMENT=	Web-interface based binary newsgrabber in python, with nzb support
@@ -17,11 +14,13 @@ RUN_DEPENDS=	cheetah:devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	sabnzbd
+GH_PROJECT=	sabnzbd
+
 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 @@ PORTDOCS=	ABOUT.txt \
 		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 @@ 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
+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 @@ post-patch:
 	@${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 --git a/news/sabnzbdplus/distinfo b/news/sabnzbdplus/distinfo
index dae9d79a343c..9bab212043fc 100644
--- a/news/sabnzbdplus/distinfo
+++ b/news/sabnzbdplus/distinfo
@@ -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 --git a/news/sabnzbdplus/pkg-plist b/news/sabnzbdplus/pkg-plist
index 7eb7be08649a..fe64bb881d9c 100644
--- a/news/sabnzbdplus/pkg-plist
+++ b/news/sabnzbdplus/pkg-plist
@@ -46,7 +46,6 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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 @@ bin/SABnzbd.py
 %%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