Enable socks supports and associated logic (no socks with slang).

Add a test for BSD color capable curses, but leave the default at
slang. It builds with curses, but I can't get any color out of it.

3 files changed, 54 insertions, 15 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 28e97b649c1..6012f781dbd 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/05/08 01:46:55 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2000/05/09 00:54:58 fredb Exp $
 #
 
 DISTNAME=		lynx2.8.3rel.1
@@ -23,10 +23,10 @@ WRKSRC=			${WRKDIR}/lynx2-8-3
 
 GNU_CONFIGURE=		yes
 USE_SSL=		yes
-INSTALL_TARGET=		install-full
+INSTALL_TARGET=		install-bin install-man install-cfg install-help install-doc
 MAKEFILE=       	makefile
 
-BUILD_DEFS+=		LYNX_SCREEN_LIB
+BUILD_DEFS+=		LYNX_SCREEN_LIB USE_SOCKS
 
 # For nls/gettext
 CONFIGURE_ARGS+=	--enable-nls
@@ -34,7 +34,9 @@ CONFIGURE_ARGS+=	--with-nls-datadir=${PREFIX}/share
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 
-# Note: the following have no effect with curses screen
+# Note: --enable-{default-colors,scrollbar} are simply ignored
+# for certain settings of --with-screen.
+CONFIGURE_ARGS+=	--with-screen=${LYNX_SCREEN_LIB}
 CONFIGURE_ARGS+=	--enable-default-colors
 CONFIGURE_ARGS+=	--enable-scrollbar
 
@@ -79,30 +81,58 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX until our curses does color...
+# XXX Not Yet
+#.if defined(CURSES_HAS_COLORS) && ${CURSES_HAS_COLORS} == YES
+#LYNX_SCREEN_LIB?=	curses
+#.else
 LYNX_SCREEN_LIB?=	slang
+#.endif
 
 .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
+.elif (${LYNX_SCREEN_LIB} != curses)
 pre-configure:
 	@${ECHO} '****************************************************'
 	@${ECHO} '* Invalid value for LYNX_SCREEN_LIB. Please choose *'
 	@${ECHO} '* one of "slang", "ncurses", or "curses"!          *'
 	@${ECHO} '****************************************************'
-	@false
+	@${FALSE}
+
+.endif
+
+# Include SOCKS firewall support
+.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
+.if (${LYNX_SCREEN_LIB} == slang)
+pre-configure:
+	@${ECHO} '******************************************************'
+	@${ECHO} '* Socks may not be enabled together with the "slang" *'
+	@${ECHO} '* screen library. If socks support is desired,       *'
+	@${ECHO} '* please also set LYNX_SCREEN_LIB to one of "curses" *'
+	@${ECHO} '* or "ncurses"!                                      *'
+	@${ECHO} '******************************************************'
+	@${FALSE}
+
+.endif
+.if ${USE_SOCKS} == 4
+CONFIGURE_ARGS+= 	--with-socks
+DEPENDS+=		socks4-2.2:../../net/socks4
+.else
+CONFIGURE_ARGS+= 	--with-socks5
+DEPENDS+=		socks5-1.0.2:../../net/socks5
+.endif
 .endif
 
 .include "../../mk/bsd.pkg.mk"
 
+NM?=			/usr/bin/nm
+CURSES_HAS_COLORS!=	${NM} /usr/lib/libcurses.a | \
+				${GREP} -q has_colors && \
+				${ECHO} YES || ${ECHO} NO
+
 .if (${SSLBASE} == /usr)
 SSLLIBS=	-lssl -lcrypto
 SSLINCS=	-I/usr/include/openssl
diff --git a/www/lynx-current/files/patch-sum b/www/lynx-current/files/patch-sum
index 854d832c1f4..20c42b18612 100644
--- a/www/lynx-current/files/patch-sum
+++ b/www/lynx-current/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 2000/05/08 01:46:56 fredb Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/09 00:55:00 fredb Exp $
 
-MD5 (patch-aa) = 5b225918e22afc71c6c1e5e366c5dbb8
+MD5 (patch-aa) = 072f8a39714a5fe048b2f22d0d81d36f
 MD5 (patch-ab) = 045fec4a443e066bdfa6f88202528d3a
diff --git a/www/lynx-current/patches/patch-aa b/www/lynx-current/patches/patch-aa
index 98f1413d566..a7dd08be30a 100644
--- a/www/lynx-current/patches/patch-aa
+++ b/www/lynx-current/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2000/05/08 01:46:57 fredb Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/09 00:55:00 fredb Exp $
 
 --- configure.orig	Sat Apr 22 20:16:38 2000
-+++ configure	Sun May  7 19:57:45 2000
++++ configure	Mon May  8 19:27:11 2000
+@@ -5666,7 +5666,7 @@
+   LIBS="$LIBS -L$cf_cv_use_libsocks"
+   ;;
+ esac
+-LIBS="$LIBS -lsocks"
++LIBS="$LIBS -lsocks4"
+ cat >> confdefs.h <<\EOF
+ #define SOCKS 1
+ EOF
 @@ -6597,7 +6597,10 @@
  echo "$ac_t""$cf_cv_screen" 1>&6