- update tvbrowser to 2.5

- move out of /usr/X11R6 (USE_X_PREFIX)
- move from german to misc

Approved by:	lars.engels@0x20.net (maintainer), miwi (mentor)

(this time really in misc)

4 files changed, 15 insertions, 11 deletions

diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index dc01208ef67d..b4fcc1adbabb 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	tvbrowser
-PORTVERSION=	2.2.1
-CATEGORIES=	german java
+PORTVERSION=	2.5
+CATEGORIES=	misc java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	tvbrowser
 
 MAINTAINER=	lars.engels@0x20.net
 COMMENT=	A digital tv guide
 
-USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 SUB_FILES=	tvbrowser
 
 DESKTOP_ENTRIES="TV-Browser" \
diff --git a/misc/tvbrowser/distinfo b/misc/tvbrowser/distinfo
index 24b8992d6063..d72301aefcbc 100644
--- a/misc/tvbrowser/distinfo
+++ b/misc/tvbrowser/distinfo
@@ -1,3 +1,3 @@
-MD5 (tvbrowser-2.2.1.tar.gz) = d112e385f2b82efd7a20c97796e9b17e
-SHA256 (tvbrowser-2.2.1.tar.gz) = f0f88d9ec8c221e1be93d521900a194e5122beb5171a3533603ae04073b5c794
-SIZE (tvbrowser-2.2.1.tar.gz) = 2408456
+MD5 (tvbrowser-2.5.tar.gz) = 588e7978a133c9000f6e9061d0cde164
+SHA256 (tvbrowser-2.5.tar.gz) = 5b67690fd388e6f031daa700b92dc247b1632bde1fe070716939f822a3e10358
+SIZE (tvbrowser-2.5.tar.gz) = 2732000
diff --git a/misc/tvbrowser/pkg-descr b/misc/tvbrowser/pkg-descr
index fa12980f9c22..a08690a3d7e3 100644
--- a/misc/tvbrowser/pkg-descr
+++ b/misc/tvbrowser/pkg-descr
@@ -3,7 +3,7 @@ multiple sources and can be downloaded from our servers after
 having been automatically processed.
 
 Currently, TV-Browser supports tv and some radio channels from
-Germany, Austria and Switzerland.
+Germany, Austria and Switzerland, and the UK.
 
 WWW: http://www.tvbrowser.org
 
diff --git a/misc/tvbrowser/pkg-plist b/misc/tvbrowser/pkg-plist
index 5b32453881fe..edf13ab2feea 100644
--- a/misc/tvbrowser/pkg-plist
+++ b/misc/tvbrowser/pkg-plist
@@ -1,6 +1,6 @@
 bin/tvbrowser
-share/applications/tvbrowser.desktop
 %%DATADIR%%/LICENSE.txt
+%%DATADIR%%/enwiki.url
 %%DATADIR%%/forum.url
 %%DATADIR%%/icons/tango/16x16/actions/appointment-new.png
 %%DATADIR%%/icons/tango/16x16/actions/bookmark-new.png
@@ -128,10 +128,13 @@ share/applications/tvbrowser.desktop
 %%DATADIR%%/imgs/Info_BlackAndWhite.gif
 %%DATADIR%%/imgs/Info_DolbyDigital51.gif
 %%DATADIR%%/imgs/Info_DolbySurround.gif
+%%DATADIR%%/imgs/Info_HasPicture.png
 %%DATADIR%%/imgs/Info_Mono.gif
 %%DATADIR%%/imgs/Info_OriginalWithSubtitle.gif
+%%DATADIR%%/imgs/Info_OriginalWithSubtitle_EN.gif
 %%DATADIR%%/imgs/Info_Stereo.gif
 %%DATADIR%%/imgs/Info_SubtitleForAurallyHandicapped.gif
+%%DATADIR%%/imgs/Info_SubtitleForAurallyHandicapped_US.gif
 %%DATADIR%%/imgs/Info_TwoChannelTone.gif
 %%DATADIR%%/imgs/Jar16.gif
 %%DATADIR%%/imgs/TVBrowser.ico
@@ -157,11 +160,14 @@ share/applications/tvbrowser.desktop
 %%DATADIR%%/plugins/CapturePlugin.jar
 %%DATADIR%%/plugins/ClipboardPlugin.jar
 %%DATADIR%%/plugins/EMailPlugin.jar
+%%DATADIR%%/plugins/I18NPlugin.jar
 %%DATADIR%%/plugins/ListViewPlugin.jar
 %%DATADIR%%/plugins/NewsPlugin.jar
 %%DATADIR%%/plugins/PrintPlugin.jar
-%%DATADIR%%/plugins/SearchPlugin.jar
+%%DATADIR%%/plugins/RadioTimesDataService.jar
+%%DATADIR%%/plugins/SimpleMarkerPlugin.jar
 %%DATADIR%%/plugins/ShowviewPlugin.jar
+%%DATADIR%%/plugins/SweDBTvDataService.jar
 %%DATADIR%%/plugins/TVRaterPlugin.jar
 %%DATADIR%%/plugins/TvBrowserDataService.jar
 %%DATADIR%%/plugins/WebPlugin.jar
@@ -194,4 +200,3 @@ share/applications/tvbrowser.desktop
 @dirrm %%DATADIR%%/icons/tango
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
-@dirrm share/applications