8 files changed, 118 insertions, 100 deletions

diff --git a/deskutils/ontv/Makefile b/deskutils/ontv/Makefile
index ccb215523f50..071a43248942 100644
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@@ -7,30 +7,34 @@
 #
 
 PORTNAME=	ontv
-PORTVERSION=	2.4.0
-PORTREVISION=	11
+PORTVERSION=	3.2.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME Applet for monitoring current and upcoming TV programs
 
-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 \
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
+		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
+RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		tv_check:${PORTSDIR}/textproc/p5-xmltv
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras
+USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras pygtk2
 USE_GMAKE=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.5-2.7
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GCONF_SCHEMAS=	ontv.schemas
 INSTALLS_ICONS=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local/lib/python2.6|${PYTHON_LIBDIR}|' \
+		${WRKSRC}/bin/ontv
+
 .include <bsd.port.mk>
diff --git a/deskutils/ontv/distinfo b/deskutils/ontv/distinfo
index df3b2af6ae3d..dc259ebbc332 100644
--- a/deskutils/ontv/distinfo
+++ b/deskutils/ontv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ontv-2.4.0.tar.bz2) = 54160178096824ad66d365d4563434e9d60ba6794041d59df9500a5ff7456709
-SIZE (ontv-2.4.0.tar.bz2) = 411776
+SHA256 (ontv-3.2.0.tar.bz2) = 328becc62bd15728b5f91a42745d2322781f65e958f3dbe392887706331ebf8a
+SIZE (ontv-3.2.0.tar.bz2) = 398404
diff --git a/deskutils/ontv/files/patch-bin_ontv b/deskutils/ontv/files/patch-bin_ontv
new file mode 100644
index 000000000000..ebe5342d402d
--- /dev/null
+++ b/deskutils/ontv/files/patch-bin_ontv
@@ -0,0 +1,19 @@
+--- bin/ontv.orig	2010-08-04 22:26:46.000000000 +0400
++++ bin/ontv	2011-08-19 15:22:32.000000000 +0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ 
+ # Copyright (C) 2010 Olof Kindgren <olki@src.gnome.org>
+@@ -34,8 +34,8 @@
+ from optparse import OptionParser
+ 
+ import locale
+-locale.setlocale(locale.LC_ALL, '')
+-locale.bindtextdomain(NAME.lower(), LOCALE_DIR)
++#locale.setlocale(locale.LC_ALL, '')
++#locale.bindtextdomain(NAME.lower(), LOCALE_DIR)
+ import gettext
+ gettext.bindtextdomain(NAME.lower(), LOCALE_DIR)
+ gettext.textdomain(NAME.lower())
diff --git a/deskutils/ontv/files/patch-ontv_Main.py b/deskutils/ontv/files/patch-ontv_Main.py
deleted file mode 100644
index f34850a3a22e..000000000000
--- a/deskutils/ontv/files/patch-ontv_Main.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- ontv/Main.py.orig	Mon Jul 24 23:09:57 2006
-+++ ontv/Main.py	Mon Jul 24 23:10:06 2006
-@@ -38,8 +38,8 @@
-     gettext.bindtextdomain(NAME.lower(), LOCALE_DIR)
-     gettext.textdomain(NAME.lower())
- 
--    locale.bindtextdomain(NAME.lower(), LOCALE_DIR)
--    locale.textdomain(NAME.lower())
-+#    locale.bindtextdomain(NAME.lower(), LOCALE_DIR)
-+#    locale.textdomain(NAME.lower())
- 
-     try:
-         opts, args = getopt.getopt(sys.argv[1:], "hdw", ["help", "debug",
diff --git a/deskutils/ontv/files/patch-ontv___init__.in.py b/deskutils/ontv/files/patch-ontv__init__.py.in
index 7813d3e97618..677fa1f3abf6 100644
--- a/deskutils/ontv/files/patch-ontv___init__.in.py
+++ b/deskutils/ontv/files/patch-ontv__init__.py.in
@@ -1,5 +1,5 @@
---- ontv/__init__.py.in.orig	Sun Feb 18 00:51:02 2007
-+++ ontv/__init__.py.in	Sun Feb 18 00:51:12 2007
+--- ontv/__init__.py.in.orig	2010-04-30 01:03:03.000000000 +0400
++++ ontv/__init__.py.in	2011-08-19 15:54:49.000000000 +0400
 @@ -1,7 +1,7 @@
  NAME = 'OnTV'
  VERSION = '@VERSION@'
diff --git a/deskutils/ontv/files/patch-ontv_dialogs.py b/deskutils/ontv/files/patch-ontv_dialogs.py
new file mode 100644
index 000000000000..3fb352dba659
--- /dev/null
+++ b/deskutils/ontv/files/patch-ontv_dialogs.py
@@ -0,0 +1,13 @@
+--- ontv/dialogs.py.orig	2010-07-27 03:20:48.000000000 +0400
++++ ontv/dialogs.py	2011-08-19 15:37:50.000000000 +0400
+@@ -34,8 +34,8 @@
+ from ontv import NAME, VERSION, LOCALE_DIR
+ 
+ import locale
+-locale.setlocale(locale.LC_ALL, '')
+-locale.bindtextdomain(NAME.lower(), LOCALE_DIR)
++#locale.setlocale(locale.LC_ALL, '')
++#locale.bindtextdomain(NAME.lower(), LOCALE_DIR)
+ import gettext
+ gettext.bindtextdomain(NAME.lower(), LOCALE_DIR)
+ gettext.textdomain(NAME.lower())
diff --git a/deskutils/ontv/pkg-descr b/deskutils/ontv/pkg-descr
index 49a8d61ec384..29e131bf757c 100644
--- a/deskutils/ontv/pkg-descr
+++ b/deskutils/ontv/pkg-descr
@@ -1,4 +1,4 @@
 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
+WWW: http://live.gnome.org/OnTV
diff --git a/deskutils/ontv/pkg-plist b/deskutils/ontv/pkg-plist
index aa542e1c1362..0bbd78b388cf 100644
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@@ -1,80 +1,60 @@
-%%PYTHON_SITELIBDIR%%/ontv/AboutDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/AboutDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/AboutDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Channel.py
-%%PYTHON_SITELIBDIR%%/ontv/Channel.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Channel.pyo
-%%PYTHON_SITELIBDIR%%/ontv/ChannelDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/ChannelDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/ChannelDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Configuration.py
-%%PYTHON_SITELIBDIR%%/ontv/Configuration.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Configuration.pyo
-%%PYTHON_SITELIBDIR%%/ontv/GUI.py
-%%PYTHON_SITELIBDIR%%/ontv/GUI.pyc
-%%PYTHON_SITELIBDIR%%/ontv/GUI.pyo
-%%PYTHON_SITELIBDIR%%/ontv/KeyBinder.py
-%%PYTHON_SITELIBDIR%%/ontv/KeyBinder.pyc
-%%PYTHON_SITELIBDIR%%/ontv/KeyBinder.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Listings.py
-%%PYTHON_SITELIBDIR%%/ontv/Listings.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Listings.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Main.py
-%%PYTHON_SITELIBDIR%%/ontv/Main.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Main.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Notification.py
-%%PYTHON_SITELIBDIR%%/ontv/Notification.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Notification.pyo
-%%PYTHON_SITELIBDIR%%/ontv/OnTVApplet.py
-%%PYTHON_SITELIBDIR%%/ontv/OnTVApplet.pyc
-%%PYTHON_SITELIBDIR%%/ontv/OnTVApplet.pyo
-%%PYTHON_SITELIBDIR%%/ontv/PreferencesDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/PreferencesDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/PreferencesDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Program.py
-%%PYTHON_SITELIBDIR%%/ontv/Program.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Program.pyo
-%%PYTHON_SITELIBDIR%%/ontv/ProgramDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/ProgramDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/ProgramDialog.pyo
-%%PYTHON_SITELIBDIR%%/ontv/ProgramWindow.py
-%%PYTHON_SITELIBDIR%%/ontv/ProgramWindow.pyc
-%%PYTHON_SITELIBDIR%%/ontv/ProgramWindow.pyo
-%%PYTHON_SITELIBDIR%%/ontv/Reminders.py
-%%PYTHON_SITELIBDIR%%/ontv/Reminders.pyc
-%%PYTHON_SITELIBDIR%%/ontv/Reminders.pyo
-%%PYTHON_SITELIBDIR%%/ontv/SearchDialog.py
-%%PYTHON_SITELIBDIR%%/ontv/SearchDialog.pyc
-%%PYTHON_SITELIBDIR%%/ontv/SearchDialog.pyo
-%%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
+bin/ontv
+bin/ontv-dbus
 %%PYTHON_SITELIBDIR%%/ontv/__init__.py
 %%PYTHON_SITELIBDIR%%/ontv/__init__.pyc
 %%PYTHON_SITELIBDIR%%/ontv/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/__init__.py
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/__init__.pyc
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/__init__.pyo
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/_keybinder.a
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/_keybinder.la
-%%PYTHON_SITELIBDIR%%/ontv/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/ontv/applet.py
+%%PYTHON_SITELIBDIR%%/ontv/applet.pyc
+%%PYTHON_SITELIBDIR%%/ontv/applet.pyo
+%%PYTHON_SITELIBDIR%%/ontv/assistant.py
+%%PYTHON_SITELIBDIR%%/ontv/assistant.pyc
+%%PYTHON_SITELIBDIR%%/ontv/assistant.pyo
+%%PYTHON_SITELIBDIR%%/ontv/channel.py
+%%PYTHON_SITELIBDIR%%/ontv/channel.pyc
+%%PYTHON_SITELIBDIR%%/ontv/channel.pyo
+%%PYTHON_SITELIBDIR%%/ontv/config.py
+%%PYTHON_SITELIBDIR%%/ontv/config.pyc
+%%PYTHON_SITELIBDIR%%/ontv/config.pyo
+%%PYTHON_SITELIBDIR%%/ontv/dbus_service.py
+%%PYTHON_SITELIBDIR%%/ontv/dbus_service.pyc
+%%PYTHON_SITELIBDIR%%/ontv/dbus_service.pyo
+%%PYTHON_SITELIBDIR%%/ontv/dialogs.py
+%%PYTHON_SITELIBDIR%%/ontv/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/ontv/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/ontv/gui.py
+%%PYTHON_SITELIBDIR%%/ontv/gui.pyc
+%%PYTHON_SITELIBDIR%%/ontv/gui.pyo
+%%PYTHON_SITELIBDIR%%/ontv/listings.py
+%%PYTHON_SITELIBDIR%%/ontv/listings.pyc
+%%PYTHON_SITELIBDIR%%/ontv/listings.pyo
+%%PYTHON_SITELIBDIR%%/ontv/notify.py
+%%PYTHON_SITELIBDIR%%/ontv/notify.pyc
+%%PYTHON_SITELIBDIR%%/ontv/notify.pyo
+%%PYTHON_SITELIBDIR%%/ontv/ontv_core.py
+%%PYTHON_SITELIBDIR%%/ontv/ontv_core.pyc
+%%PYTHON_SITELIBDIR%%/ontv/ontv_core.pyo
+%%PYTHON_SITELIBDIR%%/ontv/program.py
+%%PYTHON_SITELIBDIR%%/ontv/program.pyc
+%%PYTHON_SITELIBDIR%%/ontv/program.pyo
+%%PYTHON_SITELIBDIR%%/ontv/reminders.py
+%%PYTHON_SITELIBDIR%%/ontv/reminders.pyc
+%%PYTHON_SITELIBDIR%%/ontv/reminders.pyo
+%%PYTHON_SITELIBDIR%%/ontv/utils.py
+%%PYTHON_SITELIBDIR%%/ontv/utils.pyc
+%%PYTHON_SITELIBDIR%%/ontv/utils.pyo
+%%PYTHON_SITELIBDIR%%/ontv/window.py
+%%PYTHON_SITELIBDIR%%/ontv/window.pyc
+%%PYTHON_SITELIBDIR%%/ontv/window.pyo
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.py
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.pyc
 %%PYTHON_SITELIBDIR%%/ontv/xmltv.pyo
+%%PYTHON_SITELIBDIR%%/ontv/xmltv_file.py
+%%PYTHON_SITELIBDIR%%/ontv/xmltv_file.pyc
+%%PYTHON_SITELIBDIR%%/ontv/xmltv_file.pyo
 libdata/bonobo/servers/GNOME_OnTVApplet.server
-libexec/ontv
+libexec/ontv-applet
+share/applications/ontv.desktop
 share/gnome-2.0/ui/GNOME_OnTVApplet.xml
-share/ontv/images/ontv-logo-downloading.png
-share/ontv/ontv.glade
 share/icons/hicolor/16x16/apps/ontv.png
 share/icons/hicolor/22x22/apps/ontv.png
 share/icons/hicolor/24x24/apps/ontv.png
@@ -87,25 +67,40 @@ 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/el/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
 share/locale/fi/LC_MESSAGES/ontv.mo
 share/locale/fr/LC_MESSAGES/ontv.mo
+share/locale/gl/LC_MESSAGES/ontv.mo
+share/locale/hu/LC_MESSAGES/ontv.mo
+share/locale/id/LC_MESSAGES/ontv.mo
 share/locale/lv/LC_MESSAGES/ontv.mo
 share/locale/nb/LC_MESSAGES/ontv.mo
 share/locale/nl/LC_MESSAGES/ontv.mo
+share/locale/oc/LC_MESSAGES/ontv.mo
 share/locale/pa/LC_MESSAGES/ontv.mo
 share/locale/pl/LC_MESSAGES/ontv.mo
+share/locale/pt/LC_MESSAGES/ontv.mo
 share/locale/pt_BR/LC_MESSAGES/ontv.mo
 share/locale/sk/LC_MESSAGES/ontv.mo
+share/locale/sl/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/ontv/images
-@dirrm share/ontv
-@dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
-@dirrm %%PYTHON_SITELIBDIR%%/ontv
+%%DATADIR%%/about_dialog.ui
+%%DATADIR%%/channel_dialog.ui
+%%DATADIR%%/images/ontv-logo-downloading.png
+%%DATADIR%%/preferences_dialog.ui
+%%DATADIR%%/program_dialog.ui
+%%DATADIR%%/search_dialog.ui
+%%DATADIR%%/status_icon.ui
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrm %%PYTHON_SITELIBDIR%%/ontv