From 6f1ce595dd373774cf21156bf73e7cd49029c345 Mon Sep 17 00:00:00 2001
From: itojun <itojun>
Date: Sat, 31 Mar 2001 09:21:16 +0000
Subject: upgrade to 0.2.1.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2001/3/23 ==============================================================
From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01807] Re: w3m-0.2.0
* url.c doesn't compile when USE_NNTP or __EMX__ is defined.
* patch for EWS4800
* when #define USE_SSL and #undef USE_SSL_VERIFY, rc.c and url.c
  doesn't compile. (problems about ssl_forbid_method)
* when saveBufferDelNum and del==TRUE, patterns before ":" are
  deleted twice.
* bugfix about saving history.

From: TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp>
Subject: [w3m-dev 01810] deflate (was: w3m-0.2.0)
deflate patch in 0.2.0 doesn't work on http://cvs.m17n.org/~akr/diary/ .

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01808] Re: w3m-0.2.0
w3m doesn't compile on GNU/Linux and glibc2.2 because it lacks
sin.ss_len.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev-en 00399] Re: w3m-0.2.0
 >> From: Dan Fandrich <dan@coneharvesters.com>
 >> Version 0.2.0 still contains the following bugs which I fixed two months
 >> ago and sent patches for to this list, namely:
 >> - core dumps on startup if given a URL requiring a needsterminal mailcap
 >>   handler
 >> - destroys most of an existing ~/.mailcap file without warning when editing
 >> - mailcap handling is still wrong as MIME type should be case insensitive
 >> - private mailcap extension has an illegal name

From: SATO Seichi <seichi@as.airnet.ne.jp>
Subject: w3m regex bugs
w3m coredumps when passing $* as a search string.

2001/3/22 ==============================================================

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01664] Re: Patch for anonymizer.com
Don't call cleanupName() when the URL is http://<host>/<scheme>: ...

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01670] Re: w3m-0.1.11-pre-kokb24-test1
strcpy/strncpy in Str.c are replaced with bcopy.

From: TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp>
Subject: [w3m-dev 01618] backend patch
Subject: [w3m-dev 01671] backend patch for w3m-0.1.11-pre-kokb24-test1
A patch for w3m to work as a client. (-backend patch)

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01673] SEGV in append_frame_info()
Improvement of illegal frame handling.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01674] image map
w3m doesn't follow anchors from client-side image map when the URLs
are like "#test".

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01675] goto label
Changed w3m not to reload the document when following label-only URL
like #label.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01676] Re: w3m-0.1.11-pre-kokb24-test1
Subject: [w3m-dev 01678] Re: w3m-0.1.11-pre-kokb24-test1

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01680] Re: w3m-0.1.11-pre-kokb24-test1
To remove the compiler warnings

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01684] Re: http://cvs.m17n.org/~akr/diary/
application/x-deflate support.

From: Moritz Barsnick <barsnick@gmx.net>
Subject: [w3m-dev-en 00318] Information about current page
Subject: [w3m-dev-en 00320] Re: Information about current page
Subject: [w3m-dev-en 00322] Re: Information about current page
Subject: [w3m-dev-en 00323] Buglet (Was: Re: Information about current page)
Changes 'URL of the current anchor' on the info page into
'full' URL. When the cursor is on a form element,
`Method/type of current form' will be displayed.

From: c603273@vus069.trl.telstra.com.au (Brian Keck)
Subject: [w3m-dev-en 00343] patch for proxy user:passwd on command line
Subject: [w3m-dev-en 00351] Re: patch for proxy user:passwd on command line
This patch to w3m-0.1.11-pre-kokb23 adds the lynx-like option

        -pauth username:password

so I don't have to retype username & password every time I run w3m,
which is often.  It's so simple I wonder whether it's against policy,
but it would be nice for me & some others if it was in the official
0.1.11.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01772] Re: visited anchor
Subject: [w3m-dev 01773] Re: visited anchor
 * visited anhor color support.
 * textlist based history implementation.
 * history URLs are stored in a hash table.
 * the implementation of rules are changed.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01786] Re: w3m-0.1.11-pre-hsaka24
Subject: [w3m-dev 01787] Re: w3m-0.1.11-pre-hsaka24
 * Improvement of illegal frame handling.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01788] Re: w3m-0.1.11-pre-hsaka24

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01792] Re: w3m-0.1.11-pre-hsaka24
search algorithm in retrieveAnchor() is changed from linear search
to binary search.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01793] <li type="..">
make type attribute of <li> tag effective not only for the <li>
element but also for all <li> tags that follows the first
type-specified <li> tag.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01801] some fixes.
Bugfix of frame

Subject: IPv6 support for w3m's ftp
From: Hajimu UMEMOTO <ume@imasy.or.jp>
IPv6 support for FTP.

2001/3/16 =============================================================
From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01711] Authorization
* http://user:pass@hostname/ support.

From: hsaka@mth.biglobe.ne.jp
Subject: [w3m-dev 01724] buf->type when mailcap is used.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01726] anchor jump too slow by TAB-key on STDIN.
* when moving from anchor to anchor by TAB on the document read
  from stdin, the movement is very slow because currentdir() is invoked
  on each TAB.

From: sakane@d4.bsd.nes.nec.co.jp (Yoshinobu Sakane)
Subject: [w3m-dev 01727] C-z when stdin

From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Subject: [w3m-dev 01729] ignore_null_img_alt
* when ignore_null_img_alt is OFF, no img link is displayed when
  no ALT attribute is specified.

From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Subject: [w3m-dev 01730] Re: <hr> in a table
Improvement of <hr>.

From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Subject: [w3m-dev 01731] completion list
When completing a filename, the candidates of the completion
will be displayed like this:

----- Completion list -----
X11R6/    compat/   include/  libdata/  local/    nfs/      ports/    share/
bin/      games/    lib/      libexec/  mdec/     obj/      sbin/     src/
(Load)Filename? /usr/


From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01733] A patch concerning SSL
The following two improvements are done about SSL:
1. a new option ``ssl_forbid_method'' is added.
2. an error message is displayed when w3m fails to establish an
   SSL connection.

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01735] Re: A patch concerning SSL
Subject: [w3m-dev 01737] Re: A patch concerning SSL
1. the data type of ssl_forbid_method is changed from P_STRING to P_SSLPATH.
2. Error message log function.

From: kiwamu <kiwamu@debian.or.jp>
Subject: [w3m-dev 01739] wheel mouse patch

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01742] w3mmee 0.1.11p16-6 segfault
w3mmee 0.1.11p16-6 segfaults depending on the content of mime.types.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01752] SEGV in search_param()
 > >> * w3m -o 1 causes SEGV.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01753] empty <select>
When <select>..</select> have no <option>, for example

<form action=A>
<select name=B></select>
<input type=submit>
</form>

submit causes SEGV.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01754] A search does not stop.
When reading a large file from stdin and wrap search option is ON,
a search that doesn't hit will cause an infinite loop.

From: WATANABE Katsuyuki <katsuyuki_1.watanabe@toppan.co.jp>
Subject: [w3m-dev 01755] relative path with -bookmark option
* when a bookmark file name is given by -bookmark as relative path,
  `add to bookmark'doesn't work.

2001/2/7
From: aito
Subject: [w3m-dev 01722] <hr> in a table
* the width of <hr> in a table exceeds the column width.

2001/2/6
From: aito
* `Local cookie' mechanism is introduced to authorize local CGI.
  The behavior of CGI script using the local cookie is as follows:
  - w3m generates process-dependent `Local cookie'
  - on the local CGI invocation, w3m passes the script the local
    cookie through the environment variable LOCAL_COOKIE.
  - the sctipt embeds the local cookie into the form for the next
    local CGI invocation.
  - on the next CGI invocation, the CGI script compares two local CGIs
    which are passed through CGI parameter and environment variable.
    If they are different, the script prohibits dangerous operations,
    such as file creation and file deletion.

* The local cookie mechanism is implemented on w3mbookmark and
  w3mhelperpanel.

* On Linux, gcmain.c doesn't compile when the GC library is already
  installed in /usr/local/lib.

2001/1/25

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01667] Re: mailer %s

2001/1/24

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01661] Re: <head>
  security fix.


2001/1/23

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * check if ", <, > and &s are quoted within attribute values.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01663] replace addUniqHist with addHist in loadHistory()


2001/1/22

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01617] Re: first body with -m (Re: w3m-m17n-0.7)
  * terminal resize related fix.
  * info page ('=' command) fix for multi-layered frame page.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01621] NEXT_LINK and GOTO_LINE problem

From: Yamate Keiichirou <yamate@ebina.hitachi.co.jp>
Subject: [w3m-dev 01623] Re: (frame) http://www.securityfocus.com/
Subject: [w3m-dev 01632] Re: (frame) http://www.securityfocus.com/
  frame fix.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01624] Re: first body with -m
From: Hironori Sakamoto <h-saka@udlew10.uldev.lsi.nec.co.jp>
Subject: [w3m-dev 01625] Re: first body with -m
  pgFore, pgBack behaviour fix.

From: Hironori Sakamoto <h-saka@udlew10.uldev.lsi.nec.co.jp>
Subject: [w3m-dev 01635] Directory list
  local.c directory list fix.

From: Hironori Sakamoto <h-saka@udlew10.uldev.lsi.nec.co.jp>
Subject: [w3m-dev 01643] buffername
Subject: [w3m-dev 01650] Re: buffername
  buffername (title) related improvements.
  * when displayLink is ON, truncate buffername on showing long URL.
  * displayBuffer() cleanup.
  * remove trailing spaces from content of <title>..</title>.
  * [w3m-dev 01503], [w3m-dev 01504]

From: Hironori Sakamoto <h-saka@udlew10.uldev.lsi.nec.co.jp>
Subject: [w3m-dev 01646] putAnchor
  * putAnchor related improvement.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01647] Re: first body with -m
  * cursor position moves unexpectedly when reloading a URL
    with #label.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01651] display column position with LINE_INFO

2001/1/5

From: Ryoji Kato <ryoji.kato@nrj.ericsson.se>
Subject: [w3m-dev 01582] rfc2732 patch
  literal IPv6 address treatment (bracketed by '[' and ']')
  according to RFC2732.

From: Yamate Keiichirou <yamate@ebina.hitachi.co.jp>
Subject: [w3m-dev 01594] first body with -m (Re: w3m-m17n-0.7)

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01602] Re: first body with -m (Re: w3m-m17n-0.7)

2001/1/1

From: Yamate Keiichirou <yamate@ebina.hitachi.co.jp>
Subject: [w3m-dev 01584] Re: attribute replacing in frames. (Re: some fixes)


2000/12/27

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * remove trailing blank lines in a buffer.

2000/12/26

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01560] Re: long URL
  Multiple 'u' and 'c' scrolls long URL.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01570] Re: long URL

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01506] compile option of gc.a

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01509] Forward: Bug#79689: No way to view information on SSL certificates
  Now '=' shows info about SSL certificate.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01556] Re: ANSI color support (was Re:  w3m-m17n-0.4)
  ANSI color support.

From: Yamate Keiichirou <yamate@ebina.hitachi.co.jp>
Subject: [w3m-dev 01535] how to check wait3 in configure.
From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01537] Re: how to check wait3 in configure.
  On BSD/OS 3.1, SunOS 4.1.3, configure can't detect wait3().

2000/12/25

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  <plaintext> doesn't work.


2000/12/22

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01555] Re: some fixes for <select>
  w3m crashes by <select> without <option>.

2000/12/21

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
   * table related improvements (<xmp> inside table, etc)

From: Yamate Keiichirou <yamate@ebina.hitachi.co.jp>
Subject: [w3m-dev 01536] Re: <P> in <DL>
Subject: [w3m-dev 01544] Re: <P> in <DL>
   * w3m crashes by an illegal HTML.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
   * treat unclosed <a>, <img_alt>, <b>, <u>

2000/12/20

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
   * bugfix on <dt> tag processing in feed_table_tag().
   * w3m eventually crashed when a tag is not closed in a table.
   * ignore <p> just after <dt>.

From: Yamate Keiichirou <yamate@ebina.hitachi.co.jp>
Subject: [w3m-dev 01530] returned at a morment.
   * skip newline within "-enclosed attribute value.

Subject: [w3m-dev 01531] coocie check in header from stdin.
   * w3m crashes by 'cat mail | w3m -m'


2000/12/17

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01513] Re: w3m-0.1.11-pre-kokb23
  frame.c bugfix
Subject: [w3m-dev 01515] some fixes for <select>
Subject: [w3m-dev 01516] Re: some fixes for <select>
  Several improvements on <select>..<option>

2000/12/14

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01501] Re: w3m-0.1.11-pre-kokb23
  Compile error for 'no menu' model


2000/12/13

From: sekita-n@hera.im.uec.ac.jp (Nobutaka SEKITANI)
Subject: [w3m-dev 01483] Patch to show image URL includes anchor
  Peek image URL by 'i'

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01500] fix risky code in url.c
  Vulnerble code in url.c fixed

