Update to 1.3.1.

6 files changed, 219 insertions, 178 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index faf328595728..c17f17688ef4 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.2.7
+PORTVERSION=	1.3.1
 CATEGORIES=	www elisp
 MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -28,15 +28,14 @@ USE_AUTOCONF=	yes
 ALL_TARGET=	default
 
 PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS_ONLY=${XEMACS_ONLY} \
-		EMACS20_ONLY=${EMACS20_ONLY} \
-		EMACS21_ONLY=${EMACS21_ONLY} \
-		EMACS_ONLY=${EMACS_ONLY} \
+		XEMACS=${XEMACS} \
+		EMACS20=${EMACS20} \
+		EMACS21=${EMACS21} \
+		EMACS=${EMACS} \
 		LISPDIR=${LISPDIR} \
 		ICONDIR=${ICONDIR} \
 		ETCDIR=${ETCDIR} \
 		PKGINFODIR=${PKGINFODIR} \
-		SHIMBUN=${SHIMBUN} \
 		ICONS=${ICONS} \
 		ETC=${ETC}
 
@@ -47,25 +46,25 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
 
 .if (${EMACS_PORT_NAME} == "xemacs21-mule")
-XEMACS_ONLY=	""
-EMACS_ONLY=	"@comment "
-EMACS20_ONLY=	"@comment "
-EMACS21_ONLY=	"@comment "
+XEMACS=		""
+EMACS=		"@comment "
+EMACS20=	"@comment "
+EMACS21=	"@comment "
 ICONS=		""
 ETC=		"@comment "
 .else
 .if (${EMACS_PORT_NAME} == "emacs20")
-XEMACS_ONLY=	"@comment "
-EMACS_ONLY=	""
-EMACS20_ONLY=	""
-EMACS21_ONLY=	"@comment "
+XEMACS=		"@comment "
+EMACS=		""
+EMACS20=	""
+EMACS21=	"@comment "
 ICONS=		"@comment "
 ETC=		"@comment "
 .else
-XEMACS_ONLY=	"@comment "
-EMACS_ONLY=	""
-EMACS20_ONLY=	"@comment "
-EMACS21_ONLY=	""
+XEMACS=		"@comment "
+EMACS=		""
+EMACS20=	"@comment "
+EMACS21=	""
 ICONS=		""
 ETC=		""
 INSTALL_TARGET=	install install-icons
@@ -74,38 +73,40 @@ INSTALL_TARGET=	install install-icons
 
 .include <bsd.port.pre.mk>
 
-FLIM_TRUNK=	1.14
-FLIM_COOKIE=	${LOCALBASE}/share/flim/flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
 .if (${EMACS_PORT_NAME} == "emacs21")
 FLIM_PORT=	${PORTSDIR}/editors/flim
-.else
-FLIM_PORT=	${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}
-.endif
-
-.if defined(WITH_SHIMBUN)
-HAVE_FLIM=	yes
-SHIMBUN=	""
-.else
-.if exists(${FLIM_COOKIE})
-HAVE_FLIM=	yes
-SHIMBUN=	""
-.else
-SHIMBUN=	"@comment "
-.endif
+SEMI_PORT=	${PORTSDIR}/editors/semi
+MULE_UCS_PORT=	${PORTSDIR}/converters/mule-ucs
 .endif
 
-.if defined(HAVE_FLIM)
-BUILD_DEPENDS+=	${FLIM_COOKIE}:${FLIM_PORT}
-RUN_DEPENDS+=		${FLIM_COOKIE}:${FLIM_PORT}
+FLIM_TRUNK=	1.14
+FLIM_COOKIE=	${LOCALBASE}/share/flim/flim-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+FLIM_PORT?=	${PORTSDIR}/editors/flim-${EMACS_PORT_NAME}
+
+SEMI_TRUNK=	1.14
+SEMI_COOKIE=	${LOCALBASE}/share/semi/semi-${EMACS_PORT_NAME}-${FLIM_TRUNK}.FreeBSD-packages
+SEMI_PORT?=	${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}
+
+MULE_UCS_PORT?=	${PORTSDIR}/converters/mule-ucs-${EMACS_PORT_NAME}
+MULE_UCS_ELISP_FILE=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs/un-define.el
+
+BUILD_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n \
+		${FLIM_COOKIE}:${FLIM_PORT}
+RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m-m17n \
+		${FLIM_COOKIE}:${FLIM_PORT}
+.if (${EMACS_PORT_NAME} != "xemacs21-mule" && !defined(WITHOUT_OCTET_VIEWER))
+RUN_DEPENDS+=	${SEMI_COOKIE}:${SEMI_PORT} \
+		wvHtml:${PORTSDIR}/textproc/wv \
+		xlhtml:${PORTSDIR}/textproc/xlhtml \
+		${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
 .endif
-BUILD_DEPENDS+=	w3m:${PORTSDIR}/www/w3m-m17n
-RUN_DEPENDS+=		w3m:${PORTSDIR}/www/w3m-m17n
 
-.if !defined(HAVE_FLIM)
 pre-everything::
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> You can have shimbun support by adding \"WITH_SHIMBUN=yes\" to argument of make."
-	@${ECHO_MSG} "====>"
+.if (${EMACS_PORT_NAME} != "xemacs21-mule" || !defined(WITHOUT_OCTET_VIEWER))
+	@${ECHO_MSG} "===>"
+	@${ECHO_MSG} "===>  If you don't use octet stream viewer,"
+	@${ECHO_MSG} "===>  please define WITHOUT_OCTET_VIEWER."
+	@${ECHO_MSG} "===>"
 .endif
 
 post-extract:
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 71b1831b55d5..7f5825d1b448 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1 +1 @@
-MD5 (w3m_el-1.2.7.tar.gz) = f313fa562f6b1ad55bc5c6dadd7363c0
+MD5 (w3m_el-1.3.1.tar.gz) = 36ce7a3a05cbce8b526f32fec66ec8f8
diff --git a/www/emacs-w3m/files/_pkg.el b/www/emacs-w3m/files/_pkg.el
index 772e07229337..dd5c3a8e146e 100644
--- a/www/emacs-w3m/files/_pkg.el
+++ b/www/emacs-w3m/files/_pkg.el
@@ -1,4 +1,4 @@
 ;;;###autoload
 (package-provide 'w3m
-                 :version 0.2
+                 :version 1.3
                  :type 'regular)
diff --git a/www/emacs-w3m/files/patch-Makefile.in b/www/emacs-w3m/files/patch-Makefile.in
index c83dad7b004d..c27d78bb1d0e 100644
--- a/www/emacs-w3m/files/patch-Makefile.in
+++ b/www/emacs-w3m/files/patch-Makefile.in
@@ -1,10 +1,10 @@
---- Makefile.in.orig	Sat Mar 24 03:52:13 2001
-+++ Makefile.in	Sat Mar 24 03:52:22 2001
-@@ -41,7 +41,7 @@
+--- Makefile.in.orig	Mon Jul  1 00:49:09 2002
++++ Makefile.in	Mon Jul  1 00:49:17 2002
+@@ -32,7 +32,7 @@
  
  install: default
  	@$(SHELL) ./mkinstalldirs $(lispdir);\
--	for p in ChangeLog *.el; do\
+-	for p in ChangeLog* *.el; do\
 +	for p in *.el; do\
  	  echo " $(INSTALL_DATA) $$p $(lispdir)/$$p";\
  	  $(INSTALL_DATA) $$p $(lispdir)/$$p;\
diff --git a/www/emacs-w3m/pkg-message b/www/emacs-w3m/pkg-message
index 6be273457676..91687eaf932d 100644
--- a/www/emacs-w3m/pkg-message
+++ b/www/emacs-w3m/pkg-message
@@ -5,22 +5,16 @@
 *                                                                  *
 * To use emacs-w3m on Wanderlust, add this to your own .emacs:     *
 *                                                                  *
-* (setq mime-setup-enable-inline-html nil)                         *
-* (eval-after-load "mime-view"                                     *
-*   '(progn                                                        *
-*     (autoload 'mime-w3m-preview-text/html "mime-w3m")            *
-*     (ctree-set-calist-strictly                                   *
-*      'mime-preview-condition                                     *
-*      '((type . text) (subtype . html) (body . visible)           *
-*	 (body-presentation-method . mime-w3m-preview-text/html))) *
-*     (set-alist 'mime-view-type-subtype-score-alist               *
-*		 '(text . html) 3)))                               *
+* (require 'mime-w3m)                                              *
 *                                                                  *
-* And to use emacs-w3m on Mew, add this to your own .mew.el:       *
+* To use emacs-w3m on Mew, add this to your own .mew.el:           *
 *                                                                  *
-* (condition-case nil                                              *
-*     (require 'mew-w3m)                                           *
-*   (file-error nil))                                              *
-* (setq w3m-type 'w3m-m17n)                                        *
+* (require 'mew-w3m)                                               *
+* (setq mew-prog-html '(mew-mime-text/html-w3m nil nil))           *
 *                                                                  *
+* And to use octet stream viewer, add this to your own .emacs:     *
+*                                                                  *
+* (require 'w3m)                                                   *
+* (require 'octet)                                                 *
+* (octet-mime-setup)                                               *
 ********************************************************************
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