update to 2.18.0

This moves this pkg to the new stable gnome branch, too much to list here.

4 files changed, 24 insertions, 22 deletions

diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 24b936a413b..e216a9652a1 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2007/03/21 12:05:44 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/04/11 18:16:59 drochner Exp $
 #
 
-DISTNAME=		gconf-editor-2.16.0
-PKGREVISION=		2
+DISTNAME=		gconf-editor-2.18.0
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/editors/gconf-editor/PLIST b/editors/gconf-editor/PLIST
index a92e99d4004..ee53d145bea 100644
--- a/editors/gconf-editor/PLIST
+++ b/editors/gconf-editor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/09/15 15:21:40 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/04/11 18:16:59 drochner Exp $
 bin/gconf-editor
 man/man1/gconf-editor.1
 share/applications/gconf-editor.desktop
@@ -6,11 +6,18 @@ share/gconf/schemas/gconf-editor.schemas
 share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/C/gconf-editor.xml
 share/gnome/help/gconf-editor/C/legal.xml
+share/gnome/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/fr/gconf-editor.xml
+share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/it/gconf-editor.xml
+share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/sv/gconf-editor.xml
 share/icons/hicolor/48x48/apps/gconf-editor.png
 share/locale/am/LC_MESSAGES/gconf-editor.mo
 share/locale/ar/LC_MESSAGES/gconf-editor.mo
 share/locale/az/LC_MESSAGES/gconf-editor.mo
 share/locale/be/LC_MESSAGES/gconf-editor.mo
+share/locale/be@latin/LC_MESSAGES/gconf-editor.mo
 share/locale/bg/LC_MESSAGES/gconf-editor.mo
 share/locale/bn/LC_MESSAGES/gconf-editor.mo
 share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
@@ -83,6 +90,9 @@ share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 share/omf/gconf-editor/gconf-editor-C.omf
+share/omf/gconf-editor/gconf-editor-fr.omf
+share/omf/gconf-editor/gconf-editor-it.omf
+share/omf/gconf-editor/gconf-editor-sv.omf
 share/pixmaps/gconf-editor/entry-blank.png
 share/pixmaps/gconf-editor/entry-bool.png
 share/pixmaps/gconf-editor/entry-list.png
@@ -97,6 +107,12 @@ share/pixmaps/gconf-editor/folder-open.png
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/gnome/help/gconf-editor/sv/figures
+@dirrm share/gnome/help/gconf-editor/sv
+@dirrm share/gnome/help/gconf-editor/it/figures
+@dirrm share/gnome/help/gconf-editor/it
+@dirrm share/gnome/help/gconf-editor/fr/figures
+@dirrm share/gnome/help/gconf-editor/fr
 @dirrm share/gnome/help/gconf-editor/C/figures
 @dirrm share/gnome/help/gconf-editor/C
 @dirrm share/gnome/help/gconf-editor
diff --git a/editors/gconf-editor/distinfo b/editors/gconf-editor/distinfo
index a0ea9cc7f8d..1a12eaafa93 100644
--- a/editors/gconf-editor/distinfo
+++ b/editors/gconf-editor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2007/03/25 08:30:07 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/04/11 18:16:59 drochner Exp $
 
-SHA1 (gconf-editor-2.16.0.tar.bz2) = a3e807aff373c3ecd7cd49d5ef7f5a8e53c058d0
-RMD160 (gconf-editor-2.16.0.tar.bz2) = fd368fd7f1de34e1f1c407e0e152eee3bbba0c71
-Size (gconf-editor-2.16.0.tar.bz2) = 528644 bytes
+SHA1 (gconf-editor-2.18.0.tar.bz2) = 18b969b5aba2e42f0d68e2538a5529b544a8811e
+RMD160 (gconf-editor-2.18.0.tar.bz2) = cc16f83d771b7797a6b310a6d504e36ffe116541
+Size (gconf-editor-2.18.0.tar.bz2) = 694449 bytes
 SHA1 (patch-aa) = 09fe480dda1d7b24abec27198a7ffa0cf3b14244
diff --git a/editors/gconf-editor/patches/patch-aa b/editors/gconf-editor/patches/patch-aa
deleted file mode 100644
index 86eb244a836..00000000000
--- a/editors/gconf-editor/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/03/25 08:30:07 wiz Exp $
-
---- docs/C/gconf-editor.xml.orig	2006-09-04 21:55:15.000000000 +0000
-+++ docs/C/gconf-editor.xml
-@@ -31,7 +31,7 @@
-          </copyright>
-     -->
- 
--    <publisher> 
-+    <publisher role="maintainer"> 
-       <publishername>GNOME Documentation Project</publishername> 
-     </publisher> 
-