Update to 2.8.5dev.7, here know as 2.8.5.0.7. Lots of minor fixes for

obscure bugs; few, if any, visible changes.

4 files changed, 22 insertions, 24 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 78969afb6f6..bbec56919c6 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2001/12/31 19:50:21 fredb Exp $
+# $NetBSD: Makefile,v 1.38 2002/05/04 17:06:48 fredb Exp $
 #
 
-DISTNAME=		lynx2.8.5dev.5
-PKGNAME=		lynx-2.8.5.0.5
+DISTNAME=		lynx2.8.5dev.7
+PKGNAME=		lynx-2.8.5.0.7
 CATEGORIES=		www
 MASTER_SITES=		http://lynx.isc.org/current/ \
 			ftp://ftp.nl.uu.net/pub/unix/www/lynx/current/ \
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 5133df49227..5d8bea82cbd 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/12/31 04:21:30 fredb Exp $
+$NetBSD: distinfo,v 1.4 2002/05/04 17:06:48 fredb Exp $
 
-SHA1 (lynx2.8.5dev.5.tar.bz2) = ecf83a7f0e6d89941d29faa2b6a6f6a51b0e1f46
-Size (lynx2.8.5dev.5.tar.bz2) = 1963309 bytes
-SHA1 (patch-aa) = 2efc89aee3297f1af1b0fe3214b2ae2b9c6d3a0c
-SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260
+SHA1 (lynx2.8.5dev.7.tar.bz2) = 8e9eb4bf11944c24517e99ec0ef76b203022c5fe
+Size (lynx2.8.5dev.7.tar.bz2) = 1966524 bytes
+SHA1 (patch-aa) = 8935e11ef53dc6a686b2fc19359aa2db7fffc226
+SHA1 (patch-ae) = 116b1a797f52b214c125dd362ed1161bab78313f
diff --git a/www/lynx-current/patches/patch-aa b/www/lynx-current/patches/patch-aa
index d62aeaa2b7e..933a84ff38b 100644
--- a/www/lynx-current/patches/patch-aa
+++ b/www/lynx-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/12/31 04:21:31 fredb Exp $
+$NetBSD: patch-aa,v 1.6 2002/05/04 17:06:49 fredb Exp $
 
---- configure.orig	Sun Nov 18 19:37:14 2001
+--- configure.orig	Tue Jan  1 19:30:08 2002
 +++ configure
-@@ -4296,7 +4296,7 @@
+@@ -4474,7 +4474,7 @@
    fi
    ;;
  esac
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2001/12/31 04:21:31 fredb Exp $
  cat >> confdefs.h <<\EOF
  #define SOCKS 1
  EOF
-@@ -5412,12 +5412,25 @@
+@@ -5590,12 +5590,25 @@
  echo "$ac_t""$cf_cv_screen" 1>&6
  
  case $cf_cv_screen in
@@ -28,13 +28,14 @@ $NetBSD: patch-aa,v 1.5 2001/12/31 04:21:31 fredb Exp $
  pdcurses)
  	cf_cv_ncurses_header=xcurses.h
  	;;
- curses)
+-#curses)
++curses)
 +	case $host_os in
 +	netbsd)
 +		ac_cv_header_term_h=no
 +		cf_cv_ncurses_version=no
 +		;;
 +	esac
- 	if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
- 		cf_cv_ncurses_header=curses.h
- 	fi
+ #	if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
+ #		cf_cv_ncurses_header=curses.h
+ #	fi
diff --git a/www/lynx-current/patches/patch-ae b/www/lynx-current/patches/patch-ae
index 27fa8eb289f..e3799411b6c 100644
--- a/www/lynx-current/patches/patch-ae
+++ b/www/lynx-current/patches/patch-ae
@@ -1,16 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2001/12/31 04:21:31 fredb Exp $
+$NetBSD: patch-ae,v 1.4 2002/05/04 17:06:49 fredb Exp $
 
---- WWW/Library/Implementation/HTParse.c.orig	Wed Oct 25 11:35:28 2000
-+++ WWW/Library/Implementation/HTParse.c	Tue Feb  6 15:26:57 2001
-@@ -291,7 +291,11 @@
+--- WWW/Library/Implementation/HTParse.c.orig	Sun Apr  1 19:51:46 2001
++++ WWW/Library/Implementation/HTParse.c
+@@ -291,7 +291,7 @@
  		char *p2, *h;
  		if ((p2 = strchr(result, '@')) != NULL)
  		   tail = (p2 + 1);
-+#ifdef INET6
+-		p2 = strchr(tail, ':');
 +		p2 = strrchr(tail, ':');
-+#else
- 		p2 = strchr(tail, ':');
-+#endif
  		if (p2 != NULL && !isdigit(UCH(p2[1])))
  		    /*
  		    **	Colon not followed by a port number.