From owner-svn-ports-all@freebsd.org Sat Mar 17 15:11:34 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27A1AF50B4B; Sat, 17 Mar 2018 15:11:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C97C380075; Sat, 17 Mar 2018 15:11:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C414B14013; Sat, 17 Mar 2018 15:11:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2HFBXXs094535; Sat, 17 Mar 2018 15:11:33 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2HFBWGI094528; Sat, 17 Mar 2018 15:11:32 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201803171511.w2HFBWGI094528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 17 Mar 2018 15:11:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464823 - in head/multimedia: . plexpy tautulli tautulli/files X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/multimedia: . plexpy tautulli tautulli/files X-SVN-Commit-Revision: 464823 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 15:11:34 -0000 Author: feld Date: Sat Mar 17 15:11:32 2018 New Revision: 464823 URL: https://svnweb.freebsd.org/changeset/ports/464823 Log: multimedia/plexpy: Move to new project name, Tautulli Due to Copyright infringement, the upstream project was renamed. The software has also been updated from version 1.x to 2.x. Notable changes and improvements: - Automated pkg-plist - No hardcoded user in the package. You can now more easily run the software as another user - Files have been moved to WWWDIR instead of PREFIX/plexpy - Software no longer needs write access to the web root: all data is now in /var/db/tautulli (backups, cache, logs, database) Upgrade instructions: - Install Tautulli - Create /var/db/tautulli, owned by the user you will run the daemon as (default: nobody) - Copy your config.ini and plexpy.db to /var/db/tautulli - Enable the service and start the software Tautulli should automatically find your database file, rename it to tautulli.db, and perform the required updates. Reported by: many Added: head/multimedia/tautulli/ - copied from r464822, head/multimedia/plexpy/ head/multimedia/tautulli/files/patch-Tautulli.py - copied, changed from r464822, head/multimedia/plexpy/files/patch-PlexPy.py head/multimedia/tautulli/files/tautulli.in - copied, changed from r464822, head/multimedia/plexpy/files/plexpy.in Deleted: head/multimedia/plexpy/ head/multimedia/tautulli/files/patch-PlexPy.py head/multimedia/tautulli/files/plexpy.in head/multimedia/tautulli/pkg-plist Modified: head/multimedia/Makefile head/multimedia/tautulli/Makefile head/multimedia/tautulli/distinfo head/multimedia/tautulli/files/patch-plexpy_config.py head/multimedia/tautulli/pkg-descr Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Sat Mar 17 14:43:34 2018 (r464822) +++ head/multimedia/Makefile Sat Mar 17 15:11:32 2018 (r464823) @@ -312,7 +312,6 @@ SUBDIR += playd SUBDIR += plexmediaserver SUBDIR += plexmediaserver-plexpass - SUBDIR += plexpy SUBDIR += plexwatch SUBDIR += podcastdl SUBDIR += poe @@ -397,6 +396,7 @@ SUBDIR += swfdec-gnome SUBDIR += syncplay SUBDIR += szap-s2 + SUBDIR += tautulli SUBDIR += tcmplex-panteltje SUBDIR += tivodecode SUBDIR += totem Modified: head/multimedia/tautulli/Makefile ============================================================================== --- head/multimedia/plexpy/Makefile Sat Mar 17 14:43:34 2018 (r464822) +++ head/multimedia/tautulli/Makefile Sat Mar 17 15:11:32 2018 (r464823) @@ -1,9 +1,9 @@ # Created by: Mark Felder # $FreeBSD$ -PORTNAME= plexpy -PORTVERSION= 1.4.22 -PORTREVISION= 1 +PORTNAME= tautulli +PORTVERSION= 2.0.22 +PORTREVISION= 0 CATEGORIES= multimedia python DISTVERSIONPREFIX=v @@ -21,23 +21,29 @@ USE_RC_SUBR= ${PORTNAME} SUB_LIST= PYTHON_CMD=${PYTHON_CMD} USES= python:2.7 shebangfix -SHEBANG_FILES= PlexPy.py +SHEBANG_FILES= Tautulli.py python_OLD_CMD= /bin/sh USE_GITHUB= yes -GH_ACCOUNT= drzoidberg33 +GH_ACCOUNT= Tautulli +GH_PROJECT= Tautulli NO_BUILD= yes NO_ARCH= yes +post-patch: + ${FIND} ${WRKSRC} -name '*.orig' -delete + do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/plexpy - ${MKDIR} ${STAGEDIR}${PREFIX}/plexpy/data - ${MKDIR} ${STAGEDIR}${PREFIX}/plexpy/lib - ${MKDIR} ${STAGEDIR}${PREFIX}/plexpy/plexpy - cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${PREFIX}/plexpy - cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}/plexpy - cd ${WRKSRC} && ${COPYTREE_SHARE} plexpy ${STAGEDIR}${PREFIX}/plexpy - ${INSTALL_SCRIPT} ${WRKSRC}/PlexPy.py ${STAGEDIR}${PREFIX}/plexpy - ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${PREFIX}/plexpy + ${MKDIR} ${STAGEDIR}${WWWDIR}/data ${STAGEDIR}${WWWDIR}/lib \ + ${STAGEDIR}${WWWDIR}/plexpy + cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${WWWDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${WWWDIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} plexpy ${STAGEDIR}${WWWDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/Tautulli.py ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${WWWDIR} + +post-install: + ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ + ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} .include Modified: head/multimedia/tautulli/distinfo ============================================================================== --- head/multimedia/plexpy/distinfo Sat Mar 17 14:43:34 2018 (r464822) +++ head/multimedia/tautulli/distinfo Sat Mar 17 15:11:32 2018 (r464823) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505926131 -SHA256 (drzoidberg33-plexpy-v1.4.22_GH0.tar.gz) = e7d6882d67a9c4b7cacfb8f535b41b6d3896aff196dc7a5a914e58c2cf210f95 -SIZE (drzoidberg33-plexpy-v1.4.22_GH0.tar.gz) = 35629572 +TIMESTAMP = 1521296092 +SHA256 (Tautulli-Tautulli-v2.0.22_GH0.tar.gz) = 19adaf2c4565380af46c79507aa436f9fe2b23c9e092f655437bd1a8d2536a0a +SIZE (Tautulli-Tautulli-v2.0.22_GH0.tar.gz) = 10263582 Copied and modified: head/multimedia/tautulli/files/patch-Tautulli.py (from r464822, head/multimedia/plexpy/files/patch-PlexPy.py) ============================================================================== --- head/multimedia/plexpy/files/patch-PlexPy.py Sat Mar 17 14:43:34 2018 (r464822, copy source) +++ head/multimedia/tautulli/files/patch-Tautulli.py Sat Mar 17 15:11:32 2018 (r464823) @@ -1,7 +1,7 @@ ---- PlexPy.py.orig 2016-05-17 15:13:59 UTC -+++ PlexPy.py +--- Tautulli.py.orig 2018-03-17 14:15:36 UTC ++++ Tautulli.py @@ -1,8 +1,4 @@ - #!/bin/sh + #!/usr/local/bin/python2.7 -''''which python >/dev/null 2>&1 && exec python "$0" "$@" # ''' -''''which python2 >/dev/null 2>&1 && exec python2 "$0" "$@" # ''' -''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # ''' Modified: head/multimedia/tautulli/files/patch-plexpy_config.py ============================================================================== --- head/multimedia/plexpy/files/patch-plexpy_config.py Sat Mar 17 14:43:34 2018 (r464822) +++ head/multimedia/tautulli/files/patch-plexpy_config.py Sat Mar 17 15:11:32 2018 (r464823) @@ -1,6 +1,6 @@ ---- plexpy/config.py.orig 2017-05-15 14:05:14 UTC +--- plexpy/config.py.orig 2018-03-17 14:16:52 UTC +++ plexpy/config.py -@@ -107,7 +107,7 @@ _CONFIG_DEFINITIONS = { +@@ -111,7 +111,7 @@ _CONFIG_DEFINITIONS = { 'CACHE_DIR': (str, 'General', ''), 'CACHE_IMAGES': (int, 'General', 1), 'CACHE_SIZEMB': (int, 'Advanced', 32), @@ -9,10 +9,3 @@ 'CHECK_GITHUB_INTERVAL': (int, 'General', 360), 'CHECK_GITHUB_ON_STARTUP': (int, 'General', 1), 'CLEANUP_FILES': (int, 'General', 0), -@@ -812,4 +812,4 @@ class Config(object): - if self.CONFIG_VERSION == '6': - if self.GIT_USER.lower() == 'drzoidberg33': - self.GIT_USER = 'JonnyWong16' -- self.CONFIG_VERSION = '7' -\ No newline at end of file -+ self.CONFIG_VERSION = '7' Copied and modified: head/multimedia/tautulli/files/tautulli.in (from r464822, head/multimedia/plexpy/files/plexpy.in) ============================================================================== --- head/multimedia/plexpy/files/plexpy.in Sat Mar 17 14:43:34 2018 (r464822, copy source) +++ head/multimedia/tautulli/files/tautulli.in Sat Mar 17 15:11:32 2018 (r464823) @@ -3,37 +3,38 @@ # # $FreeBSD$ # -# PROVIDE: plexpy +# PROVIDE: tautulli # REQUIRE: LOGIN # KEYWORD: shutdown # -# Add the following lines to /etc/rc.conf to enable PlexPy: +# Add the following lines to /etc/rc.conf to enable Tautulli: # -# plexpy_enable="YES" +# tautulli_enable="YES" # . /etc/rc.subr -name=plexpy -rcvar=plexpy_enable +name=tautulli +rcvar=tautulli_enable load_rc_config $name -: ${plexpy_enable:=NO} -: ${plexpy_user=nobody} +: ${tautulli_enable:=NO} +: ${tautulli_user=nobody} -pidfile=%%PREFIX%%/plexpy/plexpy.pid command_interpreter=%%PYTHON_CMD%% -command=%%PREFIX%%/plexpy/PlexPy.py -command_args="-d --nolaunch --pid ${pidfile}" -start_precmd=plexpy_prestart +command=%%WWWDIR%%/Tautulli.py +command_args="-d --nolaunch --datadir /var/db/tautulli" +start_precmd=tautulli_prestart -plexpy_prestart() +tautulli_prestart() { if ! [ -e /etc/localtime ] ; then - echo "Plexpy needs the system timezone to be set." + echo "Tautulli needs the system timezone to be set." echo "Please run /usr/sbin/tzsetup" exit 1 fi + + install -d -o ${tautulli_user} /var/db/tautulli } run_rc_command "$1" Modified: head/multimedia/tautulli/pkg-descr ============================================================================== --- head/multimedia/plexpy/pkg-descr Sat Mar 17 14:43:34 2018 (r464822) +++ head/multimedia/tautulli/pkg-descr Sat Mar 17 15:11:32 2018 (r464823) @@ -1,4 +1,4 @@ A python based web application for monitoring, analytics and notifications for Plex Media Server (www.plex.tv). -WWW: https://github.com/drzoidberg33/plexpy +WWW: https://github.com/Tautulli/Tautulli