diff options
| author | fredb <fredb@pkgsrc.org> | 2001-03-27 02:58:39 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2001-03-27 02:58:39 +0000 |
| commit | d5f813f88b7e8fab565be817580917bc22dbdbec (patch) | |
| tree | 2a088fc7d6a5c9f198803a288461c795b48b666d /www/lynx-current/patches | |
| parent | af6958bd73d0c4b549d840a50e174e6d460554ac (diff) | |
| download | pkgsrc-d5f813f88b7e8fab565be817580917bc22dbdbec.tar.gz | |
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.
Diffstat (limited to 'www/lynx-current/patches')
| -rw-r--r-- | www/lynx-current/patches/patch-aa | 78 |
1 files changed, 66 insertions, 12 deletions
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" + + + |