Update to 0.1.10. Related changes are:

* Bugfix: When a header by CGI POST method gives Location: header,
  the redirect can't be reloaded.
* white spaces in URL are removed.
* Bugfix: onA() doesn't work.
* Improvement of 'Jump to label' behavior within a frame.
* Bugfix: width of <li>
* Bugfix: Line break occurs on &nbsp;.
* Bugfix: single > in a document isn't analyzed properly.
* Bugfix: <xmp>,<listing> in <textarea>
* Screen shift bugfix.
* Bugfix: <option> without <select> in table causes core dump.
* Bugfix: CRs in <textarea>..</textarea> are replaced with
  white spaces.
* Bugfix: After specifying non-text file in 'V' command,
  w3m dumps core.
* BUFINFO related bugfix.
* Bugfix: extbrowser setting in config desn't work.
* Bugfix: pathname to invoke external viewer becomes like
  ``/home/okada/.w3m//w3mv6244-0..pdf''.
* enhancement of [w3m-dev 00684].
* Bugfix; when CLEAR_BUF is defined, buffer size is displayed as [0 line].
* show_params() improvement.
* when CLEAR_BUF is defined and reloading local file, that is overwritten.
* When submitting data in textarea without editing them, CR charcters are
  sent instead of CRLF.
* When CLEAR_BUF is defined, content of form disappears.
* Improvement of Japanese coding-system decition algorithm.
* Command line analysis enhancement.
* Bugfix of PIPE_SHELL('#'), READ_SHELL('@') and  EXEC_SHELL('!').
* Bugfix: When CLEAR_BUF is defined, anchors created by  : disappears.
* Enhancement of dirlist.cgi.
* when -m option is used, continuation lines in header are not
  processed properly.
* handling of Japanese character in HTTP header.
* Bugfix: w3m dumps core after like w3m -T a -B and save command.
* frameset related bugfix.
* ID_EXT related bugfix.
* Bugfix? handling of character-entity (&quot;) in attribute.
* Enhancement: frame names are embedded as id attribute in
  the frame-table.
* Bugfix: <STRONG> tags become comments in frame.
* frame related bugfix.
* Bugfix: as some file descriptors are not closed, file descriptors
  are exhausted on a certain condition.
* Bugfix: a blank line is inserted when processing <title>...</title>.
* <table> within <blockquote> in <table> corrupts.
* Support of terminals which can't display &nbsp; (0xa0).
* <!--comment --\n> like comment handling fix.
* w3mhelperpanel.c fix.
* Bugfix: personal_document_root doesn't work.
* When opening file:///dir/, if index.html exists in
  that directory, open the file instead of displaying directory list.
* w3m -num fix.
* Bugfix: When using -dump option, temporary files don't be unlinked.
* Bugfix: When <blockquote> exists outside of <tr>..</tr> in <table>,
  the table corrupts.
* Bugfix: supports terminal without sr capability.
* Kanji-code decision enhancement.
* Bugfix: w3m can't handle cgi using <ISINDEX>.
* Remove CR/LF within URL.
* Layered frameset support.
* id attribute support bugfix.
* Enhancement: -o option parameter list
* Security hole fix about I command.
* Filename completion bugfix.
* Color display bugfix.
* When transmitting a string to form, it was made not to escape
  a safe character.
* Bugfix: when displaying the page which has a link in the
  beginning of the screen, the first link doesn't get active.
* proxy initialization bugfix.
* free memory of hidden buffers. (CLEAR_BUF)
* when file:// style local file access fails, don't retry
  as http://file://.
* Enhancement: Save Buffer URL into file.
* FTP proxy bugfix.
* Bugfix: After window resize, reshapeBuffer() is called on
  each keyin.

5 files changed, 31 insertions, 38 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 82c77475367..f850f5f05ec 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2000/06/21 02:39:48 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/21 08:22:08 itohy Exp $
 
-DISTNAME=	w3m-0.1.9
+DISTNAME=	w3m-0.1.10
 CATEGORIES=	www
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/
 
@@ -9,7 +9,6 @@ HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/
 
 DEPENDS=	boehm-gc-5.0a7:../../devel/boehm-gc
 
-WRKSRC=		${WRKDIR}/w3m
 HELPDIR=	share/doc/w3m
 HELPERDIR=	lib/w3m
 
@@ -20,9 +19,9 @@ BUILD_DEFS+=	USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
 .if defined(EXTRACT_USING_PAX)
-EXTRACT_ELEMENTS=	-c w3m/gc/\*
+EXTRACT_ELEMENTS=	-c ${DISTNAME}/gc/\*
 .else
-EXTRACT_ELEMENTS=	--exclude w3m/gc/\*
+EXTRACT_ELEMENTS=	--exclude ${DISTNAME}/gc/\*
 .endif
 
 # Set this to NO for ISO-8859-1 support (exclusive to Japanese).
diff --git a/www/w3m/files/md5 b/www/w3m/files/md5
index af94020b638..eb2e25472dd 100644
--- a/www/w3m/files/md5
+++ b/www/w3m/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/05/19 07:34:34 itohy Exp $
+$NetBSD: md5,v 1.5 2000/06/21 08:22:10 itohy Exp $
 
