Index: head/news/sabnzbdplus/Makefile
===================================================================
--- head/news/sabnzbdplus/Makefile	(revision 383732)
+++ head/news/sabnzbdplus/Makefile	(revision 383733)
@@ -1,141 +1,93 @@
 # $FreeBSD$
 
 PORTNAME=	sabnzbdplus
 PORTVERSION=	0.7.20
 CATEGORIES=	news
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	SABnzbd-${PORTVERSION}-src
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Web-interface based binary newsgrabber in python, with nzb support
 
-LICENSE=	GPLv2 GPLv3 PSFL CHERRYPY CONFIGOBJ FEEDPARSER GNTP JSON KRONOS LISTQUOTE MSGFMT PYNEWSLEECHER RARFILE RSSLIB SSMTPLIB
+LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2 GPLv3 ISCL MIT PSFL
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah \
 		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:${PORTSDIR}/devel/py-utils \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-
-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
 
 USES=		gettext python
 
 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 \
 		CHANGELOG.txt \
 		COPYRIGHT.txt \
 		INSTALL.txt \
 		ISSUES.txt \
 		README.txt
 
 USERS=		_sabnzbd
 GROUPS=		_sabnzbd
 
 OPTIONS_DEFINE=	PAR2CMDLINE UNRAR FEEDPARSER YENC OPENSSL DOCS
 OPTIONS_DEFAULT=	PAR2CMDLINE UNRAR FEEDPARSER YENC OPENSSL
 PAR2CMDLINE_DESC=	Required for postprocessing of par files
 UNRAR_DESC=	Often required for unpacking many downloads
 FEEDPARSER_DESC=	rss-feed support
 YENC_DESC=	yenc support
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPAR2CMDLINE}
 RUN_DEPENDS+=	par2repair:${PORTSDIR}/archivers/par2cmdline-tbb
 .endif
 
 .if ${PORT_OPTIONS:MFEEDPARSER}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
 .endif
 
 .if ${PORT_OPTIONS:MYENC}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yenc>=0:${PORTSDIR}/news/py-yenc
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
 .endif
 
 .if ${PORT_OPTIONS:MUNRAR}
 RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s:/usr/bin/python:${PYTHON_CMD}:g" \
 		 ${WRKSRC}/SABnzbd.py
 	@${REINPLACE_CMD} -e "s:%%PREFIX%%:'${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}
 	${INSTALL} -d ${STAGEDIR}${PREFIX}/sabnzbd
 .for i in cherrypy gntp interfaces locale po tools util
 	${MKDIR} ${STAGEDIR}${DATADIR}/${i}
 	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
 .endfor
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>
Index: head/news/sabnzbdplus/files/pkg-message.in
===================================================================
--- head/news/sabnzbdplus/files/pkg-message.in	(revision 383732)
+++ head/news/sabnzbdplus/files/pkg-message.in	(revision 383733)
@@ -1,18 +1,18 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 news/sabnzbdplus includes an RC script:
 %%PREFIX%%/etc/rc.d/sabnzbd
 
 TO START SABNZBD ON BOOT:
-echo 'sabnzbd_enable="YES"' >> /etc/rc.conf
+# sysrc sabnzbd_enable=YES
 
 START MANUALLY:
-%%PREFIX%%/etc/rc.d/sabnzbd start
+# service sabnzbd start
 
 Once started, visit the following to configure:
 http://localhost:8080/sabnzbd/
 
 Note that your URL may differ slightly if you have an old sabnzbd.ini
 that specifies a different address to bind to.
 
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *