8 files changed, 30 insertions, 530 deletions

diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 951c434c670c..343d4e133759 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -1,68 +1,37 @@
 # New ports collection makefile for:	ndtpd
-# Version required:		2.0.3
+# Version required:		2.2
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.4 1998/08/10 12:21:16 steve Exp $
+# $Id: Makefile,v 1.5 1998/10/16 04:32:50 jseger Exp $
 #
 
-DISTNAME=	ndtpd-2.0.3
-PKGNAME=	ja-ndtpd-2.0.3
+DISTNAME=	ndtpd-2.2
+PKGNAME=	ja-ndtpd-2.2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/appendix/ \
-		ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/appendix/old/ \
-		ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/ \
+MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/ \
 		ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/old/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${APPENDIXFILES}
-APPENDIXFILES=	chujiten-2.3.tar.gz \
-		chujiten2-2.0.tar.gz \
-		chujiten6-2.3.tar.gz \
-		colloc-2.0.tar.gz \
-		daijirin-2.0.tar.gz \
-		global-2.0.tar.gz \
-		heritage-2.2.tar.gz \
-		izumi-2.0.tar.gz \
-		jitenban-2.4.tar.gz \
-		jitenban97-2.1.tar.gz \
-		kanjigen-2.0.tar.gz \
-		kojien-2.3.tar.gz \
-		kojien2-2.0.tar.gz \
-		kojien4-2.2.tar.gz \
-		oxford-2.0.tar.gz \
-		plus-2.0.tar.gz \
-		readers-2.2.tar.gz \
-		readers2-2.0.tar.gz
 
 MAINTAINER=	m-kasahr@sra.co.jp
 
-BROKEN_ELF=	yes
+LIB_DEPENDS=	eb.2:${PORTSDIR}/japanese/eb
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-DIST_SUBDIR=	ndtpd
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --enable-ja-doc
+CONFIGURE_ARGS=	--localstatedir=/var --with-eb --with-zlib \
+		--with-eb-includes=${PREFIX}/include \
+		--with-eb-libraries=${PREFIX}/lib
+
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 .if !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	Maybe interactive at install stage
+IS_INTERACTIVE=	Maybe_interactive_at_install_stage
 .endif
 
-APPENDIXDIR=	${PREFIX}/share/eb/appendix
-
 post-install:
