Update emacs-w3m to 1.4.4.

A lot of changes since 1.3.3, including Unicode support and add-on modules
("shimbun").

NOTE:
I had to comment out w3m's "ucs_conv=1" option which is hard-coded in w3m.el,
so that w3m without unicode option also works with emacs-w3m.  Do we want
w3m to always have its homegrown yet another Unicode mapping table?

% ls w3m.*
-rwxr-xr-x  1 uebayasi  users   513186 Jan 27 20:46 w3m.no-unicode
-rwxr-xr-x  1 uebayasi  users  1182323 Jan 27 20:48 w3m.unicode

4 files changed, 170 insertions, 43 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 119cfecfe04..7816739bfac 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2006/02/22 20:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/27 12:56:02 uebayasi Exp $
 
-DISTNAME=	emacs-w3m-1.3.3
-PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+DISTNAME=	emacs-w3m-1.4.4
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}
 
@@ -10,20 +8,17 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://emacs-w3m.namazu.org/
 COMMENT=	Simple w3m interface for Emacs
 
-DEPENDS+=	{w3m,w3m-img}>=0.3.1:../../www/w3m
-BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
-
-# Not tested with xemacs...
-EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
+DEPENDS+=	w3m>=0.5.1nb2:../../www/w3m
 
 .include "../../mk/emacs.mk"
 
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
 .if ${EMACS_FLAVOR} == "xemacs"
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel
 .endif
 
