Changes 2.8.5:

* file-upload supported
* support for bzip2 compression
* performance improved
* improved SSL support
* improvements to color-style
* better interaction with user
* improved cookie support

6 files changed, 79 insertions, 111 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index c2ae2bdb981..7a42db44945 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,38 +1,29 @@
-# $NetBSD: Makefile,v 1.66 2004/02/26 14:04:20 fredb Exp $
+# $NetBSD: Makefile,v 1.67 2004/03/03 14:01:00 adam Exp $
 #
 
-DISTNAME=		lynx2.8.4rel.1
-PKGNAME=		lynx-2.8.4.1.4
-PKGREVISION=		2
-CATEGORIES=		www
-MASTER_SITES=		http://lynx.isc.org/lynx2.8.4/ \
-			ftp://lynx.isc.org/lynx2.8.4/ \
-			ftp://ftp.nl.uu.net/pub/unix/www/lynx/lynx2.8.4/ \
-			ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/lynx2.8.4/
-EXTRACT_SUFX=		.tar.bz2
-
-PATCH_SITES=		http://lynx.isc.org/lynx2.8.4/patches/ \
-			ftp://lynx.isc.org/lynx/lynx2.8.4/patches/ \
-			ftp://ftp.nl.uu.net/pub/unix/www/lynx/lynx2.8.4/patches/ \
-			ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/WWW/lynx/lynx2.8.4/patches/
-PATCHFILES=		lynx2.8.4rel.1a.patch lynx2.8.4rel.1b.patch \
-			lynx2.8.4rel.1c.patch lynx2.8.4rel.1d.patch
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=		fredb@NetBSD.org
-HOMEPAGE=		http://lynx.isc.org/
-COMMENT=		Alphanumeric display oriented World-Wide Web Client
+DISTNAME=	lynx2.8.5
+WRKSRC=		${WRKDIR}/lynx2-8-5
+PKGNAME=	lynx-2.8.5
+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}/
+EXTRACT_SUFX=	.tar.bz2
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
+MAINTAINER=	fredb@NetBSD.org
+HOMEPAGE=	http://lynx.isc.org/
+COMMENT=	Alphanumeric display oriented World-Wide Web Client
 
 BUILD_USES_MSGFMT=	yes
 
-WRKSRC=			${WRKDIR}/lynx2-8-4
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INSTALL_TARGET=		install-bin install-cfg install-help install-lss
-INSTALL_TARGET+=	install-doc install-man
+USE_GNU_TOOLS+=		make
+INSTALL_TARGET=		install-full install-lss
 MAKEFILE=       	makefile
 
 BUILD_DEFS+=		LYNX_SCREEN_LIB USE_SOCKS USE_INET6
@@ -40,13 +31,10 @@ BUILD_DEFS+=		LYNX_SCREEN_LIB USE_SOCKS USE_INET6
 .include "../../mk/bsd.prefs.mk"
 
 # For nls/gettext
+CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--with-nls-datadir=${PREFIX}/share
 CONFIGURE_ARGS+=	--without-included-gettext
 
-.if ${OPSYS} != "IRIX"
-CONFIGURE_ARGS+=	--enable-nls
-.endif
-
 # With SSL, lynx can get https:// and snews:// URL's.
 CONFIGURE_ARGS+=	--with-ssl
 
@@ -67,6 +55,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
 
@@ -76,8 +66,11 @@ CONFIGURE_ARGS+=	--enable-read-eta
 USE_NCURSES=		color
 .  include "../../devel/ncurses/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-color-style
-.elif ${LYNX_SCREEN_LIB} == "curses"
+.elif ${LYNX_SCREEN_LIB} == curses
 .  include "../../mk/curses.buildlink3.mk"
+.  if !empty(MACHINE_PLATFORM:MNetBSD-1.5*-i386)
+CONFIGURE_ARGS+=	--enable-color-style
+.  endif
 .else
 pre-configure:
 	@${ECHO} '****************************************************'
@@ -115,8 +108,9 @@ CONFIGURE_ARGS+= 	--with-socks5
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
 
-pre-install:
-	${RM} -f ${WRKSRC}/CHANGES.orig
+# problem encountered with zh_TW.po, maybe it will be fixed in the future
+post-extract:
+	${RM} ${WRKSRC}/po/zh_TW.po
 
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx
diff --git a/www/lynx/PLIST b/www/lynx/PLIST
index 729f5f1c2e8..594ee308924 100644
--- a/www/lynx/PLIST
+++ b/www/lynx/PLIST
@@ -1,33 +1,66 @@
-@comment $NetBSD: PLIST,v 1.5 2003/05/28 13:52:13 grant Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/03/03 14:01:00 adam Exp $
 bin/lynx
 man/man1/lynx.1
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/lynx.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/lynx.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/lynx.mo
 share/lynx/lynx.cfg
 share/lynx/lynx.lss
 share/lynx/lynx_doc/CHANGES
-share/lynx/lynx_doc/CHANGES.orig_dist
 share/lynx/lynx_doc/COPYHEADER
 share/lynx/lynx_doc/COPYING
 share/lynx/lynx_doc/PROBLEMS
 share/lynx/lynx_doc/README
+share/lynx/lynx_doc/docs/CHANGES2.3.gz
+share/lynx/lynx_doc/docs/CHANGES2.4.gz
+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
+share/lynx/lynx_doc/docs/OS-390.announce.gz
+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.rootcerts
+share/lynx/lynx_doc/docs/README.ssl
+share/lynx/lynx_doc/docs/README.sslcerts
+share/lynx/lynx_doc/docs/SOCKETSHR.announce.gz
+share/lynx/lynx_doc/docs/TCPWARE.announce.gz
+share/lynx/lynx_doc/docs/VMSWAIS.announce.gz
+share/lynx/lynx_doc/docs/djgpp.key
+share/lynx/lynx_doc/docs/pdcurses.key
+share/lynx/lynx_doc/docs/slang.key
+share/lynx/lynx_doc/docs/win-386.announce.gz
 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
@@ -39,11 +72,14 @@ 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/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/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
@@ -74,5 +110,6 @@ share/lynx/lynx_help/keystrokes/xterm_help.html.gz
 @dirrm share/lynx/lynx_help
 @dirrm share/lynx/lynx_doc/samples
 @dirrm share/lynx/lynx_doc/test
+@dirrm share/lynx/lynx_doc/docs
 @dirrm share/lynx/lynx_doc
 @dirrm share/lynx/
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 58f944d9140..f0354de2370 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,15 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/11/12 20:01:17 tron Exp $
+$NetBSD: distinfo,v 1.10 2004/03/03 14:01:00 adam Exp $
 
