6 files changed, 48 insertions, 31 deletions

diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index b47cd0098017..de0dc08aaa32 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -3,30 +3,33 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/ontv/Makefile,v 1.3 2006/10/08 16:50:42 mezz Exp $
+#   $MCom: ports/deskutils/ontv/Makefile,v 1.5 2007/02/18 19:18:34 mezz Exp $
 #
 
 PORTNAME=	ontv
-PORTVERSION=	2.2.0
-PORTREVISION=	2
-CATEGORIES=	deskutils
+PORTVERSION=	2.4.0
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME Applet frontend of XMLTV
+COMMENT=	A GNOME Applet for monitoring current and upcoming TV programs
 
-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
+		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
 		tv_grab_be:${PORTSDIR}/textproc/p5-xmltv
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	pygnomedesktop gnomeprefix pygnomeextras
+USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	ontv.schemas
+INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/ontv/distinfo b/deskutils/ontv/distinfo
index a89575630aec..b9e56a4e54dc 100644
--- a/deskutils/ontv/distinfo
+++ b/deskutils/ontv/distinfo
@@ -1,3 +1,3 @@
-MD5 (ontv-2.2.0.tar.bz2) = 10f72547a3026c2485a379a12301376c
-SHA256 (ontv-2.2.0.tar.bz2) = 4e7fb7fc70899b0cb16c7452a10ef2dd8f0d14c127137c08eed32283958b50cb
-SIZE (ontv-2.2.0.tar.bz2) = 406089
+MD5 (ontv-2.4.0.tar.bz2) = 9f59697b1785055a347bd8e6bba8b2d3
+SHA256 (ontv-2.4.0.tar.bz2) = 54160178096824ad66d365d4563434e9d60ba6794041d59df9500a5ff7456709
+SIZE (ontv-2.4.0.tar.bz2) = 411776
diff --git a/deskutils/ontv/files/patch-data_Makefile.in b/deskutils/ontv/files/patch-data_Makefile.in
deleted file mode 100644
index 79d3d00fc881..000000000000
--- a/deskutils/ontv/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig	Mon Jul 24 23:13:40 2006
-+++ data/Makefile.in	Mon Jul 24 23:14:10 2006
-@@ -240,7 +240,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = images
--serverdir = $(libdir)/bonobo/servers
-+serverdir = @prefix@/libdata/bonobo/servers
- server_in_files = GNOME_OnTVApplet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
- gladedir = $(datadir)/ontv
diff --git a/deskutils/ontv/files/patch-ontv___init__.in.py b/deskutils/ontv/files/patch-ontv___init__.in.py
index a572e9074428..a74da50bf327 100644
--- a/deskutils/ontv/files/patch-ontv___init__.in.py
+++ b/deskutils/ontv/files/patch-ontv___init__.in.py
@@ -1,15 +1,15 @@
---- ontv/__init__.py.in.orig	Mon Jul 24 23:05:49 2006
-+++ ontv/__init__.py.in	Mon Jul 24 23:06:14 2006
+--- ontv/__init__.py.in.orig	Sun Feb 18 00:51:02 2007
++++ ontv/__init__.py.in	Sun Feb 18 00:51:12 2007
 @@ -1,7 +1,7 @@
  NAME = 'OnTV'
  VERSION = '@VERSION@'
 -SERVERS_DIR = '@prefix@/lib/bonobo/servers'
 -DATA_DIR = '@prefix@/@DATADIRNAME@/ontv'
--PIXMAPS_DIR = '@prefix@/@DATADIRNAME@/pixmaps'
+-IMAGES_DIR = '@prefix@/@DATADIRNAME@/ontv/images'
 -UI_DIR = '@prefix@/@DATADIRNAME@/gnome-2.0/ui'
 -LOCALE_DIR = '@prefix@/@DATADIRNAME@/locale'
 +SERVERS_DIR = '@prefix@/libdata/bonobo/servers'
 +DATA_DIR = '@prefix@/share/gnome/ontv'
-+PIXMAPS_DIR = '@prefix@/share/gnome/pixmaps'
++IMAGES_DIR = '@prefix@/share/gnome/ontv/images'
 +UI_DIR = '@prefix@/share/gnome/gnome-2.0/ui'
 +LOCALE_DIR = '@prefix@/share/locale'
