Update GConf to 1.0.3

Changes are bugfixes only:
    * Many robustness issues and crashes fixed
    * Fixes for bugs where you end up with multiple oafd's

5 files changed, 61 insertions, 24 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index e68e0e68df0..6906fd72674 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:25 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/11 18:28:58 rh Exp $
 #
 
-DISTNAME=	GConf-1.0.0
+DISTNAME=	GConf-1.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/GConf/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://advogato.org/proj/GConf/
@@ -19,7 +20,7 @@ USE_LIBINTL=	YES
 USE_LIBTOOL=	YES
 
 LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CPPFLAGS+=	-I${X11PREFIX}/include
+CPPFLAGS+=	-I${LOCALBASE}/include/db3 -I${X11PREFIX}/include
 PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
 
 post-install:
@@ -27,4 +28,5 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gconf-1.m4 \
 	  ${LOCALBASE}/share/aclocal/gconf-1.m4
 
+.include "../../databases/db3/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index b2f0f73d47d..d8619a0eced 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/11 18:28:58 rh Exp $
 
-SHA1 (GConf-1.0.0.tar.gz) = 84dad3745e11e91dd683a4172f8d8905b577b7f6
-Size (GConf-1.0.0.tar.gz) = 1009630 bytes
+SHA1 (GConf-1.0.3.tar.bz2) = 2510418de8a5e062cc953194f0a4230d88316e28
+Size (GConf-1.0.3.tar.bz2) = 671630 bytes
 SHA1 (patch-aa) = 4249617614234ecb57c84a8f128fdd673ffadc13
-SHA1 (patch-ab) = 5ed3714db2ea0caf36e2a159e89e7915f1604721
-SHA1 (patch-ac) = d346082950ccd2cb1e6ea5d1e17d691384e46da4
+SHA1 (patch-ab) = 4ff400a4173fd3135361f17e2f33e08ae5e1a0a5
+SHA1 (patch-ac) = 9501b64e48663807ef923efe1778b69d3291510e
 SHA1 (patch-ad) = ba80c589aedd007cd78d455cdee297b8cdb8e89f
diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab
index 3c8fb5e30a6..10eccd916b7 100644
--- a/devel/GConf/patches/patch-ab
+++ b/devel/GConf/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/08/30 06:19:09 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/08/11 18:28:58 rh Exp $
 
---- gconf/gconftool.c.orig	Sun Jul 16 19:50:58 2000
-+++ gconf/gconftool.c	Sun Jul 16 19:51:07 2000
+--- 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>
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/30 06:19:09 rh Exp $
 +#include <popt-gnome.h>
  #include <gnome-xml/tree.h>
  #include <gnome-xml/parser.h>
- #include <stdlib.h>
+ #include <gnome-xml/xmlmemory.h>
diff --git a/devel/GConf/patches/patch-ac b/devel/GConf/patches/patch-ac
index 9985a5e607e..979067f8edf 100644
--- a/devel/GConf/patches/patch-ac
+++ b/devel/GConf/patches/patch-ac
@@ -1,15 +1,43 @@
-$NetBSD: patch-ac,v 1.3 2001/04/10 22:55:07 rh Exp $
+$NetBSD: patch-ac,v 1.4 2001/08/11 18:28:58 rh Exp $
 
---- configure.orig	Thu Apr  5 16:31:04 2001
+--- configure.orig	Mon Jul 23 22:44:59 2001
 +++ configure
-@@ -3015,14 +3015,14 @@
+@@ -6497,14 +6497,14 @@
+ BDB_LIBS=
+ 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:3020: checking for poptGetArg in -lpopt" >&5
+-echo "configure:6601: checking for poptGetArg in -lpopt" >&5
 +echo $ac_n "checking for poptGetArg in -lgnomesupport""... $ac_c" 1>&6
-+echo "configure:3020: checking for poptGetArg in -lgnomesupport" >&5
++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
@@ -18,9 +46,9 @@ $NetBSD: patch-ac,v 1.3 2001/04/10 22:55:07 rh Exp $
 -LIBS="-lpopt  $LIBS"
 +LIBS="-lgnomesupport  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 3028 "configure"
+ #line 6609 "configure"
  #include "confdefs.h"
-@@ -3050,19 +3050,19 @@
+@@ -6631,19 +6631,19 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -30,18 +58,18 @@ $NetBSD: patch-ac,v 1.3 2001/04/10 22:55:07 rh Exp $
    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:3059: checking for popt.h" >&5
+-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:3059: checking for popt-gnome.h" >&5
++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 3064 "configure"
+ #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:3069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:6650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/devel/GConf/pkg/PLIST b/devel/GConf/pkg/PLIST
index b27df25db88..1175007183e 100644
--- a/devel/GConf/pkg/PLIST
+++ b/devel/GConf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2001/04/06 22:00:08 rh Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/08/11 18:28:58 rh Exp $
 bin/gconf-config
 bin/gconf-config-1
 bin/gconfd-1
@@ -15,6 +15,9 @@ include/gconf/1/gconf/gconf-listeners.h
 include/gconf/1/gconf/gconf-schema.h
 include/gconf/1/gconf/gconf-value.h
 include/gconf/1/gconf/gconf.h
+lib/GConf/1/libgconfbackend-bdb.a
+lib/GConf/1/libgconfbackend-bdb.la
+lib/GConf/1/libgconfbackend-bdb.so
 lib/GConf/1/libgconfbackend-xml.a
 lib/GConf/1/libgconfbackend-xml.la
 lib/GConf/1/libgconfbackend-xml.so
@@ -28,6 +31,8 @@ lib/libgconf-gtk-1.la
 lib/libgconf-gtk-1.so
 lib/libgconf-gtk-1.so.1
 lib/libgconf-gtk-1.so.1.0
+lib/pkgconfig/gconf.pc
+lib/pkgconfig/gconfgtk.pc
 share/aclocal/gconf-1.m4
 share/locale/az/LC_MESSAGES/GConf.mo
 share/locale/ca/LC_MESSAGES/GConf.mo
@@ -44,6 +49,7 @@ share/locale/it/LC_MESSAGES/GConf.mo
 share/locale/ja/LC_MESSAGES/GConf.mo
 share/locale/ko/LC_MESSAGES/GConf.mo
 share/locale/nl/LC_MESSAGES/GConf.mo
+share/locale/nn/LC_MESSAGES/GConf.mo
 share/locale/no/LC_MESSAGES/GConf.mo
 share/locale/pt_BR/LC_MESSAGES/GConf.mo
 share/locale/ru/LC_MESSAGES/GConf.mo
@@ -52,6 +58,7 @@ share/locale/sl/LC_MESSAGES/GConf.mo
 share/locale/sv/LC_MESSAGES/GConf.mo
 share/locale/tr/LC_MESSAGES/GConf.mo
 share/locale/uk/LC_MESSAGES/GConf.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/GConf.mo
 share/oaf/gconfd-1.oafinfo
 @dirrm lib/GConf/1
 @dirrm lib/GConf