Page MenuHomeFreeBSD
Files F149438786

D41017.1790131951.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D41017.1790131951.diff
View Options

diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
--- a/www/madsonic/Makefile
+++ b/www/madsonic/Makefile
@@ -1,10 +1,9 @@
PORTNAME= madsonic
-PORTVERSION= 6.2.9040
-PORTREVISION= 4
+PORTVERSION= 6.2.9092
CATEGORIES= www java
-MASTER_SITES= http://madsonic.org/download/6.2/
+MASTER_SITES= https://madsonic.org/download/6.2/
DISTFILES= ${DISTDATE}_${DISTNAME}-war-tomcat.zip \
- ${DISTDATE}_${DISTNAME}-war-jspc.zip
+ ${DISTDATE}_${DISTNAME}-war-jspc.zip
MAINTAINER= ports@FreeBSD.org
COMMENT= Madsonic streaming media server
@@ -12,75 +11,76 @@
LICENSE= GPLv3
-OPTIONS_SINGLE= APPSERVER
-APPSERVER_DESC= Java Application Server
-OPTIONS_SINGLE_APPSERVER= JETTY TOMCAT7 RESIN3
-TOMCAT7_DESC= Use Tomcat 7.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 XMP MPC APE
-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= 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 JETTY
-OPTIONS_SUB= yes
-
RUN_DEPENDS+= ${JAVALIBDIR}/servlet-api.jar:www/servlet-api \
- ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
-TOMCAT7_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
-TOMCAT7_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat7
-JETTY_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
-JETTY_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
-RESIN3_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
-RESIN3_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/lib/resin.jar:www/resin3
-FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg
-FLAC_RUN_DEPENDS= flac:audio/flac
-LAME_RUN_DEPENDS= lame:audio/lame
-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
+ ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
-.include <bsd.port.options.mk>
+USES= zip
+USE_JAVA= yes
+JAVA_VERSION= 8
+WRKSRC= ${WRKDIR}/${PORTNAME}
+NO_ARCH= yes
NO_BUILD= yes
-DISTDATE= 20161208
-USE_JAVA= yes
-USES= zip
-USER= www
-GROUP= www
-MADSONIC_HOME= /var/madsonic
-WRKSRC= ${WRKDIR}/${PORTNAME}
-WEBAPPDIR= ${PREFIX}/${SERVERDIR}/webapps
+PLIST= ${WRKDIR}/plist
PKGMESSAGE= ${WRKDIR}/pkg-message
-PLIST= ${WRKDIR}/plist
PLIST_SUB+= MADSONIC_HOME="${MADSONIC_HOME}" \
- WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||}
-SUB_FILES= message-common\
- message-transcoding
+ WEBAPPS=${WEBAPPDIR:S|^${PREFIX}/||}
+SUB_FILES= message-common message-transcoding
SUB_LIST= MADSONIC_HOME="${MADSONIC_HOME}"
-.if ${PORT_OPTIONS:MTOMCAT7}
+OPTIONS_SINGLE= APPSERVER
+OPTIONS_SINGLE_APPSERVER= JETTY8 TOMCAT85
+OPTIONS_GROUP= TRANSCODING
+OPTIONS_GROUP_TRANSCODING= APE FAAC FAAD FFMPEG FLAC LAME MPC VORBIS XMP
+OPTIONS_DEFAULT= FFMPEG JETTY8
+OPTIONS_SUB= yes
+
+APE_DESC= Depend on mac for Monkey's Audio transcoding #'
+APPSERVER_DESC= Java Application Server
+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
+JETTY8_DESC= Use Jetty 8.x
+LAME_DESC= Depend on LAME for MP3 transcoding
+MPC_DESC= Depend on mpcdec for MPC transcoding
+TOMCAT85_DESC= Use Tomcat 8.5.x
+TRANSCODING_DESC= Transcoding support
+VORBIS_DESC= Depend on oggenc/oggdec for Vorbis transcoding
+XMP_DESC= Depend on XMP for module file transcoding
+
+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
+JETTY8_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
+JETTY8_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/start.jar:www/jetty8
+LAME_RUN_DEPENDS= lame:audio/lame
+MPC_RUN_DEPENDS= mpcdec:audio/musepack
+TOMCAT85_BUILD_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat85
+TOMCAT85_RUN_DEPENDS= ${LOCALBASE}/${SERVERDIR}/bin/bootstrap.jar:www/tomcat85
+VORBIS_RUN_DEPENDS= oggenc:audio/vorbis-tools
+XMP_RUN_DEPENDS= xmp:audio/xmp
+
+DISTDATE= 20220126
+USER= www
+GROUP= www
+MADSONIC_HOME= /var/madsonic
+
+.include <bsd.port.options.mk>
+
+WEBAPPDIR= ${PREFIX}/${SERVERDIR}/webapps
+
+.if ${PORT_OPTIONS:MTOMCAT85}
APPPKGMESSAGE= pkg-message-tomcat
DISTVER= tomcat
-PKGNAMESUFFIX= -tomcat7
-SERVERDIR= apache-tomcat-7.0
-SUB_LIST+= CONTAINERFLAGS="tomcat7_java_opts"
+PKGNAMESUFFIX= -tomcat85
+SERVERDIR= apache-tomcat-8.5
+SUB_LIST+= CONTAINERFLAGS="tomcat85_java_opts"
.endif
-.if ${PORT_OPTIONS:MJETTY}
+.if ${PORT_OPTIONS:MJETTY8}
APPPKGMESSAGE= pkg-message-jetty
DISTVER= jspc
PKGNAMESUFFIX= -jetty
@@ -88,14 +88,6 @@
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
-
do-extract:
${EXTRACT_CMD} -qo ${DISTDIR}/${DISTDATE}_${PORTNAME}-${PORTVERSION}-war-${DISTVER}.zip -d ${WRKDIR}
diff --git a/www/madsonic/distinfo b/www/madsonic/distinfo
--- a/www/madsonic/distinfo
+++ b/www/madsonic/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1475617922
-SHA256 (20161208_madsonic-6.2.9040-war-tomcat.zip) = 1309d147155e5d6966ef510a74861edc09d2fabc0ca066576d3c4dbc619d3024
-SIZE (20161208_madsonic-6.2.9040-war-tomcat.zip) = 80707015
-SHA256 (20161208_madsonic-6.2.9040-war-jspc.zip) = 55300906f036f24e21f6cd718219ff308d8c1f945a309df262248a03b72fcca9
-SIZE (20161208_madsonic-6.2.9040-war-jspc.zip) = 80678832
+TIMESTAMP = 1689251347
+SHA256 (20220126_madsonic-6.2.9092-war-tomcat.zip) = c23d8fc9e80132811cf0fd1ab47e61a7a4f6ae653fb0cf16d9305ce38acf83fb
+SIZE (20220126_madsonic-6.2.9092-war-tomcat.zip) = 79926349
+SHA256 (20220126_madsonic-6.2.9092-war-jspc.zip) = b1e670910674ce481da578ea716b8dacd6032c168c7eb0e0764a747bb0240eeb
+SIZE (20220126_madsonic-6.2.9092-war-jspc.zip) = 79929699
diff --git a/www/madsonic/pkg-message-resin3 b/www/madsonic/pkg-message-resin3
deleted file mode 100644
--- a/www/madsonic/pkg-message-resin3
+++ /dev/null
@@ -1,2 +0,0 @@
-Enable or restart resin3, then you can access Madsonic at
-http://127.0.0.1:8080/madsonic/ if using the default Resin HTTP port.

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 23, 2:52 AM (6 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29869397
Default Alt Text
D41017.1790131951.diff (6 KB)

Event Timeline