Update to 2.5.8.2, from Stefan Krueger in PR 25478. Ok'd by fredb,

the maintainer. Sort PLIST.

Changes:
* correct ifdef in LYgetattrs() to ensure that getattrs() is used only
  if the configure script actually found it
  (report/patch by Paul Gilmartin).
* correct LYcommandList() to allocate data passed to HTList_addObject(),
  since LYRemoveFromCloset() may free it (report by FLWM) -TD
* add a null-pointer check to parameter of HTQuoteParameter(), fixes bug
  introduced in 2.8.5pre.4 (report by FLWM) -TD
* correct units shown by HTReadProgress() for very low rates - bug from
  2.8.5pre.3 changes (report by PG) -TD
* update current-version in README -LP

3 files changed, 24 insertions, 16 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 111d14c9f2d..c0e4a6e3bc5 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2004/05/06 19:19:40 wiz Exp $
 #
 
 DISTNAME=	lynx2.8.5
-PKGNAME=	lynx-2.8.5
-PKGREVISION=	1
+PKGNAME=	lynx-2.8.5.2
 CATEGORIES=	www
 MASTER_SITES=	http://lynx.isc.org/${DISTNAME}/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/lynx/${DISTNAME}/ \
@@ -11,6 +10,9 @@ MASTER_SITES=	http://lynx.isc.org/${DISTNAME}/ \
 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/${DISTNAME}/
 EXTRACT_SUFX=	.tar.bz2
 
+PATCH_SITES=	${MASTER_SITES:=patches/}
+PATCHFILES=	2.8.5rel.2.patch.gz
+
 MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://lynx.isc.org/
 COMMENT=	Alphanumeric display oriented World-Wide Web Client
@@ -19,6 +21,7 @@ BUILD_USES_MSGFMT=	yes
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+DIST_SUBDIR=		lynx
 WRKSRC=			${WRKDIR}/${DISTNAME:S/./-/g}
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
@@ -111,6 +114,9 @@ CONFIGURE_ARGS+=       --enable-ipv6
 
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx
+	# gets created when applying 2.8.5.2 patch -- remove on 
+	# patchless update
+	${RM} ${PREFIX}/share/lynx/lynx_doc/CHANGES.orig_dist
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/www/lynx/PLIST b/www/lynx/PLIST
index 6b062044404..aa4f7c4a0e5 100644
--- a/www/lynx/PLIST
+++ b/www/lynx/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/03 21:14:41 ben Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/05/06 19:19:40 wiz Exp $
 bin/lynx
 man/man1/lynx.1
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/lynx.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/lynx.mo
@@ -63,9 +63,9 @@ share/lynx/lynx_doc/samples/lynx.com
 share/lynx/lynx_doc/samples/lynx.lss
 share/lynx/lynx_doc/samples/lynxdump
 share/lynx/lynx_doc/samples/mailcap
-share/lynx/lynx_doc/samples/mime.types
-share/lynx/lynx_doc/samples/mild-colors.lss
 share/lynx/lynx_doc/samples/mailto-form.pl
+share/lynx/lynx_doc/samples/mild-colors.lss
+share/lynx/lynx_doc/samples/mime.types
 share/lynx/lynx_doc/test/ALT88592.html
 share/lynx/lynx_doc/test/ISO_LATIN1_test.html
 share/lynx/lynx_doc/test/README.txt
@@ -81,13 +81,10 @@ share/lynx/lynx_doc/test/spaces.html
 share/lynx/lynx_doc/test/tabtest.html
 share/lynx/lynx_doc/test/unicode.html
 share/lynx/lynx_doc/test/utf-8-demo.html
-share/lynx/lynx_help/COPYING
 share/lynx/lynx_help/COPYHEADER
+share/lynx/lynx_help/COPYING
 share/lynx/lynx_help/Lynx_users_guide.html.gz
 share/lynx/lynx_help/about_lynx.html.gz
-share/lynx/lynx_help/lynx-dev.html.gz
-share/lynx/lynx_help/lynx_help_main.html.gz
-share/lynx/lynx_help/lynx_url_support.html.gz
 share/lynx/lynx_help/keystrokes/alt_edit_help.html.gz
 share/lynx/lynx_help/keystrokes/bashlike_edit_help.html.gz
 share/lynx/lynx_help/keystrokes/bookmark_help.html.gz
@@ -107,10 +104,13 @@ share/lynx/lynx_help/keystrokes/scrolling_help.html.gz
 share/lynx/lynx_help/keystrokes/test_display.html.gz
 share/lynx/lynx_help/keystrokes/visited_help.html.gz
 share/lynx/lynx_help/keystrokes/xterm_help.html.gz
+share/lynx/lynx_help/lynx-dev.html.gz
+share/lynx/lynx_help/lynx_help_main.html.gz
+share/lynx/lynx_help/lynx_url_support.html.gz
 @dirrm share/lynx/lynx_help/keystrokes
 @dirrm share/lynx/lynx_help
-@dirrm share/lynx/lynx_doc/samples
 @dirrm share/lynx/lynx_doc/test
+@dirrm share/lynx/lynx_doc/samples
 @dirrm share/lynx/lynx_doc/docs
 @dirrm share/lynx/lynx_doc
-@dirrm share/lynx/
+@dirrm share/lynx
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 02cc926a9d2..7f820f22e08 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.13 2004/03/11 22:10:48 ben Exp $
+$NetBSD: distinfo,v 1.14 2004/05/06 19:19:40 wiz Exp $
 
-SHA1 (lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4
-Size (lynx2.8.5.tar.bz2) = 2177287 bytes
+SHA1 (lynx/lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4
+Size (lynx/lynx2.8.5.tar.bz2) = 2177287 bytes
+SHA1 (lynx/2.8.5rel.2.patch.gz) = f2f6cf025a11a860ce2af98ef9c3c0cf0699a8ee
+Size (lynx/2.8.5rel.2.patch.gz) = 2445 bytes
 SHA1 (patch-aa) = ac17101b5dfa296298f1fcd58e8b14673c2855bb
 SHA1 (patch-ae) = 5dff036d9fc35dca528acb530f779dce4a98cddd
 SHA1 (patch-af) = 819cdfae5e8181423f5be68cc202a6e074560e75