Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Feb 2014 03:59:56 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345916 - in head/multimedia/plexmediaserver-plexpass: . files
Message-ID:  <201402250359.s1P3xuqY085806@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Tue Feb 25 03:59:55 2014
New Revision: 345916
URL: http://svnweb.freebsd.org/changeset/ports/345916
QAT: https://qat.redports.org/buildarchive/r345916/

Log:
  Update to 0.9.9.5.411
  
  This port can now be installed parallel to multimedia/plexmediaserver to
  make it easier to compare behavior with the latest stable release.
  
  The default data directory is now /usr/local/plexdata-plexpass so as not
  to conflict with your existing Plex Media Server installation. When both are
  installed at the same time it is up to the user to decide if they want
  to attempt to make both versions share the same data directory. This can
  be controlled by overriding the support path as documented in the
  rc script.

Added:
  head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
     - copied, changed from r345908, head/multimedia/plexmediaserver-plexpass/files/plexmediaserver.in
Deleted:
  head/multimedia/plexmediaserver-plexpass/files/plexmediaserver.in
Modified:
  head/multimedia/plexmediaserver-plexpass/Makefile
  head/multimedia/plexmediaserver-plexpass/distinfo
  head/multimedia/plexmediaserver-plexpass/pkg-plist

Modified: head/multimedia/plexmediaserver-plexpass/Makefile
==============================================================================
--- head/multimedia/plexmediaserver-plexpass/Makefile	Tue Feb 25 03:12:24 2014	(r345915)
+++ head/multimedia/plexmediaserver-plexpass/Makefile	Tue Feb 25 03:59:55 2014	(r345916)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plexmediaserver
-PORTVERSION=	0.9.9.4.409
+PORTVERSION=	0.9.9.5.411
 CATEGORIES=	multimedia
 MASTER_SITES=	http://plex.r.worldssl.net/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/
 PKGNAMESUFFIX=	-plexpass
@@ -12,24 +12,24 @@ MAINTAINER=	feld@FreeBSD.org
 COMMENT=	The Plex Media Server component
 
 USE_BZIP2=	yes
-PLEX_BUILD=	bf81d98
+PLEX_BUILD=	da1d892
 NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}
 
-USE_RC_SUBR=	plexmediaserver
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
-SUB_FILES=	plexmediaserver
+USE_RC_SUBR=	plexmediaserver_plexpass
+
+SUB_FILES=	plexmediaserver_plexpass
 SUB_LIST=	SUPPORT_PATH=${SUPPORT_PATH} SCRIPT_PATH="${SCRIPT_PATH}" USERS=${USERS} GROUPS=${GROUPS}
 
 USERS=	plex
 GROUPS=	plex
-SUPPORT_PATH?=	${PREFIX}/plexdata
+SUPPORT_PATH?=	${PREFIX}/plexdata${PKGNAMESUFFIX}
 SCRIPT_PATH?=	${DATADIR}
 
 ONLY_FOR_ARCHS=	amd64
 
-CONFLICTS=	plexmediaserver-[0-9]*
-
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD

Modified: head/multimedia/plexmediaserver-plexpass/distinfo
==============================================================================
--- head/multimedia/plexmediaserver-plexpass/distinfo	Tue Feb 25 03:12:24 2014	(r345915)
+++ head/multimedia/plexmediaserver-plexpass/distinfo	Tue Feb 25 03:59:55 2014	(r345916)
@@ -1,2 +1,2 @@
-SHA256 (PlexMediaServer-0.9.9.4.409-bf81d98-freebsd-amd64.tar.bz2) = 9011fa76c9842d04d9a56d27e1bf8768fbb5ab6f5d4521610593c42a5c103038
-SIZE (PlexMediaServer-0.9.9.4.409-bf81d98-freebsd-amd64.tar.bz2) = 62892326
+SHA256 (PlexMediaServer-0.9.9.5.411-da1d892-freebsd-amd64.tar.bz2) = 5e9138c75d469806219e8cdfbcb6ffeb831a8cb0addfd9117cc047a6df092045
+SIZE (PlexMediaServer-0.9.9.5.411-da1d892-freebsd-amd64.tar.bz2) = 62903234

Copied and modified: head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in (from r345908, head/multimedia/plexmediaserver-plexpass/files/plexmediaserver.in)
==============================================================================
--- head/multimedia/plexmediaserver-plexpass/files/plexmediaserver.in	Mon Feb 24 23:05:10 2014	(r345908, copy source)
+++ head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in	Tue Feb 25 03:59:55 2014	(r345916)
@@ -3,29 +3,29 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: plexmediaserver
+# PROVIDE: plexmediaserver_plexpass
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable the Plex Media Server:
 #
-# plexmediaserver_enable="YES"
+# plexmediaserver_plexpass_enable="YES"
 #
-# plexmediaserver_support_path="%%SUPPORT_PATH%%" # Plex data: logs, media metadata, settings, etc
+# plexmediaserver_plexpass_support_path="%%SUPPORT_PATH%%" # Plex data: logs, media metadata, settings, etc
 #
