Update to 2.13.3.

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

2 files changed, 21 insertions, 46 deletions

diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
index 7ea6bb0dd..49727c882 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -1,16 +1,25 @@
---- capplets/about-me/gnome-about-me-password.c.orig	Wed Aug 10 05:45:08 2005
-+++ capplets/about-me/gnome-about-me-password.c	Wed Aug 10 15:44:57 2005
-@@ -35,7 +35,13 @@
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <termios.h>
-+#include <signal.h>
+--- capplets/about-me/gnome-about-me-password.c.orig	Mon Nov 28 10:02:57 2005
++++ capplets/about-me/gnome-about-me-password.c	Wed Dec 14 13:56:42 2005
+@@ -25,7 +25,9 @@
+ #  include <config.h>
+ #endif
+ 
 +#ifndef __FreeBSD__
- #include <pty.h>
-+#else
+ #include <stropts.h>
++#endif
+ #include <gnome.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+@@ -45,6 +47,12 @@
+ 
+ #if __sun
+ #include <sys/types.h>
++#include <signal.h>
++#endif
++
++#if __FreeBSD__
 +#include <sys/types.h>
 +#include <libutil.h>
-+#endif
+ #include <signal.h>
+ #endif
  
- #include "capplet-util.h"
- #include "eel-alert-dialog.h"
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
deleted file mode 100644
index 0d1f85f32..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- capplets/about-me/gnome-about-me.c.orig	Wed Jul 27 13:45:17 2005
-+++ capplets/about-me/gnome-about-me.c	Wed Jul 27 13:47:09 2005
-@@ -258,12 +258,10 @@
- static char *
- get_user_login (void)
- {
--	char buf[LINE_MAX * 4];
--	struct passwd pwd, *err;
-+	struct passwd *pwd;
- 
--	int i;
--	i = getpwuid_r(getuid(), &pwd, buf, sizeof(buf), &err);
--	return ((i == 0) && (err == &pwd)) ? g_strdup(pwd.pw_name) : NULL;
-+	pwd = getpwuid(getuid());
-+	return (pwd != NULL) ? g_strdup(pwd->pw_name) : NULL;
- }
- 
- /*
-@@ -664,6 +662,7 @@
- 	struct passwd *pwent;
- 	char *user = NULL;
- 	gchar *str;
-+	gchar **tok;
- 
- 	me = g_new0 (GnomeAboutMe, 1);
- 
-@@ -733,7 +732,6 @@
- 				_("Unknown login ID, the user database might be corrupted"));
- 		return ;
- 	}
--	gchar **tok;
- 	tok = g_strsplit (pwent->pw_gecos, ",", 0);
- 
- 	/************************************************/