Update to 2.3.7.

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

5 files changed, 62 insertions, 25 deletions

diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index bbfee865b..9ac5010e5 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.3.6
-PORTREVISION=	3
+PORTVERSION=	2.3.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.3
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 0d0e3340e..85cad3191 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.3.6.tar.bz2) = f2b49d4c45c3eba21e008f1618110cd5
+MD5 (gnome2/gnome-applets-2.3.7.tar.bz2) = ef1cdea7405d04cd952b952789cf745c
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
new file mode 100644
index 000000000..973b7e342
--- /dev/null
+++ b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
@@ -0,0 +1,11 @@
+--- stickynotes/Makefile.in.orig	Thu Aug 28 01:00:09 2003
++++ stickynotes/Makefile.in	Thu Aug 28 01:00:26 2003
+@@ -142,7 +142,7 @@
+ 
+ SUBDIRS = pixmaps docs
+ 
+-CFLAGS = -Wall -g
++CFLAGS += -Wall -g
+ 
+ INCLUDES =  	-I. 	-I$(srcdir) 	$(GNOME_APPLETS_CFLAGS) 	$(LIBGLADE_CFLAGS) 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 	-DSTICKYNOTES_GLADEDIR=\"$(gladedir)\" 	-DSTICKYNOTES_ICONDIR=\"$(icondir)\"
+ 
diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
index 40a83db7b..5c1e32e88 100644
--- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
+++ b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
@@ -1,5 +1,5 @@
---- wireless/wireless-applet.c.orig	Sun May 18 11:50:43 2003
-+++ wireless/wireless-applet.c	Fri Aug  8 10:10:53 2003
+--- wireless/wireless-applet.c.orig	Sat Aug 23 09:10:54 2003
++++ wireless/wireless-applet.c	Thu Aug 28 00:44:16 2003
 @@ -30,12 +30,25 @@
  #include <math.h>
  #include <dirent.h>
@@ -26,7 +26,7 @@
  #define CFG_UPDATE_INTERVAL 2
  
  typedef enum {
-@@ -93,6 +106,12 @@
+@@ -89,6 +102,12 @@
  		WirelessApplet *applet);
  static void wireless_applet_about_cb (BonoboUIComponent *uic,
  		WirelessApplet *applet);
@@ -39,17 +39,20 @@
  
  static const BonoboUIVerb wireless_menu_verbs [] = {
  	BONOBO_UI_UNSAFE_VERB ("WirelessProperties",
-@@ -150,7 +169,9 @@
+@@ -143,9 +162,11 @@
  	g_free (tmp);
  
  	/* Update the image */
 +#ifndef __FreeBSD__
- 	percent = CLAMP (percent, 0, 100);
+ 	percent = CLAMP (percent, -1, 100);
 +#endif
  
- 	if (applet->pixmaps[percent] != applet->current_pixmap)
- 	{
-@@ -234,6 +255,7 @@
+-	if (percent < 0)
++	if (percent < 0 || percent > 100)
+ 		state = PIX_BROKEN;
+ 	else if (percent == 0)
+ 		state = PIX_NO_LINK;
+@@ -176,6 +197,7 @@
  	int percent;
  
  	/* Calculate the percentage based on the link quality */
@@ -57,7 +60,7 @@
  	if (level < 0) {
  		percent = -1;
  	} else {
-@@ -244,8 +266,11 @@
+@@ -186,6 +208,9 @@
  			percent = CLAMP (percent, 0, 100);
  		}
  	}
@@ -65,13 +68,10 @@
 +	percent = (int)level;
 +#endif
  
--	if (percent < 0) {
-+	if (percent < 0 || percent > 100) {
- 		applet->state = BUSTED_LINK;
- 		wireless_applet_animation_state (applet);
- 	} else if (percent == 0) {
-@@ -387,22 +412,179 @@
- 	applet->show_dialogs = show;
+ 	wireless_applet_draw (applet, percent);
+ }
+@@ -228,22 +253,179 @@
+ 	}
  }
  
 +#ifdef __FreeBSD__
@@ -252,7 +252,7 @@
  		char *ptr;
  
  		fgets (line, 256, applet->file);
-@@ -435,6 +617,7 @@
+@@ -276,6 +458,7 @@
  				wireless_applet_update_state (applet, device, link, level, noise);
  			}
  		}
@@ -260,7 +260,7 @@
  	} while (1);
  
  	if (g_list_length (applet->devices)==1) {
-@@ -446,17 +629,23 @@
+@@ -287,17 +470,23 @@
  	}
  
  	/* rewind the /proc/net/wireless file */
@@ -284,7 +284,7 @@
  
  	wireless_applet_read_device_state (applet);
  
-@@ -522,6 +711,7 @@
+@@ -344,6 +533,7 @@
  static void
  start_file_read (WirelessApplet *applet)
  {
@@ -292,7 +292,7 @@
  	applet->file = fopen ("/proc/net/wireless", "rt");
  	if (applet->file == NULL) {
  		gtk_tooltips_set_tip (applet->tips,
-@@ -530,6 +720,7 @@
+@@ -352,6 +542,7 @@
  				NULL);
  		show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
  	}
@@ -300,7 +300,7 @@
  }
  
  static void
-@@ -775,8 +966,10 @@
+@@ -577,8 +768,10 @@
  		applet->prefs = NULL;
  	}
  
@@ -310,4 +310,4 @@
 +#endif
  }
  
- static GtkWidget *
+ static void
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index e210c4749..0973a959b 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -698,6 +698,26 @@ share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png
 share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/zh_TW/legal.xml
 share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml
+share/gnome/help/modemlights/C/figures/modemlights-advanced.png
+share/gnome/help/modemlights/C/figures/modemlights-advpref.png
+share/gnome/help/modemlights/C/figures/modemlights-color.png
+share/gnome/help/modemlights/C/figures/modemlights-general.png
+share/gnome/help/modemlights/C/figures/modemlights-prefs.png
+share/gnome/help/modemlights/C/figures/modemlights.png
+share/gnome/help/modemlights/C/figures/modemlights_applet.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_button.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_general.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png
+share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png
+share/gnome/help/modemlights/C/legal.xml
+share/gnome/help/modemlights/C/modemlights.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
 share/gnome/omf/gnome-applets/accessx-status-C.omf
@@ -886,6 +906,8 @@ share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/modemlights-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/stickynotes_applet-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/accessx-status-applet/ax-applet.png
@@ -1148,6 +1170,7 @@ share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1185,6 +1208,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/pixmaps/accessx-status-applet
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/modemlights/C/figures
+@dirrm share/gnome/help/modemlights/C
+@dirrm share/gnome/help/modemlights
 @dirrm share/gnome/help/mixer_applet2/zh_TW/figures
 @dirrm share/gnome/help/mixer_applet2/zh_TW
 @dirrm share/gnome/help/mixer_applet2/zh_CN/figures
@@ -1510,4 +1536,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-sv.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/modemlights-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/stickynotes_applet-C.omf 2>/dev/null || /usr/bin/true