sickbeard: Address feedback from pkgsrc-users@

[Jonathan Schleifer <js%heap.zone@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Schleifer <js%heap.zone@localhost>
Pushed By:	js
Date:		Tue Jul 12 23:17:10 2016 +0200
Changeset:	605d3d78a83ea3a6441bc6e03e83f9348f56d5e6

Modified Files:
	sickbeard/Makefile
	sickbeard/PLIST
Removed Files:
	sickbeard/INSTALL
	sickbeard/MESSAGE.SunOS

Log Message:
sickbeard: Address feedback from pkgsrc-users@

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=605d3d78a83ea3a6441bc6e03e83f9348f56d5e6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sickbeard/INSTALL       | 10 ----------
 sickbeard/MESSAGE.SunOS | 10 ----------
 sickbeard/Makefile      | 23 +++++++++++++----------
 sickbeard/PLIST         | 49 -------------------------------------------------
 4 files changed, 13 insertions(+), 79 deletions(-)

diffs:
diff --git a/sickbeard/INSTALL b/sickbeard/INSTALL
deleted file mode 100644
index ed6a2c5..0000000
--- a/sickbeard/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2013/10/01 20:29:58 wongk Exp $
-SB_DIR="@PREFIX@/sickbeard"
-SB_USER=sickbeard
-SB_GROUP=other
-
-case ${STAGE} in
-POST-INSTALL)
-	(${CHOWN} -R ${SB_USER}:"${SB_GROUP}" "${SB_DIR}")
-	;;
-esac
diff --git a/sickbeard/MESSAGE.SunOS b/sickbeard/MESSAGE.SunOS
deleted file mode 100644
index 20906ab..0000000
--- a/sickbeard/MESSAGE.SunOS
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.1 2013/10/02 11:50:24 wongk Exp $
-
-To use sickbeard on Solaris, you'll need to import and enable the service
-via SMF:
-    svccfg import /opt/local/sickbeard/init.solaris11
-    svcadm enable sickbeard
-
-
-===========================================================================
diff --git a/sickbeard/Makefile b/sickbeard/Makefile
index 973efd5..27ebc71 100644
--- a/sickbeard/Makefile
+++ b/sickbeard/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	sickbeard-507
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=midgetspy/}
 GITHUB_PROJECT=	Sick-Beard
@@ -13,19 +13,17 @@ COMMENT=	PVR application to search and manage TV shows
 # sickbeard, cherrypy, simplejson, jquery, gntp, tvdb_api
 LICENSE=	gnu-gpl-v3 AND modified-bsd AND mit AND unlicense
 
-DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
 DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
+DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
 
 WRKSRC=		${WRKDIR}/Sick-Beard-build-${PKGVERSION_NOREV}
 NO_BUILD=	yes
 USE_TOOLS=	pax
 
-PKG_GROUPS=		sickbeard
-PKG_USERS=		sickbeard:sickbeard
-PKG_HOME.sickbeard=	${PREFIX}/lib/sickbeard
-
-INSTALL_DIRS+=	autoProcessTV cherrypy data lib sickbeard
+INSTALL_DIRS+=	autoProcessTV data lib sickbeard
 INSTALL_FILES+=	SickBeard.py CHANGELOG.txt CONTRIBUTING.md COPYING.txt
 AUTO_MKDIRS=	yes
 