-# plexmediaserver_tmp="/tmp" # tmp directory used for the transcoding process
+# plexmediaserver_plexpass_tmp="/tmp" # tmp directory used for the transcoding process
 #
 
 . /etc/rc.subr
 
-name=plexmediaserver
-rcvar=plexmediaserver_enable
+name=plexmediaserver_plexpass
+rcvar=plexmediaserver_plexpass_enable
 load_rc_config $name
 
-: ${plexmediaserver_enable:=NO}
-: ${plexmediaserver_support_path="%%SUPPORT_PATH%%"}
-: ${plexmediaserver_user="%%USERS%%"}
-: ${plexmediaserver_group="%%GROUPS%%"}
+: ${plexmediaserver_plexpass_enable:=NO}
+: ${plexmediaserver_plexpass_support_path="%%SUPPORT_PATH%%"}
+: ${plexmediaserver_plexpass_user="%%USERS%%"}
+: ${plexmediaserver_plexpass_group="%%GROUPS%%"}
 
 extra_commands=status
 start_precmd=plex_precmd
@@ -36,27 +36,27 @@ pidfile=/var/run/plex/plex.pid
 
 plex_precmd()
 {
-	export SUPPORT_PATH="${plexmediaserver_support_path}"
-	export HOME="${plexmediaserver_support_path}/Plex Media Server"
+	export SUPPORT_PATH="${plexmediaserver_plexpass_support_path}"
+	export HOME="${plexmediaserver_plexpass_support_path}/Plex Media Server"
 	export PYTHONHOME="%%SCRIPT_PATH%%/Resources/Python"
 	export SCRIPTPATH="%%SCRIPT_PATH%%"
 	export LD_LIBRARY_PATH="${SCRIPTPATH}"
 	export PLEX_MEDIA_SERVER_HOME="${SCRIPTPATH}"
 	export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6
-	export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${plexmediaserver_support_path}
+	export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${plexmediaserver_plexpass_support_path}
 	export PLEX_MEDIA_SERVER_PIDFILE=${pidfile}
-	if ${plexmediaserver_tmp}; then export PLEX_MEDIA_SERVER_TMPDIR=${plexmediaserver_tmp}; fi
+	if ${plexmediaserver_tmp}; then export PLEX_MEDIA_SERVER_TMPDIR=${plexmediaserver_plexpass_tmp}; fi
 	export PATH="${SCRIPTPATH}/Resources/Python/bin:${PATH}"
 	export LC_ALL="C"
 	export LANG="C"
 	ulimit -s 3000
 
 	if [ ! -d ${pidfile%/*} ]; then
-		install -d -o ${plexmediaserver_user} ${pidfile%/*};
+		install -d -o ${plexmediaserver_plexpass_user} ${pidfile%/*};
 	fi
 	
-	if [ ! -d "${plexmediaserver_support_path}/Plex Media Server" ]; then
-		install -d -g ${plexmediaserver_group} -o ${plexmediaserver_user} "${plexmediaserver_support_path}/Plex Media Server";
+	if [ ! -d "${plexmediaserver_plexpass_support_path}/Plex Media Server" ]; then
+		install -d -g ${plexmediaserver_plexpass_group} -o ${plexmediaserver_plexpass_user} "${plexmediaserver_plexpass_support_path}/Plex Media Server";
 	fi
 }
 
@@ -66,7 +66,7 @@ plex_startcmd()
 		echo "${name} is already running with pid: $(cat ${pidfile})";
 	else
 		echo "Starting ${name}."
-		/usr/sbin/daemon -u ${plexmediaserver_user} -f '%%SCRIPT_PATH%%/Plex Media Server'
+		/usr/sbin/daemon -u ${plexmediaserver_plexpass_user} -f '%%SCRIPT_PATH%%/Plex Media Server'
 	fi
 }
 

Modified: head/multimedia/plexmediaserver-plexpass/pkg-plist
==============================================================================
--- head/multimedia/plexmediaserver-plexpass/pkg-plist	Tue Feb 25 03:12:24 2014	(r345915)
+++ head/multimedia/plexmediaserver-plexpass/pkg-plist	Tue Feb 25 03:59:55 2014	(r345916)
@@ -1517,6 +1517,8 @@
 %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.skysports/URL/SkySports/ServiceCode.pys
 %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.slice/ServiceInfo.plist
 %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.slice/URL/Slice/ServiceCode.pys
+%%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.soundcloud/ServiceInfo.plist
+%%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.soundcloud/URL/SoundCloud/ServiceCode.pys
 %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.southpark/ServiceInfo.plist
 %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.southpark/URL/South Park/ServiceCode.pys
 %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.spike/ServiceInfo.plist
@@ -3231,6 +3233,9 @@
 @dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.southpark/URL/South Park
 @dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.southpark/URL
 @dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.southpark
+@dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.soundcloud/URL/SoundCloud
+@dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.soundcloud/URL
+@dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.soundcloud
 @dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.slice/URL/Slice
 @dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.slice/URL
 @dirrmtry %%DATADIR%%/Resources/Plug-ins/Services.bundle/Contents/Service Sets/com.plexapp.plugins.slice



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402250359.s1P3xuqY085806>