Update to 2.8.6:

   New features (some are compile-time options):
     * INFO and Options pages are laid out properly for multibyte locales,
       accounting for character widths.
     * change configure option default for --enable-justify-elts to true.
       Change default for JUSTIFY to "false".
     * add PREFERRED_ENCODING to lynx.cfg, along with an options-menu
       selection for this, to set "Accept-Encoding:" string
     * add PREFERRED_MEDIA_TYPES to lynx.cfg, corresponding to the option for
       HTFilterPresentations(). A minimal set of media types is used by
       default, though the old behavior can be selected
     * add -nonumbers option, which modifies the output of -dump to suppress
       the link-numbering
     * add -listonly option, which modifies the output of -dump to show only
       the list of links
     * add -syslog-urls option and lynx.cfg settings (SYSLOG_TEXT,
       SYSLOG_REQUESTED_URLS) to allow syslog'ing of URLs to be optional.
       This cannot be set from the options menu
     * the -version option shows the version of ncurses, curses, etc., from
       runtime data when available.
     * add -notitle option to suppress title line and following blank line to
       maximize screen use for small displays
     * add -nomargins option to suppress left/right margins to maximize
       screen use for small displays
     * add NO_MARGINS and NO_TITLE to lynx.cfg
     * add NESTED_TABLES setting to lynx.cfg to allow site override of the
       built-in default
     * add DEFAULT_COLORS item to lynx.cfg to allow disabling the default
       colors feature at runtime, allowing better matching of old color
       scheme via a script
     * add -stderr option to write error messages when doing a -dump -or
       -source. Normally these are written to the status line but that does
       not exist when dumping to standard output
     * add configure --enable-largefile / --disable-largefile options.
     * add --enable-widec configure option to allow building lynx without
       wide character support using ncursesw, to accommodate users with older
       releases of ncurses
   Other enhancements:
     * improve SSL support:
          * updated README.sslcerts
          * update CF_GNUTLS macro to look for -lgnutls-openssl as well as
            the older -lgnutls-extra library
          * modify HTLoadHTTP() to interpret leading asterisks in common name
            fields as wildcards
          * suppress OpenSSL URL from version message if it happens to be
            built using GNU TLS (or other libraries which happen to define
            symbols to pretend they are OpenSSL).
     * improve HTML interpretation:
          * fix function, which was checking for the absence only of some
            nonstandard encodings (8bit, 7bit, binary) rather than for the
            presence of the encodings as specified in RFC 2068 (gzip,
            compress, etc). This makes lynx able to view a site which puts
            the charset as the Content-Type
          * add "deflate" to the encoding types which lynx implements. This
            consists of several parts
               * adapted logic from w3m's inflate.c to construct an internal
                 "deflate" decompressor. Tested this with

                         http://carsten.codimi.de/gzip.yaws/

               * add "deflate" to the options menu.
               * modify logic that builds "Accept-Encoding" value to omit
                 encodings which have no external decompressor associated.
                 The effect of this change is to allow lynx to behave as it
                 did before adding the (possibly incomplete) "inflate"
                 support.
               * add INFLATE_PATH to lynx.cfg, to optionally specify an
                 external program which can be used to decompress deflated
                 files. For testing, a shell script using w3m's utility,
                 e.g., /usr/lib/w3m/inflate, sufficed. NOTE: As currently
                 implemented, lynx requires the external decompression
                 programs to be specified even if it can decompress using
                 library calls.
               * use ".zz" for suffix of downloaded (but not inflated)
                 deflated files, mapped to application/deflate and
                 application/x-deflate.
          * modify source-view toggle to keep the current anchor visible.
            Toggling source view may change the line number on which the
            anchor is found, requiring some adjustment. This feature is
            implemented only for source cached pages
          * fixes to source-view of ftp:// and file:// URLs, i.e., eliminate
            redundant PRE's, add DOCTYPE and meta tags
          * correct parsing of embedded URLs which have parameters but no
            path, e.g., base

                         http://wj55.org/Minutes.php

            and embedded

                         ?date_meeting=2004-08-31

          * add presentation type for application/xml and text/xml mime types
            as per

                         http://www.w3.org/TR/xhtml-media-types/
                         http://www.w3.org/TR/2002/NOTE-xhtml-media-types-20020801

            which states that they may be used, though application/xhtml+xml
            is the preferred media type
          * add presentation type for application/xhtml+xml mime type as per
            RFC 3236
          * add presentation for text/css, to allow browsing ".css" files
          * force a newline in HTML_end_element() after a </pre>, which
            causes lines containing only whitespace before the </pre> to
            display a new line, rather than putting that whitespace before
            text that follows the </pre>
          * following a link consisting of a "#" fragment will move the
            cursor to the link containing the target rather than simply
            ensuring that it is visible
     * improvements to character sets and display:
          * new message files for localization: rw.po, vi.po
          * updated message files for localization: cs.po, da.po, de.po,
            et.po, fr.po, hu.po, nl.po, pt_BR.po, sv.po, tr.po
          * use puts() rather than printf() in some messages to avoid chance
            of "%" in the translation
          * modify HTConfirmCookie() to ensure the translator's note is
            copied into the lynx.pot file, by adding a gettext("Y/N/A/V")
            call after the comment
          * improve layout of options-menu and info-page for multibyte
            character sets by computing the extent of the labels. This works
            only for wide-character curses.
          * add ISO-8859-13 and ISO-8859-14 chrtrans tables, revise
            ISO-8859-10 based on

                         http://czyborra.com/charsets/iso8859.html

            Change display name for ISO-8859-10 to indicate the region
          * improve checking if the current character set does not match the
            character set inferred from the locale. This reduces the number
            of cases where line-drawing in the options menu does not work
          * improve recovery when a charset is found that cannot be
            translated. Before this change, the charset was not stripped from
            the format string, e.g.,

                         text/html; charset=big5

            and since there would be no match for the format, lynx would
            offer to simply download the page (if interactive), or refuse to
            format (for dumps). Although the content of the page is unusable,
            the user can still navigate the page using the links which may be
            there
          * modify logic for locale_charset configuration variable so it is
            not modified simply by saving the .lynxrc while in running in a
            non-locale configuration. That does not alter the display charset
            used by lynx
          * improve workaround for line-drawing characters with
            font-switching by checking if the loaded font has line-drawing
            characters in the same positions as the terminal description,
            rather than simply ignoring line-drawing when the codeset differs
          * workaround for codepage support on OS/2 by changing the effect of
            unctrl(). Add/use new preferred function use_legacy_coding() to
            ncurses which provides the same effect with the wide-character
            ncursesw
          * improve def7_uni.tbl substitutions for the symbols beginning at
            U+2600
          * add experimental option --enable-japanese-utf8 for using libiconv
            for Japanese and UTF-8
     * improvements to color-style:
          * change configure script --enable-color-style so it is enabled by
            default
          * add COLOR_STYLE setting to lynx.cfg
          * change default initialization of color-style code when no lss
            file is given to simulate the non-color-style code. There are
            some visual differences, e.g., links that contain a mixture of
            styles will display with mixed colors, but overall the visual
            effect matches the non-color-style code well enough to change the
            default configuration. If an empty string is given for the lss
            filename, this is treated as an empty style file, and lynx will
            not use its built-in default color style. To make the behavior
            easier to diagnose, lynx will now exit with an error if it cannot
            find the lss file.
     * improve interaction with user:
          * highlight the target and pause for 20 milliseconds when selecting
            a link with the mouse
          * modify behavior when user attempts to toggle a radiobutton off,
            to make the message that one radio button must be selected only
            in novice mode
          * modify column limits, allowing text to be written to the last
            column on the screen. This allows users to view text which is
            formatted for 80 columns without the last character of each line
            wrapping to the next line
          * prompt user, displaying the command that would be executed, to
            confirm that it should be. This makes it easier to notice when a
            local program would be run by activating a lynxcgi link. This is
            not done in advanced mode, since the URL is already visible in
            the status line
          * modify HTSaveAndExecute() to check first for result from
            HTFileSuffix() before choosing between BIN_SUFFIX and
            HTML_SUFFIX. This allows the PDF viewer on OS X to get the proper
            suffix (.pdf) rather than .bin
          * add check for failure to write to disk, e.g., on disk full, and
            report error condition via HTAlert()
          * modify suggested_filename() to strip bzip2's ".bz2" suffixes as
            well as ".zz" suffixes
          * modify INFO-page to list the rendered size in bytes if the
            Content-Length is not available
          * print the contents of image maps, if any, at the end of a dump
          * command-line options that toggle or set a boolean now accept
            "true" and "false" strings.
     * improve interaction with other programs:
          * strip special characters such as '%' from parameters passed to
            external programs for EXTERNAL mechanism on Windows platform.
            This is ifdef'd with WIN_EX
     * improve cookie support:
          * modify HTConfirmCookie() and statusline() to allow cookie prompt
            message in Japanese to not be truncated when using wide-curses
          * make the maximum number of cookies configurable in lynx.cfg,
            added MAX_COOKIES_DOMAIN, MAX_COOKIES_GLOBAL and
            MAX_COOKIES_BUFFER
     * improvements to debug/traces:
          * use symbol USE_VERTRACE in HTUtils.h to allow makefiles that do
            not use the configure script to turn on the equivalent --enable
            vertrace feature
     * improvements to scripting/logging:
          * make "lynx -version" work in the absence of ".cfg" or ".lss"
            files
          * modify print_wwwfile_to_fd() and print_crawl_to_fd() to ensure
            that no trailing blanks are written in a -dump, etc.
          * correct parsing of "key 0xNN" lines in command-scripts, had
            omitted a "!" to invert a check
          * modify initialization so that

                         cat options.txt | lynx -

            will allow interactive use
     * other improvements:
          * modify logic for -dump so it can dump all pages listed on the
            command line
          * lynx accepts multiple URLs on the command line; all are added to
            G)oto history. Documented this in manpage
          * add (ifdef'd with EXP_HTTP_HEADERS) code to display the full text
            of the HTTP headers in the INFO page.
          * modify treatment of symbolic links for ftp-URLs to show the link
            target, as with the local directory editor
          * correct sort-order of local directory listing, using the target
            of a symbolic link to determine whether it is grouped with files
            or directories
          * modified mailcap command and testcommand substitutions to provide
            for running the testcommand's after program initialization
          * read user's ".newsauth" file for news-server authentication
            information
          * escape "From " when it appears in a page which is mailed, to
            avoid confusing mail clients
          * add "Anonymous FTP Password" to Options menu, to allow user to
            override use of personal email address as the anonymous ftp
            password
   New/improved sample files:
     * add script samples/oldlynx, which gives the non-color-style scheme
       using an executable built for color-style
     * add scripts/tbl2html.pl, which can be used to generate test pages for
       the charsets from src/chrtrans/*.tbl
     * add test/special_urls.html
     * modify ".lss" files to work equally well on terminals setup with white
       text on black background, or the reverse. This also required fixing a
       few places in LYsubwindow() and curses_w_style() to make window
       backgrounds use the colors given in the ".lss" default- and
       normal-colors lines
     * make ".lss" example files somewhat readable by modifying parser to
       remove blanks from the color description lines and modifying the
       example files to use this feature
   New ports:
     * none
       (it seems to run everywhere, but there are a few possibilities)
   Improvements to existing ports:
     * UNIX:
          * improve configure script macro CF_XOPEN_SOURCE, ensuring that
            _POSIX_C_SOURCE is defined with a value.
          * revise configure script check whether _POSIX_C_SOURCE should be
            defined, taking into account the _POSIX_SOURCE definition
     * Linux:
          * add codepage 857 (DOSTurkish), since console-tools package
            provides a suitable font
          * update Linux console font support to use console-tools package.
            The configure script checks for consolechars and setfont programs
            (must find at least one). The corresponding SETFONT_PATH can be
            set in lynx.cfg to provide a choice between the two
          * modify configure script to check for Intel compiler 8.0 (and
            9.0).
     * some others [stripped]
   Improvements for maintainability and testing:
     * remove macros such as ARGS1, NOPARM which supported K&R compilers
     * make ANSI C required, drop support for K&R C.
     * add scripts/indent.sh, use this to reindent C source files
     * add tags rules to makefile.in's
     * modify makefile.in to ensure that scripts are prefixed with $(SHELL),
       in case packager has stripped executable permissions from scripts,
       e.g., by using CVS
     * modify configure script and makefiles to allow cross-compiling
     * add --with-system-type option to configure script to simplify testing
       the case-statements involving $host_os
     * change configure script to put the ".cfg" and ".lss" files by default
       in the --sysconfdir, e.g., $prefix/etc, and the help-files in lynx_doc
       and lynx_help directories under --datadir, e.g.,
       $prefix/share/lynx_doc, $prefix/share/lynx_doc. To obtain the old
       behavior, use configure --sysconfdir=/usr/local/lib
       --datadir=/usr/local/lib
     * add configure options --with-cfg-file and --with-lss-file to allow one
       to specify the names and paths of the default configuration and
       color-style files
     * filter out obsolete URLs from the customizations saved during install
       of lynx.cfg
     * rename test/iso8859-1.html and test/iso88592.html to
       test/iso-8859-1.html and test/isoi-8859-2.html, corresponding to the
       proper MIME names to simplify test-scripts
     * update test/iso8859-1.html (minor fixes) from

                         http://www.ramsch.org/martin/uni/fmi-hp/iso8859-1.html

     * applied lynx's changes to updated files from ftp.unicode.org to take
       advantage of less restrictive copyright
   As well as security-related changes:
     * eliminate fixed-size buffers in HTrjis() and related functions to
       avoid potential buffer overflow in nntp pages
     * eliminate fixed-size buffers in LYExpandHostForURL() to guard against
       buffer overflow resulting from too-long domain prefix/suffix data from
       lynx.cfg
     * reduce TRST_MAXROWSPAN and TRST_MAXCOLSPAN to 200, which is more
       plausible than 10000 by 1000.
     * limit TEXTAREA columns to the screen width, and rows to 3 times the
       screen height.
   And finally:
     * A lot of bug fixes
     * A lot of documentation changes.
     * A lot of dead code removed

15 files changed, 59 insertions, 339 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index f121c4d7fd8..c1aa64f4d6b 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2007/03/08 19:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2007/03/10 09:14:09 wiz Exp $
 
 #
 # NOTE: Please do not enable the lynxcgi feature unless it is lynx
@@ -6,21 +6,15 @@
 # with this feature in earlier versions.
 #
 
-DISTNAME=	lynx2.8.5
-PKGNAME=	lynx-2.8.5.5
-PKGREVISION=	2
+DISTNAME=	lynx2.8.6rel.4
+PKGNAME=	lynx-2.8.6.4
 CATEGORIES=	www
-MASTER_SITES=	http://lynx.isc.org/${DISTNAME}/ \
-		ftp://ftp.nl.uu.net/pub/unix/www/lynx/${DISTNAME}/ \
-		ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${DISTNAME}/ \
-		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/${DISTNAME}/
+MASTER_SITES=	http://lynx.isc.org/${SUBDIR:Q}/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/lynx/${SUBDIR:Q}/ \
+		ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/ \
+		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/${SUBDIR:Q}/
 EXTRACT_SUFX=	.tar.bz2
 
-PATCH_DIST_STRIP= -p1
-PATCH_SITES=	${MASTER_SITES:=patches/}
-PATCHFILES=	2.8.5rel.2.patch.gz 2.8.5rel.3.patch.gz
-PATCHFILES+=	2.8.5rel.4.patch.gz 2.8.5rel.5.patch.gz
-
 MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://lynx.isc.org/
 COMMENT=	Alphanumeric display oriented World-Wide Web Client
@@ -28,25 +22,28 @@ COMMENT=	Alphanumeric display oriented World-Wide Web Client
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DIST_SUBDIR=		lynx
-WRKSRC=			${WRKDIR}/${DISTNAME:S/./-/g}
+SUBDIR=			current
+WRKSRC=			${WRKDIR}/lynx2-8-6
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INSTALL_TARGET=		install-full install-lss
+INSTALL_TARGET=		install-full
 MAKE_FILE=		makefile
 
 CONFIGURE_ENV+=		GZIP=${TOOLS_GZIP_CMD:Q}
 USE_TOOLS+=		gzip msgfmt
 
+CONF_FILES+=		share/examples/lynx/lynx.cfg ${PKG_SYSCONFDIR}/lynx.cfg
+CONF_FILES+=		share/examples/lynx/lynx.lss ${PKG_SYSCONFDIR}/lynx.lss
+
+# But no dependency on Perl.
 REPLACE_PERL+=		samples/mailto-form.pl
 CHECK_FILES_SKIP+=	samples/mailto-form.pl
-# But no dependency on Perl.
 
 .include "options.mk"
 
 # For nls/gettext
 CONFIGURE_ARGS+=	--enable-nls
-CONFIGURE_ARGS+=	--with-nls-datadir=${PREFIX}/share
+CONFIGURE_ARGS+=	--with-nls-datadir=${PREFIX}/${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--without-included-gettext
 
 # With SSL, lynx can get https:// and snews:// URL's.
@@ -59,12 +56,13 @@ CONFIGURE_ARGS+=	--enable-default-colors
 CONFIGURE_ARGS+=	--enable-scrollbar
 
 # Install gzip'ed help files to ${PREFIX}/share/lynx
-CONFIGURE_ARGS+=	--libdir="${PREFIX}/share/lynx"
+CONFIGURE_ARGS+=	--datadir="${PREFIX}/share/lynx"
 CONFIGURE_ARGS+=	--enable-gzip-help --with-zlib
 
 # Miscellaneous
 CONFIGURE_ARGS+=	--enable-externs
 CONFIGURE_ARGS+=	--enable-source-cache
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 # Experimental features
 CONFIGURE_ARGS+=	--enable-file-upload
@@ -77,12 +75,4 @@ CONFIGURE_ARGS+=	--enable-read-eta
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-
-post-install:
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/lynx
-	${FIND} ${DESTDIR}${PREFIX}/share/lynx -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	# gets created when applying 2.8.5.2 patch -- remove on
-	# patchless update
-	${RM} -f ${DESTDIR}${PREFIX}/share/lynx/lynx_doc/CHANGES.orig_dist
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/lynx/PLIST b/www/lynx/PLIST
index f05f294748f..feb260b0585 100644
--- a/www/lynx/PLIST
+++ b/www/lynx/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2006/04/17 07:07:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/03/10 09:14:09 wiz Exp $
 bin/lynx
 man/man1/lynx.1
+share/examples/lynx/lynx.cfg
+share/examples/lynx/lynx.lss
 share/locale/ca/LC_MESSAGES/lynx.mo
 share/locale/cs/LC_MESSAGES/lynx.mo
 share/locale/da/LC_MESSAGES/lynx.mo
@@ -13,17 +15,19 @@ share/locale/ja/LC_MESSAGES/lynx.mo
 share/locale/nl/LC_MESSAGES/lynx.mo
 share/locale/pt_BR/LC_MESSAGES/lynx.mo
 share/locale/ru/LC_MESSAGES/lynx.mo
+share/locale/rw/LC_MESSAGES/lynx.mo
 share/locale/sl/LC_MESSAGES/lynx.mo
 share/locale/sv/LC_MESSAGES/lynx.mo
 share/locale/tr/LC_MESSAGES/lynx.mo
 share/locale/uk/LC_MESSAGES/lynx.mo
+share/locale/vi/LC_MESSAGES/lynx.mo
 share/locale/zh_CN/LC_MESSAGES/lynx.mo
 share/locale/zh_TW/LC_MESSAGES/lynx.mo
-share/lynx/lynx.cfg
-share/lynx/lynx.lss
 share/lynx/lynx_doc/CHANGES
 share/lynx/lynx_doc/COPYHEADER
+share/lynx/lynx_doc/COPYHEADER.asc
 share/lynx/lynx_doc/COPYING
+share/lynx/lynx_doc/COPYING.asc
 share/lynx/lynx_doc/PROBLEMS
 share/lynx/lynx_doc/README
 share/lynx/lynx_doc/docs/CHANGES2.3.gz
@@ -32,7 +36,6 @@ share/lynx/lynx_doc/docs/CHANGES2.5.gz
 share/lynx/lynx_doc/docs/CHANGES2.6.gz
 share/lynx/lynx_doc/docs/CHANGES2.7.gz
 share/lynx/lynx_doc/docs/CHANGES2.8.gz
-share/lynx/lynx_doc/docs/CMU.announce.gz
 share/lynx/lynx_doc/docs/CRAWL.announce.gz
 share/lynx/lynx_doc/docs/FM.announce.gz
 share/lynx/lynx_doc/docs/IBMPC-charsets.announce.gz
@@ -41,6 +44,7 @@ share/lynx/lynx_doc/docs/README.TRST
 share/lynx/lynx_doc/docs/README.chartrans
 share/lynx/lynx_doc/docs/README.defines
 share/lynx/lynx_doc/docs/README.jp
+share/lynx/lynx_doc/docs/README.metrics
 share/lynx/lynx_doc/docs/README.rootcerts
 share/lynx/lynx_doc/docs/README.ssl
 share/lynx/lynx_doc/docs/README.sslcerts
@@ -66,19 +70,23 @@ share/lynx/lynx_doc/samples/mailcap
 share/lynx/lynx_doc/samples/mailto-form.pl
 share/lynx/lynx_doc/samples/mild-colors.lss
 share/lynx/lynx_doc/samples/mime.types
+share/lynx/lynx_doc/samples/oldlynx
 share/lynx/lynx_doc/test/ALT88592.html
 share/lynx/lynx_doc/test/ISO_LATIN1_test.html
 share/lynx/lynx_doc/test/README.txt
 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/iso-8859-1.html
+share/lynx/lynx_doc/test/iso-8859-2.html
 share/lynx/lynx_doc/test/koi8-r.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/special_urls.html
 share/lynx/lynx_doc/test/tabtest.html
+share/lynx/lynx_doc/test/tags.html
+share/lynx/lynx_doc/test/test-styles.html
 share/lynx/lynx_doc/test/unicode.html
 share/lynx/lynx_doc/test/utf-8-demo.html
 share/lynx/lynx_help/COPYHEADER
@@ -114,3 +122,4 @@ share/lynx/lynx_help/lynx_url_support.html.gz
 @dirrm share/lynx/lynx_doc/docs
 @dirrm share/lynx/lynx_doc
 @dirrm share/lynx
+@dirrm share/examples/lynx
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 0ef50e70f43..4d231419c30 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,28 +1,8 @@
-$NetBSD: distinfo,v 1.22 2006/11/10 00:09:07 rillig Exp $
+$NetBSD: distinfo,v 1.23 2007/03/10 09:14:09 wiz Exp $
 
-SHA1 (lynx/lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4
-RMD160 (lynx/lynx2.8.5.tar.bz2) = 80d20261ac6eaebe1d940fb5de485daaad7bb3b7
-Size (lynx/lynx2.8.5.tar.bz2) = 2177287 bytes
-SHA1 (lynx/2.8.5rel.2.patch.gz) = f2f6cf025a11a860ce2af98ef9c3c0cf0699a8ee
-RMD160 (lynx/2.8.5rel.2.patch.gz) = 827a440a5aa311d740a8b459f639b20cdcd9d481
-Size (lynx/2.8.5rel.2.patch.gz) = 2445 bytes
-SHA1 (lynx/2.8.5rel.3.patch.gz) = 3df403358d24f2e3ebbe89732710f0e92af0242c
-RMD160 (lynx/2.8.5rel.3.patch.gz) = 51eaf9b8df1a97aba47d2ee18a90af20a9bf93f0
-Size (lynx/2.8.5rel.3.patch.gz) = 4376 bytes
-SHA1 (lynx/2.8.5rel.4.patch.gz) = 69bc5f656d3ab45182541ca86c4631177ec51565
-RMD160 (lynx/2.8.5rel.4.patch.gz) = 1763a6869c61cfe368072b6a11b5cb7d7242eff9
-Size (lynx/2.8.5rel.4.patch.gz) = 2543 bytes
-SHA1 (lynx/2.8.5rel.5.patch.gz) = 8e99778c6cad4681ce5730a27caf2ed33aff1cf6
-RMD160 (lynx/2.8.5rel.5.patch.gz) = ed108c96e2e3ce959aa35c0aa1c415da38e58cfd
-Size (lynx/2.8.5rel.5.patch.gz) = 2117 bytes
-SHA1 (patch-aa) = ac17101b5dfa296298f1fcd58e8b14673c2855bb
-SHA1 (patch-ab) = 2cc647d06d97127546bf2511fbfac6a5eef67d07
-SHA1 (patch-ae) = 5dff036d9fc35dca528acb530f779dce4a98cddd
-SHA1 (patch-af) = be52c260ee5c052984e247bc04b5d6bb5bc6c1c2
-SHA1 (patch-ag) = 93d1ff507f8533e54a45f50d0310d2bb8017f1d2
-SHA1 (patch-ba) = 14aa7dd1026127753f6f8e5bf18bcf83a7a246fc
-SHA1 (patch-bb) = 33ebf1ad1f7471ec5afba8b436b7fdc2214ac6d7
-SHA1 (patch-bc) = 6f293327a757ee96617d05ad9ab37d43da283f33
-SHA1 (patch-bd) = 11e1b29fe521b874e5e9b09c70572119b31b655a
-SHA1 (patch-be) = 36be2a5f00fd8cd6d7fdc62b768bf960df480573
-SHA1 (patch-bf) = 8ba9b49824aaebe6010aba15e9ae74c800e521b7
+SHA1 (lynx2.8.6rel.4.tar.bz2) = b4e37025e99aabaddb219b2f27b1b0ac5db89708
+RMD160 (lynx2.8.6rel.4.tar.bz2) = 47e48e4136df298bf5168bc8d2d49e1ac92a6820
+Size (lynx2.8.6rel.4.tar.bz2) = 2291156 bytes
+SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
+SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
+SHA1 (patch-af) = 7d3c6f461837604f6497e568d49457fbf4ee76d7
diff --git a/www/lynx/options.mk b/www/lynx/options.mk
index bd8a0210984..1494d9ca7c1 100644
--- a/www/lynx/options.mk
+++ b/www/lynx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2007/03/08 19:25:32 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2007/03/10 09:14:09 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lynx
 PKG_SUPPORTED_OPTIONS=	inet6
@@ -32,13 +32,13 @@ SCREENTYPE=		slang
 .endif
 .if !empty(PKG_OPTIONS:Mncurses)
 SCREENTYPE=		ncurses
-USE_NCURSES=		color
+USE_NCURSES=		YES # color
 .  include "../../devel/ncurses/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-color-style
 .endif
 .if !empty(PKG_OPTIONS:Mncursesw)
 SCREENTYPE=		ncurses
-USE_NCURSES=		color
+USE_NCURSES=		YES # color
 LIBS+=			-lncursesw
 .  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-color-style
diff --git a/www/lynx/patches/patch-aa b/www/lynx/patches/patch-aa
index a667dc72327..0eddb5318fa 100644
--- a/www/lynx/patches/patch-aa
+++ b/www/lynx/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2004/03/11 20:53:17 ben Exp $
+$NetBSD: patch-aa,v 1.8 2007/03/10 09:14:09 wiz Exp $
 
---- configure.orig	2004-02-04 12:07:09.000000000 +0000
-+++ configure	2004-03-05 11:45:35.000000000 +0000
-@@ -4853,3 +4853,3 @@
- esac
--LIBS="$LIBS -lsocks"
-+LIBS="$LIBS -lsocks4"
- cat >> confdefs.h <<\EOF
-@@ -12836,3 +12836,3 @@
- case $cf_cv_screen in
--slang|ncurses*)
-+curses|slang|ncurses*)
- 	use_dft_colors=maybe
+--- makefile.in.orig	2006-09-03 23:25:39.000000000 +0000
++++ makefile.in
+@@ -56,7 +56,7 @@ mandir= @mandir@/man1
+ MANDIR= $(DESTDIR)$(mandir)
+ 
+ ## Where you want the lynx.cfg file installed
+-sysconfdir= @sysconfdir@
++sysconfdir= @prefix@/share/examples/lynx
+ SYSCONFDIR= $(DESTDIR)$(sysconfdir)
+ 
+ ## Where you want the doc-files installed
diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab
index 65eaf39e702..a40a395da26 100644
--- a/www/lynx/patches/patch-ab
+++ b/www/lynx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2006/04/22 15:08:04 joerg Exp $
+$NetBSD: patch-ab,v 1.9 2007/03/10 09:14:09 wiz Exp $
 
---- cfg_defs.sh.orig	2006-04-22 17:02:33.000000000 +0200
-+++ cfg_defs.sh
-@@ -19,6 +19,7 @@ static CONST struct {
+--- scripts/cfg_defs.sh.orig	2006-01-23 01:16:14.000000000 +0000
++++ scripts/cfg_defs.sh
+@@ -19,6 +19,7 @@ static const struct {
  EOF
  
  sed \
diff --git a/www/lynx/patches/patch-ae b/www/lynx/patches/patch-ae
deleted file mode 100644
index e2f17ac9875..00000000000
--- a/www/lynx/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/03/03 14:01:00 adam Exp $
-
---- WWW/Library/Implementation/HTParse.c.orig	2004-02-02 20:02:28.000000000 +0000
-+++ WWW/Library/Implementation/HTParse.c
-@@ -329,7 +329,7 @@ PUBLIC char * HTParse ARGS3(
- 		char *p2, *h;
- 		if ((p2 = strchr(result, '@')) != NULL)
- 		   tail = (p2 + 1);
--		p2 = strchr(tail, ':');
-+		p2 = strrchr(tail, ':');
- 		if (p2 != NULL && !isdigit(UCH(p2[1])))
- 		    /*
- 		    **	Colon not followed by a port number.
diff --git a/www/lynx/patches/patch-af b/www/lynx/patches/patch-af
index 84e568b6828..61e814416cc 100644
--- a/www/lynx/patches/patch-af
+++ b/www/lynx/patches/patch-af
@@ -1,19 +1,7 @@
-$NetBSD: patch-af,v 1.3 2006/11/10 00:09:07 rillig Exp $
+$NetBSD: patch-af,v 1.4 2007/03/10 09:14:10 wiz Exp $
 
 --- po/makefile.inn.orig	2004-01-28 19:30:38.000000000 +0000
 +++ po/makefile.inn
-@@ -71,6 +71,11 @@ INSTOBJEXT = @INSTOBJEXT@
- 	$(MSGFMT) -o $@ $<
- 
- .po.gmo:
-+	@if [ `$(GMSGFMT) --version | head -1 | cut -d . -f 2` -lt 11 ]; then \
-+		mv $< $<.bak; \
-+		sed '/^msgstr/s/\([^\\]\)\(\\[^[:print:]]\)/\1\\\2/g' \
-+			<$<.bak >$<; \
-+	fi
- 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
- 
 @@ -113,16 +118,16 @@ install-data: install-data-@USE_NLS@
  install-data-no: all
  install-data-yes: all
diff --git a/www/lynx/patches/patch-ag b/www/lynx/patches/patch-ag
deleted file mode 100644
index 07cf4b77d45..00000000000
--- a/www/lynx/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/05/25 13:45:36 fredb Exp $
-
---- src/chrtrans/makefile.in.orig	2004-01-08 03:03:09.000000000 +0100
-+++ src/chrtrans/makefile.in	2005-05-25 11:32:21.000000000 +0200
-@@ -101,7 +101,7 @@
- 
- makeuctb$o: $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
- 
--.SUFFIXES : $o .tbl .i
-+.SUFFIXES : $o .h .tbl .i
- 
- .c$o:
- @RULE_CC@
diff --git a/www/lynx/patches/patch-ba b/www/lynx/patches/patch-ba
deleted file mode 100644
index 4f8ac0c46a5..00000000000
--- a/www/lynx/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2006/05/29 16:58:18 drochner Exp $
-
---- userdefs.h.orig	2006-05-29 14:15:01.000000000 +0200
-+++ userdefs.h
-@@ -1379,6 +1379,8 @@
- #define MAXCHARSETS 60		/* max character sets supported */
- #define TRST_MAXROWSPAN 10000	/* max rowspan accepted by TRST code */
- #define TRST_MAXCOLSPAN 1000	/* max colspan and COL/COLGROUP span accepted */
-+#define MAX_TABLE_ROWS  200	/* max rows for tables */
-+#define MAX_TABLE_COLS  200	/* max cols for tables */
- #define SAVE_TIME_NOT_SPACE	/* minimize number of some malloc calls */
- 
- /* Win32 may support more, but old win16 helper apps may not. */
diff --git a/www/lynx/patches/patch-bb b/www/lynx/patches/patch-bb
deleted file mode 100644
index ee645431c89..00000000000
--- a/www/lynx/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2006/05/29 16:58:18 drochner Exp $
-
---- src/GridText.c.orig	2004-01-28 20:30:38.000000000 +0100
-+++ src/GridText.c
-@@ -9589,8 +9589,8 @@ PUBLIC int HText_beginInput ARGS3(
-     /*
-      *  Set SIZE.
-      */
--    if (I->size != NULL) {
--	f->size = atoi(I->size);
-+    if (I->size != 0) {
-+	f->size = I->size;
- 	/*
- 	 *  Leave at zero for option lists.
- 	 */
diff --git a/www/lynx/patches/patch-bc b/www/lynx/patches/patch-bc
deleted file mode 100644
index ea8d8d4eb35..00000000000
--- a/www/lynx/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2006/05/29 16:58:18 drochner Exp $
-
---- src/HTForms.h.orig	2003-06-02 03:16:28.000000000 +0200
-+++ src/HTForms.h
-@@ -40,7 +40,7 @@ typedef struct _InputFieldData {
- 	CONST char *md;
- 	CONST char *min;
- 	CONST char *name;
--	CONST char *size;
-+	int   size;
- 	CONST char *src;
- 	CONST char *type;
- 	char *value;
diff --git a/www/lynx/patches/patch-bd b/www/lynx/patches/patch-bd
deleted file mode 100644
index 91f8b9a2e27..00000000000
--- a/www/lynx/patches/patch-bd
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2006/05/29 16:58:18 drochner Exp $
-
---- src/HTML.c.orig	2004-01-19 13:16:02.000000000 +0100
-+++ src/HTML.c
-@@ -80,6 +80,19 @@
- 
- #define STACKLEVEL(me) ((me->stack + MAX_NESTING - 1) - me->sp)
- 
-+#define DFT_TEXTAREA_COLS 60
-+#define DFT_TEXTAREA_ROWS 4
-+
-+#define MAX_TEXTAREA_COLS LYcolLimit
-+#define MAX_TEXTAREA_ROWS (3 * LYlines)
-+
-+#define LimitValue(name, value) \
-+ 	if (name > value) { \
-+		CTRACE((tfp, "Limited " #name " to %d, was %d\n", \
-+			value, name)); \
-+		name = value; \
-+	}
-+
- struct _HTStream {
-     CONST HTStreamClass *	isa;
- #ifdef USE_SOURCE_CACHE
-@@ -4316,7 +4329,7 @@ PRIVATE int HTML_start_element ARGS6(
- 	    I.align=NULL; I.accept=NULL; I.checked=NO; I.class=NULL;
- 	    I.disabled=NO; I.error=NULL; I.height= NULL; I.id=NULL;
- 	    I.lang=NULL; I.max=NULL; I.maxlength=NULL; I.md=NULL;
--	    I.min=NULL; I.name=NULL; I.size=NULL; I.src=NULL;
-+	    I.min=NULL; I.name=NULL; I.size=0; I.src=NULL;
- 	    I.type=NULL; I.value=NULL; I.width=NULL;
- 	    I.accept_cs = NULL;
- 	    I.name_cs = ATTR_CS_IN;
-@@ -4502,7 +4515,7 @@ PRIVATE int HTML_start_element ARGS6(
- 	    I.align=NULL; I.accept=NULL; I.checked=NO; I.class=NULL;
- 	    I.disabled=NO; I.error=NULL; I.height= NULL; I.id=NULL;
- 	    I.lang=NULL; I.max=NULL; I.maxlength=NULL; I.md=NULL;
--	    I.min=NULL; I.name=NULL; I.size=NULL; I.src=NULL;
-+	    I.min=NULL; I.name=NULL; I.size=0; I.src=NULL;
- 	    I.type=NULL; I.value=NULL; I.width=NULL;
- 	    I.accept_cs = NULL;
- 	    I.name_cs = ATTR_CS_IN;
-@@ -4794,7 +4807,7 @@ PRIVATE int HTML_start_element ARGS6(
- 		I.checked = YES;
- 	    if (present && present[HTML_INPUT_SIZE] &&
- 		value[HTML_INPUT_SIZE] && *value[HTML_INPUT_SIZE])
--		I.size = value[HTML_INPUT_SIZE];
-+		I.size = atoi(value[HTML_INPUT_SIZE]);
- 	    if (present && present[HTML_INPUT_MAXLENGTH] &&
- 		value[HTML_INPUT_MAXLENGTH] && *value[HTML_INPUT_MAXLENGTH])
- 		I.maxlength = value[HTML_INPUT_MAXLENGTH];
-@@ -5033,26 +5046,28 @@ PRIVATE int HTML_start_element ARGS6(
- 	if (present && present[HTML_TEXTAREA_COLS] &&
- 	    value[HTML_TEXTAREA_COLS] &&
- 	    isdigit(UCH(*value[HTML_TEXTAREA_COLS])))
--	    StrAllocCopy(me->textarea_cols, value[HTML_TEXTAREA_COLS]);
-+	    me->textarea_cols = atoi(value[HTML_TEXTAREA_COLS]);
- 	else {
- 	    int width;
- 	    width = LYcols - 1 -
- 		    me->new_style->leftIndent - me->new_style->rightIndent;
- 	    if (dump_output_immediately) /* don't waste too much for this */
--		width = HTMIN(width, 60);
-+		width = HTMIN(width, DFT_TEXTAREA_COLS);
- 	    if (width > 1 && (width-1)*6 < MAX_LINE - 3 -
- 		me->new_style->leftIndent - me->new_style->rightIndent)
--		HTSprintf0(&me->textarea_cols, "%d", width);
-+		me->textarea_cols = width;
- 	    else
--		StrAllocCopy(me->textarea_cols, "60");
-+		me->textarea_cols = DFT_TEXTAREA_COLS;
- 	}
-+	LimitValue(me->textarea_cols, MAX_TEXTAREA_COLS);
- 
- 	if (present && present[HTML_TEXTAREA_ROWS] &&
- 	    value[HTML_TEXTAREA_ROWS] &&
- 	    isdigit(UCH(*value[HTML_TEXTAREA_ROWS])))
- 	    me->textarea_rows = atoi(value[HTML_TEXTAREA_ROWS]);
- 	else
--	    me->textarea_rows = 4;
-+	    me->textarea_rows = DFT_TEXTAREA_ROWS;
-+	LimitValue(me->textarea_rows, MAX_TEXTAREA_ROWS);
- 
- 	if (present && present[HTML_TEXTAREA_DISABLED])
- 	    me->textarea_disabled = YES;
-@@ -5169,7 +5184,7 @@ PRIVATE int HTML_start_element ARGS6(
- 		I.align=NULL; I.accept=NULL; I.checked=NO; I.class=NULL;
- 		I.disabled=NO; I.error=NULL; I.height= NULL; I.id=NULL;
- 		I.lang=NULL; I.max=NULL; I.maxlength=NULL; I.md=NULL;
--		I.min=NULL; I.name=NULL; I.size=NULL; I.src=NULL;
-+		I.min=NULL; I.name=NULL; I.size=0; I.src=NULL;
- 		I.type=NULL; I.value=NULL; I.width=NULL;
- 		I.accept_cs = NULL;
- 		I.name_cs = -1;
-@@ -6818,7 +6833,7 @@ End_Object:
- 	    I.align=NULL; I.accept=NULL; I.checked=NO; I.class=NULL;
- 	    I.disabled=NO; I.error=NULL; I.height= NULL; I.id=NULL;
- 	    I.lang=NULL; I.max=NULL; I.maxlength=NULL; I.md=NULL;
--	    I.min=NULL; I.name=NULL; I.size=NULL; I.src=NULL;
-+	    I.min=NULL; I.name=NULL; I.size=0; I.src=NULL;
- 	    I.type=NULL; I.value=NULL; I.width=NULL;
- 	    I.value_cs = current_char_set;
- 
-@@ -6969,7 +6984,7 @@ End_Object:
- 		}
- 		I.value = temp;
- 		chars = HText_beginInput(me->text, me->inUnderline, &I);
--		for (chars = atoi(me->textarea_cols); chars > 0; chars--)
-+		for (chars = me->textarea_cols; chars > 0; chars--)
- 		    HTML_put_character(me, '_');
- 		HText_appendCharacter(me->text, '\r');
- 		if (*data == '\n') {
-@@ -6994,7 +7009,6 @@ End_Object:
- 	    HTChunkClear(&me->textarea);
- 	    FREE(me->textarea_name);
- 	    me->textarea_name_cs = -1;
--	    FREE(me->textarea_cols);
- 	    FREE(me->textarea_id);
- 	    break;
- 	}
-@@ -7541,7 +7555,6 @@ PRIVATE void HTML_abort ARGS2(HTStructur
-     FREE(me->map_address);
-     FREE(me->textarea_name);
-     FREE(me->textarea_accept_cs);
--    FREE(me->textarea_cols);
-     FREE(me->textarea_id);
-     FREE(me->LastOptionValue);
-     FREE(me->xinclude);
-@@ -7721,7 +7734,7 @@ PUBLIC HTStructured* HTML_new ARGS3(
-     me->textarea_name = NULL;
-     me->textarea_name_cs = -1;
-     me->textarea_accept_cs = NULL;
--    me->textarea_cols = NULL;
-+    me->textarea_cols = 0;
-     me->textarea_rows = 4;
-     me->textarea_disabled = NO;
-     me->textarea_id = NULL;
diff --git a/www/lynx/patches/patch-be b/www/lynx/patches/patch-be
deleted file mode 100644
index d44c6b7420e..00000000000
--- a/www/lynx/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2006/05/29 16:58:18 drochner Exp $
-
---- src/HTML.h.orig	2004-01-08 03:03:09.000000000 +0100
-+++ src/HTML.h
-@@ -104,7 +104,7 @@ struct _HTStructured {
-     char *			textarea_name;
-     int				textarea_name_cs;
-     char *			textarea_accept_cs;
--    char *			textarea_cols;
-+    int				textarea_cols;
-     int				textarea_rows;
-     int				textarea_disabled;
-     char *			textarea_id;
diff --git a/www/lynx/patches/patch-bf b/www/lynx/patches/patch-bf
deleted file mode 100644
index bebcdeeb190..00000000000
--- a/www/lynx/patches/patch-bf
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2006/05/29 16:58:18 drochner Exp $
-
---- src/LYCurses.h.orig	2004-01-28 20:30:38.000000000 +0100
-+++ src/LYCurses.h
-@@ -365,6 +365,24 @@ extern long LYgetattrs PARAMS((WINDOW *w
- extern int LYlines;	/* replaces LINES */
- extern int LYcols;	/* replaces COLS */
- 
-+/*
-+ * The scrollbar, if used, occupies the rightmost column.
-+ */
-+#ifdef USE_SCROLLBAR
-+#define LYbarWidth (LYShowScrollbar ? 1 : 0)
-+#else
-+#define LYbarWidth 0
-+#endif
-+
-+/*
-+ * Usable limits for display:
-+ */
-+#if defined(FANCY_CURSES) || defined(USE_SLANG)
-+#define LYcolLimit (LYcols - LYbarWidth)
-+#else
-+#define LYcolLimit (LYcols - 1)
-+#endif
-+
- #ifdef USE_CURSES_PADS
- extern WINDOW *LYwin;
- extern int LYshiftWin;