summaryrefslogtreecommitdiffstats
path: root/sysutils/gnomecontrolcenter2
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/gnomecontrolcenter2')
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile4
-rw-r--r--sysutils/gnomecontrolcenter2/distinfo6
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c33
-rw-r--r--sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c34
4 files changed, 26 insertions, 51 deletions
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index a5891e7aa..088fbf7b6 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.86 2005/11/06 02:52:07 ahze Exp $
+# $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.87 2005/11/14 19:24:07 ahze Exp $
#
PORTNAME= gnomecontrolcenter2
-PORTVERSION= 2.13.2
+PORTVERSION= 2.13.3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/2.13
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 825590ba4..6c40f65e8 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.13.2.tar.bz2) = bfd70d61e331b559fcb271aa0ceafeb7
-SHA256 (gnome2/control-center-2.13.2.tar.bz2) = 36348b6d730c9b6d11e043a836c62b330301246575513a623a81fbcafcc861ff
-SIZE (gnome2/control-center-2.13.2.tar.bz2) = 1783706
+MD5 (gnome2/control-center-2.13.3.tar.bz2) = 972f2e962a871c7bacdf6acf5e3a4999
+SHA256 (gnome2/control-center-2.13.3.tar.bz2) = 506505111b3cab78e95e1f4d911c3dcf859e2b2ae5016ad466a1c44c8aa5c35d
+SIZE (gnome2/control-center-2.13.3.tar.bz2) = 1795665
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);
-
- /************************************************/