Update GConf to 1.0.7. Changes are mainly bugfixes. In addition, this

now makes use of the real "popt" instead of the skeletion in
libgnomesupport.

5 files changed, 24 insertions, 115 deletions

diff --git a/devel/GConf/patches/patch-aa b/devel/GConf/patches/patch-aa
index d68cc6c798e..3b2e6b76e08 100644
--- a/devel/GConf/patches/patch-aa
+++ b/devel/GConf/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/30 06:19:09 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/01/15 23:59:46 rh Exp $
 
---- gconf/gconf.c.orig	Sun Jul 16 19:50:40 2000
-+++ gconf/gconf.c	Sun Jul 16 19:50:48 2000
-@@ -17,7 +17,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
--#include <popt.h>
-+#include <popt-gnome.h>
- #include "GConf.h"
- #include "gconf.h"
- #include "gconf-internals.h"
+--- gconf/gconf-internals.c.orig	Tue Oct 30 04:42:49 2001
++++ gconf/gconf-internals.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab
deleted file mode 100644
index 10eccd916b7..00000000000
--- a/devel/GConf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/08/11 18:28:58 rh Exp $
-
---- gconf/gconftool.c.orig	Tue Jul 24 04:46:14 2001
-+++ gconf/gconftool.c
-@@ -21,7 +21,7 @@
- #include "gconf-internals.h"
- #include <stdio.h>
- #include <unistd.h>
--#include <popt.h>
-+#include <popt-gnome.h>
- #include <gnome-xml/tree.h>
- #include <gnome-xml/parser.h>
- #include <gnome-xml/xmlmemory.h>
diff --git a/devel/GConf/patches/patch-ac b/devel/GConf/patches/patch-ac
index 979067f8edf..f2ef7b8aedb 100644
--- a/devel/GConf/patches/patch-ac
+++ b/devel/GConf/patches/patch-ac
@@ -1,75 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2001/08/11 18:28:58 rh Exp $
+$NetBSD: patch-ac,v 1.5 2002/01/15 23:59:46 rh Exp $
 
---- configure.orig	Mon Jul 23 22:44:59 2001
+--- configure.orig	Tue Oct 30 04:55:14 2001
 +++ configure
-@@ -6497,14 +6497,14 @@
- BDB_LIBS=
+@@ -6627,7 +6627,7 @@
  BDB_CFLAGS=
  
--echo $ac_n "checking for db_env_create in -ldb-3""... $ac_c" 1>&6
--echo "configure:6502: checking for db_env_create in -ldb-3" >&5
--ac_lib_var=`echo db-3'_'db_env_create | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for db_env_create in -ldb3""... $ac_c" 1>&6
-+echo "configure:6502: checking for db_env_create in -ldb3" >&5
-+ac_lib_var=`echo db3'_'db_env_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb-3  $LIBS"
-+LIBS="-ldb3  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6510 "configure"
- #include "confdefs.h"
-@@ -6532,7 +6532,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  BDB_LIBS=-ldb-3
-+  BDB_LIBS=-ldb3
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -6596,14 +6596,14 @@
  
- 
- 
--echo $ac_n "checking for poptGetArg in -lpopt""... $ac_c" 1>&6
--echo "configure:6601: checking for poptGetArg in -lpopt" >&5
-+echo $ac_n "checking for poptGetArg in -lgnomesupport""... $ac_c" 1>&6
-+echo "configure:6601: checking for poptGetArg in -lgnomesupport" >&5
- ac_lib_var=`echo popt'_'poptGetArg | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpopt  $LIBS"
-+LIBS="-lgnomesupport  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6609 "configure"
- #include "confdefs.h"
-@@ -6631,19 +6631,19 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  POPT_LIBS=-lpopt
-+  POPT_LIBS=-lgnomesupport
- else
-   echo "$ac_t""no" 1>&6
--ac_safe=`echo "popt.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for popt.h""... $ac_c" 1>&6
--echo "configure:6640: checking for popt.h" >&5
-+ac_safe=`echo "popt-gnome.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for popt-gnome.h""... $ac_c" 1>&6
-+echo "configure:6640: checking for popt-gnome.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6645 "configure"
- #include "confdefs.h"
--#include <popt.h>
-+#include <popt-gnome.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-for dblib in db-3.3 db-3.2 db-3.1 db-3; do
++for dblib in db-3.3 db-3.2 db-3.1 db-3 db3; do
+   echo $ac_n "checking for db_env_create in -l$dblib""... $ac_c" 1>&6
+ echo "configure:6633: checking for db_env_create in -l$dblib" >&5
+ ac_lib_var=`echo $dblib'_'db_env_create | sed 'y%./+-%__p_%'`
diff --git a/devel/GConf/patches/patch-ad b/devel/GConf/patches/patch-ad
deleted file mode 100644
index af3c3a07730..00000000000
--- a/devel/GConf/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/04/06 22:00:07 rh Exp $
-
---- gconf/gconf.h.orig	Thu Apr  5 16:35:43 2001
-+++ gconf/gconf.h
-@@ -270,9 +270,7 @@
- 
- extern const char gconf_version[];
- 
--#ifdef HAVE_POPT_H
--#include <popt.h>
--#endif
-+#include <popt-gnome.h>
- 
- #ifdef POPT_AUTOHELP
- /* If people are using popt, then make the table available to them */
diff --git a/devel/GConf/patches/patch-ae b/devel/GConf/patches/patch-ae
index a39e5b571cd..d34e208939f 100644
--- a/devel/GConf/patches/patch-ae
+++ b/devel/GConf/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2001/08/26 16:55:46 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/01/15 23:59:47 rh Exp $
 
---- gconf/Makefile.in.orig	Thu Aug 16 00:01:16 2001
+--- gconf/Makefile.in.orig	Tue Oct 30 04:55:38 2001
 +++ gconf/Makefile.in
-@@ -546,7 +546,7 @@
+@@ -597,7 +597,7 @@
  
  install-data-local:
  	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
 -	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path
 +	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path.example
- 	-mkdir -p $(DESTDIR)$(datadir)/oaf
- 	$(INSTALL_DATA) gconfd.oafinfo $(DESTDIR)$(datadir)/oaf/gconfd-$(MAJOR_VERSION).oafinfo
  
+ # 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.