[pkgsrc/trunk]: pkgsrc/misc/yelp update to 2.20.0

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac150291e574
branches:  trunk
changeset: 534912:ac150291e574
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Sat Nov 03 16:25:51 2007 +0000

description:
update to 2.20.0
This switches to the new gnome-2.20 branch.

diffstat:

 misc/yelp/Makefile         |   8 ++++----
 misc/yelp/PLIST            |   6 +++++-
 misc/yelp/distinfo         |  10 +++++-----
 misc/yelp/patches/patch-aa |  13 -------------
 misc/yelp/patches/patch-ac |  13 +++++++++++++
 5 files changed, 27 insertions(+), 23 deletions(-)

diffs (116 lines):

diff -r 45eda32ec26a -r ac150291e574 misc/yelp/Makefile
--- a/misc/yelp/Makefile        Sat Nov 03 16:24:10 2007 +0000
+++ b/misc/yelp/Makefile        Sat Nov 03 16:25:51 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:03 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2007/11/03 16:25:51 drochner Exp $
 #
 
-DISTNAME=              yelp-2.18.1
-PKGREVISION=           4
+DISTNAME=              yelp-2.20.0
 CATEGORIES=            misc
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/yelp/2.18/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/yelp/2.20/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -55,6 +54,7 @@
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/buildlink3.mk"
 .include "../../www/seamonkey/gecko-depends.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff -r 45eda32ec26a -r ac150291e574 misc/yelp/PLIST
--- a/misc/yelp/PLIST   Sat Nov 03 16:24:10 2007 +0000
+++ b/misc/yelp/PLIST   Sat Nov 03 16:25:51 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/09/25 10:54:16 hira Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/11/03 16:25:51 drochner Exp $
 bin/gnome-help
 bin/yelp
 share/applications/yelp.desktop
@@ -9,6 +9,7 @@
 share/locale/ar/LC_MESSAGES/yelp.mo
 share/locale/az/LC_MESSAGES/yelp.mo
 share/locale/be/LC_MESSAGES/yelp.mo
+share/locale/be@latin/LC_MESSAGES/yelp.mo
 share/locale/bg/LC_MESSAGES/yelp.mo
 share/locale/bn/LC_MESSAGES/yelp.mo
 share/locale/bn_IN/LC_MESSAGES/yelp.mo
@@ -61,6 +62,7 @@
 share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
 share/locale/nso/LC_MESSAGES/yelp.mo
+share/locale/oc/LC_MESSAGES/yelp.mo
 share/locale/or/LC_MESSAGES/yelp.mo
 share/locale/pa/LC_MESSAGES/yelp.mo
 share/locale/pl/LC_MESSAGES/yelp.mo
@@ -69,6 +71,7 @@
 share/locale/ro/LC_MESSAGES/yelp.mo
 share/locale/ru/LC_MESSAGES/yelp.mo
 share/locale/rw/LC_MESSAGES/yelp.mo
+share/locale/si/LC_MESSAGES/yelp.mo
 share/locale/sk/LC_MESSAGES/yelp.mo
 share/locale/sl/LC_MESSAGES/yelp.mo
 share/locale/sq/LC_MESSAGES/yelp.mo
@@ -76,6 +79,7 @@
 share/locale/sr@Latn/LC_MESSAGES/yelp.mo
 share/locale/sv/LC_MESSAGES/yelp.mo
 share/locale/ta/LC_MESSAGES/yelp.mo
+share/locale/te/LC_MESSAGES/yelp.mo
 share/locale/tg/LC_MESSAGES/yelp.mo
 share/locale/th/LC_MESSAGES/yelp.mo
 share/locale/tr/LC_MESSAGES/yelp.mo
diff -r 45eda32ec26a -r ac150291e574 misc/yelp/distinfo
--- a/misc/yelp/distinfo        Sat Nov 03 16:24:10 2007 +0000
+++ b/misc/yelp/distinfo        Sat Nov 03 16:25:51 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2007/04/11 18:26:27 drochner Exp $
+$NetBSD: distinfo,v 1.22 2007/11/03 16:25:51 drochner Exp $
 
-SHA1 (yelp-2.18.1.tar.bz2) = 66e446596c22902290d6614b2d356b64d5bd304c
-RMD160 (yelp-2.18.1.tar.bz2) = 8aaf7e5f7f37369fa6822eed615f110babbecd28
-Size (yelp-2.18.1.tar.bz2) = 900142 bytes
-SHA1 (patch-aa) = 06d5f0a6d6e34db1cfff7d65c74cfd3b0d6fe51c
+SHA1 (yelp-2.20.0.tar.bz2) = 29c99793174c24f86ad34373ed5798b534aaac9e
+RMD160 (yelp-2.20.0.tar.bz2) = 381b71583bc98dcce52a3de19407cc7f7e123ab0
+Size (yelp-2.20.0.tar.bz2) = 903106 bytes
 SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea
+SHA1 (patch-ac) = cb1bce8994503ea978c06e6a9e2354241f6fc230
diff -r 45eda32ec26a -r ac150291e574 misc/yelp/patches/patch-aa
--- a/misc/yelp/patches/patch-aa        Sat Nov 03 16:24:10 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/11/29 22:00:49 drochner Exp $
-
---- ./src/yelp-utils.c.orig    2006-11-20 23:23:16.000000000 +0100
-+++ ./src/yelp-utils.c
-@@ -789,7 +789,7 @@ convert_man_uri (gchar *uri, gboolean tr
-       if (!g_spawn_command_line_sync ("manpath", &manp, NULL, NULL, NULL))
-           manp = g_strdup (g_getenv ("MANPATH"));
-       if (!manp) {
--          return NULL;
-+          manp = g_strdup ("/usr/share/man");
-       }
-       g_strstrip (manp);
-       manpath = g_strsplit (manp, ":", -1);
diff -r 45eda32ec26a -r ac150291e574 misc/yelp/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/yelp/patches/patch-ac        Sat Nov 03 16:25:51 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/11/03 16:25:52 drochner Exp $
+
+--- ./src/yelp-window.c.orig   2007-09-29 21:20:58.000000000 +0200
++++ ./src/yelp-window.c
+@@ -1584,7 +1584,7 @@ window_do_load_html (YelpWindow    *wind
+       goto done;
+     }
+ 
+-    base_uri = g_filename_to_uri (real_uri, NULL, NULL);
++    base_uri = g_filename_to_uri (uri, NULL, NULL);
+     if (frag_id) {
+       real_uri = g_strconcat (base_uri, "#", frag_id);
+       g_free (base_uri);