Date: Sat, 29 Nov 2014 16:39:07 +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: r373634 - in head/multimedia: plexmediaserver plexmediaserver-plexpass plexmediaserver-plexpass/files plexmediaserver/files Message-ID: <201411291639.sATGd7i8081795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Sat Nov 29 16:39:06 2014 New Revision: 373634 URL: https://svnweb.freebsd.org/changeset/ports/373634 QAT: https://qat.redports.org/buildarchive/r373634/ Log: Restore ONLY_FOR_ARCHS Fix a few rc script issues that mainly affected the plexpass slave port 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 Sat Nov 29 15:37:25 2014 (r373633) +++ head/multimedia/plexmediaserver-plexpass/Makefile Sat Nov 29 16:39:06 2014 (r373634) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTVERSION= 0.9.11.4.739 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= -plexpass MAINTAINER= feld@FreeBSD.org Modified: head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in ============================================================================== --- head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Sat Nov 29 15:37:25 2014 (r373633) +++ head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Sat Nov 29 16:39:06 2014 (r373634) @@ -38,14 +38,14 @@ 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="${%%PORTNAME%%_support_path}" + export HOME="${%%PORTNAME%%_support_path}/Plex Media Server" export PYTHONHOME="%%DATADIR%%/Resources/Python" export SCRIPTPATH="%%DATADIR%%" export LD_LIBRARY_PATH="${SCRIPTPATH}" export PLEX_MEDIA_SERVER_HOME="${SCRIPTPATH}" - export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${plexmediaserver_maxplugins} - export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${plexmediaserver_support_path} + export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${%%PORTNAME%%_maxplugins} + export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${%%PORTNAME%%_support_path} export PLEX_MEDIA_SERVER_PIDFILE=${pidfile} export PATH="${SCRIPTPATH}/Resources/Python/bin:${PATH}" export LC_ALL="C" @@ -53,16 +53,16 @@ plex_precmd() ulimit -s 3000 if [ ! -d ${pidfile%/*} ]; then - install -d -o ${plexmediaserver_user} ${pidfile%/*}; + install -d -o ${%%PORTNAME%%_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 "${%%PORTNAME%%_support_path}/Plex Media Server" ]; then + install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_support_path}/Plex Media Server"; fi - if [ ${plexmediaserver_tmp} ]; then - export TMPDIR=${plexmediaserver_tmp}; - install -d -g ${plexmediaserver_group} -o ${plexmediaserver_user} "${plexmediaserver_tmp}"; + if [ ${%%PORTNAME%%_tmp} ]; then + export TMPDIR=${%%PORTNAME%%_tmp}; + install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_tmp}"; fi } Modified: head/multimedia/plexmediaserver/Makefile ============================================================================== --- head/multimedia/plexmediaserver/Makefile Sat Nov 29 15:37:25 2014 (r373633) +++ head/multimedia/plexmediaserver/Makefile Sat Nov 29 16:39:06 2014 (r373634) @@ -3,7 +3,7 @@ PORTNAME= plexmediaserver PORTVERSION?= 0.9.11.4.739 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ DISTNAME= PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-${ARCH} @@ -25,6 +25,7 @@ USERS= plex GROUPS= ${USERS} BUNDLE_LIBS= yes +ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= It is a binary-only program. Source code not available. .include <bsd.port.pre.mk> Modified: head/multimedia/plexmediaserver/files/plexmediaserver.in ============================================================================== --- head/multimedia/plexmediaserver/files/plexmediaserver.in Sat Nov 29 15:37:25 2014 (r373633) +++ head/multimedia/plexmediaserver/files/plexmediaserver.in Sat Nov 29 16:39:06 2014 (r373634) @@ -38,14 +38,14 @@ 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="${%%PORTNAME%%_support_path}" + export HOME="${%%PORTNAME%%_support_path}/Plex Media Server" export PYTHONHOME="%%DATADIR%%/Resources/Python" export SCRIPTPATH="%%DATADIR%%" export LD_LIBRARY_PATH="${SCRIPTPATH}" export PLEX_MEDIA_SERVER_HOME="${SCRIPTPATH}" - export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${plexmediaserver_maxplugins} - export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${plexmediaserver_support_path} + export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${%%PORTNAME%%_maxplugins} + export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${%%PORTNAME%%_support_path} export PLEX_MEDIA_SERVER_PIDFILE=${pidfile} export PATH="${SCRIPTPATH}/Resources/Python/bin:${PATH}" export LC_ALL="C" @@ -53,16 +53,16 @@ plex_precmd() ulimit -s 3000 if [ ! -d ${pidfile%/*} ]; then - install -d -o ${plexmediaserver_user} ${pidfile%/*}; + install -d -o ${%%PORTNAME%%_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 "${%%PORTNAME%%_support_path}/Plex Media Server" ]; then + install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_support_path}/Plex Media Server"; fi - if [ ${plexmediaserver_tmp} ]; then - export TMPDIR=${plexmediaserver_tmp}; - install -d -g ${plexmediaserver_group} -o ${plexmediaserver_user} "${plexmediaserver_tmp}"; + if [ ${%%PORTNAME%%_tmp} ]; then + export TMPDIR=${%%PORTNAME%%_tmp}; + install -d -g ${%%PORTNAME%%_group} -o ${%%PORTNAME%%_user} "${%%PORTNAME%%_tmp}"; fi }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411291639.sATGd7i8081795>