1 files changed, 195 insertions, 142 deletions

diff --git a/japanese/ebnetd/pkg-plist b/japanese/ebnetd/pkg-plist
index 075e484412f3..727006800d0e 100644
--- a/japanese/ebnetd/pkg-plist
+++ b/japanese/ebnetd/pkg-plist
@@ -1,162 +1,215 @@
 bin/ebfont
 bin/ebinfo
 bin/ebappendix
-etc/ndtpd.sample
+lib/libeb.a
+lib/libeb.la
+lib/libeb.so
+lib/libeb.so.1.0
 include/eb/appendix.h
 include/eb/defs.h
 include/eb/eb.h
 include/eb/error.h
 include/eb/font.h
-include/eb/io.h
 include/eb/language.h
 include/eb/text.h
-include/eb/types.h
-lib/libeb.a
-libexec/ndtpstat
 sbin/ndtpd
 sbin/ndtpcheck
 sbin/ndtpcontrol
 sbin/ndtpdaily
-@unexec install-info --delete %D/info/ndtpd.info    %D/info/dir
+libexec/ndtpstat
+etc/ndtpd.sample
+@unexec install-info --delete %D/info/ndtpd.info %D/info/dir
 @unexec install-info --delete %D/info/ndtpd-ja.info %D/info/dir
 info/ndtpd.info
 info/ndtpd-ja.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/ndtpd.info    %D/info/dir
+@exec install-info %D/info/ndtpd.info %D/info/dir
 @exec install-info %D/info/ndtpd-ja.info %D/info/dir
-share/ndtpd/appendix/chujiten-2.3/catalog.app
-share/ndtpd/appendix/chujiten-2.3/waei.app
-share/ndtpd/appendix/chujiten-2.3/eiwa.app
-share/ndtpd/appendix/chujiten-2.3/catalog
-share/ndtpd/appendix/chujiten-2.3/eiwa/appendix
-share/ndtpd/appendix/chujiten-2.3/waei/appendix
-share/ndtpd/appendix/chujiten2-2.0/chujiten.app
-share/ndtpd/appendix/chujiten2-2.0/catalogs.app
-share/ndtpd/appendix/chujiten2-2.0/catalogs
-share/ndtpd/appendix/chujiten2-2.0/chujiten/data/furoku
-share/ndtpd/appendix/chujiten6-2.3/catalog.app
-share/ndtpd/appendix/chujiten6-2.3/catalog
-share/ndtpd/appendix/chujiten6-2.3/chujiten.app
-share/ndtpd/appendix/chujiten6-2.3/chujiten/appendix
-share/ndtpd/appendix/heritage-2.2/catalog.app
-share/ndtpd/appendix/heritage-2.2/roget.app
-share/ndtpd/appendix/heritage-2.2/dict.app
-share/ndtpd/appendix/heritage-2.2/abbrev.app
-share/ndtpd/appendix/heritage-2.2/bioentry.app
-share/ndtpd/appendix/heritage-2.2/geoentry.app
-share/ndtpd/appendix/heritage-2.2/root.app
-share/ndtpd/appendix/heritage-2.2/info.app
-share/ndtpd/appendix/heritage-2.2/catalog
-share/ndtpd/appendix/heritage-2.2/roget/appendix
-share/ndtpd/appendix/heritage-2.2/dict/appendix
-share/ndtpd/appendix/heritage-2.2/abbrev/appendix
-share/ndtpd/appendix/heritage-2.2/bioentry/appendix
-share/ndtpd/appendix/heritage-2.2/geoentry/appendix
-share/ndtpd/appendix/heritage-2.2/colleges.app
-share/ndtpd/appendix/heritage-2.2/colleges/appendix
-share/ndtpd/appendix/heritage-2.2/root/appendix
-share/ndtpd/appendix/heritage-2.2/info/appendix
-share/ndtpd/appendix/heritage-2.2/font
-share/ndtpd/appendix/jitenban-2.4/chujiten.app
-share/ndtpd/appendix/jitenban-2.4/iwakoku.app
-share/ndtpd/appendix/jitenban-2.4/catalogs
-share/ndtpd/appendix/jitenban-2.4/chiezo.app
-share/ndtpd/appendix/jitenban-2.4/mypaedia/data/furoku
-share/ndtpd/appendix/jitenban-2.4/catalogs.app
-share/ndtpd/appendix/jitenban-2.4/iwakoku/data/furoku
-share/ndtpd/appendix/jitenban-2.4/chujiten/data/furoku
-share/ndtpd/appendix/jitenban-2.4/chiezo/data/furoku
-share/ndtpd/appendix/jitenban-2.4/mypaedia.app
-share/ndtpd/appendix/jitenban97-2.1/catalogs.app
-share/ndtpd/appendix/jitenban97-2.1/chujiten.app
-share/ndtpd/appendix/jitenban97-2.1/iwakoku.app
-share/ndtpd/appendix/jitenban97-2.1/chiezo.app
-share/ndtpd/appendix/jitenban97-2.1/mypaedia.app
-share/ndtpd/appendix/jitenban97-2.1/catalogs
-share/ndtpd/appendix/jitenban97-2.1/iwakoku/data/furoku
-share/ndtpd/appendix/jitenban97-2.1/chujiten/data/furoku
-share/ndtpd/appendix/jitenban97-2.1/chiezo/data/furoku
-share/ndtpd/appendix/jitenban97-2.1/mypaedia/data/furoku
-share/ndtpd/appendix/kanjigen-2.0/catalog
-share/ndtpd/appendix/kanjigen-2.0/catalog.app
-share/ndtpd/appendix/kanjigen-2.0/gdd01.app
-share/ndtpd/appendix/kanjigen-2.0/gdd01/appendix
-share/ndtpd/appendix/kojien-2.3/catalog.app
-share/ndtpd/appendix/kojien-2.3/kojien.app
-share/ndtpd/appendix/kojien-2.3/catalog
-share/ndtpd/appendix/kojien-2.3/kojien/appendix
-share/ndtpd/appendix/kojien2-2.0/koujien.app
-share/ndtpd/appendix/kojien2-2.0/furoku.app
-share/ndtpd/appendix/kojien2-2.0/catalogs.app
-share/ndtpd/appendix/kojien2-2.0/catalogs
-share/ndtpd/appendix/kojien2-2.0/koujien/data/furoku
-share/ndtpd/appendix/kojien2-2.0/furoku/data/furoku
-share/ndtpd/appendix/kojien4-2.2/catalog.app
-share/ndtpd/appendix/kojien4-2.2/koujien/appendix
-share/ndtpd/appendix/kojien4-2.2/furoku.app
-share/ndtpd/appendix/kojien4-2.2/catalog
-share/ndtpd/appendix/kojien4-2.2/furoku/appendix
-share/ndtpd/appendix/kojien4-2.2/koujien.app
-share/ndtpd/appendix/readers-2.2/catalog.app
-share/ndtpd/appendix/readers-2.2/catalog
-share/ndtpd/appendix/readers-2.2/readers.app
-share/ndtpd/appendix/readers-2.2/readers/appendix
-share/ndtpd/appendix/readers2-2.0/readers.app
-share/ndtpd/appendix/readers2-2.0/catalogs.app
-share/ndtpd/appendix/readers2-2.0/catalogs
-share/ndtpd/appendix/readers2-2.0/readers/data/furoku
-@dirrm share/ndtpd/appendix/chujiten-2.3/eiwa
-@dirrm share/ndtpd/appendix/chujiten-2.3/waei
-@dirrm share/ndtpd/appendix/chujiten-2.3
-@dirrm share/ndtpd/appendix/chujiten2-2.0/chujiten/data
-@dirrm share/ndtpd/appendix/chujiten2-2.0/chujiten
-@dirrm share/ndtpd/appendix/chujiten2-2.0
-@dirrm share/ndtpd/appendix/chujiten6-2.3/chujiten
-@dirrm share/ndtpd/appendix/chujiten6-2.3
-@dirrm share/ndtpd/appendix/heritage-2.2/roget
-@dirrm share/ndtpd/appendix/heritage-2.2/dict
-@dirrm share/ndtpd/appendix/heritage-2.2/abbrev
-@dirrm share/ndtpd/appendix/heritage-2.2/bioentry
-@dirrm share/ndtpd/appendix/heritage-2.2/geoentry
-@dirrm share/ndtpd/appendix/heritage-2.2/colleges
-@dirrm share/ndtpd/appendix/heritage-2.2/root
-@dirrm share/ndtpd/appendix/heritage-2.2/info
-@dirrm share/ndtpd/appendix/heritage-2.2
-@dirrm share/ndtpd/appendix/jitenban-2.4/mypaedia/data
-@dirrm share/ndtpd/appendix/jitenban-2.4/mypaedia
-@dirrm share/ndtpd/appendix/jitenban-2.4/iwakoku/data
-@dirrm share/ndtpd/appendix/jitenban-2.4/iwakoku
-@dirrm share/ndtpd/appendix/jitenban-2.4/chujiten/data
-@dirrm share/ndtpd/appendix/jitenban-2.4/chujiten
-@dirrm share/ndtpd/appendix/jitenban-2.4/chiezo/data
-@dirrm share/ndtpd/appendix/jitenban-2.4/chiezo
-@dirrm share/ndtpd/appendix/jitenban-2.4
-@dirrm share/ndtpd/appendix/jitenban97-2.1/iwakoku/data
-@dirrm share/ndtpd/appendix/jitenban97-2.1/iwakoku
-@dirrm share/ndtpd/appendix/jitenban97-2.1/chujiten/data
-@dirrm share/ndtpd/appendix/jitenban97-2.1/chujiten
-@dirrm share/ndtpd/appendix/jitenban97-2.1/chiezo/data
-@dirrm share/ndtpd/appendix/jitenban97-2.1/chiezo
-@dirrm share/ndtpd/appendix/jitenban97-2.1/mypaedia/data
-@dirrm share/ndtpd/appendix/jitenban97-2.1/mypaedia
-@dirrm share/ndtpd/appendix/jitenban97-2.1
-@dirrm share/ndtpd/appendix/kanjigen-2.0/gdd01
-@dirrm share/ndtpd/appendix/kanjigen-2.0
-@dirrm share/ndtpd/appendix/kojien-2.3/kojien
-@dirrm share/ndtpd/appendix/kojien-2.3
-@dirrm share/ndtpd/appendix/kojien2-2.0/koujien/data
-@dirrm share/ndtpd/appendix/kojien2-2.0/koujien
-@dirrm share/ndtpd/appendix/kojien2-2.0/furoku/data
-@dirrm share/ndtpd/appendix/kojien2-2.0/furoku
-@dirrm share/ndtpd/appendix/kojien2-2.0
-@dirrm share/ndtpd/appendix/kojien4-2.2/koujien
-@dirrm share/ndtpd/appendix/kojien4-2.2/furoku
-@dirrm share/ndtpd/appendix/kojien4-2.2
-@dirrm share/ndtpd/appendix/readers-2.2/readers
-@dirrm share/ndtpd/appendix/readers-2.2
-@dirrm share/ndtpd/appendix/readers2-2.0/readers/data
-@dirrm share/ndtpd/appendix/readers2-2.0/readers
-@dirrm share/ndtpd/appendix/readers2-2.0
+share/eb/appendix/LIST
+share/eb/appendix/chujiten-2.3/catalog.app
+share/eb/appendix/chujiten-2.3/waei.app
+share/eb/appendix/chujiten-2.3/eiwa.app
+share/eb/appendix/chujiten-2.3/catalog
+share/eb/appendix/chujiten-2.3/eiwa/appendix
+share/eb/appendix/chujiten-2.3/waei/appendix
+share/eb/appendix/chujiten2-2.0/chujiten.app
+share/eb/appendix/chujiten2-2.0/catalogs.app
+share/eb/appendix/chujiten2-2.0/catalogs
+share/eb/appendix/chujiten2-2.0/chujiten/data/furoku
+share/eb/appendix/chujiten6-2.3/catalog.app
+share/eb/appendix/chujiten6-2.3/catalog
+share/eb/appendix/chujiten6-2.3/chujiten.app
+share/eb/appendix/chujiten6-2.3/chujiten/appendix
+share/eb/appendix/colloc-2.0/catalogs
+share/eb/appendix/colloc-2.0/catalogs.app
+share/eb/appendix/colloc-2.0/colloc/data/furoku
+share/eb/appendix/colloc-2.0/colloc.app
+share/eb/appendix/daijirin-2.0/catalogs.app
+share/eb/appendix/daijirin-2.0/dgx01.app
+share/eb/appendix/daijirin-2.0/catalogs
+share/eb/appendix/daijirin-2.0/dgx01/data/furoku
+share/eb/appendix/global-2.0/catalogs.app
+share/eb/appendix/global-2.0/gejcje.app
+share/eb/appendix/global-2.0/catalogs
+share/eb/appendix/global-2.0/gejcje/data/furoku
+share/eb/appendix/heritage-2.2/catalog.app
+share/eb/appendix/heritage-2.2/roget.app
+share/eb/appendix/heritage-2.2/dict.app
+share/eb/appendix/heritage-2.2/abbrev.app
+share/eb/appendix/heritage-2.2/bioentry.app
+share/eb/appendix/heritage-2.2/geoentry.app
+share/eb/appendix/heritage-2.2/root.app
+share/eb/appendix/heritage-2.2/info.app
+share/eb/appendix/heritage-2.2/catalog
+share/eb/appendix/heritage-2.2/roget/appendix
+share/eb/appendix/heritage-2.2/dict/appendix
+share/eb/appendix/heritage-2.2/abbrev/appendix
+share/eb/appendix/heritage-2.2/bioentry/appendix
+share/eb/appendix/heritage-2.2/geoentry/appendix
+share/eb/appendix/heritage-2.2/colleges.app
+share/eb/appendix/heritage-2.2/colleges/appendix
+share/eb/appendix/heritage-2.2/root/appendix
+share/eb/appendix/heritage-2.2/info/appendix
+share/eb/appendix/heritage-2.2/font
+share/eb/appendix/izumi-2.0/catalog.app
+share/eb/appendix/izumi-2.0/file1.app
+share/eb/appendix/izumi-2.0/catalog
+share/eb/appendix/izumi-2.0/file1/appendix
+share/eb/appendix/jitenban-2.4/chujiten.app
+share/eb/appendix/jitenban-2.4/iwakoku.app
+share/eb/appendix/jitenban-2.4/catalogs
+share/eb/appendix/jitenban-2.4/chiezo.app
+share/eb/appendix/jitenban-2.4/mypaedia/data/furoku
+share/eb/appendix/jitenban-2.4/catalogs.app
+share/eb/appendix/jitenban-2.4/iwakoku/data/furoku
+share/eb/appendix/jitenban-2.4/chujiten/data/furoku
+share/eb/appendix/jitenban-2.4/chiezo/data/furoku
+share/eb/appendix/jitenban-2.4/mypaedia.app
+share/eb/appendix/jitenban97-2.1/catalogs.app
+share/eb/appendix/jitenban97-2.1/chujiten.app
+share/eb/appendix/jitenban97-2.1/iwakoku.app
+share/eb/appendix/jitenban97-2.1/chiezo.app
+share/eb/appendix/jitenban97-2.1/mypaedia.app
+share/eb/appendix/jitenban97-2.1/catalogs
+share/eb/appendix/jitenban97-2.1/iwakoku/data/furoku
+share/eb/appendix/jitenban97-2.1/chujiten/data/furoku
+share/eb/appendix/jitenban97-2.1/chiezo/data/furoku
+share/eb/appendix/jitenban97-2.1/mypaedia/data/furoku
+share/eb/appendix/kanjigen-2.0/catalog
+share/eb/appendix/kanjigen-2.0/catalog.app
+share/eb/appendix/kanjigen-2.0/gdd01.app
+share/eb/appendix/kanjigen-2.0/gdd01/appendix
+share/eb/appendix/kojien-2.3/catalog.app
+share/eb/appendix/kojien-2.3/kojien.app
+share/eb/appendix/kojien-2.3/catalog
+share/eb/appendix/kojien-2.3/kojien/appendix
+share/eb/appendix/kojien2-2.0/koujien.app
+share/eb/appendix/kojien2-2.0/furoku.app
+share/eb/appendix/kojien2-2.0/catalogs.app
+share/eb/appendix/kojien2-2.0/catalogs
+share/eb/appendix/kojien2-2.0/koujien/data/furoku
+share/eb/appendix/kojien2-2.0/furoku/data/furoku
+share/eb/appendix/kojien4-2.2/catalog.app
+share/eb/appendix/kojien4-2.2/koujien/appendix
+share/eb/appendix/kojien4-2.2/furoku.app
+share/eb/appendix/kojien4-2.2/catalog
+share/eb/appendix/kojien4-2.2/furoku/appendix
+share/eb/appendix/kojien4-2.2/koujien.app
+share/eb/appendix/oxford-2.0/user.app
+share/eb/appendix/oxford-2.0/catalog.app
+share/eb/appendix/oxford-2.0/oxford.app
+share/eb/appendix/oxford-2.0/about.app
+share/eb/appendix/oxford-2.0/quick.app
+share/eb/appendix/oxford-2.0/catalog
+share/eb/appendix/oxford-2.0/oxford/appendix
+share/eb/appendix/oxford-2.0/quick/appendix
+share/eb/appendix/oxford-2.0/user/appendix
+share/eb/appendix/oxford-2.0/about/appendix
+share/eb/appendix/plus-2.0/catalogs.app
+share/eb/appendix/plus-2.0/plus.app
+share/eb/appendix/plus-2.0/catalogs
+share/eb/appendix/plus-2.0/plus/data/furoku
+share/eb/appendix/readers-2.2/catalog.app
+share/eb/appendix/readers-2.2/catalog
+share/eb/appendix/readers-2.2/readers.app
+share/eb/appendix/readers-2.2/readers/appendix
+share/eb/appendix/readers2-2.0/readers.app
+share/eb/appendix/readers2-2.0/catalogs.app
+share/eb/appendix/readers2-2.0/catalogs
+share/eb/appendix/readers2-2.0/readers/data/furoku
+@dirrm share/eb/appendix/chujiten-2.3/eiwa
+@dirrm share/eb/appendix/chujiten-2.3/waei
+@dirrm share/eb/appendix/chujiten-2.3
+@dirrm share/eb/appendix/chujiten2-2.0/chujiten/data
+@dirrm share/eb/appendix/chujiten2-2.0/chujiten
+@dirrm share/eb/appendix/chujiten2-2.0
+@dirrm share/eb/appendix/chujiten6-2.3/chujiten
+@dirrm share/eb/appendix/chujiten6-2.3
+@dirrm share/eb/appendix/colloc-2.0/colloc/data
+@dirrm share/eb/appendix/colloc-2.0/colloc
+@dirrm share/eb/appendix/colloc-2.0
+@dirrm share/eb/appendix/daijirin-2.0/dgx01/data
+@dirrm share/eb/appendix/daijirin-2.0/dgx01
+@dirrm share/eb/appendix/daijirin-2.0
+@dirrm share/eb/appendix/global-2.0/gejcje/data
+@dirrm share/eb/appendix/global-2.0/gejcje
+@dirrm share/eb/appendix/global-2.0
+@dirrm share/eb/appendix/heritage-2.2/roget
+@dirrm share/eb/appendix/heritage-2.2/dict
+@dirrm share/eb/appendix/heritage-2.2/abbrev
+@dirrm share/eb/appendix/heritage-2.2/bioentry
+@dirrm share/eb/appendix/heritage-2.2/geoentry
+@dirrm share/eb/appendix/heritage-2.2/colleges
+@dirrm share/eb/appendix/heritage-2.2/root
+@dirrm share/eb/appendix/heritage-2.2/info
+@dirrm share/eb/appendix/heritage-2.2
+@dirrm share/eb/appendix/izumi-2.0/file1
+@dirrm share/eb/appendix/izumi-2.0
+@dirrm share/eb/appendix/jitenban-2.4/mypaedia/data
+@dirrm share/eb/appendix/jitenban-2.4/mypaedia
+@dirrm share/eb/appendix/jitenban-2.4/iwakoku/data
+@dirrm share/eb/appendix/jitenban-2.4/iwakoku
+@dirrm share/eb/appendix/jitenban-2.4/chujiten/data
+@dirrm share/eb/appendix/jitenban-2.4/chujiten
+@dirrm share/eb/appendix/jitenban-2.4/chiezo/data
+@dirrm share/eb/appendix/jitenban-2.4/chiezo
+@dirrm share/eb/appendix/jitenban-2.4
+@dirrm share/eb/appendix/jitenban97-2.1/iwakoku/data
+@dirrm share/eb/appendix/jitenban97-2.1/iwakoku
+@dirrm share/eb/appendix/jitenban97-2.1/chujiten/data
+@dirrm share/eb/appendix/jitenban97-2.1/chujiten
+@dirrm share/eb/appendix/jitenban97-2.1/chiezo/data
+@dirrm share/eb/appendix/jitenban97-2.1/chiezo
+@dirrm share/eb/appendix/jitenban97-2.1/mypaedia/data
+@dirrm share/eb/appendix/jitenban97-2.1/mypaedia
+@dirrm share/eb/appendix/jitenban97-2.1
+@dirrm share/eb/appendix/kanjigen-2.0/gdd01
+@dirrm share/eb/appendix/kanjigen-2.0
+@dirrm share/eb/appendix/kojien-2.3/kojien
+@dirrm share/eb/appendix/kojien-2.3
+@dirrm share/eb/appendix/kojien2-2.0/koujien/data
+@dirrm share/eb/appendix/kojien2-2.0/koujien
+@dirrm share/eb/appendix/kojien2-2.0/furoku/data
+@dirrm share/eb/appendix/kojien2-2.0/furoku
+@dirrm share/eb/appendix/kojien2-2.0
+@dirrm share/eb/appendix/kojien4-2.2/koujien
+@dirrm share/eb/appendix/kojien4-2.2/furoku
+@dirrm share/eb/appendix/kojien4-2.2
+@dirrm share/eb/appendix/oxford-2.0/oxford
+@dirrm share/eb/appendix/oxford-2.0/quick
+@dirrm share/eb/appendix/oxford-2.0/user
+@dirrm share/eb/appendix/oxford-2.0/about
+@dirrm share/eb/appendix/oxford-2.0
+@dirrm share/eb/appendix/plus-2.0/plus/data
+@dirrm share/eb/appendix/plus-2.0/plus
+@dirrm share/eb/appendix/plus-2.0
+@dirrm share/eb/appendix/readers-2.2/readers
+@dirrm share/eb/appendix/readers-2.2
+@dirrm share/eb/appendix/readers2-2.0/readers/data
+@dirrm share/eb/appendix/readers2-2.0/readers
+@dirrm share/eb/appendix/readers2-2.0
 @dirrm include/eb
-@dirrm share/ndtpd/appendix
-@dirrm share/ndtpd
+@dirrm share/eb/appendix
+@dirrm share/eb
+@exec /sbin/ldconfig -m %D/lib
+@unexec /sbin/ldconfig -R