svn commit: r383733 - in head/news/sabnzbdplus: . files

[Mark Felder]

Author: feld
Date: Fri Apr 10 15:10:53 2015
New Revision: 383733
URL: https://svnweb.freebsd.org/changeset/ports/383733

Log:
  Consolidate LICENSEs
  
  This port had a lot of custom licenses defined instead of using the
  correct licenses that the ports license framework already knows about.
  Due to incorrect LICENSE_PERMS on these custom licenses the sabnzbdplus
  package was missing from the official FreeBSD mirrors.
  
  While here, modernize the instructions in pkg-message

Modified:
  head/news/sabnzbdplus/Makefile
  head/news/sabnzbdplus/files/pkg-message.in

Modified: head/news/sabnzbdplus/Makefile
==============================================================================
--- head/news/sabnzbdplus/Makefile	Fri Apr 10 15:10:04 2015	(r383732)
+++ head/news/sabnzbdplus/Makefile	Fri Apr 10 15:10:53 2015	(r383733)
@@ -9,61 +9,13 @@ DISTNAME=	SABnzbd-${PORTVERSION}-src
 MAINTAINER=	feld at 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

Modified: head/news/sabnzbdplus/files/pkg-message.in
==============================================================================
--- head/news/sabnzbdplus/files/pkg-message.in	Fri Apr 10 15:10:04 2015	(r383732)
+++ head/news/sabnzbdplus/files/pkg-message.in	Fri Apr 10 15:10:53 2015	(r383733)
@@ -4,10 +4,10 @@ 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/