From b204ecc5eaaa2c1c893741ec28d5663964f683c9 Mon Sep 17 00:00:00 2001 From: fredb Date: Mon, 31 Dec 2001 04:21:30 +0000 Subject: Update lynx-current to 2.8.5dev.5 (2.8.5.0.5). Numerous bug fixes, many involving refinements to the options handling (both on the command line and in ~/lynx.cfg), and also including several fixes for obscure html parsing errors. This package now enables a few experimental options which are not brand new, but have not been enabled in the package before: --enable-kbd-layout (define EXP_KEYBOARD_LAYOUT) Disabled by default, this option allows you to use translation tables on the input keystrokes. Current tables include ROT13'd keyboard layout JCUKEN Cyrillic, for AT 101-key kbd YAWERTY Cyrillic, for DEC LK201 kbd --enable-nested-tables Extends TRST to format nested tables, as well as be smarter about
and

tags in table cells. Also for the first time, enable color styles with NetBSD curses (the default) on NetBSD-1.5 and newer, only: --enable-color-style (define USE_COLOR_STYLE) Use this option to enable optional and *experimental* color style. This is implemented for curses (if it supports color), ncurses and PDCurses, but not slang. The color style support lets the user specify an ".lss" file to map html styles to colors. This was already the package default for the ncurses build, though now, in NetBSD curses, the colors don't look quite the same as they do in ncurses. --- www/lynx-current/Makefile | 27 ++++++----- www/lynx-current/PLIST | 55 ++++++++++++----------- www/lynx-current/distinfo | 9 ++-- www/lynx-current/patches/patch-aa | 94 +++++++++------------------------------ www/lynx-current/patches/patch-ac | 37 --------------- www/lynx-current/patches/patch-ae | 2 +- 6 files changed, 71 insertions(+), 153 deletions(-) delete mode 100644 www/lynx-current/patches/patch-ac (limited to 'www/lynx-current') diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index b35df81b37d..80c8941fa9d 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.35 2001/12/28 07:38:56 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2001/12/31 04:21:30 fredb Exp $ # -DISTNAME= lynx2.8.4dev.19 -PKGNAME= lynx-2.8.4.0b19 +DISTNAME= lynx2.8.5dev.5 +PKGNAME= lynx-2.8.5.0.5 CATEGORIES= www -MASTER_SITES= http://lynx.isc.org/current/ \ - http://lynx.isc.org/po/ \ - http://www.iro.umontreal.ca/contrib/po/teams/PO/ +MASTER_SITES= http://lynx.isc.org/current/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= fredb@netbsd.org @@ -15,12 +13,14 @@ COMMENT= Alphanumeric display oriented World-Wide Web Client BUILD_USES_MSGFMT= yes -WRKSRC= ${WRKDIR}/lynx2-8-4 +WRKSRC= ${WRKDIR}/lynx2-8-5 USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes -INSTALL_TARGET= install-bin install-cfg install-help install-lss -INSTALL_TARGET+= install-doc install-man +USE_GMAKE= yes +USE_LIBINTL= yes +USE_SSL= yes +INSTALL_TARGET= install-full install-lss MAKEFILE= makefile BUILD_DEFS+= LYNX_SCREEN_LIB USE_SOCKS USE_INET6 @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-scrollbar # Install gzip'ed help files to ${PREFIX}/share/lynx CONFIGURE_ARGS+= --libdir="${PREFIX}/share/lynx" -CONFIGURE_ARGS+= --enable-gzip-help --with-zlib +CONFIGURE_ARGS+= --with-zlib # Miscellaneous CONFIGURE_ARGS+= --enable-externs @@ -50,6 +50,8 @@ CONFIGURE_ARGS+= --enable-source-cache # Experimental features CONFIGURE_ARGS+= --enable-file-upload CONFIGURE_ARGS+= --enable-justify-elts +CONFIGURE_ARGS+= --enable-kbd-layout +CONFIGURE_ARGS+= --enable-nested-tables CONFIGURE_ARGS+= --enable-prettysrc CONFIGURE_ARGS+= --enable-read-eta @@ -58,7 +60,6 @@ post-install: .include "../../mk/bsd.prefs.mk" -LYNX_SCREEN_LIB?= slang .if (${LYNX_SCREEN_LIB} == slang) . include "../../devel/libslang/buildlink.mk" .elif (${LYNX_SCREEN_LIB} == ncurses) @@ -66,7 +67,9 @@ USE_NCURSES= color . include "../../devel/ncurses/buildlink.mk" CONFIGURE_ARGS+= --enable-color-style .elif (${LYNX_SCREEN_LIB} == curses) -CONFIGURE_ENV+= cf_cv_ncurses_version=no +. if ${MACHINE_PLATFORM:MNetBSD-1.5*-i386} != "" +CONFIGURE_ARGS+= --enable-color-style +. endif .else pre-configure: @${ECHO} '****************************************************' diff --git a/www/lynx-current/PLIST b/www/lynx-current/PLIST index b52bae45c9f..569716f6ce5 100644 --- a/www/lynx-current/PLIST +++ b/www/lynx-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:21 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/12/31 04:21:30 fredb Exp $ bin/lynx man/man1/lynx.1 share/locale/cs/LC_MESSAGES/lynx.mo @@ -19,13 +19,16 @@ share/lynx/lynx_doc/COPYING share/lynx/lynx_doc/PROBLEMS share/lynx/lynx_doc/README share/lynx/lynx_doc/samples/blue-background.lss +share/lynx/lynx_doc/samples/bright-blue.lss share/lynx/lynx_doc/samples/cernrules.txt share/lynx/lynx_doc/samples/installdirs.html share/lynx/lynx_doc/samples/jumpsUnix.html share/lynx/lynx_doc/samples/jumpsVMS.html +share/lynx/lynx_doc/samples/keepviewer share/lynx/lynx_doc/samples/lynx-keymaps share/lynx/lynx_doc/samples/lynx.com share/lynx/lynx_doc/samples/lynx.lss +share/lynx/lynx_doc/samples/lynxdump share/lynx/lynx_doc/samples/mailcap share/lynx/lynx_doc/samples/mime.types share/lynx/lynx_doc/samples/mild-colors.lss @@ -37,37 +40,39 @@ share/lynx/lynx_doc/test/TestComment.html share/lynx/lynx_doc/test/c1.html share/lynx/lynx_doc/test/iso8859-1.html share/lynx/lynx_doc/test/iso88592.html +share/lynx/lynx_doc/test/quickbrown.html share/lynx/lynx_doc/test/raw8bit.html share/lynx/lynx_doc/test/sgml.html share/lynx/lynx_doc/test/spaces.html share/lynx/lynx_doc/test/tabtest.html share/lynx/lynx_doc/test/unicode.html +share/lynx/lynx_doc/test/utf-8-demo.html share/lynx/lynx_help/COPYING share/lynx/lynx_help/COPYHEADER -share/lynx/lynx_help/Lynx_users_guide.html.gz -share/lynx/lynx_help/about_lynx.html.gz -share/lynx/lynx_help/lynx-dev.html.gz -share/lynx/lynx_help/lynx_help_main.html.gz -share/lynx/lynx_help/lynx_url_support.html.gz -share/lynx/lynx_help/keystrokes/alt_edit_help.html.gz -share/lynx/lynx_help/keystrokes/bashlike_edit_help.html.gz -share/lynx/lynx_help/keystrokes/bookmark_help.html.gz -share/lynx/lynx_help/keystrokes/cookie_help.html.gz -share/lynx/lynx_help/keystrokes/dired_help.html.gz -share/lynx/lynx_help/keystrokes/edit_help.html.gz -share/lynx/lynx_help/keystrokes/environments.html.gz -share/lynx/lynx_help/keystrokes/follow_help.html.gz -share/lynx/lynx_help/keystrokes/gopher_types_help.html.gz -share/lynx/lynx_help/keystrokes/history_help.html.gz -share/lynx/lynx_help/keystrokes/keystroke_help.html.gz -share/lynx/lynx_help/keystrokes/movement_help.html.gz -share/lynx/lynx_help/keystrokes/option_help.html.gz -share/lynx/lynx_help/keystrokes/other_help.html.gz -share/lynx/lynx_help/keystrokes/print_help.html.gz -share/lynx/lynx_help/keystrokes/scrolling_help.html.gz -share/lynx/lynx_help/keystrokes/test_display.html.gz -share/lynx/lynx_help/keystrokes/visited_help.html.gz -share/lynx/lynx_help/keystrokes/xterm_help.html.gz +share/lynx/lynx_help/Lynx_users_guide.html +share/lynx/lynx_help/about_lynx.html +share/lynx/lynx_help/lynx-dev.html +share/lynx/lynx_help/lynx_help_main.html +share/lynx/lynx_help/lynx_url_support.html +share/lynx/lynx_help/keystrokes/alt_edit_help.html +share/lynx/lynx_help/keystrokes/bashlike_edit_help.html +share/lynx/lynx_help/keystrokes/bookmark_help.html +share/lynx/lynx_help/keystrokes/cookie_help.html +share/lynx/lynx_help/keystrokes/dired_help.html +share/lynx/lynx_help/keystrokes/edit_help.html +share/lynx/lynx_help/keystrokes/environments.html +share/lynx/lynx_help/keystrokes/follow_help.html +share/lynx/lynx_help/keystrokes/gopher_types_help.html +share/lynx/lynx_help/keystrokes/history_help.html +share/lynx/lynx_help/keystrokes/keystroke_help.html +share/lynx/lynx_help/keystrokes/movement_help.html +share/lynx/lynx_help/keystrokes/option_help.html +share/lynx/lynx_help/keystrokes/other_help.html +share/lynx/lynx_help/keystrokes/print_help.html +share/lynx/lynx_help/keystrokes/scrolling_help.html +share/lynx/lynx_help/keystrokes/test_display.html +share/lynx/lynx_help/keystrokes/visited_help.html +share/lynx/lynx_help/keystrokes/xterm_help.html @dirrm share/lynx/lynx_help/keystrokes @dirrm share/lynx/lynx_help @dirrm share/lynx/lynx_doc/samples diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo index eef07ba9e70..5133df49227 100644 --- a/www/lynx-current/distinfo +++ b/www/lynx-current/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/05/22 23:05:32 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/12/31 04:21:30 fredb Exp $ -SHA1 (lynx2.8.4dev.19.tar.bz2) = e6020bd87b2188c13336cb2c43a31040100d1062 -Size (lynx2.8.4dev.19.tar.bz2) = 1928297 bytes -SHA1 (patch-aa) = 3b4c6019fe232e333e48e6a51c7adf5b3c8e63e5 -SHA1 (patch-ac) = 258d75c4d2263837d0b633987031f1a5ae180a86 +SHA1 (lynx2.8.5dev.5.tar.bz2) = ecf83a7f0e6d89941d29faa2b6a6f6a51b0e1f46 +Size (lynx2.8.5dev.5.tar.bz2) = 1963309 bytes +SHA1 (patch-aa) = 2efc89aee3297f1af1b0fe3214b2ae2b9c6d3a0c SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260 diff --git a/www/lynx-current/patches/patch-aa b/www/lynx-current/patches/patch-aa index 0dd85b076f1..d62aeaa2b7e 100644 --- a/www/lynx-current/patches/patch-aa +++ b/www/lynx-current/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2001/03/27 02:58:41 fredb Exp $ +$NetBSD: patch-aa,v 1.5 2001/12/31 04:21:31 fredb Exp $ ---- configure.orig Mon Feb 26 20:41:57 2001 +--- configure.orig Sun Nov 18 19:37:14 2001 +++ configure -@@ -5717,7 +5717,7 @@ +@@ -4296,7 +4296,7 @@ fi ;; esac @@ -11,82 +11,30 @@ $NetBSD: patch-aa,v 1.4 2001/03/27 02:58:41 fredb Exp $ cat >> confdefs.h <<\EOF #define SOCKS 1 EOF -@@ -6833,7 +6833,10 @@ +@@ -5412,12 +5412,25 @@ echo "$ac_t""$cf_cv_screen" 1>&6 case $cf_cv_screen in --ncurses|slang) -+ncurses) -+ cf_cv_ncurses_header=ncurses.h +-ncurses|ncursesw|slang) ++ncurses|ncursesw) ++ case $host_os in ++ netbsd) ++ cf_cv_ncurses_h=ncurses.h ++ ;; ++ esac + ;; +slang) ;; pdcurses) cf_cv_ncurses_header=xcurses.h -@@ -7484,6 +7487,12 @@ - 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 < conftest.$ac_ext < --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" - - - + curses) ++ case $host_os in ++ netbsd) ++ ac_cv_header_term_h=no ++ cf_cv_ncurses_version=no ++ ;; ++ esac + if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then + cf_cv_ncurses_header=curses.h + fi diff --git a/www/lynx-current/patches/patch-ac b/www/lynx-current/patches/patch-ac deleted file mode 100644 index 7bd74859d56..00000000000 --- a/www/lynx-current/patches/patch-ac +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2001/03/26 14:23:05 simonb Exp $ - ---- src/LYCurses.c.orig Tue Feb 27 13:41:57 2001 -+++ src/LYCurses.c Sun Mar 25 23:17:50 2001 -@@ -1492,6 +1492,10 @@ - #endif /* FANCY_CURSES || USE_SLANG */ - } - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+ - /* - * Accommodate the different flavors of touchline - */ -@@ -1502,11 +1506,17 @@ - wredrawln(LYwin, row, 1); - #else - #if defined(HAVE_TOUCHLINE) -- /* touchline() is not available on VMS before version 7.0, and then only on -- * Alpha, since prior ports of curses were broken. BSD touchline() has a -- * 4th parameter since it is used internally by touchwin(). -+ /* touchline() is not available on VMS before version 7.0, and then -+ * only on Alpha, since prior ports of curses were broken. Traditional -+ * BSD touchline() had a 4th parameter which was used internally by -+ * touchwin(), but NetBSD dropped that in version 1.5 when it moved -+ * to a SysV-like curses. - */ -- touchline(LYwin, row, 1, 0); -+#if defined(NCURSES) || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) -+ touchline(stdscr, row, 1); -+#else -+ touchline(stdscr, row, 1, 0); -+#endif - #else - #if !defined(USE_SLANG) - touchwin(LYwin); diff --git a/www/lynx-current/patches/patch-ae b/www/lynx-current/patches/patch-ae index 3e32ceb17ec..27fa8eb289f 100644 --- a/www/lynx-current/patches/patch-ae +++ b/www/lynx-current/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2001/02/08 19:52:04 fredb Exp $ +$NetBSD: patch-ae,v 1.3 2001/12/31 04:21:31 fredb Exp $ --- WWW/Library/Implementation/HTParse.c.orig Wed Oct 25 11:35:28 2000 +++ WWW/Library/Implementation/HTParse.c Tue Feb 6 15:26:57 2001 -- cgit v1.2.3