6 files changed, 116 insertions, 41 deletions

diff --git a/www/emacs-w3m-emacs20/pkg-plist b/www/emacs-w3m-emacs20/pkg-plist
index 920cf5f97b60..78eb363d3187 100644
--- a/www/emacs-w3m-emacs20/pkg-plist
+++ b/www/emacs-w3m-emacs20/pkg-plist
@@ -4,6 +4,7 @@
 %%INFODIR%%/emacs-w3m-ja.info-1
 %%INFODIR%%/emacs-w3m-ja.info-2
 %%INFODIR%%/emacs-w3m-ja.info-3
+%%INFODIR%%/emacs-w3m-ja.info-4
 @unexec install-info --delete %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-w3m.info
 @exec install-info %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
@@ -22,14 +23,20 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el
+%%SHIMBUN%%%%LISPDIR%%/sb-bbc.el
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el
+%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-chalow.el
 %%SHIMBUN%%%%LISPDIR%%/sb-chalow.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-coldsync.el
 %%SHIMBUN%%%%LISPDIR%%/sb-coldsync.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.el
@@ -54,14 +61,14 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.el
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.el
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.el
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el
+%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
@@ -74,6 +81,7 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.el
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.el
 %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
 %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el
@@ -130,16 +138,19 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-pocketgames.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-quickml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-quickml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.el
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.el
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rss.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-sankei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.el
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el
 %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-sml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-sml.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-sourceforge-jp.el
@@ -166,6 +177,7 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-wiki.el
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.el
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wired.el
@@ -178,10 +190,6 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.elc
-%%SHIMBUN%%%%LISPDIR%%/shimbun-servers.el
-%%SHIMBUN%%%%LISPDIR%%/shimbun-servers.elc
 %%SHIMBUN%%%%LISPDIR%%/shimbun.el
 %%SHIMBUN%%%%LISPDIR%%/shimbun.elc
 %%LISPDIR%%/w3m-antenna.el
@@ -191,6 +199,8 @@
 %%LISPDIR%%/w3m-bookmark.elc
 %%LISPDIR%%/w3m-bug.el
 %%LISPDIR%%/w3m-bug.elc
+%%LISPDIR%%/w3m-ccl.el
+%%LISPDIR%%/w3m-ccl.elc
 %%LISPDIR%%/w3m-cookie.el
 %%LISPDIR%%/w3m-cookie.elc
 %%LISPDIR%%/w3m-dtree.el
@@ -199,14 +209,18 @@
 %%LISPDIR%%/w3m-e20.el
 %%LISPDIR%%/w3m-e20.elc
 %%LISPDIR%%/w3m-e21.el
-%%LISPDIR%%/w3m-fsf.el
-%%LISPDIR%%/w3m-fsf.elc
+%%LISPDIR%%/w3m-favicon.el
+%%LISPDIR%%/w3m-filter.el
+%%LISPDIR%%/w3m-filter.elc
 %%LISPDIR%%/w3m-form.el
 %%LISPDIR%%/w3m-form.elc
+%%LISPDIR%%/w3m-fsf.el
+%%LISPDIR%%/w3m-fsf.elc
 %%LISPDIR%%/w3m-hist.el
 %%LISPDIR%%/w3m-hist.elc
 %%LISPDIR%%/w3m-image.el
 %%LISPDIR%%/w3m-image.elc
+%%LISPDIR%%/w3m-load.el
 %%LISPDIR%%/w3m-namazu.el
 %%LISPDIR%%/w3m-namazu.elc
 %%LISPDIR%%/w3m-om.el
@@ -216,20 +230,21 @@
 %%LISPDIR%%/w3m-proc.elc
 %%LISPDIR%%/w3m-search.el
 %%LISPDIR%%/w3m-search.elc
+%%LISPDIR%%/w3m-symbol.el
+%%LISPDIR%%/w3m-symbol.elc
 %%LISPDIR%%/w3m-tabmenu.el
 %%LISPDIR%%/w3m-tabmenu.elc
 %%LISPDIR%%/w3m-ucs.el
