upgrade to 0.1.11pre. mostly bugfixes. the most important

one is: segv on ftp transfer (with no proxy) is fixed.

5 files changed, 21 insertions, 29 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 97b7f211ab1..d9b3e5fd967 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2000/08/15 10:49:44 itojun Exp $
+# $NetBSD: Makefile,v 1.19 2000/10/14 01:22:41 itojun Exp $
 
-DISTNAME=	w3m-0.1.10
+DISTNAME=	w3m-0.1.11-pre
+PKGNAME=	w3m-0.1.10.pre11
 CATEGORIES=	www
-MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/
+MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/dev/
 
 MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/
diff --git a/www/w3m/files/md5 b/www/w3m/files/md5
index eb2e25472dd..fb0662514c1 100644
--- a/www/w3m/files/md5
+++ b/www/w3m/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/06/21 08:22:10 itohy Exp $
+$NetBSD: md5,v 1.6 2000/10/14 01:22:41 itojun Exp $
 
-MD5 (w3m-0.1.10.tar.gz) = 2e0ed5e8db8ac8d7eb1e6996b74ace1d
+MD5 (w3m-0.1.11-pre.tar.gz) = d9fb24700ecde78624280467dda1aee5
diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum
index d21ce0a6939..05faf052aea 100644
--- a/www/w3m/files/patch-sum
+++ b/www/w3m/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.13 2000/08/16 00:31:32 itojun Exp $
+$NetBSD: patch-sum,v 1.14 2000/10/14 01:22:41 itojun Exp $
 
 MD5 (patch-aa) = 233ec21f2f46d880ae75b782d228c4ad
 MD5 (patch-ab) = d88798980e1985d3e3f71669d57d9a4a
-MD5 (patch-ac) = ff0f95231d7f2d894b629f07465fb715
-MD5 (patch-ad) = 3d07f5d56a7655cc636b1c9823181e5a
+MD5 (patch-ac) = af2e832fd50f33f296c768a71f05188b
+MD5 (patch-ad) = 462ff6a5eb0b20a03c32fa17009e9e47
 MD5 (patch-ae) = 4a7157011c6876b5fb70809fe3efbd83
diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac
index 20787fea2ee..2e41ef0414b 100644
--- a/www/w3m/patches/patch-ac
+++ b/www/w3m/patches/patch-ac
@@ -1,22 +1,14 @@
-$NetBSD: patch-ac,v 1.6 2000/08/15 05:01:22 itojun Exp $
-repair iso-8859 build.
+$NetBSD: patch-ac,v 1.7 2000/10/14 01:22:42 itojun Exp $
 
---- display.c.orig	Tue Jun  6 14:39:13 2000
-+++ display.c	Tue Aug 15 13:58:05 2000
-@@ -242,3 +242,3 @@
+--- 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));
-@@ -261,3 +261,3 @@
+@@ -251,3 +251,3 @@
  		Strcat(msg, Strsubstr(s, 0, (l - 2) / 2));
 -#if LANG == JA
 +#if KANJI_SYMBOL
  		Strcat_charp(msg, "…");
-@@ -719,4 +719,6 @@
-         buf->pos = l->len -1;
-+#ifdef JP_CHARSET
-         if (CharType(p[buf->pos]) == PC_KANJI2)
-             buf->pos--;
-+#endif
-     }
diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad
index 79c6c939372..8c03397b1a2 100644
--- a/www/w3m/patches/patch-ad
+++ b/www/w3m/patches/patch-ad
@@ -1,24 +1,23 @@
-$NetBSD: patch-ad,v 1.4 2000/08/15 03:42:22 itojun Exp $
-use KANJI_SYMBOL to determine the language for configuration screen.
+$NetBSD: patch-ad,v 1.5 2000/10/14 01:22:42 itojun Exp $
 
---- rc.c.orig	Mon Jun  5 20:17:04 2000
-+++ rc.c	Tue Aug 15 12:36:56 2000
-@@ -58,3 +58,3 @@
+--- rc.c.orig	Wed Jun 14 19:18:51 2000
++++ rc.c	Wed Oct 11 15:36:29 2000
+@@ -52,3 +52,3 @@
  
 -#if LANG == JA
 +#if KANJI_SYMBOL
  #define CMT_HELPER	 "外部ビューアの編集"
-@@ -130,3 +130,3 @@
+@@ -129,3 +129,3 @@
  #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"
-@@ -214,3 +214,3 @@
+@@ -218,3 +218,3 @@
  {
 -#if LANG== JA
 +#if KANJI_SYMBOL
      {0, "black", "黒"},
-@@ -364,3 +364,3 @@
+@@ -367,3 +367,3 @@
  {
 -#if LANG == JA
 +#if KANJI_SYMBOL