Updated to version 3.3.2.

Addresses PR pkg/21116 by Makoto Fujiwara.

Changes:

- honour PKG_SYSCONFDIR
- add another two appendixes
- delint

3.3.2:
======
- Fix version number of the shared library.
- Support for Nichi-Ei-Futsu Jiten (YRRS-059).

3.3.1:
======
- Support for EPWING Geinus Eiwa Daijiten.
- Fix a bug in handling of multi-search.
- Fix a bug of debug mode.

3.3:
====
- Fix a bug of eb_read_binary_mpeg().

3.3beta3:
=========
- Fix multi search.
- Fix some minor bugs.

3.3beta2:
=========
- Fix some serious and minor bugs.
- Install `eb3.m4' in `$(datadir)/aclocal'.

3.3beta1:
=========
- Fix some bugs.

3.3beta0:
=========
- Revise file name and compression type detection codes for EPWING.
- The eb_multi_title() function is added, which gets a title of the
  specified multi search.
  Using this function, the `ebinfo' command also outputs multi search
  titles when `--multi-search' (or `-m') option is specified.
- Fix a bug of `ebrefile'.
- Add two text hooks for inline image support.

4 files changed, 89 insertions, 21 deletions

diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index bd5ce7dc39e..dd6928b9737 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/02/08 12:38:08 cjep Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/13 01:29:15 salo Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
+#
 
-DISTNAME=	eb-3.2.3
+DISTNAME=	eb-3.3.2
 CATEGORIES=	textproc japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/
@@ -28,6 +29,7 @@ EB_APPENDICES=	\
 		daihyakka-1.0.tar.gz \
 		daijirin-2.0.tar.gz \
 		dd75-2.0.tar.gz \
+		gendai2000-1.0.tar.gz \
 		genius-1.0.tar.gz \
 		genius2-1.1.tar.gz \
 		global-2.0.tar.gz \
@@ -44,23 +46,33 @@ EB_APPENDICES=	\
 		plus-2.0.tar.gz \
 		readers-2.2.tar.gz \
 		readers2-2.0.tar.gz \
+		ruigigo-1.0.tar.gz \
 		superdic98-1.0.tar.gz
 EXTRACT_ONLY=	${EB_DISTFILES}
+DIST_SUBDIR=	eb
 
-DIST_SUBDIR=		eb
-USE_BUILDLINK2=		# Defined
-USE_LIBTOOL=		# Defined
-GNU_CONFIGURE=		# Defined
-CONFIGURE_ARGS+=	--with-zlib
-USE_GMAKE=		# Defined
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
 TEXINFO_OVERRIDE=	YES
+
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+CONFIGURE_ARGS+=	--with-zlib
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+CONF_FILES=		${EGDIR}/eb.conf.default ${PKG_SYSCONFDIR}/eb.conf
+
 # For patterns like '... (install-info ...) ...'
 TEXINFO_SUBST_SED+=	-e "s!^\(	.*\)\([ 	'(]\)install-info\([ 	]\)!\1\2${INSTALL_INFO}\3!g"
 
 EB_APPENDIXDIR=	${PREFIX}/share/eb/appendix
+EGDIR=		${PREFIX}/share/examples/eb/
 
 post-extract:
-	cd ${WRKSRC} && ${RM} -rf zlib
+	${RM} -rf ${WRKSRC}/zlib
 
 post-install:
 	for f in ${EB_LISTS}; do \
@@ -69,6 +81,8 @@ post-install:
 	for f in ${EB_APPENDICES}; do \
 		${GTAR} -C ${EB_APPENDIXDIR} -zxmf ${_DISTDIR}/$${f}; \
 	done
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/eb.conf ${EGDIR}/eb.conf.default
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST
index 6d13dde4513..3a8d884d14d 100644
--- a/textproc/eb/PLIST
+++ b/textproc/eb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/02/08 12:38:08 cjep Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/04/13 01:29:15 salo Exp $
 bin/ebappendix
 bin/ebfont
 bin/ebinfo
@@ -6,7 +6,6 @@ bin/ebrefile
 bin/ebunzip
 bin/ebzip
 bin/ebzipinfo
-etc/eb.conf
 include/eb/appendix.h
 include/eb/binary.h
 include/eb/defs.h
@@ -18,6 +17,12 @@ include/eb/zio.h
 @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
+info/eb-ja.info-1
+info/eb-ja.info-2
+info/eb-ja.info-3
+info/eb-ja.info-4
+info/eb-ja.info-5
+info/eb-ja.info-6
 @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
@@ -45,8 +50,9 @@ info/ebzip.info
 lib/libeb.a
 lib/libeb.la
 lib/libeb.so
-lib/libeb.so.6
-lib/libeb.so.6.3
+lib/libeb.so.7
+lib/libeb.so.7.2
+share/aclocal/eb3.m4
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
@@ -99,6 +105,15 @@ 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/gendai2000-1.0/CVS/Entries
+share/eb/appendix/gendai2000-1.0/CVS/Repository
+share/eb/appendix/gendai2000-1.0/CVS/Root
+share/eb/appendix/gendai2000-1.0/catalog
+share/eb/appendix/gendai2000-1.0/catalog.app
+share/eb/appendix/gendai2000-1.0/gn00eb01.app
+share/eb/appendix/gendai2000-1.0/gn00eb01/appendix
+share/eb/appendix/gendai2000-1.0/gn00eb02.app
+share/eb/appendix/gendai2000-1.0/gn00eb02/appendix
 share/eb/appendix/genius-1.0/catalog
 share/eb/appendix/genius-1.0/catalog.app
 share/eb/appendix/genius-1.0/genius.app
@@ -200,6 +215,10 @@ 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
+share/eb/appendix/ruigigo-1.0/catalogs
+share/eb/appendix/ruigigo-1.0/catalogs.app
+share/eb/appendix/ruigigo-1.0/ruigigo.app
+share/eb/appendix/ruigigo-1.0/ruigigo/data/furoku
 share/eb/appendix/superdic98-1.0/catalogs
 share/eb/appendix/superdic98-1.0/catalogs.app
 share/eb/appendix/superdic98-1.0/chujiten.app
@@ -216,7 +235,8 @@ share/eb/appendix/superdic98-1.0/kanjigen.app
 share/eb/appendix/superdic98-1.0/kanjigen/data/furoku
 share/eb/appendix/superdic98-1.0/koujien.app
 share/eb/appendix/superdic98-1.0/koujien/data/furoku
-share/eb/eb3.m4
+share/examples/eb/eb.conf.default
+@dirrm share/examples/eb
 @dirrm share/eb/appendix/superdic98-1.0/koujien/data
 @dirrm share/eb/appendix/superdic98-1.0/koujien
 @dirrm share/eb/appendix/superdic98-1.0/kanjigen/data
@@ -232,6 +252,9 @@ share/eb/eb3.m4
 @dirrm share/eb/appendix/superdic98-1.0/chujiten/data
 @dirrm share/eb/appendix/superdic98-1.0/chujiten
 @dirrm share/eb/appendix/superdic98-1.0
+@dirrm share/eb/appendix/ruigigo-1.0/ruigigo/data
+@dirrm share/eb/appendix/ruigigo-1.0/ruigigo
+@dirrm share/eb/appendix/ruigigo-1.0
 @dirrm share/eb/appendix/readers2-2.0/readers/data
 @dirrm share/eb/appendix/readers2-2.0/readers
 @dirrm share/eb/appendix/readers2-2.0
@@ -297,6 +320,10 @@ share/eb/eb3.m4
 @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/gendai2000-1.0/gn00eb02
+@dirrm share/eb/appendix/gendai2000-1.0/gn00eb01
+@dirrm share/eb/appendix/gendai2000-1.0/CVS
+@dirrm share/eb/appendix/gendai2000-1.0
 @dirrm share/eb/appendix/dd75-2.0/koujien
 @dirrm share/eb/appendix/dd75-2.0/chujiten
 @dirrm share/eb/appendix/dd75-2.0
diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo
index 9b5ba57549d..daf468952b7 100644
--- a/textproc/eb/distinfo
+++ b/textproc/eb/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2003/03/11 23:37:27 wiz Exp $
+$NetBSD: distinfo,v 1.8 2003/04/13 01:29:15 salo Exp $
 
-SHA1 (eb/eb-3.2.3.tar.gz) = 1812f7773f5352403d3fd40a5d7c75b0f02c4ea8
-Size (eb/eb-3.2.3.tar.gz) = 1011232 bytes
-SHA1 (eb/LIST) = d1d476a5a529c61aa30b99f48d1f22da9cbf57ff
-Size (eb/LIST) = 9253 bytes
-SHA1 (eb/LIST-ja) = 85647a7aadf3197d27cbe285dc410aa94dbbc8c2
-Size (eb/LIST-ja) = 10841 bytes
+SHA1 (eb/eb-3.3.2.tar.gz) = b865897e2e7dff8eb8c0d88f37ac0c5c35528e53
+Size (eb/eb-3.3.2.tar.gz) = 1056979 bytes
+SHA1 (eb/LIST) = 9c059b159f624b8f962daa695d52f60598ba1a3e
+Size (eb/LIST) = 11210 bytes
+SHA1 (eb/LIST-ja) = b9278c27bcf952aa84812c4c9440bb1b2fd2561a
+Size (eb/LIST-ja) = 13396 bytes
 SHA1 (eb/cencro-1.0.tar.gz) = 3b5c692fc8273e0e61c6b28e29a30875d9f609ad
 Size (eb/cencro-1.0.tar.gz) = 1666 bytes
 SHA1 (eb/chujiten-2.3.tar.gz) = 7d995a898666ab611e58d3d0087df0c1a62938d1
@@ -28,6 +28,8 @@ SHA1 (eb/daijirin-2.0.tar.gz) = 0a4dd911fb196155fae32904873bd3a21060f4d5
 Size (eb/daijirin-2.0.tar.gz) = 2095 bytes
 SHA1 (eb/dd75-2.0.tar.gz) = f2a0141a259bcaeddb972d2b228fa1ed8e712c37
 Size (eb/dd75-2.0.tar.gz) = 4062 bytes
+SHA1 (eb/gendai2000-1.0.tar.gz) = 030c72e8bfccad041551c95d9c95c6e29e80f12b
+Size (eb/gendai2000-1.0.tar.gz) = 1063 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
@@ -60,7 +62,10 @@ SHA1 (eb/readers-2.2.tar.gz) = b8948b2f466cd017cc71d418ab2a96edce59ad00
 Size (eb/readers-2.2.tar.gz) = 2194 bytes
 SHA1 (eb/readers2-2.0.tar.gz) = 08f6dc279a09ef1094d1b36152c857f6e3890d84
 Size (eb/readers2-2.0.tar.gz) = 2698 bytes
+SHA1 (eb/ruigigo-1.0.tar.gz) = a50a361e2d022919672ffe08fc1875c1913f7d77
+Size (eb/ruigigo-1.0.tar.gz) = 1326 bytes
 SHA1 (eb/superdic98-1.0.tar.gz) = 4e74ecf887e0c1cf257b718d0e0922d03dfe8138
 Size (eb/superdic98-1.0.tar.gz) = 5252 bytes
 SHA1 (patch-aa) = 9dde77605b151e22c0b0ea96cb9d58788d259360
 SHA1 (patch-ab) = c135fd66475eac600226b672e7963b696720a3cf
+SHA1 (patch-ac) = 1b3dabf92cf820dbb5d56e6384502366b2e9a314
diff --git a/textproc/eb/patches/patch-ac b/textproc/eb/patches/patch-ac
new file mode 100644
index 00000000000..b3a8170a254
--- /dev/null
+++ b/textproc/eb/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2003/04/13 01:29:15 salo Exp $
+
+--- Makefile.in.orig	2003-03-08 04:57:44.000000000 +0100
++++ Makefile.in	2003-04-13 02:38:03.000000000 +0200
+@@ -168,7 +168,7 @@
+ 
+ appendixdir = $(pkgdatadir)/appendix
+ appendix_DATA = 
+-sysconf_DATA = eb.conf
++sysconf_DATA = 
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -189,7 +189,7 @@
+ 	mkinstalldirs
+ DIST_SUBDIRS = zlib eb libebutils ebappendix ebfont ebinfo ebrefile \
+ 	ebzip doc doc-ja po-eb po-ebutils m4 samples
+-all: config.h
++all: config.h eb.conf
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES: