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.

25 files changed, 28 insertions, 175 deletions

diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 300bbee7534..213c49eb2e4 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/02/14 20:18:04 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/18 20:52:05 jmmv Exp $
 
 SHA1 (libgnomedb-0.10.0.tar.bz2) = 93a13e22d8dec53463871bb9e4b1795bd1b7490d
 Size (libgnomedb-0.10.0.tar.bz2) = 450273 bytes
-SHA1 (patch-aa) = 019cb8036ebd1d97a8739a094aa970d903580c61
+SHA1 (patch-aa) = a9b3f8c0073ac9cbe7835b7749ac4c81322586d0
 SHA1 (patch-ab) = b1b1203f2dfadf4138b65d4eb4a1ea22a905ac75
 SHA1 (patch-ac) = 3cf595c0a49189f15eba1a6a3a846700ed8ec31d
diff --git a/databases/libgnomedb/patches/patch-aa b/databases/libgnomedb/patches/patch-aa
index 3c258fdc2b5..b9c0705b27b 100644
--- a/databases/libgnomedb/patches/patch-aa
+++ b/databases/libgnomedb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/02/14 20:18:05 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2003/02/18 20:52:05 jmmv Exp $
 
 --- data/Makefile.in.orig	2003-01-28 02:41:30.000000000 +0100
 +++ data/Makefile.in
@@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.2 2003/02/14 20:18:05 jmmv Exp $
  schema_DATA = libgnomedb.schemas
  
  # Pixmaps
-@@ -320,7 +320,6 @@ maintainer-clean
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
- @INTLTOOL_KEYS_RULE@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 666a0c79d1d..5ccb6e4204a 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/02/15 17:01:43 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/02/18 20:52:05 jmmv Exp $
 
 SHA1 (libgnome-2.2.0.1.tar.bz2) = 50a7dd086638094723f47788d399d1826647710e
 Size (libgnome-2.2.0.1.tar.bz2) = 716319 bytes
 SHA1 (patch-aa) = edb9f86dbc9defefab5a31ebc6303a7488dab639
 SHA1 (patch-ab) = f1d44227b78406e7daece28e734ac239cda41518
 SHA1 (patch-ac) = f5aaa1cd464d85b9ceea42a29edec950658620f8
-SHA1 (patch-ad) = debc95d4b6bed9998d18c2b2bad1b5a985300ccc
 SHA1 (patch-ae) = 3e9d43e3608cbf9e180c06e690f53c030580fbb2
 SHA1 (patch-af) = 91ce8f910ed54e6186ab6592494ae9190705629b
diff --git a/devel/libgnome/patches/patch-ad b/devel/libgnome/patches/patch-ad
deleted file mode 100644
index a5318f750a9..00000000000
--- a/devel/libgnome/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/02/14 20:11:52 jmmv Exp $
-
---- schemas/Makefile.in.orig	Thu Jan 23 15:08:14 2003
-+++ schemas/Makefile.in
-@@ -279,7 +279,7 @@ maintainer-clean
- 
- # 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 $(schema_DATA) ; do \
- 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
- 		done \
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 7ef64879726..61d9006951a 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/02/14 21:10:14 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/02/18 20:52:06 jmmv Exp $
 
 SHA1 (gedit-2.2.0.1.tar.bz2) = 79ebfc22882706938c53658c3f5d02f3f052926c
 Size (gedit-2.2.0.1.tar.bz2) = 1456472 bytes
-SHA1 (patch-aa) = 908ebb3c7aca809f151dc80b7adda44d72491b46
+SHA1 (patch-aa) = d27d5614e73e7fa6be9e439e3260b4010f3cf621
diff --git a/editors/gedit/patches/patch-aa b/editors/gedit/patches/patch-aa
index d2877497d6f..2d5158f0913 100644
--- a/editors/gedit/patches/patch-aa
+++ b/editors/gedit/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/02/14 21:10:14 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/18 20:52:06 jmmv Exp $
 
 --- data/Makefile.in.orig	2003-02-14 17:59:17.000000000 +0100
 +++ data/Makefile.in
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.1 2003/02/14 21:10:14 jmmv Exp $
  schemas_in_files = gedit.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
  
-@@ -412,7 +412,7 @@ maintainer-clean-generic clean mostlycle
- @INTLTOOL_SERVER_RULE@
- 
- install-data-local:
--	        if test -z "$(DESTDIR)" ; then \
-+	        if false; then \
- 	                for p in $(schemas_DATA) ; do \
- 	                        GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
- 	                done \
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index a2252d64e8a..b5438c203aa 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/02/14 21:11:26 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/02/18 20:52:06 jmmv Exp $
 
 SHA1 (eog-2.2.0.tar.bz2) = 121d6c2529b26de6edebeae892630c092fee0b1e
 Size (eog-2.2.0.tar.bz2) = 469229 bytes
