5 files changed, 50 insertions, 89 deletions

diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index 4c6fc115e090..52329d08f418 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -6,34 +6,22 @@
 #
 
 PORTNAME=	tvbrowser
-PORTVERSION=	1.0
+PORTVERSION=	2.1
 CATEGORIES=	german java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	tvbrowser
-DISTNAME=	tvbrowser_v1.0_bin
 
 MAINTAINER=	lars.engels@0x20.net
 COMMENT=	A digital tv guide
 
-EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
-USE_ZIP=	yes
 NO_BUILD=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/${PORTNAME}
-	@${CP} -r ${WRKSRC}/tvbrowser_v1.0/* ${PREFIX}/share/${PORTNAME}
+	@${CP} -r ${WRKSRC}/* ${PREFIX}/share/${PORTNAME}
 	@${CP} -r ${FILESDIR}/tvbrowser /${PREFIX}/bin/
 	@${CHMOD} 755 /${PREFIX}/bin/tvbrowser
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/${PORTNAME}/tvdata
-	@${MKDIR} /var/tvbrowser/tvdata
-	@${CHMOD} 777 /var/tvbrowser/tvdata
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/misc/tvbrowser/distinfo b/misc/tvbrowser/distinfo
index 2520b5aa7084..0668158ef5ac 100644
--- a/misc/tvbrowser/distinfo
+++ b/misc/tvbrowser/distinfo
@@ -1,2 +1,3 @@
-MD5 (tvbrowser_v1.0_bin.zip) = b27d85ead880b2d7a07e69e5f46775fc
-SIZE (tvbrowser_v1.0_bin.zip) = 1060069
+MD5 (tvbrowser-2.1.tar.gz) = 59367e4242e5c75fd86e01d4b98710d0
+SHA256 (tvbrowser-2.1.tar.gz) = 7ddf0a34369f8a8cb856cd4d67d7cc45cd3a6489abee8c5e772e454272744d16
+SIZE (tvbrowser-2.1.tar.gz) = 1749103
diff --git a/misc/tvbrowser/files/pkg-message.in b/misc/tvbrowser/files/pkg-message.in
deleted file mode 100644
index 145b011921cf..000000000000
--- a/misc/tvbrowser/files/pkg-message.in
+++ /dev/null
@@ -1,30 +0,0 @@
-************************************************************
-
-Check if %%PREFIX%%/bin/java exists. If not, create a link:
-
-       ln -s %%PREFIX%%/bin/javavm %%PREFIX%%/bin/java
-
-or change the start script %%PREFIX%%/bin/tvbrowser
-
-
-    
-               !!!    IMPORTANT    !!!
-
-In order to use TV Browser as a regular user you have to do
-the following:
-
-1. As the regular user run tvbrowser
-
-2. Cancel the Setup Assistant
-
-3. Do not update the tv data
-
-4. Click on the Settings button
-
-5. Select Advanced | Directories and enter 
-   
-   /var/tvbrowser/tvdata 
-
-6. Restart TV Browser and have fun
-
-************************************************************
diff --git a/misc/tvbrowser/pkg-descr b/misc/tvbrowser/pkg-descr
index 935b5ba16f62..7a8eb01b9913 100644
--- a/misc/tvbrowser/pkg-descr
+++ b/misc/tvbrowser/pkg-descr
@@ -3,9 +3,9 @@ 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 Swiss.
+Germany, Austria and Switzerland.
 
 WWW: http://www.tvbrowser.org
 
 - Lars Engels
-lars@0x20.net
++lars.engels@0x20.net
diff --git a/misc/tvbrowser/pkg-plist b/misc/tvbrowser/pkg-plist
index ceb5bda480d8..538dbf8ad241 100644
--- a/misc/tvbrowser/pkg-plist
+++ b/misc/tvbrowser/pkg-plist
@@ -1,37 +1,25 @@
 bin/tvbrowser
-%%DATADIR%%/INSTALL.txt
 %%DATADIR%%/LICENSE.txt
-%%DATADIR%%/help/de/Forward24.gif
-%%DATADIR%%/help/de/about.html
-%%DATADIR%%/help/de/assistant.html
-%%DATADIR%%/help/de/deinstallation.html
-%%DATADIR%%/help/de/faq.html
-%%DATADIR%%/help/de/img01.png
-%%DATADIR%%/help/de/img02.png
-%%DATADIR%%/help/de/img03.png
-%%DATADIR%%/help/de/img04.png
-%%DATADIR%%/help/de/img05.png
-%%DATADIR%%/help/de/img06.png
-%%DATADIR%%/help/de/img07.png
-%%DATADIR%%/help/de/img08.png
-%%DATADIR%%/help/de/img09.png
-%%DATADIR%%/help/de/index.html
-%%DATADIR%%/help/de/installation.html
-%%DATADIR%%/help/de/main.html
-%%DATADIR%%/help/de/navigation.html
-%%DATADIR%%/help/de/online.html
-%%DATADIR%%/help/de/settings.html
-%%DATADIR%%/help/default/index.html
-%%DATADIR%%/help/style.css
+%%DATADIR%%/forum.url
 %%DATADIR%%/imgs/About16.gif
+%%DATADIR%%/imgs/About24.gif
 %%DATADIR%%/imgs/Back24.gif
+%%DATADIR%%/imgs/Bookmarks16.gif
+%%DATADIR%%/imgs/Bookmarks24.gif
+%%DATADIR%%/imgs/Delete16.gif
+%%DATADIR%%/imgs/Delete24.gif
 %%DATADIR%%/imgs/Down24.gif
 %%DATADIR%%/imgs/Export16.gif
+%%DATADIR%%/imgs/Filter16.png
+%%DATADIR%%/imgs/Filter24.png
+%%DATADIR%%/imgs/FilterSet16.png
+%%DATADIR%%/imgs/FilterSet24.png
 %%DATADIR%%/imgs/Find24.gif
 %%DATADIR%%/imgs/Forward24.gif
 %%DATADIR%%/imgs/Help16.gif
 %%DATADIR%%/imgs/Host16.gif
 %%DATADIR%%/imgs/Import16.gif
+%%DATADIR%%/imgs/Import24.gif
 %%DATADIR%%/imgs/Info_16to9.gif
 %%DATADIR%%/imgs/Info_BlackAndWhite.gif
 %%DATADIR%%/imgs/Info_DolbyDigital51.gif
@@ -42,17 +30,24 @@ bin/tvbrowser
 %%DATADIR%%/imgs/Info_SubtitleForAurallyHandicapped.gif
 %%DATADIR%%/imgs/Info_TwoChannelTone.gif
 %%DATADIR%%/imgs/Jar16.gif
+%%DATADIR%%/imgs/New16.gif
+%%DATADIR%%/imgs/New24.gif
 %%DATADIR%%/imgs/Open16.gif
+%%DATADIR%%/imgs/Play16.gif
+%%DATADIR%%/imgs/Play24.gif
 %%DATADIR%%/imgs/Preferences16.gif
 %%DATADIR%%/imgs/Preferences24.gif
 %%DATADIR%%/imgs/Refresh16.gif
 %%DATADIR%%/imgs/Refresh24.gif
 %%DATADIR%%/imgs/Search16.gif
+%%DATADIR%%/imgs/SendToPlugin.png
+%%DATADIR%%/imgs/SendToPlugin24.png
+%%DATADIR%%/imgs/Server16.gif
+%%DATADIR%%/imgs/StepForward16.gif
+%%DATADIR%%/imgs/StepForward24.gif
+%%DATADIR%%/imgs/Stop16.gif
 %%DATADIR%%/imgs/Stop24.gif
 %%DATADIR%%/imgs/TVBrowser.ico
-%%DATADIR%%/imgs/TVBrowser16.gif
-%%DATADIR%%/imgs/TVBrowser16.png
-%%DATADIR%%/imgs/TVBrowser32.gif
 %%DATADIR%%/imgs/TimeEarly24.gif
 %%DATADIR%%/imgs/TimeEvening24.gif
 %%DATADIR%%/imgs/TimeMidday24.gif
@@ -62,20 +57,31 @@ bin/tvbrowser
 %%DATADIR%%/imgs/WebComponent16.gif
 %%DATADIR%%/imgs/background.jpg
 %%DATADIR%%/imgs/background2.jpg
+%%DATADIR%%/imgs/beanshell.png
 %%DATADIR%%/imgs/columns2.jpg
 %%DATADIR%%/imgs/columns_afternoon.jpg
 %%DATADIR%%/imgs/columns_early.jpg
 %%DATADIR%%/imgs/columns_edge.jpg
 %%DATADIR%%/imgs/columns_evening.jpg
 %%DATADIR%%/imgs/columns_midday.jpg
+%%DATADIR%%/imgs/desktop.ico
 %%DATADIR%%/imgs/down16.gif
 %%DATADIR%%/imgs/more.png
-%%DATADIR%%/imgs/splash.jpg
-%%DATADIR%%/imgs/tvabout.jpg
+%%DATADIR%%/imgs/splash.png
+%%DATADIR%%/imgs/systray.ico
+%%DATADIR%%/imgs/tvabout.png
+%%DATADIR%%/imgs/tvbrowser128.png
+%%DATADIR%%/imgs/tvbrowser16.png
+%%DATADIR%%/imgs/tvbrowser32.png
+%%DATADIR%%/imgs/tvbrowser48.png
 %%DATADIR%%/imgs/up16.gif
+%%DATADIR%%/libDesktopIndicator.so
+%%DATADIR%%/linux.properties
+%%DATADIR%%/plugins/CalendarExportPlugin.jar
+%%DATADIR%%/plugins/CapturePlugin.jar
+%%DATADIR%%/plugins/ClipboardPlugin.jar
+%%DATADIR%%/plugins/EMailPlugin.jar
 %%DATADIR%%/plugins/FavoritesPlugin.jar
-%%DATADIR%%/plugins/GoogleSearchPlugin.jar
-%%DATADIR%%/plugins/ImdbSearchPlugin.jar
 %%DATADIR%%/plugins/ListViewPlugin.jar
 %%DATADIR%%/plugins/NewsPlugin.jar
 %%DATADIR%%/plugins/PrintPlugin.jar
@@ -84,18 +90,14 @@ bin/tvbrowser
 %%DATADIR%%/plugins/SearchPlugin.jar
 %%DATADIR%%/plugins/ShowviewPlugin.jar
 %%DATADIR%%/plugins/TVRaterPlugin.jar
+%%DATADIR%%/plugins/TvBrowserDataService.jar
+%%DATADIR%%/plugins/WebPlugin.jar
 %%DATADIR%%/themepacks/themepack.zip
 %%DATADIR%%/tvbrowser.jar
-%%DATADIR%%/tvdataservice/TvBrowserDataService.jar
+%%DATADIR%%/tvbrowser.sh
 %%DATADIR%%/website.url
-@dirrm %%DATADIR%%/tvdataservice
-@dirrm %%DATADIR%%/themepacks
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/imgs
-@dirrm %%DATADIR%%/help/default
-@dirrm %%DATADIR%%/help/de
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/tvdata
-@unexec rmdir /var/tvbrowser/tvdata
-@unexec rmdir /var/tvbrowser
+%%DATADIR%%/wiki.url
+@dirrm share/tvbrowser/themepacks
+@dirrm share/tvbrowser/plugins
+@dirrm share/tvbrowser/imgs
 @dirrm share/tvbrowser