From 28d9c7c6d8df2f807b6b8279cd0099021eaf34fe Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Tue, 15 Jun 2010 20:54:37 +0000
Subject: update to 2.30.0 This switches to the gnome-2.30 release branch

---
 editors/gconf-editor/Makefile | 15 ++++-----------
 editors/gconf-editor/PLIST    |  3 ++-
 editors/gconf-editor/distinfo |  8 ++++----
 3 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'editors')

diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 257ee146c2c..74e43030cd9 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.68 2010/06/13 22:44:11 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/15 21:01:21 drochner Exp $
 #
 
-DISTNAME=		gconf-editor-2.28.0
-PKGREVISION=		1
+DISTNAME=		gconf-editor-2.30.0
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.28/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.30/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -23,12 +22,6 @@ CONFIGURE_ARGS+=	--with-gconf-mandatory-source=${GCONF_CONFIG_SOURCE:S/gconf.xml
 
 GCONF_SCHEMAS=		gconf-editor.schemas
 
-# needed for gconf-editor-2.28 and gtk2-2.20 -- remove on next update
-BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGDK_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
-
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.14.0
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -37,7 +30,7 @@ BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.14.0
 .include "../../security/policykit/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gconf-editor/PLIST b/editors/gconf-editor/PLIST
index 36320ebbcf1..897c75f20c6 100644
--- a/editors/gconf-editor/PLIST
+++ b/editors/gconf-editor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/10/24 13:00:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/06/15 21:01:21 drochner Exp $
 bin/gconf-editor
 man/man1/gconf-editor.1
 share/applications/gconf-editor.desktop
@@ -161,6 +161,7 @@ share/locale/da/LC_MESSAGES/gconf-editor.mo
 share/locale/de/LC_MESSAGES/gconf-editor.mo
 share/locale/dz/LC_MESSAGES/gconf-editor.mo
 share/locale/el/LC_MESSAGES/gconf-editor.mo
+share/locale/en@shaw/LC_MESSAGES/gconf-editor.mo
 share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
 share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
 share/locale/es/LC_MESSAGES/gconf-editor.mo
diff --git a/editors/gconf-editor/distinfo b/editors/gconf-editor/distinfo
index 5d8192beb70..fa7b71ba729 100644
--- a/editors/gconf-editor/distinfo
+++ b/editors/gconf-editor/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2009/10/24 13:00:04 drochner Exp $
+$NetBSD: distinfo,v 1.21 2010/06/15 21:01:21 drochner Exp $
 
-SHA1 (gconf-editor-2.28.0.tar.bz2) = 5fd385886cb4b2232747b000f2523d7cdbc9b020
-RMD160 (gconf-editor-2.28.0.tar.bz2) = 9c6d619f672a8ce941ff1906b668bcd9676162ac
-Size (gconf-editor-2.28.0.tar.bz2) = 1405006 bytes
+SHA1 (gconf-editor-2.30.0.tar.bz2) = 5fd85bc70278d1904cbe6aec7509b30bed52adfc
+RMD160 (gconf-editor-2.30.0.tar.bz2) = 3a94bee90b068e87906258cbb144b2f27eef0187
+Size (gconf-editor-2.30.0.tar.bz2) = 1389176 bytes
-- 
cgit v1.2.3