1 files changed, 160 insertions, 114 deletions

diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index f09e867b29c3..dd28df1f9036 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -17,145 +17,191 @@
 %%ICONS%%%%ICONDIR%%/weather-up.xpm
 %%ICONS%%@dirrm %%ICONDIR%%
 %%ETC%%@dirrm %%ETCDIR%%
-%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.el
-%%XEMACS_ONLY%%%%LISPDIR%%/_pkg.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.el
-%%XEMACS_ONLY%%%%LISPDIR%%/auto-autoloads.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.el
-%%XEMACS_ONLY%%%%LISPDIR%%/custom-load.elc
-%%XEMACS_ONLY%%%%LISPDIR%%/w3m-xmas.elc
+%%XEMACS%%%%LISPDIR%%/_pkg.el
+%%XEMACS%%%%LISPDIR%%/_pkg.elc
+%%XEMACS%%%%LISPDIR%%/auto-autoloads.el
+%%XEMACS%%%%LISPDIR%%/auto-autoloads.elc
+%%XEMACS%%%%LISPDIR%%/custom-load.el
+%%XEMACS%%%%LISPDIR%%/custom-load.elc
+%%XEMACS%%%%LISPDIR%%/w3m-xmas.elc
+%%LISPDIR%%/mew-shimbun.el
+@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc
 %%LISPDIR%%/mew-w3m.el
 @unexec rm -f %D/%%LISPDIR%%/mew-w3m.elc
 %%LISPDIR%%/mime-w3m.el
 @unexec rm -f %D/%%LISPDIR%%/mime-w3m.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-airs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-debian.el
-%%SHIMBUN%%%%LISPDIR%%/sb-debian.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-digiko.el
-%%SHIMBUN%%%%LISPDIR%%/sb-digiko.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ding.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ding.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-f1express.el
-%%SHIMBUN%%%%LISPDIR%%/sb-f1express.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-f1fan.el
-%%SHIMBUN%%%%LISPDIR%%/sb-f1fan.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-fml.el
-%%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
-%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
-%%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-gyve.el
-%%SHIMBUN%%%%LISPDIR%%/sb-gyve.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-isize-sports.el
-%%SHIMBUN%%%%LISPDIR%%/sb-isize-sports.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
-%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
-%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-lump.el
-%%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-m17n.el
-%%SHIMBUN%%%%LISPDIR%%/sb-m17n.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-makanai.el
-%%SHIMBUN%%%%LISPDIR%%/sb-makanai.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-meadow.el
-%%SHIMBUN%%%%LISPDIR%%/sb-meadow.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mew.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mew.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.el
-%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-muchy.el
-%%SHIMBUN%%%%LISPDIR%%/sb-muchy.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-namazu.el
-%%SHIMBUN%%%%LISPDIR%%/sb-namazu.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.el
-%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.el
-%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
-%%SHIMBUN%%%%LISPDIR%%/sb-ruby.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-sponichi.el
-%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
-%%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-text.el
-%%SHIMBUN%%%%LISPDIR%%/sb-text.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.el
-%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.el
-%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
-%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wired.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wired.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el
-%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.el
-%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
-%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.elc
-%%SHIMBUN%%%%LISPDIR%%/shimbun.el
-%%SHIMBUN%%%%LISPDIR%%/shimbun.elc
+%%LISPDIR%%/octet.el
+%%LISPDIR%%/octet.elc
+%%LISPDIR%%/sb-2ch.el
+%%LISPDIR%%/sb-2ch.elc
+%%LISPDIR%%/sb-airs.el
+%%LISPDIR%%/sb-airs.elc
+%%LISPDIR%%/sb-asahi-html.el
+%%LISPDIR%%/sb-asahi-html.elc
+%%LISPDIR%%/sb-asahi.el
+%%LISPDIR%%/sb-asahi.elc
+%%LISPDIR%%/sb-bbdb-ml.el
+%%LISPDIR%%/sb-bbdb-ml.elc
+%%LISPDIR%%/sb-cnet.el
+%%LISPDIR%%/sb-cnet.elc
+%%LISPDIR%%/sb-debian-jp.el
+%%LISPDIR%%/sb-debian-jp.elc
+%%LISPDIR%%/sb-debian.el
+%%LISPDIR%%/sb-debian.elc
+%%LISPDIR%%/sb-digiko.el
+%%LISPDIR%%/sb-digiko.elc
+%%LISPDIR%%/sb-ding.el
+%%LISPDIR%%/sb-ding.elc
+%%LISPDIR%%/sb-f1express.el
+%%LISPDIR%%/sb-f1express.elc
+%%LISPDIR%%/sb-f1fan.el
+%%LISPDIR%%/sb-f1fan.elc
+%%LISPDIR%%/sb-fml.el
+%%LISPDIR%%/sb-fml.elc
+%%LISPDIR%%/sb-geocrawler.el
+%%LISPDIR%%/sb-geocrawler.elc
+%%LISPDIR%%/sb-glimpse.el
+%%LISPDIR%%/sb-glimpse.elc
+%%LISPDIR%%/sb-gnome.el
+%%LISPDIR%%/sb-gnome.elc
+%%LISPDIR%%/sb-gyve.el
+%%LISPDIR%%/sb-gyve.elc
+%%LISPDIR%%/sb-h14m.el
+%%LISPDIR%%/sb-h14m.elc
+%%LISPDIR%%/sb-hns.el
+%%LISPDIR%%/sb-hns.elc
+%%LISPDIR%%/sb-ibm-dev.el
+%%LISPDIR%%/sb-ibm-dev.elc
+%%LISPDIR%%/sb-impress.el
+%%LISPDIR%%/sb-impress.elc
+%%LISPDIR%%/sb-isize-sports.el
+%%LISPDIR%%/sb-isize-sports.elc
+%%LISPDIR%%/sb-japantimes.el
+%%LISPDIR%%/sb-japantimes.elc
+%%LISPDIR%%/sb-javaconf.el
+%%LISPDIR%%/sb-javaconf.elc
+%%LISPDIR%%/sb-kantei.el
+%%LISPDIR%%/sb-kantei.elc
+%%LISPDIR%%/sb-kde.el
+%%LISPDIR%%/sb-kde.elc
+%%LISPDIR%%/sb-linuxce-jp.el
+%%LISPDIR%%/sb-linuxce-jp.elc
+%%LISPDIR%%/sb-lump.el
+%%LISPDIR%%/sb-lump.elc
+%%LISPDIR%%/sb-m17n.el
+%%LISPDIR%%/sb-m17n.elc
+%%LISPDIR%%/sb-mailarc.el
+%%LISPDIR%%/sb-mailarc.elc
+%%LISPDIR%%/sb-mailman.el
+%%LISPDIR%%/sb-mailman.elc
+%%LISPDIR%%/sb-mainichi.el
+%%LISPDIR%%/sb-mainichi.elc
+%%LISPDIR%%/sb-makanai.el
+%%LISPDIR%%/sb-makanai.elc
+%%LISPDIR%%/sb-marc-aims.el
+%%LISPDIR%%/sb-marc-aims.elc
+%%LISPDIR%%/sb-meadow.el
+%%LISPDIR%%/sb-meadow.elc
+%%LISPDIR%%/sb-mew.el
+%%LISPDIR%%/sb-mew.elc
+%%LISPDIR%%/sb-mhonarc.el
+%%LISPDIR%%/sb-mhonarc.elc
+%%LISPDIR%%/sb-muchy.el
+%%LISPDIR%%/sb-muchy.elc
+%%LISPDIR%%/sb-namazu.el
+%%LISPDIR%%/sb-namazu.elc
+%%LISPDIR%%/sb-netbsd.el
+%%LISPDIR%%/sb-netbsd.elc
+%%LISPDIR%%/sb-nikkansports.el
+%%LISPDIR%%/sb-nikkansports.elc
+%%LISPDIR%%/sb-nikkei.el
+%%LISPDIR%%/sb-nikkei.elc
+%%LISPDIR%%/sb-orca.el
+%%LISPDIR%%/sb-orca.elc
+%%LISPDIR%%/sb-palmfan.el
+%%LISPDIR%%/sb-palmfan.elc
+%%LISPDIR%%/sb-pcweb-column.el
+%%LISPDIR%%/sb-pcweb-column.elc
+%%LISPDIR%%/sb-pilot-link.el
+%%LISPDIR%%/sb-pilot-link.elc
+%%LISPDIR%%/sb-quickml.el
+%%LISPDIR%%/sb-quickml.elc
+%%LISPDIR%%/sb-ruby.el
+%%LISPDIR%%/sb-ruby.elc
+%%LISPDIR%%/sb-savannah.el
+%%LISPDIR%%/sb-savannah.elc
+%%LISPDIR%%/sb-security-memo.el
+%%LISPDIR%%/sb-security-memo.elc
+%%LISPDIR%%/sb-slashdot-jp.el
+%%LISPDIR%%/sb-slashdot-jp.elc
+%%LISPDIR%%/sb-sponichi.el
+%%LISPDIR%%/sb-sponichi.elc
+%%LISPDIR%%/sb-tcup.el
+%%LISPDIR%%/sb-tcup.elc
+%%LISPDIR%%/sb-texfaq.el
+%%LISPDIR%%/sb-texfaq.elc
+%%LISPDIR%%/sb-text.el
+%%LISPDIR%%/sb-text.elc
+%%LISPDIR%%/sb-toshiba.el
+%%LISPDIR%%/sb-toshiba.elc
+%%LISPDIR%%/sb-vinelinux.el
+%%LISPDIR%%/sb-vinelinux.elc
+%%LISPDIR%%/sb-w3m-dev.el
+%%LISPDIR%%/sb-w3m-dev.elc
+%%LISPDIR%%/sb-wired.el
+%%LISPDIR%%/sb-wired.elc
+%%LISPDIR%%/sb-xemacs.el
+%%LISPDIR%%/sb-xemacs.elc
+%%LISPDIR%%/sb-yahoo.el
+%%LISPDIR%%/sb-yahoo.elc
+%%LISPDIR%%/sb-yomiuri-html.el
+%%LISPDIR%%/sb-yomiuri-html.elc
+%%LISPDIR%%/sb-yomiuri.el
+%%LISPDIR%%/sb-yomiuri.elc
+%%LISPDIR%%/sb-zdnet.el
+%%LISPDIR%%/sb-zdnet.elc
+%%LISPDIR%%/shimbun.el
+%%LISPDIR%%/shimbun.elc
 %%LISPDIR%%/w3m-antenna.el
 %%LISPDIR%%/w3m-antenna.elc
