As per request of itojun and hubertf, rename w3m-m17n as w3m. It reduces our

maintenance cost.  Approved by agc.

10 files changed, 131 insertions, 196 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 1f260abad73..0c5946db83d 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,19 +1,25 @@
-# $NetBSD: Makefile,v 1.23 2001/03/31 09:21:16 itojun Exp $
+# $NetBSD: Makefile,v 1.24 2001/05/01 00:31:24 kei Exp $
+#
 
 DISTNAME=	w3m-0.2.1
+PKGNAME=	w3m-0.2.1.0.19
 CATEGORIES=	www
 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/
-COMMENT=	Terminal-based WWW browser with HTML tables and frames support
+PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+PATCHFILES=	w3m-0.2.1-m17n-0.19.patch.gz
+PATCH_DIST_STRIP= -p1
 
-DEPENDS=	boehm-gc-5.*:../../devel/boehm-gc
+MAINTAINER=	kei@netbsd.org
+HOMEPAGE=	http://www2u.biglobe.ne.jp/~hsaka/w3m/
+COMMENT=	multilingualized version of a pager/text-based browser w3m
 
-HELPDIR=	share/doc/w3m
-HELPERDIR=	lib/w3m
+DEPENDS=	boehm-gc>=5.3:../../devel/boehm-gc
 
-HAS_CONFIGURE=	yes
+CONFLICTS+=	w3m-m17n-*
+
+HELPDIR=        share/doc/w3m
+HELPERDIR=      lib/w3m
 
 # configure will check IPv6 readiness automatically
 BUILD_DEFS+=	USE_INET6
@@ -25,76 +31,83 @@ EXTRACT_ELEMENTS=	-c ${DISTNAME}/gc/\*
 EXTRACT_ELEMENTS=	--exclude ${DISTNAME}/gc/\*
 .endif
 
-# Set this to NO for ISO-8859-1 support (exclusive to Japanese).
-W3M_USE_JAPANESE?=	YES
-# Set this to YES if you want to use Japanese symbol/messages.
-W3M_USE_JAPANESE_SYMBOL?=NO
+# Always enable multiligualization.
+W3M_USE_M17N=			YES
+# Set this to YES if you want unicode support.
+W3M_USE_UNICODE?=		YES
+# set this to YES to use Japanese messages.
+W3M_USE_JAPANESE_MESSAGES?=	NO
 # Set this to YES to use lynx like key binding.
-W3M_USE_LYNX_KEY?=	NO
+W3M_USE_LYNX_KEY?=		NO
 # set this to YES if you want HTTPS support.
-W3M_USE_SSL?=		YES
+W3M_USE_SSL?=			YES
 # set this to YES if you want HTTP cookie support.
-W3M_USE_COOKIE?=	YES
+W3M_USE_COOKIE?=        	YES
 # set this to YES if you want mouse support.
-W3M_USE_MOUSE?=		NO
+W3M_USE_MOUSE?=			YES
 # set this to YES if you want color support.
-W3M_USE_COLOR?=		NO
+W3M_USE_COLOR?=			YES
 
-.if defined(W3M_USE_COLOR) && ${W3M_USE_COLOR} == YES
+CONFIGURE_ENV+=	use_m17n=y
+.if ${W3M_USE_UNICODE} == YES
+CONFIGURE_ENV+=	use_unicode=y
+.else
+CONFIGURE_ENV+=	use_unicode=n
+.endif
+CONFIGURE_ENV+=	charset=ISO-2022-JP-2
+.if ${W3M_USE_JAPANESE_MESSAGES} == YES
+CONFIGURE_ENV+=	lang=ja
+HELP_LANG=			_ja
+.else
+CONFIGURE_ENV+=	lang=en
+HELP_LANG=			_en
+.endif
+.if ${W3M_USE_COLOR} == YES
 CONFIGURE_ENV+=	use_color=y
 .else
 CONFIGURE_ENV+=	use_color=n
 .endif
-.if defined(W3M_USE_MOUSE) && ${W3M_USE_MOUSE} == YES
+.if ${W3M_USE_MOUSE} == YES
 CONFIGURE_ENV+=	use_mouse=y
 .else
 CONFIGURE_ENV+=	use_mouse=n
 .endif