@@ -34,6 +32,13 @@ PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
 REPLACE_PYTHON=			*.py */*.py */*/*.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-cheetah
 
+BUILD_DEFS+=		VARBASE
+OWN_DIRS_PERMS=		${VARBASE}/sickbeard /sickbeard sickbeard 750
+
+PKG_GROUPS=		sickbeard
+PKG_USERS=		sickbeard:sickbeard
+PKG_HOME.sickbeard=	${PREFIX}/lib/sickbeard
+
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	sickbeard.sh
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
@@ -41,17 +46,15 @@ SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
 SUBST_STAGE.paths=	post-patch
 
-OWN_DIRS=		${VARBASE}/sickbeard
-
 post-extract:
 	${CP} ${FILESDIR}/sickbeard.sh ${WRKSRC}/sickbeard.sh
+	${RM} -rf ${WRKSRC}/lib/simplejson
 
 do-install:
 .for i in ${INSTALL_FILES} ${INSTALL_DIRS}
 	cd ${WRKSRC} && pax -rw -pmp ${i} ${DESTDIR}${PREFIX}/lib/sickbeard/
 .endfor
 	${RM} -rf ${DESTDIR}${PREFIX}/lib/sickbeard/lib/tvdb_api/tests
-	${MKDIR} ${DESTDIR}${PREFIX}/bin
 	${INSTALL} -m 755 ${WRKSRC}/sickbeard.sh ${DESTDIR}${PREFIX}/bin/sickbeard
 
 .include "../../lang/python/application.mk"
diff --git a/sickbeard/PLIST b/sickbeard/PLIST
index 6aa87f5..70b3f41 100644
--- a/sickbeard/PLIST
+++ b/sickbeard/PLIST
@@ -9,49 +9,6 @@ lib/sickbeard/autoProcessTV/autoProcessTV.py
 lib/sickbeard/autoProcessTV/hellaToSickBeard.py
 lib/sickbeard/autoProcessTV/sabToSickBeard.py
 lib/sickbeard/autoProcessTV/setup.py
-lib/sickbeard/cherrypy/__init__.py
-lib/sickbeard/cherrypy/_cpchecker.py
-lib/sickbeard/cherrypy/_cpconfig.py
-lib/sickbeard/cherrypy/_cpdispatch.py
-lib/sickbeard/cherrypy/_cperror.py
-lib/sickbeard/cherrypy/_cplogging.py
-lib/sickbeard/cherrypy/_cpmodpy.py
-lib/sickbeard/cherrypy/_cpnative_server.py
-lib/sickbeard/cherrypy/_cpreqbody.py
-lib/sickbeard/cherrypy/_cprequest.py
-lib/sickbeard/cherrypy/_cpserver.py
-lib/sickbeard/cherrypy/_cpthreadinglocal.py
-lib/sickbeard/cherrypy/_cptools.py
-lib/sickbeard/cherrypy/_cptree.py
-lib/sickbeard/cherrypy/_cpwsgi.py
-lib/sickbeard/cherrypy/_cpwsgi_server.py
-lib/sickbeard/cherrypy/cherryd
-lib/sickbeard/cherrypy/favicon.ico
-lib/sickbeard/cherrypy/lib/__init__.py
-lib/sickbeard/cherrypy/lib/auth.py
-lib/sickbeard/cherrypy/lib/auth_basic.py
-lib/sickbeard/cherrypy/lib/auth_digest.py
-lib/sickbeard/cherrypy/lib/caching.py
-lib/sickbeard/cherrypy/lib/covercp.py
-lib/sickbeard/cherrypy/lib/cptools.py
-lib/sickbeard/cherrypy/lib/encoding.py
-lib/sickbeard/cherrypy/lib/http.py
-lib/sickbeard/cherrypy/lib/httpauth.py
-lib/sickbeard/cherrypy/lib/httputil.py
-lib/sickbeard/cherrypy/lib/jsontools.py
-lib/sickbeard/cherrypy/lib/profiler.py
-lib/sickbeard/cherrypy/lib/reprconf.py
-lib/sickbeard/cherrypy/lib/sessions.py
-lib/sickbeard/cherrypy/lib/static.py
-lib/sickbeard/cherrypy/lib/xmlrpc.py
-lib/sickbeard/cherrypy/process/__init__.py
-lib/sickbeard/cherrypy/process/plugins.py
-lib/sickbeard/cherrypy/process/servers.py
-lib/sickbeard/cherrypy/process/win32.py
-lib/sickbeard/cherrypy/process/wspbus.py
-lib/sickbeard/cherrypy/wsgiserver/__init__.py
-lib/sickbeard/cherrypy/wsgiserver/ssl_builtin.py
-lib/sickbeard/cherrypy/wsgiserver/ssl_pyopenssl.py
 lib/sickbeard/data/css/lib/bootstrap.css
 lib/sickbeard/data/css/lib/images/ui-bg_fine-grain_10_eceadf_60x60.png
 lib/sickbeard/data/css/lib/images/ui-bg_flat_0_000000_40x100.png
@@ -505,11 +462,6 @@ lib/sickbeard/lib/profilehooks.py
 lib/sickbeard/lib/pynma/__init__.py
 lib/sickbeard/lib/pynma/pynma.py
 lib/sickbeard/lib/pythontwitter/__init__.py
-lib/sickbeard/lib/simplejson/__init__.py
-lib/sickbeard/lib/simplejson/_speedups.c
-lib/sickbeard/lib/simplejson/decoder.py
-lib/sickbeard/lib/simplejson/encoder.py
-lib/sickbeard/lib/simplejson/scanner.py
 lib/sickbeard/lib/socks/__init__.py
 lib/sickbeard/lib/tvdb_api/MANIFEST.in
 lib/sickbeard/lib/tvdb_api/Rakefile
@@ -605,4 +557,3 @@ lib/sickbeard/sickbeard/versionChecker.py
 lib/sickbeard/sickbeard/webapi.py
 lib/sickbeard/sickbeard/webserve.py
 lib/sickbeard/sickbeard/webserveInit.py
-@pkgdir etc/sickbeard