- Update to 2.6

- Use SF macro
- Add to virtual java category

Approved by:	miwi (mentor)

3 files changed, 40 insertions, 7 deletions

diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index b0f8a9abc51c..f500bbf43910 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	tvbrowser
-PORTVERSION=	2.5.3
-CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	tvbrowser
+PORTVERSION=	2.6
+CATEGORIES=	misc java
+MASTER_SITES=	SF
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	A digital TV guide
diff --git a/misc/tvbrowser/distinfo b/misc/tvbrowser/distinfo
index ebc10926cd62..3dfe22443e38 100644
--- a/misc/tvbrowser/distinfo
+++ b/misc/tvbrowser/distinfo
@@ -1,3 +1,3 @@
-MD5 (tvbrowser-2.5.3.tar.gz) = ad6a7015ff83eea98495f7b11080b764
-SHA256 (tvbrowser-2.5.3.tar.gz) = 3742eb30a8f4919a45a8cac319b20845f510e791d9a4e11c0e435353af5d380d
-SIZE (tvbrowser-2.5.3.tar.gz) = 2982703
+MD5 (tvbrowser-2.6.tar.gz) = 5ec998351ced19a58fe52a5bc1cd485c
+SHA256 (tvbrowser-2.6.tar.gz) = ac21b14caddb617a7b9fcb209838519c9315547f1c9d2ffcbf1bcf0491cab1de
+SIZE (tvbrowser-2.6.tar.gz) = 3283555
diff --git a/misc/tvbrowser/pkg-plist b/misc/tvbrowser/pkg-plist
index 1206032cab6d..b6265ba1e0f9 100644
--- a/misc/tvbrowser/pkg-plist
+++ b/misc/tvbrowser/pkg-plist
@@ -17,28 +17,37 @@ bin/tvbrowser
 %%DATADIR%%/icons/tango/16x16/actions/edit-find.png
 %%DATADIR%%/icons/tango/16x16/actions/edit-paste.png
 %%DATADIR%%/icons/tango/16x16/actions/edit-undo.png
+%%DATADIR%%/icons/tango/16x16/actions/folder-new.png
+%%DATADIR%%/icons/tango/16x16/actions/format-justify-fill.png
 %%DATADIR%%/icons/tango/16x16/actions/go-down.png
 %%DATADIR%%/icons/tango/16x16/actions/go-next.png
 %%DATADIR%%/icons/tango/16x16/actions/go-previous.png
+%%DATADIR%%/icons/tango/16x16/actions/go-to-date-list.png
 %%DATADIR%%/icons/tango/16x16/actions/go-to-date.png
 %%DATADIR%%/icons/tango/16x16/actions/go-to-next-day.png
 %%DATADIR%%/icons/tango/16x16/actions/go-to-previous-day.png
 %%DATADIR%%/icons/tango/16x16/actions/go-to-today.png
 %%DATADIR%%/icons/tango/16x16/actions/go-up.png
+%%DATADIR%%/icons/tango/16x16/actions/list-remove.png
 %%DATADIR%%/icons/tango/16x16/actions/mail-message-new.png
 %%DATADIR%%/icons/tango/16x16/actions/media-playback-start.png
 %%DATADIR%%/icons/tango/16x16/actions/media-seek-forward.png
 %%DATADIR%%/icons/tango/16x16/actions/process-stop.png
+%%DATADIR%%/icons/tango/16x16/actions/scroll-to-channel-list.png
 %%DATADIR%%/icons/tango/16x16/actions/scroll-to-channel.png
 %%DATADIR%%/icons/tango/16x16/actions/scroll-to-now.png
 %%DATADIR%%/icons/tango/16x16/actions/scroll-to-specific-time.png
+%%DATADIR%%/icons/tango/16x16/actions/scroll-to-time-list.png
 %%DATADIR%%/icons/tango/16x16/actions/scroll-to-time.png
+%%DATADIR%%/icons/tango/16x16/actions/sort-list-numerical.png
 %%DATADIR%%/icons/tango/16x16/actions/sort-list.png
 %%DATADIR%%/icons/tango/16x16/actions/system-search.png
 %%DATADIR%%/icons/tango/16x16/actions/view-filter.png
+%%DATADIR%%/icons/tango/16x16/actions/view-fullscreen.png
 %%DATADIR%%/icons/tango/16x16/actions/view-list.png
 %%DATADIR%%/icons/tango/16x16/actions/view-plugins.png
 %%DATADIR%%/icons/tango/16x16/actions/view-refresh.png
+%%DATADIR%%/icons/tango/16x16/actions/view-tree.png
 %%DATADIR%%/icons/tango/16x16/actions/web-search.png
 %%DATADIR%%/icons/tango/16x16/actions/zoom-in.png
 %%DATADIR%%/icons/tango/16x16/actions/zoom-out.png
@@ -53,10 +62,12 @@ bin/tvbrowser
 %%DATADIR%%/icons/tango/16x16/apps/preferences-desktop-theme.png
 %%DATADIR%%/icons/tango/16x16/apps/preferences-desktop-wallpaper.png
 %%DATADIR%%/icons/tango/16x16/apps/preferences-system-network-proxy.png
+%%DATADIR%%/icons/tango/16x16/apps/system-file-manager.png
 %%DATADIR%%/icons/tango/16x16/apps/system-software-update.png
 %%DATADIR%%/icons/tango/16x16/categories/preferences-desktop.png
 %%DATADIR%%/icons/tango/16x16/devices/input-mouse.png
 %%DATADIR%%/icons/tango/16x16/devices/printer.png
+%%DATADIR%%/icons/tango/16x16/emblems/emblem-important.png
 %%DATADIR%%/icons/tango/16x16/emblems/emblem-symbolic-link.png
 %%DATADIR%%/icons/tango/16x16/mimetypes/image-x-generic.png
 %%DATADIR%%/icons/tango/16x16/mimetypes/video-x-generic.png
@@ -64,7 +75,9 @@ bin/tvbrowser
 %%DATADIR%%/icons/tango/16x16/status/dialog-information.png
 %%DATADIR%%/icons/tango/16x16/status/dialog-warning.png
 %%DATADIR%%/icons/tango/16x16/status/folder-open.png
+%%DATADIR%%/icons/tango/16x16/status/mail-attachment.png
 %%DATADIR%%/icons/tango/16x16/status/network-transmit-receive.png
+%%DATADIR%%/icons/tango/16x16/status/software-update-available.png
 %%DATADIR%%/icons/tango/16x16/status/view-filter-set.png
 %%DATADIR%%/icons/tango/22x22/actions/appointment-new.png
 %%DATADIR%%/icons/tango/22x22/actions/document-edit.png
@@ -79,11 +92,13 @@ bin/tvbrowser
 %%DATADIR%%/icons/tango/22x22/actions/edit-find.png
 %%DATADIR%%/icons/tango/22x22/actions/edit-paste.png
 %%DATADIR%%/icons/tango/22x22/actions/edit-undo.png
+%%DATADIR%%/icons/tango/22x22/actions/folder-new.png
 %%DATADIR%%/icons/tango/22x22/actions/format-justify-fill.png
 %%DATADIR%%/icons/tango/22x22/actions/go-bottom.png
 %%DATADIR%%/icons/tango/22x22/actions/go-down.png
 %%DATADIR%%/icons/tango/22x22/actions/go-next.png
 %%DATADIR%%/icons/tango/22x22/actions/go-previous.png
+%%DATADIR%%/icons/tango/22x22/actions/go-to-date-list.png
 %%DATADIR%%/icons/tango/22x22/actions/go-to-date.png
 %%DATADIR%%/icons/tango/22x22/actions/go-to-next-day.png
 %%DATADIR%%/icons/tango/22x22/actions/go-to-previous-day.png
@@ -94,16 +109,21 @@ bin/tvbrowser
 %%DATADIR%%/icons/tango/22x22/actions/media-playback-start.png
 %%DATADIR%%/icons/tango/22x22/actions/media-seek-forward.png
 %%DATADIR%%/icons/tango/22x22/actions/process-stop.png
+%%DATADIR%%/icons/tango/22x22/actions/scroll-to-channel-list.png
 %%DATADIR%%/icons/tango/22x22/actions/scroll-to-channel.png
 %%DATADIR%%/icons/tango/22x22/actions/scroll-to-now.png
 %%DATADIR%%/icons/tango/22x22/actions/scroll-to-specific-time.png
+%%DATADIR%%/icons/tango/22x22/actions/scroll-to-time-list.png
 %%DATADIR%%/icons/tango/22x22/actions/scroll-to-time.png
