diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile
index 89f9d582033..3fabf70b6c0 100644
--- a/x11/gnome/panel/Makefile
+++ b/x11/gnome/panel/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.55 2009/04/16 08:11:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.56 2009/06/07 10:46:40 ajacoutot Exp $
 
 COMMENT=		GNOME panel
 
 GNOME_PROJECT=		gnome-panel
 GNOME_VERSION=		2.24.3
-PKGNAME=		${DISTNAME}p6
+PKGNAME=		${DISTNAME}p7
 
 SHARED_LIBS=	panel-applet-2       2.24      # .2.26
 CATEGORIES=		x11
@@ -25,7 +25,7 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xau Xcomposite \
 		Xrender art_lgpl_2 asn1 atk-1.0 bonobo-2 \
 		bonobo-activation bonoboui-2 bz2 c cairo com_err croco-0.6 \
 		crypto dbus-1 dbus-glib-1 expat fontconfig freetype \
-		gailutil gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
+		gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
 		glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \
 		gnomecanvas-2 gnomeui-2 gnomevfs-2 gnutls gobject-2.0 \
 		gpg-error gsf-1 gssapi gthread-2.0 gtk-x11-2.0 krb5 m \
@@ -35,7 +35,8 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xau Xcomposite \
 		ssl3 startup-notification-1 tasn1 util xml2 z
 
 MODULES=		devel/gettext \
-			x11/gnome
+			x11/gnome \
+			devel/gconf2
 
 LIB_DEPENDS= 		camel-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2::databases/evolution-data-server \
 			wnck-1.>=21::devel/libwnck \
@@ -47,9 +48,9 @@ LIB_DEPENDS= 		camel-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2::d
 MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
+MODGCONF2_SCHEMAS_DIR=	gnome-panel
+
 CONFIGURE_ARGS+= 	--enable-eds \
-			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-panel \
-			--disable-schemas-install \
 			--disable-scrollkeeper
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome/panel/pkg/PLIST b/x11/gnome/panel/pkg/PLIST
index 3de02af8710..1007f5c76cc 100644
--- a/x11/gnome/panel/pkg/PLIST
+++ b/x11/gnome/panel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.32 2009/03/14 10:40:53 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.33 2009/06/07 10:46:40 ajacoutot Exp $
 %%SHARED%%
 @bin bin/gnome-desktop-item-edit
 @bin bin/gnome-panel