+%%LISPDIR%%/w3m-bitmap.el
 %%LISPDIR%%/w3m-bookmark.el
 %%LISPDIR%%/w3m-bookmark.elc
+%%LISPDIR%%/w3m-bug.el
+%%LISPDIR%%/w3m-bug.elc
+%%LISPDIR%%/w3m-cookie.el
+%%LISPDIR%%/w3m-cookie.elc
 %%LISPDIR%%/w3m-dtree.el
 %%LISPDIR%%/w3m-dtree.elc
+%%LISPDIR%%/w3m-e19.el
 %%LISPDIR%%/w3m-e20.el
-%%EMACS20_ONLY%%%%LISPDIR%%/w3m-e20.elc
+%%EMACS20%%%%LISPDIR%%/w3m-e20.elc
 %%LISPDIR%%/w3m-e21.el
-%%EMACS21_ONLY%%%%LISPDIR%%/w3m-e21.elc
+%%EMACS21%%%%LISPDIR%%/w3m-e21.elc
 %%LISPDIR%%/w3m-filter.el
 %%LISPDIR%%/w3m-filter.elc
 %%LISPDIR%%/w3m-fsf.el
-%%EMACS_ONLY%%%%LISPDIR%%/w3m-fsf.elc
+%%EMACS%%%%LISPDIR%%/w3m-fsf.elc
 %%LISPDIR%%/w3m-form.el
 %%LISPDIR%%/w3m-form.elc
 %%LISPDIR%%/w3m-hist.el
 %%LISPDIR%%/w3m-hist.elc
-%%LISPDIR%%/w3m-macro.el
-%%LISPDIR%%/w3m-macro.elc
+%%LISPDIR%%/w3m-image.el
+%%LISPDIR%%/w3m-image.elc
 %%LISPDIR%%/w3m-namazu.el
 %%LISPDIR%%/w3m-namazu.elc
 %%LISPDIR%%/w3m-om.el
+%%LISPDIR%%/w3m-perldoc.el
+%%LISPDIR%%/w3m-perldoc.elc
+%%LISPDIR%%/w3m-proc.el
+%%LISPDIR%%/w3m-proc.elc
 %%LISPDIR%%/w3m-search.el
 %%LISPDIR%%/w3m-search.elc
+%%LISPDIR%%/w3m-tabmenu.el
+%%LISPDIR%%/w3m-tabmenu.elc
 %%LISPDIR%%/w3m-ucs.el
+%%LISPDIR%%/w3m-util.el
+%%LISPDIR%%/w3m-util.elc
 @unexec rm -f %D/%%LISPDIR%%/w3m-ucs.elc
 %%LISPDIR%%/w3m-weather.el
 %%LISPDIR%%/w3m-weather.elc