- Move to LOCALBASE,

  This includes a path update so everything in X11BASE/etc/gconf will
  still work.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6610 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 115 insertions, 0 deletions

diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
new file mode 100644
index 000000000..6f25900e7
--- /dev/null
+++ b/devel/gconf2/files/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Aug  4 22:38:39 2002
++++ Makefile.in	Sun Aug  4 22:39:52 2002
+@@ -35,7 +35,7 @@
+ DESTDIR =
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = .
diff --git a/devel/gconf2/files/patch-gconf_default.path.in b/devel/gconf2/files/patch-gconf_default.path.in
new file mode 100644
index 000000000..32b327490
--- /dev/null
+++ b/devel/gconf2/files/patch-gconf_default.path.in
@@ -0,0 +1,12 @@
+--- gconf/default.path.in.orig	Mon Jul 17 13:14:41 2006
++++ gconf/default.path.in	Mon Jul 17 13:15:19 2006
+@@ -28,5 +28,8 @@
+ # Finally, look at the systemwide defaults
+ xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.defaults
+ 
+-
++xml:readonly:%%X11BASE%%/etc/gconf/gconf.xml.mandatory
++include %%X11BASE%%/etc/gconf/2/local-mandatory.path
++include %%X11BASE%%/etc/gconf/2/local-defaults.path
++xml:readonly:%%X11BASE%%/etc/gconf/gconf.xml.defaults
+ 
diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c
new file mode 100644
index 000000000..ef551cb28
--- /dev/null
+++ b/devel/gconf2/files/patch-gconf_gconfd.c
@@ -0,0 +1,64 @@
+--- gconf/gconfd.c.orig	Fri May  5 12:40:23 2006
++++ gconf/gconfd.c	Fri May  5 12:41:43 2006
+@@ -124,12 +124,6 @@
+ 
+ static gboolean in_shutdown = FALSE;
+ 
+-/*
+- * Flag indicating we received a SIGHUP and we should reaload
+- * all sources during the next periodic_cleanup()
+- */
+-static gboolean need_db_reload = FALSE;
+-
+ /* 
+  * CORBA goo
+  */
+@@ -410,6 +404,18 @@
+ }
+ 
+ static void
++reload_db (void)
++{
++  gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases"));
++
++  logfile_save ();
++  shutdown_databases ();
++  init_databases ();
++  gconf_server_load_sources ();
++  logfile_read ();
++}
++
++static void
+ signal_handler (int signo)
+ {
+   static gint in_fatal = 0;
+@@ -482,8 +488,8 @@
+   case SIGHUP:
+     --in_fatal;
+ 
+-    /* reload sources during next periodic_cleanup() */
+-    need_db_reload = TRUE;
++    /* reload sources immediately */
++    reload_db ();
+     break;
+ #endif
+ 
+@@ -864,18 +870,6 @@
+ static gboolean
+ periodic_cleanup_timeout(gpointer data)
+ {  
+-  if (need_db_reload)
+-    {
+-      gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases"));
+-
+-      need_db_reload = FALSE;
+-      logfile_save ();
+-      shutdown_databases ();
+-      init_databases ();
+-      gconf_server_load_sources ();
+-      logfile_read ();
+-    }
+-  
+   gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft");
+   
+   drop_old_clients ();
diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c
new file mode 100644
index 000000000..c47e5e426
--- /dev/null
+++ b/devel/gconf2/files/patch-gconf_gconftool.c
@@ -0,0 +1,28 @@
+--- gconf/gconftool.c.orig	Fri May  5 12:36:01 2006
++++ gconf/gconftool.c	Fri May  5 12:39:29 2006
+@@ -3724,6 +3724,8 @@
+ static int
+ do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload)
+ {
++  int sync_result;
++
+   if (args == NULL)
+     {
+       g_printerr (_("Must specify some schema files to install\n"));
+@@ -3738,7 +3740,15 @@
+       ++args;
+     }
+ 
+-  return do_sync (conf);
++  sync_result = do_sync (conf);
++
++  /*
++   * Send all the gconfd-2 processes a SIGHUP so that they reload the
++   * databases and pick up the added/removed schemas.
++   */
++  system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1");
++
++  return sync_result;
+ }
+ 
+ typedef enum {