Attachment 148315 Details for Bug 194326 – Subsonic 5.0 port diff

[patch] Subsonic 5.0 port diff

subsonic-5.0.diff (text/plain), 7.65 KB, created by Nicole Reid on 2014-10-15 02:16:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicole Reid

Created: 2014-10-15 02:16:40 UTC

Size: 7.65 KB

patch

obsolete

>diff -u subsonic-old/Makefile subsonic/Makefile
>--- subsonic-old/Makefile	2014-10-12 22:16:50.113629029 -0700
>+++ subsonic/Makefile	2014-10-14 19:14:00.980088292 -0700
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/subsonic/Makefile 347789 2014-03-10 18:01:09Z bapt $
> 
> PORTNAME=	subsonic
>-PORTVERSION=	4.9
>+PORTVERSION=	5.0
> CATEGORIES=	www java
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}-${PORTVERSION}-war
>@@ -10,44 +10,136 @@
> MAINTAINER=	root@cooltrainer.org
> COMMENT=	Subsonic streaming media server
> 
>-BUILD_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0:${PORTSDIR}/www/tomcat6
>-RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:${PORTSDIR}/www/servlet-api
>+LICENSE=	GPLv3
> 
>-OPTIONS_DEFINE=	TRANSCODING
>-TRANSCODING_DESC=	Transcoding with FFmpeg and LAME
>-OPTIONS_DEFAULT=	TRANSCODING
>-OPTIONS_SUB=		yes
>-
>-TRANSCODING_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
>-				lame:${PORTSDIR}/audio/lame
>-
>-USES=		zip
>+OPTIONS_SINGLE=	APPSERVER
>+APPSERVER_DESC=	Java Application Server
>+OPTIONS_SINGLE_APPSERVER=	JETTY TOMCAT8 TOMCAT7 TOMCAT6 RESIN3
>+TOMCAT8_DESC=	Use Tomcat 8.x
>+TOMCAT7_DESC=	Use Tomcat 7.x
>+TOMCAT6_DESC=	Use Tomcat 6.x
>+JETTY_DESC=	Use Jetty
>+RESIN3_DESC=	Use Resin 3
>+
>+OPTIONS_GROUP=	TRANSCODING
>+TRANSCODING_DESC=	Transcoding support
>+OPTIONS_GROUP_TRANSCODING=	FFMPEG FLAC LAME VORBIS FAAC FAAD
>+FFMPEG_DESC=	Depend on FFmpeg for audio and video transcoding
>+FLAC_DESC=	Depend on FLAC for transcoding
>+LAME_DESC=	Depend on LAME for MP3 transcoding
>+VORBIS_DESC=	Depend on oggenc/oggdec for Vorbis transcoding
>+FAAC_DESC=	Depend on FAAD for AAC/M4A transcoding
>+FAAD_DESC=	Degend on FAAC for AAC/M4A transcoding
>+
>+OPTIONS_DEFAULT=	FFMPEG JETTY
>+OPTIONS_SUB=	yes
>+
>+RUN_DEPENDS+=	${JAVAJARDIR}/servlet-api.jar:${PORTSDIR}/www/servlet-api \
>+	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
>+TOMCAT8_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
>+TOMCAT8_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat8
>+TOMCAT7_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
>+TOMCAT7_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
>+TOMCAT6_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>+TOMCAT6_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>+JETTY_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:${PORTSDIR}/www/jetty
>+JETTY_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/start.jar:${PORTSDIR}/www/jetty
>+RESIN3_BUILD_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:${PORTSDIR}/www/resin3
>+RESIN3_RUN_DEPENDS=	${LOCALBASE}/${SERVERDIR}/lib/resin.jar:${PORTSDIR}/www/resin3
>+FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
>+FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
>+LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
>+VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
>+FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
>+FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
> 
> .include <bsd.port.options.mk>
> 
>-#Subsonic does not currently run on Tomcat 7
>-SUB_FILES=	pkg-message
>-WEBAPPDIR=	${PREFIX}/apache-tomcat-6.0/webapps
>-BUILD_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>-RUN_DEPENDS+=	${LOCALBASE}/apache-tomcat-6.0/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
>-SUB_LIST=	TOMCATOPTS="tomcat60_java_opts"
>-
> NO_BUILD=	yes
> USE_JAVA=	yes
> JAVA_VERSION=	1.6+
>-USER=		www
>-GROUP=		www
>+USES=	zip
>+USER=	www
>+GROUP=	www
> SUBSONIC_HOME=	/var/subsonic
>+WRKSRC=	${WRKDIR}/${PORTNAME}
>+WEBAPPDIR=	${PREFIX}/${SERVERDIR}/webapps
>+PKGMESSAGE=	${WRKDIR}/pkg-message
>+PLIST=	${WRKDIR}/plist
> PLIST_SUB+=	SUBSONIC_HOME="${SUBSONIC_HOME}" \
>-		WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||} \
>-		USER=${USER} GROUP=${GROUP} \
>-		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
>+	WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||}
>+SUB_FILES=	message-common\
>+	message-transcoding
>+SUB_LIST=	SUBSONIC_HOME="${SUBSONIC_HOME}"
>+
>+.if ${PORT_OPTIONS:MTOMCAT8}
>+APPPKGMESSAGE=	pkg-message-tomcat
>+DISTVER=	tomcat
>+PKGNAMESUFFIX=	-tomcat8
>+SERVERDIR=	apache-tomcat-8.0
>+SUB_LIST+=	CONTAINERFLAGS="tomcat8_java_opts"
>+.endif
>+
>+.if ${PORT_OPTIONS:MTOMCAT7}
>+APPPKGMESSAGE=	pkg-message-tomcat
>+DISTVER=	tomcat
>+PKGNAMESUFFIX=	-tomcat7
>+SERVERDIR=	apache-tomcat-7.0
>+SUB_LIST+=	CONTAINERFLAGS="tomcat7_java_opts"
>+.endif
>+
>+.if ${PORT_OPTIONS:MTOMCAT6}
>+APPPKGMESSAGE=	pkg-message-tomcat
>+DISTVER=	tomcat
>+PKGNAMESUFFIX=	-tomcat6
>+SERVERDIR=	apache-tomcat-6.0
>+SUB_LIST+=	CONTAINERFLAGS="tomcat60_java_opts"
>+.endif
>+
>+.if ${PORT_OPTIONS:MJETTY}
>+APPPKGMESSAGE=	pkg-message-jetty
>+DISTVER=	jspc
>+PKGNAMESUFFIX=	-jetty
>+SERVERDIR=	jetty
>+SUB_LIST+=	CONTAINERFLAGS="jetty_flags"
>+.endif
>+
>+.if ${PORT_OPTIONS:MRESIN3}
>+APPPKGMESSAGE=	pkg-message-resin3
>+DISTVER=	tomcat
>+PKGNAMESUFFIX=	-resin3
>+SERVERDIR=	resin3
>+SUB_LIST+=	CONTAINERFLAGS="resin3_flags"
>+.endif
> 
> post-extract:
>-	@${MKDIR} ${WRKDIR}/${PORTDIRNAME}
>-	@${TAR} xf ${WRKDIR}/${PORTNAME}.war -C ${WRKDIR}/${PORTDIRNAME}
>+	@${MKDIR} ${WRKSRC}
>+	@${TAR} -xf ${WRKDIR}/${PORTNAME}.war -C ${WRKSRC}
>+
>+pre-install:
>+	@${RM} ${PLIST}
>+	@${ECHO} "@owner ${USER}" >> ${PLIST}
>+	@${ECHO} "@group ${GROUP}" >> ${PLIST}
>+	@cd ${WRKSRC}; ${FIND} . -type f | cut -c2- \
>+		| ${SED} 's|^|${WEBAPPDIR:S,${PREFIX}/,,}/${PORTDIRNAME}|' \
>+		| ${SORT} >> ${PLIST}
>+	@${CAT} ${PKGDIR}/pkg-plist-chunk >> ${PLIST}
>+	@cd ${WRKSRC}; ${FIND} . -type d | cut -c2- \
>+		| ${SED} 's|^|@dir ${WEBAPPDIR:S,${PREFIX}/,,}/${PORTDIRNAME}|' \
>+		| ${SORT} -r >> ${PLIST}
>+	@${RM} ${PKGMESSAGE}
>+	@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
>+	@${CAT} ${PKGDIR}/${APPPKGMESSAGE} >> ${PKGMESSAGE}
>+	@${CAT} ${WRKDIR}/message-common >> ${PKGMESSAGE}
>+	@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
>+	@${CAT} ${WRKDIR}/message-transcoding >> ${PKGMESSAGE}
>+	@${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
> 
> do-install:
>-	@cd ${WRKDIR} && ${COPYTREE_SHARE} ${PORTDIRNAME} ${STAGEDIR}${WEBAPPDIR}
>+	cd ${WRKDIR} && ${COPYTREE_SHARE} ${PORTDIRNAME} ${STAGEDIR}${WEBAPPDIR}
>+
>+post-stage:
>+	${MKDIR} ${STAGEDIR}${SUBSONIC_HOME}
>+	${MKDIR} ${STAGEDIR}${SUBSONIC_HOME}/transcode
> 
> .include <bsd.port.mk>
>diff -u subsonic-old/distinfo subsonic/distinfo
>--- subsonic-old/distinfo	2014-03-06 12:29:47.000000000 -0800
>+++ subsonic/distinfo	2014-10-12 22:19:30.514225945 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (subsonic-4.9-war.zip) = 64ffc808c2027652910b7a9d579fbf86a5915efda096cfaf13a0d36fcb495f98
>-SIZE (subsonic-4.9-war.zip) = 21340775
>+SHA256 (subsonic-5.0-war.zip) = 80374293daa2b5deeacae6fbaa725c70473585d95e100fbfb6bd805644509a3d
>+SIZE (subsonic-5.0-war.zip) = 26822614
>Common subdirectories: subsonic-old/files and subsonic/files
>diff -u subsonic-old/pkg-descr subsonic/pkg-descr
>--- subsonic-old/pkg-descr	2014-01-22 07:44:51.000000000 -0800
>+++ subsonic/pkg-descr	2014-10-12 23:18:07.427983900 -0700
>@@ -1,8 +1,7 @@
>-Subsonic is a free, web-based media streamer, providing ubiquitous
>-access to your music. Use it to share your music with friends,
>-or to listen to your own music while at work.
>-You can stream to multiple players simultaneously,
>-for instance to one player in your kitchen and another in your living
>-room.
>+Subsonic instantly transports your media to any HTTP connected device
>+regardless of bitrate. You can stream to multiple players simultaneously.
>+Subsonic is designed to handle very large music collections. By using
>+transcoder plug-ins, Subsonic supports on-the-fly conversion and streaming
>+of virtually any audio format, including MP3, OGG, WMA, FLAC, APE and more.
> 
> WWW: http://www.subsonic.org
>Only in subsonic: pkg-message-jetty
>Only in subsonic: pkg-message-resin3
>Only in subsonic: pkg-message-spacer
>Only in subsonic: pkg-message-tomcat
>Only in subsonic-old: pkg-plist
>Only in subsonic: pkg-plist-chunk
>Only in subsonic-old: work

Actions: View | Diff

Attachments on bug 194326: 148227 | 148228 | 148315 | 148316 | 148648