- Update to 0.10.0

PR:		114542
Submitted by:	Leonhard Wimmer <leo@mediatomb.cc> (maintainer)

5 files changed, 40 insertions, 20 deletions

diff --git a/net/mediatomb/Makefile b/net/mediatomb/Makefile
index 477ed58dbb95..38b8a7a777f4 100644
--- a/net/mediatomb/Makefile
+++ b/net/mediatomb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mediatomb
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.0
 CATEGORIES=	net multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,8 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-search="${LOCALBASE}" \
-		--mandir="${MANPREFIX}/man"
+		--mandir="${MANPREFIX}/man" \
+		--disable-inotify
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
diff --git a/net/mediatomb/distinfo b/net/mediatomb/distinfo
index 2ae60076aec2..ca279d08216b 100644
--- a/net/mediatomb/distinfo
+++ b/net/mediatomb/distinfo
@@ -1,3 +1,3 @@
-MD5 (mediatomb-0.9.1.tar.gz) = 3cb8a14b17102ec828853679d879f7bc
-SHA256 (mediatomb-0.9.1.tar.gz) = 64821ec2c678e5da1582ee116d919ce2beef166301586e42c547e4482fb8d945
-SIZE (mediatomb-0.9.1.tar.gz) = 881850
+MD5 (mediatomb-0.10.0.tar.gz) = 2436c73de4ac5f3ba1575f7ee93a0430
+SHA256 (mediatomb-0.10.0.tar.gz) = 801bb34cc552b31e7bd873ab90b7af92cc8a473f1603265baf7c3b62a71a4877
+SIZE (mediatomb-0.10.0.tar.gz) = 910233
diff --git a/net/mediatomb/files/config.xml.dist.in b/net/mediatomb/files/config.xml.dist.in
index 7ad2d076d0e7..30d213e63088 100644
--- a/net/mediatomb/files/config.xml.dist.in
+++ b/net/mediatomb/files/config.xml.dist.in
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<config
-  xmlns="http://mediatomb.cc/0.9.1/config"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://mediatomb.cc/0.9.1/config http://mediatomb.cc/0.9.1/config.xsd">
+<config xmlns="http://mediatomb.cc/0.10.0/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/0.10.0/config http://mediatomb.cc/0.10.0/config.xsd">
   <server>
     <ui enabled="yes">
       <accounts enabled="no" session-timeout="30"/>
@@ -15,9 +12,13 @@
     </storage>
   </server>
   <import hidden-files="no">
-    <virtual-layout type="builtin">
-      <script>%%DATADIR%%/js/import.js</script>
-    </virtual-layout>
+    <scripting script-charset="UTF-8">
+      <common-script>%%DATADIR%%/js/common.js</common-script>
+      <playlist-script>%%DATADIR%%/js/playlists.js</playlist-script>
+      <virtual-layout type="builtin">
+        <import-script>%%DATADIR%%/js/import.js</import-script>
+      </virtual-layout>
+    </scripting>
     <mappings>
       <extension-mimetype ignore-unknown="no">
         <map from="mp3" to="audio/mpeg"/>
@@ -30,7 +31,8 @@
         <map from="wvx" to="video/x-ms-wvx"/>
         <map from="wm" to="video/x-ms-wm"/>
         <map from="wmx" to="video/x-ms-wmx"/>
-        <map from="wmx" to="video/x-ms-wmx"/>
+        <map from="m3u" to="audio/x-mpegurl"/>
+        <map from="pls" to="audio/x-scpls"/>
       </extension-mimetype>
       <mimetype-upnpclass>
         <map from="audio/*" to="object.item.audioItem.musicTrack"/>
@@ -43,6 +45,8 @@
         <treat mimetype="application/ogg" as="ogg"/>
         <treat mimetype="audio/x-flac" as="flac"/>
         <treat mimetype="image/jpeg" as="jpg"/>
+        <treat mimetype="audio/x-mpegurl" as="playlist"/>
+        <treat mimetype="audio/x-scpls" as="playlist"/>
       </mimetype-contenttype>
     </mappings>
   </import>
diff --git a/net/mediatomb/files/mediatomb.sh.in b/net/mediatomb/files/mediatomb.sh.in
index 04321431ba3a..1ee812143875 100644
--- a/net/mediatomb/files/mediatomb.sh.in
+++ b/net/mediatomb/files/mediatomb.sh.in
@@ -22,14 +22,21 @@ mediatomb_config=${mediatomb_config-"%%PREFIX%%/etc/mediatomb/config.xml"}
 mediatomb_flags=${mediatomb_flags-""}
 mediatomb_logfile=${mediatomb_logfile-"%%MEDIATOMB_DIR%%/mediatomb.log"}
 mediatomb_pidfile=${mediatomb_pidfile-"%%MEDIATOMB_DIR%%/mediatomb.pid"}
+mediatomb_interface=${mediatomb_interface-""}
 
 name="mediatomb"
 rcvar=`set_rcvar`
 
 load_rc_config $name
 
+if [ "xx" != "x${mediatomb_interface}x" ]; then
+    mediatomb_interface_command="-e ${mediatomb_interface}"
+else
+    mediatomb_interface_command=""
+fi
+
 command="%%PREFIX%%/bin/mediatomb"
-command_args="-d -c ${mediatomb_config} -l ${mediatomb_logfile} -u ${mediatomb_mtuser} -g ${mediatomb_mtgroup} -P ${mediatomb_pidfile}"
+command_args="-d -c ${mediatomb_config} -l ${mediatomb_logfile} -u ${mediatomb_mtuser} -g ${mediatomb_mtgroup} -P ${mediatomb_pidfile} ${mediatomb_interface_command}"
 
 pidfile="${mediatomb_pidfile}"
 
diff --git a/net/mediatomb/pkg-plist b/net/mediatomb/pkg-plist
index a715c4f27f3c..ba326abcb69e 100644
--- a/net/mediatomb/pkg-plist
+++ b/net/mediatomb/pkg-plist
@@ -1,6 +1,8 @@
 @comment $FreeBSD$
 bin/mediatomb
 %%DATADIR%%/js/import.js
+%%DATADIR%%/js/playlists.js
+%%DATADIR%%/js/common.js
 %%DATADIR%%/mappings.xml
 %%DATADIR%%/mysql.sql
 %%DATADIR%%/sqlite3.sql
@@ -9,8 +11,10 @@ bin/mediatomb
 %%DATADIR%%/web/disabled.html
 %%DATADIR%%/web/favicon.ico
 %%DATADIR%%/web/icons/add_as_autoscan.png
-%%DATADIR%%/web/icons/autoscan_config_folder_open.png
-%%DATADIR%%/web/icons/autoscan_folder_open.png
+%%DATADIR%%/web/icons/autoscan_inotify_config_folder_open.png
+%%DATADIR%%/web/icons/autoscan_inotify_folder_open.png
+%%DATADIR%%/web/icons/autoscan_timed_config_folder_open.png
+%%DATADIR%%/web/icons/autoscan_timed_folder_open.png
 %%DATADIR%%/web/icons/blank.gif
 %%DATADIR%%/web/icons/blank.png
 %%DATADIR%%/web/icons/document-new.png
@@ -31,10 +35,14 @@ bin/mediatomb
 %%DATADIR%%/web/icons/mt-icon48.bmp
 %%DATADIR%%/web/icons/mt-icon48.jpg
 %%DATADIR%%/web/icons/mt-icon48.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_config_folder_closed.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_config_folder_open.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_folder_closed.png
-%%DATADIR%%/web/icons/nanotree/images/autoscan_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_config_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_config_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_inotify_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_config_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_config_folder_open.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_folder_closed.png
+%%DATADIR%%/web/icons/nanotree/images/autoscan_timed_folder_open.png
 %%DATADIR%%/web/icons/nanotree/images/folder_closed.png
 %%DATADIR%%/web/icons/nanotree/images/folder_open.png
 %%DATADIR%%/web/icons/nanotree/images/lastnode.png