-.if defined(W3M_USE_COOKIE) && ${W3M_USE_COOKIE} == YES
+.if ${W3M_USE_COOKIE} == YES
 CONFIGURE_ENV+=	use_cookie=y
 .else
 CONFIGURE_ENV+=	use_cookie=n
 .endif
-.if defined(W3M_USE_SSL) && ${W3M_USE_SSL} == YES
-USE_SSL=	YES
+.if ${W3M_USE_SSL} == YES
+USE_SSL=			YES
 CONFIGURE_ENV+=	use_ssl=y use_ssl_verify=n
 .else
 CONFIGURE_ENV+=	use_ssl=n use_ssl_verify=n
 .endif
-.if defined(W3M_USE_JAPANESE) && ${W3M_USE_JAPANESE} == YES
-CONFIGURE_ENV+=	def_lg=1
-CONFIGURE_ENV+=	def_dcode=n
-.else
-CONFIGURE_ENV+=	def_lg=2
-.endif
-.if defined(W3M_USE_JAPANESE_SYMBOL) && ${W3M_USE_JAPANESE_SYMBOL} == YES
-CONFIGURE_ENV+=	kanji_symbols=y
-HELP_LANG=	_ja
-.else
-CONFIGURE_ENV+=	kanji_symbols=n
-HELP_LANG=	_en
-.endif
-.if defined(W3M_USE_LYNX_KEY) && ${W3M_USE_LYNX_KEY} == YES
+.if ${W3M_USE_LYNX_KEY} == YES
 CONFIGURE_ENV+=	lynx_key=y
-HELP_W3M=	-lynx
+HELP_W3M=			-lynx
 .else
 CONFIGURE_ENV+=	lynx_key=n
-HELP_W3M=	-w3m
+HELP_W3M=			-w3m
 .endif
-CONFIGURE_ENV+=	def_bindir=${LOCALBASE}/bin
-CONFIGURE_ENV+=	def_libdir=${LOCALBASE}/${HELPERDIR}
-CONFIGURE_ENV+=	def_helpdir=${LOCALBASE}/${HELPDIR}
-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"
-CONFIGURE_ENV+=	dmodel=6
-CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV+= def_bindir=${LOCALBASE}/bin
+CONFIGURE_ENV+= def_libdir=${LOCALBASE}/${HELPERDIR}
+CONFIGURE_ENV+= def_helpdir=${LOCALBASE}/${HELPDIR}
+CONFIGURE_ENV+= use_menu=y use_matrix=n ansi_color=y
+CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser=
+CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap"
+CONFIGURE_ENV+= dldflags="-Wl,-rpath,${LOCALBASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV+= dmodel=6
+CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
+CONFIGURE_ARGS+= -suffix=
 
 post-extract:
 	@(cd ${WRKSRC}/doc; ${RM} -fr CVS)
 	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
 