-SHA1 (lynx2.8.4rel.1.tar.bz2) = 11285022fbe6910fb0a47adc14581ceb0c3bfc98
-Size (lynx2.8.4rel.1.tar.bz2) = 1940531 bytes
-SHA1 (lynx2.8.4rel.1a.patch) = 65473d215a17a80c1c1203c6c35c4fc7c6951a5d
-Size (lynx2.8.4rel.1a.patch) = 7530 bytes
-SHA1 (lynx2.8.4rel.1b.patch) = 323edfa079bf8e6ed517e1031a6797ade4fe823a
-Size (lynx2.8.4rel.1b.patch) = 8939 bytes
-SHA1 (lynx2.8.4rel.1c.patch) = 47c9d74c063714b499f03135f3ecba894a037a10
-Size (lynx2.8.4rel.1c.patch) = 9270 bytes
-SHA1 (lynx2.8.4rel.1d.patch) = d217452fe9b4862c0e98d63b2391708feb27366e
-Size (lynx2.8.4rel.1d.patch) = 4688 bytes
-SHA1 (patch-aa) = 123ebe71a00dfdd309d54b96f52ea83002d43cb2
-SHA1 (patch-ab) = 77911b842a84f3930fd53101974b5a422775b70b
-SHA1 (patch-ae) = ebd644a91ad08060baaf724d44bb03bb2f51a260
+SHA1 (lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4
+Size (lynx2.8.5.tar.bz2) = 2177287 bytes
+SHA1 (patch-aa) = fcf770cbaeead3f88f507184c5efd3c1b0c55ee0
+SHA1 (patch-ae) = 5dff036d9fc35dca528acb530f779dce4a98cddd
diff --git a/www/lynx/patches/patch-aa b/www/lynx/patches/patch-aa
index a6b000395e5..bbae760a711 100644
--- a/www/lynx/patches/patch-aa
+++ b/www/lynx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2001/12/21 03:55:50 fredb Exp $
+$NetBSD: patch-aa,v 1.5 2004/03/03 14:01:00 adam Exp $
 
---- configure.orig	Tue Jul 17 16:04:37 2001
+--- configure.orig	2004-02-04 12:07:09.000000000 +0000
 +++ configure
-@@ -5763,7 +5763,7 @@
+@@ -4851,7 +4851,7 @@ no|yes) #(vi
    fi
    ;;
  esac
@@ -11,41 +11,3 @@ $NetBSD: patch-aa,v 1.4 2001/12/21 03:55:50 fredb Exp $
  cat >> confdefs.h <<\EOF
  #define SOCKS 1
  EOF
-@@ -6879,15 +6879,33 @@
- echo "$ac_t""$cf_cv_screen" 1>&6
- 
- case $cf_cv_screen in
--ncurses|slang)
-+ncurses)
-+	cf_cv_ncurses_header=ncurses.h
-+	;;
-+slang)
-+	case $host_os in
-+	netbsd)
-+		;;
-+	*)
-+		cf_cv_ncurses_header=ncurses.h
-+		;;
-+	esac
- 	;;
- pdcurses)
- 	cf_cv_ncurses_header=xcurses.h
- 	;;
- curses)
--	if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
--		cf_cv_ncurses_header=curses.h
--	fi
-+	case $host_os in
-+	netbsd)
-+		ac_cv_header_term_h=no
-+		cf_cv_ncurses_version=no
-+		;;
-+	*)
-+		if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" != set"; then
-+			cf_cv_ncurses_header=curses.h
-+		fi
-+		;;
-+	esac
- 	;;
- esac
- 
diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab
deleted file mode 100644
index 5b9a8fceb11..00000000000
--- a/www/lynx/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/11/12 20:01:17 tron Exp $
-
---- src/chrtrans/makefile.in.orig	2001-04-02 02:51:46.000000000 +0200
-+++ src/chrtrans/makefile.in	2003-11-12 20:34:44.000000000 +0100
-@@ -99,7 +99,7 @@
- 
- makeuctb$(_O): $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
- 
--.SUFFIXES : $(_O) .tbl .i
-+.SUFFIXES : $(_O) .tbl .i .h
- 
- .c$(_O):
- @RULE_CC@
diff --git a/www/lynx/patches/patch-ae b/www/lynx/patches/patch-ae
index c32198986db..e2f17ac9875 100644
--- a/www/lynx/patches/patch-ae
+++ b/www/lynx/patches/patch-ae
@@ -1,16 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2001/12/21 03:55:50 fredb Exp $
+$NetBSD: patch-ae,v 1.2 2004/03/03 14:01:00 adam 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
-@@ -291,7 +291,11 @@
+--- 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);
-+#ifdef INET6
+-		p2 = strchr(tail, ':');
 +		p2 = strrchr(tail, ':');
-+#else
- 		p2 = strchr(tail, ':');
-+#endif
  		if (p2 != NULL && !isdigit(UCH(p2[1])))
  		    /*
  		    **	Colon not followed by a port number.