Fix package (broken in recent i386 bulk build) and fully update to 3.2.3.

* Use genius2-1.1.
* Fix distinfo to match Makefile distfile list.

Changes since 3.2.2 include:
* eb/subbook.c (eb_set_subbook_epwing): Open `honmon2' for
  sound or graphic file if `honmong' or `honmons' doesn't exist.
* eb/binary.c (eb_set_binary_wave): Fix a bug that the function
  composes broken WAVE header.
* eb/text.h, eb/readtext.c: Define `EB_HOOK_BEGIN_DECORATION' and
  `EB_HOOK_END_DECORATION', requested from Kenichi SUTO.

3 files changed, 35 insertions, 26 deletions

diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 807a4f1ffbb..bd5ce7dc39e 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/02/06 04:24:12 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2003/02/08 12:38:08 cjep Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 
 DISTNAME=	eb-3.2.3
@@ -29,7 +29,7 @@ EB_APPENDICES=	\
 		daijirin-2.0.tar.gz \
 		dd75-2.0.tar.gz \
 		genius-1.0.tar.gz \
-		genius2-1.0.tar.gz \
+		genius2-1.1.tar.gz \
 		global-2.0.tar.gz \
 		heritage-2.2.tar.gz \
 		izumi-2.0.tar.gz \
diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST
index b2b54e38f1e..6d13dde4513 100644
--- a/textproc/eb/PLIST
+++ b/textproc/eb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/25 18:39:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/02/08 12:38:08 cjep Exp $
 bin/ebappendix
 bin/ebfont
 bin/ebinfo
@@ -15,38 +15,38 @@ include/eb/error.h
 include/eb/font.h
 include/eb/text.h
 include/eb/zio.h
-@unexec install-info --delete --info-dir=%D/info %D/info/eb-ja.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebfont-ja.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebfont.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebinfo-ja.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebinfo.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebrefile-ja.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebrefile.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebzip-ja.info
-@unexec install-info --delete --info-dir=%D/info %D/info/ebzip.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/eb-ja.info
 info/eb-ja.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/eb-ja.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont-ja.info
 info/ebfont-ja.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont-ja.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebfont.info
 info/ebfont.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebfont.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo-ja.info
 info/ebinfo-ja.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo-ja.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebinfo.info
 info/ebinfo.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebinfo.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile-ja.info
 info/ebrefile-ja.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile-ja.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebrefile.info
 info/ebrefile.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebrefile.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip-ja.info
 info/ebzip-ja.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip-ja.info
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ebzip.info
 info/ebzip.info
-@exec install-info --info-dir=%D/info %D/info/ebzip.info
-@exec install-info --info-dir=%D/info %D/info/ebzip-ja.info
-@exec install-info --info-dir=%D/info %D/info/ebrefile.info
-@exec install-info --info-dir=%D/info %D/info/ebrefile-ja.info
-@exec install-info --info-dir=%D/info %D/info/ebinfo.info
-@exec install-info --info-dir=%D/info %D/info/ebinfo-ja.info
-@exec install-info --info-dir=%D/info %D/info/ebfont.info
-@exec install-info --info-dir=%D/info %D/info/ebfont-ja.info
-@exec install-info --info-dir=%D/info %D/info/eb-ja.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ebzip.info
 lib/libeb.a
 lib/libeb.la
 lib/libeb.so
 lib/libeb.so.6
-lib/libeb.so.6.2
+lib/libeb.so.6.3
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
@@ -81,9 +81,9 @@ share/eb/appendix/crownfj2-1.0/catalog
 share/eb/appendix/crownfj2-1.0/catalog.app
 share/eb/appendix/crownfj2-1.0/crfre.app
 share/eb/appendix/crownfj2-1.0/crfre/appendix
+share/eb/appendix/crowngj-1.0/catalog
 share/eb/appendix/crowngj-1.0/catalog.app
 share/eb/appendix/crowngj-1.0/crger.app
-share/eb/appendix/crowngj-1.0/catalog
 share/eb/appendix/crowngj-1.0/crger/appendix
 share/eb/appendix/daihyakka-1.0/catalog
 share/eb/appendix/daihyakka-1.0/catalog.app
@@ -103,6 +103,10 @@ 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/genius2-1.1/catalogs
+share/eb/appendix/genius2-1.1/catalogs.app
+share/eb/appendix/genius2-1.1/genius.app
+share/eb/appendix/genius2-1.1/genius/data/furoku
 share/eb/appendix/global-2.0/catalogs
 share/eb/appendix/global-2.0/catalogs.app
 share/eb/appendix/global-2.0/gejcje.app
@@ -288,6 +292,9 @@ share/eb/eb3.m4
 @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/genius2-1.1/genius/data
+@dirrm share/eb/appendix/genius2-1.1/genius
+@dirrm share/eb/appendix/genius2-1.1
 @dirrm share/eb/appendix/genius-1.0/genius
 @dirrm share/eb/appendix/genius-1.0
 @dirrm share/eb/appendix/dd75-2.0/koujien
diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo
index 1cd687fb7b5..441561df3f3 100644
--- a/textproc/eb/distinfo
+++ b/textproc/eb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 18:40:00 jlam Exp $
+$NetBSD: distinfo,v 1.6 2003/02/08 12:38:08 cjep Exp $
 
-SHA1 (eb/eb-3.2.2.tar.gz) = ae6fa87b996c239d95a8e24a4514eadb3cd9fb80
-Size (eb/eb-3.2.2.tar.gz) = 1010300 bytes
+SHA1 (eb/eb-3.2.3.tar.gz) = 1812f7773f5352403d3fd40a5d7c75b0f02c4ea8
+Size (eb/eb-3.2.3.tar.gz) = 1011232 bytes
 SHA1 (eb/LIST) = 03cc7f7c41b415fd7ea9c119ee1cb9c445617cdd
 Size (eb/LIST) = 9136 bytes
 SHA1 (eb/LIST-ja) = f21e7765c637ad13beb8171edf70b0587f298e19
@@ -30,6 +30,8 @@ SHA1 (eb/dd75-2.0.tar.gz) = f2a0141a259bcaeddb972d2b228fa1ed8e712c37
 Size (eb/dd75-2.0.tar.gz) = 4062 bytes
 SHA1 (eb/genius-1.0.tar.gz) = 4dc04040ee19ed5d0817015db8b621fc4ead9b46
 Size (eb/genius-1.0.tar.gz) = 2241 bytes
+SHA1 (eb/genius2-1.1.tar.gz) = 16b3b16aa30f42088074f006b3103a9aad47e56e
+Size (eb/genius2-1.1.tar.gz) = 887 bytes
 SHA1 (eb/global-2.0.tar.gz) = e7df085181d795ade8e1e743e05a56d15119db06
 Size (eb/global-2.0.tar.gz) = 4034 bytes
 SHA1 (eb/heritage-2.2.tar.gz) = 32f22976e72f214dbed0322f20f6f5d1a6a3cc3f