2000/12/12

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01491] bug ?

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  Search for a string that contains null character.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01498] Re: null character
  Infinite loop


2000/12/11

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
   * StrmyISgets doesn't recognize a '\r' as a newline character.
   * Null character support on pager mode.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01487] A string in <textarea> is broken after editing
  <textarea> related fix.

Subject: [w3m-dev 01488] buffer overflow bugs
  * Buffer overflow fixes.

2000/12/9

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * maximum_table_width now considers width attribute in td and th tag.

2000/12/8

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01473] Re: internal tag and attribute check

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
   * hborder and border attribute handling.

From: sakane@d4.bsd.nes.nec.co.jp (Yoshinobu Sakane)
Subject: [w3m-dev 01478] Option Setting Panel
  * Improvement of the option setting panel view.

2000/12/7

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * parse_tag improvements.
  * don't parse tag within visible_length().

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01456] linein.c
  * linein.c is rewritten based on calcPosition().

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01457] cursor position on sumbit form
  * TAB key behaviour fix.

2000/12/3

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01449] Re: Directory of private header of gc library.
  * w3m crashes when accessing a list after popping the last element
    by popText (rpopText).

2000/12/2

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * image map related fix.

2000/12/1

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: Security hole in w3m (<input_alt type=file>)
  * Prohibit using internal tags in HTML.

Subject: [w3m-dev 01432] Re: w3m-0.1.11-pre-kokb22 patch
Subject: [w3m-dev 01437] Re: w3m-0.1.11-pre-kokb22 patch
  * Image map related fix.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * a compile option which enables the removal of trailing
    blank lines in a burrer. (ENABLE_REMOVE_TRAILINGSPACES)

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev-en 00301] Re: "w3m -h" outputs to stderr
  * Destination of w3m -h output is changed from stderr
    to stdout.

From: sakane@d4.bsd.nes.nec.co.jp (Yoshinobu Sakane)
Subject: [w3m-dev 01430] Re: w3m-0.1.11-pre-kokb22 patch
  * EWS4800(/usr/abiccs/bin/cc) support.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * id attribute check in dummy_table tag.
  * fid attribute check in form_int tag.
  * table stack overflow check.

2000/11/29

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01422] bpcmp in anchor.c
From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01423] Re: bpcmp in anchor.c
  * some improvements for speedup.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * CheckType() bugfix and speedup.

2000/11/28

From: Takenobu Sugiyama <sugiyama@ae.advantest.co.jp>
Subject: patch for cygwin
  * enables ftp download for cygwin w3m

2000/11/27

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01401] Re: bugfix of display of control chars, merge of easy UTF-8 patch, etc.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * table rendering speed-up.


2000/11/25

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * table column width sometimes get narrower than specified width value.

2000/11/24
From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * Progress bar display enhancement.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * command line option about proxy and cookie doesn't work.
  * 'Save to local file' overwrites the existing file.

2000/11/23

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * get_ctype is now macro.
  * menu.c type mismatch fix.


2000/11/22

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * fixes for speedup.

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01372] w3m sometimes uses the wrong mailcap entry
  http://bugs.debian.org/77679

2000/11/20

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * an empty table in another table makes the outer table funny.

2000/11/19

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  gc6 support.

2000/11/18

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * space characters in a buffer are mapped into 0x80-0x9f.
  * unprintable characters (0x80-0xa0) are displayed as \xxx.