diff --git a/deskutils/ontv/pkg-descr b/deskutils/ontv/pkg-descr
index 40fe2d716862..49a8d61ec384 100644
--- a/deskutils/ontv/pkg-descr
+++ b/deskutils/ontv/pkg-descr
@@ -1 +1,4 @@
-GNOME Applet frontend of XMLTV
+OnTV is a GNOME Applet for monitoring current and upcoming TV programs. It
+uses XMLTV files to monitor them.
+
+WWW: http://johan.svedberg.com/projects/coding/ontv
diff --git a/deskutils/ontv/pkg-plist b/deskutils/ontv/pkg-plist
index 678e481878ea..1eda48a7ea3a 100644
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@@ -10,9 +10,6 @@
 %%PYTHON_SITELIBDIR%%/ontv/Configuration.py
 %%PYTHON_SITELIBDIR%%/ontv/Configuration.pyc
 %%PYTHON_SITELIBDIR%%/ontv/Configuration.pyo
-%%PYTHON_SITELIBDIR%%/ontv/DBus.py
-%%PYTHON_SITELIBDIR%%/ontv/DBus.pyc
-%%PYTHON_SITELIBDIR%%/ontv/DBus.pyo
 %%PYTHON_SITELIBDIR%%/ontv/GUI.py
 %%PYTHON_SITELIBDIR%%/ontv/GUI.pyc
 %%PYTHON_SITELIBDIR%%/ontv/GUI.pyo
@@ -52,6 +49,12 @@
 %%PYTHON_SITELIBDIR%%/ontv/TimeSpan.py
 %%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyc
 %%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyo
+%%PYTHON_SITELIBDIR%%/ontv/Utils.py
+%%PYTHON_SITELIBDIR%%/ontv/Utils.pyc
+%%PYTHON_SITELIBDIR%%/ontv/Utils.pyo
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.py
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyc
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyo
 %%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.py
 %%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyc
 %%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyo
@@ -70,11 +73,20 @@
 libdata/bonobo/servers/GNOME_OnTVApplet.server
 libexec/ontv
 share/gnome/gnome-2.0/ui/GNOME_OnTVApplet.xml
-share/gnome/ontv/ontv-logo-downloading.png
+share/gnome/ontv/images/ontv-logo-downloading.png
 share/gnome/ontv/ontv.glade
-share/gnome/pixmaps/ontv.png
+share/icons/hicolor/16x16/apps/ontv.png
+share/icons/hicolor/22x22/apps/ontv.png
+share/icons/hicolor/24x24/apps/ontv.png
+share/icons/hicolor/32x32/apps/ontv.png
+share/icons/hicolor/48x48/apps/ontv.png
+share/icons/hicolor/scalable/apps/ontv.svg
+share/locale/ar/LC_MESSAGES/ontv.mo
 share/locale/bg/LC_MESSAGES/ontv.mo
+share/locale/ca/LC_MESSAGES/ontv.mo
+share/locale/cs/LC_MESSAGES/ontv.mo
 share/locale/de/LC_MESSAGES/ontv.mo
+share/locale/dz/LC_MESSAGES/ontv.mo
 share/locale/en_CA/LC_MESSAGES/ontv.mo
 share/locale/en_GB/LC_MESSAGES/ontv.mo
 share/locale/es/LC_MESSAGES/ontv.mo
@@ -86,10 +98,12 @@ share/locale/nl/LC_MESSAGES/ontv.mo
 share/locale/pa/LC_MESSAGES/ontv.mo
 share/locale/pl/LC_MESSAGES/ontv.mo
 share/locale/pt_BR/LC_MESSAGES/ontv.mo
+share/locale/sk/LC_MESSAGES/ontv.mo
 share/locale/sv/LC_MESSAGES/ontv.mo
 share/locale/uk/LC_MESSAGES/ontv.mo
 share/locale/vi/LC_MESSAGES/ontv.mo
 share/locale/zh_CN/LC_MESSAGES/ontv.mo
+@dirrm share/gnome/ontv/images
 @dirrm share/gnome/ontv
 @dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
 @dirrm %%PYTHON_SITELIBDIR%%/ontv
@@ -97,7 +111,15 @@ share/locale/zh_CN/LC_MESSAGES/ontv.mo
 @dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca