Update to 2.8.3rel.1. Minor bug-fixes and tweaks since 2.8.3pre.7.

This version is considered to be release quality, but I'm putting
this under lynx-current pending integration of ipv6 support. Also,
socks is said to be broken in this release.

Add a hook to use "ncurses" for the screen library -- currently
the only way to get color-style support, or "curses" -- for the
day when NetBSD curses supports color. "slang" remains the default.

5 files changed, 79 insertions, 16 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 1bbf7acdfc2..28e97b649c1 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2000/04/27 06:46:02 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/05/08 01:46:55 fredb Exp $
 #
 
-DISTNAME=		lynx2.8.3pre.7
-PKGNAME=		lynx-2.8.3pre.7
+DISTNAME=		lynx2.8.3rel.1
+PKGNAME=		lynx-2.8.3rel.1
 CATEGORIES=		www
 MASTER_SITES=		http://lynx.isc.org/current/
 EXTRACT_SUFX=		.tar.bz2
 
 PATCH_SITES=		http://www.moxienet.com/lynx/
-PATCHFILES= 		lynx-283d17-ssl.patch.gz
+PATCHFILES= 		lynx-283-ssl.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		fb@enteract.com
 HOMEPAGE=		http://lynx.browser.org/
 
 DEPENDS+=		gettext-0.10.*:../../devel/gettext
-DEPENDS+=		libslang-*:../../devel/libslang
 
 NO_PACKAGE=		${RESTRICTED}
 RESTRICTED=		"Crypto; export-controlled"
@@ -27,22 +26,17 @@ USE_SSL=		yes
 INSTALL_TARGET=		install-full
 MAKEFILE=       	makefile
 
+BUILD_DEFS+=		LYNX_SCREEN_LIB
+
 # For nls/gettext
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--with-nls-datadir=${PREFIX}/share
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 
-# Curses/slang
+# Note: the following have no effect with curses screen
 CONFIGURE_ARGS+=	--enable-default-colors
 CONFIGURE_ARGS+=	--enable-scrollbar
-CONFIGURE_ARGS+=	--with-screen=slang
-CONFIGURE_ENV+=		LIBS="-lm -ltermcap"
-
-# XXX Just for fun, to use ncurses instead of slang.
-#CONFIGURE_ARGS+=	--enable-color-style
-#CONFIGURE_ARGS+=	--with-screen=ncurses
-#DEPENDS+=		ncurses-*:../../devel/ncurses
 
 # Install gzip'ed help files to ${PREFIX}/share/lynx
 CONFIGURE_ARGS+=	--libdir="${PREFIX}/share/lynx"
@@ -83,6 +77,30 @@ post-install:
 	    ${CP} ${PREFIX}/share/lynx/lynx_doc/samples/lynx.lss ${PREFIX}/etc/; \
 	fi
 
+.include "../../mk/bsd.prefs.mk"
+
+# XXX until our curses does color...
+LYNX_SCREEN_LIB?=	slang
+
+.if (${LYNX_SCREEN_LIB} == slang)
+DEPENDS+=		libslang-*:../../devel/libslang
+CONFIGURE_ARGS+=	--with-screen=slang
+CONFIGURE_ENV+=		LIBS="-lm -ltermcap"
+.elif (${LYNX_SCREEN_LIB} == ncurses)
+DEPENDS+=		ncurses-*:../../devel/ncurses
+CONFIGURE_ARGS+=	--enable-color-style
+CONFIGURE_ARGS+=	--with-screen=ncurses
+.elif (${LYNX_SCREEN_LIB} == curses)
+CONFIGURE_ARGS+=	--with-screen=curses
+.else
+pre-configure:
+	@${ECHO} '****************************************************'
+	@${ECHO} '* Invalid value for LYNX_SCREEN_LIB. Please choose *'
+	@${ECHO} '* one of "slang", "ncurses", or "curses"!          *'
+	@${ECHO} '****************************************************'
+	@false
+.endif
+
 .include "../../mk/bsd.pkg.mk"
 
 .if (${SSLBASE} == /usr)
diff --git a/www/lynx-current/files/md5 b/www/lynx-current/files/md5
index 2152850147d..ed5ca9f9663 100644
--- a/www/lynx-current/files/md5
+++ b/www/lynx-current/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.3 2000/04/22 05:34:05 fredb Exp $
+$NetBSD: md5,v 1.4 2000/05/08 01:46:56 fredb Exp $
 
-MD5 (lynx2.8.3pre.7.tar.bz2) = 5ed168676d218e311f2e8e94938e3485
-MD5 (lynx-283d17-ssl.patch.gz) = a5bcfaf72753393d992eb8e56658a375
+MD5 (lynx2.8.3rel.1.tar.bz2) = 162c7479203d97758d3cb07f385062ac
+MD5 (lynx-283-ssl.patch.gz) = c48607b33f493284ba60c8a431a13b03
diff --git a/www/lynx-current/files/patch-sum b/www/lynx-current/files/patch-sum
new file mode 100644
index 00000000000..854d832c1f4
--- /dev/null
+++ b/www/lynx-current/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 2000/05/08 01:46:56 fredb Exp $
+
+MD5 (patch-aa) = 5b225918e22afc71c6c1e5e366c5dbb8
+MD5 (patch-ab) = 045fec4a443e066bdfa6f88202528d3a
diff --git a/www/lynx-current/patches/patch-aa b/www/lynx-current/patches/patch-aa
new file mode 100644
index 00000000000..98f1413d566
--- /dev/null
+++ b/www/lynx-current/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1 2000/05/08 01:46:57 fredb Exp $
+
+--- configure.orig	Sat Apr 22 20:16:38 2000
++++ configure	Sun May  7 19:57:45 2000
+@@ -6597,7 +6597,10 @@
+ echo "$ac_t""$cf_cv_screen" 1>&6
+ 
+ case $cf_cv_screen in
+-ncurses|slang)
++ncurses)
++	cf_cv_ncurses_header=ncurses.h
++	;;
++slang)
+ 	;;
+ pdcurses)
+ 	cf_cv_ncurses_header=xcurses.h
+@@ -7171,6 +7174,12 @@
+ 
+ case $cf_cv_ncurses_header in # (vi
+ */ncurses.h)
++	cat >> confdefs.h <<\EOF
++#define HAVE_NCURSES_H 1
++EOF
++
++	;;
++ncurses.h)
+ 	cat >> confdefs.h <<\EOF
+ #define HAVE_NCURSES_H 1
+ EOF
diff --git a/www/lynx-current/patches/patch-ab b/www/lynx-current/patches/patch-ab
new file mode 100644
index 00000000000..0f409191fdd
--- /dev/null
+++ b/www/lynx-current/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2000/05/08 01:46:57 fredb Exp $
+
+--- src/LYStrings.c.orig	Mon Apr 17 05:59:17 2000
++++ src/LYStrings.c	Sun May  7 19:43:16 2000
+@@ -25,6 +25,7 @@
+ #endif /* DJGPP_KEYHANDLER */
+ 
+ #ifdef USE_COLOR_STYLE
++#include <LYCurses.h>
+ #include <LYHash.h>
+ #include <AttrList.h>
+ #endif