Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

5 files changed, 144 insertions, 116 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index fe250e8a4c15..0829a1f84d91 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.120 2006/10/03 00:02:39 ahze Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.132 2007/03/12 22:05:56 marcus Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
-		gnomemenus desktopfileutils nautilus2
+		gnomemenus desktopfileutils libgnomekbd gnomepanel
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
@@ -39,8 +39,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
 		apps_gnome_settings_daemon_screensaver.schemas \
+		control-center.schemas \
 		desktop_gnome_font_rendering.schemas \
-		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 428041be50db..f6b4fabd0a84 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.16.3.tar.bz2) = 75ec00d864a69684abc561546fb762bb
-SHA256 (gnome2/control-center-2.16.3.tar.bz2) = 6bffec96f9014b3742df80f193b68877e31b26b2a1cc0ba961fcba15a22af9d9
-SIZE (gnome2/control-center-2.16.3.tar.bz2) = 2025478
+MD5 (gnome2/control-center-2.18.0.tar.bz2) = e5251c30c45577b78770beb2df59df5d
+SHA256 (gnome2/control-center-2.18.0.tar.bz2) = 5879c85775c2ba659174c506def2f0db11cad4215c956415c5e13908c5d06611
+SIZE (gnome2/control-center-2.18.0.tar.bz2) = 2138980
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 94466c8551f1..6527e6758b0e 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,28 +1,10 @@
---- configure.orig	Thu Jul 13 12:02:50 2006
-+++ configure	Thu Jul 13 12:04:24 2006
-@@ -22229,6 +22229,7 @@ echo $ECHO_N "checking for $ac_func... $
- if eval "test \"\${$as_ac_var+set}\" = set"; then
+--- configure.orig	Tue Feb 13 07:51:47 2007
++++ configure	Tue Feb 13 07:51:47 2007
+@@ -22302,6 +22302,7 @@
+ if test "${gt_cv_func_ngettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 +  LIBS="-lintl $LIBS"
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28440,7 +28441,7 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG 
- 
- 
- # dbus directory
--DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
-+DBUS_SERVICES_DIR='$(prefix)'"/share/dbus-1/services"
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -29126,7 +29127,7 @@ fi
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
-+#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- _ACEOF
- 
- 
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
new file mode 100644
index 000000000000..86acdbe0c46e
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
@@ -0,0 +1,9 @@
+--- libslab/directory-tile.c.orig	Mon Mar 12 16:33:35 2007
++++ libslab/directory-tile.c	Mon Mar 12 16:35:48 2007
+@@ -644,5 +644,5 @@ static void
+ disown_spawned_child (gpointer user_data)
+ {
+ 	setsid  ();
+-	setpgrp ();
++	setpgrp (0, 0);
+ }
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index f37dab73c184..955244143dbf 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -21,9 +21,29 @@ bin/gnome-window-properties
 bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
+etc/xdg/menus/gnomecc.menu
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
+include/slab/app-resizer.h
+include/slab/app-shell-startup.h
+include/slab/app-shell.h
+include/slab/application-tile.h
+include/slab/directory-tile.h
+include/slab/document-tile.h
+include/slab/gnome-utils.h
+include/slab/nameplate-tile.h
+include/slab/nld-marshal.c
+include/slab/nld-marshal.h
+include/slab/search-bar.h
+include/slab/search-context-picker.h
+include/slab/search-entry-watermark.h
+include/slab/search-entry.h
+include/slab/shell-window.h
+include/slab/slab-gnome-util.h
+include/slab/slab-section.h
+include/slab/system-tile.h
+include/slab/tile.h
 lib/gnome-vfs-2.0/modules/libfont-method.a
 lib/gnome-vfs-2.0/modules/libfont-method.la
 lib/gnome-vfs-2.0/modules/libfont-method.so
@@ -34,6 +54,10 @@ lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
+lib/libslab.a
+lib/libslab.la
+lib/libslab.so
+lib/libslab.so.0
 lib/nautilus/extensions-1.0/libnautilus-fontilus.a
 lib/nautilus/extensions-1.0/libnautilus-fontilus.la
 lib/nautilus/extensions-1.0/libnautilus-fontilus.so
@@ -45,6 +69,7 @@ lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
 libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
+libdata/pkgconfig/libslab.pc
 libexec/gnome-settings-daemon
 share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/gnome/applications/accessibility-keyboard.desktop
@@ -58,6 +83,7 @@ share/gnome/applications/gnome-font-viewer.desktop
 share/gnome/applications/gnome-network-preferences.desktop
 share/gnome/applications/gnome-settings-mouse.desktop
 share/gnome/applications/gnome-settings-sound.desktop
+share/gnome/applications/gnome-theme-installer.desktop
 share/gnome/applications/gnome-ui-properties.desktop
 share/gnome/applications/gnomecc.desktop
 share/gnome/applications/gtk-theme-selector.desktop
@@ -65,73 +91,72 @@ share/gnome/applications/keybinding.desktop
 share/gnome/applications/keyboard.desktop
 share/gnome/applications/themus-theme-applier.desktop
 share/gnome/applications/window-properties.desktop
-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
-share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
-share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
-share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
-share/gnome/control-center-2.0/interfaces/sound-properties.glade
-share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/acme-eject.png
-share/gnome/control-center-2.0/pixmaps/at-startup.png
-share/gnome/control-center-2.0/pixmaps/at-support.png
-share/gnome/control-center-2.0/pixmaps/bar-disabled.png
-share/gnome/control-center-2.0/pixmaps/bar-green.png
-share/gnome/control-center-2.0/pixmaps/bar-red.png
-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-lock-open.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock.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
-share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
-share/gnome/control-center-2.0/pixmaps/mouse-left.png
-share/gnome/control-center-2.0/pixmaps/mouse-right.png
-share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
-share/gnome/control-center-2.0/pixmaps/stop.png
-share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
-share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
-share/gnome/control-center-2.0/pixmaps/visual-bell.png
-share/gnome/control-center-2.0/xrdb/Editres.ad
-share/gnome/control-center-2.0/xrdb/Emacs.ad
-share/gnome/control-center-2.0/xrdb/General.ad
-share/gnome/control-center-2.0/xrdb/Motif.ad
-share/gnome/control-center-2.0/xrdb/Tk.ad
-share/gnome/control-center-2.0/xrdb/Xaw.ad
+share/gnome/control-center/glade/acme.glade
+share/gnome/control-center/glade/apply-font.glade
+share/gnome/control-center/glade/at-enable-dialog.glade
+share/gnome/control-center/glade/font-properties.glade
+%%ABOUTME%%share/gnome/control-center/glade/gnome-about-me.glade
+share/gnome/control-center/glade/gnome-accessibility-keyboard-properties.glade
+share/gnome/control-center/glade/gnome-background-properties.glade
+share/gnome/control-center/glade/gnome-default-applications-properties.glade
+share/gnome/control-center/glade/gnome-keybinding-properties.glade
+share/gnome/control-center/glade/gnome-keyboard-properties.glade
+share/gnome/control-center/glade/gnome-mouse-properties.glade
+share/gnome/control-center/glade/gnome-network-preferences.glade
+share/gnome/control-center/glade/gnome-ui-properties.glade
+share/gnome/control-center/glade/gnome-window-properties.glade
+share/gnome/control-center/glade/modmap-dialog.glade
+share/gnome/control-center/glade/sound-properties.glade
+share/gnome/control-center/glade/theme-properties.glade
+share/gnome/control-center/gnome-default-applications.xml
+share/gnome/control-center/icons/display-capplet.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-bouncekey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-mousekey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-slowkey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-stickykey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-togglekey.png
+share/gnome/control-center/pixmaps/acme-eject.png
+share/gnome/control-center/pixmaps/at-startup.png
+share/gnome/control-center/pixmaps/at-support.png
+share/gnome/control-center/pixmaps/bar-disabled.png
+share/gnome/control-center/pixmaps/bar-green.png
+share/gnome/control-center/pixmaps/bar-red.png
+share/gnome/control-center/pixmaps/bar.png
+share/gnome/control-center/pixmaps/double-click-maybe.png
+share/gnome/control-center/pixmaps/double-click-off.png
+share/gnome/control-center/pixmaps/double-click-on.png
+%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock.png
+share/gnome/control-center/pixmaps/keyboard-bell.png
+share/gnome/control-center/pixmaps/keyboard-cursor.png
+share/gnome/control-center/pixmaps/keyboard-repeat.png
+share/gnome/control-center/pixmaps/keyboard-volume.png
+share/gnome/control-center/pixmaps/mouse-cursor-normal-large.png
+share/gnome/control-center/pixmaps/mouse-cursor-normal.png
+share/gnome/control-center/pixmaps/mouse-cursor-white-large.png
+share/gnome/control-center/pixmaps/mouse-cursor-white.png
+share/gnome/control-center/pixmaps/mouse-left.png
+share/gnome/control-center/pixmaps/mouse-right.png
+share/gnome/control-center/pixmaps/ocean-stripes.png
+share/gnome/control-center/pixmaps/stop.png
+share/gnome/control-center/pixmaps/subpixel-bgr.png
+share/gnome/control-center/pixmaps/subpixel-rgb.png
+share/gnome/control-center/pixmaps/subpixel-vbgr.png
+share/gnome/control-center/pixmaps/subpixel-vrgb.png
+share/gnome/control-center/pixmaps/theme-thumbnailing.png
+share/gnome/control-center/pixmaps/visual-bell.png
+share/gnome/control-center/xrdb/Editres.ad
+share/gnome/control-center/xrdb/Emacs.ad
+share/gnome/control-center/xrdb/General.ad
+share/gnome/control-center/xrdb/Motif.ad
+share/gnome/control-center/xrdb/Tk.ad
+share/gnome/control-center/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/desktop-directories/font-method.directory
+share/gnome/desktop-directories/gnomecc.directory
 share/gnome/desktop-directories/theme-method.directory