-EMACS_MAJOR_VERSION=	${_EMACS_VERSION:C/\..*//}
-.if ${EMACS_FLAVOR} == "emacs" && ${EMACS_MAJOR_VERSION} == 21
+.if ${EMACS_FLAVOR} == "emacs" && \
+    (${EMACS_VERSION_MAJOR} == 21 || ${EMACS_VERSION_MAJOR} == 22)
 BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs
 .endif
 
@@ -36,17 +31,16 @@ INSTALL_TARGET=	install-package
 INSTALL_TARGET=	install install-icons
 .endif
 
-DOCUMENTS=	COPYING ChangeLog ChangeLog.1 FAQ FAQ.ja README README.ja README.namazu.ja README.shimbun.ja TIPS TIPS.ja
+DOCUMENTS=	COPYING ChangeLog ChangeLog.1 README README.ja
 .if ${EMACS_FLAVOR} == "xemacs"
 ETCDIR=	lib/xemacs/site-packages/etc
 ICONDIR=	${ETCDIR}/w3m
 .else
-ETCDIR=	share/emacs/${_EMACS_VERSION:C/(^[0-9.]*).*$/\1/}/etc
+ETCDIR=	share/emacs/${_EMACS_VERSION_NOREV}/etc
 ICONDIR=	${ETCDIR}/w3m/icons
 .endif
 DOCDIR=	${ETCDIR}/w3m/doc
 PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
-PLIST_SUBST+=	ETCDIR=${ETCDIR:Q}
 PLIST_SUBST+=	ICONDIR=${ICONDIR:Q}
 
 post-install:
diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST
index 128e1446968..12e18a1047b 100644
--- a/www/emacs-w3m/PLIST
+++ b/www/emacs-w3m/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2006/02/22 20:35:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/27 12:56:02 uebayasi Exp $
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el
-@comment not created: ${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
+${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.el
 ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc
 ${EMACS_LISPPREFIX}/w3m/octet.el
@@ -23,15 +23,19 @@ ${EMACS_LISPPREFIX}/w3m/w3m-e20.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-e20.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-e21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
+${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-e21.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-form.el
 ${EMACS_LISPPREFIX}/w3m/w3m-form.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-fsf.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
+${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-fsf.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.el
 ${EMACS_LISPPREFIX}/w3m/w3m-hist.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-image.el
 ${EMACS_LISPPREFIX}/w3m/w3m-image.elc
+${EMACS_LISPPREFIX}/w3m/w3m-lnum.el
+${EMACS_LISPPREFIX}/w3m/w3m-lnum.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-namazu.el
 ${EMACS_LISPPREFIX}/w3m/w3m-namazu.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-om.el
@@ -39,12 +43,15 @@ ${EMACS_LISPPREFIX}/w3m/w3m-perldoc.el
 ${EMACS_LISPPREFIX}/w3m/w3m-perldoc.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-proc.el
 ${EMACS_LISPPREFIX}/w3m/w3m-proc.elc
+${EMACS_LISPPREFIX}/w3m/w3m-rss.el
+${EMACS_LISPPREFIX}/w3m/w3m-rss.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-search.el
 ${EMACS_LISPPREFIX}/w3m/w3m-search.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.el
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-ucs.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
+${FOR_emacs22}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-util.el
@@ -56,34 +63,73 @@ ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
 ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
 ${EMACS_LISPPREFIX}/w3m/w3m.el
 ${EMACS_LISPPREFIX}/w3m/w3m.elc
-${EMACS_LISPPREFIX}/w3m/w3mhack.el
 ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el
 @comment XXX This doesn't seem to work with Mew 4.x.
 @comment ${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
+${EMACS_LISPPREFIX}/w3m/w3m-ccl.el
+${EMACS_LISPPREFIX}/w3m/w3m-favicon.el
+${EMACS_LISPPREFIX}/w3m/w3m-filter.el
+${EMACS_LISPPREFIX}/w3m/w3m-load.el
+${EMACS_LISPPREFIX}/w3m/w3m-symbol.el
+${EMACS_LISPPREFIX}/w3m/w3m-ccl.elc
+${EMACS_LISPPREFIX}/w3m/w3m-favicon.elc
+${EMACS_LISPPREFIX}/w3m/w3m-filter.elc
+${EMACS_LISPPREFIX}/w3m/w3m-symbol.elc
+${EMACS_LISPPREFIX}/w3m/nnshimbun.el
+${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
+${EMACS_LISPPREFIX}/w3m/nnshimbun.elc
 ${EMACS_LISPPREFIX}/w3m/sb-2ch.el
 ${EMACS_LISPPREFIX}/w3m/sb-2ch.elc
 ${EMACS_LISPPREFIX}/w3m/sb-airs.el
 ${EMACS_LISPPREFIX}/w3m/sb-airs.elc
 ${EMACS_LISPPREFIX}/w3m/sb-asahi-html.el
 ${EMACS_LISPPREFIX}/w3m/sb-asahi-html.elc
+${EMACS_LISPPREFIX}/w3m/sb-asahi-mytown.el
+${EMACS_LISPPREFIX}/w3m/sb-asahi-mytown.elc
 ${EMACS_LISPPREFIX}/w3m/sb-asahi.el
 ${EMACS_LISPPREFIX}/w3m/sb-asahi.elc
+${EMACS_LISPPREFIX}/w3m/sb-atmarkit.el
+${EMACS_LISPPREFIX}/w3m/sb-atmarkit.elc
+${EMACS_LISPPREFIX}/w3m/sb-bbc.el
+${EMACS_LISPPREFIX}/w3m/sb-bbc.elc
 ${EMACS_LISPPREFIX}/w3m/sb-bbdb-ml.el
 ${EMACS_LISPPREFIX}/w3m/sb-bbdb-ml.elc
+${EMACS_LISPPREFIX}/w3m/sb-cgi-board.el
+${EMACS_LISPPREFIX}/w3m/sb-cgi-board.elc
+${EMACS_LISPPREFIX}/w3m/sb-chalow.el
+${EMACS_LISPPREFIX}/w3m/sb-chalow.elc
+${EMACS_LISPPREFIX}/w3m/sb-cnet-jp.el
+${EMACS_LISPPREFIX}/w3m/sb-cnet-jp.elc
 ${EMACS_LISPPREFIX}/w3m/sb-cnet.el
 ${EMACS_LISPPREFIX}/w3m/sb-cnet.elc
+${EMACS_LISPPREFIX}/w3m/sb-cnn-jp.el
+${EMACS_LISPPREFIX}/w3m/sb-cnn-jp.elc
+${EMACS_LISPPREFIX}/w3m/sb-coldsync.el
+${EMACS_LISPPREFIX}/w3m/sb-coldsync.elc
 ${EMACS_LISPPREFIX}/w3m/sb-debian-jp.el
 ${EMACS_LISPPREFIX}/w3m/sb-debian-jp.elc
 ${EMACS_LISPPREFIX}/w3m/sb-debian.el
 ${EMACS_LISPPREFIX}/w3m/sb-debian.elc
+${EMACS_LISPPREFIX}/w3m/sb-dennou.el
+${EMACS_LISPPREFIX}/w3m/sb-dennou.elc
 ${EMACS_LISPPREFIX}/w3m/sb-digiko.el
 ${EMACS_LISPPREFIX}/w3m/sb-digiko.elc
-${EMACS_LISPPREFIX}/w3m/sb-ding.el
-${EMACS_LISPPREFIX}/w3m/sb-ding.elc
-${EMACS_LISPPREFIX}/w3m/sb-f1express.el
-${EMACS_LISPPREFIX}/w3m/sb-f1express.elc
+${EMACS_LISPPREFIX}/w3m/sb-elips.el
+${EMACS_LISPPREFIX}/w3m/sb-elips.elc
+${EMACS_LISPPREFIX}/w3m/sb-emacs-w3m.el
+${EMACS_LISPPREFIX}/w3m/sb-emacs-w3m.elc
+${EMACS_LISPPREFIX}/w3m/sb-emacswiki.el
+${EMACS_LISPPREFIX}/w3m/sb-emacswiki.elc
+${EMACS_LISPPREFIX}/w3m/sb-excite.el
+${EMACS_LISPPREFIX}/w3m/sb-excite.elc
+${EMACS_LISPPREFIX}/w3m/sb-exconn.el
+${EMACS_LISPPREFIX}/w3m/sb-exconn.elc
 ${EMACS_LISPPREFIX}/w3m/sb-f1fan.el
 ${EMACS_LISPPREFIX}/w3m/sb-f1fan.elc
+${EMACS_LISPPREFIX}/w3m/sb-fau.el
+${EMACS_LISPPREFIX}/w3m/sb-fau.elc
+${EMACS_LISPPREFIX}/w3m/sb-ffii.el
+${EMACS_LISPPREFIX}/w3m/sb-ffii.elc
 ${EMACS_LISPPREFIX}/w3m/sb-fml.el
 ${EMACS_LISPPREFIX}/w3m/sb-fml.elc
 ${EMACS_LISPPREFIX}/w3m/sb-geocrawler.el
@@ -92,28 +138,38 @@ ${EMACS_LISPPREFIX}/w3m/sb-glimpse.el
 ${EMACS_LISPPREFIX}/w3m/sb-glimpse.elc
 ${EMACS_LISPPREFIX}/w3m/sb-gnome.el
 ${EMACS_LISPPREFIX}/w3m/sb-gnome.elc
-${EMACS_LISPPREFIX}/w3m/sb-gyve.el
-${EMACS_LISPPREFIX}/w3m/sb-gyve.elc
-${EMACS_LISPPREFIX}/w3m/sb-h14m.el
-${EMACS_LISPPREFIX}/w3m/sb-h14m.elc
+${EMACS_LISPPREFIX}/w3m/sb-haiku-os.el
+${EMACS_LISPPREFIX}/w3m/sb-haiku-os.elc
+${EMACS_LISPPREFIX}/w3m/sb-heise.el
+${EMACS_LISPPREFIX}/w3m/sb-heise.elc
 ${EMACS_LISPPREFIX}/w3m/sb-hns.el
 ${EMACS_LISPPREFIX}/w3m/sb-hns.elc
 ${EMACS_LISPPREFIX}/w3m/sb-ibm-dev.el
 ${EMACS_LISPPREFIX}/w3m/sb-ibm-dev.elc
 ${EMACS_LISPPREFIX}/w3m/sb-impress.el
 ${EMACS_LISPPREFIX}/w3m/sb-impress.elc
-${EMACS_LISPPREFIX}/w3m/sb-isize-sports.el
-${EMACS_LISPPREFIX}/w3m/sb-isize-sports.elc
+${EMACS_LISPPREFIX}/w3m/sb-itmedia.el
+${EMACS_LISPPREFIX}/w3m/sb-itmedia.elc
 ${EMACS_LISPPREFIX}/w3m/sb-japantimes.el
 ${EMACS_LISPPREFIX}/w3m/sb-japantimes.elc
 ${EMACS_LISPPREFIX}/w3m/sb-javaconf.el
 ${EMACS_LISPPREFIX}/w3m/sb-javaconf.elc
+${EMACS_LISPPREFIX}/w3m/sb-jpilot.el
+${EMACS_LISPPREFIX}/w3m/sb-jpilot.elc
+${EMACS_LISPPREFIX}/w3m/sb-jpo.el
+${EMACS_LISPPREFIX}/w3m/sb-jpo.elc
 ${EMACS_LISPPREFIX}/w3m/sb-kantei.el
 ${EMACS_LISPPREFIX}/w3m/sb-kantei.elc
 ${EMACS_LISPPREFIX}/w3m/sb-kde.el
 ${EMACS_LISPPREFIX}/w3m/sb-kde.elc
+${EMACS_LISPPREFIX}/w3m/sb-laut-de.el
+${EMACS_LISPPREFIX}/w3m/sb-laut-de.elc
+${EMACS_LISPPREFIX}/w3m/sb-linux-ja.el
+${EMACS_LISPPREFIX}/w3m/sb-linux-ja.elc
 ${EMACS_LISPPREFIX}/w3m/sb-linuxce-jp.el
 ${EMACS_LISPPREFIX}/w3m/sb-linuxce-jp.elc
+${EMACS_LISPPREFIX}/w3m/sb-lotusex.el
+${EMACS_LISPPREFIX}/w3m/sb-lotusex.elc
 ${EMACS_LISPPREFIX}/w3m/sb-lump.el
 ${EMACS_LISPPREFIX}/w3m/sb-lump.elc
 ${EMACS_LISPPREFIX}/w3m/sb-m17n.el
@@ -136,8 +192,16 @@ ${EMACS_LISPPREFIX}/w3m/sb-mew.el
 ${EMACS_LISPPREFIX}/w3m/sb-mew.elc
 ${EMACS_LISPPREFIX}/w3m/sb-mhonarc.el
 ${EMACS_LISPPREFIX}/w3m/sb-mhonarc.elc
+${EMACS_LISPPREFIX}/w3m/sb-mozilla-jp.el
+${EMACS_LISPPREFIX}/w3m/sb-mozilla-jp.elc
+${EMACS_LISPPREFIX}/w3m/sb-msdn.el
+${EMACS_LISPPREFIX}/w3m/sb-msdn.elc
+${EMACS_LISPPREFIX}/w3m/sb-msports-nifty.el
+${EMACS_LISPPREFIX}/w3m/sb-msports-nifty.elc
 ${EMACS_LISPPREFIX}/w3m/sb-muchy.el
 ${EMACS_LISPPREFIX}/w3m/sb-muchy.elc
+${EMACS_LISPPREFIX}/w3m/sb-n24-de.el
+${EMACS_LISPPREFIX}/w3m/sb-n24-de.elc
 ${EMACS_LISPPREFIX}/w3m/sb-namazu.el
 ${EMACS_LISPPREFIX}/w3m/sb-namazu.elc
 ${EMACS_LISPPREFIX}/w3m/sb-netbsd.el
@@ -154,44 +218,92 @@ ${EMACS_LISPPREFIX}/w3m/sb-pcweb-column.el
 ${EMACS_LISPPREFIX}/w3m/sb-pcweb-column.elc
 ${EMACS_LISPPREFIX}/w3m/sb-pilot-link.el
 ${EMACS_LISPPREFIX}/w3m/sb-pilot-link.elc
-${EMACS_LISPPREFIX}/w3m/sb-quickml.el
-${EMACS_LISPPREFIX}/w3m/sb-quickml.elc
+${EMACS_LISPPREFIX}/w3m/sb-pilot-mailsync.el
+${EMACS_LISPPREFIX}/w3m/sb-pilot-mailsync.elc
+${EMACS_LISPPREFIX}/w3m/sb-plucker.el
+${EMACS_LISPPREFIX}/w3m/sb-plucker.elc
+${EMACS_LISPPREFIX}/w3m/sb-pocketgames.el
+${EMACS_LISPPREFIX}/w3m/sb-pocketgames.elc
+${EMACS_LISPPREFIX}/w3m/sb-rakuten.el
+${EMACS_LISPPREFIX}/w3m/sb-rakuten.elc
 ${EMACS_LISPPREFIX}/w3m/sb-redhat.el
 ${EMACS_LISPPREFIX}/w3m/sb-redhat.elc
+${EMACS_LISPPREFIX}/w3m/sb-rediff.el
+${EMACS_LISPPREFIX}/w3m/sb-rediff.elc
+${EMACS_LISPPREFIX}/w3m/sb-rss.el
+${EMACS_LISPPREFIX}/w3m/sb-rss.elc
 ${EMACS_LISPPREFIX}/w3m/sb-ruby.el
 ${EMACS_LISPPREFIX}/w3m/sb-ruby.elc
+${EMACS_LISPPREFIX}/w3m/sb-sankei.el
+${EMACS_LISPPREFIX}/w3m/sb-sankei.elc
 ${EMACS_LISPPREFIX}/w3m/sb-savannah.el
 ${EMACS_LISPPREFIX}/w3m/sb-savannah.elc
 ${EMACS_LISPPREFIX}/w3m/sb-security-memo.el
 ${EMACS_LISPPREFIX}/w3m/sb-security-memo.elc
 ${EMACS_LISPPREFIX}/w3m/sb-slashdot-jp.el
 ${EMACS_LISPPREFIX}/w3m/sb-slashdot-jp.elc
+${EMACS_LISPPREFIX}/w3m/sb-sml.el
+${EMACS_LISPPREFIX}/w3m/sb-sml.elc
+${EMACS_LISPPREFIX}/w3m/sb-sourceforge-jp.el
+${EMACS_LISPPREFIX}/w3m/sb-sourceforge-jp.elc
+${EMACS_LISPPREFIX}/w3m/sb-spiegel.el
+${EMACS_LISPPREFIX}/w3m/sb-spiegel.elc
 ${EMACS_LISPPREFIX}/w3m/sb-sponichi.el
 ${EMACS_LISPPREFIX}/w3m/sb-sponichi.elc
+${EMACS_LISPPREFIX}/w3m/sb-squeak-dev.el
+${EMACS_LISPPREFIX}/w3m/sb-squeak-dev.elc
+${EMACS_LISPPREFIX}/w3m/sb-squeak-ja.el
+${EMACS_LISPPREFIX}/w3m/sb-squeak-ja.elc
 ${EMACS_LISPPREFIX}/w3m/sb-tcup.el
 ${EMACS_LISPPREFIX}/w3m/sb-tcup.elc
+${EMACS_LISPPREFIX}/w3m/sb-tdiary-ml.el
+${EMACS_LISPPREFIX}/w3m/sb-tdiary-ml.elc
+${EMACS_LISPPREFIX}/w3m/sb-tdiary.el
+${EMACS_LISPPREFIX}/w3m/sb-tdiary.elc
 ${EMACS_LISPPREFIX}/w3m/sb-texfaq.el
 ${EMACS_LISPPREFIX}/w3m/sb-texfaq.elc
 ${EMACS_LISPPREFIX}/w3m/sb-text.el
 ${EMACS_LISPPREFIX}/w3m/sb-text.elc
+${EMACS_LISPPREFIX}/w3m/sb-the-register.el
+${EMACS_LISPPREFIX}/w3m/sb-the-register.elc
+${EMACS_LISPPREFIX}/w3m/sb-tigris.el
+${EMACS_LISPPREFIX}/w3m/sb-tigris.elc
 ${EMACS_LISPPREFIX}/w3m/sb-toshiba.el
 ${EMACS_LISPPREFIX}/w3m/sb-toshiba.elc
 ${EMACS_LISPPREFIX}/w3m/sb-vinelinux.el
 ${EMACS_LISPPREFIX}/w3m/sb-vinelinux.elc
 ${EMACS_LISPPREFIX}/w3m/sb-w3m-dev.el
 ${EMACS_LISPPREFIX}/w3m/sb-w3m-dev.elc
+${EMACS_LISPPREFIX}/w3m/sb-weeklyworldnews.el
+${EMACS_LISPPREFIX}/w3m/sb-weeklyworldnews.elc
+${EMACS_LISPPREFIX}/w3m/sb-welt-de.el
+${EMACS_LISPPREFIX}/w3m/sb-welt-de.elc
+${EMACS_LISPPREFIX}/w3m/sb-wiki.el
+${EMACS_LISPPREFIX}/w3m/sb-wiki.elc
+${EMACS_LISPPREFIX}/w3m/sb-wikimedia.el
+${EMACS_LISPPREFIX}/w3m/sb-wikimedia.elc
+${EMACS_LISPPREFIX}/w3m/sb-wincefan.el
+${EMACS_LISPPREFIX}/w3m/sb-wincefan.elc
+${EMACS_LISPPREFIX}/w3m/sb-wired-jp.el
+${EMACS_LISPPREFIX}/w3m/sb-wired-jp.elc
 ${EMACS_LISPPREFIX}/w3m/sb-wired.el
 ${EMACS_LISPPREFIX}/w3m/sb-wired.elc
+${EMACS_LISPPREFIX}/w3m/sb-x51.el
+${EMACS_LISPPREFIX}/w3m/sb-x51.elc
 ${EMACS_LISPPREFIX}/w3m/sb-xemacs.el
 ${EMACS_LISPPREFIX}/w3m/sb-xemacs.elc
+${EMACS_LISPPREFIX}/w3m/sb-yahoo-auctions.el
+${EMACS_LISPPREFIX}/w3m/sb-yahoo-auctions.elc
+${EMACS_LISPPREFIX}/w3m/sb-yahoo-sports.el
+${EMACS_LISPPREFIX}/w3m/sb-yahoo-sports.elc
 ${EMACS_LISPPREFIX}/w3m/sb-yahoo.el
 ${EMACS_LISPPREFIX}/w3m/sb-yahoo.elc
 ${EMACS_LISPPREFIX}/w3m/sb-yomiuri-html.el
 ${EMACS_LISPPREFIX}/w3m/sb-yomiuri-html.elc
 ${EMACS_LISPPREFIX}/w3m/sb-yomiuri.el
 ${EMACS_LISPPREFIX}/w3m/sb-yomiuri.elc
-${EMACS_LISPPREFIX}/w3m/sb-zdnet.el
-${EMACS_LISPPREFIX}/w3m/sb-zdnet.elc
+${EMACS_LISPPREFIX}/w3m/sb-zeit-de.el
+${EMACS_LISPPREFIX}/w3m/sb-zeit-de.elc
 ${EMACS_LISPPREFIX}/w3m/shimbun.el
 ${EMACS_LISPPREFIX}/w3m/shimbun.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/auto-autoloads.el
@@ -201,14 +313,8 @@ ${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/custom-load.elc
 ${DOCDIR}/COPYING
 ${DOCDIR}/ChangeLog
 ${DOCDIR}/ChangeLog.1
-${DOCDIR}/FAQ
-${DOCDIR}/FAQ.ja
 ${DOCDIR}/README
 ${DOCDIR}/README.ja
-${DOCDIR}/README.namazu.ja
-${DOCDIR}/README.shimbun.ja
-${DOCDIR}/TIPS
-${DOCDIR}/TIPS.ja
 ${FOR_emacs21}${ICONDIR}/antenna-up.xpm
 ${FOR_emacs21}${ICONDIR}/back-disabled.xpm
 ${FOR_emacs21}${ICONDIR}/back-up.xpm
@@ -224,6 +330,11 @@ ${FOR_emacs21}${ICONDIR}/parent-disabled.xpm
 ${FOR_emacs21}${ICONDIR}/parent-up.xpm
 ${FOR_emacs21}${ICONDIR}/reload-up.xpm
 ${FOR_emacs21}${ICONDIR}/search-up.xpm
+${FOR_emacs21}${ICONDIR}/spinner.gif
+${FOR_emacs21}${ICONDIR}/state-00.xpm
+${FOR_emacs21}${ICONDIR}/state-01.xpm
+${FOR_emacs21}${ICONDIR}/state-10.xpm
+${FOR_emacs21}${ICONDIR}/state-11.xpm
 ${FOR_emacs21}${ICONDIR}/weather-up.xpm
 ${FOR_xemacs214}${ICONDIR}/antenna-up.xpm
 ${FOR_xemacs214}${ICONDIR}/back-disabled.xpm
@@ -240,6 +351,11 @@ ${FOR_xemacs214}${ICONDIR}/parent-disabled.xpm
 ${FOR_xemacs214}${ICONDIR}/parent-up.xpm
 ${FOR_xemacs214}${ICONDIR}/reload-up.xpm
 ${FOR_xemacs214}${ICONDIR}/search-up.xpm
+${FOR_xemacs214}${ICONDIR}/spinner.gif
+${FOR_xemacs214}${ICONDIR}/state-00.xpm
+${FOR_xemacs214}${ICONDIR}/state-01.xpm
+${FOR_xemacs214}${ICONDIR}/state-10.xpm
+${FOR_xemacs214}${ICONDIR}/state-11.xpm
 ${FOR_xemacs214}${ICONDIR}/weather-up.xpm
 ${FOR_xemacs215}${ICONDIR}/antenna-up.xpm
 ${FOR_xemacs215}${ICONDIR}/back-disabled.xpm
@@ -256,11 +372,14 @@ ${FOR_xemacs215}${ICONDIR}/parent-disabled.xpm
 ${FOR_xemacs215}${ICONDIR}/parent-up.xpm
 ${FOR_xemacs215}${ICONDIR}/reload-up.xpm
 ${FOR_xemacs215}${ICONDIR}/search-up.xpm
+${FOR_xemacs215}${ICONDIR}/spinner.gif
+${FOR_xemacs215}${ICONDIR}/state-00.xpm
+${FOR_xemacs215}${ICONDIR}/state-01.xpm
+${FOR_xemacs215}${ICONDIR}/state-10.xpm
+${FOR_xemacs215}${ICONDIR}/state-11.xpm
 ${FOR_xemacs215}${ICONDIR}/weather-up.xpm
 @dirrm ${EMACS_LISPPREFIX}/w3m
 @dirrm ${DOCDIR}
 ${FOR_emacs21}@dirrm ${ICONDIR}
 ${FOR_xemacs214}@dirrm ${ICONDIR}
 ${FOR_xemacs215}@dirrm ${ICONDIR}
-${FOR_emacs20}@dirrm ${ETCDIR}/w3m
-${FOR_emacs21}@dirrm ${ETCDIR}/w3m
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 0670894f664..a08fc2e8c65 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:08:30 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/01/27 12:56:02 uebayasi Exp $
 
-SHA1 (emacs-w3m-1.3.3.tar.gz) = b3bff0b9419cd65b805ddc06d93eb9d93b2b1f22
-RMD160 (emacs-w3m-1.3.3.tar.gz) = e9a19ba0411bf8a299aa6678a71cf41076612125
-Size (emacs-w3m-1.3.3.tar.gz) = 356491 bytes
+SHA1 (emacs-w3m-1.4.4.tar.gz) = e7b85e5af9d05fbb836c49b75b9aa76d90bbbde8
+RMD160 (emacs-w3m-1.4.4.tar.gz) = d57a1296bcfcb422c379c9e8f35311ff2ac7d702
+Size (emacs-w3m-1.4.4.tar.gz) = 796123 bytes
+SHA1 (patch-aa) = bdbee77c09c115f46384380cc9932a26b3437d17
diff --git a/www/emacs-w3m/patches/patch-aa b/www/emacs-w3m/patches/patch-aa
new file mode 100644
index 00000000000..44306582e7d
--- /dev/null
+++ b/www/emacs-w3m/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/01/27 12:56:02 uebayasi Exp $
+
+--- w3m.el.orig	2005-03-25 09:00:00.000000000 +0900
++++ w3m.el
+@@ -2311,7 +2311,7 @@ If it is nil, the command specified to `
+ 	       "-o" "strict_iso2022=0"
+ 	       "-o" "fix_width_conv=1"
+ 	       "-o" "use_jisx0201=0"
+-	       "-o" "ucs_conv=1"
++	       ;"-o" "ucs_conv=1"
+ 	       '(if (eq w3m-input-coding-system 'binary)
+ 		    (if charset (list "-I" 'charset))
+ 		  (list "-I" (if (eq w3m-input-coding-system 'utf-8)