From owner-svn-ports-head@FreeBSD.ORG Tue Feb 25 14:39:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EA99EC2; Tue, 25 Feb 2014 14:39:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3982F109B; Tue, 25 Feb 2014 14:39:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PEdUha051013; Tue, 25 Feb 2014 14:39:30 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PEdT6N051007; Tue, 25 Feb 2014 14:39:29 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201402251439.s1PEdT6N051007@svn.freebsd.org> From: Mark Felder Date: Tue, 25 Feb 2014 14:39:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346010 - in head/multimedia: plexmediaserver plexmediaserver-plexpass plexmediaserver-plexpass/files plexmediaserver/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 14:39:30 -0000 Author: feld Date: Tue Feb 25 14:39:29 2014 New Revision: 346010 URL: http://svnweb.freebsd.org/changeset/ports/346010 QAT: https://qat.redports.org/buildarchive/r346010/ Log: Add capability to override default maximum number of plugin processes in rc.conf. This mirrors the capability found on Linux and is only required in rare circumstances when the user has installed 3rd party Plex agents. Modified: head/multimedia/plexmediaserver-plexpass/Makefile head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in head/multimedia/plexmediaserver/Makefile head/multimedia/plexmediaserver/files/plexmediaserver.in Modified: head/multimedia/plexmediaserver-plexpass/Makefile ============================================================================== --- head/multimedia/plexmediaserver-plexpass/Makefile Tue Feb 25 14:23:06 2014 (r346009) +++ head/multimedia/plexmediaserver-plexpass/Makefile Tue Feb 25 14:39:29 2014 (r346010) @@ -3,6 +3,7 @@ PORTNAME= plexmediaserver PORTVERSION= 0.9.9.5.411 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://plex.r.worldssl.net/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ PKGNAMESUFFIX= -plexpass Modified: head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in ============================================================================== --- head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Tue Feb 25 14:23:06 2014 (r346009) +++ head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Tue Feb 25 14:39:29 2014 (r346010) @@ -15,6 +15,8 @@ # # plexmediaserver_plexpass_tmp="/tmp" # tmp directory used for the transcoding process # +# plexmediaserver_plexpass_maxplugins="6" # Maximum number of background plugin procs. May have to raise in rare cases. +# . /etc/rc.subr @@ -26,6 +28,7 @@ load_rc_config $name : ${plexmediaserver_plexpass_support_path="%%SUPPORT_PATH%%"} : ${plexmediaserver_plexpass_user="%%USERS%%"} : ${plexmediaserver_plexpass_group="%%GROUPS%%"} +: ${plexmediaserver_plexpass_maxplugins=6} extra_commands=status start_precmd=plex_precmd @@ -42,7 +45,7 @@ plex_precmd() 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_MAX_PLUGIN_PROCS=${plexmediaserver_plexpass_maxplugins} 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_plexpass_tmp}; fi Modified: head/multimedia/plexmediaserver/Makefile ============================================================================== --- head/multimedia/plexmediaserver/Makefile Tue Feb 25 14:23:06 2014 (r346009) +++ head/multimedia/plexmediaserver/Makefile Tue Feb 25 14:39:29 2014 (r346010) @@ -3,6 +3,7 @@ PORTNAME= plexmediaserver PORTVERSION= 0.9.9.4.409 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://plex.r.worldssl.net/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ DISTNAME= PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-amd64 Modified: head/multimedia/plexmediaserver/files/plexmediaserver.in ============================================================================== --- head/multimedia/plexmediaserver/files/plexmediaserver.in Tue Feb 25 14:23:06 2014 (r346009) +++ head/multimedia/plexmediaserver/files/plexmediaserver.in Tue Feb 25 14:39:29 2014 (r346010) @@ -15,6 +15,8 @@ # # plexmediaserver_tmp="/tmp" # tmp directory used for the transcoding process # +# plexmediaserver_maxplugins="6" # Maximum number of background plugin procs. May have to raise in rare cases. +# . /etc/rc.subr @@ -26,6 +28,7 @@ load_rc_config $name : ${plexmediaserver_support_path="%%SUPPORT_PATH%%"} : ${plexmediaserver_user="%%USERS%%"} : ${plexmediaserver_group="%%GROUPS%%"} +: ${plexmediaserver_maxplugins=6} extra_commands=status start_precmd=plex_precmd @@ -42,7 +45,7 @@ plex_precmd() 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_MAX_PLUGIN_PROCS=${plexmediaserver_maxplugins} export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${plexmediaserver_support_path} export PLEX_MEDIA_SERVER_PIDFILE=${pidfile} if ${plexmediaserver_tmp}; then export PLEX_MEDIA_SERVER_TMPDIR=${plexmediaserver_tmp}; fi