3 files changed, 72 insertions, 39 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index bf96c64f2c27..61d64f2df5ab 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sabnzbdplus
-PORTVERSION=	0.6.14
+PORTVERSION=	0.6.15
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
 DISTNAME=	SABnzbd-${PORTVERSION}-src
@@ -14,13 +14,63 @@ DISTNAME=	SABnzbd-${PORTVERSION}-src
 MAINTAINER=	dab@rj45.org
 COMMENT=	A web-interface based binary newsgrabber in python, with nzb support
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 GPLv3 PSFL CHERRYPY CONFIGOBJ FEEDPARSER GNTP JSON KRONOS LISTQUOTE MSGFMT PYNEWSLEECHER RARFILE RSSLIB SSMTPLIB
+LICENSE_COMB=	multi
+
+LICENSE_NAME_CHERRYPY=	CherryPy License
+LICENSE_FILE_CHERRYPY=	${WRKSRC}/licenses/License-CherryPy.txt
+LICENSE_PERMS_CHERRYPY=	auto-accept
+
+LICENSE_NAME_CONFIGOBJ=	configobj License
+LICENSE_FILE_CONFIGOBJ=	${WRKSRC}/licenses/License-configobj.txt
+LICENSE_PERMS_CONFIGOBJ=	auto-accept
+
+LICENSE_NAME_FEEDPARSER=	feedparser License
+LICENSE_FILE_FEEDPARSER=	${WRKSRC}/licenses/License-feedparser.txt
+LICENSE_PERMS_FEEDPARSER=	auto-accept
+
+LICENSE_NAME_GNTP=	gntp License
+LICENSE_FILE_GNTP=	${WRKSRC}/licenses/License-gntp.txt
+LICENSE_PERMS_GNTP=	auto-accept
+
+LICENSE_NAME_JSON=	json License
+LICENSE_FILE_JSON=	${WRKSRC}/licenses/License-json.txt
+LICENSE_PERMS_JSON=	auto-accept
+
+LICENSE_NAME_KRONOS=	kronos License
+LICENSE_FILE_KRONOS=	${WRKSRC}/licenses/License-kronos.txt
+LICENSE_PERMS_KRONOS=	auto-accept
+
+LICENSE_NAME_LISTQUOTE=	listquote License
+LICENSE_FILE_LISTQUOTE=	${WRKSRC}/licenses/License-listquote.txt
+LICENSE_PERMS_LISTQUOTE=	auto-accept
+
+LICENSE_NAME_MSGFMT=	msgfmt License
+LICENSE_FILE_MSGFMT=	${WRKSRC}/licenses/License-msgfmt.txt
+LICENSE_PERMS_MSGFMT=	auto-accept
+
+LICENSE_NAME_PYNEWSLEECHER=	pynewsleecher License
+LICENSE_FILE_PYNEWSLEECHER=	${WRKSRC}/licenses/License-pynewsleecher.txt
+LICENSE_PERMS_PYNEWSLEECHER=	auto-accept
+
+LICENSE_NAME_RARFILE=	rarfile License
+LICENSE_FILE_RARFILE=	${WRKSRC}/licenses/License-rarfile.txt
+LICENSE_PERMS_RARFILE=	auto-accept
+
+LICENSE_NAME_RSSLIB=	rsslib License
+LICENSE_FILE_RSSLIB=	${WRKSRC}/licenses/License-rsslib.txt
+LICENSE_PERMS_RSSLIB=	auto-accept
+
+LICENSE_NAME_SSMTPLIB=	ssmtplib License
+LICENSE_FILE_SSMTPLIB=	${WRKSRC}/licenses/License-ssmtplib.txt
+LICENSE_PERMS_SSMTPLIB=	auto-accept
 
 RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 
 USE_PYTHON=	2.5+
+USE_GETTEXT=	yes
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/SABnzbd-${PORTVERSION}
@@ -28,7 +78,14 @@ PLIST_SUB=	PORTNAME=${PORTNAME}
 SUB_LIST+=	PORTNAME=${PORTNAME}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	sabnzbd
