From f9d6df0e97ee70543f7dd1ac702f7a1229efb583 Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Wed, 31 Oct 2007 19:46:17 +0000
Subject: update to 2.20.1 This switches to the new gnome-2.20 branch.

---
 devel/GConf-ui/Makefile     | 4 +---
 devel/GConf/Makefile        | 4 +---
 devel/GConf/Makefile.common | 6 +++---
 devel/GConf/PLIST           | 5 ++++-
 devel/GConf/distinfo        | 8 ++++----
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/devel/GConf-ui/Makefile b/devel/GConf-ui/Makefile
index 25d97ae72e9..023b879de3f 100644
--- a/devel/GConf-ui/Makefile
+++ b/devel/GConf-ui/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2007/09/21 12:58:15 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/10/31 19:46:18 drochner Exp $
 #
 
 .include "../../devel/GConf/Makefile.common"
 
-PKGREVISION=	1
-
 PKGNAME=	${DISTNAME:S/GConf/GConf-ui/}
 
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=${GCONF_VERSION}
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 0fbdb04bc70..62db3b3e9a3 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2007/09/23 17:16:45 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/10/31 19:46:17 drochner Exp $
 #
 
 .include "../../devel/GConf/Makefile.common"
 
-PKGREVISION=	1
-
 CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	ac_cv_header_ldap_h=no
 
diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common
index 25198d30cbd..cd4ea6e2bca 100644
--- a/devel/GConf/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.1 2007/09/21 12:58:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2007/10/31 19:46:17 drochner Exp $
 #
 
-GCONF_VERSION=		2.18.0.1
+GCONF_VERSION=		2.20.1
 
 DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index e79712fae22..8d8a39a9794 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2007/09/21 12:58:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/10/31 19:46:17 drochner Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -53,6 +53,7 @@ share/locale/cs/LC_MESSAGES/GConf2.mo
 share/locale/cy/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
+share/locale/dz/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
 share/locale/en_CA/LC_MESSAGES/GConf2.mo
 share/locale/en_GB/LC_MESSAGES/GConf2.mo
@@ -87,6 +88,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/oc/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
@@ -102,6 +104,7 @@ share/locale/sr/LC_MESSAGES/GConf2.mo
 share/locale/sr@Latn/LC_MESSAGES/GConf2.mo
 share/locale/sv/LC_MESSAGES/GConf2.mo
 share/locale/ta/LC_MESSAGES/GConf2.mo
+share/locale/te/LC_MESSAGES/GConf2.mo
 share/locale/th/LC_MESSAGES/GConf2.mo
 share/locale/tr/LC_MESSAGES/GConf2.mo
 share/locale/uk/LC_MESSAGES/GConf2.mo
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index f75aea9c190..706d07faf92 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2007/09/21 12:58:13 wiz Exp $
+$NetBSD: distinfo,v 1.17 2007/10/31 19:46:17 drochner Exp $
 
-SHA1 (GConf-2.18.0.1.tar.bz2) = 6bbceafc636457ec14ec2d7b4358235ff6cf08d3
-RMD160 (GConf-2.18.0.1.tar.bz2) = 79bad5a19404277abfbd7f17b61e09274dcc1aa3
-Size (GConf-2.18.0.1.tar.bz2) = 1347765 bytes
+SHA1 (GConf-2.20.1.tar.bz2) = c628e2645a91b15749f1ebacc62ea685cbfa681c
+RMD160 (GConf-2.20.1.tar.bz2) = 743bee341731402e5d4938ee030adf4f463d9a52
+Size (GConf-2.20.1.tar.bz2) = 1404919 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
 SHA1 (patch-ac) = 1a1989511b9bb78f0310e70289b54ed326dede1b
 SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
-- 
cgit v1.2.3