-SHA1 (patch-aa) = bed9ab3f596e5044eb2af84d2c3da7e723024603
+SHA1 (patch-aa) = 652b3c9489bdaffd3fbcdd90dcb759fdd79e73b8
diff --git a/graphics/eog2/patches/patch-aa b/graphics/eog2/patches/patch-aa
index 5eaafb80eb6..1dc706dc3c1 100644
--- a/graphics/eog2/patches/patch-aa
+++ b/graphics/eog2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/02/14 21:11:26 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/18 20:52:07 jmmv Exp $
 
 --- Makefile.in.orig	2003-01-28 09:35:03.000000000 +0100
 +++ Makefile.in
@@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.1 2003/02/14 21:11:26 jmmv Exp $
  schemas_in_files = eog.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
  
-@@ -512,7 +512,6 @@ mostlyclean distclean maintainer-clean
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/eog.schemas
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 4f084b3cf1c..197ca6515b7 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/02/18 14:56:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/18 20:52:07 jmmv Exp $
 #
 
 DISTNAME=		ggv-1.99.98
@@ -21,7 +21,6 @@ USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ARGS+=	--disable-install-schemas
 
 GCONF2_SCHEMAS= 	ggv.schemas
 
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index a56d5ea80fc..b0eb551313b 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/02/15 11:03:42 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/18 20:52:07 jmmv Exp $
 
 SHA1 (seahorse-0.7.0.tar.gz) = 237cfad85023b65c646befb2731aa4a97de87edf
 Size (seahorse-0.7.0.tar.gz) = 629183 bytes
-SHA1 (patch-aa) = 1496356157500eccd4d03dd31c8fdfaf63298792
+SHA1 (patch-aa) = 43bd79a324d2a654af8e9a6f80ebd11857223f51
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
index 4608575b58d..f20bfcb92f1 100644
--- a/security/seahorse/patches/patch-aa
+++ b/security/seahorse/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/02/15 11:04:25 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/18 20:52:07 jmmv Exp $
 
 --- data/Makefile.in.orig	2003-02-15 11:33:21.000000000 +0100
 +++ data/Makefile.in
@@ -11,17 +11,3 @@ $NetBSD: patch-aa,v 1.1 2003/02/15 11:04:25 jmmv Exp $
  schemas_in_files = seahorse.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
  
-@@ -300,13 +300,6 @@ uninstall-am: uninstall-desktopDATA unin
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	@GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 \
--		--makefile-install-rule $(schemas_DATA) || \
--		(echo ;\
--		echo "*****************************************************"; \
--		echo "Installation of schemas failed, install them manually"; \
--		echo "*****************************************************";)
--	@true
- 
- @INTLTOOL_DESKTOP_RULE@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index fb3626fb9a4..faa2fa09141 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2003/02/15 16:41:20 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2003/02/18 20:52:07 jmmv Exp $
 
 SHA1 (gnome-vfs-2.2.2.tar.bz2) = 98c87820f17bd1b7fa75162f079e25ae515378b0
 Size (gnome-vfs-2.2.2.tar.bz2) = 988477 bytes
 SHA1 (patch-aa) = 31c919ba5d732a0b3f1950811adbc58ba9b50bb3
-SHA1 (patch-ab) = dded13bd541a42530af426597f56997e8de301c2
 SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2
 SHA1 (patch-ag) = 48a1a7e7b780bcf25f311abe0c48524c8fe9eaa4
 SHA1 (patch-ai) = 0cbdf095c4c55a770d13d443d904bb567fee3666
diff --git a/sysutils/gnome-vfs2/patches/patch-ab b/sysutils/gnome-vfs2/patches/patch-ab
deleted file mode 100644
index 9d2be4e9924..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/02/15 16:29:32 jmmv Exp $
-
-This patch is being tracked in bug #104418.
-See http://bugzilla.gnome.org/show_bug.cgi?id=104418 for more details.
-
---- schemas/Makefile.in.orig	Mon Jan 20 20:46:20 2003
-+++ schemas/Makefile.in
-@@ -303,7 +303,7 @@ maintainer-clean
- 
- # 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 $(schema_DATA) ; do \
- 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
- 		done \
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 9cc2af8ba8e..f62d7301014 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/02/14 20:59:44 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/02/18 20:52:08 jmmv Exp $
 
 SHA1 (metacity-2.4.34.tar.bz2) = 2262ceea772107522777ee17463ce9b6184fe285
 Size (metacity-2.4.34.tar.bz2) = 1217155 bytes
-SHA1 (patch-aa) = a5f4d2a89228e9cab834938c3ccb692f2bd0be65
diff --git a/wm/metacity/patches/patch-aa b/wm/metacity/patches/patch-aa
deleted file mode 100644
index a6cd09857eb..00000000000
--- a/wm/metacity/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/02/14 20:59:44 jmmv Exp $
-
---- src/Makefile.in.orig	2003-02-13 23:51:38.000000000 +0100
-+++ src/Makefile.in
-@@ -679,7 +679,6 @@ maintainer-clean-generic clean mostlycle
- @INTLTOOL_SCHEMAS_RULE@
- 
- install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
- 
- inlinepixbufs.h: $(IMAGES)
- 	   $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 61271397449..c4c6dcb6b18 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2003/02/15 12:02:34 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/02/18 20:52:08 jmmv Exp $
 
 SHA1 (gnome-panel-2.2.0.1.tar.bz2) = 5da094f37dfb5433bcd7eba42ceea9c86e11e586
 Size (gnome-panel-2.2.0.1.tar.bz2) = 1775486 bytes
 SHA1 (patch-ab) = 4673a6b83dc31e129e81419275fe3f60ad7b7eda