+post-patch:
+	${FIND} ${WRKSRC} -type f -name '*.orig'|xargs ${RM}
+
 # do not look at previous configuration
 do-configure:
 	@yes '' | (cd ${WRKSRC} && CC="${CC}" ac_cv_path_CC="${CC}" \
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 60a888856cd..0402957b4ad 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 12:13:26 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/05/01 00:31:25 kei Exp $
 
 SHA1 (w3m-0.2.1.tar.gz) = 3ae98283f02f4faf05af76ee0b022f01c1301d29
-SHA1 (patch-aa) = 3b3e7a37d2b76bb312263ee6b0a3fe65fd408d63
+Size (w3m-0.2.1.tar.gz) = 844101 bytes
+SHA1 (w3m-0.2.1-m17n-0.19.patch.gz) = fad1119054d27bff8683176ff0c02ba906535448
+Size (w3m-0.2.1-m17n-0.19.patch.gz) = 1245263 bytes
+SHA1 (patch-aa) = 9c8e45448aedb1959d155eef355fe5d37599e11c
 SHA1 (patch-ab) = 08a28e40907f8c3040b1e9253caf14b8b4f0dc7e
-SHA1 (patch-ac) = 0df544ffc127a1fd6495a29fef8e9e8ff99d20c3
-SHA1 (patch-ad) = e3fbd004492adb34816c734b87def63415d96236
-SHA1 (patch-ae) = 205a712187241abf85d870c703a2453f48d1b8f1
+SHA1 (patch-af) = f43380334a92c609afef4058b03f1ef72ae77e2e
diff --git a/www/w3m/patches/patch-aa b/www/w3m/patches/patch-aa
index 9a7b41716e3..41fd95dd22c 100644
--- a/www/w3m/patches/patch-aa
+++ b/www/w3m/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $
+$NetBSD: patch-aa,v 1.9 2001/05/01 00:31:25 kei Exp $
 
---- configure.orig	Fri Mar 23 11:18:40 2001
-+++ configure	Fri Mar 30 21:11:58 2001
-@@ -188,7 +188,7 @@
+--- configure.orig	Sat Apr 21 13:43:38 2001
++++ configure	Sat Apr 21 13:44:34 2001
+@@ -194,7 +194,7 @@
  
  find_ssl() {
    sslinclude=""
@@ -11,37 +11,7 @@ $NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $
    do
      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]? '
--  def_lg=2
--else
--  Echo '[1]? '
--  def_lg=1
--fi
-+#if [ "$pref_lang" = 2 ]; then
-+#  Echo '[2]? '
-+#  def_lg=2
-+#else
-+#  Echo '[1]? '
-+#  def_lg=1
-+#fi
- while :
- 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 @@
+@@ -907,7 +907,7 @@
  gclib=''
  gcinclude=''
  gctarget=''
@@ -50,7 +20,7 @@ $NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $
  do
    if [ -f $libdir/libgc.a -o -f $libdir/libgc.so ] ; then 
      echo "$libdir/libgc found"
-@@ -804,7 +804,7 @@
+@@ -915,7 +915,7 @@
      break
    fi
  done
@@ -59,7 +29,7 @@ $NetBSD: patch-aa,v 1.8 2001/03/31 09:21:17 itojun Exp $
  do
    if [ -f $inc/gc.h ]; then
      echo "$inc/gc.h found"
-@@ -1699,6 +1699,7 @@
+@@ -1600,6 +1600,7 @@
  if [ `expr "$perl" : 'not found'` != 0 ]; then
    perl=/usr/local/bin/perl
  fi
diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab
index b1f5a713454..9eee5c0a173 100644
--- a/www/w3m/patches/patch-ab
+++ b/www/w3m/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2001/03/31 09:21:17 itojun Exp $
+$NetBSD: patch-ab,v 1.8 2001/05/01 00:31:25 kei Exp $
 
 --- main.c.orig	Fri Mar 23 11:14:58 2001
 +++ main.c	Fri Mar 30 21:02:12 2001
diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac
deleted file mode 100644
index 7e5741f1311..00000000000
--- a/www/w3m/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2001/03/31 09:21:17 itojun Exp $
-
-*** 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
deleted file mode 100644
index d800d64b8d1..00000000000
--- a/www/w3m/patches/patch-ad
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2001/03/31 09:21:17 itojun Exp $
-
---- 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	 "外部ビューアの編集"
- #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"
- #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 KANJI_SYMBOL
-     {0, "black", "黒"},
-     {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 06fc426f0d5..00000000000
--- a/www/w3m/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2001/04/02 04:24:14 itojun Exp $
-
---- w3mhelperpanel.c-	Mon Apr  2 13:22:06 2001
-+++ w3mhelperpanel.c	Mon Apr  2 13:22:18 2001
-@@ -10,7 +10,7 @@
- 
- #include "gcmain.c"
- 
--#if LANG == JA
-+#if KANJI_SYMBOL
- #define MSG_TITLE		"外部ビューアの編集"
- #define MSG_NEW_ENTRY		"新規登録"
- #define MSG_TYPE		"データタイプ"
diff --git a/www/w3m/patches/patch-af b/www/w3m/patches/patch-af
new file mode 100644
index 00000000000..2e127501689
--- /dev/null
+++ b/www/w3m/patches/patch-af
@@ -0,0 +1,38 @@
+$NetBSD: patch-af,v 1.3 2001/05/01 00:31:26 kei Exp $
+
+--- libwc/Makefile.orig	Sat Apr 21 16:23:53 2001
++++ libwc/Makefile	Sat Apr 21 16:32:43 2001
+@@ -1,10 +1,10 @@
+ 
+ LIBRARY = libwc.a
+-GCLIB = ../gc/gc.a
+-CC = cc -O -g -Wall -DUSE_UNICODE
+-CFLAGS = -I. -I.. -I../gc/include -I../gc
+-AR = ar
+-RANLIB = ranlib
++GCLIB = ${PREFIX}/lib/libgc.a
++CC = ${CC} -O -g -Wall -DUSE_UNICODE
++CFLAGS = -I. -I.. -I${PREFIX}/include
++AR = ${AR}
++RANLIB = ${RANLIB}
+ 
+ SRCS = big5.c \
+ 		ces.c \
+@@ -90,7 +90,7 @@
+ ces.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h sjis.h hz.h \
+ 	big5.h johab.h gbk.h gb18030.h uhc.h viet.h utf8.h
+ char_conv.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h
+-charset.o: ../gc/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \
++charset.o: ${PREFIX}/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \
+ 	priv.h
+ combining.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h \
+ 	map/iso88596_combining.map map/iso885911_combining.map \
+@@ -117,7 +117,7 @@
+ search.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h
+ sjis.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h sjis.h jis.h \
+ 	wtf.h ucs.h map/jisx02132_sjis.map
+-status.o: ../gc/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \
++status.o: ${PREFIX}/include/gc.h wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h \
+ 	priv.h ucs.h
+ test.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h
+ ucs.o: wc.h ../Str.h wc_types.h ces.h ccs.h iso2022.h priv.h ucs.h search.h \
diff --git a/www/w3m/pkg/DESCR b/www/w3m/pkg/DESCR
index ec7be9aff2b..0f6ba4e1d47 100644
--- a/www/w3m/pkg/DESCR
+++ b/www/w3m/pkg/DESCR
@@ -1,6 +1,16 @@
-W3m is a termial-based WWW browser which supports HTML tables and frames.  It's
-small, so faster than other WWW browsers.  It also supports following URL by
-clicking mouse button on the anchor in xterm and its variants from 990526
-version.
+Quoted from README.m17n:
 
-It uses Boehm-GC to implement the table/frame parser.
+Muntilingualizaion of w3m 
+                                                              2001/03/24
+                                                              H. Sakamoto
+
+Introduction
+
+  I have tried the muntilingualization of w3m (w3m-m17n).
+  The patch for w3m-0.2.1 is available on the following site.
+
+    http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/w3m-m17n-0.18.tar.gz
+                                                README.m17n
+
+  It is a development version. And enough test is not preformed because
+  I can understand Japanese only. Please use, test, and report bugs.
diff --git a/www/w3m/pkg/PLIST b/www/w3m/pkg/PLIST
index 1dbf3da3ffc..d0cc9fbbd07 100644
--- a/www/w3m/pkg/PLIST
+++ b/www/w3m/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/03/31 09:21:18 itojun Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/05/01 00:31:26 kei Exp $
 bin/w3m
 man/man1/w3m.1
 man/ja_JP.EUC/man1/w3m.1
@@ -15,6 +15,7 @@ share/doc/w3m/doc/README
 share/doc/w3m/doc/README.cygwin
 share/doc/w3m/doc/README.dict
 share/doc/w3m/doc/README.func
+share/doc/w3m/doc/README.m17n
 share/doc/w3m/doc/STORY.html
 share/doc/w3m/doc/history
 share/doc/w3m/doc/keymap.default
@@ -36,9 +37,11 @@ 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.m17n
 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/TODO.m17n
 share/doc/w3m/doc-jp/keymap.default
 share/doc/w3m/doc-jp/keymap.lynx
 share/doc/w3m/doc-jp/menu.default