- Update to 3.0.0

- Convert to new OPTIONS framework

Submitted by:	Oliver Brandmueller <ob@e-Gitt.NET> (via private mail)

4 files changed, 24 insertions, 30 deletions

diff --git a/german/mediathek/Makefile b/german/mediathek/Makefile
index 13631597c585..5f84b5d41c82 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathek/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	mediathek
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 CATEGORIES=	german java
 MASTER_SITES=	SF/zdfmediathk/Mediathek/Mediathek%20${PORTVERSION}
-DISTNAME=	Mediathek_${PORTVERSION}
+DISTNAME=	MediathekView_${PORTVERSION}
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Filme der oeff. rechtlichen Sender herunterladen und ansehen
@@ -23,27 +22,25 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 SUB_FILES=	mediathek
 
-OPTIONS=	MPLAYER "mplayer zum Aufnehmen verwenden" on \
-		VLC "VLC zum Abspielen verwenden" on
+INSTALLFILES=	MediathekView.jar
+INSTALLDOCS=	Anleitung.pdf
+INSTALLLIBS=	commons-compress-1.4.jar commons-lang3-3.1.jar \
+		jdom-2.0.0.jar
 
-INSTALLFILES=	Mediathek.jar
-INSTALLDOCS=	make.txt releases.txt Kurzanleitung.pdf
-INSTALLLIBS=	commons-compress-1.1.jar commons-lang-2.5.jar \
-		jdom.jar rome-1.0.jar
+OPTIONS_MULTI=		BACKEND
+OPTIONS_MULTI_BACKEND=	MPLAYER VLC
 
-.include <bsd.port.pre.mk>
+VLC_DESC=		VLC support
 
-pre-everything::
-.if !defined(WITH_MPLAYER) && !defined(WITH_VLC)
-	@${ECHO_MSG} "Es muss entweder mplayer oder VLC ausgewaehlt sein"
-	@${FALSE}
-.endif
+OPTIONS_DEFAULT=	VLC
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MPLAYER)
+.if ${PORT_OPTIONS:MMPLAYER}
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 .endif
 
-.if defined(WITH_VLC)
+.if ${PORT_OPTIONS:MVLC}
 RUN_DEPENDS+=	vlc:${PORTSDIR}/multimedia/vlc
 .endif
 
@@ -61,7 +58,7 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${INSTALLDOCS}
-		@${INSTALL_DATA} ${WRKSRC}/Anleitung/${i} ${DOCSDIR}/
+		@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 .endif
 .for i in ${INSTALLLIBS}
@@ -69,4 +66,4 @@ do-install:
 .endfor
 	@${INSTALL_SCRIPT} ${WRKDIR}/mediathek ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/german/mediathek/distinfo b/german/mediathek/distinfo
index f1c9eeba3c84..d26dc6f66f7a 100644
--- a/german/mediathek/distinfo
+++ b/german/mediathek/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Mediathek_2.6.0.zip) = 7381aaa3e69059ff5ec1ae580b2a049c88e8a7a0cfdb5c643b8e59bd102ccd18
-SIZE (Mediathek_2.6.0.zip) = 1880966
+SHA256 (MediathekView_3.0.0.zip) = ea823797c62afc46d740425b703e3cf9515e48007708cada961fb6d97b19486e
+SIZE (MediathekView_3.0.0.zip) = 2043758
diff --git a/german/mediathek/files/mediathek.in b/german/mediathek/files/mediathek.in
index 230e55da4150..c2c416880786 100644
--- a/german/mediathek/files/mediathek.in
+++ b/german/mediathek/files/mediathek.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar Mediathek.jar "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar MediathekView.jar "$@"
 
diff --git a/german/mediathek/pkg-plist b/german/mediathek/pkg-plist
index 355e4df8b396..05c0edad1541 100644
--- a/german/mediathek/pkg-plist
+++ b/german/mediathek/pkg-plist
@@ -1,12 +1,9 @@
 bin/mediathek
-%%PORTDOCS%%%%DOCSDIR%%/Kurzanleitung.pdf
-%%PORTDOCS%%%%DOCSDIR%%/make.txt
-%%PORTDOCS%%%%DOCSDIR%%/releases.txt
-%%DATADIR%%/Mediathek.jar
-%%DATADIR%%/lib/commons-compress-1.1.jar
-%%DATADIR%%/lib/commons-lang-2.5.jar
-%%DATADIR%%/lib/jdom.jar
-%%DATADIR%%/lib/rome-1.0.jar
+%%PORTDOCS%%%%DOCSDIR%%/Anleitung.pdf
+%%DATADIR%%/MediathekView.jar
+%%DATADIR%%/lib/commons-compress-1.4.jar
+%%DATADIR%%/lib/commons-lang3-3.1.jar
+%%DATADIR%%/lib/jdom-2.0.0.jar
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%