54 files changed, 54 insertions, 87 deletions

diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index 1483b7010ccb..abc814efdaa8 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -26,4 +26,6 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lcam"
 
+GCONF_SCHEMAS=	marlin.schemas
+
 .include <bsd.port.mk>
diff --git a/audio/marlin/pkg-plist b/audio/marlin/pkg-plist
index 750ac9ec6f4b..2428e9a2d444 100644
--- a/audio/marlin/pkg-plist
+++ b/audio/marlin/pkg-plist
@@ -1,7 +1,4 @@
 bin/marlin
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/marlin.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/marlin.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/marlin.schemas > /dev/null || /usr/bin/true
 include/libmarlin/marlin-a11y-helper.h
 include/libmarlin/marlin-block.h
 include/libmarlin/marlin-cross-fader.h
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 9802eb3559e0..18166163a64b 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -27,4 +27,6 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	libgnomedb.schemas
+
 .include <bsd.port.mk>
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index be38bcbd1973..a7c91a4d5591 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-database-properties
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/libgnomedb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/libgnomedb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/libgnomedb.schemas > /dev/null || /usr/bin/true
 include/libgnomedb/gnome-db-browser.h
 include/libgnomedb/gnome-db-combo.h
 include/libgnomedb/gnome-db-config.h
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index c122b49fecb6..d1d065390124 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -25,4 +25,6 @@ USE_GNOME=	gnomehack gnomeprefix pygnome2
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/libs"
 
+GCONF_SCHEMAS=	gnomeblog.schemas
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index 320b75052f86..21761df342a3 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -1,8 +1,5 @@
 bin/blog_applet.py
 bin/gnome-blog-poster
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomeblog.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
diff --git a/deskutils/gnomeblog/Makefile b/deskutils/gnomeblog/Makefile
index c122b49fecb6..d1d065390124 100644
--- a/deskutils/gnomeblog/Makefile
+++ b/deskutils/gnomeblog/Makefile
@@ -25,4 +25,6 @@ USE_GNOME=	gnomehack gnomeprefix pygnome2
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/libs"
 
+GCONF_SCHEMAS=	gnomeblog.schemas
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
index 320b75052f86..21761df342a3 100644
--- a/deskutils/gnomeblog/pkg-plist
+++ b/deskutils/gnomeblog/pkg-plist
@@ -1,8 +1,5 @@
 bin/blog_applet.py
 bin/gnome-blog-poster
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomeblog.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeblog.schemas > /dev/null || /usr/bin/true
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.py
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyc
 %%PYTHON_SITELIBDIR%%/gnomeblog/MetaWeblog.pyo
diff --git a/deskutils/goats/Makefile b/deskutils/goats/Makefile
index c9a43120c91c..83cdc9afb7f7 100644
--- a/deskutils/goats/Makefile
+++ b/deskutils/goats/Makefile
@@ -21,6 +21,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	goats.schemas
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g'
 
diff --git a/deskutils/goats/pkg-plist b/deskutils/goats/pkg-plist
index 8e259e704eab..8cf0b03241cf 100644
--- a/deskutils/goats/pkg-plist
+++ b/deskutils/goats/pkg-plist
@@ -1,8 +1,5 @@
 bin/goats-applet
 bin/goat-create
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/goats.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/goats.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/goats.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_GoatsApplet.server
 share/gnome/gnome-2.0/ui/GNOME_GoatsApplet.xml
 share/gnome/goats/alarm.png
diff --git a/deskutils/gtodo/Makefile b/deskutils/gtodo/Makefile
index 91353b7f316d..2ad8532952c7 100644
--- a/deskutils/gtodo/Makefile
+++ b/deskutils/gtodo/Makefile
@@ -24,4 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gtodo.schemas
+
 .include <bsd.port.mk>
diff --git a/deskutils/gtodo/pkg-plist b/deskutils/gtodo/pkg-plist
index aa1e862aa553..d8924d1eb992 100644
--- a/deskutils/gtodo/pkg-plist
+++ b/deskutils/gtodo/pkg-plist
@@ -1,7 +1,4 @@
 bin/gtodo
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gtodo.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gtodo.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gtodo.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gtodo.desktop
 share/gnome/pixmaps/gtodo-about.png
 share/gnome/pixmaps/gtodo-edit.png
diff --git a/games/teg/Makefile b/games/teg/Makefile
index ee9224f3073f..1a65465d24af 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -22,6 +22,8 @@ USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	teg.schemas
+
 post-patch:
 	@${GREP} -lR " LIST_NEXT" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's| LIST_NEXT| TEG_LIST_NEXT|g'
diff --git a/games/teg/pkg-plist b/games/teg/pkg-plist
index b9f674b6bcd2..7e18d5919c74 100644
--- a/games/teg/pkg-plist
+++ b/games/teg/pkg-plist
@@ -1,9 +1,6 @@
 bin/tegclient
 bin/tegrobot
 bin/tegserver
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/teg.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/teg.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/teg.schemas > /dev/null || /usr/bin/true
 share/gnome/apps/Games/teg.desktop
 share/gnome/help/teg/C/figures/connect.png
 share/gnome/help/teg/C/figures/dices.png
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 8a971e10e2a5..94be84a0e032 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -39,6 +39,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 PLIST_SUB=	VERSION=${PORTVERSION}-bonobo
 
 MAN1=		gnumeric.1 ssconvert.1
+GCONF_SCHEMAS=	gnumeric-dialogs.schemas gnumeric-general.schemas \
+		gnumeric-plugins.schemas
 
 post-patch:
 	@${FIND} ${WRKSRC}/plugins -name "plugin.xml.in" | ${XARGS} \
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index d7ba6c755209..160b8efff6f4 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -1,14 +1,5 @@
 bin/gnumeric
 bin/ssconvert
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnumeric-dialogs.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnumeric-dialogs.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnumeric-dialogs.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnumeric-general.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnumeric-general.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnumeric-general.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnumeric-plugins.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnumeric-plugins.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnumeric-plugins.schemas > /dev/null || /usr/bin/true
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/corba/corba.so
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index 3a09ab11c503..99c25c7bde3c 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -24,4 +24,6 @@ USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gst-thumbnail.schemas
+
 .include <bsd.port.mk>
diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist
index b9fb4a8a167c..b60c1c45bc03 100644
--- a/multimedia/nautilus-media/pkg-plist
+++ b/multimedia/nautilus-media/pkg-plist
@@ -1,7 +1,4 @@
 bin/gst-thumbnail
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gst-thumbnail.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gst-thumbnail.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gst-thumbnail.schemas > /dev/null || /usr/bin/true
 lib/bonobo/libnautilus-audio-properties-view.so
 libdata/bonobo/servers/Nautilus_View_audio.server
 libdata/bonobo/servers/Nautilus_View_audio_properties.server
diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile
index eb0be59bf883..b1f056231ed1 100644
--- a/net-im/gnome-jabber/Makefile
+++ b/net-im/gnome-jabber/Makefile
@@ -24,4 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-jabber.schemas
+
 .include <bsd.port.mk>
diff --git a/net-im/gnome-jabber/pkg-plist b/net-im/gnome-jabber/pkg-plist
index 6bafed59f644..a751ebd010ea 100644
--- a/net-im/gnome-jabber/pkg-plist
+++ b/net-im/gnome-jabber/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-jabber
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-jabber.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-jabber.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-jabber.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-jabber.desktop
 share/gnome/gnome-jabber/contact.wav
 share/gnome/gnome-jabber/gj_emote_biggrin.png
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index d5f610f0b820..56785171bc9b 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -25,6 +25,9 @@ USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
+
+GCONF_SCHEMAS=	gnomeicu.schemas
+
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index 7b4e54228c1c..dd2ccb12d5d4 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/gnomeicu/pkg-plist
@@ -1,8 +1,5 @@
 bin/gnomeicu
 bin/gnomeicu-client
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomeicu.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applications/GnomeICU.desktop
 share/gnome/gnomeicu/emoticons/AIM/angel.xpm
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index d5f610f0b820..56785171bc9b 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -25,6 +25,9 @@ USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
+
+GCONF_SCHEMAS=	gnomeicu.schemas
+
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
index 7b4e54228c1c..dd2ccb12d5d4 100644
--- a/net-im/gnomeicu2/pkg-plist
+++ b/net-im/gnomeicu2/pkg-plist
@@ -1,8 +1,5 @@
 bin/gnomeicu
 bin/gnomeicu-client
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomeicu.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applications/GnomeICU.desktop
 share/gnome/gnomeicu/emoticons/AIM/angel.xpm
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index ce5b38f312ad..e5e9bb2ce14f 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -25,4 +25,6 @@ USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gossip.schemas
+
 .include <bsd.port.mk>
diff --git a/net-im/gossip/pkg-plist b/net-im/gossip/pkg-plist
index bd0b035f2064..4dfe31207535 100644
--- a/net-im/gossip/pkg-plist
+++ b/net-im/gossip/pkg-plist
@@ -1,7 +1,4 @@
 bin/gossip
-@unexec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gossip.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gossip.schemas
-@exec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gossip.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gossip.desktop
 share/gnome/gossip/channel-old4.png
 share/gnome/gossip/chat.glade
diff --git a/net/gnome-jabber/Makefile b/net/gnome-jabber/Makefile
index eb0be59bf883..b1f056231ed1 100644
--- a/net/gnome-jabber/Makefile
+++ b/net/gnome-jabber/Makefile
@@ -24,4 +24,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-jabber.schemas
+
 .include <bsd.port.mk>
diff --git a/net/gnome-jabber/pkg-plist b/net/gnome-jabber/pkg-plist
index 6bafed59f644..a751ebd010ea 100644
--- a/net/gnome-jabber/pkg-plist
+++ b/net/gnome-jabber/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-jabber
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-jabber.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-jabber.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-jabber.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-jabber.desktop
 share/gnome/gnome-jabber/contact.wav
 share/gnome/gnome-jabber/gj_emote_biggrin.png
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 906bf0c42181..4d645a04fa97 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -26,6 +26,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN6=		gnome-mud.6
+GCONF_SCHEMAS=	gnome-mud.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/net/gnome-mud/pkg-plist b/net/gnome-mud/pkg-plist
index 919f3db9d255..32a3d7995bcf 100644
--- a/net/gnome-mud/pkg-plist
+++ b/net/gnome-mud/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-mud
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-mud.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-mud.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-mud.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-mud.desktop
 share/gnome/help/gnome-mud/C/figures/connections-window.png
 share/gnome/help/gnome-mud/C/figures/main-window.png
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index d5f610f0b820..56785171bc9b 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -25,6 +25,9 @@ USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
+
+GCONF_SCHEMAS=	gnomeicu.schemas
+
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist
index 7b4e54228c1c..dd2ccb12d5d4 100644
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ b/net/gnomeicu/gnomeicu/pkg-plist
@@ -1,8 +1,5 @@
 bin/gnomeicu
 bin/gnomeicu-client
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomeicu.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applications/GnomeICU.desktop
 share/gnome/gnomeicu/emoticons/AIM/angel.xpm
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index d5f610f0b820..56785171bc9b 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -25,6 +25,9 @@ USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
+
+GCONF_SCHEMAS=	gnomeicu.schemas
+
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
diff --git a/net/gnomeicu2/pkg-plist b/net/gnomeicu2/pkg-plist
index 7b4e54228c1c..dd2ccb12d5d4 100644
--- a/net/gnomeicu2/pkg-plist
+++ b/net/gnomeicu2/pkg-plist
@@ -1,8 +1,5 @@
 bin/gnomeicu
 bin/gnomeicu-client
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnomeicu.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomeicu.schemas > /dev/null || /usr/bin/true
 etc/sound/events/GnomeICU.soundlist
 share/gnome/applications/GnomeICU.desktop
 share/gnome/gnomeicu/emoticons/AIM/angel.xpm
diff --git a/net/gossip/Makefile b/net/gossip/Makefile
index ce5b38f312ad..e5e9bb2ce14f 100644
--- a/net/gossip/Makefile
+++ b/net/gossip/Makefile
@@ -25,4 +25,6 @@ USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gossip.schemas
+
 .include <bsd.port.mk>
diff --git a/net/gossip/pkg-plist b/net/gossip/pkg-plist
index bd0b035f2064..4dfe31207535 100644
--- a/net/gossip/pkg-plist
+++ b/net/gossip/pkg-plist
@@ -1,7 +1,4 @@
 bin/gossip
-@unexec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gossip.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gossip.schemas
-@exec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gossip.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gossip.desktop
 share/gnome/gossip/channel-old4.png
 share/gnome/gossip/chat.glade
diff --git a/net/vino/Makefile b/net/vino/Makefile
index e11dabda5745..df3d97b11d66 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -26,4 +26,6 @@ CONFIGURE_ARGS=	--enable-session-support
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	vino-server.schemas
+
 .include <bsd.port.mk>
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index ba8c4a06fed8..551b7dc0c42e 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -1,8 +1,5 @@
 bin/vino-preferences
 bin/vino-session
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/vino-server.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/vino-server.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/vino-server.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_RemoteDesktop.server
 libexec/vino-server
 share/gnome/control-center-2.0/capplets/vino-preferences.desktop
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 01bce833e72d..88e0c3b9d46e 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -32,5 +32,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gpilot-install-file.1
+GCONF_SCHEMAS=	pilot.schemas
 
 .include <bsd.port.mk>
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 312426cb9ac0..0ea0a7f47c8b 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -2,9 +2,6 @@ bin/gnome-pilot-make-password
 bin/gpilot-install-file
 bin/gpilotd-control-applet
 bin/gpilotd-session-wrapper
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/pilot.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/pilot.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/pilot.schemas > /dev/null || /usr/bin/true
 include/gpilotd/gnome-pilot-client.h
 include/gpilotd/gnome-pilot-conduit-backup.h
 include/gpilotd/gnome-pilot-conduit-file.h
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 01bce833e72d..88e0c3b9d46e 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -32,5 +32,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gpilot-install-file.1
+GCONF_SCHEMAS=	pilot.schemas
 
 .include <bsd.port.mk>
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index 312426cb9ac0..0ea0a7f47c8b 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -2,9 +2,6 @@ bin/gnome-pilot-make-password
 bin/gpilot-install-file
 bin/gpilotd-control-applet
 bin/gpilotd-session-wrapper
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/pilot.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/pilot.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/pilot.schemas > /dev/null || /usr/bin/true
 include/gpilotd/gnome-pilot-client.h
 include/gpilotd/gnome-pilot-conduit-backup.h
 include/gpilotd/gnome-pilot-conduit-file.h
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index 81a2528a774f..9b6843a33c83 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -25,4 +25,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	battfink.schemas
+
 .include <bsd.port.mk>
diff --git a/sysutils/battfink/pkg-plist b/sysutils/battfink/pkg-plist
index 45526045abd9..dc47c075ce7f 100644
--- a/sysutils/battfink/pkg-plist
+++ b/sysutils/battfink/pkg-plist
@@ -1,7 +1,4 @@
 bin/battfink
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/battfink.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/battfink.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/battfink.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_Battfink.server
 share/gnome/battfink/battfink.glade
 share/gnome/battfink/help/C/battfink.xml
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 8262fc38fa38..518967a00048 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -22,6 +22,8 @@ USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-pkgview.schemas
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e 's|%%X11BASE%%|${X11BASE}|g' \
diff --git a/sysutils/gnome-pkgview/pkg-plist b/sysutils/gnome-pkgview/pkg-plist
index 46bc8ef21a3d..5f21b15abd38 100644
--- a/sysutils/gnome-pkgview/pkg-plist
+++ b/sysutils/gnome-pkgview/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-pkgview
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-pkgview.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-pkgview.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-pkgview.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-pkgview.desktop
 share/gnome/pixmaps/gnome-pkgview/debian.png
 share/gnome/pixmaps/gnome-pkgview/fedora.png
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 638f2f1d6df7..40979da781c0 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -27,6 +27,8 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-system-tools.schemas
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500000
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index a9b10543285c..e5a9bbbff59e 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -6,9 +6,6 @@ etc/X11/sysconfig/network.desktop
 %%SERVICES%%etc/X11/sysconfig/services.desktop
 etc/X11/sysconfig/time.desktop
 etc/X11/sysconfig/users.desktop
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-tools.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-system-tools.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-tools.schemas > /dev/null || /usr/bin/true
 libdata/pkgconfig/gnome-system-tools.pc
 libdata/pkgconfig/system-tools-backends.pc
 share/gnome-system-tools/interfaces/boot.glade
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 638f2f1d6df7..40979da781c0 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -27,6 +27,8 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	gnome-system-tools.schemas
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500000
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index a9b10543285c..e5a9bbbff59e 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -6,9 +6,6 @@ etc/X11/sysconfig/network.desktop
 %%SERVICES%%etc/X11/sysconfig/services.desktop
 etc/X11/sysconfig/time.desktop
 etc/X11/sysconfig/users.desktop
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-tools.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-system-tools.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-tools.schemas > /dev/null || /usr/bin/true
 libdata/pkgconfig/gnome-system-tools.pc
 libdata/pkgconfig/system-tools-backends.pc
 share/gnome-system-tools/interfaces/boot.glade
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index ab52acef334e..832fcaead286 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -50,6 +50,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		galeon.1
+GCONF_SCHEMAS=	galeon.schemas
 
 FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
 
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 8034cd87baaf..625e2b2336d3 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -1,9 +1,6 @@
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/galeon.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/galeon.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/galeon.schemas > /dev/null || /usr/bin/true
 etc/sound/events/galeon.soundlist
 lib/galeon/components/libgaleon-xpcom.a
 lib/galeon/components/libgaleon-xpcom.so
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 9d2fccbde6f8..a6f7f415e3ef 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -28,4 +28,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
+GCONF_SCHEMAS=	metacity.schemas
+
 .include <bsd.port.mk>
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index ae4a274f4b43..8fa23364fcd5 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -2,9 +2,6 @@ bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
 bin/metacity-window-demo
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/metacity.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/metacity.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/metacity.schemas > /dev/null || /usr/bin/true
 include/metacity-1/metacity-private/common.h
 include/metacity-1/metacity-private/gradient.h
 include/metacity-1/metacity-private/preview-widget.h