german/mediathek:

- Rename the port to german/mediathekview to reflect upstream change (a long time ago)
- Update to 13.0.1
- Use upstream's Java start parameters in mediathekview.in
- Switch from .zip to .tar.gz distfile
- Add an OPTION for multimedia/mpv as player / backend
- Modernize OPTIONS

7 files changed, 28 insertions, 37 deletions

diff --git a/german/Makefile b/german/Makefile
index 219691497b5f..66534a29329f 100644
--- a/german/Makefile
+++ b/german/Makefile
@@ -20,7 +20,7 @@
     SUBDIR += jdictionary-ger-hun
     SUBDIR += kde4-l10n
     SUBDIR += libreoffice
-    SUBDIR += mediathek
+    SUBDIR += mediathekview
     SUBDIR += mythes
     SUBDIR += phone
     SUBDIR += php_doc
diff --git a/german/mediathek/distinfo b/german/mediathek/distinfo
deleted file mode 100644
index c2bcf85b6799..000000000000
--- a/german/mediathek/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1471200643
-SHA256 (MediathekView_12.zip) = 7a8767572657390831a39f0a1e6ce483cca589c56506a27c896f6fb39edd549a
-SIZE (MediathekView_12.zip) = 39389109
diff --git a/german/mediathek/Makefile b/german/mediathekview/Makefile
index 5314c5d38f5f..e02e615f9c6d 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathekview/Makefile
@@ -1,11 +1,11 @@
 # Created by: Lars Engels <lme@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	mediathek
-PORTVERSION=	12
+PORTNAME=	mediathekview
+PORTVERSION=	13.0.1
 CATEGORIES=	german java
-MASTER_SITES=	SF/zdfmediathk/Mediathek/Mediathek%20${PORTVERSION}
-DISTNAME=	MediathekView_${PORTVERSION}
+MASTER_SITES=	https://download.mediathekview.de/stabil/
+DISTNAME=	MediathekView-${PORTVERSION}
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Filme der oeff. rechtlichen Sender herunterladen und ansehen
@@ -14,44 +14,33 @@ RUN_DEPENDS=	${LOCALBASE}/openjdk8/bin/javafxpackager:java/openjfx8-devel \
 		flvstreamer:multimedia/flvstreamer
 
 NO_BUILD=	yes
-USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
-SUB_FILES=	mediathek
+SUB_FILES=	${PORTNAME}
 
 INSTALLFILES=	MediathekView.jar MediathekView.ico
 INSTALLDOCS=	Kurzanleitung.pdf Instructions.pdf
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_MULTI=		BACKEND
-OPTIONS_MULTI_BACKEND=	MPLAYER VLC
+OPTIONS_MULTI_BACKEND=	MPLAYER MPV VLC
 
 VLC_DESC=		VLC support
+MPV_DESC=		VLC support
 
 OPTIONS_DEFAULT=	VLC
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMPLAYER}
-RUN_DEPENDS+=	mplayer:multimedia/mplayer
-.endif
-
-.if ${PORT_OPTIONS:MVLC}
-RUN_DEPENDS+=	vlc:multimedia/vlc
-.endif
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MPV_RUN_DEPENDS=	mpv:multimedia/mpv
+VLC_RUN_DEPENDS=	vlc:multimedia/vlc
 
 DESKTOP_ENTRIES="MediathekView" \
 		"Filme der oeff. rechtlichen Sender herunterladen und ansehen" \
 		"${DATADIR}/MediathekView.ico" \
-		"mediathek" \
+		"${PORTNAME}" \
 		"Video;AudioVideo;Java;" \
 		false
 
