- Update to 3.3.0

- Depend on Java 1.7+
- Support stage dir
- Use a single space for WWW

5 files changed, 32 insertions, 27 deletions

diff --git a/german/mediathek/Makefile b/german/mediathek/Makefile
index 35a4eda8cb3e..641233d4b8b0 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathek/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mediathek
-PORTVERSION=	3.1.0
-PORTREVISION=	2
+PORTVERSION=	3.3.0
 CATEGORIES=	german java
 MASTER_SITES=	SF/zdfmediathk/Mediathek/Mediathek%20${PORTVERSION}
 DISTNAME=	MediathekView_${PORTVERSION}
@@ -16,12 +15,11 @@ RUN_DEPENDS=	flvstreamer:${PORTSDIR}/multimedia/flvstreamer
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 SUB_FILES=	mediathek
 
 INSTALLFILES=	MediathekView.jar MediathekView.ico
-INSTALLDOCS=	Anleitung.pdf
-INSTALLLIBS=	commons-compress-1.4.jar commons-lang3-3.1.jar
+INSTALLDOCS=	Kurzanleitung.pdf Instructions.pdf
 
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	MPLAYER VLC
@@ -30,7 +28,6 @@ VLC_DESC=		VLC support
 
 OPTIONS_DEFAULT=	VLC
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMPLAYER}
@@ -54,20 +51,16 @@ do-extract:
 	@${UNZIP_CMD} -q -d ${WRKSRC} ${DISTDIR}/${EXTRACT_ONLY}
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${DATADIR}/lib
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 .for i in ${INSTALLFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}/
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}/
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${INSTALLDOCS}
-		@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+		@${INSTALL_DATA} ${WRKSRC}/Anleitung/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
-.for i in ${INSTALLLIBS}
-	@${INSTALL_DATA} ${WRKSRC}/lib/${i} ${DATADIR}/lib/
-.endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/mediathek ${PREFIX}/bin
+	@(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lib/)
+	@${INSTALL_SCRIPT} ${WRKDIR}/mediathek ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/german/mediathek/distinfo b/german/mediathek/distinfo
index cfce69cf6ee9..7041122c7d78 100644
--- a/german/mediathek/distinfo
+++ b/german/mediathek/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MediathekView_3.1.0.zip) = 9cd892762eae310965be0b910785ef65172b9a5ecacc5f09854994322d9ec921
-SIZE (MediathekView_3.1.0.zip) = 4343470
+SHA256 (MediathekView_3.3.0.zip) = d1d7029326dd0bda6bc90c382c8f4045a50e1391fbe246cbc4be062bd64bd7fa
+SIZE (MediathekView_3.3.0.zip) = 12839824
diff --git a/german/mediathek/files/mediathek.in b/german/mediathek/files/mediathek.in
index c2c416880786..43805f6b0664 100644
--- a/german/mediathek/files/mediathek.in
+++ b/german/mediathek/files/mediathek.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 cd %%DATADIR%%
-JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar MediathekView.jar "$@"
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
+    -Xms128M -Xmx1G -jar MediathekView.jar "$@"
 
diff --git a/german/mediathek/pkg-descr b/german/mediathek/pkg-descr
index 220e9043bb22..5974db6e41fc 100644
--- a/german/mediathek/pkg-descr
+++ b/german/mediathek/pkg-descr
@@ -7,4 +7,4 @@ Das Programm durchsucht die Mediathek verschiedener Sender (ARD, ZDF, Arte,
 kann Themen als Abos anlegen und neue Beitraege automatisch downloaden. Es gibt
 auch eine Moeglichkeit, Podcast zu verwalten und zu downloaden.
 
-WWW:	http://zdfmediathk.sourceforge.net/	
+WWW: http://zdfmediathk.sourceforge.net/	
diff --git a/german/mediathek/pkg-plist b/german/mediathek/pkg-plist
index 20a743cde2d3..ce0b7c840e26 100644
--- a/german/mediathek/pkg-plist
+++ b/german/mediathek/pkg-plist
@@ -1,9 +1,20 @@
 bin/mediathek
-%%PORTDOCS%%%%DOCSDIR%%/Anleitung.pdf
-%%DATADIR%%/MediathekView.jar
+%%PORTDOCS%%%%DOCSDIR%%/Instructions.pdf
+%%PORTDOCS%%%%DOCSDIR%%/Kurzanleitung.pdf
 %%DATADIR%%/MediathekView.ico
-%%DATADIR%%/lib/commons-compress-1.4.jar
+%%DATADIR%%/MediathekView.jar
+%%DATADIR%%/lib/commons-compress-1.4.1.jar
 %%DATADIR%%/lib/commons-lang3-3.1.jar
-@dirrm %%DATADIR%%/lib
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%DATADIR%%/lib/jgoodies-common-1.6.0-javadoc.jar
+%%DATADIR%%/lib/jgoodies-common-1.6.0-sources.jar
+%%DATADIR%%/lib/jgoodies-common-1.6.0.jar
+%%DATADIR%%/lib/jgoodies-forms-1.7.1-javadoc.jar
+%%DATADIR%%/lib/jgoodies-forms-1.7.1-sources.jar
+%%DATADIR%%/lib/jgoodies-forms-1.7.1.jar
+%%DATADIR%%/lib/jide-oss-3.5.1-sources.jar
+%%DATADIR%%/lib/jide-oss-3.5.1.jar
+%%DATADIR%%/lib/swingx-all-1.6.4-sources.jar
+%%DATADIR%%/lib/swingx-all-1.6.4.jar
+@dirrmtry %%DATADIR%%/lib
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%