Upgrade to ndtpd-2.3.2 and eb-2.3.2. PR was for ndtpd-2.3.1 and

eb-2.3, I changed the versions and recalculated the checksums.

Also, ndtpd/patches/patch-aa (by me) is for quieting ndtpd somewhat so
it won't leave dozens of lines to /var/log/messages every time someone
looks up a word, and eb/patches/patch-aa (by Kasahara-san, the
original author) is for changing the shared lib versions.
ndtpd/Makefile's LIB_DEPENDS was adjusted accordingly.

PR:		12130
Submitted by:	maintainer
Reviewed (my changes) by: maintainer

4 files changed, 118 insertions, 99 deletions

diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 7522dc643e53..92dda7e010b3 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -1,30 +1,34 @@
 # New ports collection makefile for:	eb
-# Version required:		2.2
+# Version required:		2.3.2
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id: Makefile,v 1.2 1999/03/13 07:35:40 taoka Exp $
+# $Id: Makefile,v 1.3 1999/06/05 22:29:54 mharo Exp $
 #
 
-DISTNAME=	eb-2.2.2
-PKGNAME=	ja-eb-2.2.2
+DISTNAME=	eb-2.3.2
+PKGNAME=	ja-eb-2.3.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/appendix/old/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/ \
-		ftp://ftp.sra.co.jp/pub/misc/eb/old/
+		ftp://ftp.sra.co.jp/pub/misc/eb/old/ \
+		ftp://ftp.mei.co.jp/free/others/Dictionary/eb/appendix/ \
+		ftp://ftp.mei.co.jp/free/others/Dictionary/eb/
 DISTFILES=	${EBFILES} ${APPENDIXFILES}
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
 EBFILES=	${DISTNAME}.tar.gz
-APPENDIXFILES=	chujiten-2.3.tar.gz \
+APPENDIXFILES=	cencro-1.0.tar.gz \
+		chujiten-2.3.tar.gz \
 		chujiten2-2.0.tar.gz \
 		chujiten6-2.3.tar.gz \
 		colloc-2.0.tar.gz \
 		crownfj-2.0.tar.gz \
 		daijirin-2.0.tar.gz \
 		dd75-2.0.tar.gz \
+		genius-1.0.tar.gz \
 		global-2.0.tar.gz \
 		heritage-2.2.tar.gz \
 		izumi-2.0.tar.gz \
@@ -39,11 +43,12 @@ APPENDIXFILES=	chujiten-2.3.tar.gz \
 		plus-2.0.tar.gz \
 		readers-2.2.tar.gz \
 		readers2-2.0.tar.gz
