Update to 1.4.378 CVS snapshot on 2010/01/25.

Current version 1.4.4 does not support emacs23 and
new version has not been released since 2005.

2 files changed, 70 insertions, 17 deletions

diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile
index 222b6d6a2238..2986f34824f7 100644
--- a/www/emacs-w3m-xemacs21-mule/Makefile
+++ b/www/emacs-w3m-xemacs21-mule/Makefile
@@ -11,6 +11,7 @@ USE_EMACS=	yes
 EMACS_PORT_NAME=	xemacs21-mule
 COMMENT=	Simple front-end to w3m for xemacs21-mule
 
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-aclocal.m4
 CONFIGURE_ARGS=		--with-xemacs=${EMACS_CMD} \
 			--with-packagedir=${PREFIX}/${EMACS_PACKAGESDIR}
 EMACS_PACKAGESDIR=	lib/xemacs/site-packages
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
index 701e6ff393f7..0e768546d3bf 100644
--- a/www/emacs-w3m-xemacs21-mule/pkg-plist
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -1,24 +1,44 @@
 %%PKGINFODIR%%/MANIFEST.w3m
+%%ICONDIR%%/antenna-up.png
 %%ICONDIR%%/antenna-up.xpm
+%%ICONDIR%%/back-disabled.png
 %%ICONDIR%%/back-disabled.xpm
+%%ICONDIR%%/back-up.png
 %%ICONDIR%%/back-up.xpm
+%%ICONDIR%%/copy-up.png
 %%ICONDIR%%/copy-up.xpm
+%%ICONDIR%%/db-history-up.png
 %%ICONDIR%%/db-history-up.xpm
+%%ICONDIR%%/forward-disabled.png
 %%ICONDIR%%/forward-disabled.xpm
+%%ICONDIR%%/forward-up.png
 %%ICONDIR%%/forward-up.xpm
+%%ICONDIR%%/history-up.png
 %%ICONDIR%%/history-up.xpm
+%%ICONDIR%%/home-up.png
 %%ICONDIR%%/home-up.xpm
+%%ICONDIR%%/image-up.png
 %%ICONDIR%%/image-up.xpm
+%%ICONDIR%%/open-up.png
 %%ICONDIR%%/open-up.xpm
+%%ICONDIR%%/parent-disabled.png
 %%ICONDIR%%/parent-disabled.xpm
+%%ICONDIR%%/parent-up.png
 %%ICONDIR%%/parent-up.xpm
+%%ICONDIR%%/reload-up.png
 %%ICONDIR%%/reload-up.xpm
+%%ICONDIR%%/search-up.png
 %%ICONDIR%%/search-up.xpm
 %%ICONDIR%%/spinner.gif
+%%ICONDIR%%/state-00.png
 %%ICONDIR%%/state-00.xpm
+%%ICONDIR%%/state-01.png
 %%ICONDIR%%/state-01.xpm
+%%ICONDIR%%/state-10.png
 %%ICONDIR%%/state-10.xpm
+%%ICONDIR%%/state-11.png
 %%ICONDIR%%/state-11.xpm
+%%ICONDIR%%/weather-up.png
 %%ICONDIR%%/weather-up.xpm
 %%LISPDIR%%/_pkg.el
 %%LISPDIR%%/_pkg.elc
@@ -41,6 +61,10 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-2ch.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-airs.el
 %%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.el
+%%SHIMBUN%%%%LISPDIR%%/sb-aljazeera.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.el
+%%SHIMBUN%%%%LISPDIR%%/sb-arch-bluegate.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi-mytown.el
@@ -49,14 +73,16 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.el
 %%SHIMBUN%%%%LISPDIR%%/sb-atmarkit.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.el
+%%SHIMBUN%%%%LISPDIR%%/sb-atom-hash.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-atom.el
+%%SHIMBUN%%%%LISPDIR%%/sb-atom.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
@@ -69,6 +95,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-debian.el
 %%SHIMBUN%%%%LISPDIR%%/sb-debian.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.el
+%%SHIMBUN%%%%LISPDIR%%/sb-debugmagazin-de.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-dennou.el
 %%SHIMBUN%%%%LISPDIR%%/sb-dennou.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-digiko.el
@@ -79,6 +107,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-emacs-w3m.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.el
 %%SHIMBUN%%%%LISPDIR%%/sb-emacswiki.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.el
+%%SHIMBUN%%%%LISPDIR%%/sb-engadget-ja.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-excite.el
 %%SHIMBUN%%%%LISPDIR%%/sb-excite.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-exconn.el
@@ -91,6 +121,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-ffii.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-fml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-gendai-net.el
+%%SHIMBUN%%%%LISPDIR%%/sb-gendai-net.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.el
 %%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
@@ -99,6 +131,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.el
 %%SHIMBUN%%%%LISPDIR%%/sb-haiku-os.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-hash.el
+%%SHIMBUN%%%%LISPDIR%%/sb-hash.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-heise.el
 %%SHIMBUN%%%%LISPDIR%%/sb-heise.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.el
@@ -107,6 +141,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-ibm-dev.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.el
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.el
+%%SHIMBUN%%%%LISPDIR%%/sb-infoshop.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-itmedia.el
 %%SHIMBUN%%%%LISPDIR%%/sb-itmedia.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-japantimes.el
@@ -123,8 +159,6 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-laut-de.el
 %%SHIMBUN%%%%LISPDIR%%/sb-laut-de.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
@@ -157,8 +191,8 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-msdn.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.el
 %%SHIMBUN%%%%LISPDIR%%/sb-msports-nifty.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-muchy.el
-%%SHIMBUN%%%%LISPDIR%%/sb-muchy.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-multi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-multi.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-n24-de.el
 %%SHIMBUN%%%%LISPDIR%%/sb-n24-de.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-namazu.el
@@ -169,12 +203,18 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
 %%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nytimes.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-opentechpress-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-orca.el
 %%SHIMBUN%%%%LISPDIR%%/sb-orca.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el
 %%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el
 %%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.el
+%%SHIMBUN%%%%LISPDIR%%/sb-perlentaucher-de.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el
 %%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.el
@@ -189,6 +229,10 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-rediff.el
 %%SHIMBUN%%%%LISPDIR%%/sb-rediff.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rss-blogs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rss-hash.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-rss.el
 %%SHIMBUN%%%%LISPDIR%%/sb-rss.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
@@ -197,10 +241,14 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-sankei.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.el
 %%SHIMBUN%%%%LISPDIR%%/sb-savannah.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-scipy.el
+%%SHIMBUN%%%%LISPDIR%%/sb-scipy.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-slashdot.el
+%%SHIMBUN%%%%LISPDIR%%/sb-slashdot.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-sml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-sml.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-sourceforge-jp.el
@@ -213,16 +261,22 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.el
 %%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sueddeutsche-de.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
 %%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-tdiary-ml.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-tdiary.el
 %%SHIMBUN%%%%LISPDIR%%/sb-tdiary.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.el
+%%SHIMBUN%%%%LISPDIR%%/sb-tech-on.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-texfaq.el
 %%SHIMBUN%%%%LISPDIR%%/sb-texfaq.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-text.el
 %%SHIMBUN%%%%LISPDIR%%/sb-text.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.el
+%%SHIMBUN%%%%LISPDIR%%/sb-the-onion.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-the-register.el
 %%SHIMBUN%%%%LISPDIR%%/sb-the-register.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-tigris.el
@@ -233,8 +287,6 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
 %%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-weeklyworldnews.el
-%%SHIMBUN%%%%LISPDIR%%/sb-weeklyworldnews.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-welt-de.el
 %%SHIMBUN%%%%LISPDIR%%/sb-welt-de.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wiki.el
@@ -245,8 +297,6 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-wincefan.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.el
 %%SHIMBUN%%%%LISPDIR%%/sb-wired-jp.elc
-%%SHIMBUN%%%%LISPDIR%%/sb-wired.el
-%%SHIMBUN%%%%LISPDIR%%/sb-wired.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-x51.el
 %%SHIMBUN%%%%LISPDIR%%/sb-x51.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el
@@ -261,13 +311,14 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri-html.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-zdnet-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.el
 %%SHIMBUN%%%%LISPDIR%%/sb-zeit-de.elc
 %%SHIMBUN%%%%LISPDIR%%/shimbun.el
 %%SHIMBUN%%%%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
@@ -278,16 +329,15 @@
 %%LISPDIR%%/w3m-cookie.elc
 %%LISPDIR%%/w3m-dtree.el
 %%LISPDIR%%/w3m-dtree.elc
-%%LISPDIR%%/w3m-e19.el
-%%LISPDIR%%/w3m-e20.el
-%%LISPDIR%%/w3m-e21.el
+%%LISPDIR%%/w3m-ems.el
 %%LISPDIR%%/w3m-favicon.el
 %%LISPDIR%%/w3m-favicon.elc
+%%LISPDIR%%/w3m-fb.el
+%%LISPDIR%%/w3m-fb.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
@@ -295,9 +345,10 @@
 %%LISPDIR%%/w3m-lnum.el
 %%LISPDIR%%/w3m-lnum.elc
 %%LISPDIR%%/w3m-load.el
+%%LISPDIR%%/w3m-mail.el
+%%LISPDIR%%/w3m-mail.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
@@ -306,6 +357,8 @@
 %%LISPDIR%%/w3m-rss.elc
 %%LISPDIR%%/w3m-search.el
 %%LISPDIR%%/w3m-search.elc
+%%LISPDIR%%/w3m-session.el
+%%LISPDIR%%/w3m-session.elc
 %%LISPDIR%%/w3m-symbol.el
 %%LISPDIR%%/w3m-symbol.elc
 %%LISPDIR%%/w3m-tabmenu.el
@@ -316,7 +369,6 @@
 %%LISPDIR%%/w3m-util.elc
 %%LISPDIR%%/w3m-weather.el
 %%LISPDIR%%/w3m-weather.elc
-%%LISPDIR%%/w3m-xmas.el
 %%LISPDIR%%/w3m.el
 %%LISPDIR%%/w3m.elc
 %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja