Sync w/ FreeBSD ports tree.

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

4 files changed, 9 insertions, 55 deletions

diff --git a/deskutils/timer-applet/Makefile b/deskutils/timer-applet/Makefile
index 7a25ffb1d..867ecf7f9 100644
--- a/deskutils/timer-applet/Makefile
+++ b/deskutils/timer-applet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	timer-applet
-PORTVERSION=	1.2
+PORTVERSION=	1.3.1
 PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	timerapplet
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A timer applet for the GNOME panel
 
+LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	${LOCALBASE}/share/gnome/sounds/gtk-events/clicked.wav:${PORTSDIR}/audio/gnome-audio
 
 USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack
diff --git a/deskutils/timer-applet/distinfo b/deskutils/timer-applet/distinfo
index a0b6e4390..90657f60d 100644
--- a/deskutils/timer-applet/distinfo
+++ b/deskutils/timer-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (timer-applet-1.2.tar.gz) = 00dfc31e32a9a4cad3084b78a49c8a40
-SHA256 (timer-applet-1.2.tar.gz) = f1b3ef59f2bb0124da23eadc9b74949b3a6cf96dafd912171a4f008aef9841ae
-SIZE (timer-applet-1.2.tar.gz) = 183072
+MD5 (timer-applet-1.3.1.tar.gz) = 6c7f36c41bd8d7a86c055bfdf42f1493
+SHA256 (timer-applet-1.3.1.tar.gz) = c0ad517f6b9ef42d19c0a493ff75f2f0c9f8442d8616a945b6bf5abdb7595f26
+SIZE (timer-applet-1.3.1.tar.gz) = 213048
diff --git a/deskutils/timer-applet/files/patch-src_timer-applet.c b/deskutils/timer-applet/files/patch-src_timer-applet.c
deleted file mode 100644
index 1a3ecaec0..000000000
--- a/deskutils/timer-applet/files/patch-src_timer-applet.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/timer-applet.c.orig	Wed Dec 14 23:39:09 2005
-+++ src/timer-applet.c	Sun Jan 29 03:52:57 2006
-@@ -872,11 +872,11 @@
- update_presets_submenu (TimerApplet *timer_applet)
- {
- 	BonoboUIComponent *popup_component;
-+	int i;
- 
- 	popup_component = panel_applet_get_popup_component (PANEL_APPLET (timer_applet->applet));
- 	
- 	/* Remove existing menu items. */
--	int i;
- 	for (i = 0;; i++) {
- 		gchar *item_path = g_strdup_printf (PRESETS_SUBMENU_PATH "/Preset_%d", i);
- 		if (bonobo_ui_component_path_exists (popup_component, item_path, NULL)) {
-@@ -902,6 +902,8 @@
- 			gdouble preset_duration;
- 			gchar *preset_display_name;
- 			gint preset_index;
-+			gchar *verb;
-+			BonoboUINode *node;
- 			
- 			gtk_tree_model_get (GTK_TREE_MODEL (timer_presets_list), &iter,
- 								PROFILE_NAME_COL, &preset_name,
-@@ -923,8 +925,8 @@
- 				path = NULL;
- 			}
- 			
--			gchar *verb = g_strdup_printf ("Preset_%d", preset_index);
--			BonoboUINode *node = bonobo_ui_node_new ("menuitem");	
-+			verb = g_strdup_printf ("Preset_%d", preset_index);
-+			node = bonobo_ui_node_new ("menuitem");	
- 			bonobo_ui_node_set_attr (node, "name", verb);
- 			bonobo_ui_node_set_attr (node, "verb", verb);
- 			bonobo_ui_node_set_attr (node, "label", preset_display_name);
-@@ -1415,6 +1417,7 @@
- on_presets_submenu_item_activate (BonoboUIComponent *uic, TimerApplet *timer_applet, const gchar *verb)
- {
- 	int preset_index;
-+	GtkTreeIter iter;
- 	
- 	g_assert (timer_applet);
- 	
-@@ -1423,7 +1426,6 @@
- 		return;
- 	}
- 
--	GtkTreeIter iter;
- 	{
- 		GtkTreePath *path = gtk_tree_path_new_from_indices (preset_index, -1);
- 		gboolean iter_set = gtk_tree_model_get_iter (GTK_TREE_MODEL (timer_presets_list), &iter, path);
diff --git a/deskutils/timer-applet/pkg-plist b/deskutils/timer-applet/pkg-plist
index 0f7bac22a..1359518a7 100644
--- a/deskutils/timer-applet/pkg-plist
+++ b/deskutils/timer-applet/pkg-plist
@@ -9,9 +9,13 @@ share/gnome/omf/timer-applet/timer-applet-C.omf
 share/gnome/omf/timer-applet/timer-applet-fr.omf
 share/gnome/pixmaps/timer-applet/timer-applet-icon.png
 share/locale/de/LC_MESSAGES/timer-applet.mo
+share/locale/eo/LC_MESSAGES/timer-applet.mo
 share/locale/es/LC_MESSAGES/timer-applet.mo
 share/locale/eu/LC_MESSAGES/timer-applet.mo
+share/locale/fi/LC_MESSAGES/timer-applet.mo
 share/locale/fr/LC_MESSAGES/timer-applet.mo
+share/locale/it/LC_MESSAGES/timer-applet.mo
+share/locale/ko/LC_MESSAGES/timer-applet.mo
 share/locale/pl/LC_MESSAGES/timer-applet.mo
 share/locale/sv/LC_MESSAGES/timer-applet.mo
 share/locale/tr/LC_MESSAGES/timer-applet.mo