Update to 1.3.5.

Divide pkg-plist for each emacs variants.

7 files changed, 517 insertions, 72 deletions

diff --git a/www/emacs-w3m-emacs20/Makefile b/www/emacs-w3m-emacs20/Makefile
index f3e8155060ff..a2844ec21f9d 100644
--- a/www/emacs-w3m-emacs20/Makefile
+++ b/www/emacs-w3m-emacs20/Makefile
@@ -7,8 +7,8 @@
 
 MASTERDIR=	${.CURDIR}/../emacs-w3m
 
-PORTCLASS=	slave
 EMACS_PORT_NAME=	emacs20
 COMMENT=	Simple front-end to w3m for emacs20
+PLIST=			${.CURDIR}/pkg-plist
 
 .include <${MASTERDIR}/Makefile>
diff --git a/www/emacs-w3m-emacs20/pkg-plist b/www/emacs-w3m-emacs20/pkg-plist
new file mode 100644
index 000000000000..f8d9d6f6bdd8
--- /dev/null
+++ b/www/emacs-w3m-emacs20/pkg-plist
@@ -0,0 +1,229 @@
+@unexec install-info --delete %D/%%INFODIR%%/emacs-w3m-ja.info %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-w3m-ja.info
+@exec install-info %D/%%INFODIR%%/emacs-w3m-ja.info %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-w3m-ja.info-1
+%%INFODIR%%/emacs-w3m-ja.info-2
+%%INFODIR%%/emacs-w3m-ja.info-3
+@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
+%%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
+%%SHIMBUN%%@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
+%%LISPDIR%%/octet.el
+@unexec rm -f %D/%%LISPDIR%%/octet.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-2ch.el
+%%SHIMBUN%%%%LISPDIR%%/sb-2ch.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-airs.el
+%%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-anthy.el
+%%SHIMBUN%%%%LISPDIR%%/sb-anthy.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-canna-dev.el
+%%SHIMBUN%%%%LISPDIR%%/sb-canna-dev.elc
+%%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
+%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-debian.el
+%%SHIMBUN%%%%LISPDIR%%/sb-debian.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-dennou.el
+%%SHIMBUN%%%%LISPDIR%%/sb-dennou.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-digiko.el
+%%SHIMBUN%%%%LISPDIR%%/sb-digiko.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-elips.el
+%%SHIMBUN%%%%LISPDIR%%/sb-elips.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-geocrawler.el
+%%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
+%%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-japantimes.el
+%%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-jpilot.el
+%%SHIMBUN%%%%LISPDIR%%/sb-jpilot.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-jpo.el
+%%SHIMBUN%%%%LISPDIR%%/sb-jpo.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kde.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el
+%%SHIMBUN%%%%LISPDIR%%/sb-lotusex.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-lump.el
+%%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-m17n.el
+%%SHIMBUN%%%%LISPDIR%%/sb-m17n.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-macosx-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-macosx-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mailman.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mailman.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-makanai.el
+%%SHIMBUN%%%%LISPDIR%%/sb-makanai.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.el
+%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.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-nikkansports.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-orca.el
+%%SHIMBUN%%%%LISPDIR%%/sb-orca.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el
+%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-palmoslove.el
+%%SHIMBUN%%%%LISPDIR%%/sb-palmoslove.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-plucker.el
+%%SHIMBUN%%%%LISPDIR%%/sb-plucker.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-quickml.el
+%%SHIMBUN%%%%LISPDIR%%/sb-quickml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-redhat.el
+%%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.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-sponichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.el
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.el
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
+%%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-tdiary.el
+%%SHIMBUN%%%%LISPDIR%%/sb-tdiary.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.el
+%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.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-wincefan.el
+%%SHIMBUN%%%%LISPDIR%%/sb-wincefan.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-html.el
+%%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%%/nnshimbun.el
+%%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
+%%LISPDIR%%/w3m-e20.elc
+%%LISPDIR%%/w3m-e21.el
+%%LISPDIR%%/w3m-fsf.el
+%%LISPDIR%%/w3m-fsf.elc
+%%LISPDIR%%/w3m-form.el
+%%LISPDIR%%/w3m-form.elc
+%%LISPDIR%%/w3m-hist.el
+%%LISPDIR%%/w3m-hist.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
+%%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
diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile
index 1f3e2d28be81..cdfe3a8f3b29 100644
--- a/www/emacs-w3m-xemacs21-mule/Makefile
+++ b/www/emacs-w3m-xemacs21-mule/Makefile
@@ -7,8 +7,6 @@
 
 MASTERDIR=	${.CURDIR}/../emacs-w3m
 
