The "slang" build on NetBSD-1.4.3/a.out really needs -ltermcap, and

the old "configure" hack of adding "-ltermcap" to LIBS wasn't working
(configure's too smart for that), so hack "configure" directly.

3 files changed, 69 insertions, 16 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 90c0a3d2e89..5dfaba4f337 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/03/26 14:23:04 simonb Exp $
+# $NetBSD: Makefile,v 1.30 2001/03/27 02:58:39 fredb Exp $
 #
 
 DISTNAME=		lynx2.8.4dev.19
@@ -62,7 +62,6 @@ post-install:
 LYNX_SCREEN_LIB?=	slang
 .if (${LYNX_SCREEN_LIB} == slang)
 DEPENDS+=		libslang-*:../../devel/libslang
-CONFIGURE_ENV+=		LIBS="-lm -ltermcap"
 .elif (${LYNX_SCREEN_LIB} == ncurses)
 DEPENDS+=		ncurses-*:../../devel/ncurses
 CONFIGURE_ARGS+=	--enable-color-style
diff --git a/www/lynx-current/files/patch-sum b/www/lynx-current/files/patch-sum
index 3b42c6720dd..3f7b4cd46c3 100644
--- a/www/lynx-current/files/patch-sum
+++ b/www/lynx-current/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.8 2001/03/26 14:23:05 simonb Exp $
+$NetBSD: patch-sum,v 1.9 2001/03/27 02:58:40 fredb Exp $
 
-SHA1 (patch-aa) = e22e0595958c3b6fe44011afaba2220c9b3b3639
+SHA1 (patch-aa) = 3b4c6019fe232e333e48e6a51c7adf5b3c8e63e5
 SHA1 (patch-ac) = 258d75c4d2263837d0b633987031f1a5ae180a86
 SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260
diff --git a/www/lynx-current/patches/patch-aa b/www/lynx-current/patches/patch-aa
index afa3ed9bdea..0dd85b076f1 100644
--- a/www/lynx-current/patches/patch-aa
+++ b/www/lynx-current/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2001/02/08 19:52:04 fredb Exp $
+$NetBSD: patch-aa,v 1.4 2001/03/27 02:58:41 fredb Exp $
 
---- configure.orig	Mon Jan  1 19:39:50 2001
-+++ configure	Wed Feb  7 15:40:30 2001
-@@ -5863,7 +5863,7 @@
+--- configure.orig	Mon Feb 26 20:41:57 2001
++++ configure
+@@ -5717,7 +5717,7 @@
    fi
    ;;
  esac
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/08 19:52:04 fredb Exp $
  cat >> confdefs.h <<\EOF
  #define SOCKS 1
  EOF
-@@ -6832,7 +6832,10 @@
+@@ -6833,7 +6833,10 @@
  echo "$ac_t""$cf_cv_screen" 1>&6
  
  case $cf_cv_screen in
@@ -23,16 +23,70 @@ $NetBSD: patch-aa,v 1.3 2001/02/08 19:52:04 fredb Exp $
  	;;
  pdcurses)
  	cf_cv_ncurses_header=xcurses.h
-@@ -7478,6 +7481,12 @@
+@@ -7484,6 +7487,12 @@
+ EOF
  
- case $cf_cv_ncurses_header in # (vi
- */ncurses.h)
+ 	;;
++ncurses.h)
 +	cat >> confdefs.h <<\EOF
 +#define HAVE_NCURSES_H 1
 +EOF
 +
 +	;;
-+ncurses.h)
- 	cat >> confdefs.h <<\EOF
- #define HAVE_NCURSES_H 1
- EOF
+ esac
+ 
+ case $cf_cv_ncurses_header in # (vi
+@@ -8655,32 +8664,32 @@
+ cf_slang_LIBS3="$LIBS"
+ echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6
+ echo "configure:8658: checking if we can link slang without termcap" >&5
+-if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
+-	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'`
+-else
+-	cf_exclude="$cf_slang_LIBS2"
+-fi
+-LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
+-cat > conftest.$ac_ext <<EOF
++#if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
++#	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'`
++#else
++#	cf_exclude="$cf_slang_LIBS2"
++#fi
++#LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'`
++#cat > conftest.$ac_ext <<EOF
+ #line 8666 "configure"
+ #include "confdefs.h"
+ #include <slang.h>
+-int main() {
+-SLtt_get_screen_size()
+-; return 0; }
+-EOF
+-if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  cf_result=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
++#int main() {
++#SLtt_get_screen_size()
++#; return 0; }
++#EOF
++#if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++#  rm -rf conftest*
++#  cf_result=yes
++#else
++#  echo "configure: failed program was:" >&5
++#  cat conftest.$ac_ext >&5
++#  rm -rf conftest*
+   cf_result=no
+-fi
+-rm -f conftest*
++#fi
++#rm -f conftest*
+ echo "$ac_t""$cf_result" 1>&6
+-test $cf_result = no && LIBS="$cf_slang_LIBS3"
++test $cf_result = no && LIBS="$cf_slang_LIBS3 -lm -ltermcap"
+ 
+ 
+