From 9e1eefdda0fc818c3ce346dec28232e0bf18ae76 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Tue, 30 Nov 2004 15:33:53 +0000
Subject: Forgot to change LYNX_SCREEN_LIB, this should be fixed now.

---
 www/lynx/Makefile   | 7 +++----
 www/lynx/options.mk | 5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'www/lynx')

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 8de8890549b..c0374777015 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: Makefile,v 1.77 2004/11/30 15:33:53 xtraeme Exp $
 #
 
 DISTNAME=	lynx2.8.5
@@ -32,7 +32,7 @@ USE_GNU_TOOLS+=		make
 INSTALL_TARGET=		install-full install-lss
 MAKEFILE=       	makefile
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 # For nls/gettext
 CONFIGURE_ARGS+=	--enable-nls
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--with-ssl
 
 # Note: --enable-{default-colors,scrollbar} are simply ignored
 # for certain settings of --with-screen.
-CONFIGURE_ARGS+=	--with-screen=${LYNX_SCREEN_LIB}
+CONFIGURE_ARGS+=	--with-screen=${SCREENTYPE}
 CONFIGURE_ARGS+=	--enable-default-colors
 CONFIGURE_ARGS+=	--enable-scrollbar
 
@@ -64,7 +64,6 @@ CONFIGURE_ARGS+=	--enable-nested-tables
 CONFIGURE_ARGS+=	--enable-prettysrc
 CONFIGURE_ARGS+=	--enable-read-eta
 
-.include "options.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index 80c9eca3f84..c215bcdf769 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/11/27 08:44:35 xtraeme Exp $
+# $NetBSD: options.mk,v 1.5 2004/11/30 15:33:53 xtraeme Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	curses inet6 ncurses slang socks4 socks5
@@ -20,12 +20,15 @@ PKG_FAIL_REASON+=	"SOCKS may not be enabled together with the \"slang\"" \
 ### Set the screen library to "slang", "ncurses", or plain "curses".
 ###
 .if !empty(PKG_OPTIONS:Mslang)
+SCREENTYPE=		slang
 .  include "../../devel/libslang/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mncurses)
+SCREENTYPE=		ncurses
 USE_NCURSES=		color
 .  include "../../devel/ncurses/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-color-style
 .elif !empty(PKG_OPTIONS:Mcurses)
+SCREENTYPE=		curses
 .  include "../../mk/curses.buildlink3.mk"
 .  if !empty(MACHINE_PLATFORM:MNetBSD-1.[56]*-i386)
 CONFIGURE_ARGS+=	--enable-color-style
-- 
cgit v1.2.3