svn commit: r367523 - head/multimedia/universal-media-server
John Marino
marino at FreeBSD.org
Sun Sep 7 11:37:45 UTC 2014
Author: marino
Date: Sun Sep 7 11:37:44 2014
New Revision: 367523
URL: http://svnweb.freebsd.org/changeset/ports/367523
QAT: https://qat.redports.org/buildarchive/r367523/
Log:
multimedia/universal-media-server: partially fix, but mark BROKEN
This port has had issues every since it was introduced, but the previous
commit actually made them worse. This commit fixes the problems that were
introduced then, but the RC script is currently non-functional.
The maintainer has not been responding to repeated requests for help to
fix the RC script, so I'm going to commit the fixes we have and mark the
port broken now (as I was tempted to do over a month ago).
PR: 192347
Modified:
head/multimedia/universal-media-server/Makefile
head/multimedia/universal-media-server/pkg-plist
Modified: head/multimedia/universal-media-server/Makefile
==============================================================================
--- head/multimedia/universal-media-server/Makefile Sun Sep 7 11:37:43 2014 (r367522)
+++ head/multimedia/universal-media-server/Makefile Sun Sep 7 11:37:44 2014 (r367523)
@@ -3,22 +3,26 @@
PORTNAME= universal-media-server
PORTVERSION= 4.0.0
+PORTREVISION= 1
CATEGORIES= multimedia java
MASTER_SITES= SF/unimediaserver/Official%20Releases/Linux
DISTNAME= UMS-${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= dreamcat4 at gmail.com
COMMENT= Universal Media Server
LICENSE= GPLv2
+BROKEN= RC script broken, especially prestart target
+
+USES= tar:tgz
USE_JAVA= yes
JAVA_VERSION= 1.7+
JAVA_VENDOR= openjdk
JAVA_RUN= true
-OPTIONS_DEFINE= MEDIAINFO FLAC DCRAW TSMUXER FFMPEG MPLAYER VLC MENCODER DOCS
+OPTIONS_DEFINE= MEDIAINFO FLAC DCRAW TSMUXER FFMPEG MPLAYER VLC \
+ MENCODER DOCS
OPTIONS_DEFAULT= MEDIAINFO FLAC DCRAW
MEDIAINFO_DESC= Metadata information about video & audio files
@@ -54,29 +58,32 @@ UMS_PROFILE_PATH= /var/db/${PORTNAME}
UMS_LOG_DIR= /var/log/${PORTNAME}
UMS_PID_DIR= /var/run/${PORTNAME}
+PLIST_SUB= RCNAME=${USE_RC_SUBR} JAVA_HOME=${JAVA_HOME} JAVA=${JAVA}
SUB_LIST= RCNAME=${USE_RC_SUBR} JAVA_HOME=${JAVA_HOME} JAVA=${JAVA} \
- UMS_PROFILE_PATH=${UMS_PROFILE_PATH}
-PLIST_SUB= ${SUB_LIST}
+ UMS_PROFILE_PATH=${UMS_PROFILE_PATH} \
+ UMS_LOG_DIR=${UMS_LOG_DIR} \
+ UMS_PID_DIR=${UMS_PID_DIR}
SUB_FILES= pkg-message
USE_RC_SUBR= universal_media_server
.include <bsd.port.pre.mk>
do-install:
- @${MKDIR} ${STAGEDIR}${UMS_PROFILE_PATH}
- @${CP} ${WRKSRC}/UMS.conf ${STAGEDIR}${UMS_PROFILE_PATH}/UMS.conf.sample
- @${CP} ${WRKSRC}/WEB.conf ${STAGEDIR}${UMS_PROFILE_PATH}/WEB.conf.sample
- @${MKDIR} ${STAGEDIR}${UMS_PID_DIR}
- @${MKDIR} ${STAGEDIR}${UMS_LOG_DIR}
-
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- @(cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
- @(cd ${WRKSRC} && ${RM} -rf documentation)
+ ${MKDIR} ${STAGEDIR}${UMS_PROFILE_PATH} \
+ ${STAGEDIR}${UMS_PID_DIR} \
+ ${STAGEDIR}${UMS_LOG_DIR} \
+ ${STAGEDIR}${DOCSDIR} \
+ ${STAGEDIR}${DATADIR} \
+ ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/UMS.conf ${STAGEDIR}${ETCDIR}/UMS.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/WEB.conf ${STAGEDIR}${ETCDIR}/WEB.conf.sample
+
+ (cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+ (cd ${WRKSRC} && ${RM} -rf documentation)
- @(cd ${WRKSRC}/linux && ${RM} -rf *)
- @(cd ${WRKSRC}/linux && ${LN} -sf ${PREFIX}/bin/tsMuxeR tsMuxeR-new)
+ (cd ${WRKSRC}/linux && ${RM} -rf *)
+ (cd ${WRKSRC}/linux && ${LN} -sf ${PREFIX}/bin/tsMuxeR tsMuxeR-new)
- @${MKDIR} ${STAGEDIR}${DATADIR}
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
.include <bsd.port.post.mk>
Modified: head/multimedia/universal-media-server/pkg-plist
==============================================================================
--- head/multimedia/universal-media-server/pkg-plist Sun Sep 7 11:37:43 2014 (r367522)
+++ head/multimedia/universal-media-server/pkg-plist Sun Sep 7 11:37:44 2014 (r367523)
@@ -1,3 +1,5 @@
+ at sample etc/universal-media-server/UMS.conf.sample
+ at sample etc/universal-media-server/WEB.conf.sample
%%PORTDOCS%%%%DOCSDIR%%/applications.html
%%PORTDOCS%%%%DOCSDIR%%/avisynth.html
%%PORTDOCS%%%%DOCSDIR%%/coreavc.html
@@ -137,8 +139,6 @@
%%DATADIR%%/web/web-narrow.css
%%DATADIR%%/web/web-wide.css
%%DATADIR%%/web/web.css
-%%UMS_PROFILE_PATH%%/UMS.conf.sample
-%%UMS_PROFILE_PATH%%/WEB.conf.sample
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/css
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -148,8 +148,10 @@
@dirrmtry %%DATADIR%%/web/img
@dirrmtry %%DATADIR%%/web
@dirrmtry %%DATADIR%%
- at cwd /
- at dirrm var/db/universal-media-server
- at dirrm var/log/universal-media-server
- at dirrm var/run/universal-media-server
- at cwd %%RESETPREFIX%%
+ at dirrmtry etc/universal-media-server
+ at exec mkdir -p /var/db/universal-media-server
+ at exec mkdir -p /var/log/universal-media-server
+ at exec mkdir -p /var/run/universal-media-server
+ at unexec rmdir /var/db/universal-media-server >/dev/null 2>&1 || :
+ at unexec rmdir /var/log/universal-media-server >/dev/null 2>&1 || :
+ at unexec rmdir /var/run/universal-media-server >/dev/null 2>&1 || :
More information about the svn-ports-head
mailing list