-CONFLICTS=	sabzndb-0.*
+CONFLICTS_INSTALL=	sabzndb-0.*
+
+PORTDOCS=	ABOUT.txt \
+		CHANGELOG.txt \
+		COPYRIGHT.txt \
+		INSTALL.txt \
+		ISSUES.txt \
+		README.txt
 
 USERS=		_sabnzbd
 GROUPS=		_sabnzbd
@@ -71,23 +128,20 @@ post-patch:
 # the NO_BUILD option stops execution after configure. This should really be
 # post-build
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${PREFIX}/bin/SABnzbd.py
-	${INSTALL} -d  ${PYTHONPREFIX_SITELIBDIR}/
-	${CP} -rp ${WRKSRC}/sabnzbd ${PYTHONPREFIX_SITELIBDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/SABnzbd.py ${PREFIX}/bin
+	${INSTALL} -d ${PYTHONPREFIX_SITELIBDIR}/sabnzbd
+	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${PYTHONPREFIX_SITELIBDIR}/sabnzbd
 	${INSTALL} -d ${DATADIR}
-	${CP} -rp ${WRKSRC}/cherrypy ${DATADIR}
-	${CP} -rp ${WRKSRC}/gntp ${DATADIR}
-	${CP} -rp ${WRKSRC}/interfaces ${DATADIR}
-	${CP} -rp ${WRKSRC}/locale ${DATADIR}
-	${CP} -rp ${WRKSRC}/po ${DATADIR}
-	${CP} -rp ${WRKSRC}/tools ${DATADIR}
-	${CP} -rp ${WRKSRC}/util ${DATADIR}
+.for i in cherrypy gntp interfaces locale po tools util
+	${MKDIR} ${DATADIR}/${i}
+	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${DATADIR}/${i}
+.endfor
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in *.txt licenses/*.txt
-	${CP} ${WRKSRC}/$i ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/sabnzbd
diff --git a/news/sabnzbdplus/distinfo b/news/sabnzbdplus/distinfo
index 85868c26b397..3f0f8df468e5 100644
--- a/news/sabnzbdplus/distinfo
+++ b/news/sabnzbdplus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SABnzbd-0.6.14-src.tar.gz) = 74084bfa4bf3133086647c85953be5dacddb8e8cad721dda8f0175f7a79e54c2
-SIZE (SABnzbd-0.6.14-src.tar.gz) = 1947492
+SHA256 (SABnzbd-0.6.15-src.tar.gz) = a1f6cd461123b7787d99d87d509c08a9607f3d01d447af3d0f3826b760bf2eb6
+SIZE (SABnzbd-0.6.15-src.tar.gz) = 1949179
diff --git a/news/sabnzbdplus/pkg-plist b/news/sabnzbdplus/pkg-plist
index d23d76799e56..5ee8b074eca1 100644
--- a/news/sabnzbdplus/pkg-plist
+++ b/news/sabnzbdplus/pkg-plist
@@ -48,27 +48,6 @@ bin/SABnzbd.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/version.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/wizard.py
-%%PORTDOCS%%%%DOCSDIR%%/ABOUT.txt
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.txt
-%%PORTDOCS%%%%DOCSDIR%%/GPL2.txt
-%%PORTDOCS%%%%DOCSDIR%%/GPL3.txt
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
-%%PORTDOCS%%%%DOCSDIR%%/ISSUES.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-CherryPy.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-Python.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-configobj.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-feedparser.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-gntp.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-json.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-kronos.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-listquote.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-msgfmt.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-pynewsleecher.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-rarfile.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-rsslib.txt
-%%PORTDOCS%%%%DOCSDIR%%/License-ssmtplib.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%DATADIR%%/cherrypy/LICENSE.txt
 %%DATADIR%%/cherrypy/VERSION.txt
 %%DATADIR%%/cherrypy/__init__.py
@@ -374,7 +353,6 @@ bin/SABnzbd.py
 %%DATADIR%%/util/__init__.py
 %%DATADIR%%/util/apireg.py
 %%DATADIR%%/util/mailslot.py
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/util
 @dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%/po/nsis
@@ -453,3 +431,4 @@ bin/SABnzbd.py
 @dirrm %%PYTHON_SITELIBDIR%%/sabnzbd
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @exec mkdir -p %D/sabnzbd
+@exec chown _sabnzbd:_sabnzbd %D/sabnzbd