From 3fd98bb1f51eb6294a1edf62e0819c6632c9202f Mon Sep 17 00:00:00 2001
From: marcm <marcm@openbsd.org>
Date: Sun, 6 Jul 2003 18:19:20 +0000
Subject: [PATCH] Stop gconf from creating directories under $HOME.

Noticed by sturm@ and systrace
---
 x11/gnome/applets2/Makefile                        |  4 +---
 .../applets2/patches/patch-battstat_Makefile_in    | 12 ++++++++++--
 .../applets2/patches/patch-cdplayer_Makefile_in    | 11 +++++++++++
 .../applets2/patches/patch-charpick_Makefile_in    | 11 +++++++++++
 .../applets2/patches/patch-drivemount_Makefile_in  | 11 +++++++++++
 x11/gnome/applets2/patches/patch-geyes_Makefile_in | 11 +++++++++++
 .../applets2/patches/patch-gkb-new_Makefile_in     | 11 +++++++++++
 x11/gnome/applets2/patches/patch-gtik_Makefile_in  | 11 +++++++++++
 .../applets2/patches/patch-gweather_Makefile_in    | 11 +++++++++++
 .../patches/patch-mini-commander_src_Makefile_in   | 12 ++++++++++++
 .../applets2/patches/patch-modemlights_Makefile_in | 13 +++++++++++++
 .../applets2/patches/patch-multiload_Makefile_in   | 14 +++++++++++---
 .../applets2/patches/patch-panel-menu_Makefile_in  | 11 +++++++++++
 x11/gnome/metacity/Makefile                        |  4 +---
 x11/gnome/metacity/patches/patch-src_Makefile_in   | 11 +++++++++++
 x11/gnome/terminal/Makefile                        |  4 +---
 x11/gnome/terminal/patches/patch-src_Makefile_in   | 11 +++++++++++
 17 files changed, 159 insertions(+), 14 deletions(-)
 create mode 100644 x11/gnome/applets2/patches/patch-cdplayer_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-charpick_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-drivemount_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-geyes_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-gkb-new_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-gtik_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-gweather_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-mini-commander_src_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-modemlights_Makefile_in
 create mode 100644 x11/gnome/applets2/patches/patch-panel-menu_Makefile_in
 create mode 100644 x11/gnome/metacity/patches/patch-src_Makefile_in
 create mode 100644 x11/gnome/terminal/patches/patch-src_Makefile_in

diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index 0fde28552b3..ab6b632293d 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/12 20:12:55 marcm Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/06 18:19:20 marcm Exp $
 
 COMMENT=		"applets for use with the GNOME2 panel"
 COMMENT-battstat=	"Gnome2 applet for monitoring battery level"
@@ -30,8 +30,6 @@ LIB_DEPENDS=		panel-applet-2.0::x11/gnome/panel \
 			gailutil.17::x11/gnome/gail \
 			gtop-2.0.0.0,gtop_common-2.0.0.0,gtop_sysdeps-2.0.0.0,gtop_suid_common-2.0.0.0,gtop_sysdeps_suid-2.0.0.0::devel/libgtop2
 
-MAKE_ENV+=		GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
 PSEUDO_FLAVORS=		no_battstat
 # Only i386 and macppc have the headers for the battstat applet
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "powerpc"
diff --git a/x11/gnome/applets2/patches/patch-battstat_Makefile_in b/x11/gnome/applets2/patches/patch-battstat_Makefile_in
index 9d1db1cec8a..83bf47d9564 100644
--- a/x11/gnome/applets2/patches/patch-battstat_Makefile_in
+++ b/x11/gnome/applets2/patches/patch-battstat_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-battstat_Makefile_in,v 1.2 2003/06/12 20:12:55 marcm Exp $
+$OpenBSD: patch-battstat_Makefile_in,v 1.3 2003/07/06 18:19:20 marcm Exp $
 --- battstat/Makefile.in.orig	Mon Mar 10 09:49:09 2003
-+++ battstat/Makefile.in	Tue May 27 11:26:47 2003
++++ battstat/Makefile.in	Sun Jul  6 10:54:52 2003
 @@ -148,11 +148,11 @@ glade_DATA = battstat_applet.glade
  pixmapsdir = $(datadir)/pixmaps
  pixmaps_DATA = battstat.png
@@ -26,3 +26,11 @@ $OpenBSD: patch-battstat_Makefile_in,v 1.2 2003/06/12 20:12:55 marcm Exp $
  battstat_applet_2_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -637,7 +636,6 @@ maintainer-clean-generic clean mostlycle
