Page MenuHomeFreeBSD
Files F154957039

D13040.id35786.diff
No OneTemporary
Actions

D13040.id35786.diff
View Options

Index: www/subsonic-standalone/Makefile
===================================================================
--- www/subsonic-standalone/Makefile
+++ www/subsonic-standalone/Makefile
@@ -2,16 +2,21 @@
# Based on www/subsonic from Nicole Reid <root@cooltrainer.org>
# $FreeBSD$
-PORTNAME= subsonic-standalone
+PORTNAME= subsonic
+DISTVERSIONPREFIX= v
PORTVERSION= 6.0
PORTREVISION= 5
CATEGORIES= www java
MASTER_SITES= SF/subsonic/subsonic/${PORTVERSION}
DISTNAME= subsonic-${PORTVERSION}-standalone
+PKGNAMESUFFIX= -standalone
MAINTAINER= jlh@FreeBSD.org
COMMENT= Subsonic streaming media server, standalone version
+USE_JAVA= yes
+USE_RC_SUBR= subsonic
+
# Subsonic 6 onwards has become proprietary. License is unclear.
# http://forum.subsonic.org/forum/viewtopic.php?f=4&t=16604#p71128
LICENSE= NONE
@@ -19,45 +24,41 @@
OPTIONS_GROUP= TRANSCODING
TRANSCODING_DESC= Transcoding support
OPTIONS_GROUP_TRANSCODING= FFMPEG FLAC LAME VORBIS FAAC FAAD XMP MPC APE
+APE_DESC= Depend on mac for Monkey's Audio transcoding #'
+FAAC_DESC= Depend on FAAD for AAC/M4A transcoding
+FAAD_DESC= Depend on FAAC for AAC/M4A transcoding
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
+MPC_DESC= Depend on mpcdec for MPC transcoding
VORBIS_DESC= Depend on oggenc/oggdec for Vorbis transcoding
-FAAC_DESC= Depend on FAAD for AAC/M4A transcoding
-FAAD_DESC= Depend on FAAC for AAC/M4A transcoding
XMP_DESC= Depend on XMP for module file transcoding
-MPC_DESC= Depend on mpcdec for MPC transcoding
-APE_DESC= Depend on mac for Monkey's Audio transcoding #'
OPTIONS_DEFAULT= FFMPEG
OPTIONS_SUB= yes
+APE_RUN_DEPENDS= mac:audio/mac
+FAAC_RUN_DEPENDS= faac:audio/faac
+FAAD_RUN_DEPENDS= faad:audio/faad
FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg
FLAC_RUN_DEPENDS= flac:audio/flac
LAME_RUN_DEPENDS= lame:audio/lame
+MPC_RUN_DEPENDS= mpcdec:audio/musepack
VORBIS_RUN_DEPENDS= oggenc:audio/vorbis-tools
-FAAC_RUN_DEPENDS= faac:audio/faac
-FAAD_RUN_DEPENDS= faad:audio/faad
XMP_RUN_DEPENDS= xmp:audio/xmp
-MPC_RUN_DEPENDS= mpcdec:audio/musepack
-APE_RUN_DEPENDS= mac:audio/mac
-
-.include <bsd.port.options.mk>
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_JAVA= yes
-USE_RC_SUBR= subsonic
JAVA_VERSION= 1.6+
JAVA_RUN= yes
+# This UID/GID is shared with Subsonic's forks ports (madsonic/libresonic/...)
USERS= subsonic
GROUPS= subsonic
SUBSONIC_HOME= /var/subsonic
PLIST_SUB+= SUBSONIC_HOME="${SUBSONIC_HOME}" \
USER="${USERS}" \
GROUP="${GROUPS}"
-SUB_FILES= pkg-message \
- message-transcoding
+SUB_FILES= pkg-message
SUB_LIST= SUBSONIC_HOME="${SUBSONIC_HOME}" \
USER="${USERS}" \
GROUP="${GROUPS}" \
@@ -66,24 +67,19 @@
CONFLICTS_INSTALL= subsonic-jetty subsonic-resin3 subsonic-tomcat[678]
do-install:
- @${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
- @${CAT} ${WRKDIR}/message-transcoding >> ${PKGMESSAGE}
- @${CAT} ${PKGDIR}/pkg-message-spacer >> ${PKGMESSAGE}
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_MAN} ${WRKSRC}/README.TXT ${STAGEDIR}${DATADIR}/
${INSTALL_DATA} ${WRKSRC}/subsonic.war ${STAGEDIR}${DATADIR}/
${INSTALL_DATA} ${WRKSRC}/subsonic-booter-jar-with-dependencies.jar ${STAGEDIR}${DATADIR}/
-
-post-install:
${MKDIR} ${STAGEDIR}${SUBSONIC_HOME}/transcode
-post-install-FFMPEG-on:
- ${LN} -sf ${PREFIX}/bin/ffmpeg ${STAGEDIR}${SUBSONIC_HOME}/transcode/ffmpeg
+do-install-FFMPEG-on:
+ ${RLN} ${PREFIX}/bin/ffmpeg ${STAGEDIR}${SUBSONIC_HOME}/transcode/ffmpeg
-post-install-FLAC-on:
- ${LN} -sf ${PREFIX}/bin/flac ${STAGEDIR}${SUBSONIC_HOME}/transcode/flac
+do-install-FLAC-on:
+ ${RLN} ${PREFIX}/bin/flac ${STAGEDIR}${SUBSONIC_HOME}/transcode/flac
-post-install-LAME-on:
- ${LN} -sf ${PREFIX}/bin/lame ${STAGEDIR}${SUBSONIC_HOME}/transcode/lame
+do-install-LAME-on:
+ ${RLN} ${PREFIX}/bin/lame ${STAGEDIR}${SUBSONIC_HOME}/transcode/lame
.include <bsd.port.mk>
Index: www/subsonic-standalone/files/message-transcoding.in
===================================================================
--- www/subsonic-standalone/files/message-transcoding.in
+++ /dev/null
@@ -1,38 +0,0 @@
-Transcoding in Subsonic is a way to re-encode music on the fly to a format
-your listening device supports. A common use is transcoding FLAC, WMA,
-and Vorbis audio to MP3 for devices supporting only that codec.
-
-Configuring transcoding uses up to three commands one would use on a normal
-command line pipe but with a whitelist of executables installed or linked into
-%%SUBSONIC_HOME%%/transcode. The transcoding configuration page takes
-transcoding rules in the form of:
-
- [rule name] [convert from] [convert to] [command 1] [command 2] [command 3]
-
-The most compatible single audio transcoding command is with FFmpeg, transcoding
-any input to MP3, mapping all streams to output, and limiting metadata to the
-more-compatible ID3v2.3:
-
- [All to MP3] [ogg flac wma aiff m4a] [mp3] ...
- [ffmpeg -i %s -ab %bk -id3v2_version 3 -map_metadata 0 -map 0:0 -ar 44100 -ac 2 -v 0 -f mp3 -]
-
-You can also transcode with multiple single-codec commands to avoid
-the heavy FFmpeg dependency:
-
- [FLAC to MP3] [flac] [mp3] ...
- [flac --silent --decode --stdout %s] [lame --silent -h -b %b -]
-
- [AAC to MP3] [m4a] [mp3] ...
- [faad -s -o - %s] [lame --silent -h -b %b -]
-
- [Vorbis to MP3] [ogg] [mp3] ...
- [oggdec -Q -o /dev/stdout %s] [lame --silent -h -b %b -]
-
- [MPC to MP3] [mpc] [mp3] ...
- [mpcdec %s -] [lame --silent -h -b %b -]
-
- [APE to MP3] [ape] [mp3] ...
- [mac %s - -d] [lame --silent -h -b %b -]
-
- [Trackers to MP3] [mod s3m xm it] [mp3] ...
- [xmp -q -c %s] [lame --silent -h -b %b -]
Index: www/subsonic-standalone/files/pkg-message.in
===================================================================
--- www/subsonic-standalone/files/pkg-message.in
+++ www/subsonic-standalone/files/pkg-message.in
@@ -5,3 +5,47 @@
subsonic_enable="YES"
See %%LOCALBASE%%/etc/rc.d/subsonic for all the options.
+
+========================================================================
+
+Transcoding in Subsonic is a way to re-encode music on the fly to a format
+your listening device supports. A common use is transcoding FLAC, WMA,
+and Vorbis audio to MP3 for devices supporting only that codec.
+
+Configuring transcoding uses up to three commands one would use on a normal
+command line pipe but with a whitelist of executables installed or linked into
+%%SUBSONIC_HOME%%/transcode. The transcoding configuration page takes
+transcoding rules in the form of:
+
+ [rule name] [convert from] [convert to] [command 1] [command 2] [command 3]
+
+The most compatible single audio transcoding command is with FFmpeg, transcoding
+any input to MP3, mapping all streams to output, and limiting metadata to the
+more-compatible ID3v2.3:
+
+ [All to MP3] [ogg flac wma aiff m4a] [mp3] ...
+ [ffmpeg -i %s -ab %bk -id3v2_version 3 -map_metadata 0 -map 0:0 -ar 44100 -ac 2 -v 0 -f mp3 -]
+
+You can also transcode with multiple single-codec commands to avoid
+the heavy FFmpeg dependency:
+
+ [FLAC to MP3] [flac] [mp3] ...
+ [flac --silent --decode --stdout %s] [lame --silent -h -b %b -]
+
+ [AAC to MP3] [m4a] [mp3] ...
+ [faad -s -o - %s] [lame --silent -h -b %b -]
+
+ [Vorbis to MP3] [ogg] [mp3] ...
+ [oggdec -Q -o /dev/stdout %s] [lame --silent -h -b %b -]
+
+ [MPC to MP3] [mpc] [mp3] ...
+ [mpcdec %s -] [lame --silent -h -b %b -]
+
+ [APE to MP3] [ape] [mp3] ...
+ [mac %s - -d] [lame --silent -h -b %b -]
+
+ [Trackers to MP3] [mod s3m xm it] [mp3] ...
+ [xmp -q -c %s] [lame --silent -h -b %b -]
+
+========================================================================
+
Index: www/subsonic-standalone/pkg-message-spacer
===================================================================
--- www/subsonic-standalone/pkg-message-spacer
+++ /dev/null
@@ -1,3 +0,0 @@
-
-========================================================================
-

File Metadata

Mime Type
text/plain
Expires
Fri, May 1, 7:47 AM (1 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32563383
Default Alt Text
D13040.id35786.diff (7 KB)

Event Timeline