diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 31ac5a2ae9e..378a2be20e4 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2009/03/05 08:11:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2009/06/07 05:30:09 ajacoutot Exp $
 
 COMMENT=		implementation of the Freedesktop sound theme spec.
 
 DISTNAME=		libcanberra-0.11
+PKGNAME=		${DISTNAME}p0
 SHARED_LIBS +=  canberra             1.0      # .1.4
 SHARED_LIBS +=  canberra-gtk         0.0      # .0.4
 CATEGORIES=		audio devel
@@ -23,7 +24,11 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		gthread-2.0 m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 \
 		pcre pixman-1 png pthread sndio xml2 z
 
-MODULES=		devel/gettext
+MODULES=		devel/gettext \
+			devel/gconf2
+
+MODGCONF2_SCHEMAS_DIR=	libcanberra
+MODGCONF2_LIBDEP=	No
 
 AUTOCONF_VERSION=	2.62
 AUTOMAKE_VERSION=	1.9
@@ -41,9 +46,7 @@ USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/libcanberra \
-			--disable-schemas-install \
-			--localstatedir="/var" \
+CONFIGURE_ARGS+=	--localstatedir="/var" \
 			--enable-sndio \
 			--enable-gstreamer \
 			--disable-oss \
diff --git a/audio/libcanberra/pkg/PLIST b/audio/libcanberra/pkg/PLIST
index 4973951412e..6d9b5184fbe 100644
--- a/audio/libcanberra/pkg/PLIST
+++ b/audio/libcanberra/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/03/05 08:11:56 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/06/07 05:30:09 ajacoutot Exp $
 %%SHARED%%
 @bin bin/canberra-gtk-play
 include/canberra-gtk.h