From: Tsutomu Okada ($B2,ED(B $BJY(B) <okada@furuno.co.jp>
Subject: [w3m-dev 01354] minimize when #undef USE_GOPHER or USE_NNTP

2000/11/16

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  getescapechar() returns abnormal value for illegal entity.

2000/11/15

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * table-related fix.
  * DEL character is treated as `breakable space.'

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01338] Re: Lynx patch for character encoding in form
Subject: [w3m-dev 01342] Re: Lynx patch for character encoding in form
  * support for accept-charset attribute in form tag.

2000/11/14

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * cleanup_str and htmlquote_str now returns the oritinal string
    itself when there's no need to (un)quote it.

2000/11/10

From: Katsuyuki Watanabe <katsuyuki_1.watanabe@toppan.co.jp>
Subject: [w3m-dev 01336] patch for Cygwin 1.1.x
  Patch for Cygwin 1.1.x (1.1.3 and later)

2000/11/8

From: Jan Nieuwenhuizen <janneke@gnu.org>
Subject: [w3m-dev-en 00189] [PATCH] w3m menu <select> search
  Enable to search within popup menu.


2000/11/7

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01331] Re: form TEXT:
  * Search string history and form input string history are merged.

2000/11/4
From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * When a cell width exceeds the screen width, format contents in
    the cell to fit into the screen width.

2000/11/2

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01313] Re: SCM_NNTP
  nntp: for MARL_URL

2000/10/31

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01310] Re: option select (Re:  w3mmee-0.1.11p10)
  Output error messages from gc library using disp_message_nsec.

2000/10/30

From: sakane@d4.bsd.nes.nec.co.jp (Yoshinobu Sakane)
Subject: [w3m-dev 01294] mouse no effect on blank page.
From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01295] Re: mouse no effect on blank page.

From: SASAKI Takeshi <sasaki@ct.sakura.ne.jp>
Subject: [w3m-dev 01297] Re: backword search bug report

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01298] Re: backword search bug report
  bug fix of backword search
Subject: [w3m-dev 01299] Re: backword search bug report
  bug fix of the handling of multi-byte regexp.

2000/10/29

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * LESSOPEN can be set via the option setting panel. (default: off)
  * speed-up of gunzip_stream(), save2tmp(), visible_length().


2000/10/28

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * Emacs-like completion key support.
    (by #define EMACS_LIKE_LINEEDIT in config.h)

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01284] Re: improvement of filename input
  * in 'Goto URL' command, local file name will be completed
    after 'file:/'.

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01280] Stop to prepend rc_dir to full path.

2000/10/27

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01269] Re: SCM_NNTP
Subject: [w3m-dev 01273] Re: SCM_NNTP
  Prohibit gopher:, news: and nntp: scheme when USE_GOPHER and USE_NNTP
  macros are undefined.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01258] improvement of filename input
  * Completion lists are displayed by C-d.
  * in 'Goto URL' command, local file name will be completed
    after 'file:/', 'file:///' and 'file://localhost/'.
  * password part of URLs in the history list are removed.

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01277] Accept-Encoding: gzip (Re:  some wishlists)
  Accept-Encoding: gzip, compress
  is appended in the request header.
Subject: [w3m-dev 01275] Re: squeeze multiple blank lines option ( http://bugs.debian.org/75527 )
  when #ifdef DEBIAN,
  'squeeze multiple blank line' switch  (default -S) is set to -s
  character-code specifier (-s/-e/-j) are removed. use '-o kanjicode={S,E,J}'
  instead.
Subject: [w3m-dev 01274] Re: SCM_NNTP
  nntp: support.
Subject: [w3m-dev 01276] URL in w3m -v
  when LANG=EN (or #undef JP_CHARSET), the URL displayed at w3m -v
  (visual startup mode) is incorrect.

2000/10/26

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  location of mailcap and mime.type can be specified in the Option Setting
  Panel.

2000/10/25

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01247] Re: buffer selection menu
  Menu related patches.
  ([w3m-dev 01227], [w3m-dev 01228],[w3m-dev 01229], [w3m-dev 01237],
   [w3m-dev 01238])

2000/10/24

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * in the cookie-related setting, '.' is regarded as any domain.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01240] Re: w3m-0.1.11-pre-kokb17 patch
  'incompatible pointer type' fix.

2000/10/23

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * "Domains from which should accept/reject cookies" setting in
    the option setting panel.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01211] Re: a small change to linein.c
Subject: [w3m-dev 01214] Re: a small change to linein.c
  * When editing long string, a part of the string disappear.

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01216] error message for invalid keymap
From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01220] Re: error message for invalid keymap
  * w3m will display an error-message against the illegal
    keymap file specification.

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01217] keymap.lynx example could be better.
  keymap.lynx update.

2000/10/20
From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  cookie-related improvements.
  * version 1 cookie handling is now compliant to
       http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-12.txt
     Cookie2 is added in the Netscape-style cookie request header.

2000/10/19

From: "Ambrose Li [EDP]" <acli@mingpaoxpress.com>
Subject: [w3m-dev-en 00136] version 0 cookies and some odds and ends
Subject: [w3m-dev-en 00191] sorry, the last patch was not made properly
Subject: [w3m-dev-en 00190] w3m-0.1.10 patch (mostly version 0 cookie handling)
  I've hacked up a big mess (patch) against w3m-0.1.9 primarily
  involving version 0 cookies. To my dismay, it seems that most
  servers out there still want version 0 cookies and version 0
  cookie handling behaviour, and w3m's cookie handling is too
  strict for version 0, causing some sites (notably my.yahoo.co.jp)
  not to work.

2000/10/18

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * pixel-per-character is now changable.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01208] '#', '?' in ftp:/....
  * w3m fails to parse URL when ftp:/ URL contains '#'.

From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
Subject: [w3m-dev 01209] http_response_code and ``Location:'' header
  w3m now follows Location: header only when
  http_response_code is 301 - 303.


2000/10/17

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  local CGI makes zombie processes.


2000/10/16

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  w3m hangs when <textarea> is not closed in a table.

From: maeda@tokyo.pm.org
Subject: [w3m-dev 00990] auth password input

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01193] Re: frame bug?
  w3m eventually crashes when browsing frame pages.

2000/10/13

From: SASAKI Takeshi <sasaki@ct.sakura.ne.jp>
Subject: [w3m-dev 00928] misdetection of IPv6 support on CYGWIN 1.1.2

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01170] Re: cursor position after RELOAD, EDIT
  * Bugfix: remove cache files
  * The following functions can take arguments in keymap.
    LOAD ... a file name
    EXTERN, EXTERN_LINK ... a name of the external browser
      (Can't be used from w3m-control: )
    EXEC_SHELL, READ_SHELL, PIPE_SHELL ... shell command
      (Can't be used from w3m-control: )
    SAVE, SAVE_IMAGE, SAVE_LINK, SAVE_SCREEN ... a filename (or command name)
      (Can't be used from w3m-control: )


2000/10/11

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * the buffer name of an input taken from the stdin is now determined
    from MAN_PN.

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01156] Re: w3m-0.1.11-pre-kokb15
  * mydirname bugfix.
  * SERVER_NAME can be configured.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01158] some bugs fix when RELOAD, EDIT
Subject: [w3m-dev 01164] cursor position after RELOAD, EDIT
  * a file: called as local CGI can be edited.

2000/10/10

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01166] Re: cell width in table
  table-related bugfix.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01155] history of data for <input type=text>
  <input type=text> input will be put into history buffer.

2000/10/9

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01150] Some bug fixes
  Bugfixes of the problems reported in
    [w3m-dev 00956] unknown scheme in frame
    [w3m-dev 00975] goto link from frame page

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01145] buffer overflow in linein.c
  Fix of the buffer overrun problem in  inputLineHist(linein.c)

2000/10/8

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01136] function argument in keymap
Subject: [w3m-dev 01139] Re: function argument in keymap
  Some functions specified in ~/.w3m/keymap can take an argument.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 01143] image map with popup menu
  image map can be treated as popup menu
  (#define MENU_MAP in config.h)

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 00971] Re: segmentation fault with http:
  Specifying 'http:' or  'http:/' as URLs will crash w3m.

2000/10/07

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01134] w3m in xterm horribly confused by Japanese in title (fr
  w3m-en will crash when browsing a page with Japanese title.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01127] SIGINT signal in ftp session (Re:  my w3m support page)
  SIGINT will crash w3m when downloading via ftp.

2000/10/06

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * the maximum value of wmin in recalc_width() is changed to 0.05.
  * when deflating compressed data other than http file and local file,
    the file will be stored as a temporary file.
  * mailcap edit= attribute support.

2000/10/05

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * Improvements of -dump, -source_dump options.
  * Ignore <meta> tags in a frame.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 00930] HTML-quote in w3mbookmark.c
  * In 'Bookmark registration', URL and Title are not HTML-quoted.

From: hsaka@mth.biglobe.ne.jp (Hironori Sakamoto)
Subject: [w3m-dev 00972] better display of progress bar ?
  * An improvement of progress bar.

2000/10/05

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
  * Null pointer chech for textlist.

From: Fumitoshi UKAI <ukai@debian.or.jp>
Subject: [w3m-dev 01100] space in URL

  * http://bugs.debian.org/60825 and http://bugs.debian.org/67466
	when submitting a form, name is not quoted (which should be)

  * http://bugs.debian.org/66887
	Remove preceding and trailing spaces from URL input through
	'U' command.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01113] bug fix (content charset)
  content charset bugfix


2000/10/02

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01112] Re: mailcap test= directive
  improvements of mailcap handling
  * In addition to %s, %t (content-type name) will be available.
  * nametemplate option is now valid.
  * If there is no %s in the entry, 'command < %s' is assumed.
  * If needsterminal is specified, spawn the command foreground.
  * If copiousoutput is specified, load the command output into
    buffer.
  * `htmloutput' option is added, which indicates that the output
    of the command is to be read by w3m as text/html. For example,

     application/excel; xlHtml %s | lv -Iu8 -Oej; htmloutput

    enables an Excel book to be displayed as an HTML document.
  * compressed file browsing support for ftp scheme.
  * Bug: compressed file isn't displayed properly for http: scheme.

2000/09/28

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01097] gunzip_stream problem
  * Fix of the behaviour against INT signal while reading compressed
    file.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01092] CONFIG_FILE
  * CONFIG_FILE in config.h was hard-coded.