-SHA1 (patch-ac) = 01ee6684dca4076384c96d869e7e77ff68e55f2a
-SHA1 (patch-ad) = 137b18f7fcbebbe12126278e94c85a281a5d80ca
+SHA1 (patch-ac) = fbf30d038322cd2366bcd2c67088d5a5369edd03
+SHA1 (patch-ad) = 68ef55c876e70fb6e8b20eb415e0e31aa111da28
 SHA1 (patch-ae) = 0e2b0efbce597d5517b05216ed3eaaa5ae5b7351
 SHA1 (patch-af) = 78d8cecec09db1743b640b9b516033b1fc8f96d4
-SHA1 (patch-ag) = be9305fbaa08a946b2850bde2e69aed9dd5a55d9
+SHA1 (patch-ag) = 6f039752a72d21ae3ad38673c10937adbf403141
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 \
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 4c0a378f56d..d11209a9507 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/02/14 21:08:39 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/02/18 20:52:09 jmmv Exp $
 
 SHA1 (gnome-session-2.2.0.2.tar.bz2) = 7a40ddad89135a5bcd26d54e71871d3531040229
 Size (gnome-session-2.2.0.2.tar.bz2) = 736370 bytes
-SHA1 (patch-aa) = 74b3ecc90f529c070826de2de7c29652e5980967
 SHA1 (patch-ab) = 6a7b9394c41442c4181f4efb33f7ea7c61ee6f6b
 SHA1 (patch-ac) = 2b467144bbf8f42a7a0796840c42ba8537aa8634
 SHA1 (patch-ad) = 24901462a72294008ef4f219668323fc159eaea0
diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa
deleted file mode 100644
index 14b68fb1d09..00000000000
--- a/x11/gnome-session/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/02/14 21:08:39 jmmv Exp $
-
---- gnome-session/Makefile.in.orig	2003-02-04 00:00:04.000000000 +0100
-+++ gnome-session/Makefile.in
-@@ -658,7 +658,7 @@ default.wm: default.wm.in ../config.stat
- 
- # 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)/gnome-session/$$p ; \
- 	  done \
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index ca1875aea63..0e9bbea0b0b 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/02/14 21:03:41 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/18 20:52:09 jmmv Exp $
 
 SHA1 (control-center-2.2.0.1.tar.bz2) = 620dab3ee2e17124dff948cd362d83ca0ef28135
 Size (control-center-2.2.0.1.tar.bz2) = 1462388 bytes
-SHA1 (patch-aa) = 7e84fc5046e6e2401f40004ddf2aea69b13dd4a6
diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/gnome2-control-center/patches/patch-aa
deleted file mode 100644
index d95dee8d882..00000000000
--- a/x11/gnome2-control-center/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/02/14 21:03:41 jmmv Exp $
-
---- schemas/Makefile.in.orig	2003-02-14 15:11:06.000000000 +0100
-+++ schemas/Makefile.in
-@@ -280,7 +280,7 @@ maintainer-clean
- 
- # 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 $(schema_DATA) ; do \
- 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
- 		done \
diff --git a/x11/gnome2-terminal/distinfo b/x11/gnome2-terminal/distinfo
index 81e5f8750be..0b3075501d0 100644
--- a/x11/gnome2-terminal/distinfo
+++ b/x11/gnome2-terminal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/02/14 21:13:35 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/18 20:52:10 jmmv Exp $
 
 SHA1 (gnome-terminal-2.0.1.tar.bz2) = 514a21a00f9a6b87161f4b90acc553ec3ede02a1
 Size (gnome-terminal-2.0.1.tar.bz2) = 616470 bytes
-SHA1 (patch-aa) = 45f8eb55e2ecaaf36ad580c325cf42a146f30f1f
+SHA1 (patch-aa) = f87211a54c16b23730566c8149a1b3f5efbd6acd
diff --git a/x11/gnome2-terminal/patches/patch-aa b/x11/gnome2-terminal/patches/patch-aa
index 6a408de3347..0b622ed6cdb 100644
--- a/x11/gnome2-terminal/patches/patch-aa
+++ b/x11/gnome2-terminal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/02/14 21:13:35 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2003/02/18 20:52:10 jmmv Exp $
 
 --- src/Makefile.in.orig	Mon Aug  5 03:05:07 2002
 +++ src/Makefile.in
@@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.2 2003/02/14 21:13:35 jmmv Exp $
  	  else :; fi; \
  	done
  
-@@ -603,7 +603,6 @@ maintainer-clean-generic clean mostlycle
- 
- 
- install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
- 
- regenerate-built-sources:
- 	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh