Attachment 145394 Details for Bug 192347 – universal-media-server.diff

[patch] universal-media-server.diff

universal-media-server.diff (text/plain), 3.56 KB, created by Bartek Rutkowski on 2014-08-05 12:59:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bartek Rutkowski

Created: 2014-08-05 12:59:28 UTC

Size: 3.56 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 363836)
>+++ Makefile	(working copy)
>@@ -3,10 +3,10 @@
> 
> 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@gmail.com
> COMMENT=	Universal Media Server
>@@ -13,6 +13,7 @@
> 
> LICENSE=	GPLv2
> 
>+USES=		tar:tgz
> USE_JAVA=	yes
> JAVA_VERSION=	1.7+
> JAVA_VENDOR=	openjdk
>@@ -54,10 +55,8 @@
> UMS_LOG_DIR=		/var/log/${PORTNAME}
> UMS_PID_DIR=		/var/run/${PORTNAME}
> 
>-SUB_LIST=	RCNAME=${USE_RC_SUBR} JAVA_HOME=${JAVA_HOME} JAVA=${JAVA} \
>-		UMS_PROFILE_PATH=${UMS_PROFILE_PATH}
>+SUB_LIST=	RCNAME=${USE_RC_SUBR} JAVA_HOME=${JAVA_HOME} JAVA=${JAVA}
> PLIST_SUB=	${SUB_LIST}
>-PLIST_SUB+=	RESETPREFIX=${PREFIX}
> SUB_FILES=	pkg-message
> USE_RC_SUBR=	universal_media_server
> 
>@@ -64,20 +63,21 @@
> .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}${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
> 
>-		@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-		@(cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
>-		@(cd ${WRKSRC} && ${RM} -rf documentation)
>+		(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>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 363836)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,5 @@
>+@sample etc/universal-media-server/UMS.conf.sample
>+@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%%
>-@cwd /
>-@dirrm var/db/universal-media-server
>-@dirrm var/log/universal-media-server
>-@dirrm var/run/universal-media-server
>-@cwd %%RESETPREFIX%%
>+@dirrmtry etc/universal-media-server
>+@exec mkdir -p /var/db/universal-media-server
>+@exec mkdir -p /var/log/universal-media-server
>+@exec mkdir -p /var/run/universal-media-server
>+@unexec rmdir /var/db/universal-media-server >/dev/null 2>&1 || :
>+@unexec rmdir /var/log/universal-media-server >/dev/null 2>&1 || :
>+@unexec rmdir /var/run/universal-media-server >/dev/null 2>&1 || :

Actions: View | Diff

Attachments on bug 192347: 145274 | 145394