update to 1.10.0

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

4 files changed, 14 insertions, 23 deletions

diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 8189c19f2f4..4fdc1e54e5e 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2007/03/21 12:05:45 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/04/11 18:10:44 drochner Exp $
 #
 
-DISTNAME=	gucharmap-1.8.0
-PKGREVISION=	2
+DISTNAME=	gucharmap-1.10.0
 CATEGORIES=	fonts gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gucharmap/1.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/fonts/gucharmap/PLIST b/fonts/gucharmap/PLIST
index fb5a86dcc22..863a82b307a 100644
--- a/fonts/gucharmap/PLIST
+++ b/fonts/gucharmap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/09/15 15:13:22 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/04/11 18:10:44 drochner Exp $
 bin/charmap
 bin/gnome-character-map
 bin/gucharmap
@@ -27,6 +27,9 @@ share/gnome/help/gucharmap/bg/gucharmap.xml
 share/gnome/help/gucharmap/de/figures/gucharmap_window.png
 share/gnome/help/gucharmap/de/gucharmap.xml
 share/gnome/help/gucharmap/de/legal.xml
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
+share/gnome/help/gucharmap/en_GB/gucharmap.xml
 share/gnome/help/gucharmap/es/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/es/figures/gucharmap_window.png
 share/gnome/help/gucharmap/es/gucharmap.xml
@@ -133,6 +136,7 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
 share/omf/gucharmap/gucharmap-C.omf
 share/omf/gucharmap/gucharmap-bg.omf
 share/omf/gucharmap/gucharmap-de.omf
+share/omf/gucharmap/gucharmap-en_GB.omf
 share/omf/gucharmap/gucharmap-es.omf
 share/omf/gucharmap/gucharmap-fi.omf
 share/omf/gucharmap/gucharmap-fr.omf
@@ -167,6 +171,8 @@ share/omf/gucharmap/gucharmap-zh_TW.omf
 @dirrm share/gnome/help/gucharmap/fi
 @dirrm share/gnome/help/gucharmap/es/figures
 @dirrm share/gnome/help/gucharmap/es
+@dirrm share/gnome/help/gucharmap/en_GB/figures
+@dirrm share/gnome/help/gucharmap/en_GB
 @dirrm share/gnome/help/gucharmap/de/figures
 @dirrm share/gnome/help/gucharmap/de
 @dirrm share/gnome/help/gucharmap/bg/figures
diff --git a/fonts/gucharmap/distinfo b/fonts/gucharmap/distinfo
index b15d41ce95e..6e805521c5f 100644
--- a/fonts/gucharmap/distinfo
+++ b/fonts/gucharmap/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2007/03/27 22:31:16 wiz Exp $
+$NetBSD: distinfo,v 1.13 2007/04/11 18:10:45 drochner Exp $
 
-SHA1 (gucharmap-1.8.0.tar.bz2) = eaaabf11c4fa7f897af5ea2d1b4072debc6ff717
-RMD160 (gucharmap-1.8.0.tar.bz2) = 366426537ffa5b3e24e31b474d6755bd37d73cb1
-Size (gucharmap-1.8.0.tar.bz2) = 2542413 bytes
-SHA1 (patch-aa) = e5b623381245dfb189bdce14ef3d5b91aab7640a
+SHA1 (gucharmap-1.10.0.tar.bz2) = 99957a7ef4be025db4e11bdf1eb7367438e1265d
+RMD160 (gucharmap-1.10.0.tar.bz2) = 6caf6b49d27fd76991db384ef894c2dd7de38dce
+Size (gucharmap-1.10.0.tar.bz2) = 2506883 bytes
diff --git a/fonts/gucharmap/patches/patch-aa b/fonts/gucharmap/patches/patch-aa
deleted file mode 100644
index 38ce9dd1288..00000000000
--- a/fonts/gucharmap/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/03/27 22:31:16 wiz Exp $
-
---- help/C/gucharmap.xml.orig	2006-09-04 22:42:05.000000000 +0000
-+++ help/C/gucharmap.xml
-@@ -44,7 +44,7 @@
-     </copyright>
- -->
- 
--    <publisher> 
-+    <publisher role="maintainer"> 
-       <publishername>GNOME Documentation Project</publishername> 
-     </publisher> 
-