2000/09/17

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01078] treatment of content type
  Improvements around document type handling.
  * precedence between lessopen_stream() and gunzip_stream() was changed
    in examineFile().
  * lessopen_stream()ed file is treated as a plein text.
  * lessopen_stream() is applied only if document type is text/* or
    no external viewer is set.
  * all text/* data other than text/html are handled inside w3m.
  * The document type displayed by page_info_panel() is now the one
    before examineFile() processing.
  * When invoking an external viewer, ">/dev/null 2>&1 &" is appended
    to the command line.

2000/09/13

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01053] Re: Location: in local cgi.
  * Do not interpret Location: header of the local file when invoking
    with -m flag,

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01065] map key '0'
  Improvement around keymap.
  * Now a single '0' can be mapped. Numbers other than 0, for example
    `10 j' are regarded as prefix arguments.

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 01066] 104japan
  * Code conversion fix for forms in frame.

2000/09/07

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01058] <dt>, <dd>, <blockquote> (Re:  <ol> etc.)
  * insert blank lines before and after <blockquote>.
  * Don't ignore <p> tag just after <dt> and <dd>.

2000/09/04

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01052] cellpadding, cellspacing, vspace, etc.
  Some changes about space character and blank lines:
  * <a name="..."></a> or <font> outside <tr> or <td> are pushed
    into the next cell.
  * cellspacing attribute in <table> tag is now handled correctly.
  * vspace attribute interpretation.
  * blank line detection criterion is changed.
  * </p> tag inserts a blank line.

2000/08/17

From: Tsutomu Okada <okada@furuno.co.jp>
Subject: [w3m-dev 01018] sqrt DOMAIN error in table.c
From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01019] Re: sqrt DOMAIN error in table.c
  * fix of DOMAIN error of sqrt().

2000/08/15

From: satodai@dog.intcul.tohoku.ac.jp (Dai Sato)
Subject: [w3m-dev 01017] value of input tag in option panel
  * Fix of the problem of the option setting panel: when specifying
    a value including a double quote, the value after " is not displayed
    on the next invocation of the option setting panel.

2000/08/06

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01016] Table geometry calculation
  * rounding algorithm of table geometry calculation is changed to
    minimize the difference of the column width and the `true' width.

2000/07/26

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01006] initialize PRNG of openssl 0.9.5 or later
  * when using openssl library after 0.9.5, enables SSL on the environment
    without the random device (/dev/urandom).

2000/07/21

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01004] unused socket is not closed.
  When interrupting file transfer using C-c, the socket sometimes
  stay unclosed.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01005] table caption problem
  Fix of the problem that w3m doesn't stop when there's no closing
  </caption>.

2000/07/19

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 00966] ssl and proxy authorization
  Fix of the authorization procedure of SSL tunneling via HTP proxy.

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 01003] Some bug fixes for table

2000/07/16

From: SASAKI Takeshi <sasaki@ct.sakura.ne.jp>
Subject: [w3m-dev 00999] Re: bookmark
  * Sometimes a link can't be appended into the bookmark.

2000/06/18

From: Okabe Katsuya <okabek@guitar.ocn.ne.jp>
Subject: [w3m-dev 00934] clear_buffer bug
  Bugfix: when clear_buffer is TRUE, selBuf() clears the screen.

2000/06/17

From: SASAKI Takeshi <sasaki@ct.sakura.ne.jp>
Subject: [w3m-dev 00929] ftp.c patch
  Return code 230 against USER command is regarded as a successful
  login.

2000/06/16

From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 00923] some bug fixes
  * when #undef JP_CHARSET, file.c doesn't compile.
  * buffer.c bugfix ("=" should be "==")

From: Kazuhiko Izawa <izawa@nucef.tokai.jaeri.go.jp>
Subject: [w3m-dev 00924] Re: w3m-0.1.11pre
From: Hironori Sakamoto <h-saka@lsi.nec.co.jp>
Subject: [w3m-dev 00925] Re: w3m-0.1.11pre
  Accessing URL like file://localhost/foo causes abnormal termination.

2000.6.6
From: aito
* [w3m-dev 00826]
  * Bugfix: When a header by CGI POST method gives Location: header,
    the redirect can't be reloaded.
  * white spaces in URL are removed.
---
 www/w3m/Makefile         |  12 ++---
 www/w3m/files/md5        |   4 +-
 www/w3m/files/patch-sum  |  12 ++---
 www/w3m/patches/patch-aa |  46 ++++++++++++++---
 www/w3m/patches/patch-ab |  14 +++--
 www/w3m/patches/patch-ac |  50 +++++++++++++-----
 www/w3m/patches/patch-ad |  41 ++++++++++++---
 www/w3m/patches/patch-ae | 132 -----------------------------------------------
 www/w3m/patches/patch-af |  14 -----
 www/w3m/pkg/PLIST        |   6 ++-
 10 files changed, 130 insertions(+), 201 deletions(-)
 delete mode 100644 www/w3m/patches/patch-ae
 delete mode 100644 www/w3m/patches/patch-af

(limited to 'www')

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index ed8526cd58c..1f260abad73 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/02/23 06:46:30 jun Exp $
+# $NetBSD: Makefile,v 1.23 2001/03/31 09:21:16 itojun Exp $
 
-DISTNAME=	w3m-0.1.11-pre
-PKGNAME=	w3m-0.1.10.pre11
+DISTNAME=	w3m-0.2.1
 CATEGORIES=	www
-MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/
+MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/
@@ -85,7 +84,7 @@ HELP_W3M=	-w3m
 CONFIGURE_ENV+=	def_bindir=${LOCALBASE}/bin
 CONFIGURE_ENV+=	def_libdir=${LOCALBASE}/${HELPERDIR}
 CONFIGURE_ENV+=	def_helpdir=${LOCALBASE}/${HELPDIR}
-CONFIGURE_ENV+=	use_menu=n use_matrix=n
+CONFIGURE_ENV+=	use_menu=y use_matrix=n
 CONFIGURE_ENV+=	ded=vi dmail=Mail dbrowser=
 CONFIGURE_ENV+=	dcc="${CC}" dtermlib="-ltermcap"
 CONFIGURE_ENV+=	dldflags="-Wl,-rpath,${LOCALBASE}/lib -L${LOCALBASE}/lib"
@@ -97,9 +96,6 @@ post-extract:
 	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
 
 # do not look at previous configuration
-pre-configure:
-	${RM} ${WRKSRC}/config.param
-
 do-configure:
 	@yes '' | (cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \
 	    INSTALL="${INSTALL_SCRIPT}"                             \
diff --git a/www/w3m/files/md5 b/www/w3m/files/md5
index fb0662514c1..08283795f38 100644
--- a/www/w3m/files/md5
+++ b/www/w3m/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2000/10/14 01:22:41 itojun Exp $
+$NetBSD: md5,v 1.7 2001/03/31 09:21:17 itojun Exp $
 
-MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5
+SHA1 (w3m-0.2.1.tar.gz) = 3ae98283f02f4faf05af76ee0b022f01c1301d29
diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum
index ff71fde47eb..06298b89185 100644
--- a/www/w3m/files/patch-sum
+++ b/www/w3m/files/patch-sum
@@ -1,8 +1,6 @@
-$NetBSD: patch-sum,v 1.15 2001/02/11 22:30:09 hubertf Exp $
+$NetBSD: patch-sum,v 1.16 2001/03/31 09:21:17 itojun Exp $
 
-MD5 (patch-aa) = 233ec21f2f46d880ae75b782d228c4ad
-MD5 (patch-ab) = d88798980e1985d3e3f71669d57d9a4a
-MD5 (patch-ac) = af2e832fd50f33f296c768a71f05188b
-MD5 (patch-ad) = 462ff6a5eb0b20a03c32fa17009e9e47
-MD5 (patch-ae) = 4a7157011c6876b5fb70809fe3efbd83
-MD5 (patch-af) = e315371d2b284ff0adb99a70b0567548
+SHA1 (patch-aa) = 3b3e7a37d2b76bb312263ee6b0a3fe65fd408d63
+SHA1 (patch-ab) = 08a28e40907f8c3040b1e9253caf14b8b4f0dc7e
+SHA1 (patch-ac) = 0df544ffc127a1fd6495a29fef8e9e8ff99d20c3
+SHA1 (patch-ad) = e3fbd004492adb34816c734b87def63415d96236
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa
index b1d566646a5..9a7b41716e3 100644
--- a/www/w3m/patches/patch-aa
+++ b/www/w3m/patches/patch-aa
@@ -1,12 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2000/08/15 03:57:48 itojun Exp $
---- configure.orig	Mon Jun  5 18:41:35 2000
-+++ configure	Tue Aug 15 12:43:25 2000
-@@ -190,3 +190,3 @@
+$NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $
+
+--- configure.orig	Fri Mar 23 11:18:40 2001
++++ configure	Fri Mar 30 21:11:58 2001
+@@ -188,7 +188,7 @@
+ 
+ find_ssl() {
    sslinclude=""
 -  for i1 in /usr /usr/local
 +  for i1 in /usr /usr/local /usr/pkg
    do
-@@ -312,9 +312,9 @@
+     for i2 in /openssl /ssl / 
+     do
+@@ -312,13 +312,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.)"
 -if [ "$pref_lang" = 2 ]; then
 -  Echo '[2]? '
@@ -23,17 +30,40 @@ $NetBSD: patch-aa,v 1.7 2000/08/15 03:57:48 itojun Exp $
 +#  def_lg=1
 +#fi
  while :
-@@ -786,3 +786,3 @@
+ do
+   readanswer lg_ans "$def_lg"
+@@ -469,7 +469,7 @@
+ case "$ans" in
+   1)
+     use_color=n; def_color="#undef COLOR"
+-    use_menu=n;  def_menu="#undef MENU"
++    use_menu=y;  def_menu="#undef MENU"
+     use_mouse=n; def_mouse="#undef MOUSE"
+     use_cookie=n; def_cookie="#undef USE_COOKIE"
+     use_ssl=n; def_ssl="#undef USE_SSL"
+@@ -796,7 +796,7 @@
+ gclib=''
+ gcinclude=''
  gctarget=''
 -for libdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib
 +for libdir in /lib /usr/lib ${LOCALBASE}/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib ${HOME}/lib
  do
-@@ -794,3 +794,3 @@
+   if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then 
+     echo "$libdir/libgc found"
+@@ -804,7 +804,7 @@
+     break
+   fi
  done
 -for inc in /usr/include /usr/include/gc /usr/local/include /usr/local/include/gc ${HOME}/include
 +for inc in /usr/include /usr/include/gc ${LOCALBASE}/include /usr/local/include /usr/local/include/gc ${HOME}/include
  do
-@@ -1555,2 +1555,3 @@
+   if [ -f $inc/gc.h ]; then
+     echo "$inc/gc.h found"
+@@ -1699,6 +1699,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 0dbbe03d076..b1f5a713454 100644
--- a/www/w3m/patches/patch-ab
+++ b/www/w3m/patches/patch-ab
@@ -1,14 +1,12 @@
-$NetBSD: patch-ab,v 1.6 2000/06/21 08:22:12 itohy Exp $
+$NetBSD: patch-ab,v 1.7 2001/03/31 09:21:17 itojun Exp $
 
-Suspend the job w3m belongs to, not w3m only.
-
---- main.c.orig	Tue Jun  6 14:56:48 2000
-+++ main.c	Tue Jun 20 21:21:19 2000
-@@ -1529,7 +1529,17 @@
+--- main.c.orig	Fri Mar 23 11:14:58 2001
++++ main.c	Fri Mar 30 21:02:12 2001
+@@ -1645,7 +1645,17 @@
  	shell = "/bin/sh";
      system(shell);
  #else				/* SIGSTOP */