+LISTFILES=	LIST LIST-ja
 
 EXTRACT_ONLY=	${EBFILES}
 
 DIST_SUBDIR=	eb
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-zlib
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
@@ -51,16 +56,11 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 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
-	${INSTALL_DATA} ${FILESDIR}/LIST ${APPENDIXDIR}/LIST
-	${INSTALL_DATA} ${FILESDIR}/LIST-ja ${APPENDIXDIR}/LIST-ja
-.for info in eb ebinfo ebfont ebrefile ebzip
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
+.for file in ${APPENDIXFILES}
+	${TAR} -C ${APPENDIXDIR} -zxmf ${DISTDIR}/${DIST_SUBDIR}/${file}
+.endfor
+.for file in ${LISTFILES}
+	${INSTALL_DATA} ${FILESDIR}/${file} ${APPENDIXDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/eb/distinfo b/japanese/eb/distinfo
index 88246c7f35e0..541f312e0a0a 100644
--- a/japanese/eb/distinfo
+++ b/japanese/eb/distinfo
@@ -1,4 +1,5 @@
-MD5 (eb/eb-2.2.2.tar.gz) = 13aa743fa582a1f18e7dfe4768257dac
+MD5 (eb/eb-2.3.2.tar.gz) = 92e17f181b2287f0cb00af0e4920c2d9
+MD5 (eb/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
 MD5 (eb/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
 MD5 (eb/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
 MD5 (eb/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
@@ -6,6 +7,7 @@ MD5 (eb/colloc-2.0.tar.gz) = d8a4faa20b9ef4eca5d0a92aa1bfdad5
 MD5 (eb/crownfj-2.0.tar.gz) = 7637ea60ee8bae58da1606ffba4c1815
 MD5 (eb/daijirin-2.0.tar.gz) = d56b2f50a2fd8a9dc49dcda2b075781c
 MD5 (eb/dd75-2.0.tar.gz) = 7979cfb612d8f2ab97fc1c3e7af5d653
+MD5 (eb/genius-1.0.tar.gz) = 534571189137c7f508fdea767399d0f4
 MD5 (eb/global-2.0.tar.gz) = 3750ea2d2c78ad786f1d2bc47a8c5b82
 MD5 (eb/heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
 MD5 (eb/izumi-2.0.tar.gz) = 89a0d17f13c84c0aa0e57db434eb7462
diff --git a/japanese/eb/pkg-descr b/japanese/eb/pkg-descr
index d4c5c0348aee..beed2df44f90 100644
--- a/japanese/eb/pkg-descr
+++ b/japanese/eb/pkg-descr
@@ -3,3 +3,8 @@ supports to access CD-ROM books of EB, EBG, EBXA and EPWING formats.
 CD-ROM books of those formats are popular in Japan.
 
 -- Motoyuki Kasahara <m-kasahr@sra.co.jp>
+
+You can get information about EB Library from their website.
+WWW: http://www.sra.co.jp/people/m-kasahr/eb/
+
+-- Kazutoki TAKAMUNE <takamune@avrl.mei.co.jp>
diff --git a/japanese/eb/pkg-plist b/japanese/eb/pkg-plist
index 59f0a9db676e..677370689c0e 100644
--- a/japanese/eb/pkg-plist
+++ b/japanese/eb/pkg-plist
@@ -2,15 +2,9 @@ bin/ebappendix
 bin/ebfont
 bin/ebinfo
 bin/ebrefile
-bin/ebzip
 bin/ebunzip
+bin/ebzip
 bin/ebzipinfo
-lib/libeb.a
-lib/libeb.la
-lib/libeb.so
-lib/libeb.so.2.0
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/eb/appendix.h
 include/eb/defs.h
 include/eb/eb.h
@@ -18,165 +12,184 @@ include/eb/error.h
 include/eb/font.h
 include/eb/language.h
 include/eb/text.h
-@unexec install-info --delete %D/info/eb.info %D/info/dir
-@unexec install-info --delete %D/info/ebfont.info %D/info/dir
-@unexec install-info --delete %D/info/ebinfo.info %D/info/dir
-@unexec install-info --delete %D/info/ebrefile.info %D/info/dir
-@unexec install-info --delete %D/info/ebzip.info %D/info/dir
+@dirrm include/eb
 @unexec install-info --delete %D/info/eb-ja.info %D/info/dir
+@unexec install-info --delete %D/info/eb.info %D/info/dir
 @unexec install-info --delete %D/info/ebfont-ja.info %D/info/dir
+@unexec install-info --delete %D/info/ebfont.info %D/info/dir
 @unexec install-info --delete %D/info/ebinfo-ja.info %D/info/dir
+@unexec install-info --delete %D/info/ebinfo.info %D/info/dir
 @unexec install-info --delete %D/info/ebrefile-ja.info %D/info/dir
+@unexec install-info --delete %D/info/ebrefile.info %D/info/dir
 @unexec install-info --delete %D/info/ebzip-ja.info %D/info/dir
-info/eb.info
-info/ebfont.info
-info/ebinfo.info
-info/ebrefile.info
-info/ebzip.info
+@unexec install-info --delete %D/info/ebzip.info %D/info/dir
 info/eb-ja.info
+info/eb.info
 info/ebfont-ja.info
+info/ebfont.info
 info/ebinfo-ja.info
+info/ebinfo.info
 info/ebrefile-ja.info
+info/ebrefile.info
 info/ebzip-ja.info
-@exec install-info %D/info/eb.info %D/info/dir
-@exec install-info %D/info/ebfont.info %D/info/dir
-@exec install-info %D/info/ebinfo.info %D/info/dir
-@exec install-info %D/info/ebrefile.info %D/info/dir
-@exec install-info %D/info/ebzip.info %D/info/dir
-@exec install-info %D/info/eb-ja.info %D/info/dir
-@exec install-info %D/info/ebfont-ja.info %D/info/dir
-@exec install-info %D/info/ebinfo-ja.info %D/info/dir
-@exec install-info %D/info/ebrefile-ja.info %D/info/dir
-@exec install-info %D/info/ebzip-ja.info %D/info/dir
+info/ebzip.info
+@exec [ -f %D/info/dir ] || cp -p /usr/share/info/dir-tmpl %D/info/dir
+@exec install-info %B/eb-ja.info %B/dir
+@exec install-info %B/eb.info %B/dir
+@exec install-info %B/ebfont-ja.info %B/dir
+@exec install-info %B/ebfont.info %B/dir
+@exec install-info %B/ebinfo-ja.info %B/dir
+@exec install-info %B/ebinfo.info %B/dir
+@exec install-info %B/ebrefile-ja.info %B/dir
+@exec install-info %B/ebrefile.info %B/dir
+@exec install-info %B/ebzip-ja.info %B/dir
+@exec install-info %B/ebzip.info %B/dir
+lib/libeb.a
+lib/libeb.so
+lib/libeb.so.3
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
+share/eb/appendix/cencro-1.0/catalog
+share/eb/appendix/cencro-1.0/catalog.app
+share/eb/appendix/cencro-1.0/cencro.app
+share/eb/appendix/cencro-1.0/cencro/appendix
+share/eb/appendix/chujiten-2.3/catalog
 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.app
 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/catalogs.app
+share/eb/appendix/chujiten2-2.0/chujiten.app
 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/catalog.app
 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/colloc-2.0/colloc/data/furoku
+share/eb/appendix/crownfj-2.0/catalogs
 share/eb/appendix/crownfj-2.0/catalogs.app
 share/eb/appendix/crownfj-2.0/crown_fj.app
-share/eb/appendix/crownfj-2.0/daily_ei.app
-share/eb/appendix/crownfj-2.0/catalogs
 share/eb/appendix/crownfj-2.0/crown_fj/data/furoku
+share/eb/appendix/crownfj-2.0/daily_ei.app
 share/eb/appendix/crownfj-2.0/daily_ei/data/furoku
+share/eb/appendix/daijirin-2.0/catalogs
 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/dd75-2.0/catalog
 share/eb/appendix/dd75-2.0/catalog.app
-share/eb/appendix/dd75-2.0/chujiten/appendix
 share/eb/appendix/dd75-2.0/chujiten.app
+share/eb/appendix/dd75-2.0/chujiten/appendix
 share/eb/appendix/dd75-2.0/koujien.app
 share/eb/appendix/dd75-2.0/koujien/appendix
+share/eb/appendix/genius-1.0/catalog
+share/eb/appendix/genius-1.0/catalog.app
+share/eb/appendix/genius-1.0/genius.app
+share/eb/appendix/genius-1.0/genius/appendix
+share/eb/appendix/global-2.0/catalogs
 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.app
 share/eb/appendix/heritage-2.2/bioentry/appendix
-share/eb/appendix/heritage-2.2/geoentry/appendix
+share/eb/appendix/heritage-2.2/catalog
+share/eb/appendix/heritage-2.2/catalog.app
 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/dict.app
+share/eb/appendix/heritage-2.2/dict/appendix
 share/eb/appendix/heritage-2.2/font
+share/eb/appendix/heritage-2.2/geoentry.app
+share/eb/appendix/heritage-2.2/geoentry/appendix
+share/eb/appendix/heritage-2.2/info.app
+share/eb/appendix/heritage-2.2/info/appendix
+share/eb/appendix/heritage-2.2/roget.app
+share/eb/appendix/heritage-2.2/roget/appendix
+share/eb/appendix/heritage-2.2/root.app
+share/eb/appendix/heritage-2.2/root/appendix
+share/eb/appendix/izumi-2.0/catalog
 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.app
 share/eb/appendix/jitenban-2.4/chiezo/data/furoku
+share/eb/appendix/jitenban-2.4/chujiten.app
+share/eb/appendix/jitenban-2.4/chujiten/data/furoku
+share/eb/appendix/jitenban-2.4/iwakoku.app
+share/eb/appendix/jitenban-2.4/iwakoku/data/furoku
 share/eb/appendix/jitenban-2.4/mypaedia.app
+share/eb/appendix/jitenban-2.4/mypaedia/data/furoku
+share/eb/appendix/jitenban97-2.1/catalogs
 share/eb/appendix/jitenban97-2.1/catalogs.app
+share/eb/appendix/jitenban97-2.1/chiezo.app
+share/eb/appendix/jitenban97-2.1/chiezo/data/furoku
 share/eb/appendix/jitenban97-2.1/chujiten.app
+share/eb/appendix/jitenban97-2.1/chujiten/data/furoku
 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.app
 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/kanjigen2-2.0/catalogs
 share/eb/appendix/kanjigen2-2.0/catalogs.app
 share/eb/appendix/kanjigen2-2.0/kanjigen.app
-share/eb/appendix/kanjigen2-2.0/catalogs
 share/eb/appendix/kanjigen2-2.0/kanjigen/data/furoku
+share/eb/appendix/kojien-2.3/catalog
 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/catalogs.app
+share/eb/appendix/kojien2-2.0/furoku.app
 share/eb/appendix/kojien2-2.0/furoku/data/furoku
+share/eb/appendix/kojien2-2.0/koujien.app
+share/eb/appendix/kojien2-2.0/koujien/data/furoku
+share/eb/appendix/kojien4-2.2/catalog
 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/kojien4-2.2/koujien/appendix
 share/eb/appendix/oxford-2.0/about.app
-share/eb/appendix/oxford-2.0/quick.app
+share/eb/appendix/oxford-2.0/about/appendix
 share/eb/appendix/oxford-2.0/catalog
+share/eb/appendix/oxford-2.0/catalog.app
+share/eb/appendix/oxford-2.0/oxford.app
 share/eb/appendix/oxford-2.0/oxford/appendix
+share/eb/appendix/oxford-2.0/quick.app
 share/eb/appendix/oxford-2.0/quick/appendix
+share/eb/appendix/oxford-2.0/user.app
 share/eb/appendix/oxford-2.0/user/appendix
-share/eb/appendix/oxford-2.0/about/appendix
+share/eb/appendix/plus-2.0/catalogs
 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/catalog.app
 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/catalogs.app
+share/eb/appendix/readers2-2.0/readers.app
 share/eb/appendix/readers2-2.0/readers/data/furoku
+@dirrm share/eb/appendix/cencro-1.0/cencro
+@dirrm share/eb/appendix/cencro-1.0
+@dirrm share/eb/appendix/genius-1.0/genius
+@dirrm share/eb/appendix/genius-1.0
 @dirrm share/eb/appendix/chujiten-2.3/eiwa
 @dirrm share/eb/appendix/chujiten-2.3/waei
 @dirrm share/eb/appendix/chujiten-2.3
@@ -259,6 +272,5 @@ share/eb/appendix/readers2-2.0/readers/data/furoku
 @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