1 files changed, 80 insertions, 41 deletions

diff --git a/japanese/ddskk/pkg-plist b/japanese/ddskk/pkg-plist
index 09e91810fb03..df7299b74fc7 100644
--- a/japanese/ddskk/pkg-plist
+++ b/japanese/ddskk/pkg-plist
@@ -1,48 +1,87 @@
-%%ELISPSUBDIR%%/avltree.el
-%%ELISPSUBDIR%%/avltree.elc
-%%ELISPSUBDIR%%/elib-node.el
-%%ELISPSUBDIR%%/elib-node.elc
-%%ELISPSUBDIR%%/queue-m.el
-%%ELISPSUBDIR%%/queue-m.elc
-%%ELISPSUBDIR%%/skk-auto.el
-%%ELISPSUBDIR%%/skk-auto.elc
-%%ELISPSUBDIR%%/skk-comp.el
-%%ELISPSUBDIR%%/skk-comp.elc
-%%ELISPSUBDIR%%/skk-e19.el
-%%ELISPSUBDIR%%/skk-e19.elc
-%%ELISPSUBDIR%%/skk-gadget.el
-%%ELISPSUBDIR%%/skk-gadget.elc
-%%ELISPSUBDIR%%/skk-isearch.el
-%%ELISPSUBDIR%%/skk-isearch.elc
-%%ELISPSUBDIR%%/skk-kakasi.el
-%%ELISPSUBDIR%%/skk-kakasi.elc
-%%ELISPSUBDIR%%/skk-kcode.el
-%%ELISPSUBDIR%%/skk-kcode.elc
-%%ELISPSUBDIR%%/skk-num.el
-%%ELISPSUBDIR%%/skk-num.elc
-%%ELISPSUBDIR%%/skk-server.el
-%%ELISPSUBDIR%%/skk-server.elc
-%%ELISPSUBDIR%%/skk-tree.el
-%%ELISPSUBDIR%%/skk-tree.elc
-%%ELISPSUBDIR%%/skk-tut.el
-%%ELISPSUBDIR%%/skk-tut.elc
-%%ELISPSUBDIR%%/skk-vip.el
-%%ELISPSUBDIR%%/skk-vip.elc
-%%ELISPSUBDIR%%/skk.el
-%%ELISPSUBDIR%%/skk.elc
-%%ELISPSUBDIR%%/stack-m.el
-%%ELISPSUBDIR%%/stack-m.elc
-%%ELISPSUBDIR%%/string.el
-%%ELISPSUBDIR%%/string.elc
-@dirrm %%ELISPSUBDIR%%
-share/skk/SKK.tut
-share/skk/SKK.tut.E
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/ccc.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/queue-m.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/leim-list.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-abbrev.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-annotation.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-auto.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-autoloads.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-comp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cursor.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-cus.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dcomp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-develop.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-dic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-e21.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-gadget.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-isearch.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0201.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisx0213.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-jisyo-edit-mode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kakasi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-kcode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-leim.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-look.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-lookup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-macs.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-num.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-obsolete.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-server.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-tut.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-vars.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-version.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk-viper.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.el
+%%EMACS_VERSION_SITE_LISPDIR%%/skk/skk.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/skk
 @unexec install-info --delete %D/info/skk.info %D/info/dir
 info/skk.info
 info/skk.info-1
 info/skk.info-2
 info/skk.info-3
 info/skk.info-4
-info/skk.info-5
-info/skk.info-6
 @exec install-info %D/info/skk.info %D/info/dir
+share/skk/NICOLA-SKK.tut
+share/skk/SKK.tut
+share/skk/SKK.tut.E
+@dirrm share/skk
+share/examples/ddskk/Emacs.ad
+share/examples/ddskk/dot.emacs
+share/examples/ddskk/dot.skk
+@dirrm share/examples/ddskk
+%%PORTDOCS%%share/doc/ddskk/AUTHORS
+%%PORTDOCS%%share/doc/ddskk/Codename
+%%PORTDOCS%%share/doc/ddskk/Contributors
+%%PORTDOCS%%share/doc/ddskk/FAQ.txt
+%%PORTDOCS%%share/doc/ddskk/NEWS
+%%PORTDOCS%%share/doc/ddskk/README
+%%PORTDOCS%%@dirrm share/doc/ddskk