1 files changed, 21 insertions, 30 deletions
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%%