+%%DATADIR%%/icons/tango/22x22/actions/sort-list-numerical.png
 %%DATADIR%%/icons/tango/22x22/actions/sort-list.png
 %%DATADIR%%/icons/tango/22x22/actions/system-search.png
+%%DATADIR%%/icons/tango/22x22/actions/view-filter-list.png
 %%DATADIR%%/icons/tango/22x22/actions/view-filter.png
 %%DATADIR%%/icons/tango/22x22/actions/view-list.png
 %%DATADIR%%/icons/tango/22x22/actions/view-plugins.png
 %%DATADIR%%/icons/tango/22x22/actions/view-refresh.png
+%%DATADIR%%/icons/tango/22x22/actions/view-tree.png
 %%DATADIR%%/icons/tango/22x22/actions/web-search.png
 %%DATADIR%%/icons/tango/22x22/actions/zoom-in.png
 %%DATADIR%%/icons/tango/22x22/actions/zoom-out.png
@@ -120,11 +140,14 @@ bin/tvbrowser
 %%DATADIR%%/icons/tango/22x22/apps/system-software-update.png
 %%DATADIR%%/icons/tango/22x22/categories/preferences-desktop.png
 %%DATADIR%%/icons/tango/22x22/devices/printer.png
+%%DATADIR%%/icons/tango/22x22/emblems/emblem-important.png
 %%DATADIR%%/icons/tango/22x22/emblems/emblem-symbolic-link.png
 %%DATADIR%%/icons/tango/22x22/mimetypes/video-x-generic.png
 %%DATADIR%%/icons/tango/22x22/status/dialog-information.png
 %%DATADIR%%/icons/tango/22x22/status/folder-open.png
+%%DATADIR%%/icons/tango/22x22/status/mail-attachment.png
 %%DATADIR%%/icons/tango/22x22/status/network-transmit-receive.png
+%%DATADIR%%/icons/tango/22x22/status/view-filter-set-list.png
 %%DATADIR%%/icons/tango/22x22/status/view-filter-set.png
 %%DATADIR%%/icons/tango/index.theme
 %%DATADIR%%/icons/tango/license.txt
@@ -134,13 +157,21 @@ bin/tvbrowser
 %%DATADIR%%/imgs/FilterSet16.png
 %%DATADIR%%/imgs/FilterSet22.png
 %%DATADIR%%/imgs/Info_16to9.gif
+%%DATADIR%%/imgs/Info_AudioDescription.png
 %%DATADIR%%/imgs/Info_BlackAndWhite.gif
 %%DATADIR%%/imgs/Info_DolbyDigital51.gif
 %%DATADIR%%/imgs/Info_DolbySurround.gif
 %%DATADIR%%/imgs/Info_HasPicture.png
+%%DATADIR%%/imgs/Info_Infotainment.png
+%%DATADIR%%/imgs/Info_Live.png
 %%DATADIR%%/imgs/Info_Mono.gif
+%%DATADIR%%/imgs/Info_Movie.png
+%%DATADIR%%/imgs/Info_New.png
+%%DATADIR%%/imgs/Info_News.png
 %%DATADIR%%/imgs/Info_OriginalWithSubtitle.gif
 %%DATADIR%%/imgs/Info_OriginalWithSubtitle_EN.gif
+%%DATADIR%%/imgs/Info_Series.png
+%%DATADIR%%/imgs/Info_Show.png
 %%DATADIR%%/imgs/Info_Stereo.gif
 %%DATADIR%%/imgs/Info_SubtitleForAurallyHandicapped.gif
 %%DATADIR%%/imgs/Info_SubtitleForAurallyHandicapped_US.gif
@@ -169,7 +200,9 @@ bin/tvbrowser
 %%DATADIR%%/plugins/CapturePlugin.jar
 %%DATADIR%%/plugins/ClipboardPlugin.jar
 %%DATADIR%%/plugins/EMailPlugin.jar
+%%DATADIR%%/plugins/GenrePlugin.jar
 %%DATADIR%%/plugins/I18NPlugin.jar
+%%DATADIR%%/plugins/KNotifyPlugin.jar
 %%DATADIR%%/plugins/ListViewPlugin.jar
 %%DATADIR%%/plugins/NewsPlugin.jar
 %%DATADIR%%/plugins/PrintPlugin.jar
@@ -209,3 +242,4 @@ bin/tvbrowser
 @dirrm %%DATADIR%%/icons/tango
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%
+@dirrmtry share/applications