Restore ONLY_FOR_ARCHS

Fix a few rc script issues that mainly affected the plexpass slave port

4 files changed, 23 insertions, 22 deletions

diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile
index a958cb8bd4e4..e3277dc158bf 100644
--- a/multimedia/plexmediaserver-plexpass/Makefile
+++ b/multimedia/plexmediaserver-plexpass/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTVERSION=	0.9.11.4.739
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-plexpass
 
 MAINTAINER=	feld@FreeBSD.org
diff --git a/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in b/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
index 450a7f9e2de4..3f105b2cf687 100644
--- a/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
+++ b/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in
@@ -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
 }
 
diff --git a/multimedia/plexmediaserver/Makefile b/multimedia/plexmediaserver/Makefile
index ebdb086066cf..6ca2787a7ed5 100644
--- a/multimedia/plexmediaserver/Makefile
+++ b/multimedia/plexmediaserver/Makefile
@@ -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>
diff --git a/multimedia/plexmediaserver/files/plexmediaserver.in b/multimedia/plexmediaserver/files/plexmediaserver.in
index b3b1af401862..fa855560afd6 100644
--- a/multimedia/plexmediaserver/files/plexmediaserver.in
+++ b/multimedia/plexmediaserver/files/plexmediaserver.in
@@ -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
 }