Update to 2.6.0. Changes since previous stable branch (2.4.x):

Changes in 2.6.0:
-----------------
* Fix for for #134534, portable sed usage.          (Laszlo Peter)
* Updated translations:
  ar      (Arafat Medini)
  cs      (Miloslav Trmac)
  en_GB   (Gareth Owen)
  hu      (Andras Timar)
  pa      (Amanpreet Singh Alam)
  ro      (Mugurel Tudor)
  ru      (Russian team)
  sr      (Slobodan Sredojević)
  sr@Latn (Slobodan Sredojević)
  zh_CN   (jan2xue)

Changes in 2.5.91:
------------------
* Fix for #137216, infinite loop in tree traversal.    (Shaun McCance)
* Updated translations:
  be      (Ales Nyakhaychyk)
  bn      (Sayamindu Dasgupta)
  da      (Ole Laursen)
  el      (Nikos Charonitakis)
  en_CA   (Alexander Winston)
  ga      (Alastair McKinstry)
  nn      (Åsmund Skjæveland)
  pt_BR   (Estêvão Samuel Procópio)
  sr      (Danilo Šegan)
  sr@Latn (Danilo Šegan)
  th      (Paisa Seeluangsawat)
  uk      (Maxim Dziumanenko)

Changes in 2.5.90:
------------------
* Fixed problem where documents in certain categories weren't
  being displayed.                                       (Shaun McCance)
* Fixed #134698, because people like my name.            (Shaun McCance)
* A few stylistic changes to the HTML output.            (Shaun McCance)
* Implement some dictionary magic from DV which fixes the problem
  with libxslt 1.1.3 and should provide a speedup.       (Shaun McCance)
* Updated translations:
  az      (Mətin Əmirov)
  et      (Priit Laes)
  fi      (Lauri Nurmi)
  fr      (Jean-Michel Ardantz)
  it      (Luca Ferretti)
  lt      (Žygimantas Beručka)
  ta      (Dinesh Nadarajah)
  zh_TW   (Roy Chan)

