update to 2.30.1

This switches to the gnome-2.30 release branch

7 files changed, 9 insertions, 113 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 8bb742c79a7..d58c5d5a4ef 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2010/06/13 22:45:03 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2010/06/15 21:24:14 drochner Exp $
 #
 
-DISTNAME=		yelp-2.28.1
-PKGREVISION=		3
+DISTNAME=		yelp-2.30.1
 CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.28/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.30/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/misc/yelp/PLIST b/misc/yelp/PLIST
index 810aad5dbcc..55abec155c2 100644
--- a/misc/yelp/PLIST
+++ b/misc/yelp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/12/02 12:57:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/06/15 21:24:14 drochner Exp $
 bin/gnome-help
 bin/yelp
 share/applications/yelp.desktop
@@ -19,6 +19,7 @@ share/locale/br/LC_MESSAGES/yelp.mo
 share/locale/bs/LC_MESSAGES/yelp.mo
 share/locale/ca/LC_MESSAGES/yelp.mo
 share/locale/ca@valencia/LC_MESSAGES/yelp.mo
+share/locale/crh/LC_MESSAGES/yelp.mo
 share/locale/cs/LC_MESSAGES/yelp.mo
 share/locale/cy/LC_MESSAGES/yelp.mo
 share/locale/da/LC_MESSAGES/yelp.mo
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 559adb4a730..8d228ff741f 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.29 2010/02/13 12:26:15 tnn Exp $
+$NetBSD: distinfo,v 1.30 2010/06/15 21:24:14 drochner Exp $
 
-SHA1 (yelp-2.28.1.tar.bz2) = 260719600148490effaba2e78a9d536f251f5b66
-RMD160 (yelp-2.28.1.tar.bz2) = 0cac3a3504065fece952390a05b9612cfe180f11
-Size (yelp-2.28.1.tar.bz2) = 1136184 bytes
+SHA1 (yelp-2.30.1.tar.bz2) = 941b4c3aecd379ea2ff26d12a37efe32afbf0ab1
+RMD160 (yelp-2.30.1.tar.bz2) = a8529e8cbdb021690bcc8a399a1d1b14b0e964ad
+Size (yelp-2.30.1.tar.bz2) = 1139961 bytes
 SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea
-SHA1 (patch-ac) = 188a0a2ed84e54f9c73f589d14bfea155233021a
-SHA1 (patch-ad) = 7a737e7890be40ace92cdd79d234c57ca6e6f223
-SHA1 (patch-ae) = cb64a4aab05937b35482c83276058ae64618532b
-SHA1 (patch-af) = b6ef2e6b00ff3a1c807499113926d8ac3072e67d
diff --git a/misc/yelp/patches/patch-ac b/misc/yelp/patches/patch-ac
deleted file mode 100644
index bcb89bb067a..00000000000
--- a/misc/yelp/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/02/13 12:26:15 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- src/yelp-html.cpp.orig	2009-11-19 17:09:56.000000000 +0000
-+++ src/yelp-html.cpp
-@@ -24,6 +24,8 @@
- #include <mozilla-config.h>
- #include <config.h>
- 
-+#include <string.h>
-+
- #include "yelp-gecko-services.h"
- #include "yelp-gecko-utils.h"
- #include "yelp-marshal.h"
-@@ -90,13 +92,20 @@ static gint
- html_open_uri (GtkMozEmbed *embed, const gchar *uri)
- {
-     YelpHtml *html = YELP_HTML (embed);
--    gboolean block_load;
-+    gboolean block_load = FALSE;
- 
-     g_return_val_if_fail (uri != NULL, FALSE);
- 
-     debug_print (DB_FUNCTION, "entering\n");
-     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
- 
-+    if (g_str_equal (html->priv->base_uri, uri)) {
-+	/* As of xulrunner 1.6.2, open_uri is called in response
-+	   to the base URI we pass in.
-+	 */
-+	return FALSE;
-+    }
-+
-     if (!html->priv->frames_enabled) {
- 	g_signal_emit (html, signals[URI_SELECTED], 0, uri, FALSE);
- 	block_load = TRUE;
diff --git a/misc/yelp/patches/patch-ad b/misc/yelp/patches/patch-ad
deleted file mode 100644
index 366328bc412..00000000000
--- a/misc/yelp/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/02/13 12:26:15 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- src/yelp-window.c.orig	2009-11-19 17:09:56.000000000 +0000
-+++ src/yelp-window.c
-@@ -1854,14 +1854,21 @@ html_uri_selected_cb (YelpHtml  *html,
- 		      gboolean   handled,
- 		      gpointer   user_data)
- {
-+    gchar *new_uri = uri;
-     YelpWindow *window = YELP_WINDOW (user_data);
- 
-     debug_print (DB_FUNCTION, "entering\n");
-     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
- 
-+    if (g_str_has_prefix (uri, "xref:"))
-+        new_uri = g_strconcat (window->priv->base_uri, "#", uri + 5, NULL);
-+
-     if (!handled) {
--	yelp_window_load (window, uri);
-+	yelp_window_load (window, new_uri);
-     }
-+
-+    if (new_uri != uri)
-+        g_free (new_uri);
- }
- 
- static gboolean
diff --git a/misc/yelp/patches/patch-ae b/misc/yelp/patches/patch-ae
deleted file mode 100644
index 4e43087b02a..00000000000
--- a/misc/yelp/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/02/13 12:26:15 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- stylesheets/db2html.xsl.in.orig	2009-11-19 17:09:56.000000000 +0000
-+++ stylesheets/db2html.xsl.in
-@@ -68,7 +68,7 @@ FIXME: yelp:cache no longer works
- <!-- == db.xref.target == -->
- <xsl:template name="db.xref.target">
-   <xsl:param name="linkend"/>
--  <xsl:value-of select="concat('#', $linkend)"/>
-+  <xsl:value-of select="concat('xref:', $linkend)"/>
- </xsl:template>
- 
- <!-- == db2html.css.custom == -->
diff --git a/misc/yelp/patches/patch-af b/misc/yelp/patches/patch-af
deleted file mode 100644
index 220a3d2936a..00000000000
--- a/misc/yelp/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/02/13 12:26:16 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- stylesheets/mal2html.xsl.in.orig	2009-11-19 17:09:56.000000000 +0000
-+++ stylesheets/mal2html.xsl.in
-@@ -44,10 +44,10 @@
-     <xsl:when test="contains($xref, '#')">
-       <xsl:variable name="pageid" select="substring-before($xref, '#')"/>
-       <xsl:variable name="sectionid" select="substring-after($xref, '#')"/>
--      <xsl:value-of select="concat('#', $pageid, '/', $sectionid)"/>
-+      <xsl:value-of select="concat('xref:', $pageid, '/', $sectionid)"/>
-     </xsl:when>
-     <xsl:otherwise>
--      <xsl:value-of select="concat('#', $xref)"/>
-+      <xsl:value-of select="concat('xref:', $xref)"/>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>