Update to 2.11.2.

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

8 files changed, 44 insertions, 30 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 63088e7fd..a750e29a9 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.85 2005/07/04 00:15:01 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index ea9a43b60..bded4c2c0 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.11.1.tar.bz2) = e8ce3499fe74d471c3fdfeff3ed5637a
-SIZE (gnome2/gnome-applets-2.11.1.tar.bz2) = 6449565
+MD5 (gnome2/gnome-applets-2.11.2.tar.bz2) = 9ca884986e8a92eb1271ffd34e41042a
+SIZE (gnome2/gnome-applets-2.11.2.tar.bz2) = 6518656
diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
deleted file mode 100644
index a6bed2361..000000000
--- a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- battstat/battstat.schemas.in.orig	Fri Oct  1 16:22:39 2004
-+++ battstat/battstat.schemas.in	Fri Oct  1 16:22:46 2004
-@@ -115,7 +115,7 @@
-         <key>/schemas/apps/battstat-applet/prefs/suspend_command</key>
-         <owner>battstat-applet</owner>
-         <type>string</type>
--        <default>/usr/bin/apm -s</default>
-+        <default>/usr/sbin/zzz</default>
-         <locale name="C">
- 	  <short>Suspend Command</short>
-           <long>Command to send to suspend the computer</long>
diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c
new file mode 100644
index 000000000..718f52a0d
--- /dev/null
+++ b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c
@@ -0,0 +1,18 @@
+--- stickynotes/stickynotes_applet_callbacks.c.orig	Wed Jul 13 18:57:03 2005
++++ stickynotes/stickynotes_applet_callbacks.c	Wed Jul 13 18:57:13 2005
+@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c
+ {
+ 	static Window desktop_window = 0;
+ 	static Display *dpy;
++	XEvent event;
+ 
+ 	if (desktop_window == 0) {
+ 		desktop_window = get_desktop_window ();
+@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c
+                  * at every click on the desktop */
+ 		XSelectInput(dpy, desktop_window, PropertyChangeMask);
+ 	}
+-	XEvent event;
+ 
+ 	if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) {
+ 		stickynote_show_notes (FALSE);
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 63088e7fd..a750e29a9 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.85 2005/07/04 00:15:01 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.11.1
+PORTVERSION=	2.11.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index ea9a43b60..bded4c2c0 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.11.1.tar.bz2) = e8ce3499fe74d471c3fdfeff3ed5637a
-SIZE (gnome2/gnome-applets-2.11.1.tar.bz2) = 6449565
+MD5 (gnome2/gnome-applets-2.11.2.tar.bz2) = 9ca884986e8a92eb1271ffd34e41042a
+SIZE (gnome2/gnome-applets-2.11.2.tar.bz2) = 6518656
diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in
deleted file mode 100644
index a6bed2361..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- battstat/battstat.schemas.in.orig	Fri Oct  1 16:22:39 2004
-+++ battstat/battstat.schemas.in	Fri Oct  1 16:22:46 2004
-@@ -115,7 +115,7 @@
-         <key>/schemas/apps/battstat-applet/prefs/suspend_command</key>
-         <owner>battstat-applet</owner>
-         <type>string</type>
--        <default>/usr/bin/apm -s</default>
-+        <default>/usr/sbin/zzz</default>
-         <locale name="C">
- 	  <short>Suspend Command</short>
-           <long>Command to send to suspend the computer</long>
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c
new file mode 100644
index 000000000..718f52a0d
--- /dev/null
+++ b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c
@@ -0,0 +1,18 @@
+--- stickynotes/stickynotes_applet_callbacks.c.orig	Wed Jul 13 18:57:03 2005
++++ stickynotes/stickynotes_applet_callbacks.c	Wed Jul 13 18:57:13 2005
+@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c
+ {
+ 	static Window desktop_window = 0;
+ 	static Display *dpy;
++	XEvent event;
+ 
+ 	if (desktop_window == 0) {
+ 		desktop_window = get_desktop_window ();
+@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c
+                  * at every click on the desktop */
+ 		XSelectInput(dpy, desktop_window, PropertyChangeMask);
+ 	}
+-	XEvent event;
+ 
+ 	if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) {
+ 		stickynote_show_notes (FALSE);