+ 
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+ 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
diff --git a/x11/gnome/applets2/patches/patch-cdplayer_Makefile_in b/x11/gnome/applets2/patches/patch-cdplayer_Makefile_in
new file mode 100644
index 00000000000..04eb0dcc5a1
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-cdplayer_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-cdplayer_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- cdplayer/Makefile.in.orig	Sun Jul  6 10:49:27 2003
++++ cdplayer/Makefile.in	Sun Jul  6 10:49:35 2003
+@@ -655,7 +655,6 @@ inlinepixbufs.h: $(IMAGES)
+ $(OBJECTS): inlinepixbufs.h
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA);
+ 
+ # 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/x11/gnome/applets2/patches/patch-charpick_Makefile_in b/x11/gnome/applets2/patches/patch-charpick_Makefile_in
new file mode 100644
index 00000000000..752ef37ff9b
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-charpick_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-charpick_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- charpick/Makefile.in.orig	Sun Jul  6 10:49:47 2003
++++ charpick/Makefile.in	Sun Jul  6 10:49:55 2003
+@@ -591,7 +591,6 @@ $(server_in_files): $(server_in_files:.s
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ # 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/x11/gnome/applets2/patches/patch-drivemount_Makefile_in b/x11/gnome/applets2/patches/patch-drivemount_Makefile_in
new file mode 100644
index 00000000000..ba0ee3c699f
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-drivemount_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-drivemount_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- drivemount/Makefile.in.orig	Sun Jul  6 10:50:10 2003
++++ drivemount/Makefile.in	Sun Jul  6 10:50:19 2003
+@@ -624,7 +624,6 @@ $(server_in_files): $(server_in_files:.s
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ # 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/x11/gnome/applets2/patches/patch-geyes_Makefile_in b/x11/gnome/applets2/patches/patch-geyes_Makefile_in
new file mode 100644
index 00000000000..c8acfc66796
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-geyes_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-geyes_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- geyes/Makefile.in.orig	Sun Jul  6 10:50:30 2003
++++ geyes/Makefile.in	Sun Jul  6 10:50:38 2003
+@@ -597,7 +597,6 @@ $(server_in_files): $(server_in_files:.s
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ # 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/x11/gnome/applets2/patches/patch-gkb-new_Makefile_in b/x11/gnome/applets2/patches/patch-gkb-new_Makefile_in
new file mode 100644
index 00000000000..4a6cd19ec34
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-gkb-new_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-gkb-new_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- gkb-new/Makefile.in.orig	Sun Jul  6 10:50:49 2003
++++ gkb-new/Makefile.in	Sun Jul  6 10:50:58 2003
+@@ -649,7 +649,6 @@ gkb_xmmap: gkb_xmmap.in
+ 	&& mv gkb_xmmap.tmp gkb_xmmap
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ # 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/x11/gnome/applets2/patches/patch-gtik_Makefile_in b/x11/gnome/applets2/patches/patch-gtik_Makefile_in
new file mode 100644
index 00000000000..856cd0b15a2
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-gtik_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-gtik_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- gtik/Makefile.in.orig	Sun Jul  6 10:51:17 2003
++++ gtik/Makefile.in	Sun Jul  6 10:51:25 2003
+@@ -570,7 +570,6 @@ $(server_in_files): $(server_in_files:.s
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ # 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/x11/gnome/applets2/patches/patch-gweather_Makefile_in b/x11/gnome/applets2/patches/patch-gweather_Makefile_in
new file mode 100644
index 00000000000..f1cb93e84e8
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-gweather_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-gweather_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- gweather/Makefile.in.orig	Sun Jul  6 10:51:39 2003
++++ gweather/Makefile.in	Sun Jul  6 10:52:03 2003
+@@ -617,7 +617,6 @@ maintainer-clean-generic clean mostlycle
+ 
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+ 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
diff --git a/x11/gnome/applets2/patches/patch-mini-commander_src_Makefile_in b/x11/gnome/applets2/patches/patch-mini-commander_src_Makefile_in
new file mode 100644
index 00000000000..e5f92cca979
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-mini-commander_src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-mini-commander_src_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- mini-commander/src/Makefile.in.orig	Mon Mar 10 09:50:07 2003
++++ mini-commander/src/Makefile.in	Sun Jul  6 11:12:22 2003
+@@ -657,8 +657,6 @@ $(server_in_files): $(server_in_files:.s
+ 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(top_builddir)/mini-commander/src/mc-install-default-macros
+ 
+ @INTLTOOL_SERVER_RULE@
+ 
diff --git a/x11/gnome/applets2/patches/patch-modemlights_Makefile_in b/x11/gnome/applets2/patches/patch-modemlights_Makefile_in
new file mode 100644
index 00000000000..8b49a364d21
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-modemlights_Makefile_in
@@ -0,0 +1,13 @@
+$OpenBSD: patch-modemlights_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- modemlights/Makefile.in.orig	Sun Jul  6 10:55:14 2003
++++ modemlights/Makefile.in	Sun Jul  6 10:55:51 2003
+@@ -493,9 +493,6 @@ $(server_in_files): $(server_in_files:.s
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-	for p in $(schema_DATA); do \
+-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+-	done
+ 
+ # 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/x11/gnome/applets2/patches/patch-multiload_Makefile_in b/x11/gnome/applets2/patches/patch-multiload_Makefile_in
index 5ed6eb8f2c4..f77cf1775ea 100644
--- a/x11/gnome/applets2/patches/patch-multiload_Makefile_in
+++ b/x11/gnome/applets2/patches/patch-multiload_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-multiload_Makefile_in,v 1.1 2003/06/12 20:12:55 marcm Exp $
---- multiload/Makefile.in.orig	Tue May 27 00:19:05 2003
-+++ multiload/Makefile.in	Tue May 27 00:20:10 2003
+$OpenBSD: patch-multiload_Makefile_in,v 1.2 2003/07/06 18:19:20 marcm Exp $
+--- multiload/Makefile.in.orig	Mon Mar 10 09:49:37 2003
++++ multiload/Makefile.in	Sun Jul  6 10:56:05 2003
 @@ -88,7 +88,7 @@ GNOME_LIBS2_LIBS = @GNOME_LIBS2_LIBS@
  GNOME_VFS_APPLETS_CFLAGS = @GNOME_VFS_APPLETS_CFLAGS@
  GNOME_VFS_APPLETS_LIBS = @GNOME_VFS_APPLETS_LIBS@
@@ -10,3 +10,11 @@ $OpenBSD: patch-multiload_Makefile_in,v 1.1 2003/06/12 20:12:55 marcm Exp $
  HAVE_JW = @HAVE_JW@
  HAVE_LIBAPM = @HAVE_LIBAPM@
  INSTOBJEXT = @INSTOBJEXT@
+@@ -538,7 +538,6 @@ mostlyclean distclean maintainer-clean
+ 
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+ 	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
diff --git a/x11/gnome/applets2/patches/patch-panel-menu_Makefile_in b/x11/gnome/applets2/patches/patch-panel-menu_Makefile_in
new file mode 100644
index 00000000000..ef02cc86f3a
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-panel-menu_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-panel-menu_Makefile_in,v 1.1 2003/07/06 18:19:20 marcm Exp $
+--- panel-menu/Makefile.in.orig	Sun Jul  6 10:55:22 2003
++++ panel-menu/Makefile.in	Sun Jul  6 10:56:18 2003
+@@ -591,7 +591,6 @@ maintainer-clean-generic clean mostlycle
+ @INTLTOOL_SERVER_RULE@
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
+ 
+ # 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/x11/gnome/metacity/Makefile b/x11/gnome/metacity/Makefile
index 7edc7609968..22c79add4c6 100644
--- a/x11/gnome/metacity/Makefile
+++ b/x11/gnome/metacity/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/12 20:07:18 marcm Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/06 18:19:20 marcm Exp $
 
 COMMENT=		"Boring window manager for the adult in you."
 
@@ -25,8 +25,6 @@ LIB_DEPENDS=		gconf-2::devel/gconf2 \
 			glade-2.0.0.0::devel/libglade2 \
 			startup-notification-1::devel/startup-notification
 
-MAKE_ENV+=		GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
 USE_GMAKE=		Yes
diff --git a/x11/gnome/metacity/patches/patch-src_Makefile_in b/x11/gnome/metacity/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..3cd9aacb7b9
--- /dev/null
+++ b/x11/gnome/metacity/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2003/07/06 18:19:21 marcm Exp $
+--- src/Makefile.in.orig	Sun Jul  6 10:33:44 2003
++++ src/Makefile.in	Sun Jul  6 10:35:07 2003
+@@ -906,7 +906,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/terminal/Makefile b/x11/gnome/terminal/Makefile
index 0229e914a34..ec4f6f54ea9 100644
--- a/x11/gnome/terminal/Makefile
+++ b/x11/gnome/terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/12 20:15:47 marcm Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/06 18:19:21 marcm Exp $
 
 COMMENT=		"GNOME terminal"
 
@@ -27,8 +27,6 @@ LIB_DEPENDS=		gnomeui-2::x11/gnome/libgnomeui \
 			startup-notification-1::devel/startup-notification \
 			vte::devel/vte
 
-MAKE_ENV+=		GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-
 SEPARATE_BUILD= 	concurrent
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
diff --git a/x11/gnome/terminal/patches/patch-src_Makefile_in b/x11/gnome/terminal/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..9de7bd5d4fe
--- /dev/null
+++ b/x11/gnome/terminal/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2003/07/06 18:19:21 marcm Exp $
+--- src/Makefile.in.orig	Sun Jul  6 10:42:51 2003
++++ src/Makefile.in	Sun Jul  6 10:43:23 2003
+@@ -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