+@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-util.el
 %%LISPDIR%%/w3m-util.elc
-@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-weather.el
 %%LISPDIR%%/w3m-weather.elc
 %%LISPDIR%%/w3m-xmas.el
 %%LISPDIR%%/w3m.elc
-%%LISPDIR%%/w3mhack.el
 %%LISPDIR%%/w3m.el
-@dirrm %%LISPDIR%%
 %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja
 %%PORTDOCS%%share/doc/emacs-w3m/README
 %%PORTDOCS%%@dirrm share/doc/ja/emacs-w3m
 %%PORTDOCS%%@dirrm share/doc/emacs-w3m
+@dirrm %%LISPDIR%%
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
index 10b991b24242..e9dd5804000c 100644
--- a/www/emacs-w3m-xemacs21-mule/pkg-plist
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -4,6 +4,7 @@
 %%INFODIR%%/emacs-w3m-ja.info-1
 %%INFODIR%%/emacs-w3m-ja.info-2
 %%INFODIR%%/emacs-w3m-ja.info-3
+%%INFODIR%%/emacs-w3m-ja.info-4
 @unexec install-info --delete %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-w3m.info
 @exec install-info %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
@@ -23,6 +24,11 @@
 %%ICONDIR%%/parent-up.xpm
 %%ICONDIR%%/reload-up.xpm
 %%ICONDIR%%/search-up.xpm
+%%ICONDIR%%/spinner.gif
+%%ICONDIR%%/state-00.xpm
+%%ICONDIR%%/state-01.xpm
+%%ICONDIR%%/state-10.xpm
+%%ICONDIR%%/state-11.xpm
 %%ICONDIR%%/weather-up.xpm
 %%LISPDIR%%/_pkg.el
 %%LISPDIR%%/_pkg.elc
@@ -47,12 +53,22 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el
+%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-bbc.el
+%%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el
+%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-chalow.el
 %%SHIMBUN%%%%LISPDIR%%/sb-chalow.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-coldsync.el
@@ -79,14 +95,14 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.el
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.el
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.el
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el
+%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
@@ -99,6 +115,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.el
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.el
+%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
 %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el
@@ -155,10 +173,16 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-pocketgames.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-quickml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-quickml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.el
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rss.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rss.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-sankei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.el
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el
@@ -191,6 +215,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-wiki.el
+%%SHIMBUN%%%%LISPDIR%%/sb-wiki.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.el
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wired.el
@@ -203,10 +229,6 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.elc
-%%SHIMBUN%%%%LISPDIR%%/shimbun-servers.el
-%%SHIMBUN%%%%LISPDIR%%/shimbun-servers.elc
 %%SHIMBUN%%%%LISPDIR%%/shimbun.el
 %%SHIMBUN%%%%LISPDIR%%/shimbun.elc
 %%LISPDIR%%/w3m-antenna.el
@@ -216,6 +238,8 @@
 %%LISPDIR%%/w3m-bookmark.elc
 %%LISPDIR%%/w3m-bug.el
 %%LISPDIR%%/w3m-bug.elc
+%%LISPDIR%%/w3m-ccl.el
+%%LISPDIR%%/w3m-ccl.elc
 %%LISPDIR%%/w3m-cookie.el
 %%LISPDIR%%/w3m-cookie.elc
 %%LISPDIR%%/w3m-dtree.el
@@ -223,13 +247,18 @@
 %%LISPDIR%%/w3m-e19.el
 %%LISPDIR%%/w3m-e20.el
 %%LISPDIR%%/w3m-e21.el
-%%LISPDIR%%/w3m-fsf.el
+%%LISPDIR%%/w3m-favicon.el
+%%LISPDIR%%/w3m-favicon.elc
+%%LISPDIR%%/w3m-filter.el
+%%LISPDIR%%/w3m-filter.elc
 %%LISPDIR%%/w3m-form.el
 %%LISPDIR%%/w3m-form.elc
