- Update to 3.3

- Use upstream desktop file
- Update pkg-descr and COMMENT
- Trim Makefile header

4 files changed, 18 insertions, 23 deletions

diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index cf09573d0f94..d9d267b73a5e 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -1,19 +1,14 @@
-# New ports collection makefile for:	tvbrowser
-# Date Created:				24 May 2005
-# Whom:					Lars Engels <lars.engels@0x20.net>
-#
+# Created by: Lars Engels <lars.engels@0x20.net>
 # $FreeBSD$
-#
 
 PORTNAME=	tvbrowser
-PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	misc java
 MASTER_SITES=	SF/${PORTNAME}/TV-Browser%20Releases%20%28Java%206%20and%20higher%29/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_bin
 
 MAINTAINER=	lme@FreeBSD.org
-COMMENT=	Digital TV guide
+COMMENT=	Digital TV and radio guide
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_LDCONFIG=	yes
@@ -22,14 +17,11 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 SUB_FILES=	tvbrowser
 
-DESKTOP_ENTRIES="TV-Browser" \
-		"${COMMENT}" \
-		"${DATADIR}/imgs/tvbrowser128.png" \
-		"tvbrowser" \
-		"Video;AudioVideo;TV;Java;" \
-		true
-
 do-install:
+	@${MKDIR} ${PREFIX}/share/applications/
+	@${REINPLACE_CMD} -e "s/${PORTNAME}\.sh/${PORTNAME}/" ${WRKSRC}/${PORTNAME}.desktop
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications/
+	@${RM} ${WRKSRC}/${PORTNAME}.desktop ${WRKSRC}/${PORTNAME}.desktop.bak
 	@cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} "${DATADIR}/{}" \;
 	@cd ${WRKSRC} && ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 	@${INSTALL_SCRIPT} ${WRKDIR}/tvbrowser ${PREFIX}/bin
diff --git a/misc/tvbrowser/distinfo b/misc/tvbrowser/distinfo
index 926a1989ea2d..c40383ede96f 100644
--- a/misc/tvbrowser/distinfo
+++ b/misc/tvbrowser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tvbrowser_3.2.1_bin.tar.gz) = 2f245fce7ee86d52c3ef39a7041015c8766d324c574505cb74257b0ed887095f
-SIZE (tvbrowser_3.2.1_bin.tar.gz) = 6641325
+SHA256 (tvbrowser_3.3_bin.tar.gz) = 844a4031b6cd30ad43051c1ad37f00f884a8f9bc95ed7fb03026988c7f613a9d
+SIZE (tvbrowser_3.3_bin.tar.gz) = 6980712
diff --git a/misc/tvbrowser/pkg-descr b/misc/tvbrowser/pkg-descr
index 8293ba522535..4fb082b6e6bc 100644
--- a/misc/tvbrowser/pkg-descr
+++ b/misc/tvbrowser/pkg-descr
@@ -1,8 +1,10 @@
-TV-Browser is a digital tv guide. The tv data are retrieved from
-multiple sources and can be downloaded from our servers after
-having been automatically processed.
+TV-Browser gets the daily TV program from the internet and shows it clearly
+aranged - like a printed TV guide. An internet connection is only necessary
+during the data update.
 
-Currently, TV-Browser supports tv and some radio channels from
-Germany, Austria and Switzerland, and the UK.
+Currently, TV-Browser supports more than 1000 TV and radio channels from
+Australia, Austria, Belgium, Croatia, Czech Repulic, Denmark, France, Germany,
+Great Britain, Ireland, Italy, Norway, Poland, Spain, Sweden,
+Switzerland and the USA.
 
 WWW: http://www.tvbrowser.org
diff --git a/misc/tvbrowser/pkg-plist b/misc/tvbrowser/pkg-plist
index 931dfa3d1311..7727ef9458d4 100644
--- a/misc/tvbrowser/pkg-plist
+++ b/misc/tvbrowser/pkg-plist
@@ -1,4 +1,5 @@
 bin/tvbrowser
+share/applications/tvbrowser.desktop
 %%DATADIR%%/COPYRIGHT.txt
 %%DATADIR%%/LICENSE.txt
 %%DATADIR%%/enwiki.url
@@ -70,7 +71,6 @@ bin/tvbrowser
 %%DATADIR%%/personas/ecb70d5c-f606-4052-9059-5c501842d6c3/persona.prop
 %%DATADIR%%/plugins/NewsPlugin.jar
 %%DATADIR%%/themepacks/themepack.zip
-%%DATADIR%%/tvbrowser.desktop
 %%DATADIR%%/tvbrowser.jar
 %%DATADIR%%/tvbrowser.sh
 %%DATADIR%%/website.url
@@ -85,3 +85,4 @@ bin/tvbrowser
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/hyphen
 @dirrm %%DATADIR%%
+@dirrmtry share/applications