FreeBSD Bugzilla – Attachment 149216 Details for
Bug 194909
multimedia/plexmediaserver - rc.d simplification
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to plexmediaserver port
plex.patch (text/plain), 7.78 KB, created by
joshruehlig
on 2014-11-09 01:06:19 UTC
(
hide
)
Description:
Patch to plexmediaserver port
Filename:
MIME Type:
Creator:
joshruehlig
Created:
2014-11-09 01:06:19 UTC
Size:
7.78 KB
patch
obsolete
>diff -u -r -N plexmediaserver-orig/Makefile plexmediaserver/Makefile >--- plexmediaserver-orig/Makefile 2014-11-08 02:28:10.000000000 -0800 >+++ plexmediaserver/Makefile 2014-11-08 16:57:10.000000000 -0800 >@@ -5,7 +5,7 @@ > PORTVERSION= 0.9.11.1.678 > CATEGORIES= multimedia > MASTER_SITES= http://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ >-DISTNAME= PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-amd64 >+DISTNAME= PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-${ARCH} > > MAINTAINER= feld@FreeBSD.org > COMMENT= The Plex Media Server component >@@ -15,18 +15,17 @@ > NO_BUILD= yes > WRKSRC= ${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD} > >-USE_RC_SUBR= plexmediaserver >+USE_RC_SUBR= ${PORTNAME} > >-SUB_FILES= plexmediaserver >-SUB_LIST= SUPPORT_PATH=${SUPPORT_PATH} SCRIPT_PATH="${SCRIPT_PATH}" USERS=${USERS} GROUPS=${GROUPS} >+SUB_FILES= pkg-message >+SUB_LIST= PORTNAME=${PORTNAME} DATADIR=${DATADIR} USERS=${USERS} GROUPS=${GROUPS} > > USERS= plex >-GROUPS= plex >-SUPPORT_PATH?= ${PREFIX}/plexdata >-SCRIPT_PATH?= ${DATADIR} >+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> > >@@ -42,22 +41,24 @@ > > post-patch: > # binaries don't come pre-stripped >- ${FIND} ${WRKSRC} -name '*.so' -exec ${STRIP_CMD} {} \; >+ ${FIND} ${WRKSRC}/Resources -name '*.so' -exec ${STRIP_CMD} {} \; > ${STRIP_CMD} ${WRKSRC}/Resources/rsync ${WRKSRC}/Resources/Python/bin/python > > do-install: >- @(cd ${WRKSRC} && ${COPYTREE_SHARE} Resources ${STAGEDIR}/${SCRIPT_PATH}) >- ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ DLNA\ Server ${STAGEDIR}/${SCRIPT_PATH} >- ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Scanner ${STAGEDIR}/${SCRIPT_PATH} >- ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Server ${STAGEDIR}/${SCRIPT_PATH} >- ${INSTALL_LIB} ${WRKSRC}/lib* ${STAGEDIR}/${SCRIPT_PATH} >+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} Resources ${STAGEDIR}${DATADIR}) >+ ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ DLNA\ Server ${STAGEDIR}${DATADIR} >+ ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Scanner ${STAGEDIR}${DATADIR} >+ ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Server ${STAGEDIR}${DATADIR} >+ ${INSTALL_LIB} ${WRKSRC}/lib*.so* ${STAGEDIR}${DATADIR} > # Fix permissions to programs and db >- @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/rsync >- @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Plex\ New\ Transcoder >- @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Plex\ Transcoder >- @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Python/bin/python >- @${CHMOD} u+w ${STAGEDIR}/${SCRIPT_PATH}/Resources/com.plexapp.plugins.library.db >+ @${CHMOD} a+x ${STAGEDIR}${DATADIR}/Resources/rsync >+ @${CHMOD} a+x ${STAGEDIR}${DATADIR}/Resources/Plex\ New\ Transcoder >+ @${CHMOD} a+x ${STAGEDIR}${DATADIR}/Resources/Plex\ Transcoder >+ @${CHMOD} a+x ${STAGEDIR}${DATADIR}/Resources/Python/bin/python >+ @${CHMOD} u+w ${STAGEDIR}${DATADIR}/Resources/com.plexapp.plugins.library.db > # Python fix >- @${LN} -s ${SCRIPT_PATH}/libpython2.7.so.1 ${STAGEDIR}/${SCRIPT_PATH}/libpython2.7.so >+ @${LN} -s ${DATADIR}/libpython2.7.so.1 ${STAGEDIR}${DATADIR}/libpython2.7.so >+ # Workaround for space in binary name >+ @${LN} -s ${DATADIR}/Plex\ Media\ Server ${STAGEDIR}${DATADIR}/Plex_Media_Server > > .include <bsd.port.post.mk> >diff -u -r -N plexmediaserver-orig/files/pkg-message.in plexmediaserver/files/pkg-message.in >--- plexmediaserver-orig/files/pkg-message.in 1969-12-31 16:00:00.000000000 -0800 >+++ plexmediaserver/files/pkg-message.in 2014-11-08 04:52:22.000000000 -0800 >@@ -0,0 +1,15 @@ >+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * >+ >+multimedia/%%PORTNAME%% includes an RC script: >+%%PREFIX%%/etc/rc.d/%%PORTNAME%% >+ >+TO START PLEXMEDIASERVER ON BOOT: >+echo 'c%%PREFIX%%_enable="YES"' >> /etc/rc.conf >+ >+START MANUALLY: >+/etc/rc.d/%%PORTNAME%% start >+ >+Once started, visit the following to configure: >+http://localhost:32400/web >+ >+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * >diff -u -r -N plexmediaserver-orig/files/plexmediaserver.in plexmediaserver/files/plexmediaserver.in >--- plexmediaserver-orig/files/plexmediaserver.in 2014-11-08 02:28:10.000000000 -0800 >+++ plexmediaserver/files/plexmediaserver.in 2014-11-08 04:41:40.000000000 -0800 >@@ -3,46 +3,45 @@ > # > # $FreeBSD: head/multimedia/plexmediaserver/files/plexmediaserver.in 369936 2014-10-03 20:26:45Z feld $ > # >-# PROVIDE: plexmediaserver >+# PROVIDE: %%PORTNAME%% > # REQUIRE: LOGIN > # KEYWORD: shutdown > # > # Add the following lines to /etc/rc.conf to enable the Plex Media Server: > # >-# plexmediaserver_enable="YES" >+# %%PORTNAME%%_enable="YES" > # >-# plexmediaserver_support_path="%%SUPPORT_PATH%%" # Plex data: logs, media metadata, settings, etc >+# %%PORTNAME%%_support_path="%%PREFIX%%/plexdata" # Plex data: logs, media metadata, settings, etc > # >-# plexmediaserver_tmp="/var/tmp/plex" # configure tmp directory used for the transcoding process if desired >+# %%PORTNAME%%_tmp="/var/tmp/plex" # configure tmp directory used for the transcoding process if desired > # >-# plexmediaserver_maxplugins="6" # Maximum number of background plugin procs. May have to raise in rare cases. >+# %%PORTNAME%%_maxplugins="6" # Maximum number of background plugin procs. May have to raise in rare cases. > # > > . /etc/rc.subr > >-name=plexmediaserver >-rcvar=plexmediaserver_enable >+name=%%PORTNAME%% >+rcvar=%%PORTNAME%%_enable > load_rc_config $name > >-: ${plexmediaserver_enable:=NO} >-: ${plexmediaserver_support_path="%%SUPPORT_PATH%%"} >-: ${plexmediaserver_user="%%USERS%%"} >-: ${plexmediaserver_group="%%GROUPS%%"} >-: ${plexmediaserver_maxplugins=6} >- >-extra_commands=status >+: ${%%PORTNAME%%_enable:="NO"} >+: ${%%PORTNAME%%_support_path="%%PREFIX%%/plexdata"} >+: ${%%PORTNAME%%_user="%%USERS%%"} >+: ${%%PORTNAME%%_group="%%GROUPS%%"} >+: ${%%PORTNAME%%_maxplugins="6"} >+ >+command="/usr/sbin/daemon" >+procname="%%DATADIR%%/Plex_Media_Server" >+command_args="-f ${procname}" > start_precmd=plex_precmd >-start_cmd=plex_startcmd >-status_cmd=plex_statuscmd >-stop_cmd=plex_stopcmd > pidfile=/var/run/plex/plex.pid > > plex_precmd() > { > export SUPPORT_PATH="${plexmediaserver_support_path}" > export HOME="${plexmediaserver_support_path}/Plex Media Server" >- export PYTHONHOME="%%SCRIPT_PATH%%/Resources/Python" >- export SCRIPTPATH="%%SCRIPT_PATH%%" >+ 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} >@@ -67,39 +66,4 @@ > fi > } > >-plex_startcmd() >-{ >- if [ -f "${pidfile}" ] && (pgrep -F ${pidfile} Plex >/dev/null); then >- echo "${name} is already running with pid: $(cat ${pidfile})"; >- else >- echo "Starting ${name}." >- /usr/sbin/daemon -u ${plexmediaserver_user} -f '%%SCRIPT_PATH%%/Plex Media Server' >- fi >-} >- >-plex_statuscmd() >-{ >- if [ -f "${pidfile}" ] && (pgrep -F ${pidfile} Plex >/dev/null); then >- echo "${name} is running with pid: $(cat ${pidfile})"; >- else >- echo "${name} is not running."; >- exit 1; >- fi >-} >- >-plex_stopcmd() >-{ >- if [ -f "${pidfile}" ] && (pgrep -F ${pidfile} Plex >/dev/null); then >- main_pid=$(cat ${pidfile}); >- child_pids=$(pgrep -P ${main_pid}); >- all_pids="${main_pid} ${child_pids}" >- kill ${sig_stop} ${all_pids}; >- wait_for_pids ${all_pids}; >- rm ${pidfile} >- else >- echo "${name} is not running."; >- exit 1; >- fi >-} >- > run_rc_command "$1" >diff -u -r -N plexmediaserver-orig/pkg-plist plexmediaserver/pkg-plist >--- plexmediaserver-orig/pkg-plist 2014-11-08 02:28:10.000000000 -0800 >+++ plexmediaserver/pkg-plist 2014-11-08 04:22:30.000000000 -0800 >@@ -1,6 +1,7 @@ > %%DATADIR%%/Plex DLNA Server > %%DATADIR%%/Plex Media Scanner > %%DATADIR%%/Plex Media Server >+%%DATADIR%%/Plex_Media_Server > %%DATADIR%%/Resources/Graphics/DefaultAlbumCover.png > %%DATADIR%%/Resources/Graphics/actor-icon.png > %%DATADIR%%/Resources/Graphics/album-fanart.jpg
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 194909
:
149216
|
149217