- Update to 1.1.0

- While here, add NO_ARCH and apply minor cosmetic fixes

PR:		212848
Submitted by:	joshruehlig@gmail.com (maintainer)

3 files changed, 26 insertions, 30 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index dee80c8f6285..c86c23dc014a 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sabnzbdplus
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.0
 CATEGORIES=	news
 MASTER_SITES=	SF
 DISTNAME=	SABnzbd-${PORTVERSION}-src
@@ -16,9 +16,10 @@ 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
+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}
@@ -49,8 +50,6 @@ OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
 7ZIP_RUN_DEPENDS=	7za:archivers/p7zip
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s:/usr/bin/python:${PYTHON_CMD}:g" \
 		 ${WRKSRC}/SABnzbd.py
@@ -61,18 +60,18 @@ post-patch:
 # post-build
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${STAGEDIR}${PREFIX}/bin
-	${INSTALL} -d ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
 	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
-	${INSTALL} -d ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in cherrypy gntp interfaces locale po tools util
-	${MKDIR} ${STAGEDIR}${DATADIR}/${i}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/${i}
 	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
 .endfor
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/news/sabnzbdplus/distinfo b/news/sabnzbdplus/distinfo
index c53e35bb52c1..dae9d79a343c 100644
--- a/news/sabnzbdplus/distinfo
+++ b/news/sabnzbdplus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465600692
-SHA256 (SABnzbd-1.0.3-src.tar.gz) = cf87d3f17fc03e8b3a4b3010261115c2ad7e2f773b5ede95a80025b340dbbd35
-SIZE (SABnzbd-1.0.3-src.tar.gz) = 2975111
+TIMESTAMP = 1474366255
+SHA256 (SABnzbd-1.1.0-src.tar.gz) = 3e86a897dea1c276c54ee38667a980f644f16d57df75612fe9eefa84b339ce9a
+SIZE (SABnzbd-1.1.0-src.tar.gz) = 2736977
diff --git a/news/sabnzbdplus/pkg-plist b/news/sabnzbdplus/pkg-plist
index d5a462d7923b..7eb7be08649a 100644
--- a/news/sabnzbdplus/pkg-plist
+++ b/news/sabnzbdplus/pkg-plist
@@ -15,12 +15,12 @@ bin/SABnzbd.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/emailer.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/encoding.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/getipaddress.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/growler.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/interface.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/lang.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/misc.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/notifier.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/osxmenu.py
@@ -61,7 +61,6 @@ bin/SABnzbd.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/wizard.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py
 %%DATADIR%%/cherrypy/LICENSE.txt
-%%DATADIR%%/cherrypy/Patch-for-CP-3.8.0.diff
 %%DATADIR%%/cherrypy/VERSION.txt
 %%DATADIR%%/cherrypy/__init__.py
 %%DATADIR%%/cherrypy/__main__.py
@@ -82,6 +81,7 @@ bin/SABnzbd.py
 %%DATADIR%%/cherrypy/_cptree.py
 %%DATADIR%%/cherrypy/_cpwsgi.py
 %%DATADIR%%/cherrypy/_cpwsgi_server.py
+%%DATADIR%%/cherrypy/_helper.py
 %%DATADIR%%/cherrypy/cherryd
 %%DATADIR%%/cherrypy/daemon.py
 %%DATADIR%%/cherrypy/favicon.ico
@@ -132,21 +132,25 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Config/templates/config_sorting.tmpl
 %%DATADIR%%/interfaces/Config/templates/config_special.tmpl
 %%DATADIR%%/interfaces/Config/templates/config_switches.tmpl
+%%DATADIR%%/interfaces/Config/templates/login/main.tmpl
 %%DATADIR%%/interfaces/Config/templates/main.tmpl
 %%DATADIR%%/interfaces/Config/templates/staticcfg/bootstrap/css/bootstrap.min.css
 %%DATADIR%%/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.eot
 %%DATADIR%%/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.svg
 %%DATADIR%%/interfaces/Config/templates/staticcfg/bootstrap/fonts/glyphicons-halflings-regular.ttf
 %%DATADIR%%/interfaces/Config/templates/staticcfg/bootstrap/js/bootstrap.min.js