-share/gnome/gnome-default-applications/gnome-default-applications.xml
 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
@@ -147,21 +172,26 @@ 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/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/pa/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/uk/control-center.xml
 share/gnome/help/control-center/zh_CN/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/omf/control-center/control-center-en_GB.omf
 share/gnome/omf/control-center/control-center-es.omf
 share/gnome/omf/control-center/control-center-fr.omf
+share/gnome/omf/control-center/control-center-pa.omf
 share/gnome/omf/control-center/control-center-ru.omf
 share/gnome/omf/control-center/control-center-sv.omf
+share/gnome/omf/control-center/control-center-uk.omf
 share/gnome/omf/control-center/control-center-zh_CN.omf
 share/gnome/pixmaps/display-capplet.png
-share/icons/hicolor/48x48/apps/gnome-control-center.png
+share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/typing-monitor.svg
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
@@ -240,28 +270,8 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_HK/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
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/gnome-default-applications
-@dirrm share/gnome/gnome-background-properties
-@dirrm share/gnome/desktop-directories
-@dirrm share/gnome/cursor-fonts
-@dirrm share/gnome/control-center-2.0/xrdb
-@dirrm share/gnome/control-center-2.0/pixmaps
-@dirrm share/gnome/control-center-2.0/interfaces
-@dirrmtry share/gnome/control-center-2.0/icons
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/mime/application/x-gnome-theme-package.xml
+share/mime/packages/gnome-theme-package.xml
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
@@ -320,3 +330,30 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
+@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
+@dirrm share/gnome/cursor-fonts
+@dirrm share/gnome/control-center/xrdb
+@dirrm share/gnome/control-center/pixmaps
+@dirrmtry share/gnome/control-center/icons
+@dirrm share/gnome/control-center/glade
+@dirrm lib/window-manager-settings
+@dirrm include/slab
+@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true