-+#ifdef SIGTSTP	/* BSD */
++#ifdef SIGTSTP
 +    signal(SIGTSTP, SIG_DFL);	/* just in case */
 +    /*
 +     * Note: If susp() was called from SIGTSTP handler,
@@ -17,7 +15,7 @@ Suspend the job w3m belongs to, not w3m only.
 +     */
 +    kill(0, SIGTSTP);	/* stop whole job, not a single process */
 +#else
-     kill(getpid(), SIGSTOP);
+     kill((pid_t)0, SIGSTOP);
 +#endif
  #endif				/* SIGSTOP */
      fmInit();
diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac
index 2e41ef0414b..7e5741f1311 100644
--- a/www/w3m/patches/patch-ac
+++ b/www/w3m/patches/patch-ac
@@ -1,14 +1,38 @@
-$NetBSD: patch-ac,v 1.7 2000/10/14 01:22:42 itojun Exp $
+$NetBSD: patch-ac,v 1.8 2001/03/31 09:21:17 itojun Exp $
 
---- display.c.orig	Wed Jun 14 19:26:34 2000
-+++ display.c	Wed Oct 11 15:35:33 2000
-@@ -232,3 +232,3 @@
-     else
--#if LANG == JA
-+#if KANJI_SYMBOL
- 	msg = Sprintf("¢ã¢¬¢­Viewing <%s> ", cleanup_str(buf->buffername));
-@@ -251,3 +251,3 @@
- 		Strcat(msg, Strsubstr(s, 0, (l - 2) / 2));
--#if LANG == JA
-+#if KANJI_SYMBOL
- 		Strcat_charp(msg, "¡Ä");
+*** display.c.orig	Fri Mar 23 10:49:53 2001
+--- display.c	Fri Mar 30 21:02:31 2001
+***************
+*** 251,257 ****
+  
+  #ifdef MOUSE
+      if (use_mouse)
+! #if LANG == JA
+  	msg = Strnew_charp("¢ã¢¬¢­");
+  #else				/* LANG != JA */
+  	msg = Strnew_charp("<=UpDn ");
+--- 251,257 ----
+  
+  #ifdef MOUSE
+      if (use_mouse)
+! #if KANJI_SYMBOL
+  	msg = Strnew_charp("¢ã¢¬¢­");
+  #else				/* LANG != JA */
+  	msg = Strnew_charp("<=UpDn ");
+***************
+*** 273,279 ****
+  	if (s->length > l) {
+  	    if (l >= 4) {
+  		msg = Strsubstr(s, 0, (l - 2) / 2);
+! #if LANG == JA
+  		Strcat_charp(msg, "¡Ä");
+  #else				/* LANG != JA */
+  		Strcat_charp(msg, "..");
+--- 273,279 ----
+  	if (s->length > l) {
+  	    if (l >= 4) {
+  		msg = Strsubstr(s, 0, (l - 2) / 2);
+! #if KANJI_SYMBOL
+  		Strcat_charp(msg, "¡Ä");
+  #else				/* LANG != JA */
+  		Strcat_charp(msg, "..");
diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad
index 8c03397b1a2..d800d64b8d1 100644
--- a/www/w3m/patches/patch-ad
+++ b/www/w3m/patches/patch-ad
@@ -1,24 +1,49 @@
-$NetBSD: patch-ad,v 1.5 2000/10/14 01:22:42 itojun Exp $
+$NetBSD: patch-ad,v 1.6 2001/03/31 09:21:17 itojun Exp $
 
---- rc.c.orig	Wed Jun 14 19:18:51 2000
-+++ rc.c	Wed Oct 11 15:36:29 2000
-@@ -52,3 +52,3 @@
+--- rc.c.orig	Fri Mar 23 10:51:04 2001
++++ rc.c	Fri Mar 30 21:07:29 2001
+@@ -51,7 +51,7 @@
+ #endif
+ #define P_PIXELS   8
  
 -#if LANG == JA
 +#if KANJI_SYMBOL
  #define CMT_HELPER	 "³°Éô¥Ó¥å¡¼¥¢¤ÎÊÔ½¸"
-@@ -129,3 +129,3 @@
+ #define CMT_TABSTOP      "¥¿¥ÖÉý"
+ #define CMT_PIXEL_PER_CHAR      "ʸ»úÉý (4.0...32.0)"
+@@ -146,7 +146,7 @@
+ #define CMT_PAGERLINE    "# of reserved line when w3m is used as a pager"
+ #define CMT_HISTSIZE     "# of reserved URL"
  #define CMT_SAVEHIST     "Save URL history"
 -/* #define CMT_KANJICODE    "Display Kanji Code" */
 +#define CMT_KANJICODE    "Display Kanji Code"
  #define CMT_FRAME        "Automatic rendering of frame"
-@@ -218,3 +218,3 @@
+ #define CMT_TSELF        "use _self as default target"
+ #define CMT_DISPLINK     "Automatic display of link URL"
+@@ -184,7 +184,7 @@
+ #define CMT_FTPPASS      "Password for FTP(use your mail address)"
+ #define CMT_USERAGENT    "User-Agent"
+ #define CMT_ACCEPTLANG   "Accept-Language"
+-/* #define CMT_DOCUMENTCODE "Document Charset" */
++#define CMT_DOCUMENTCODE "Document Charset"
+ #define CMT_WRAP         "Wrap search"
+ #define CMT_VIEW_UNSEENOBJECTS "Display unseenobjects (e.g. bgimage) tag"
+ #ifdef __EMX__
+@@ -260,7 +260,7 @@
+ #ifdef COLOR
+ static struct sel_c colorstr[] =
  {
--#if LANG== JA
+-#if LANG == JA
 +#if KANJI_SYMBOL
      {0, "black", "¹õ"},
-@@ -367,3 +367,3 @@
+     {1, "red", "ÀÖ"},
+     {2, "green", "ÎÐ"},
+@@ -442,7 +442,7 @@
+ 
+ struct param_section sections[] =
  {
 -#if LANG == JA
 +#if KANJI_SYMBOL
      {"ɽ¼¨´Ø·¸", params1},
+ #ifdef COLOR
+     {"ɽ¼¨¿§", params2},
diff --git a/www/w3m/patches/patch-ae b/www/w3m/patches/patch-ae
deleted file mode 100644
index 343fdb98693..00000000000
--- a/www/w3m/patches/patch-ae
+++ /dev/null
@@ -1,132 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/08/16 00:31:34 itojun Exp $
-Index: ftp.c
-===================================================================
-RCS file: /cvsroot/apps/w3m/ftp.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -1 -r1.1 -r1.2
---- ftp.c	2000/08/15 23:53:35	1.1
-+++ ftp.c	2000/08/16 00:28:03	1.2
-@@ -15,4 +15,5 @@
- 
--#ifdef FTPPASS_HOSTNAMEGEN
- #include <sys/socket.h>
-+
-+#ifdef FTPPASS_HOSTNAMEGEN
- #include <netinet/in.h>
-@@ -22,3 +23,8 @@
- 
-+#ifdef INET6
-+#include <netdb.h>
-+#endif
-+
- typedef struct _FTP {
-+    int family;
-     FILE *rcontrol;
-@@ -105,2 +111,8 @@
-     Str tmp;
-+#ifdef INET6
-+    struct sockaddr_storage ss;
-+#else
-+    struct sockaddr ss;
-+#endif
-+    int sslen;
-     FTP ftp = New(struct _FTP);
-@@ -116,3 +128,7 @@
- 	if (n > 0 && pass[n - 1] == '@') {
-+#ifdef INET6
-+	    struct sockaddr_storage sockname;
-+#else
- 	    struct sockaddr_in sockname;
-+#endif
- 	    int socknamelen = sizeof(sockname);
-@@ -120,5 +136,19 @@
- 	    if (!getsockname(fd, (struct sockaddr *) &sockname, &socknamelen)) {
-+#ifdef INET6
-+		char hbuf[NI_MAXHOST];
-+#else
- 		struct hostent *sockent;
-+#endif
- 		Str tmp2 = Strnew_charp(pass);
- 
-+#ifdef INET6
-+		if (getnameinfo((struct sockaddr *)&sockname, socknamelen,
-+		    hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD) == 0) {
-+		    Strcat_charp(tmp2, hbuf);
-+		} else if (getnameinfo((struct sockaddr *)&sockname, socknamelen,
-+			 hbuf, sizeof(hbuf), NULL, 0, 0) == 0) {
-+		    Strcat_m_charp(tmp2, "[", hbuf, "]", NULL);
-+		} else
-+		    Strcat_charp(tmp2, "invalid");
-+#else
- 		if (sockent = gethostbyaddr((char *) &sockname.sin_addr,
-@@ -129,2 +159,3 @@
- 		    Strcat_m_charp(tmp2, "[", inet_ntoa(sockname.sin_addr), "]", NULL);
-+#endif
- 
-@@ -135,2 +166,8 @@
- #endif
-+    sslen = sizeof(ss);
-+    if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0) {
-+	close(fd);
-+	return -1;
-+    }
-+    ftp->family = ((struct sockaddr *)&ss)->sa_family;
-     ftp->rcontrol = fdopen(fd, "rb");
-@@ -176,3 +213,46 @@
- 
-+#ifdef INET6
- int
-+ftp_epsv(FTP ftp)
-+{
-+    int port;
-+    int data_s;
-+    char *p;
-+    Str tmp;
-+    char hbuf[NI_MAXHOST];
-+    struct sockaddr_storage ss;
-+    int sslen;
-+
-+    sslen = sizeof(ss);
-+    if (getpeername(fileno(ftp->wcontrol), (struct sockaddr *)&ss, &sslen) < 0)
-+	return -1;
-+    if (getnameinfo((struct sockaddr *)&ss, ((struct sockaddr *)&ss)->sa_len,
-+	hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) {
-+	return -1;
-+    }
-+
-+    fwrite("EPSV\r\n", 6, sizeof(char), ftp->wcontrol);
-+    fflush(ftp->wcontrol);
-+    tmp = read_response(ftp);
-+    if (atoi(tmp->ptr) != 229)
-+	return -1;
-+    for (p = tmp->ptr + 4; *p && *p != '('; p++);	/*)*/
-+    if (*p == '\0')
-+	return -1;
-+    p++;
-+    /* find "|||port|" */
-+    if (p[0] && p[0] == p[1] && p[0] == p[2])
-+	p += 3;
-+    else
-+	return -1;
-+    sscanf(p, "%d", &port);
-+    data_s = openSocket(hbuf, "", port);
-+    if (data_s < 0)
-+	return -1;
-+    ftp->data = fdopen(data_s, "rb");
-+    return 0;
-+}
-+#endif
-+
-+int
- ftp_pasv(FTP ftp)
-@@ -183,2 +263,9 @@
-     Str tmp;
-+
-+#ifdef INET6
-+    if (ftp->family == AF_INET6 || ftp->family == AF_INET) {
-+	if (ftp_epsv(ftp) == 0)
-+	    return 0;
-+    }
-+#endif
- 
diff --git a/www/w3m/patches/patch-af b/www/w3m/patches/patch-af
deleted file mode 100644
index 462fe928a39..00000000000
--- a/www/w3m/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/02/11 22:30:09 hubertf Exp $
-
---- file.c.orig	Wed Jun 14 12:35:40 2000
-+++ file.c
-@@ -5239,7 +5239,9 @@
- 	    Strcat(tmp, lineBuf2);
- 	    lineBuf2 = tmp;
- 	}
-+#ifdef CHARSET_JP
- 	lineBuf2 = convertLine(&uf, lineBuf2, &code);
-+#endif
- 	lineBuf2 = checkType(lineBuf2->ptr, propBuffer, LINELEN);
- 	len = lineBuf2->length;
- 	l = New(Line);
diff --git a/www/w3m/pkg/PLIST b/www/w3m/pkg/PLIST
index af219c8e7f8..1dbf3da3ffc 100644
--- a/www/w3m/pkg/PLIST
+++ b/www/w3m/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/19 07:34:35 itohy Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/03/31 09:21:18 itojun Exp $
 bin/w3m
 man/man1/w3m.1
 man/ja_JP.EUC/man1/w3m.1
@@ -16,6 +16,7 @@ share/doc/w3m/doc/README.cygwin
 share/doc/w3m/doc/README.dict
 share/doc/w3m/doc/README.func
 share/doc/w3m/doc/STORY.html
+share/doc/w3m/doc/history
 share/doc/w3m/doc/keymap.default
 share/doc/w3m/doc/keymap.lynx
 share/doc/w3m/doc/menu.default
@@ -27,12 +28,15 @@ share/doc/w3m/doc-jp/HISTORY
 share/doc/w3m/doc-jp/HISTORY.kokb
 share/doc/w3m/doc-jp/MANUAL.html
 share/doc/w3m/doc-jp/README
+share/doc/w3m/doc-jp/README.SSL
+share/doc/w3m/doc-jp/README.cookie
 share/doc/w3m/doc-jp/README.cygwin
 share/doc/w3m/doc-jp/README.dict
 share/doc/w3m/doc-jp/README.func
 share/doc/w3m/doc-jp/README.hp
 share/doc/w3m/doc-jp/README.keymap
 share/doc/w3m/doc-jp/README.kokb
+share/doc/w3m/doc-jp/README.mailcap
 share/doc/w3m/doc-jp/README.menu
 share/doc/w3m/doc-jp/STORY.html
 share/doc/w3m/doc-jp/keymap.default
-- 
cgit v1.2.3