Date: Mon, 5 Sep 2011 12:37:02 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160485: [UPDATE] deskutils/ontv: update to 3.2.0 Message-ID: <201109051237.p85Cb2gR078031@red.freebsd.org> Resent-Message-ID: <201109051240.p85Ce00j056571@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160485 >Category: ports >Synopsis: [UPDATE] deskutils/ontv: update to 3.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 05 12:40:00 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA1 >Organization: >Environment: 9.0-BETA1 i386 >Description: - update to 3.2.0 - add license - this port now needs python2.5+: """checking whether /usr/local/bin/python2.7 version >= 2.5... yes""" - change USE_PYTHON to 2.5-2.7 (it will not work with python3) - drop no more needed py-[c]elementtree deps - move CPPFLAGS out of CONFIGURE_ENV - update WWW tinderbuild logs: 7.4: http://happy-nation.by.ru/ports/tb/7.4/ontv-3.2.0.log 8.2: http://happy-nation.by.ru/ports/tb/8.2/ontv-3.2.0.log tag: dropelementtree >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa ontv.orig/Makefile ontv/Makefile --- ontv.orig/Makefile 2011-02-25 04:31:39.000000000 +0300 +++ ontv/Makefile 2011-09-04 21:21:47.000000000 +0400 @@ -7,29 +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 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +CONFIGURE_ENV= 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 -ruNa ontv.orig/distinfo ontv/distinfo --- ontv.orig/distinfo 2011-03-20 15:48:35.000000000 +0300 +++ ontv/distinfo 2011-08-18 18:15:04.000000000 +0400 @@ -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 -ruNa ontv.orig/files/patch-bin_ontv ontv/files/patch-bin_ontv --- ontv.orig/files/patch-bin_ontv 1970-01-01 03:00:00.000000000 +0300 +++ ontv/files/patch-bin_ontv 2011-08-19 15:27:38.000000000 +0400 @@ -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 -ruNa ontv.orig/files/patch-ontv_Main.py ontv/files/patch-ontv_Main.py --- ontv.orig/files/patch-ontv_Main.py 2006-10-14 12:59:47.000000000 +0400 +++ ontv/files/patch-ontv_Main.py 1970-01-01 03:00:00.000000000 +0300 @@ -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 -ruNa ontv.orig/files/patch-ontv___init__.in.py ontv/files/patch-ontv___init__.in.py --- ontv.orig/files/patch-ontv___init__.in.py 2007-10-25 03:35:30.000000000 +0400 +++ ontv/files/patch-ontv___init__.in.py 1970-01-01 03:00:00.000000000 +0300 @@ -1,15 +0,0 @@ ---- 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' --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/ontv' -+IMAGES_DIR = '@prefix@/share/ontv/images' -+UI_DIR = '@prefix@/share/gnome-2.0/ui' -+LOCALE_DIR = '@prefix@/share/locale' diff -ruNa ontv.orig/files/patch-ontv__init__.py.in ontv/files/patch-ontv__init__.py.in --- ontv.orig/files/patch-ontv__init__.py.in 1970-01-01 03:00:00.000000000 +0300 +++ ontv/files/patch-ontv__init__.py.in 2011-08-19 15:55:57.000000000 +0400 @@ -0,0 +1,15 @@ +--- 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@' +-SERVERS_DIR = '@prefix@/lib/bonobo/servers' +-DATA_DIR = '@prefix@/@DATADIRNAME@/ontv' +-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/ontv' ++IMAGES_DIR = '@prefix@/share/ontv/images' ++UI_DIR = '@prefix@/share/gnome-2.0/ui' ++LOCALE_DIR = '@prefix@/share/locale' diff -ruNa ontv.orig/files/patch-ontv_dialogs.py ontv/files/patch-ontv_dialogs.py --- ontv.orig/files/patch-ontv_dialogs.py 1970-01-01 03:00:00.000000000 +0300 +++ ontv/files/patch-ontv_dialogs.py 2011-08-19 15:38:46.000000000 +0400 @@ -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 -ruNa ontv.orig/pkg-descr ontv/pkg-descr --- ontv.orig/pkg-descr 2007-03-19 08:13:25.000000000 +0300 +++ ontv/pkg-descr 2011-09-04 21:02:33.000000000 +0400 @@ -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 -ruNa ontv.orig/pkg-plist ontv/pkg-plist --- ontv.orig/pkg-plist 2007-10-25 03:35:29.000000000 +0400 +++ ontv/pkg-plist 2011-08-19 14:32:20.000000000 +0400 @@ -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/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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109051237.p85Cb2gR078031>