@@ -687,19 +687,19 @@ share/omf/workspace-switcher/workspace-switcher-ru.omf
 share/omf/workspace-switcher/workspace-switcher-sv.omf
 share/omf/workspace-switcher/workspace-switcher-uk.omf
 share/omf/workspace-switcher/workspace-switcher-vi.omf
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-panel/*.schemas > /dev/null
-share/schemas/gnome-panel/
-share/schemas/gnome-panel/clock.schemas
-share/schemas/gnome-panel/fish.schemas
-share/schemas/gnome-panel/panel-compatibility.schemas
-share/schemas/gnome-panel/panel-default-setup.entries
-share/schemas/gnome-panel/panel-general.schemas
-share/schemas/gnome-panel/panel-global.schemas
-share/schemas/gnome-panel/panel-object.schemas
-share/schemas/gnome-panel/panel-toplevel.schemas
-share/schemas/gnome-panel/window-list.schemas
-share/schemas/gnome-panel/workspace-switcher.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-panel/*.schemas > /dev/null
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/clock.schemas
+${SCHEMAS_INSTDIR}/fish.schemas
+${SCHEMAS_INSTDIR}/panel-compatibility.schemas
+${SCHEMAS_INSTDIR}/panel-default-setup.entries
+${SCHEMAS_INSTDIR}/panel-general.schemas
+${SCHEMAS_INSTDIR}/panel-global.schemas
+${SCHEMAS_INSTDIR}/panel-object.schemas
+${SCHEMAS_INSTDIR}/panel-toplevel.schemas
+${SCHEMAS_INSTDIR}/window-list.schemas
+${SCHEMAS_INSTDIR}/workspace-switcher.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 @exec %D/bin/gconftool-2 --direct --config-source=`%D/bin/gconftool-2 --get-default-source` --load %D/share/schemas/gnome-panel/panel-default-setup.entries > /dev/null
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
diff --git a/x11/gnome/planner/Makefile b/x11/gnome/planner/Makefile
index a9085c85873..4aa31d040a5 100755
--- a/x11/gnome/planner/Makefile
+++ b/x11/gnome/planner/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2009/04/26 11:01:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2009/06/07 10:46:41 ajacoutot Exp $
 
 COMMENT=		project management application
 
 GNOME_PROJECT=		planner
 GNOME_VERSION=		0.14.4
+PKGNAME=		${DISTNAME}p0
 
 CATEGORIES=		x11
 
@@ -21,7 +22,7 @@ WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
 WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation
 WANTLIB += c cairo crypto dbus-1 dbus-glib-1 expat exslt fontconfig
-WANTLIB += freetype gailutil gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2
 WANTLIB += gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0
 WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
@@ -30,7 +31,8 @@ WANTLIB += xml2 xslt z
 
 MODULES=		devel/gettext \
 			lang/python \
-			x11/gnome
+			x11/gnome \
+			devel/gconf2
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		:py-gtk2-*:x11/py-gtk2 \
@@ -43,9 +45,9 @@ LIB_DEPENDS=		bonoboui-2::x11/gnome/libbonoboui \
 USE_X11=		Yes
 MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
+MODGCONF2_SCHEMAS_DIR=	planner
+
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
-			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/planner \
-			--disable-schemas-install \
 			--disable-update-mimedb \
 			--enable-gtk-doc=no \
 			--enable-python \
diff --git a/x11/gnome/planner/pkg/PLIST b/x11/gnome/planner/pkg/PLIST
index e96dd48e714..8ae86ebfa7a 100644
--- a/x11/gnome/planner/pkg/PLIST
+++ b/x11/gnome/planner/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/04/15 21:12:59 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.9 2009/06/07 10:46:41 ajacoutot Exp $
 @bin bin/planner
 include/planner-1.0/
 include/planner-1.0/libplanner/
@@ -293,10 +293,10 @@ share/planner/ui/sql-plugin.ui
 share/planner/ui/task-view.ui
 share/planner/ui/time-table-view.ui
 share/planner/ui/xml-planner-plugin.ui
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/planner/*.schemas > /dev/null
-share/schemas/planner/
-share/schemas/planner/planner.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/planner/*.schemas > /dev/null
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/planner.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @exec %D/bin/update-mime-database %D/share/mime
diff --git a/x11/gnome/screensaver/Makefile b/x11/gnome/screensaver/Makefile
index 9843f9fc0cf..04f45dbf4fb 100644
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/06/04 00:45:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2009/06/07 10:46:41 ajacoutot Exp $
 
 COMMENT=	screen saver and locker for GNOME
 
 GNOME_PROJECT=	gnome-screensaver
 GNOME_VERSION=	2.24.1
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +17,7 @@ WANTLIB=	GL ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		Xrender Xss Xxf86misc Xxf86vm art_lgpl_2 atk-1.0 \
 		bonobo-2 bonobo-activation bonoboui-2 c \
 		cairo crypto dbus-1 dbus-glib-1 expat fontconfig \
-		freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
+		freetype gailutil gdk-x11-2.0 gdk_pixbuf-2.0 \
 		gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
 		gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
 		gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \
@@ -26,7 +26,8 @@ WANTLIB=	GL ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		xklavier xml2 z
 
 MODULES=	devel/gettext \
-		x11/gnome
+		x11/gnome \
+		devel/gconf2
 
 BUILD_DEPENDS=	::textproc/xmlto
 LIB_DEPENDS=	gnome-desktop-2.>=6::x11/gnome/desktop \
@@ -41,17 +42,16 @@ RUN_DEPENDS=	::x11/gnome/librsvg \
 
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
+MODGCONF2_SCHEMAS_DIR= gnome-screensaver
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-schemas-install \
 		--disable-pam \
 		--enable-docbook-docs \
 		--enable-locking \
 		--with-x \
 		--with-bsdauth=yes \
-		--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-screensaver \
 		--with-xscreensaverdir="${LOCALBASE}/share/xscreensaver/config" \
 		--with-xscreensaverhackdir="${LOCALBASE}/libexec/xscreensaver" \
 		--with-gdm-config="${SYSCONFDIR}/X11/gdm/custom.conf" \
diff --git a/x11/gnome/screensaver/pkg/PLIST b/x11/gnome/screensaver/pkg/PLIST
index cdec390edbe..6ae2504142b 100644
--- a/x11/gnome/screensaver/pkg/PLIST
+++ b/x11/gnome/screensaver/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/06/04 00:45:39 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/06/07 10:46:41 ajacoutot Exp $
 @bin bin/gnome-screensaver
 @bin bin/gnome-screensaver-command
 @bin bin/gnome-screensaver-preferences
@@ -124,9 +124,9 @@ share/pixmaps/backgrounds/cosmos/jupiter.jpg
 share/pixmaps/backgrounds/cosmos/sombrero.jpg
 share/pixmaps/backgrounds/cosmos/whirlpool.jpg
 share/pixmaps/gnome-logo-white.svg
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-screensaver/*.schemas > /dev/null
-share/schemas/gnome-screensaver/
-share/schemas/gnome-screensaver/gnome-screensaver.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-screensaver/*.schemas > /dev/null
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/gnome-screensaver.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database
diff --git a/x11/gnome/seahorse/Makefile b/x11/gnome/seahorse/Makefile
index f1c23eb9d26..7cfe62b1067 100644
--- a/x11/gnome/seahorse/Makefile
+++ b/x11/gnome/seahorse/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2009/06/03 16:38:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2009/06/07 10:46:41 ajacoutot Exp $
 
 COMMENT=		manage encryption keys
 
 GNOME_PROJECT=		seahorse
 GNOME_VERSION=		2.24.1
-PKGNAME=		${DISTNAME}p7
+PKGNAME=		${DISTNAME}p8
 SHARED_LIBS +=	cryptui              0.0      # .0.0
 CATEGORIES=		security
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 avahi-client
 WANTLIB += avahi-common avahi-glib c cairo com_err crypto dbus-1
-WANTLIB += dbus-glib-1 expat fontconfig freetype gconf-2 gcrypt
+WANTLIB += dbus-glib-1 expat fontconfig freetype gcrypt
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0
 WANTLIB += glitz gmodule-2.0 gnome-keyring gnutls gobject-2.0
 WANTLIB += gp11 gpg-error gssapi gthread-2.0 gtk-x11-2.0 krb5
@@ -33,14 +33,15 @@ LIB_DEPENDS=		lber,ldap::databases/openldap \
 			gpgme::security/gpgme
 
 MODULES=		devel/gettext \
-			x11/gnome
+			x11/gnome \
+			devel/gconf2
 
 USE_X11=		Yes
 MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
+MODGCONF2_SCHEMAS_DIR=	seahorse
 
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/seahorse \
 			--with-gecko=xulrunner \
 			--enable-applet \
 			--enable-epiphany \
@@ -49,7 +50,6 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-ldap \
 			--enable-nautilus \
 			--enable-sharing \
-			--disable-schemas-install \
 			--disable-scrollkeeper
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome/seahorse/pkg/PLIST b/x11/gnome/seahorse/pkg/PLIST
index e729296887f..f97a2878e3d 100644
--- a/x11/gnome/seahorse/pkg/PLIST
+++ b/x11/gnome/seahorse/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/03/23 15:54:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.10 2009/06/07 10:46:41 ajacoutot Exp $
 %%SHARED%%
 @bin bin/seahorse
 @mode 4555
@@ -300,10 +300,10 @@ share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
 share/pixmaps/seahorse/scalable/seahorse-sign.svg
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/seahorse/*.schemas > /dev/null
-share/schemas/seahorse/
-share/schemas/seahorse/seahorse.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/seahorse/*.schemas > /dev/null
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/seahorse.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 share/seahorse/
 share/seahorse/glade/
 share/seahorse/glade/seahorse-add-keyring.glade
diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 80c2e568e42..560a69ea5ea 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.77 2009/06/01 22:28:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.78 2009/06/07 10:46:41 ajacoutot Exp $
 
 COMMENT=		GNOME session
 
 GNOME_PROJECT=		gnome-session
 GNOME_VERSION=		2.24.3
-PKGNAME=		${DISTNAME}p11
+PKGNAME=		${DISTNAME}p12
 
 CATEGORIES=		x11
 
@@ -18,14 +18,15 @@ WANTLIB=       ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 	       Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
 	       Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation \
 	       bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \
-	       fontconfig freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
+	       fontconfig freetype gailutil gdk-x11-2.0 gdk_pixbuf-2.0 \
 	       gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
 	       gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 \
 	       gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
 	       pixman-1 png popt pthread ssl startup-notification-1 util xml2 z
 
 MODULES=	devel/gettext \
-		x11/gnome
+		x11/gnome \
+		devel/gconf2
 
 BUILD_DEPENDS=	::textproc/rarian \
 		::textproc/xmlto \
@@ -58,10 +59,9 @@ RUN_DEPENDS+=		::x11/gnome/alacarte \
 
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
+MODGCONF2_SCHEMAS_DIR=	gnome-session
 
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
-			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-session/ \
-			--disable-schemas-install \
 			--disable-rebuilds
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -lexecinfo"
diff --git a/x11/gnome/session/pkg/PLIST b/x11/gnome/session/pkg/PLIST
index c17bc4de339..d48f015bf0b 100644
--- a/x11/gnome/session/pkg/PLIST
+++ b/x11/gnome/session/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2008/11/26 09:11:30 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.21 2009/06/07 10:46:41 ajacoutot Exp $
 @bin bin/gnome-session
 @bin bin/gnome-session-properties
 @bin bin/gnome-session-save
@@ -121,9 +121,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 share/pixmaps/splash/
 share/pixmaps/splash/gnome-splash.png
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-session/*.schemas > /dev/null
-share/schemas/gnome-session/
-share/schemas/gnome-session/gnome-session.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-session/*.schemas > /dev/null
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/gnome-session.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database
diff --git a/x11/gnome/settings-daemon/Makefile b/x11/gnome/settings-daemon/Makefile
index f3d7b7fc09c..1ae69f33b45 100755
--- a/x11/gnome/settings-daemon/Makefile
+++ b/x11/gnome/settings-daemon/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2009/04/16 08:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2009/06/07 10:46:41 ajacoutot Exp $
 
 COMMENT=		GNOME settings daemon
 
 GNOME_PROJECT=		gnome-settings-daemon
 GNOME_VERSION=		2.24.1
-PKGNAME=		${DISTNAME}p7
+PKGNAME=		${DISTNAME}p8
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +17,7 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		Xrender Xxf86misc art_lgpl_2 atk-1.0 \
 		bonobo-2 bonobo-activation bonoboui-2 c cairo crypto \
 		dbus-1 dbus-glib-1 expat fontconfig freetype \
-		gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
+		gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
 		glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
 		gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
 		gobject-2.0 gstbase-0.10 gstreamer-0.10 gthread-2.0 \
@@ -26,7 +26,8 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		startup-notification-1 util xkbfile xklavier xml2 z
 
 MODULES=		devel/gettext \
-			x11/gnome
+			x11/gnome \
+			devel/gconf2
 
 BUILD_DEPENDS=		::textproc/rarian
 LIB_DEPENDS=		notify::devel/libnotify \
@@ -36,13 +37,12 @@ LIB_DEPENDS=		notify::devel/libnotify \
 
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
+MODGCONF2_SCHEMAS_DIR=	control-center2
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/control-center2 \
-			--disable-schemas-install \
-			--disable-alsa \
+CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-esd
 
 # We can't have both OSS and GStreamer support for the media-keys plugin.
diff --git a/x11/gnome/settings-daemon/pkg/PLIST b/x11/gnome/settings-daemon/pkg/PLIST
index a3bfe9a7abf..5bc6273f152 100644
--- a/x11/gnome/settings-daemon/pkg/PLIST
+++ b/x11/gnome/settings-daemon/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/01/18 18:05:32 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/06/07 10:46:41 ajacoutot Exp $
 @conflict control-center2-<=2.22
 %%SHARED%%
 include/gnome-settings-daemon-2.0/
@@ -259,14 +259,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zu/
 share/locale/zu/LC_MESSAGES/
 share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/control-center2/*.schemas > /dev/null
-share/schemas/
-share/schemas/control-center2/
-share/schemas/control-center2/apps_gnome_settings_daemon_keybindings.schemas
-share/schemas/control-center2/apps_gnome_settings_daemon_screensaver.schemas
-share/schemas/control-center2/apps_gnome_settings_daemon_xrandr.schemas
-share/schemas/control-center2/desktop_gnome_font_rendering.schemas
-share/schemas/control-center2/gnome-settings-daemon.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/control-center2/*.schemas > /dev/null
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+${SCHEMAS_INSTDIR}/
+${SCHEMAS_INSTDIR}/apps_gnome_settings_daemon_keybindings.schemas
+${SCHEMAS_INSTDIR}/apps_gnome_settings_daemon_screensaver.schemas
+${SCHEMAS_INSTDIR}/apps_gnome_settings_daemon_xrandr.schemas
+${SCHEMAS_INSTDIR}/desktop_gnome_font_rendering.schemas
+${SCHEMAS_INSTDIR}/gnome-settings-daemon.schemas
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true