Update to 2.11.5.

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

5 files changed, 71 insertions, 5 deletions

diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 81a5d350f..6d8708f3f 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.74 2005/06/28 05:40:09 adamw Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.75 2005/07/01 18:06:17 marcus Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.11.4
+PORTVERSION=	2.11.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.11
@@ -39,6 +39,17 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+=	evolutiondataserver
+CONFIGURE_ARGS+=--enable-aboutme
+PLIST_SUB+=	ABOUTME=""
+.else
+CONFIGURE_ARGS+=--disable-aboutme
+PLIST_SUB+=	ABOUTME="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
@@ -51,4 +62,4 @@ post-patch:
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 5e288503f..2145b23ae 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.11.4.tar.bz2) = f3f5303df9f78e0ca85ae1569db4a8b3
-SIZE (gnome2/control-center-2.11.4.tar.bz2) = 2685506
+MD5 (gnome2/control-center-2.11.5.tar.bz2) = 2e6f3a42b2ccf1cf57fa8a49841e919c
+SIZE (gnome2/control-center-2.11.5.tar.bz2) = 2735971
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
new file mode 100644
index 000000000..2b31d0f01
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -0,0 +1,15 @@
+--- capplets/about-me/gnome-about-me-password.c.orig	Tue Jul  5 14:14:11 2005
++++ capplets/about-me/gnome-about-me-password.c	Tue Jul  5 14:14:50 2005
+@@ -35,7 +35,12 @@
+ #include <sys/wait.h>
+ #include <sys/poll.h>
+ #include <termios.h>
++#ifndef __FreeBSD__
+ #include <pty.h>
++#else
++#include <sys/types.h>
++#include <libutil.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
new file mode 100644
index 000000000..98c92bb99
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_about-me_gnome-about-me.c
@@ -0,0 +1,34 @@
+--- capplets/about-me/gnome-about-me.c.orig	Tue Jul  5 14:17:38 2005
++++ capplets/about-me/gnome-about-me.c	Tue Jul  5 14:20:06 2005
+@@ -260,12 +260,10 @@ about_me_focus_out (GtkWidget *widget, G
+ 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;
+ }
+ 
+ /*
+@@ -655,6 +653,7 @@ about_me_setup_dialog (void)
+ 	struct passwd *pwent;
+ 	char *user = NULL;
+ 	gchar *str;
++	gchar **tok;
+ 
+ 	me = g_new0 (GnomeAboutMe, 1);
+ 
+@@ -711,7 +710,6 @@ about_me_setup_dialog (void)
+ 				_("Unknown login ID, the user database might be corrupted"));
+ 		return ;
+ 	}
+-	gchar **tok;
+ 	tok = g_strsplit (pwent->pw_gecos, ",", 0);
+ 
+ 	/************************************************/
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 9bf38dd44..8a9b0b40f 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -1,3 +1,4 @@
+%%ABOUTME%%bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -34,6 +35,7 @@ lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/gnome-settings-daemon
+%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
 share/gnome/applications/accessibility-keyboard.desktop
 share/gnome/applications/at-properties.desktop
 share/gnome/applications/background.desktop
@@ -53,6 +55,7 @@ share/gnome/applications/themus-theme-applier.desktop
 share/gnome/applications/window-properties.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/control-center-2.0/icons/display-capplet.png
+%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade
 share/gnome/control-center-2.0/interfaces/acme.glade
 share/gnome/control-center-2.0/interfaces/apply-font.glade
 share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
@@ -84,6 +87,9 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
+%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png