From owner-svn-ports-head@freebsd.org Mon Feb 25 03:07:06 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5D601519FFD; Mon, 25 Feb 2019 03:07:06 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 233916FD00; Mon, 25 Feb 2019 03:07:06 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5697EF21; Mon, 25 Feb 2019 03:07:05 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1P375pD029986; Mon, 25 Feb 2019 03:07:05 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1P375uW029985; Mon, 25 Feb 2019 03:07:05 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201902250307.x1P375uW029985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 25 Feb 2019 03:07:05 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in head/multimedia/plexmediaserver-plexpass: . files X-SVN-Commit-Revision: 493832 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 233916FD00 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 25 Feb 2019 03:07:06 -0000 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}