-PORTCLASS=	slave
-
 EMACS_PORT_NAME=	xemacs21-mule
 COMMENT=	Simple front-end to w3m for xemacs21-mule
 
@@ -17,9 +15,13 @@ CONFIGURE_ARGS=		--with-xemacs=${EMACS_CMD} \
 EMACS_PACKAGESDIR=	lib/xemacs/site-packages
 LISPDIR=		${EMACS_PACKAGESDIR}/lisp/w3m
 ICONDIR=		${EMACS_PACKAGESDIR}/etc/w3m
+INFODIR=		${EMACS_PACKAGESDIR}/info
 PKGINFODIR=		${EMACS_PACKAGESDIR}/pkginfo
 INSTALL_TARGET=		install-package
 
+PLIST=			${.CURDIR}/pkg-plist
+PLIST_SUB+=		PKGINFODIR=${PKGINFODIR}
+
 WITHOUT_OCTET_VIEWER=	yes
 
 .include <${MASTERDIR}/Makefile>
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
new file mode 100644
index 000000000000..a28fd4637f64
--- /dev/null
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -0,0 +1,257 @@
+@unexec install-info --delete %D/%%INFODIR%%/emacs-w3m-ja.info %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-w3m-ja.info
+@exec install-info %D/%%INFODIR%%/emacs-w3m-ja.info %D/%%INFODIR%%/dir
+%%INFODIR%%/emacs-w3m-ja.info-1
+%%INFODIR%%/emacs-w3m-ja.info-2
+%%INFODIR%%/emacs-w3m-ja.info-3
+@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
+%%INFODIR%%/emacs-w3m.info-1
+%%INFODIR%%/emacs-w3m.info-2
+%%INFODIR%%/emacs-w3m.info-3
+%%INFODIR%%/emacs-w3m.info-4
+%%PKGINFODIR%%/MANIFEST.w3m
+%%ICONDIR%%/antenna-up.xpm
+%%ICONDIR%%/back-disabled.xpm
+%%ICONDIR%%/back-up.xpm
+%%ICONDIR%%/copy-up.xpm
+%%ICONDIR%%/db-history-up.xpm
+%%ICONDIR%%/forward-disabled.xpm
+%%ICONDIR%%/forward-up.xpm
+%%ICONDIR%%/history-up.xpm
+%%ICONDIR%%/home-up.xpm
+%%ICONDIR%%/image-up.xpm
+%%ICONDIR%%/open-up.xpm
+%%ICONDIR%%/parent-disabled.xpm
+%%ICONDIR%%/parent-up.xpm
+%%ICONDIR%%/reload-up.xpm
+%%ICONDIR%%/search-up.xpm
+%%ICONDIR%%/weather-up.xpm
+%%LISPDIR%%/_pkg.el
+%%LISPDIR%%/_pkg.elc
+%%LISPDIR%%/auto-autoloads.el
+%%LISPDIR%%/auto-autoloads.elc
+%%LISPDIR%%/custom-load.el
+%%LISPDIR%%/custom-load.elc
+%%LISPDIR%%/w3m-xmas.elc
+%%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
+%%SHIMBUN%%@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
+%%LISPDIR%%/octet.el
+@unexec rm -f %D/%%LISPDIR%%/octet.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-2ch.el
+%%SHIMBUN%%%%LISPDIR%%/sb-2ch.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-airs.el
+%%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-anthy.el
+%%SHIMBUN%%%%LISPDIR%%/sb-anthy.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-canna-dev.el
+%%SHIMBUN%%%%LISPDIR%%/sb-canna-dev.elc
+%%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
+%%SHIMBUN%%%%LISPDIR%%/sb-debian-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-debian.el
+%%SHIMBUN%%%%LISPDIR%%/sb-debian.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-dennou.el
+%%SHIMBUN%%%%LISPDIR%%/sb-dennou.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-digiko.el
+%%SHIMBUN%%%%LISPDIR%%/sb-digiko.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-elips.el
+%%SHIMBUN%%%%LISPDIR%%/sb-elips.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-geocrawler.el
+%%SHIMBUN%%%%LISPDIR%%/sb-geocrawler.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
+%%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-japantimes.el
+%%SHIMBUN%%%%LISPDIR%%/sb-japantimes.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-jpilot.el
+%%SHIMBUN%%%%LISPDIR%%/sb-jpilot.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-jpo.el
+%%SHIMBUN%%%%LISPDIR%%/sb-jpo.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kde.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kde.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-lotusex.el
+%%SHIMBUN%%%%LISPDIR%%/sb-lotusex.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-lump.el
+%%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-m17n.el
+%%SHIMBUN%%%%LISPDIR%%/sb-m17n.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-macosx-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-macosx-jp.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mailarc.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mailman.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mailman.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-makanai.el
+%%SHIMBUN%%%%LISPDIR%%/sb-makanai.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.el
+%%SHIMBUN%%%%LISPDIR%%/sb-marc-aims.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-nikkansports.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkansports.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-orca.el
+%%SHIMBUN%%%%LISPDIR%%/sb-orca.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.el
+%%SHIMBUN%%%%LISPDIR%%/sb-palmfan.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-palmoslove.el
+%%SHIMBUN%%%%LISPDIR%%/sb-palmoslove.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pcweb-column.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-link.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.el
+%%SHIMBUN%%%%LISPDIR%%/sb-pilot-mailsync.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-plucker.el
+%%SHIMBUN%%%%LISPDIR%%/sb-plucker.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-quickml.el
+%%SHIMBUN%%%%LISPDIR%%/sb-quickml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-redhat.el
+%%SHIMBUN%%%%LISPDIR%%/sb-redhat.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.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-sponichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.el
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-dev.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.el
+%%SHIMBUN%%%%LISPDIR%%/sb-squeak-ja.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
+%%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-tdiary.el
+%%SHIMBUN%%%%LISPDIR%%/sb-tdiary.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.el
+%%SHIMBUN%%%%LISPDIR%%/sb-texfaq.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-wincefan.el
+%%SHIMBUN%%%%LISPDIR%%/sb-wincefan.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-html.el
+%%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%%/nnshimbun.el
+%%LISPDIR%%/nnshimbun.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
+%%LISPDIR%%/w3m-e21.el
+%%LISPDIR%%/w3m-fsf.el
+%%LISPDIR%%/w3m-form.el
+%%LISPDIR%%/w3m-form.elc
+%%LISPDIR%%/w3m-hist.el
+%%LISPDIR%%/w3m-hist.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
+%%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
+%%PORTDOCS%%@dirrm share/doc/ja/emacs-w3m
+%%PORTDOCS%%@dirrm share/doc/emacs-w3m
+@dirrm %%ICONDIR%%
+@dirrm %%LISPDIR%%
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 4ecadf1772e8..b68f726e876d 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	www elisp
 MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -23,23 +23,14 @@ LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/w3m
 ICONDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
 ETCDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m
 INFODIR?=	info
-PKGINFODIR?=	"@comment "
 
 USE_AUTOCONF=	yes
 ALL_TARGET=	default
 
-PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS=${XEMACS} \
-		EMACS20=${EMACS20} \
-		EMACS21=${EMACS21} \
-		EMACS=${EMACS} \
-		LISPDIR=${LISPDIR} \
+PLIST_SUB+=	LISPDIR=${LISPDIR} \
 		ICONDIR=${ICONDIR} \
-		ETCDIR=${ETCDIR} \
 		INFODIR=${INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		ICONS=${ICONS} \
-		ETC=${ETC} \
+		ETCDIR=${ETCDIR} \
 		SHIMBUN=${SHIMBUN}
 
 DOCS=		README
@@ -48,32 +39,6 @@ DOCS_JA=	README.ja
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
 
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-XEMACS=		""
-EMACS=		"@comment "
-EMACS20=	"@comment "
-EMACS21=	"@comment "
-ICONS=		""
-ETC=		"@comment "
-.else
-.if (${EMACS_PORT_NAME} == "emacs20")
-XEMACS=		"@comment "
-EMACS=		""
-EMACS20=	""
-EMACS21=	"@comment "
-ICONS=		"@comment "
-ETC=		"@comment "
-.else
-XEMACS=		"@comment "
-EMACS=		""
-EMACS20=	"@comment "
-EMACS21=	""
-ICONS=		""
-ETC=		""
-INSTALL_TARGET=	install install-icons
-.endif
-.endif
-
 .if defined(WITHOUT_SHIMBUN)
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
 SHIMBUN=	"@comment "
@@ -86,6 +51,7 @@ SHIMBUN=	""
 FLIM_PORT=	${PORTSDIR}/editors/flim
 SEMI_PORT=	${PORTSDIR}/editors/semi
 MULE_UCS_PORT=	${PORTSDIR}/converters/mule-ucs
+INSTALL_TARGET=	install install-icons
 .endif
 
 FLIM_TRUNK=	1.14
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 90a9e79a025b..04ffb1edf65e 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1 +1 @@
-MD5 (emacs-w3m-1.3.4.tar.gz) = 0eedca4336ebe5acc44f989604398e03
+MD5 (emacs-w3m-1.3.5.tar.gz) = 2e9c9d66b7150b4b006ee8b283145fef
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index 484b48e98401..d4e919907dc3 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -11,32 +11,22 @@
 %%INFODIR%%/emacs-w3m.info-2
 %%INFODIR%%/emacs-w3m.info-3
 %%INFODIR%%/emacs-w3m.info-4
-%%PKGINFODIR%%/MANIFEST.w3m
-%%ICONS%%%%ICONDIR%%/antenna-up.xpm
-%%ICONS%%%%ICONDIR%%/back-disabled.xpm
-%%ICONS%%%%ICONDIR%%/back-up.xpm
-%%ICONS%%%%ICONDIR%%/copy-up.xpm
-%%ICONS%%%%ICONDIR%%/db-history-up.xpm
-%%ICONS%%%%ICONDIR%%/forward-disabled.xpm
-%%ICONS%%%%ICONDIR%%/forward-up.xpm
-%%ICONS%%%%ICONDIR%%/history-up.xpm
-%%ICONS%%%%ICONDIR%%/home-up.xpm
-%%ICONS%%%%ICONDIR%%/image-up.xpm
-%%ICONS%%%%ICONDIR%%/open-up.xpm
-%%ICONS%%%%ICONDIR%%/parent-disabled.xpm
-%%ICONS%%%%ICONDIR%%/parent-up.xpm
-%%ICONS%%%%ICONDIR%%/reload-up.xpm
-%%ICONS%%%%ICONDIR%%/search-up.xpm
-%%ICONS%%%%ICONDIR%%/weather-up.xpm
-%%ICONS%%@dirrm %%ICONDIR%%
-%%ETC%%@dirrm %%ETCDIR%%
-%%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
+%%ICONDIR%%/antenna-up.xpm
+%%ICONDIR%%/back-disabled.xpm
+%%ICONDIR%%/back-up.xpm
+%%ICONDIR%%/copy-up.xpm
+%%ICONDIR%%/db-history-up.xpm
+%%ICONDIR%%/forward-disabled.xpm
+%%ICONDIR%%/forward-up.xpm
+%%ICONDIR%%/history-up.xpm
+%%ICONDIR%%/home-up.xpm
+%%ICONDIR%%/image-up.xpm
+%%ICONDIR%%/open-up.xpm
+%%ICONDIR%%/parent-disabled.xpm
+%%ICONDIR%%/parent-up.xpm
+%%ICONDIR%%/reload-up.xpm
+%%ICONDIR%%/search-up.xpm
+%%ICONDIR%%/weather-up.xpm
 %%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
 %%SHIMBUN%%@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc
 %%LISPDIR%%/mew-w3m.el
@@ -222,11 +212,10 @@
 %%LISPDIR%%/w3m-dtree.elc
 %%LISPDIR%%/w3m-e19.el
 %%LISPDIR%%/w3m-e20.el
-%%EMACS20%%%%LISPDIR%%/w3m-e20.elc
 %%LISPDIR%%/w3m-e21.el
-%%EMACS21%%%%LISPDIR%%/w3m-e21.elc
+%%LISPDIR%%/w3m-e21.elc
 %%LISPDIR%%/w3m-fsf.el
-%%EMACS%%%%LISPDIR%%/w3m-fsf.elc
+%%LISPDIR%%/w3m-fsf.elc
 %%LISPDIR%%/w3m-form.el
 %%LISPDIR%%/w3m-form.elc
 %%LISPDIR%%/w3m-hist.el
@@ -254,8 +243,10 @@
 %%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%%
+@dirrm %%ICONDIR%%
+@dirrm %%ETCDIR%%