5 files changed, 54 insertions, 44 deletions

diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 1c4b6d266f48..4598213908cc 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.18 2009/03/21 21:05:56 marcus Exp $
+#   $MCom: ports/deskutils/hamster-applet/Makefile,v 1.29 2009/10/20 17:53:42 kwm Exp $
 #
 
 PORTNAME=	hamster-applet
-PORTVERSION=	2.26.3
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/deskutils/hamster-applet/distinfo b/deskutils/hamster-applet/distinfo
index 65ee0405391c..0e5ed6463cb3 100644
--- a/deskutils/hamster-applet/distinfo
+++ b/deskutils/hamster-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/hamster-applet-2.26.3.tar.bz2) = bc40602ef88e23e0a8c37c7086e953e7
-SHA256 (gnome2/hamster-applet-2.26.3.tar.bz2) = c0b7e444b8981593723cc3ab3063450f2a96d5f295a4011ae9d37e28754a3f76
-SIZE (gnome2/hamster-applet-2.26.3.tar.bz2) = 428731
+MD5 (gnome2/hamster-applet-2.28.1.tar.bz2) = f4c68e02b487b9e0d284e63a411d8cdd
+SHA256 (gnome2/hamster-applet-2.28.1.tar.bz2) = ab9ae10380aeb0aea09e42fd5e7ebd7b09116c0608740b5fa9eda8433d9e31c9
+SIZE (gnome2/hamster-applet-2.28.1.tar.bz2) = 517073
diff --git a/deskutils/hamster-applet/files/patch-hamster___init__.py b/deskutils/hamster-applet/files/patch-hamster___init__.py
deleted file mode 100644
index a277063e0211..000000000000
--- a/deskutils/hamster-applet/files/patch-hamster___init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- hamster/__init__.py.orig	2008-08-07 10:53:47.000000000 -0400
-+++ hamster/__init__.py	2008-08-07 10:54:01.000000000 -0400
-@@ -74,6 +74,7 @@ if not exists(USER_HAMSTER_DIR):
- if not exists(HAMSTER_DB):
-     print "Database not found in %s - installing default from %s!" % (HAMSTER_DB, SHARED_DATA_DIR)
-     copyfile(join(SHARED_DATA_DIR, DB_FILE), HAMSTER_DB)
-+    os.chmod(HAMSTER_DB, 0644)
- 
- # Init storage
- 
diff --git a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
index ec54fd792bbd..6d436ef15360 100644
--- a/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
+++ b/deskutils/hamster-applet/files/patch-hamster_hamster-applet.py
@@ -1,17 +1,23 @@
---- hamster/hamster-applet.py.orig	2009-02-13 16:02:00.000000000 -0500
-+++ hamster/hamster-applet.py	2009-02-27 19:50:13.000000000 -0500
-@@ -52,10 +52,10 @@ if hasattr(gettext, 'bind_textdomain_cod
-     gettext.bind_textdomain_codeset('hamster-applet','UTF-8')
- gettext.textdomain('hamster-applet')
+--- hamster/hamster-applet.py.orig	2009-07-19 21:41:20.000000000 +1000
++++ hamster/hamster-applet.py	2009-07-19 21:41:46.000000000 +1000
+@@ -37,14 +37,14 @@ from hamster import defs
+ from hamster.configuration import runtime
  
--locale.bindtextdomain('hamster-applet', locale_dir)
--if hasattr(locale, 'bind_textdomain_codeset'):
--    locale.bind_textdomain_codeset('hamster-applet','UTF-8')
--locale.textdomain('hamster-applet')
-+#locale.bindtextdomain('hamster-applet', locale_dir)
-+#if hasattr(locale, 'bind_textdomain_codeset'):
-+#    locale.bind_textdomain_codeset('hamster-applet','UTF-8')
-+#locale.textdomain('hamster-applet')
+ # 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"))
  
- hamster.__init_db()
- import hamster.applet
+-for module in (gettext, locale):
+-    module.bindtextdomain('hamster-applet', locale_dir)
+-    module.textdomain('hamster-applet')
++#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')
+ 
+ 
+ from hamster.applet import HamsterApplet
diff --git a/deskutils/hamster-applet/pkg-plist b/deskutils/hamster-applet/pkg-plist
index 34e12f41bd17..15387400920f 100644
--- a/deskutils/hamster-applet/pkg-plist
+++ b/deskutils/hamster-applet/pkg-plist
@@ -1,7 +1,4 @@
 lib/hamster-applet/hamster-applet
-%%PYTHON_SITELIBDIR%%/hamster/Configuration.py
-%%PYTHON_SITELIBDIR%%/hamster/Configuration.pyc
-%%PYTHON_SITELIBDIR%%/hamster/Configuration.pyo
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.py
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyc
 %%PYTHON_SITELIBDIR%%/hamster/KeyBinder.pyo
@@ -11,15 +8,15 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/about.py
 %%PYTHON_SITELIBDIR%%/hamster/about.pyc
 %%PYTHON_SITELIBDIR%%/hamster/about.pyo
-%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.py
-%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyc
-%%PYTHON_SITELIBDIR%%/hamster/add_custom_fact.pyo
 %%PYTHON_SITELIBDIR%%/hamster/applet.py
 %%PYTHON_SITELIBDIR%%/hamster/applet.pyc
 %%PYTHON_SITELIBDIR%%/hamster/applet.pyo
 %%PYTHON_SITELIBDIR%%/hamster/charting.py
 %%PYTHON_SITELIBDIR%%/hamster/charting.pyc
 %%PYTHON_SITELIBDIR%%/hamster/charting.pyo
+%%PYTHON_SITELIBDIR%%/hamster/configuration.py
+%%PYTHON_SITELIBDIR%%/hamster/configuration.pyc
+%%PYTHON_SITELIBDIR%%/hamster/configuration.pyo
 %%PYTHON_SITELIBDIR%%/hamster/db.py
 %%PYTHON_SITELIBDIR%%/hamster/db.pyc
 %%PYTHON_SITELIBDIR%%/hamster/db.pyo
@@ -29,12 +26,21 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/dispatcher.py
 %%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyc
 %%PYTHON_SITELIBDIR%%/hamster/dispatcher.pyo
+%%PYTHON_SITELIBDIR%%/hamster/edit_activity.py
+%%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyc
+%%PYTHON_SITELIBDIR%%/hamster/edit_activity.pyo
 %%PYTHON_SITELIBDIR%%/hamster/eds.py
 %%PYTHON_SITELIBDIR%%/hamster/eds.pyc
 %%PYTHON_SITELIBDIR%%/hamster/eds.pyo
+%%PYTHON_SITELIBDIR%%/hamster/graphics.py
+%%PYTHON_SITELIBDIR%%/hamster/graphics.pyc
+%%PYTHON_SITELIBDIR%%/hamster/graphics.pyo
 %%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.py
 %%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyc
 %%PYTHON_SITELIBDIR%%/hamster/hamsterdbus.pyo
+%%PYTHON_SITELIBDIR%%/hamster/i18n.py
+%%PYTHON_SITELIBDIR%%/hamster/i18n.pyc
+%%PYTHON_SITELIBDIR%%/hamster/i18n.pyo
 %%PYTHON_SITELIBDIR%%/hamster/idle.py
 %%PYTHON_SITELIBDIR%%/hamster/idle.pyc
 %%PYTHON_SITELIBDIR%%/hamster/idle.pyo
@@ -58,18 +64,21 @@ lib/hamster-applet/hamster-applet
 %%PYTHON_SITELIBDIR%%/hamster/stuff.py
 %%PYTHON_SITELIBDIR%%/hamster/stuff.pyc
 %%PYTHON_SITELIBDIR%%/hamster/stuff.pyo
+%%PYTHON_SITELIBDIR%%/hamster/widgets.py
+%%PYTHON_SITELIBDIR%%/hamster/widgets.pyc
+%%PYTHON_SITELIBDIR%%/hamster/widgets.pyo
 libdata/bonobo/servers/Hamster_Applet.server
 share/gnome-control-center/keybindings/99-hamster-applet.xml
 %%DATADIR%%/Hamster_Applet.xml
-%%DATADIR%%/add_custom_fact.glade
+%%DATADIR%%/applet.ui
 %%DATADIR%%/art/hamster-applet.png
 %%DATADIR%%/art/stock_calendar-view-day.png
 %%DATADIR%%/art/stock_calendar-view-month.png
 %%DATADIR%%/art/stock_calendar-view-week.png
+%%DATADIR%%/edit_activity.ui
 %%DATADIR%%/hamster.db
-%%DATADIR%%/menu.glade
-%%DATADIR%%/preferences.glade
-%%DATADIR%%/stats.glade
+%%DATADIR%%/preferences.ui
+%%DATADIR%%/stats.ui
 share/icons/hicolor/16x16/apps/hamster-applet.png
 share/icons/hicolor/22x22/apps/hamster-applet.png
 share/icons/hicolor/32x32/apps/hamster-applet.png
@@ -77,7 +86,9 @@ share/icons/hicolor/48x48/apps/hamster-applet.png
 share/icons/hicolor/scalable/apps/hamster-applet.svg
 share/locale/ar/LC_MESSAGES/hamster-applet.mo
 share/locale/as/LC_MESSAGES/hamster-applet.mo
+share/locale/be/LC_MESSAGES/hamster-applet.mo
 share/locale/bg/LC_MESSAGES/hamster-applet.mo
+share/locale/bn/LC_MESSAGES/hamster-applet.mo
 share/locale/bn_IN/LC_MESSAGES/hamster-applet.mo
 share/locale/ca/LC_MESSAGES/hamster-applet.mo
 share/locale/ca@valencia/LC_MESSAGES/hamster-applet.mo
@@ -103,6 +114,7 @@ share/locale/ko/LC_MESSAGES/hamster-applet.mo
 share/locale/ku/LC_MESSAGES/hamster-applet.mo
 share/locale/lt/LC_MESSAGES/hamster-applet.mo
 share/locale/lv/LC_MESSAGES/hamster-applet.mo
+share/locale/mai/LC_MESSAGES/hamster-applet.mo
 share/locale/mk/LC_MESSAGES/hamster-applet.mo
 share/locale/ml/LC_MESSAGES/hamster-applet.mo
 share/locale/mr/LC_MESSAGES/hamster-applet.mo
@@ -115,6 +127,7 @@ share/locale/pt/LC_MESSAGES/hamster-applet.mo
 share/locale/pt_BR/LC_MESSAGES/hamster-applet.mo
 share/locale/ro/LC_MESSAGES/hamster-applet.mo
 share/locale/ru/LC_MESSAGES/hamster-applet.mo
+share/locale/si/LC_MESSAGES/hamster-applet.mo
 share/locale/sl/LC_MESSAGES/hamster-applet.mo
 share/locale/sq/LC_MESSAGES/hamster-applet.mo
 share/locale/sr/LC_MESSAGES/hamster-applet.mo
@@ -123,8 +136,8 @@ share/locale/sv/LC_MESSAGES/hamster-applet.mo
 share/locale/ta/LC_MESSAGES/hamster-applet.mo
 share/locale/te/LC_MESSAGES/hamster-applet.mo
 share/locale/th/LC_MESSAGES/hamster-applet.mo
-share/locale/uk/LC_MESSAGES/hamster-applet.mo
 share/locale/tr/LC_MESSAGES/hamster-applet.mo
+share/locale/uk/LC_MESSAGES/hamster-applet.mo
 share/locale/vi/LC_MESSAGES/hamster-applet.mo
 share/locale/zh_CN/LC_MESSAGES/hamster-applet.mo
 share/locale/zh_HK/LC_MESSAGES/hamster-applet.mo
@@ -140,10 +153,12 @@ share/locale/zh_TW/LC_MESSAGES/hamster-applet.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES