Use new GCONF_SCHEMAS.

Approved by:	pav

12 files changed, 13 insertions, 18 deletions

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