Updated to 2.4.2

Changes:

* Fix problem and potential crash in info converter.
* Updated translations.
* Don't forkbomb when DISPLAY is set.
* Updated README
* Removed C99-dependant code
* Gnomeified admonition graphics
* Removed yelp-base from OAF server file
* Save window size
* Fixed CFLAGS
* Don't forkbomb when restoring session
* Fix layout problem introduced by a11y fixes
* Fix bad XSLT syntax in getting admonitions

And more... review Changelog to see a complete list of changes.

4 files changed, 40 insertions, 11 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index b86670b28c1..ce19795c1ca 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/14 23:01:51 xtraeme Exp $
 #
 
-DISTNAME=		yelp-2.2.2
-PKGREVISION=		2
+DISTNAME=		yelp-2.4.2
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		xtraeme@NetBSD.org
@@ -20,11 +19,10 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/misc/yelp/PLIST b/misc/yelp/PLIST
index d5be89c135e..4bb0c2fe9d1 100644
--- a/misc/yelp/PLIST
+++ b/misc/yelp/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/12 17:29:38 xtraeme Exp $
-bin/gman
+@comment $NetBSD: PLIST,v 1.2 2003/12/14 23:01:51 xtraeme 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
@@ -17,6 +18,7 @@ ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/yelp.mo
+${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
@@ -37,11 +39,15 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/yelp.mo
 ${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/mk/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/yelp.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/yelp.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/yelp.mo
+${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
@@ -182,14 +188,19 @@ 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/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/yelp/important_docs.xml
 share/yelp/ui/yelp.glade
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 50c14b96b95..ec3af949667 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/09/12 17:29:38 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2003/12/14 23:01:51 xtraeme Exp $
 
-SHA1 (yelp-2.2.2.tar.bz2) = 7c0c15598c21e16ce2854168a57eac04f1ca6088
-Size (yelp-2.2.2.tar.bz2) = 563355 bytes
+SHA1 (yelp-2.4.2.tar.bz2) = f17e5af5318bea90cc94922754d907277a87e0a5
+Size (yelp-2.4.2.tar.bz2) = 598274 bytes
+SHA1 (patch-aa) = 9a2bd6f18c0e17044c45a0cbd5a07eed33207b7b
diff --git a/misc/yelp/patches/patch-aa b/misc/yelp/patches/patch-aa
new file mode 100644
index 00000000000..8356e2679a5
--- /dev/null
+++ b/misc/yelp/patches/patch-aa
@@ -0,0 +1,19 @@
+$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