+%%LISPDIR%%/w3m-fsf.el
 %%LISPDIR%%/w3m-hist.el
 %%LISPDIR%%/w3m-hist.elc
 %%LISPDIR%%/w3m-image.el
 %%LISPDIR%%/w3m-image.elc
+%%LISPDIR%%/w3m-load.el
 %%LISPDIR%%/w3m-namazu.el
 %%LISPDIR%%/w3m-namazu.elc
 %%LISPDIR%%/w3m-om.el
@@ -239,18 +268,19 @@
 %%LISPDIR%%/w3m-proc.elc
 %%LISPDIR%%/w3m-search.el
 %%LISPDIR%%/w3m-search.elc
+%%LISPDIR%%/w3m-symbol.el
+%%LISPDIR%%/w3m-symbol.elc
 %%LISPDIR%%/w3m-tabmenu.el
 %%LISPDIR%%/w3m-tabmenu.elc
 %%LISPDIR%%/w3m-ucs.el
+@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-util.el
 %%LISPDIR%%/w3m-util.elc
-@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-weather.el
 %%LISPDIR%%/w3m-weather.elc
 %%LISPDIR%%/w3m-xmas.el
-%%LISPDIR%%/w3m.elc
-%%LISPDIR%%/w3mhack.el
 %%LISPDIR%%/w3m.el
+%%LISPDIR%%/w3m.elc
 %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja
 %%PORTDOCS%%share/doc/emacs-w3m/README
 %%PORTDOCS%%@dirrm share/doc/ja/emacs-w3m
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index aaf3e35d8f7c..eb39ce43142f 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.3.6
+PORTVERSION=	1.4
 CATEGORIES=	www elisp
 MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index d0c865fbe69c..ae0f51f0d3ba 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1,2 +1,2 @@
-MD5 (emacs-w3m-1.3.6.tar.gz) = a059b220f33cddfe16ecf0722d74a0a7
-SIZE (emacs-w3m-1.3.6.tar.gz) = 569994
+MD5 (emacs-w3m-1.4.tar.gz) = 699e708cf646b3f25446aa05e9cbf9cd
+SIZE (emacs-w3m-1.4.tar.gz) = 706058
diff --git a/www/emacs-w3m/files/patch-Makefile.in b/www/emacs-w3m/files/patch-Makefile.in
index 08519e15191e..07bff0203007 100644
--- a/www/emacs-w3m/files/patch-Makefile.in
+++ b/www/emacs-w3m/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri May 30 00:15:47 2003
-+++ Makefile.in	Sun Jun 22 14:23:09 2003
+--- Makefile.in.orig	Thu Apr 29 16:50:55 2004
++++ Makefile.in	Sun Jun 13 22:08:51 2004
 @@ -56,7 +56,7 @@
  
  install-lisp: lisp
  	@$(SHELL) $(srcdir)/mkinstalldirs $(lispdir);\
 -	for p in ChangeLog* *.el; do\
 +	for p in *.el; do\
- 	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
- 	  $(INSTALL_DATA) $$p $(lispdir)/$$p;\
- 	done;\
+ 	  case "$$p" in\
+ 	    $(IGNORES)) ;;\
+ 	    *) echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index 9b22c07270af..0bd92a214ffb 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -4,6 +4,7 @@
 %%INFODIR%%/emacs-w3m-ja.info-1
 %%INFODIR%%/emacs-w3m-ja.info-2
 %%INFODIR%%/emacs-w3m-ja.info-3
+%%INFODIR%%/emacs-w3m-ja.info-4
 @unexec install-info --delete %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
 %%INFODIR%%/emacs-w3m.info
 @exec install-info %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
@@ -22,6 +23,11 @@
 %%ICONDIR%%/parent-up.xpm
 %%ICONDIR%%/reload-up.xpm
 %%ICONDIR%%/search-up.xpm
+%%ICONDIR%%/spinner.gif
+%%ICONDIR%%/state-00.xpm
+%%ICONDIR%%/state-01.xpm
+%%ICONDIR%%/state-10.xpm
+%%ICONDIR%%/state-11.xpm
 %%ICONDIR%%/weather-up.xpm
 %%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
 %%SHIMBUN%%@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc
@@ -39,12 +45,22 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el
+%%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-bbc.el
+%%SHIMBUN%%%%LISPDIR%%/sb-bbc.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.el
+%%SHIMBUN%%%%LISPDIR%%/sb-cgi-board.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-chalow.el
 %%SHIMBUN%%%%LISPDIR%%/sb-chalow.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
 %%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-coldsync.el
@@ -71,14 +87,14 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.el
-%%SHIMBUN%%%%LISPDIR%%/sb-h14m.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.el
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.el
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el
+%%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
@@ -91,6 +107,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.el
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.el
+%%SHIMBUN%%%%LISPDIR%%/sb-linux-ja.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
 %%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el
@@ -147,10 +165,16 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-pocketgames.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-quickml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-quickml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rakuten.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.el
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rss.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rss.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-sankei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.el
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-security-memo.el
@@ -183,6 +207,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-wiki.el
+%%SHIMBUN%%%%LISPDIR%%/sb-wiki.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.el
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wired.el
@@ -195,10 +221,6 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.elc
-%%SHIMBUN%%%%LISPDIR%%/shimbun-servers.el
-%%SHIMBUN%%%%LISPDIR%%/shimbun-servers.elc
 %%SHIMBUN%%%%LISPDIR%%/shimbun.el
 %%SHIMBUN%%%%LISPDIR%%/shimbun.elc
 %%LISPDIR%%/w3m-antenna.el
@@ -208,6 +230,8 @@
 %%LISPDIR%%/w3m-bookmark.elc
 %%LISPDIR%%/w3m-bug.el
 %%LISPDIR%%/w3m-bug.elc
+%%LISPDIR%%/w3m-ccl.el
+%%LISPDIR%%/w3m-ccl.elc
 %%LISPDIR%%/w3m-cookie.el
 %%LISPDIR%%/w3m-cookie.elc
 %%LISPDIR%%/w3m-dtree.el
@@ -216,14 +240,19 @@
 %%LISPDIR%%/w3m-e20.el
 %%LISPDIR%%/w3m-e21.el
 %%LISPDIR%%/w3m-e21.elc
-%%LISPDIR%%/w3m-fsf.el
-%%LISPDIR%%/w3m-fsf.elc
+%%LISPDIR%%/w3m-favicon.el
+%%LISPDIR%%/w3m-favicon.elc
+%%LISPDIR%%/w3m-filter.el
+%%LISPDIR%%/w3m-filter.elc
 %%LISPDIR%%/w3m-form.el
 %%LISPDIR%%/w3m-form.elc
+%%LISPDIR%%/w3m-fsf.el
+%%LISPDIR%%/w3m-fsf.elc
 %%LISPDIR%%/w3m-hist.el
 %%LISPDIR%%/w3m-hist.elc
 %%LISPDIR%%/w3m-image.el
 %%LISPDIR%%/w3m-image.elc
+%%LISPDIR%%/w3m-load.el
 %%LISPDIR%%/w3m-namazu.el
 %%LISPDIR%%/w3m-namazu.elc
 %%LISPDIR%%/w3m-om.el
@@ -233,17 +262,18 @@
 %%LISPDIR%%/w3m-proc.elc
 %%LISPDIR%%/w3m-search.el
 %%LISPDIR%%/w3m-search.elc
+%%LISPDIR%%/w3m-symbol.el
+%%LISPDIR%%/w3m-symbol.elc
 %%LISPDIR%%/w3m-tabmenu.el
 %%LISPDIR%%/w3m-tabmenu.elc
 %%LISPDIR%%/w3m-ucs.el
+@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-util.el
 %%LISPDIR%%/w3m-util.elc
-@unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-weather.el
 %%LISPDIR%%/w3m-weather.elc
 %%LISPDIR%%/w3m-xmas.el
 %%LISPDIR%%/w3m.elc
-%%LISPDIR%%/w3mhack.el
 %%LISPDIR%%/w3m.el
 %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja
 %%PORTDOCS%%share/doc/emacs-w3m/README