Update to 2.29.6.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13528 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 43 insertions, 30 deletions

diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index f1ecd2432..557261abb 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.31 2009/12/25 15:45:16 kwm Exp $
+#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.32 2010/01/14 14:06:04 avl Exp $
 #
 
 PORTNAME=	hamster-applet
-PORTVERSION=	2.29.5
+PORTVERSION=	2.29.6
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -31,6 +31,6 @@ INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 	       	LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	hamster-applet.schemas
+#GCONF_SCHEMAS=	hamster-applet.schemas
 
 .include <bsd.port.mk>
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index ed4aa9247..7a48bb132 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.29.5.tar.bz2) = 8bd73ee05302690d41d2e7887d995de3
-SHA256 (gnome2/hamster-applet-2.29.5.tar.bz2) = dea57cef0065c10208ccc92f982b57dbc3ec9ee0cefed4f281f29c2a280d4aa5
-SIZE (gnome2/hamster-applet-2.29.5.tar.bz2) = 543611
+MD5 (gnome2/hamster-applet-2.29.6.tar.bz2) = 46e63502e4f80d985e15eee762103840
+SHA256 (gnome2/hamster-applet-2.29.6.tar.bz2) = f0f6d8403592ffca5fcc63d90228101e308c916f753656a00110a025ef72c0cd
+SIZE (gnome2/hamster-applet-2.29.6.tar.bz2) = 558466
diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
index 7f344cfc1..0bb718d09 100644
--- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
+++ b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
@@ -1,22 +1,22 @@
---- hamster/hamster-applet.py.orig	2009-12-18 20:42:05.000000000 +0100
-+++ hamster/hamster-applet.py	2009-12-25 16:38:19.000000000 +0100
-@@ -102,13 +102,13 @@ if __name__ == "__main__":
-         from hamster.configuration import runtime
-         
+--- src/hamster-applet.py.orig	2010-01-29 17:37:34.000000000 +0800
++++ src/hamster-applet.py	2010-01-29 17:38:21.000000000 +0800
+@@ -95,13 +95,13 @@ if __name__ == "__main__":
+         from hamster.configuration import runtime, dialogs
+ 
          # Setup i18n
--        locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))        
+-        locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
 -        for module in (gettext, locale):
 -            module.bindtextdomain('hamster-applet', locale_dir)
 -            module.textdomain('hamster-applet')
-+#        locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))        
++#        locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
 +#        for module in (gettext, locale):
 +#            module.bindtextdomain('hamster-applet', locale_dir)
 +#            module.textdomain('hamster-applet')
-         
+ 
 -            if hasattr(module, 'bind_textdomain_codeset'):
 -                module.bind_textdomain_codeset('hamster-applet','UTF-8')
 +#            if hasattr(module, 'bind_textdomain_codeset'):
 +#                module.bind_textdomain_codeset('hamster-applet','UTF-8')
-         
+ 
          gtk.window_set_default_icon_name("hamster-applet")
-     
+ 
diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist
index 2bd08d591..b74e799d5 100644
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@@ -1,3 +1,5 @@
+bin/gnome-time-tracker
+bin/hamster-standalone
 lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc
@@ -49,6 +51,15 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/keybinder/__init__.pyo
 %%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.la
 %%PYTHON_SITELIBDIR%%/hamster/keybinder/_keybinder.so
+%%PYTHON_SITELIBDIR%%/hamster/overview_activities.py
+%%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview_activities.pyo
+%%PYTHON_SITELIBDIR%%/hamster/overview_totals.py
+%%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview_totals.pyo
+%%PYTHON_SITELIBDIR%%/hamster/overview.py
+%%PYTHON_SITELIBDIR%%/hamster/overview.pyc
+%%PYTHON_SITELIBDIR%%/hamster/overview.pyo
 %%PYTHON_SITELIBDIR%%/hamster/preferences.py
 %%PYTHON_SITELIBDIR%%/hamster/preferences.pyc
 %%PYTHON_SITELIBDIR%%/hamster/preferences.pyo
@@ -58,15 +69,6 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/reports.py
 %%PYTHON_SITELIBDIR%%/hamster/reports.pyc
 %%PYTHON_SITELIBDIR%%/hamster/reports.pyo
-%%PYTHON_SITELIBDIR%%/hamster/stats_overview.py
-%%PYTHON_SITELIBDIR%%/hamster/stats_overview.pyc
-%%PYTHON_SITELIBDIR%%/hamster/stats_overview.pyo
-%%PYTHON_SITELIBDIR%%/hamster/stats_reports.py
-%%PYTHON_SITELIBDIR%%/hamster/stats_reports.pyc
-%%PYTHON_SITELIBDIR%%/hamster/stats_reports.pyo
-%%PYTHON_SITELIBDIR%%/hamster/stats_stats.py
-%%PYTHON_SITELIBDIR%%/hamster/stats_stats.pyc
-%%PYTHON_SITELIBDIR%%/hamster/stats_stats.pyo
 %%PYTHON_SITELIBDIR%%/hamster/stats.py
 %%PYTHON_SITELIBDIR%%/hamster/stats.pyc
 %%PYTHON_SITELIBDIR%%/hamster/stats.pyo
@@ -97,12 +99,12 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/widgets/tags.py
 %%PYTHON_SITELIBDIR%%/hamster/widgets/tags.pyc
 %%PYTHON_SITELIBDIR%%/hamster/widgets/tags.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets/timechart.pyo
 %%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.py
 %%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyc
 %%PYTHON_SITELIBDIR%%/hamster/widgets/timeinput.pyo
-%%PYTHON_SITELIBDIR%%/hamster/widgets/timeline.py
-%%PYTHON_SITELIBDIR%%/hamster/widgets/timeline.pyc
-%%PYTHON_SITELIBDIR%%/hamster/widgets/timeline.pyo
 libdata/bonobo/servers/Hamster_Applet.server
 share/gnome-control-center/keybindings/99-hamster-applet.xml
 %%DATADIR%%/Hamster_Applet.xml
@@ -113,10 +115,19 @@ share/gnome-control-center/keybindings/99-hamster-applet.xml
 %%DATADIR%%/art/stock_calendar-view-week.png
 %%DATADIR%%/edit_activity.ui
 %%DATADIR%%/hamster.db
+%%DATADIR%%/hamster.ui
+%%DATADIR%%/overview.ui
+%%DATADIR%%/overview_totals.ui
 %%DATADIR%%/preferences.ui
-%%DATADIR%%/stats_reports.ui
-%%DATADIR%%/stats_stats.ui
 %%DATADIR%%/stats.ui
+share/applications/hamster-standalone.desktop
+share/gnome/help/hamster-applet/C/legal.xml
+share/gnome/help/hamster-applet/C/backup.page
+share/gnome/help/hamster-applet/C/index.page
+share/gnome/help/hamster-applet/C/input.page
+share/gnome/help/hamster-applet/C/merge.page
+share/gnome/help/hamster-applet/C/reports.page
+share/gnome/help/hamster-applet/C/statistics.page
 share/icons/hicolor/16x16/apps/hamster-applet.png
 share/icons/hicolor/22x22/apps/hamster-applet.png
 share/icons/hicolor/32x32/apps/hamster-applet.png
@@ -187,6 +198,8 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
 @dirrm %%PYTHON_SITELIBDIR%%/hamster/keybinder
 @dirrm %%PYTHON_SITELIBDIR%%/hamster
 @dirrm lib/hamster-applet
+@dirrm share/gnome/help/hamster-applet/C
+@dirrm share/gnome/help/hamster-applet
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES