update to 2.10.0

uses the mozilla/gecko HTML renderer now, let it choose firefox or
mozilla-gtk2, what the GECKO_PROVIDER option is set to
lots of other changes, fixes and cleanup -- too much to list here

4 files changed, 74 insertions, 51 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 3cead80b67c..202818064b0 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/31 15:54:26 drochner Exp $
 #
 
-DISTNAME=		yelp-2.6.5
+DISTNAME=		yelp-2.10.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -24,6 +24,8 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 
+.include "../../mk/bsd.prefs.mk"
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -38,7 +40,15 @@ CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
+.if ${GECKO_PROVIDER} == "firefox"
+# firefox didn't have a pkgconfig file before 1.0.4
+BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
+.include "../../www/firefox/buildlink3.mk"
+.else
+.include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/yelp/PLIST b/misc/yelp/PLIST
index a2561311d00..c9d1abd1df5 100644
--- a/misc/yelp/PLIST
+++ b/misc/yelp/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2004/12/28 21:51:32 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/05/31 15:54:26 drochner Exp $
 bin/gnome-help
 bin/yelp
+etc/gconf/schemas/yelp.schemas
 lib/bonobo/servers/GNOME_Yelp.server
 share/applications/yelp.desktop
+share/icons/hicolor/192x192/apps/yelp-icon-big.png
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/yelp.mo
@@ -43,7 +45,6 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/yelp.mo
-${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/yelp.mo
@@ -61,6 +62,7 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/yelp.mo
@@ -70,59 +72,38 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/tg/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/yelp.mo
-${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/yelp.mo
-share/sgml/docbook/yelp/db2html-admon.xsl
-share/sgml/docbook/yelp/db2html-biblio.xsl
-share/sgml/docbook/yelp/db2html-block.xsl
-share/sgml/docbook/yelp/db2html-callout.xsl
-share/sgml/docbook/yelp/db2html-chunk.xsl
-share/sgml/docbook/yelp/db2html-common.xsl
-share/sgml/docbook/yelp/db2html-division.xsl
-share/sgml/docbook/yelp/db2html-ebnf.xsl
-share/sgml/docbook/yelp/db2html-footnote.xsl
-share/sgml/docbook/yelp/db2html-glossary.xsl
-share/sgml/docbook/yelp/db2html-header.xsl
-share/sgml/docbook/yelp/db2html-html.xsl
-share/sgml/docbook/yelp/db2html-index.xsl
-share/sgml/docbook/yelp/db2html-inline.xsl
-share/sgml/docbook/yelp/db2html-list.xsl
-share/sgml/docbook/yelp/db2html-math.xsl
-share/sgml/docbook/yelp/db2html-media.xsl
-share/sgml/docbook/yelp/db2html-navbar.xsl
-share/sgml/docbook/yelp/db2html-param.xsl
-share/sgml/docbook/yelp/db2html-qanda.xsl
-share/sgml/docbook/yelp/db2html-refentry.xsl
-share/sgml/docbook/yelp/db2html-suppressed.xsl
-share/sgml/docbook/yelp/db2html-synopsis.xsl
-share/sgml/docbook/yelp/db2html-table.xsl
-share/sgml/docbook/yelp/db2html-title.xsl
-share/sgml/docbook/yelp/db2html-titlepage.xsl
-share/sgml/docbook/yelp/db2html-toc.xsl
-share/sgml/docbook/yelp/db2html-xref.xsl
-share/sgml/docbook/yelp/db2html.xsl
-share/sgml/docbook/yelp/gettext.xsl
-share/sgml/docbook/yelp/l10n.xml
-share/sgml/docbook/yelp/man2html.xsl
 share/yelp/default.css
-share/yelp/icons/caution.png
-share/yelp/icons/important.png
-share/yelp/icons/note.png
-share/yelp/icons/tip.png
-share/yelp/icons/warning.png
+share/yelp/icons/yelp-icon-caution.png
+share/yelp/icons/yelp-icon-important.png
+share/yelp/icons/yelp-icon-note.png
+share/yelp/icons/yelp-icon-tip.png
+share/yelp/icons/yelp-icon-warning.png
+share/yelp/icons/yelp-watermark-blockquote-00AB.png
+share/yelp/icons/yelp-watermark-blockquote-00BB.png
+share/yelp/icons/yelp-watermark-blockquote-201C.png
+share/yelp/icons/yelp-watermark-blockquote-201D.png
+share/yelp/icons/yelp-watermark-blockquote-201E.png
 share/yelp/important_docs.xml
+share/yelp/man.xml
+share/yelp/scrollkeeper.xml
 share/yelp/toc.xml
+share/yelp/ui/yelp-ui.xml
 share/yelp/ui/yelp.glade
+share/yelp/xslt/db-title.xsl
+share/yelp/xslt/db2html.xsl
+share/yelp/xslt/info2html.xsl
+share/yelp/xslt/man2html.xsl
+share/yelp/xslt/toc2html.xsl
+@dirrm share/yelp/xslt
 @dirrm share/yelp/ui
 @dirrm share/yelp/icons
 @dirrm share/yelp
-@dirrm share/sgml/docbook/yelp
-@comment in docbook: @dirrm share/sgml/docbook
-@comment in xdg-dirs: @dirrm share/applications
-@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 50de02104ae..ec18571df4f 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 11:02:59 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/05/31 15:54:26 drochner Exp $
 
-SHA1 (yelp-2.6.5.tar.bz2) = 2cd2c4125a01016ab9d60afbd9b684225b3b401f
-RMD160 (yelp-2.6.5.tar.bz2) = d9ae640de40395485ee4e43ad03ed0e3b0c1a329
-Size (yelp-2.6.5.tar.bz2) = 654264 bytes
+SHA1 (yelp-2.10.0.tar.bz2) = 3d48b73a5b896e4a9771c3d103229ed6aadada7b
+RMD160 (yelp-2.10.0.tar.bz2) = bd224cb3d3899790f987e16b7bd2c41527651f78
+Size (yelp-2.10.0.tar.bz2) = 790852 bytes
+SHA1 (patch-aa) = af78d53023c24266c764a8af12125250e0256071
diff --git a/misc/yelp/patches/patch-aa b/misc/yelp/patches/patch-aa
new file mode 100644
index 00000000000..998ee4291f3
--- /dev/null
+++ b/misc/yelp/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.3 2005/05/31 15:54:26 drochner Exp $
+
+--- src/yelp-toc-pager.c.orig	2005-05-11 23:46:12.000000000 +0200
++++ src/yelp-toc-pager.c
+@@ -422,7 +422,7 @@ static gboolean
+ process_read_scrollkeeper (YelpTocPager *pager)
+ {
+     gchar  *content_list;
+-    gchar  *stderr;
++    gchar  *sc_stderr;
+     gchar  *lang;
+     gchar  *command;
+     static xmlSAXHandler sk_sax_handler = { 0, };
+@@ -435,7 +435,7 @@ process_read_scrollkeeper (YelpTocPager 
+ 
+     command = g_strconcat("scrollkeeper-get-content-list ", lang, NULL);
+ 
+-    if (g_spawn_command_line_sync (command, &content_list, &stderr, NULL, NULL)) {
++    if (g_spawn_command_line_sync (command, &content_list, &sc_stderr, NULL, NULL)) {
+ 	if (!sk_sax_handler.startElement) {
+ 	    sk_sax_handler.startElement = sk_startElement;
+ 	    sk_sax_handler.endElement   = sk_endElement;
+@@ -447,7 +447,7 @@ process_read_scrollkeeper (YelpTocPager 
+     }
+ 
+     g_free (content_list);
+-    g_free (stderr);
++    g_free (sc_stderr);
+     g_free (command);
+     return FALSE;
+ }