Updated w3m package to version 0.3 with m17n-20020316 patch. ChangeLog from

0.2.5 to 0.3 is so big (~ 560 lines), so I only quote release note here.  You
may want to look at the demo images before updating this package.

  http://www2u.biglobe.ne.jp/~hsaka/w3m/nec.png
  http://www2u.biglobe.ne.jp/~hsaka/w3m/mapion.png



o w3m 0.3 - 2002-03-06:

 w3m is a pager with WWW capability.  It IS a pager, but it can be used
 as a text-mode WWW browser.

 Major new features in 0.3 release are:

  * w3m-img merged: w3m now can display images in terminal emulator on X
  window system! see doc/README.img

o w3m-0.2.5.1:

  w3m 0.2.5.1 is stable release. It only applies the following patches
  (trivial and minor fixes) from CVS:

   - fix inputAnswer() and no "ssl_forbid_method" [w3m-dev 02985]
   - fix SunOS 4.1.4 build problem [w3m-dev 02972]

4 files changed, 38 insertions, 11 deletions

diff --git a/www/w3m/DESCR b/www/w3m/DESCR
index 172c7780c73..f1d9d48b95a 100644
--- a/www/w3m/DESCR
+++ b/www/w3m/DESCR
@@ -17,7 +17,7 @@ Introduction
   The patch for w3m-0.2.1 is available on the following site.
 
     http://www2u.biglobe.ne.jp/~hsaka/w3m/index.html#m17n
-                                          patch/w3m-0.2.5-m17n-20020216.tar.gz
+                                          patch/w3m-0.3-m17n-20020316.tar.gz
                                           patch/README.m17n
 
   It is a development version. And enough test is not preformed because
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 70cecb31a9c..d0391e388d1 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2002/03/14 23:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2002/04/21 23:34:32 kei Exp $
 #
 
-DISTNAME=	w3m-0.2.5-m17n-20020216
-PKGNAME=	w3m-0.2.5
-PKGREVISION=	1
+DISTNAME=	w3m-${W3M_VERS}
+PKGNAME=	w3m-${W3M_BASE_VERS}
+PKGREVISION=	# null
 CATEGORIES=	www
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
 
@@ -15,6 +15,23 @@ CONFLICTS+=	w3m-m17n-[0-9]*
 
 USE_BUILDLINK_ONLY=	yes
 
+W3M_VERS=	${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS}
+W3M_BASE_VERS=	0.3
+W3M_M17N_VERS=	20020316
+
+# w3m source with m17n patch applied.
+W3M_SRC=	${DISTNAME}${EXTRACT_SUFX}
+WRKSRC=		${WRKDIR}/w3m-${W3M_VERS}
+DISTFILES+=	${W3M_SRC}
+EXTRACT_ONLY=	${W3M_SRC}
+
+# multibyte/wide character support was split into libwc in latest version of
+# w3m-m17n.
+#LIBWC_SRC=	libwc-latest.tar.gz
+#LIBWC_WRKSRC=	${WRKDIR}/w3m-${W3M_VERS}
+#DISTFILES+=	${LIBWC_SRC}
+#EXTRACT_ONLY+=	${LIBWC_SRC}
+
 HELPDIR=        share/doc/w3m
 HELPERDIR=      lib/w3m
 
@@ -90,7 +107,8 @@ HELP_W3M=			-lynx
 CONFIGURE_ENV+=	lynx_key=n
 HELP_W3M=			-w3m
 .endif
-CONFIGURE_ENV+= use_menu=y use_matrix=n ansi_color=y use_help_cgi=n
+CONFIGURE_ENV+= use_menu=y use_matrix=n use_image=y use_ansi_color=y
+CONFIGURE_ENV+= use_help_cgi=n use_migemo=n
 CONFIGURE_ENV+= ded=vi dmail=Mail dbrowser=
 CONFIGURE_ENV+= dcc="${CC}" dtermlib="-ltermcap"
 CONFIGURE_ENV+= dldflags="-Wl,-rpath,${LOCALBASE}/lib"
@@ -108,6 +126,7 @@ CONFIGURE_ARGS+= --gc-libdir=${BUILDLINK_DIR}/lib
 post-extract:
 	@(cd ${WRKSRC}/doc; ${RM} -fr CVS)
 	@(cd ${WRKSRC}/doc-jp; ${RM} -fr CVS)
+#	@${LN} ${LIBWC_WRKSRC} ${WRKSRC}/libwc
 
 post-patch:
 	${FIND} ${WRKSRC} -type f -name '*.orig' | ${XARGS} ${RM}
@@ -139,13 +158,17 @@ do-install:
 	(cd ${WRKSRC}; ${PAX} -w doc doc-jp) | \
 	    (cd ${LOCALBASE}/${HELPDIR}; ${PAX} -r)
 	${INSTALL_DATA_DIR} ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/inflate ${LOCALBASE}/${HELPERDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/w3mbookmark ${LOCALBASE}/${HELPERDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/w3mhelperpanel ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgdisplay ${LOCALBASE}/${HELPERDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/w3mimgsize ${LOCALBASE}/${HELPERDIR}
 
 post-install:
 	(cd ${LOCALBASE}/${HELPDIR}; \
 	    ${RM} -f w3mhelp.html; \
 	    ${LN} -s w3mhelp${HELP_W3M}${HELP_LANG}.html w3mhelp.html)
 
+.include "../../graphics/imlib/buildlink.mk"
 .include "../../devel/boehm-gc/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/w3m/PLIST b/www/w3m/PLIST
index ad3921f74d0..b552a35e745 100644
--- a/www/w3m/PLIST
+++ b/www/w3m/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/02 00:08:15 kei Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/04/21 23:34:32 kei Exp $
 bin/w3m
 man/man1/w3m.1
 man/ja_JP.EUC/man1/w3m.1
@@ -38,15 +38,19 @@ share/doc/w3m/doc-jp/README.keymap
 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/README.migemo
 share/doc/w3m/doc-jp/STORY.html
 share/doc/w3m/doc-jp/keymap.default
 share/doc/w3m/doc-jp/keymap.lynx
 share/doc/w3m/doc-jp/menu.default
 share/doc/w3m/doc-jp/menu.submenu
 share/doc/w3m/doc-jp/w3m.1
-@dirrm share/doc/w3m/doc
 @dirrm share/doc/w3m/doc-jp
+@dirrm share/doc/w3m/doc
 @dirrm share/doc/w3m
+lib/w3m/inflate
 lib/w3m/w3mbookmark
 lib/w3m/w3mhelperpanel
+lib/w3m/w3mimgdisplay
+lib/w3m/w3mimgsize
 @dirrm lib/w3m
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index be775be2d91..9e8e65e2cba 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/03/04 15:55:33 kei Exp $
+$NetBSD: distinfo,v 1.7 2002/04/21 23:34:32 kei Exp $
 
-SHA1 (w3m-0.2.5-m17n-20020216.tar.gz) = 7e754c61586818e731dc2a26f69a7c9505d2e640
-Size (w3m-0.2.5-m17n-20020216.tar.gz) = 2241365 bytes
+SHA1 (w3m-0.3-m17n-20020316.tar.gz) = 680f46e46d24fe39f1cd47c8cdde6d4c70253b39
+Size (w3m-0.3-m17n-20020316.tar.gz) = 2245689 bytes
 SHA1 (patch-aa) = e40ad9fa0765041b605e86febd71d399b92fc4d1
 SHA1 (patch-ab) = c0c21616d1d3557453648107eca26eaa91af4741