-MD5 (w3m-0.1.9.tar.gz) = 311e36e3e2eb673c01dd9a63d78a9936
+MD5 (w3m-0.1.10.tar.gz) = 2e0ed5e8db8ac8d7eb1e6996b74ace1d
diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum
index 96ef8a4b8b2..fe0497d4170 100644
--- a/www/w3m/files/patch-sum
+++ b/www/w3m/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.7 2000/05/19 07:34:34 itohy Exp $
+$NetBSD: patch-sum,v 1.8 2000/06/21 08:22:11 itohy Exp $
 
-MD5 (patch-aa) = 95ceb3f4890955448ae1a705a6c691ce
-MD5 (patch-ab) = 3d631f4e994c7f0f7e4b354ee9e8e93a
+MD5 (patch-aa) = 1d08dd8ea8ea250ec0a7bef5f86ac75f
+MD5 (patch-ab) = d88798980e1985d3e3f71669d57d9a4a
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa
index 1a91571c191..95ae67b1b44 100644
--- a/www/w3m/patches/patch-aa
+++ b/www/w3m/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2000/05/19 07:34:35 itohy Exp $
+$NetBSD: patch-aa,v 1.5 2000/06/21 08:22:11 itohy Exp $
 
---- configure.orig	Fri Apr 21 12:37:24 2000
-+++ configure	Fri May 19 12:36:25 2000
-@@ -309,13 +309,13 @@
+--- configure.orig	Mon Jun  5 18:41:35 2000
++++ configure	Tue Jun 20 21:19:13 2000
+@@ -310,13 +310,13 @@
  echo "Which language do you prefer?"
  echo "  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)"
  echo "  2 - English (charset US_ASCII, ISO-8859-1, etc.)"
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.4 2000/05/19 07:34:35 itohy Exp $
  while :
  do
    readanswer lg_ans "$def_lg"
-@@ -774,14 +774,14 @@
+@@ -784,7 +784,7 @@
  gclib=''
  gcinclude=''
  gctarget=''
@@ -32,8 +32,8 @@ $NetBSD: patch-aa,v 1.4 2000/05/19 07:34:35 itohy Exp $
  do
    if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then 
      echo "$libdir/libgc found"
--    gclib="-lgc"
-+    gclib="-L$libdir -lgc"
+@@ -792,7 +792,7 @@
+     break
    fi
  done
 -for inc in /usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include
@@ -41,3 +41,11 @@ $NetBSD: patch-aa,v 1.4 2000/05/19 07:34:35 itohy Exp $
  do
    if [ -f $inc/gc.h ]; then
      echo "$inc/gc.h found"
+@@ -1553,6 +1553,7 @@
+ if [ `expr "$perl" : 'not found'` != 0 ]; then
+   perl=/usr/local/bin/perl
+ fi
++perl=/usr/pkg/bin/perl
+ if [ $sysname = CYGWIN ]; then
+   cygwin=1
+ else
diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab
index ab01146b6a6..0dbbe03d076 100644
--- a/www/w3m/patches/patch-ab
+++ b/www/w3m/patches/patch-ab
@@ -1,24 +1,10 @@
-$NetBSD: patch-ab,v 1.5 2000/05/19 07:34:35 itohy Exp $
+$NetBSD: patch-ab,v 1.6 2000/06/21 08:22:12 itohy Exp $
 
-Fix problems where:
- 1. Suspend the job w3m belongs to, not w3m only.
- 2. Automatic creation of ~/.w3m fails.
+Suspend the job w3m belongs to, not w3m only.
 
---- main.c.orig	Fri Apr 21 12:45:53 2000
-+++ main.c	Fri May 19 12:40:52 2000
-@@ -145,9 +145,8 @@
- 
-     BookmarkFile = NULL;
-     rc_dir = expandName(RC_DIR);
--    i = strlen(rc_dir);
--    if (i > 1 && rc_dir[i] == '/')
--	rc_dir[i] = '\0';
-+    for (p = rc_dir + strlen(rc_dir) - 1; p > rc_dir && *p == '/'; p--)
-+      *p = '\0';
-     config_file = rcFile("config");
- 
-     /* argument search 1 */
-@@ -1427,7 +1426,17 @@
+--- main.c.orig	Tue Jun  6 14:56:48 2000
++++ main.c	Tue Jun 20 21:21:19 2000
+@@ -1529,7 +1529,17 @@
  	shell = "/bin/sh";
      system(shell);
  #else				/* SIGSTOP */
@@ -26,8 +12,8 @@ Fix problems where:
 +    signal(SIGTSTP, SIG_DFL);	/* just in case */
 +    /*
 +     * Note: If susp() was called from SIGTSTP handler,
-+     *	unblocking SIGTSTP would be required here.
-+     *	Currently not.
++     * unblocking SIGTSTP would be required here.
++     * Currently not.
 +     */
 +    kill(0, SIGTSTP);	/* stop whole job, not a single process */
 +#else