-do-extract:
-	@${RM} -r ${WRKDIR}
-	@${MKDIR} ${WRKSRC}
-	@${UNZIP_CMD} -q -d ${WRKSRC} ${DISTDIR}/${EXTRACT_ONLY}
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
@@ -63,6 +52,6 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/Anleitung/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lib/)
-	${INSTALL_SCRIPT} ${WRKDIR}/mediathek ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/german/mediathekview/distinfo b/german/mediathekview/distinfo
new file mode 100644
index 000000000000..c3317372b0ae
--- /dev/null
+++ b/german/mediathekview/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1487606056
+SHA256 (MediathekView-13.0.1.tar.gz) = a5a7187e2ab50617bf641ca058b05432f7dfb3934136884c3dcc9657cec0d912
+SIZE (MediathekView-13.0.1.tar.gz) = 27399095
diff --git a/german/mediathek/files/mediathek.in b/german/mediathekview/files/mediathekview.in
index 43805f6b0664..db1fd5db8bf3 100644
--- a/german/mediathek/files/mediathek.in
+++ b/german/mediathekview/files/mediathekview.in
@@ -2,5 +2,5 @@
 
 cd %%DATADIR%%
 JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
-    -Xms128M -Xmx1G -jar MediathekView.jar "$@"
+    -jar MediathekView.jar "$@"
 
diff --git a/german/mediathek/pkg-descr b/german/mediathekview/pkg-descr
index e1cb2e9c5c97..e1cb2e9c5c97 100644
--- a/german/mediathek/pkg-descr
+++ b/german/mediathekview/pkg-descr
diff --git a/german/mediathek/pkg-plist b/german/mediathekview/pkg-plist
index bfd2f349a219..ef270350838f 100644
--- a/german/mediathek/pkg-plist
+++ b/german/mediathekview/pkg-plist
@@ -1,16 +1,17 @@
-bin/mediathek
+bin/mediathekview
 %%PORTDOCS%%%%DOCSDIR%%/Instructions.pdf
 %%PORTDOCS%%%%DOCSDIR%%/Kurzanleitung.pdf
 %%DATADIR%%/MediathekView.ico
 %%DATADIR%%/MediathekView.jar
-%%DATADIR%%/lib/MSearch.jar
-%%DATADIR%%/lib/commons-compress-1.12.jar
-%%DATADIR%%/lib/commons-lang3-3.4.jar
+%%DATADIR%%/lib/MSearch-2.1.1.jar
+%%DATADIR%%/lib/commons-io-1.3.1.jar
+%%DATADIR%%/lib/commons-lang3-3.5.jar
+%%DATADIR%%/lib/commons-logging-1.0.4.jar
 %%DATADIR%%/lib/jackson-core-2.7.0.jar
-%%DATADIR%%/lib/jchart2d-3.2.2.jar
-%%DATADIR%%/lib/jgoodies-common-1.8.0.jar
-%%DATADIR%%/lib/jgoodies-forms-1.8.0.jar
-%%DATADIR%%/lib/jide-oss-3.6.1.jar
+%%DATADIR%%/lib/jchart2d-3.3.2.jar
+%%DATADIR%%/lib/jgoodies-common-1.8.1.jar
+%%DATADIR%%/lib/jgoodies-forms-1.9.0.jar
+%%DATADIR%%/lib/jide-oss-3.6.16.jar
 %%DATADIR%%/lib/swingx-action-1.6.6-SNAPSHOT.jar
 %%DATADIR%%/lib/swingx-autocomplete-1.6.6-SNAPSHOT.jar
 %%DATADIR%%/lib/swingx-beaninfo-1.6.6-SNAPSHOT.jar
@@ -19,4 +20,5 @@ bin/mediathek
 %%DATADIR%%/lib/swingx-graphics-1.6.6-SNAPSHOT.jar
 %%DATADIR%%/lib/swingx-painters-1.6.6-SNAPSHOT.jar
 %%DATADIR%%/lib/swingx-plaf-1.6.6-SNAPSHOT.jar
-%%DATADIR%%/lib/xz.jar
+%%DATADIR%%/lib/xmlgraphics-commons-1.3.1.jar
+%%DATADIR%%/lib/xz-1.5.jar