@@ -42,8 +42,7 @@ share/gtk-doc/html/libcanberra/libcanberra.devhelp2
 share/gtk-doc/html/libcanberra/right.png
 share/gtk-doc/html/libcanberra/style.css
 share/gtk-doc/html/libcanberra/up.png
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/libcanberra/*.schemas > /dev/null
-share/schemas/
-share/schemas/libcanberra/
-share/schemas/libcanberra/libcanberra.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/libcanberra/*.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}/libcanberra.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
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 77d30606bf7..71ec600b151 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.35 2009/06/03 19:04:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2009/06/07 05:30:09 ajacoutot Exp $
 
 COMMENT=		music management application for GNOME
 
 GNOME_PROJECT=		rhythmbox
 GNOME_VERSION=		0.12.2
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 
 SHARED_LIBS +=  rhythmbox-core       0.0      # .0.0
 CATEGORIES=		audio
@@ -25,7 +25,7 @@ WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender art_lgpl_2 asn1 atk-1.0 avahi-client avahi-common
 WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c
 WANTLIB += cairo com_err crypto dbus-1 dbus-glib-1 expat 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 gnutls gobject-2.0
 WANTLIB += gpg-error gssapi gstbase-0.10 gstcontroller-0.10 gstinterfaces-0.10
@@ -36,7 +36,8 @@ WANTLIB += soup-2.4 sqlite3 ssl ssl3 tasn1 util xml2 z
 
 MODULES=		devel/gettext \
 			x11/gnome \
-			lang/python
+			lang/python \
+			devel/gconf2
 
 BUILD_DEPENDS=		:gstreamer-gnome->=0.10.19:multimedia/gstreamer-0.10/plugins-base,-gnome \
 			::multimedia/gstreamer-0.10/py-gstreamer
@@ -62,11 +63,10 @@ REGRESS_DEPENDS=	::devel/check
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 MODGNOME_HELP_FILES=	Yes
+MODGCONF2_SCHEMAS_DIR=	rhythmbox
 
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/rhythmbox/ \
-			--disable-schemas-install \
 			--with-database=tree \
 			--with-gnome-keyring \
 			--with-mdns=avahi \
diff --git a/audio/rhythmbox/pkg/PLIST b/audio/rhythmbox/pkg/PLIST
index 34fcce872f9..4189f1e6c1e 100644
--- a/audio/rhythmbox/pkg/PLIST
+++ b/audio/rhythmbox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2009/06/03 19:04:43 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.14 2009/06/07 05:30:09 ajacoutot Exp $
 @bin bin/rhythmbox
 @bin bin/rhythmbox-client
 lib/librhythmbox-core.la
@@ -626,10 +626,10 @@ share/rhythmbox/rhythmbox-ui.xml
 share/rhythmbox/song-info-multiple.ui
 share/rhythmbox/song-info.ui
 share/rhythmbox/uri-new.ui
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/rhythmbox/*.schemas > /dev/null
-share/schemas/rhythmbox/
-share/schemas/rhythmbox/rhythmbox.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/rhythmbox/*.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}/rhythmbox.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
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 956d994f128..638795ce6f6 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2009/06/04 01:28:43 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2009/06/07 05:30:32 ajacoutot Exp $
 
 COMMENT=	GNOME multimode HF terminal
 
 GNOME_PROJECT=	gmfsk
 GNOME_VERSION=	0.6
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=    	comms hamradio
 
 HOMEPAGE=	http://gmfsk.connect.fi/
@@ -23,17 +23,19 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0
 WANTLIB += bonobo-2 bonobo-activation bonoboui-2 c cairo dbus-1
-WANTLIB += expat fontconfig freetype gconf-2 gio-2.0 glib-2.0
+WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0
 WANTLIB += glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2
 WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png popt pthread stdc++ xml2
 WANTLIB += z
 
 MODULES=		devel/gettext \
-			x11/gnome
+			x11/gnome \
+			devel/gconf2
 
 MODGNOME_HELP_FILES=	Yes
 USE_GMAKE=		No
+MODGCONF2_SCHEMAS_DIR=	gmfsk
 
 BUILD_DEPENDS=		::textproc/rarian
 LIB_DEPENDS=		fftw.>=2::math/fftw \
@@ -42,9 +44,7 @@ LIB_DEPENDS=		fftw.>=2::math/fftw \
 			gnomeui-2::x11/gnome/libgnomeui
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--enable-hamlib \
-			--disable-schemas-install \
-			--with-gconf-schema-file-dir="${LOCALBASE}/share/schemas/gmfsk"
+CONFIGURE_ARGS=		--enable-hamlib
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/comms/gmfsk/pkg/PLIST b/comms/gmfsk/pkg/PLIST
index 062bd4553fb..22994e55750 100644
--- a/comms/gmfsk/pkg/PLIST
+++ b/comms/gmfsk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/06/04 01:28:43 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.6 2009/06/07 05:30:32 ajacoutot Exp $
 @bin bin/gmfsk
 share/gnome/help/gmfsk/
 share/gnome/help/gmfsk/C/
@@ -20,7 +20,7 @@ share/pixmaps/gmfsk/pause.xpm
 share/pixmaps/gmfsk/rx.xpm
 share/pixmaps/gmfsk/tune.xpm
 share/pixmaps/gmfsk/tx.xpm
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gmfsk/*.schemas > /dev/null
-share/schemas/gmfsk/
-share/schemas/gmfsk/gmfsk.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gmfsk/*.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}/gmfsk.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
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 7023bb48f71..ab01c88c4fa 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2008/09/29 18:16:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2009/06/07 05:31:32 ajacoutot Exp $
 
 MULTI_PACKAGES=	-main -themes
 
 COMMENT-main=	tetrinet client
 COMMENT-themes=	collection of gtetrinet themes
 DISTNAME=	gtetrinet-0.7.11
-PKGNAME-main=	${DISTNAME}p4
+PKGNAME-main=	${DISTNAME}p5
 PKGNAME-themes=	gtetrinet-themes-20070623p0
 CATEGORIES=	x11 games
 
@@ -34,9 +34,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=		textproc/intltool
+MODULES=		textproc/intltool \
+			devel/gconf2
 
-LIB_DEPENDS-main=	gnome-2::x11/gnome/libgnome \
+LIB_DEPENDS-main=	${MODGCONF2_LIB_DEPENDS} \
+			gnome-2::x11/gnome/libgnome \
 			gnomeui-2::x11/gnome/libgnomeui \
 			esd:esound->=0.2.38:audio/esound
 LIB_DEPENDS-themes=
@@ -48,17 +50,17 @@ WANTLIB-main=	ICE ORBit-2 SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi \
 		Xcomposite Xdamage \
 		Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 audiofile \
 		bonobo-2 bonobo-activation bonoboui-2 c cairo expat \
-		fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
+		fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
 		glib-2.0 glitz gmodule-2.0 gnome-keyring gnomecanvas-2 \
 		gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv \
 		intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png popt \
 		pthread xml2 z gailutil pixman-1
 WANTLIB-themes=
 
+MODGCONF2_SCHEMAS_DIR= gtetrinet
+
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gtetrinet \
-		--disable-schemas-install \
-		--enable-ipv6
+CONFIGURE_ARGS+=--enable-ipv6
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -68,6 +70,7 @@ FAKE_FLAGS=	gamesdir=${PREFIX}/bin
 USE_GMAKE=	Yes
 USE_X11=	Yes
 NO_REGRESS=	Yes
+MODGCONF2_LIBDEP= No
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/schemas/gtetrinet
@@ -82,4 +85,3 @@ post-install:
 .include <bsd.port.mk>
 
 CONFIGURE_ARGS+=--sysconfdir=${SYSCONFDIR}/gnome
-
diff --git a/games/gtetrinet/pkg/PLIST-main b/games/gtetrinet/pkg/PLIST-main
index 5eccf53c0a9..cde9686aaaf 100644
--- a/games/gtetrinet/pkg/PLIST-main
+++ b/games/gtetrinet/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2008/09/29 18:16:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2009/06/07 05:31:32 ajacoutot Exp $
 @bin bin/gtetrinet
 @man man/man6/gtetrinet.6
 share/applications/gtetrinet.desktop
@@ -78,10 +78,9 @@ share/pixmaps/gtetrinet/
 share/pixmaps/gtetrinet.png
 share/pixmaps/gtetrinet/alone.png
 share/pixmaps/gtetrinet/team.png
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gtetrinet/*.schemas > /dev/null
-share/schemas/
-share/schemas/gtetrinet/
-share/schemas/gtetrinet/gtetrinet.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gtetrinet/*.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}/gtetrinet.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/graphics/comix/Makefile b/graphics/comix/Makefile
index 00b61a06207..6247a4d17e3 100644
--- a/graphics/comix/Makefile
+++ b/graphics/comix/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2009/04/15 08:26:28 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2009/06/07 05:32:02 ajacoutot Exp $
 
 COMMENT=	gtk2 comic book viewer
 
 DISTNAME=	comix-4.0.3
+PKGNAME=	${DISTNAME}p0
+
 CATEGORIES=	graphics
 
 MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org>
@@ -15,14 +17,17 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=comix/}
 
-MODULES=	lang/python
+MODULES=	lang/python \
+		devel/gconf2
 PY_FLAVOR=	python${MODPY_VERSION}
 
+MODGCONF2_LIBDEP= No
+MODGCONF2_SCHEMAS_DIR= comix
+
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	:py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR} \
 		::x11/py-gtk2 \
 		::misc/shared-mime-info \
-		::devel/gconf2 \
 		:desktop-file-utils-*:devel/desktop-file-utils
 
 NO_REGRESS=	Yes
@@ -36,9 +41,9 @@ do-build:
 do-install:
 		cd ${WRKSRC} && ${MODPY_BIN} install.py --dir ${PREFIX} install
 		# schemas files are always installed under LOCALBASE, not PREFIX
-		${INSTALL_DATA_DIR} ${WRKINST}/${LOCALBASE}/share/schemas/comix/
+		${INSTALL_DATA_DIR} ${WRKINST}/${LOCALBASE}/${SCHEMAS_INSTDIR}/
 		${INSTALL_DATA} ${WRKSRC}/mime/comicbook.schemas \
-			${WRKINST}/${LOCALBASE}/share/schemas/comix/
+			${WRKINST}/${LOCALBASE}/${SCHEMAS_INSTDIR}/
 
 PKG_ARCH=	*
 
diff --git a/graphics/comix/pkg/PLIST b/graphics/comix/pkg/PLIST
index 9ef9299f7c1..ab20677c7e2 100644
--- a/graphics/comix/pkg/PLIST
+++ b/graphics/comix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2009/04/15 08:26:28 landry Exp $
+@comment $OpenBSD: PLIST,v 1.9 2009/06/07 05:32:02 ajacoutot Exp $
 bin/comicthumb
 bin/comix
 @man man/man1/comicthumb.1
@@ -133,10 +133,9 @@ share/locale/sv/LC_MESSAGES/comix.mo
 share/locale/zh_CN/LC_MESSAGES/comix.mo
 share/locale/zh_TW/LC_MESSAGES/comix.mo
 share/mime/packages/comix.xml
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/comix/*.schemas > /dev/null
-share/schemas/
-share/schemas/comix/
-share/schemas/comix/comicbook.schemas
+@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}/comicbook.schemas
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/comix/*.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
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 17390872382..dcf251b0054 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2009/04/16 08:11:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2009/06/07 05:32:02 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,9 +11,9 @@ GNOME_VERSION=	2.24.2
 
 CATEGORIES=	graphics print
 
-PKGNAME-main=	${DISTNAME}p6
-PKGNAME-djvu=	evince-djvu-${GNOME_VERSION}p0
-PKGNAME-dvi=	evince-dvi-${GNOME_VERSION}p0
+PKGNAME-main=	${DISTNAME}p7
+PKGNAME-djvu=	evince-djvu-${GNOME_VERSION}p1
+PKGNAME-dvi=	evince-dvi-${GNOME_VERSION}p1
 
 SHARED_LIBS=	evbackend	0.0 # .0.0
 
@@ -29,7 +29,8 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
 MODULES=	devel/gettext \
-		x11/gnome
+		x11/gnome \
+		devel/gconf2
 
 BUILD_DEPENDS=	::x11/gnome/icon-theme
 
@@ -43,7 +44,7 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		pixman-1 png xml2 z
 
 WANTLIB-main=		${WANTLIB} ICE ORBit-2 SM c dbus-1 dbus-glib-1 \
-			gconf-2 gnome-keyring gs gthread-2.0 \
+			gnome-keyring gs gthread-2.0 \
 			jpeg pthread tiff
 LIB_DEPENDS-main=	poppler.>=3,poppler-glib.>=3::print/poppler \
 			spectre::print/libspectre \
@@ -70,6 +71,7 @@ RUN_DEPENDS-dvi=	# empty
 USE_X11=		Yes
 MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
+MODGCONF2_SCHEMAS_DIR=	evince
 
 LIBTOOL_FLAGS=		--tag=disable-static
 
@@ -83,8 +85,7 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-scrollkeeper \
 		--enable-djvu \
 		--enable-dvi \
-		--enable-pixbuf \
-		--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evince/
+		--enable-pixbuf
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/graphics/evince/pkg/PLIST-djvu b/graphics/evince/pkg/PLIST-djvu
index 3acc2e28e37..8aa39d18923 100644
--- a/graphics/evince/pkg/PLIST-djvu
+++ b/graphics/evince/pkg/PLIST-djvu
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST-djvu,v 1.2 2008/12/14 19:33:48 ajacoutot Exp $
+@comment $OpenBSD: PLIST-djvu,v 1.3 2009/06/07 05:32:02 ajacoutot Exp $
 lib/evince/backends/djvudocument.evince-backend
 lib/evince/backends/libdjvudocument.la
 lib/evince/backends/libdjvudocument.so
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/evince/evince-thumbnailer-djvu.schemas > /dev/null
-share/schemas/evince/evince-thumbnailer-djvu.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/evince/evince-thumbnailer-djvu.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}/evince-thumbnailer-djvu.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
diff --git a/graphics/evince/pkg/PLIST-dvi b/graphics/evince/pkg/PLIST-dvi
index ba3be18e7f2..e27e7ea1ac1 100644
--- a/graphics/evince/pkg/PLIST-dvi
+++ b/graphics/evince/pkg/PLIST-dvi
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST-dvi,v 1.2 2008/12/14 19:33:48 ajacoutot Exp $
+@comment $OpenBSD: PLIST-dvi,v 1.3 2009/06/07 05:32:02 ajacoutot Exp $
 lib/evince/backends/dvidocument.evince-backend
 lib/evince/backends/libdvidocument.la
 lib/evince/backends/libdvidocument.so
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/evince/evince-thumbnailer-dvi.schemas > /dev/null
-share/schemas/evince/evince-thumbnailer-dvi.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/evince/evince-thumbnailer-dvi.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}/evince-thumbnailer-dvi.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
diff --git a/graphics/evince/pkg/PLIST-main b/graphics/evince/pkg/PLIST-main
index f6cb776b3ac..90bbbf875c5 100644
--- a/graphics/evince/pkg/PLIST-main
+++ b/graphics/evince/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2009/03/14 10:40:51 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2009/06/07 05:32:02 ajacoutot Exp $
 @pkgpath graphics/evince
 @bin bin/evince
 @bin bin/evince-thumbnailer
@@ -328,12 +328,12 @@ share/omf/evince/evince-sv.omf
 share/omf/evince/evince-uk.omf
 share/omf/evince/evince-vi.omf
 share/omf/evince/evince-zh_CN.omf
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/evince/*.schemas > /dev/null
-share/schemas/evince/
-share/schemas/evince/evince-thumbnailer-ps.schemas
-share/schemas/evince/evince-thumbnailer.schemas
-share/schemas/evince/evince.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/evince/*.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}/evince-thumbnailer-ps.schemas
+${SCHEMAS_INSTDIR}/evince-thumbnailer.schemas
+${SCHEMAS_INSTDIR}/evince.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
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index e83c88679f7..d4c97c9e7bd 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,10 +1,10 @@
-#$OpenBSD: Makefile,v 1.25 2009/04/06 10:09:06 ajacoutot Exp $
+#$OpenBSD: Makefile,v 1.26 2009/06/07 05:32:02 ajacoutot Exp $
 
 COMMENT=	Image viewer and browser for GNOME
 
 GNOME_PROJECT=	gthumb
 GNOME_VERSION=	2.10.11
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 
 SHARED_LIBS=	gthumb	0.0	# .0.0
 
@@ -25,7 +25,7 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		Xrender Xtst Xxf86vm art_lgpl_2 atk-1.0 \
 		bonobo-2 bonobo-activation bonoboui-2 c cairo crypto \
 		dbus-1 dbus-glib-1 exif expat fontconfig freetype \
-		gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 \
+		gailutil gdk-x11-2.0 gdk_pixbuf-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 jpeg ltdl m pango-1.0 pangocairo-1.0 \
@@ -33,7 +33,8 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		usb util xml2 z gio-2.0
 
 MODULES=	x11/gnome \
-		devel/gettext
+		devel/gettext \
+		devel/gconf2
 
 LIB_DEPENDS=	gnomeui-2.>=2000::x11/gnome/libgnomeui \
 		gphoto2.>=3,gphoto2_port.>=6::graphics/libgphoto2
@@ -42,14 +43,13 @@ RUN_DEPENDS=	::misc/shared-mime-info
 MODGNOME_HELP_FILES= Yes
 DESKTOP_FILES=	Yes
 USE_X11=	Yes
+MODGCONF2_SCHEMAS_DIR= gthumb
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gthumb \
 		--disable-scrollkeeper \
-		--disable-schemas-install \
 		--disable-iptcdata \
 		--disable-libopenraw
 
diff --git a/graphics/gthumb/pkg/PLIST b/graphics/gthumb/pkg/PLIST
index bf40f23ce32..8b7b2dd1c10 100644
--- a/graphics/gthumb/pkg/PLIST
+++ b/graphics/gthumb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2009/03/05 07:52:51 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.11 2009/06/07 05:32:02 ajacoutot Exp $
 %%SHARED%%
 @bin bin/gthumb
 lib/bonobo/
@@ -224,10 +224,10 @@ share/omf/gthumb/gthumb-de.omf
 share/omf/gthumb/gthumb-es.omf
 share/omf/gthumb/gthumb-fr.omf
 share/omf/gthumb/gthumb-sv.omf
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gthumb/*.schemas > /dev/null
-share/schemas/gthumb/
-share/schemas/gthumb/gthumb.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gthumb/*.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}/gthumb.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/rarian-sk-update
 @unexec %D/bin/rarian-sk-update
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true