-	for i in ${APPENDIXFILES}; do \
-	    dir="`echo $$i | ${SED} 's/\.tar\.gz$$//'`"; \
-	    ${RM} -rf ${APPENDIXDIR}/$$dir; \
-	    (cd ${APPENDIXDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
-	done
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
-	${INSTALL_DATA} ${FILESDIR}/LIST ${APPENDIXDIR}/LIST
-.for info in ndtpd ndtpd-ja ebinfo
+.for info in ndtpd ndtpd-ja
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	@${SETENV} PKG_PREFIX=${PREFIX} IS_INTERACTIVE="${IS_INTERACTIVE}" \
diff --git a/japanese/ebnetd/distinfo b/japanese/ebnetd/distinfo
index ebaccd829f47..5898d35c1050 100644
--- a/japanese/ebnetd/distinfo
+++ b/japanese/ebnetd/distinfo
@@ -1,19 +1 @@
-MD5 (ndtpd/ndtpd-2.0.3.tar.gz) = 2b6a9a1535a3aaeb216a9fd71977e4c3
-MD5 (ndtpd/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
-MD5 (ndtpd/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
-MD5 (ndtpd/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
-MD5 (ndtpd/colloc-2.0.tar.gz) = d8a4faa20b9ef4eca5d0a92aa1bfdad5
-MD5 (ndtpd/daijirin-2.0.tar.gz) = d56b2f50a2fd8a9dc49dcda2b075781c
-MD5 (ndtpd/global-2.0.tar.gz) = 3750ea2d2c78ad786f1d2bc47a8c5b82
-MD5 (ndtpd/heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
-MD5 (ndtpd/izumi-2.0.tar.gz) = 89a0d17f13c84c0aa0e57db434eb7462
-MD5 (ndtpd/jitenban-2.4.tar.gz) = 884c9a57aef50dc55c458d5b17c04d30
-MD5 (ndtpd/jitenban97-2.1.tar.gz) = 3313235d76dbc57a2df29afd998a2894
-MD5 (ndtpd/kanjigen-2.0.tar.gz) = f023ec2e0772f3d2cf10972130971815
-MD5 (ndtpd/kojien-2.3.tar.gz) = baf54b5fd33c1fc3ce53627fc1e80d98
-MD5 (ndtpd/kojien2-2.0.tar.gz) = 00ec924d7d52d145588bed26aa24a325
-MD5 (ndtpd/kojien4-2.2.tar.gz) = b5cd05b34d24ec6c25c177550b66c787
-MD5 (ndtpd/oxford-2.0.tar.gz) = 381c35701de3c86da23922aa31337019
-MD5 (ndtpd/plus-2.0.tar.gz) = 4f03b6808fdd9032471b654b80e0c7a1
-MD5 (ndtpd/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
-MD5 (ndtpd/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
+MD5 (ndtpd-2.2.tar.gz) = ca7003f5d042e64fb56730416788d015
diff --git a/japanese/ebnetd/pkg-descr b/japanese/ebnetd/pkg-descr
index 58f348e5fb85..27f6a9a49b75 100644
--- a/japanese/ebnetd/pkg-descr
+++ b/japanese/ebnetd/pkg-descr
@@ -1,4 +1,5 @@
-NDTPD is a server for accessing CD-ROM books with NDTP (Network Dictionary Transfer Protocol) on TCP.  You can replace dserver with
+NDTPD is a server for accessing CD-ROM books with NDTP (Network
+Dictionary Transfer Protocol) on TCP.  You can replace dserver with
 NDTPD.  NDTPD can run on UNIX derived systems.  It supports to access
 CD-ROM books of EB, EBG, EBXA and EPWING formats.  CD-ROM books of
 those formats are popular in Japan.  Since CD-ROM books themseves are
diff --git a/japanese/ebnetd/pkg-plist b/japanese/ebnetd/pkg-plist
index 727006800d0e..bbc0a8195848 100644
--- a/japanese/ebnetd/pkg-plist
+++ b/japanese/ebnetd/pkg-plist
@@ -1,17 +1,3 @@
-bin/ebfont
-bin/ebinfo
-bin/ebappendix
-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/language.h
-include/eb/text.h
 sbin/ndtpd
 sbin/ndtpcheck
 sbin/ndtpcontrol
@@ -25,191 +11,3 @@ 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-ja.info %D/info/dir
-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/eb/appendix
-@dirrm share/eb
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index 951c434c670c..343d4e133759 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -1,68 +1,37 @@
 # New ports collection makefile for:	ndtpd
-# Version required:		2.0.3
+# Version required:		2.2
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.4 1998/08/10 12:21:16 steve Exp $
+# $Id: Makefile,v 1.5 1998/10/16 04:32:50 jseger Exp $
 #
 
-DISTNAME=	ndtpd-2.0.3
-PKGNAME=	ja-ndtpd-2.0.3
+DISTNAME=	ndtpd-2.2
+PKGNAME=	ja-ndtpd-2.2
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/appendix/ \
-		ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/appendix/old/ \
-		ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/ \
+MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/ \
 		ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/old/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${APPENDIXFILES}
-APPENDIXFILES=	chujiten-2.3.tar.gz \
-		chujiten2-2.0.tar.gz \
-		chujiten6-2.3.tar.gz \
-		colloc-2.0.tar.gz \
-		daijirin-2.0.tar.gz \
-		global-2.0.tar.gz \
-		heritage-2.2.tar.gz \
-		izumi-2.0.tar.gz \
-		jitenban-2.4.tar.gz \
-		jitenban97-2.1.tar.gz \
-		kanjigen-2.0.tar.gz \
-		kojien-2.3.tar.gz \
-		kojien2-2.0.tar.gz \
-		kojien4-2.2.tar.gz \
-		oxford-2.0.tar.gz \
-		plus-2.0.tar.gz \
-		readers-2.2.tar.gz \
-		readers2-2.0.tar.gz
 
 MAINTAINER=	m-kasahr@sra.co.jp
 
-BROKEN_ELF=	yes
+LIB_DEPENDS=	eb.2:${PORTSDIR}/japanese/eb
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-DIST_SUBDIR=	ndtpd
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --enable-ja-doc
+CONFIGURE_ARGS=	--localstatedir=/var --with-eb --with-zlib \
+		--with-eb-includes=${PREFIX}/include \
+		--with-eb-libraries=${PREFIX}/lib
+
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 .if !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	Maybe interactive at install stage
+IS_INTERACTIVE=	Maybe_interactive_at_install_stage
 .endif
 
-APPENDIXDIR=	${PREFIX}/share/eb/appendix
-
 post-install:
-	for i in ${APPENDIXFILES}; do \
-	    dir="`echo $$i | ${SED} 's/\.tar\.gz$$//'`"; \
-	    ${RM} -rf ${APPENDIXDIR}/$$dir; \
-	    (cd ${APPENDIXDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
-	done
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	fi
-	${INSTALL_DATA} ${FILESDIR}/LIST ${APPENDIXDIR}/LIST
-.for info in ndtpd ndtpd-ja ebinfo
+.for info in ndtpd ndtpd-ja
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	@${SETENV} PKG_PREFIX=${PREFIX} IS_INTERACTIVE="${IS_INTERACTIVE}" \
diff --git a/japanese/ndtpd/distinfo b/japanese/ndtpd/distinfo
index ebaccd829f47..5898d35c1050 100644
--- a/japanese/ndtpd/distinfo
+++ b/japanese/ndtpd/distinfo
@@ -1,19 +1 @@
-MD5 (ndtpd/ndtpd-2.0.3.tar.gz) = 2b6a9a1535a3aaeb216a9fd71977e4c3
-MD5 (ndtpd/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
-MD5 (ndtpd/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
-MD5 (ndtpd/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
-MD5 (ndtpd/colloc-2.0.tar.gz) = d8a4faa20b9ef4eca5d0a92aa1bfdad5
-MD5 (ndtpd/daijirin-2.0.tar.gz) = d56b2f50a2fd8a9dc49dcda2b075781c
-MD5 (ndtpd/global-2.0.tar.gz) = 3750ea2d2c78ad786f1d2bc47a8c5b82
-MD5 (ndtpd/heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
-MD5 (ndtpd/izumi-2.0.tar.gz) = 89a0d17f13c84c0aa0e57db434eb7462
-MD5 (ndtpd/jitenban-2.4.tar.gz) = 884c9a57aef50dc55c458d5b17c04d30
-MD5 (ndtpd/jitenban97-2.1.tar.gz) = 3313235d76dbc57a2df29afd998a2894
-MD5 (ndtpd/kanjigen-2.0.tar.gz) = f023ec2e0772f3d2cf10972130971815
-MD5 (ndtpd/kojien-2.3.tar.gz) = baf54b5fd33c1fc3ce53627fc1e80d98
-MD5 (ndtpd/kojien2-2.0.tar.gz) = 00ec924d7d52d145588bed26aa24a325
-MD5 (ndtpd/kojien4-2.2.tar.gz) = b5cd05b34d24ec6c25c177550b66c787
-MD5 (ndtpd/oxford-2.0.tar.gz) = 381c35701de3c86da23922aa31337019
-MD5 (ndtpd/plus-2.0.tar.gz) = 4f03b6808fdd9032471b654b80e0c7a1
-MD5 (ndtpd/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
-MD5 (ndtpd/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
+MD5 (ndtpd-2.2.tar.gz) = ca7003f5d042e64fb56730416788d015
diff --git a/japanese/ndtpd/pkg-descr b/japanese/ndtpd/pkg-descr
index 58f348e5fb85..27f6a9a49b75 100644
--- a/japanese/ndtpd/pkg-descr
+++ b/japanese/ndtpd/pkg-descr
@@ -1,4 +1,5 @@
-NDTPD is a server for accessing CD-ROM books with NDTP (Network Dictionary Transfer Protocol) on TCP.  You can replace dserver with
+NDTPD is a server for accessing CD-ROM books with NDTP (Network
+Dictionary Transfer Protocol) on TCP.  You can replace dserver with
 NDTPD.  NDTPD can run on UNIX derived systems.  It supports to access
 CD-ROM books of EB, EBG, EBXA and EPWING formats.  CD-ROM books of
 those formats are popular in Japan.  Since CD-ROM books themseves are
diff --git a/japanese/ndtpd/pkg-plist b/japanese/ndtpd/pkg-plist
index 727006800d0e..bbc0a8195848 100644
--- a/japanese/ndtpd/pkg-plist
+++ b/japanese/ndtpd/pkg-plist
@@ -1,17 +1,3 @@
-bin/ebfont
-bin/ebinfo
-bin/ebappendix
-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/language.h
-include/eb/text.h
 sbin/ndtpd
 sbin/ndtpcheck
 sbin/ndtpcontrol
@@ -25,191 +11,3 @@ 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-ja.info %D/info/dir
-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/eb/appendix
-@dirrm share/eb
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R