Update GConf to 0.11. Changes include additional locale files, some

minor enhancements, and bugfixes.  Most notably, GConf now compiles under
non-ELF architectures (tested under NetBSD-1.4.3/i386)

5 files changed, 44 insertions, 39 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 3000af7c3e6..ddfcd0773ff 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2000/11/27 07:36:09 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/11/27 14:26:17 rh Exp $
 #
 
-DISTNAME=	GConf-0.8
+DISTNAME=	GConf-0.11
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/GConf/}
 
@@ -15,18 +15,12 @@ BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OBJECT_FMT} != "ELF"
-BROKEN=		"GConf only builds correctly on ELF architectures"
-.endif
-
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
 USE_LIBINTL=	YES
 USE_LIBTOOL=	YES
 
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${X11PREFIX}/include"
 PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
 
@@ -36,6 +30,8 @@ post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/gconf-1.m4 \
 	  ${LOCALBASE}/share/aclocal/gconf-1.m4
+	[ -f ${PREFIX}/lib/GConf/1/libgconfbackend-xml.so.0.0 ] || \
+	[ ! -f ${PREFIX}/lib/GConf/1/libgconfbackend-xml.so ] || \
 	${MV} ${PREFIX}/lib/GConf/1/libgconfbackend-xml.so \
 	   ${PREFIX}/lib/GConf/1/libgconfbackend-xml.so.0.0
 
diff --git a/devel/GConf/files/md5 b/devel/GConf/files/md5
index f945c32e9b2..8e12c49622e 100644
--- a/devel/GConf/files/md5
+++ b/devel/GConf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/08/30 06:19:09 rh Exp $
+$NetBSD: md5,v 1.2 2000/11/27 14:26:18 rh Exp $
 
-MD5 (GConf-0.8.tar.gz) = 57258919431085a58b16269c63b92ff3
+MD5 (GConf-0.11.tar.gz) = a31800ed99fc672c99db85cd4466139d
diff --git a/devel/GConf/files/patch-sum b/devel/GConf/files/patch-sum
index d4b83324a93..c003798c931 100644
--- a/devel/GConf/files/patch-sum
+++ b/devel/GConf/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/08/30 06:19:09 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/11/27 14:26:18 rh Exp $
 
 MD5 (patch-aa) = 45ce132399ac6075e8eaf52ca205c4fd
 MD5 (patch-ab) = 253b773d91477f656a8d380edde534d1
+MD5 (patch-ac) = 4a03f2045f359883f42170d3fc7eca24
diff --git a/devel/GConf/patches/patch-ac b/devel/GConf/patches/patch-ac
new file mode 100644
index 00000000000..19c2e89e2cb
--- /dev/null
+++ b/devel/GConf/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2000/11/27 14:26:18 rh Exp $
+
+--- gconf/gconf-glib.c.orig	Tue Nov  7 17:37:02 2000
++++ gconf/gconf-glib.c
+@@ -9966,7 +9966,9 @@
+ #endif
+ #include <string.h>
+ 
++#ifdef HAVE_ICONV
+ #include <iconv.h>
++#endif
+ #include <errno.h>
+ 
+ #include "glib.h"
+@@ -10482,6 +10484,7 @@
+   return retval;
+ }
+ 
++#ifdef HAVE_ICONV
+ /* iconv_open() etc. are not thread safe */
+ G_LOCK_DEFINE_STATIC (iconv_lock);
+ 
+@@ -10580,7 +10583,7 @@
+   else
+     return dest;
+ }
+-
++#endif	/* HAVE_ICONV */
+ 
+ /*************************************************************/
+ 
diff --git a/devel/GConf/pkg/PLIST b/devel/GConf/pkg/PLIST
index a1cf1891f46..ae14afb2d2d 100644
--- a/devel/GConf/pkg/PLIST
+++ b/devel/GConf/pkg/PLIST
@@ -1,20 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2000/11/27 07:36:09 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/11/27 14:26:18 rh Exp $
 bin/gconf-config
 bin/gconf-config-1
 bin/gconfd-1
 bin/gconftool
 bin/gconftool-1
 etc/gconf/1/path.example
-etc/gconf/gconf.xml.defaults/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/standard/%gconf.xml
 etc/gconf/schemas/desktop.schemas
-include/gconf/1/gconf/gconf-backend.h
 include/gconf/1/gconf/gconf-changeset.h
 include/gconf/1/gconf/gconf-client.h
 include/gconf/1/gconf/gconf-engine.h
 include/gconf/1/gconf/gconf-error.h
+include/gconf/1/gconf/gconf-glib-public.h
 include/gconf/1/gconf/gconf-listeners.h
 include/gconf/1/gconf/gconf-schema.h
 include/gconf/1/gconf/gconf-value.h
@@ -24,30 +20,11 @@ lib/GConf/1/libgconfbackend-xml.la
 lib/GConf/1/libgconfbackend-xml.so.0.0
 lib/libgconf-1.a
 lib/libgconf-1.la
-lib/libgconf-1.so.0.1
+lib/libgconf-1.so.1.0
 lib/libgconf-gtk-1.a
 lib/libgconf-gtk-1.la
-lib/libgconf-gtk-1.so.0.1
-lib/libgconf-gtk.so
-lib/libgconf-gtk.so.1
-lib/libgconf.so
-lib/libgconf.so.8
+lib/libgconf-gtk-1.so.1.0
 share/aclocal/gconf-1.m4
-share/locale/ca/LC_MESSAGES/GConf.mo
-share/locale/cs/LC_MESSAGES/GConf.mo
-share/locale/da/LC_MESSAGES/GConf.mo
-share/locale/de/LC_MESSAGES/GConf.mo
-share/locale/el/LC_MESSAGES/GConf.mo
-share/locale/fi/LC_MESSAGES/GConf.mo
-share/locale/fr/LC_MESSAGES/GConf.mo
-share/locale/ga/LC_MESSAGES/GConf.mo
-share/locale/ja/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
-share/locale/sv/LC_MESSAGES/GConf.mo
-share/locale/tr/LC_MESSAGES/GConf.mo
-share/locale/uk/LC_MESSAGES/GConf.mo
 share/oaf/gconfd-1.oafinfo
 @dirrm lib/GConf/1
 @dirrm lib/GConf