Update to 2.16.0:

Bug fixes. Coverity fixes. Use GOption. sysconfdir fixes.

6 files changed, 24 insertions, 23 deletions

diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index e0a2ab92377..190aba3e8d4 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/23 00:22:14 wiz Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
-PKGREVISION=	1
 
 BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=${GCONF2_VERSION}
 
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 699945ef361..b65b3e62e5a 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.40 2006/10/09 12:52:34 joerg Exp $
+# $NetBSD: Makefile.common,v 1.41 2006/10/23 00:22:14 wiz Exp $
 #
 
-GCONF2_VERSION=		2.14.0
+GCONF2_VERSION=		2.16.0
 
 DISTNAME=		GConf-${GCONF2_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.14/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.16/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -24,7 +24,7 @@ PATCHDIR=		${.CURDIR}/../GConf2/patches
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake msgfmt perl pkg-config
+USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 
 PKGCONFIG_OVERRIDE=	gconf-2.0.pc.in
 
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 31f6eee3625..5b33c2e7f58 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2006/04/17 07:07:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.27 2006/10/23 00:22:14 wiz Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -31,6 +31,7 @@ share/doc/gconf/gconf-gconf-sources.html
 share/doc/gconf/gconf-gconf-value.html
 share/doc/gconf/gconf-gconf.html
 share/doc/gconf/gconf.devhelp
+share/doc/gconf/gconf.devhelp2
 share/doc/gconf/home.png
 share/doc/gconf/index.html
 share/doc/gconf/index.sgml
@@ -45,6 +46,7 @@ share/locale/az/LC_MESSAGES/GConf2.mo
 share/locale/be/LC_MESSAGES/GConf2.mo
 share/locale/bg/LC_MESSAGES/GConf2.mo
 share/locale/bn/LC_MESSAGES/GConf2.mo
+share/locale/bn_IN/LC_MESSAGES/GConf2.mo
 share/locale/bs/LC_MESSAGES/GConf2.mo
 share/locale/ca/LC_MESSAGES/GConf2.mo
 share/locale/cs/LC_MESSAGES/GConf2.mo
@@ -71,6 +73,7 @@ share/locale/id/LC_MESSAGES/GConf2.mo
 share/locale/is/LC_MESSAGES/GConf2.mo
 share/locale/it/LC_MESSAGES/GConf2.mo
 share/locale/ja/LC_MESSAGES/GConf2.mo
+share/locale/ka/LC_MESSAGES/GConf2.mo
 share/locale/ko/LC_MESSAGES/GConf2.mo
 share/locale/ku/LC_MESSAGES/GConf2.mo
 share/locale/lt/LC_MESSAGES/GConf2.mo
@@ -83,7 +86,7 @@ share/locale/nb/LC_MESSAGES/GConf2.mo
 share/locale/ne/LC_MESSAGES/GConf2.mo
 share/locale/nl/LC_MESSAGES/GConf2.mo
 share/locale/nn/LC_MESSAGES/GConf2.mo
-share/locale/no/LC_MESSAGES/GConf2.mo
+share/locale/or/LC_MESSAGES/GConf2.mo
 share/locale/pa/LC_MESSAGES/GConf2.mo
 share/locale/pl/LC_MESSAGES/GConf2.mo
 share/locale/pt/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index 151ac7dbd61..d50ee11b67d 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.25 2006/03/30 20:50:02 jmmv Exp $
+$NetBSD: distinfo,v 1.26 2006/10/23 00:22:14 wiz Exp $
 
-SHA1 (GConf-2.14.0.tar.bz2) = 97784779cbecb1f52e1728647889dd4b48f04f62
-RMD160 (GConf-2.14.0.tar.bz2) = 4e281fc8046238df2056cbb1c1b068dc9663041b
-Size (GConf-2.14.0.tar.bz2) = 1895477 bytes
-SHA1 (patch-ab) = 67044ae449164931949f8a67d9f14db15d59365d
-SHA1 (patch-ac) = 03045811c13261088f291e2fbad24e2965c592dc
+SHA1 (GConf-2.16.0.tar.bz2) = 4fbd2aa7e0d6deb1673c3c6db64892491edcdb6a
+RMD160 (GConf-2.16.0.tar.bz2) = b3c429a45ac96cf79b7231666ecb8e1de645a4f8
+Size (GConf-2.16.0.tar.bz2) = 1307732 bytes
+SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
+SHA1 (patch-ac) = 856ff83a03658fcc33ba746a5aacbd74f2738583
 SHA1 (patch-ad) = e5b5be99da47b21e3e7dcd7c3925dffa6cfe5bfa
-SHA1 (patch-ae) = 28464446b68887b090aa73a417540690ac8c89ff
diff --git a/devel/GConf2/patches/patch-ab b/devel/GConf2/patches/patch-ab
index f617ad8c853..90732dd557b 100644
--- a/devel/GConf2/patches/patch-ab
+++ b/devel/GConf2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/09/21 16:44:50 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2006/10/23 00:22:14 wiz Exp $
 
---- Makefile.in.orig	2004-09-14 21:36:45.000000000 +0200
+--- Makefile.in.orig	2006-10-05 12:48:26.000000000 +0000
 +++ Makefile.in
-@@ -675,10 +675,6 @@ uninstall-info: uninstall-info-recursive
+@@ -711,10 +711,6 @@ uninstall-info: uninstall-info-recursive
  
  
  install-data-local:
diff --git a/devel/GConf2/patches/patch-ac b/devel/GConf2/patches/patch-ac
index 780cee2d821..1ba77c12264 100644
--- a/devel/GConf2/patches/patch-ac
+++ b/devel/GConf2/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.4 2004/09/21 16:44:50 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2006/10/23 00:22:14 wiz Exp $
 
---- gconf/Makefile.in.orig	2004-09-14 21:36:47.000000000 +0200
+--- gconf/Makefile.in.orig	2006-10-05 12:54:51.000000000 +0000
 +++ gconf/Makefile.in
-@@ -767,8 +767,8 @@ $(CORBA_SOURCECODE): $(srcdir)/GConfX.id
- 	$(ORBIT_IDL) $(srcdir)/GConfX.idl
+@@ -818,8 +818,8 @@ default.path: $(srcdir)/default.path.in
+ 		<$(srcdir)/default.path.in >default.path
  
- install-data-local:
+ install-data-local: default.path
 -	$(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
 -	$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/GConf2