GConf2's buildlink2.mk now creates a gconftool-2 wrapper which prevents the

configuration database from beeing modified by packages that do not honour
the --disable-schemas-install option. There is no need to patch these broken
packages any more.

Okay'ed by wiz.

3 files changed, 3 insertions, 30 deletions

diff --git a/x11/gnome-panel/patches/patch-ac b/x11/gnome-panel/patches/patch-ac
index 2dc0e202aa7..981b81015ab 100644
--- a/x11/gnome-panel/patches/patch-ac
+++ b/x11/gnome-panel/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2003/02/15 12:02:34 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2003/02/18 20:52:09 jmmv Exp $
 
 --- applets/gen_util/Makefile.in.orig	2003-02-04 00:29:54.000000000 +0100
 +++ applets/gen_util/Makefile.in
@@ -40,12 +40,3 @@ $NetBSD: patch-ac,v 1.3 2003/02/15 12:02:34 jmmv Exp $
  	  fi; fi; \
  	done
  
-@@ -641,7 +642,7 @@ GNOME_GenUtilApplet_Factory.server.in: G
- 
- # don't do this if we are building in eg. rpm
- install-data-local:
--	if test -z "$(DESTDIR)" ; then \
-+	if false; then \
- 		for p in $(schemas_DATA) ; do \
- 		        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/gen_util/$$p ; \
- 		done \
diff --git a/x11/gnome-panel/patches/patch-ad b/x11/gnome-panel/patches/patch-ad
index 0bace0bd3a5..106955aed38 100644
--- a/x11/gnome-panel/patches/patch-ad
+++ b/x11/gnome-panel/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2003/02/14 21:05:28 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2003/02/18 20:52:09 jmmv Exp $
 
 --- applets/fish/Makefile.in.orig	2003-02-04 00:29:54.000000000 +0100
 +++ applets/fish/Makefile.in
@@ -33,12 +33,3 @@ $NetBSD: patch-ad,v 1.2 2003/02/14 21:05:28 jmmv Exp $
  	  else :; fi; \
  	done
  
-@@ -574,7 +575,7 @@ $(server_in_files): $(server_in_files).i
- 
- # don't do this if we are building in eg. rpm
- install-data-local:
--	if test -z "$(DESTDIR)" ; then \
-+	if false; then \
- 		for p in $(schemas_DATA) ; do \
- 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/fish/$$p ; \
- 	done \
diff --git a/x11/gnome-panel/patches/patch-ag b/x11/gnome-panel/patches/patch-ag
index 87a1e381daa..3a77bd7e69b 100644
--- a/x11/gnome-panel/patches/patch-ag
+++ b/x11/gnome-panel/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 2003/02/14 21:05:28 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2003/02/18 20:52:09 jmmv Exp $
 
 --- gnome-panel/Makefile.in.orig	2003-02-04 00:29:51.000000000 +0100
 +++ gnome-panel/Makefile.in
@@ -11,12 +11,3 @@ $NetBSD: patch-ag,v 1.1 2003/02/14 21:05:28 jmmv Exp $
  schemas_in_files =  	panel-global-config.schemas.in			panel-per-panel-config.schemas.in		gnome-panel-screenshot.schemas.in		$(NULL)
  
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@@ -959,7 +959,7 @@ panel-typebuiltins.h: @REBUILD@ $(panel_
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	if test -z "$(DESTDIR)" ; then \
-+	if false; then \
- 		for p in $(schemas_DATA) ; do \
- 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
- 		done \