Changes in 2.5.6:
-----------------
* Don't break with libxslt 1.1.3                           (Shaun McCance)
* Better author/editor/othercredit support (#134769)       (Shaun McCance)
* Portability fix in build (#134534)                        (Merino Vidal)
* Don't crash when the window is closed before the
  transformation is finished (#134266)                 (Jan Arne Petersen)
* Don't crash on compulsive page switching                 (Shaun McCance)
* Some more stylesheet work                                (Shaun McCance)
* Translation updates:
  ar      (Arafat Medini)
  az      (Mətin Əmirov)
  be      (Ales Nyakhaychyk)
  ca      (Jordi Mallach)
  cs      (Miloslav Trmac)
  cy      (Rhys Jones)
  da      (Ole Laursen)
  de      (Christian Neumair)
  el      (Kostas Papadimas)
  ko      (Changwoo Ryu)
  ja      (Takeshi AIHANA)
  mn      (Sanlig Badral)
  nn      (Åsmund Skjæveland)
  no      (Kjartan Maraas)
  pt      (Duarte Loreto)
  sq      (Laurent Dhima)
  sr      (Danilo Šegan)
  sr@Latn (Danilo Šegan)
  th      (Paisa Seeluangsawat)

Changes in 2.5.5:
-----------------
* Fixed orphaned Contents header                       (Shaun McCance)
* Implemented releaseinfo element                      (Shaun McCance)
* Various stylesheet improvements and speed-ups        (Shaun McCance)
* Stop grabbing focus on the HTML widget all the time  (Shaun McCance)
* Leak less memory in the DocBook converter            (Shaun McCance)
* Made the interface more responsive while transforming
  really large documents                               (Shaun McCance)
* Fixed stupidly wrong chunking for refentry           (Shaun McCance)
* Fixed stupidly wrong ulink handling                  (Shaun McCance)
* Translation updates:
  ca      (Jordi Mallach)
  es      (Francisco Javier F. Serrador)
  hr      (Robert Sedak)
  ja      (Takeshi AIHANA)
  ko      (Changwoo Ryu)
  mn      (Sanlig Badral)
  nl      (Tino Meinen)
  pl      (GNOME PL Team)
  sq      (Laurent Dhima)
  sv      (Christian Rose)
  zh_CN   (Funda Wang)

Changes in 2.5.4:
-----------------
* Massive amount of mind-numbing work in fixing various scrolling
  issues, including pages loading at the bottom of the page (#131305)
  and not scrolling to anchors (#93721).                  (Shaun McCance)
* Build fix in yelp-window.c.                          (Mikael Hallendal)
* Handle mailto: URIs correctly again.                    (Shaun McCance)
* Fix double history problem on first page of a document. (Shaun McCance)
* Fix history problem for any external links.             (Shaun McCance)
* Some stylistic changes to the stylesheets.              (Shaun McCance)
* Don't leak massive amounts of memory in yelp-window.c   (Shaun McCance)
* Nicer automatic chunk depth determination.              (Shaun McCance)
* Handle XInclude properly.                               (Shaun McCance)
* Work around libxml2 bug (now fixed, but I don't want to depend
  on that recent of a version) which caused the TOC not to get
  loaded if there was a single bad OMF file.              (Shaun McCance)
* Allow relative paths to file on the command line.       (Shaun McCance)
* Updated translations:
  az      (Mətin Əmirov)
  cs      (Miloslav Trmac)
  da      (Ole Laursen
  de      (Christian Neumair)
  el      (Kostas Papadimas)
  es      (Francisco Javier F. Serrador)
  fr      (Christophe Merlet)
  ga      (Alastair McKinstry)
  hu      (Andras Timar)
  ja      (Takeshi AIHANA)
  ko      (Changwoo Ryu)
  lt      (Žygimantas Beručka)
  ms      (Hasbullah Bin Pit)
  nl      (Vincent van Adrighem)
  no      (Kjartan Maraas)
  pl      (Artur Flinta)
  pt      (Duarte Loreto)
  pt_BR   (Estêvão Samuel Procópio)
  sq      (Laurent Dhima)
  sr      (Danilo Šegan)
  sr@Latn (Danilo Šegan)
  sv      (Christian Rose)

Changes in 2.5.3:
-----------------
* Previous and Next changed to Previous Page and Next Page  (Shaun McCance)
* Set encoding to utf-8 in the generated html (#131186)     (Richard Hult)
* New man converter, which will be totally unadvertised
  for the 2.6 release, due to its unreadiness               (Shaun McCance)
* i18n in place for the XSLT                                (Shaun McCance)
* Some nice work on the test document, which though not
  included in the release, has shown some XSLT errors       (Eric Baudais)
* Fixes and improvements to the DocBook XSLT                (Shaun McCance)
* Mildly better error dialogs, still need work              (Shaun McCance)
* Some under-the-hood improvements to the TOC maker         (Shaun McCance)
* Anchor jumping stuff, which is still giving problems      (Shaun McCance)
* Added yelp:chunk-depth processing instruction             (Shaun McCance)
* Handle absolute ghelp: URIs again                         (Shaun McCance)
* Actually handle HTML pages                                (Shaun McCance)
* Handle links to stuff that goes outside Yelp              (Shaun McCance)
* Fix annoying whitespace problem in sidebar                (Shaun McCance)
* Update translations:
  ar      (Arafat Medini)
  ca      (Jordi Mallach)
  cs      (Miloslav Trmac)
  de      (Christian Neumair)
  es      (Francisco Javier F. Serrador)
  et      (Tõivo Leedjärv)
  fr      (Sebastien Bacher)
  hr      (Robert Sedak)
  ko      (Changwoo Ryu)
  lt      (Žygimantas Beručka)
  mn      (Sanlig Badral)
  ms      (Hasbullah Bin Pit)
  nl      (Tino Meinen)
  nn      (Åsmund Skjæveland)
  pl      (GNOME PL Team)
  pt      (Duarte Loreto)
  sr      (Danilo Šegan)
  sr@Latn (Danilo Šegan)
  sv      (Christian Rose)
  ja      (Takeshi AIHANA)

Changes in 2.5.2.1:
-------------------
* Fix the intltool 0.28 build breakage

Changes in 2.5.2:
-----------------
* Lots and lots of work on the Find dialog          (Chee Bin HOH)
* Page titles now show up in the titlebar           (Shaun McCance)
* Non-existent pages are discovered faster          (Shaun McCance)
* Sidebar selection follows loaded page again       (Shaun McCance)
* Previous, Next, and TOC have menu items           (Shaun McCance)
* Window icon from the icon theme, more to come     (Shaun McCance)
* Pretty colored boxes that follow the theme        (Shaun McCance)
* Admonition graphics work again                    (Shaun McCance)
* Plenty more work on the DocBook XSLT              (Shaun McCance)
* Display a busy cursor while loading               (Shaun McCance)
* Put Titlepage and Contents in the right order     (Shaun McCance)
* Prevent duplicate entry in history                (Shaun McCance)
* Do startup notification right                     (Shaun McCance)
* Various crashers and leaks fixed
* Updated translations:
  ar       (Arafat Medini)
  be       (Ales Nyakhaychyk)
  ca       (Jordi Mallach)
  cs       (Miloslav Trmac)
  da       (Ole Laursen)
  de       (Christian Neumair)
  el       (Nikos Charonitakis)
  es       (Francisco Javier F. Serrador)
  ja       (Takeshi AIHANA)
  nl       (Tino Meinen)
  nn       (Åsmund Skjæveland)
  pl       (GNOME PL Team)
  sr       (Danilo Šegan)
  sr@Latn  (Danilo Šegan)
  sv       (Christian Rose)

Changes in 2.5.1:
-----------------
* Remove empty Categories headers from TOC      (Shaun McCance)
* Back, Forward, and Find in Page are back      (Chee Bin HOH)
* Crashes found and fixed:
  Joe Markus Clarke (2)
  Diego González    (1)
  Shaun McCance     (1)
* Updated translations:
  cs      (Miloslav Trmac)
  lt      (Žygimantas Beručka)
  mn      (Sanlig Badral)
  nl      (Tino Meinen)
  sr      (Danilo Šegan)
  sr@Latn (Danilo Šegan)
  th      (Paisa Seeluangsawat)
  fr      (Jean-Michel Ardantz)

Changes in 2.5.0:
-----------------
Completely new transformation system.  This is really just a whole
slew of changes that I just can't list.  The transformations are
done entirely differently, in-process, and unthreaded.  A YelpPager
is used to hold the transformation, and it emits signals when pages
are ready to be displayed.  The "views" are removed from YelpWindow,
because everything goes through YelpPager, and it's considerably
simpler.  There are a lot of regressions and breakages, but the
new infastructure will prove itself.            (Shaun McCance)

4 files changed, 52 insertions, 175 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index f7daa647b12..6b4d14edc77 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2004/03/26 02:27:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/01 18:48:36 jmmv Exp $
 #
 
-DISTNAME=		yelp-2.4.2
-PKGREVISION=		9
+DISTNAME=		yelp-2.6.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		xtraeme@NetBSD.org
@@ -15,6 +14,8 @@ DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 DEPENDS+=		docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	yes
 
+BUILDLINK_DEPENDS.libxslt+=	libxslt>=1.1.4
+
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
diff --git a/misc/yelp/PLIST b/misc/yelp/PLIST
index 1402df61575..f510c1fb956 100644
--- a/misc/yelp/PLIST
+++ b/misc/yelp/PLIST
@@ -1,15 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/16 15:06:19 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/01 18:48:36 jmmv Exp $
 bin/gnome-help
 bin/yelp
-bin/yelp-pregenerate
 lib/bonobo/servers/GNOME_Yelp.server
-libexec/yelp-db2html
-libexec/yelp-info2html
-libexec/yelp-man2html
 share/applications/yelp.desktop
-share/images/yelp/bcg.png
-share/images/yelp/empty.png
-share/images/yelp/gnome2-button.png
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/yelp.mo
@@ -22,6 +15,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/yelp.mo
@@ -32,6 +27,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/yelp.mo
@@ -51,6 +47,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/yelp.mo
@@ -70,152 +67,51 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/yelp.mo
-share/sgml/docbook/yelp/docbook/VERSION
-share/sgml/docbook/yelp/docbook/common/af.xml
-share/sgml/docbook/yelp/docbook/common/ca.xml
-share/sgml/docbook/yelp/docbook/common/common.xsl
-share/sgml/docbook/yelp/docbook/common/cs.xml
-share/sgml/docbook/yelp/docbook/common/da.xml
-share/sgml/docbook/yelp/docbook/common/de.xml
-share/sgml/docbook/yelp/docbook/common/el.xml
-share/sgml/docbook/yelp/docbook/common/en.xml
-share/sgml/docbook/yelp/docbook/common/es.xml
-share/sgml/docbook/yelp/docbook/common/et.xml
-share/sgml/docbook/yelp/docbook/common/eu.xml
-share/sgml/docbook/yelp/docbook/common/fi.xml
-share/sgml/docbook/yelp/docbook/common/fr.xml
-share/sgml/docbook/yelp/docbook/common/gentext.xsl
-share/sgml/docbook/yelp/docbook/common/hu.xml
-share/sgml/docbook/yelp/docbook/common/id.xml
-share/sgml/docbook/yelp/docbook/common/it.xml
-share/sgml/docbook/yelp/docbook/common/ja.xml
-share/sgml/docbook/yelp/docbook/common/ko.xml
-share/sgml/docbook/yelp/docbook/common/l10n.dtd
-share/sgml/docbook/yelp/docbook/common/l10n.xml
-share/sgml/docbook/yelp/docbook/common/l10n.xsl
-share/sgml/docbook/yelp/docbook/common/labels.xsl
-share/sgml/docbook/yelp/docbook/common/nl.xml
-share/sgml/docbook/yelp/docbook/common/nn.xml
-share/sgml/docbook/yelp/docbook/common/no.xml
-share/sgml/docbook/yelp/docbook/common/pl.xml
-share/sgml/docbook/yelp/docbook/common/pt.xml
-share/sgml/docbook/yelp/docbook/common/pt_br.xml
-share/sgml/docbook/yelp/docbook/common/ro.xml
-share/sgml/docbook/yelp/docbook/common/ru.xml
-share/sgml/docbook/yelp/docbook/common/sk.xml
-share/sgml/docbook/yelp/docbook/common/sl.xml
-share/sgml/docbook/yelp/docbook/common/sr.xml
-share/sgml/docbook/yelp/docbook/common/subtitles.xsl
-share/sgml/docbook/yelp/docbook/common/sv.xml
-share/sgml/docbook/yelp/docbook/common/table.xsl
-share/sgml/docbook/yelp/docbook/common/th.xml
-share/sgml/docbook/yelp/docbook/common/titles.xsl
-share/sgml/docbook/yelp/docbook/common/tr.xml
-share/sgml/docbook/yelp/docbook/common/uk.xml
-share/sgml/docbook/yelp/docbook/common/xh.xml
-share/sgml/docbook/yelp/docbook/common/zh_cn.xml
-share/sgml/docbook/yelp/docbook/common/zh_tw.xml
-share/sgml/docbook/yelp/docbook/dtd/calstblx.dtd
-share/sgml/docbook/yelp/docbook/dtd/catalog
-share/sgml/docbook/yelp/docbook/dtd/dbcentx.mod
-share/sgml/docbook/yelp/docbook/dtd/dbgenent.mod
-share/sgml/docbook/yelp/docbook/dtd/dbhierx.mod
-share/sgml/docbook/yelp/docbook/dtd/dbnotnx.mod
-share/sgml/docbook/yelp/docbook/dtd/dbpoolx.mod
-share/sgml/docbook/yelp/docbook/dtd/docbookx.dtd
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-amsa.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-amsb.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-amsc.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-amsn.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-amso.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-amsr.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-box.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr1.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr2.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-dia.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-grk1.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-grk2.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-grk3.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-grk4.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-lat1.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-lat2.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-num.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-pub.ent
-share/sgml/docbook/yelp/docbook/dtd/ent/iso-tech.ent
-share/sgml/docbook/yelp/docbook/dtd/soextblx.dtd
-share/sgml/docbook/yelp/docbook/html/admon.xsl
-share/sgml/docbook/yelp/docbook/html/autoidx.xsl
-share/sgml/docbook/yelp/docbook/html/autotoc.xsl
-share/sgml/docbook/yelp/docbook/html/biblio.xsl
-share/sgml/docbook/yelp/docbook/html/block.xsl
-share/sgml/docbook/yelp/docbook/html/calc-chunks.xsl
-share/sgml/docbook/yelp/docbook/html/callout.xsl
-share/sgml/docbook/yelp/docbook/html/changebars.xsl
-share/sgml/docbook/yelp/docbook/html/chunk-experimental.xsl
-share/sgml/docbook/yelp/docbook/html/chunk.xsl
-share/sgml/docbook/yelp/docbook/html/chunker.xsl
-share/sgml/docbook/yelp/docbook/html/component.xsl
-share/sgml/docbook/yelp/docbook/html/division.xsl
-share/sgml/docbook/yelp/docbook/html/docbook.xsl
-share/sgml/docbook/yelp/docbook/html/ebnf.xsl
-share/sgml/docbook/yelp/docbook/html/expchunk.xsl
-share/sgml/docbook/yelp/docbook/html/footnote.xsl
-share/sgml/docbook/yelp/docbook/html/formal.xsl
-share/sgml/docbook/yelp/docbook/html/glossary.xsl
-share/sgml/docbook/yelp/docbook/html/graphics.xsl
-share/sgml/docbook/yelp/docbook/html/html.xsl
-share/sgml/docbook/yelp/docbook/html/index.xsl
-share/sgml/docbook/yelp/docbook/html/info.xsl
-share/sgml/docbook/yelp/docbook/html/inline.xsl
-share/sgml/docbook/yelp/docbook/html/keywords.xsl
-share/sgml/docbook/yelp/docbook/html/lists.xsl
-share/sgml/docbook/yelp/docbook/html/math.xsl
-share/sgml/docbook/yelp/docbook/html/oldchunker.xsl
-share/sgml/docbook/yelp/docbook/html/onechunk.xsl
-share/sgml/docbook/yelp/docbook/html/param.xml
-share/sgml/docbook/yelp/docbook/html/param.xsl
-share/sgml/docbook/yelp/docbook/html/pi.xsl
-share/sgml/docbook/yelp/docbook/html/qandaset.xsl
-share/sgml/docbook/yelp/docbook/html/refentry.xsl
-share/sgml/docbook/yelp/docbook/html/sections.xsl
-share/sgml/docbook/yelp/docbook/html/synop.xsl
-share/sgml/docbook/yelp/docbook/html/table.xsl
-share/sgml/docbook/yelp/docbook/html/titlepage.templates.xml
-share/sgml/docbook/yelp/docbook/html/titlepage.templates.xsl
-share/sgml/docbook/yelp/docbook/html/titlepage.xsl
-share/sgml/docbook/yelp/docbook/html/toc.xsl
-share/sgml/docbook/yelp/docbook/html/verbatim.xsl
-share/sgml/docbook/yelp/docbook/html/xref.xsl
-share/sgml/docbook/yelp/docbook/images/blank.png
-share/sgml/docbook/yelp/docbook/images/caution.png
-share/sgml/docbook/yelp/docbook/images/home.png
-share/sgml/docbook/yelp/docbook/images/important.png
-share/sgml/docbook/yelp/docbook/images/next.png
-share/sgml/docbook/yelp/docbook/images/note.png
-share/sgml/docbook/yelp/docbook/images/prev.png
-share/sgml/docbook/yelp/docbook/images/tip.png
-share/sgml/docbook/yelp/docbook/images/up.png
-share/sgml/docbook/yelp/docbook/images/warning.png
-share/sgml/docbook/yelp/docbook/lib/lib.xsl
+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/yelp-custom.xsl
-share/sgml/docbook/yelp/yelp-customization.xsl
-share/sgml/docbook/yelp/yelp-functions.xsl
-share/yelp/catalog
+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/important_docs.xml
+share/yelp/toc.xml
 share/yelp/ui/yelp.glade
 @dirrm share/yelp/ui
+@dirrm share/yelp/icons
 @dirrm share/yelp
-@dirrm share/sgml/docbook/yelp/docbook/lib
-@dirrm share/sgml/docbook/yelp/docbook/images
-@dirrm share/sgml/docbook/yelp/docbook/html
-@dirrm share/sgml/docbook/yelp/docbook/dtd/ent
-@dirrm share/sgml/docbook/yelp/docbook/dtd
-@dirrm share/sgml/docbook/yelp/docbook/common
-@dirrm share/sgml/docbook/yelp/docbook
 @dirrm share/sgml/docbook/yelp
 @comment in docbook: @dirrm share/sgml/docbook
-@dirrm share/images/yelp
-@comment in gnome2-dirs: @dirrm share/images
 @comment in gnome2-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index ec3af949667..83158a32b6a 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/12/14 23:01:51 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/04/01 18:48:36 jmmv Exp $
 
-SHA1 (yelp-2.4.2.tar.bz2) = f17e5af5318bea90cc94922754d907277a87e0a5
-Size (yelp-2.4.2.tar.bz2) = 598274 bytes
-SHA1 (patch-aa) = 9a2bd6f18c0e17044c45a0cbd5a07eed33207b7b
+SHA1 (yelp-2.6.0.tar.bz2) = 208a856065e7962e2a2ec8d315ac280d0704ba2a
+Size (yelp-2.6.0.tar.bz2) = 512061 bytes
diff --git a/misc/yelp/patches/patch-aa b/misc/yelp/patches/patch-aa
deleted file mode 100644
index 8356e2679a5..00000000000
--- a/misc/yelp/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/12/14 23:01:51 xtraeme Exp $
-
---- configure.orig	2003-12-13 03:43:06.000000000 +0100
-+++ configure	2003-12-13 03:43:52.000000000 +0100
-@@ -9987,12 +9987,12 @@
- 
- YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
- 
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
-+YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
- 
- 
- 
-   case $host in
--  *-linux-gnu | *-irix6*)
-+  *-linux-gnu | *-irix6* | *-freebsd* | *-netbsd*)
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MAN_WHEREIS 1
- _ACEOF