10 files changed, 157 insertions, 38 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 10c307825914..f11fdb353fa9 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.10
+MASTER_SITE_SUBDIR=	sources/control-center/2.12
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -24,9 +25,11 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	yes
+WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
 		gnomemenus desktopfileutils
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -38,9 +41,27 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
+.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'
+	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
+		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
 	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
 		s|/bin/gzip|/usr/bin/gzip|g' \
 		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
@@ -48,4 +69,4 @@ post-patch:
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index b834f271fa82..550ff98a48b6 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589
-SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639
+MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523
+SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
new file mode 100644
index 000000000000..7ea6bb0dd359
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
@@ -0,0 +1,16 @@
+--- 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>
++#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/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
new file mode 100644
index 000000000000..0d1f85f32c7f
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me.c
@@ -0,0 +1,34 @@
+--- 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);
+ 
+ 	/************************************************/
diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
new file mode 100644
index 000000000000..ab7180f75c17
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,17 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jul 27 13:48:58 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Jul 27 13:49:37 2005
+@@ -265,11 +265,12 @@
+                                          GladeXML * dialog)
+ {
+   GtkWidget *expander, *align, *vbox;
++  gchar *utfGroupName, *titlemarkup;
+ 
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+   expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 000000000000..32c81dfdebba
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,21 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Mon Sep  5 17:05:46 2005
++++ capplets/mouse/gnome-mouse-properties.c	Mon Sep  5 17:06:23 2005
+@@ -658,7 +658,8 @@
+ 
+ 	gchar **iterator = NULL;
+ 	gchar **paths = NULL;
+-
++	const gchar *xpaths;
++	
+ 	GConfClient* client = gconf_client_get_default();
+ 	GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model));
+ 	gchar* current_theme = gconf_client_get_string(client, CURSOR_THEME_KEY, NULL);
+@@ -666,7 +667,7 @@
+ 	g_object_unref(client);
+ 	client = NULL;
+ 
+-	const gchar *xpaths = g_getenv ("XCURSOR_PATH");
++	xpaths = g_getenv ("XCURSOR_PATH");
+ 
+ 	if (xpaths != NULL) {
+ 		paths = g_strsplit (xpaths, ":", 0);
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
deleted file mode 100644
index 52a627fb20df..000000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:19:31 2004
-+++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:20:45 2004
-@@ -296,7 +296,7 @@
- Datadir = $(datadir)/control-center-2.0/interfaces/
- Data_DATA = acme.glade
- 
--pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
-+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
- pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
- 
- EXTRA_DIST = \
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
index f66b82c9ffd1..ed30cddab65a 100644
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -1,6 +1,6 @@
---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Thu Oct 14 15:44:21 2004
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Thu Oct 14 15:44:38 2004
-@@ -813,7 +813,7 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Wed Jul 27 13:52:13 2005
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Wed Jul 27 13:52:32 2005
+@@ -828,7 +828,7 @@
  		do_mail_action (acme);
  		break;
  	case SLEEP_KEY:
@@ -8,4 +8,4 @@
 +		do_sleep_action ("zzz", "xset dpms force off");
  		break;
  	case SCREENSAVER_KEY:
- 		execute ("xscreensaver-command -lock", FALSE);
+ 		if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
deleted file mode 100644
index 149d59a9b0c8..000000000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/wm-list.c.orig	Tue Oct  8 17:43:12 2002
-+++ libwindow-settings/wm-list.c	Tue Oct  8 17:43:25 2002
-@@ -251,7 +251,7 @@
-         gchar *name;
- 	GConfClient *client;
- 	
--        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
-         wm_list_read_dir (tempdir, FALSE);
-         g_free (tempdir);
-         
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 9bf38dd44446..b43391f76cfb 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,3 +1,4 @@
+%%ABOUTME%%bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -40,6 +41,7 @@ share/gnome/applications/background.desktop
 share/gnome/applications/default-applications.desktop
 share/gnome/applications/display-properties.desktop
 share/gnome/applications/font-properties.desktop
+%%ABOUTME%%share/gnome/applications/gnome-about-me.desktop
 share/gnome/applications/gnome-font-viewer.desktop
 share/gnome/applications/gnome-network-preferences.desktop
 share/gnome/applications/gnome-settings-mouse.desktop
@@ -51,12 +53,12 @@ share/gnome/applications/keybinding.desktop
 share/gnome/applications/keyboard.desktop
 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
 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
 share/gnome/control-center-2.0/interfaces/font-properties.glade
+%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.glade
 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade
@@ -84,6 +86,12 @@ 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
+share/gnome/control-center-2.0/pixmaps/acme-brightness.png
+share/gnome/control-center-2.0/pixmaps/acme-eject.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.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
@@ -111,15 +119,27 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
+share/gnome/help/control-center/C/config-accessibility-keyboard.xml
+share/gnome/help/control-center/C/config-background.xml
+share/gnome/help/control-center/C/config-behavior.xml
+share/gnome/help/control-center/C/config-cds.xml
+share/gnome/help/control-center/C/config-default-apps.xml
+share/gnome/help/control-center/C/config-file-type.xml
+share/gnome/help/control-center/C/config-hints.xml
+share/gnome/help/control-center/C/config-html.xml
+share/gnome/help/control-center/C/config-kbd.xml
+share/gnome/help/control-center/C/config-keybindings.xml
+share/gnome/help/control-center/C/config-mouse.xml
+share/gnome/help/control-center/C/config-screensaver.xml
+share/gnome/help/control-center/C/config-sound.xml
+share/gnome/help/control-center/C/config-themes.xml
+share/gnome/help/control-center/C/control-center.xml
 share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/omf/control-center/control-center-C.omf
 share/gnome/pixmaps/display-capplet.png
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
-share/icons/gnome/48x48/apps/acme-brightness.png
-share/icons/gnome/48x48/apps/acme-eject.png
-share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
-share/icons/gnome/48x48/apps/gnome-speakernotes.png
 share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
@@ -155,6 +175,7 @@ share/locale/is/LC_MESSAGES/control-center-2.0.mo
 share/locale/it/LC_MESSAGES/control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/control-center-2.0.mo
+share/locale/ku/LC_MESSAGES/control-center-2.0.mo
 share/locale/lt/LC_MESSAGES/control-center-2.0.mo
 share/locale/lv/LC_MESSAGES/control-center-2.0.mo
 share/locale/mk/LC_MESSAGES/control-center-2.0.mo
@@ -181,6 +202,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/te/LC_MESSAGES/control-center-2.0.mo
 share/locale/th/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/control-center-2.0.mo
@@ -190,9 +212,18 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso 2> /dev/null || true
-@dirrm share/gnome/gnome-background-properties
+@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
@@ -200,4 +231,5 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true