Update lynx-current to 2.8.4dev.19. The dev.16 distfile is no

longer available from the lynx download side.  More bugfixes - see
http://lynx.isc.org/current/CHANGES for a complete list of changes.

5 files changed, 18 insertions, 112 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index cae79c305e3..90c0a3d2e89 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2001/03/25 18:18:32 kim Exp $
+# $NetBSD: Makefile,v 1.29 2001/03/26 14:23:04 simonb Exp $
 #
 
-DISTNAME=		lynx2.8.4dev.16
-PKGNAME=		lynx-2.8.4.0b16
+DISTNAME=		lynx2.8.4dev.19
+PKGNAME=		lynx-2.8.4.0b19
 CATEGORIES=		www
 MASTER_SITES=		http://lynx.isc.org/current/ \
 			http://lynx.isc.org/po/ \
diff --git a/www/lynx-current/files/md5 b/www/lynx-current/files/md5
index 2f3421cd39b..8fd88583b6b 100644
--- a/www/lynx-current/files/md5
+++ b/www/lynx-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 2001/02/08 19:52:03 fredb Exp $
+$NetBSD: md5,v 1.9 2001/03/26 14:23:05 simonb Exp $
 
-MD5 (lynx2.8.4dev.16.tar.bz2) = 8db0588e3ce75a92455b33a11c0f6703
+SHA1 (lynx2.8.4dev.19.tar.bz2) = e6020bd87b2188c13336cb2c43a31040100d1062
diff --git a/www/lynx-current/files/patch-sum b/www/lynx-current/files/patch-sum
index c327a1c133c..3b42c6720dd 100644
--- a/www/lynx-current/files/patch-sum
+++ b/www/lynx-current/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.7 2001/02/10 06:19:51 fredb Exp $
+$NetBSD: patch-sum,v 1.8 2001/03/26 14:23:05 simonb Exp $
 
-MD5 (patch-aa) = 6cbf38885526260607e8ccc12a454d2e
-MD5 (patch-ac) = a476f5a2b64916f4e679881c25da75bb
-MD5 (patch-ad) = f90d7b543fce9491af13faf73a2a611c
-MD5 (patch-ae) = d2b3513288722f670351c84adef88c8e
+SHA1 (patch-aa) = e22e0595958c3b6fe44011afaba2220c9b3b3639
+SHA1 (patch-ac) = 258d75c4d2263837d0b633987031f1a5ae180a86
+SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260
diff --git a/www/lynx-current/patches/patch-ac b/www/lynx-current/patches/patch-ac
index e1cc9e08bac..7bd74859d56 100644
--- a/www/lynx-current/patches/patch-ac
+++ b/www/lynx-current/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2001/02/10 06:19:52 fredb Exp $
+$NetBSD: patch-ac,v 1.4 2001/03/26 14:23:05 simonb Exp $
 
---- src/LYCurses.c.orig	Mon Jan  1 19:39:50 2001
-+++ src/LYCurses.c	Fri Feb  9 23:33:47 2001
-@@ -1408,6 +1408,10 @@
+--- src/LYCurses.c.orig	Tue Feb 27 13:41:57 2001
++++ src/LYCurses.c	Sun Mar 25 23:17:50 2001
+@@ -1492,6 +1492,10 @@
  #endif /* FANCY_CURSES || USE_SLANG */
  }
  
@@ -13,8 +13,8 @@ $NetBSD: patch-ac,v 1.3 2001/02/10 06:19:52 fredb Exp $
  /*
   * Accommodate the different flavors of touchline
   */
-@@ -1418,11 +1422,17 @@
-     wredrawln(stdscr, row, 1);
+@@ -1502,11 +1506,17 @@
+     wredrawln(LYwin, row, 1);
  #else
  #if defined(HAVE_TOUCHLINE)
 -    /* touchline() is not available on VMS before version 7.0, and then only on
@@ -26,11 +26,12 @@ $NetBSD: patch-ac,v 1.3 2001/02/10 06:19:52 fredb Exp $
 +     * touchwin(), but NetBSD dropped that in version 1.5 when it moved
 +     * to a SysV-like curses.
       */
+-    touchline(LYwin, row, 1, 0);
 +#if defined(NCURSES) || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
 +    touchline(stdscr, row, 1);
 +#else
-     touchline(stdscr, row, 1, 0);
++    touchline(stdscr, row, 1, 0);
 +#endif
  #else
  #if !defined(USE_SLANG)
-     touchwin(stdscr);
+     touchwin(LYwin);
diff --git a/www/lynx-current/patches/patch-ad b/www/lynx-current/patches/patch-ad
deleted file mode 100644
index 72c504cf3aa..00000000000
--- a/www/lynx-current/patches/patch-ad
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/02/06 07:07:44 itojun Exp $
-
---- WWW/Library/Implementation/HTFTP.c.orig	Fri Sep 22 11:21:59 2000
-+++ WWW/Library/Implementation/HTFTP.c	Tue Feb  6 15:59:19 2001
-@@ -2992,15 +2992,18 @@
- 	    char command[LINE_LENGTH+1];
- 	    char *p;
- 	    int h0, h1, h2, h3, p0, p1;	/* Parts of reply */
-+#ifdef INET6
-+	    char dst[LINE_LENGTH+1];
-+#endif
- 
- 	    data_soc = status;
- 
- #ifdef INET6
--	    status = send_cmd_1("EPSV");
-+	    status = send_cmd_1(p = "EPSV");
- 	    if (status < 0)	/* retry or Bad return */
- 		continue;
- 	    else if (status != 2) {
--		status = send_cmd_1("PASV");
-+		status = send_cmd_1(p = "PASV");
- 		if (status < 0)	/* retry or Bad return */
- 		    continue;
- 		else if (status != 2) {
-@@ -3008,7 +3011,7 @@
- 		}
- 	    }
- 
--	    if (strncmp(command, "PASV", 4) == 0) {
-+	    if (strcmp(p, "PASV") == 0) {
- 		for (p = response_text; *p && *p != ','; p++)
- 		    ; /* null body */
- 
-@@ -3021,26 +3024,37 @@
- 		    return -99;
- 		}
- 		passive_port = (p0<<8) + p1;
--	    } else if (strncmp(command, "EPSV", 4) == 0) {
-+		snprintf(dst, sizeof(dst), "%d.%d.%d.%d", h0, h1, h2, h3);
-+	    } else if (strcmp(p, "EPSV") == 0) {
- 		unsigned char c0, c1, c2, c3;
-+		struct sockaddr_storage ss;
-+		int sslen;
-+
- 		/*
--		 * EPSV |||port|
-+		 * EPSV bla (|||port|)
- 		 */
- 		for (p = response_text; *p && !isspace(*p); p++)
- 		    ; /* null body */
--		for (p = response_text; *p && isspace(*p); p++)
-+		for (/*nothing*/; *p && *p && *p != '('; p++)	/*)*/
- 		    ; /* null body */
--		status = sscanf(p+1, "%c%c%c%d%c",
--		       &c0, &c1, &c2, &p0, &c3);
-+		status = sscanf(p, "(%c%c%c%d%c)", &c0, &c1, &c2, &p0, &c3);
- 		if (status != 5) {
- 		    fprintf(tfp, "HTFTP: EPSV reply has invalid format!\n");
- 		    return -99;
- 		}
--		h0 = c0;
--		h1 = c1;
--		h2 = c2;
--		h3 = c3;
- 		passive_port = p0;
-+
-+		sslen = sizeof(ss);
-+		if (getpeername(control->socket, (struct sockaddr *)&ss,
-+		    &sslen) < 0) {
-+		    fprintf(tfp, "HTFTP: getpeername(control) failed\n");
-+		    return -99;
-+		}
-+		if (getnameinfo((struct sockaddr *)&ss, sslen, dst,
-+		    sizeof(dst), NULL, 0, NI_NUMERICHOST)) {
-+		    fprintf(tfp, "HTFTP: getnameinfo failed\n");
-+		    return -99;
-+		}
- 	    }
- #else
- 	    status = send_cmd_1("PASV");
-@@ -3068,8 +3082,12 @@
- 
- 	    /* Open connection for data:  */
- 
-+#ifdef INET6
-+	    sprintf(command, "ftp://%s:%d/", dst, passive_port);
-+#else
- 	    sprintf(command, "ftp://%d.%d.%d.%d:%d/",
- 		    h0, h1, h2, h3, passive_port);
-+#endif
- 	    status = HTDoConnect(command, "FTP data", passive_port, &data_soc);
- 
- 	    if (status < 0) {