Date: Mon, 25 Feb 2019 03:07:05 +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: r493832 - in head/multimedia/plexmediaserver-plexpass: . files Message-ID: <201902250307.x1P375uW029985@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Feb 25 03:07:05 2019 New Revision: 493832 URL: https://svnweb.freebsd.org/changeset/ports/493832 Log: multimedia/plexmediaserver-plexpass: Unbreak port Sync rc script with upstream's start.sh script Modified: head/multimedia/plexmediaserver-plexpass/Makefile head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Modified: head/multimedia/plexmediaserver-plexpass/Makefile ============================================================================== --- head/multimedia/plexmediaserver-plexpass/Makefile Mon Feb 25 03:05:54 2019 (r493831) +++ head/multimedia/plexmediaserver-plexpass/Makefile Mon Feb 25 03:07:05 2019 (r493832) @@ -3,15 +3,13 @@ PORTVERSION= 1.15.1.707 DISTVERSIONSUFFIX=d893009fb -PORTREVISION= 0 +PORTREVISION= 1 MASTER_SITES= https://downloads.plex.tv/plex-media-server-new/${DISTVERSION}-${DISTVERSIONSUFFIX}/freebsd/ PKGNAMESUFFIX= -plexpass DISTNAME= PlexMediaServer-${DISTVERSION}-${DISTVERSIONSUFFIX}-FreeBSD-${ARCH} MAINTAINER= feld@FreeBSD.org -BROKEN= Plex broke the build on FreeBSD - USE_RC_SUBR= ${PORTNAME}_plexpass MASTERDIR=${.CURDIR}/../plexmediaserver @@ -21,5 +19,7 @@ FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} SUB_LIST= PORTNAME=${PORTNAME}_plexpass DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS} + +RUN_DEPENDS= # No longer require FreeBSD compat libs .include "${MASTERDIR}/Makefile" Modified: head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in ============================================================================== --- head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Mon Feb 25 03:05:54 2019 (r493831) +++ head/multimedia/plexmediaserver-plexpass/files/plexmediaserver_plexpass.in Mon Feb 25 03:07:05 2019 (r493832) @@ -40,11 +40,23 @@ stop_postcmd=plex_stop_postcmd plex_precmd() { + #Set identification variables for FreeNAS; with fallback to FreeBSD + if [ -f "/etc/version" ]; then + export PLEX_MEDIA_SERVER_INFO_VENDOR="$(cat /etc/version|cut -d- -f1)" + export PLEX_MEDIA_SERVER_INFO_DEVICE=NAS + export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)" + export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(cat /etc/version|cut -d- -f2-)" + else + export PLEX_MEDIA_SERVER_INFO_VENDOR=FreeBSD + export PLEX_MEDIA_SERVER_INFO_DEVICE=PC + export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)" + export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(uname -r)" + fi 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="%%PREFIX%%/lib/compat:${SCRIPTPATH}" + export LD_LIBRARY_PATH="${SCRIPTPATH}/lib" export PLEX_MEDIA_SERVER_HOME="${SCRIPTPATH}" export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=${%%PORTNAME%%_maxplugins} export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=${%%PORTNAME%%_support_path}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902250307.x1P375uW029985>