+%%DATADIR%%/interfaces/Config/templates/staticcfg/css/login.css
 %%DATADIR%%/interfaces/Config/templates/staticcfg/css/style.css
+%%DATADIR%%/interfaces/Config/templates/staticcfg/ico/android-192x192.png
 %%DATADIR%%/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-120x120-precomposed.png
 %%DATADIR%%/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-152x152-precomposed.png
 %%DATADIR%%/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-180x180-precomposed.png
 %%DATADIR%%/interfaces/Config/templates/staticcfg/ico/apple-touch-icon-76x76-precomposed.png
 %%DATADIR%%/interfaces/Config/templates/staticcfg/ico/favicon.ico
 %%DATADIR%%/interfaces/Config/templates/staticcfg/ico/faviconpaused.ico
-%%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo-small.png
-%%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo.png
+%%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/script.js
 %%DATADIR%%/interfaces/Glitter/licenses/LICENSE-Apache.txt
@@ -156,7 +160,7 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Glitter/templates/include_history.tmpl
 %%DATADIR%%/interfaces/Glitter/templates/include_menu.tmpl
 %%DATADIR%%/interfaces/Glitter/templates/include_messages.tmpl
-%%DATADIR%%/interfaces/Glitter/templates/include_modals.tmpl
+%%DATADIR%%/interfaces/Glitter/templates/include_overlays.tmpl
 %%DATADIR%%/interfaces/Glitter/templates/include_queue.tmpl
 %%DATADIR%%/interfaces/Glitter/templates/main.tmpl
 %%DATADIR%%/interfaces/Glitter/templates/nzo.tmpl
@@ -166,12 +170,15 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.svg
 %%DATADIR%%/interfaces/Glitter/templates/static/bootstrap/fonts/glyphicons-halflings-regular.ttf
 %%DATADIR%%/interfaces/Glitter/templates/static/bootstrap/js/bootstrap.min.js
-%%DATADIR%%/interfaces/Glitter/templates/static/images/logo-small.png
-%%DATADIR%%/interfaces/Glitter/templates/static/images/logo.png
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/date.min.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.basic.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.history.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.js
-%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery-1.11.2.min.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.main.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery-ui.min.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery.min.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery.peity.min.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-extensions.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-latest.js
@@ -233,7 +240,6 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/refresh.png
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/rss-grey.png
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/nav/rss.png
-%%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/%%PORTNAME%%.ico
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sound16.png
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-config.png
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/colorschemes/gold/images/sprite-main.png
@@ -292,7 +298,6 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/smpl/templates/static/images/favicon.ico
 %%DATADIR%%/interfaces/smpl/templates/static/images/key_enter.png
 %%DATADIR%%/interfaces/smpl/templates/static/images/messagebox_critical.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/newzbin.png
 %%DATADIR%%/interfaces/smpl/templates/static/images/nuvola/kgpg.png
 %%DATADIR%%/interfaces/smpl/templates/static/images/up.gif
 %%DATADIR%%/interfaces/smpl/templates/static/sabnzbd_small4.png
@@ -305,14 +310,6 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/wizard/inc_top.tmpl
 %%DATADIR%%/interfaces/wizard/index.html
 %%DATADIR%%/interfaces/wizard/one.html
-%%DATADIR%%/interfaces/wizard/static/images/classic-th.png
-%%DATADIR%%/interfaces/wizard/static/images/classic.png
-%%DATADIR%%/interfaces/wizard/static/images/favicon.ico
-%%DATADIR%%/interfaces/wizard/static/images/icon_sab.png
-%%DATADIR%%/interfaces/wizard/static/images/plush-th.png
-%%DATADIR%%/interfaces/wizard/static/images/plush.png
-%%DATADIR%%/interfaces/wizard/static/images/smpl-th.png
-%%DATADIR%%/interfaces/wizard/static/images/smpl.png
 %%DATADIR%%/interfaces/wizard/static/javascript/checkserver.js
 %%DATADIR%%/interfaces/wizard/static/javascript/jquery.js
 %%DATADIR%%/interfaces/wizard/static/javascript/restart.js