update to 2.22.1

This switches to the gnome-2.22 release branch.

4 files changed, 10 insertions, 26 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 4f8f5e22179..0ca8bf301a9 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2008/04/15 18:27:48 drochner Exp $
 #
 
-DISTNAME=		yelp-2.20.0
-PKGREVISION=		2
+DISTNAME=		yelp-2.22.1
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -47,14 +46,12 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/rarian/buildlink3.mk"
 .include "../../www/seamonkey/gecko-depends.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/yelp/PLIST b/misc/yelp/PLIST
index cc4d69ad498..7d80a6eb178 100644
--- a/misc/yelp/PLIST
+++ b/misc/yelp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2007/11/03 16:25:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/04/15 18:27:48 drochner Exp $
 bin/gnome-help
 bin/yelp
 share/applications/yelp.desktop
@@ -7,6 +7,7 @@ share/icons/hicolor/192x192/apps/yelp-icon-big.png
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
 share/locale/ar/LC_MESSAGES/yelp.mo
+share/locale/as/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
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 5dc7f22ef4c..79a03fc6e2b 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.22 2007/11/03 16:25:51 drochner Exp $
+$NetBSD: distinfo,v 1.23 2008/04/15 18:27:48 drochner Exp $
 
-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 (yelp-2.22.1.tar.bz2) = 29586dd5415fc6470c43dbd68fdb491f91778231
+RMD160 (yelp-2.22.1.tar.bz2) = 236acd566b5e0cde0cc1365b1fdae75b2451bcce
+Size (yelp-2.22.1.tar.bz2) = 995734 bytes
 SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea
-SHA1 (patch-ac) = cb1bce8994503ea978c06e6a9e2354241f6fc230
diff --git a/misc/yelp/patches/patch-ac b/misc/yelp/patches/patch-ac
deleted file mode 100644
index 47cfe676609..00000000000
--- a/misc/yelp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);