Updated to 3.2.2.

	* Fix bug in handling of appendix.
	* Fix gettext message catalogs.

Besides these, eb.conf is properly fixed in buildlink.mk so that headers/
libraries can be found in the right paths. Bump BUILDLINK_DEPENDS.eb.

6 files changed, 93 insertions, 12 deletions

diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 457ebc9426e..3a772426a95 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/03/15 08:05:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2002/06/12 01:14:49 uebayasi Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 
-DISTNAME=	eb-3.2.1
+DISTNAME=	eb-3.2.2
 CATEGORIES=	textproc japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/
diff --git a/textproc/eb/PLIST b/textproc/eb/PLIST
index a757e500777..67bc5690bc3 100644
--- a/textproc/eb/PLIST
+++ b/textproc/eb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/03/14 13:54:04 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/06/12 01:14:49 uebayasi Exp $
 bin/ebappendix
 bin/ebfont
 bin/ebinfo
@@ -15,6 +15,7 @@ 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
@@ -23,6 +24,7 @@ include/eb/zio.h
 @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
+info/eb-ja.info
 info/ebfont-ja.info
 info/ebfont.info
 info/ebinfo-ja.info
@@ -31,6 +33,7 @@ info/ebrefile-ja.info
 info/ebrefile.info
 info/ebzip-ja.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
@@ -38,12 +41,12 @@ info/ebzip.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/ebzip.info
+@exec install-info --info-dir=%D/info %D/info/eb-ja.info
 lib/libeb.a
 lib/libeb.la
 lib/libeb.so
 lib/libeb.so.6
-lib/libeb.so.6.1
+lib/libeb.so.6.2
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
diff --git a/textproc/eb/buildlink.mk b/textproc/eb/buildlink.mk
index 34835fd21e6..07bef2c61bc 100644
--- a/textproc/eb/buildlink.mk
+++ b/textproc/eb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/03/22 03:57:54 uebayasi Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/06/12 01:14:49 uebayasi Exp $
 #
 # This Makefile fragment is included by packages that use EB.
 #
@@ -17,14 +17,28 @@ EB_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-# 3.2.0 had an 'appendix' bug, so bump the base version.
-BUILDLINK_DEPENDS.eb?=	eb>=3.2.1
+# <=3.2.1 packages didn't fix eb.conf.
+BUILDLINK_DEPENDS.eb?=	eb>=3.2.2
 DEPENDS+=	${BUILDLINK_DEPENDS.eb}:../../textproc/eb
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.eb=eb
-#BUILDLINK_PREFIX.png_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.eb=	include/eb/*.h
 BUILDLINK_FILES.eb+=	lib/libeb.*
+BUILDLINK_FILES.eb+=	etc/eb.conf
+
+# Fixing etc/eb.conf.
+#	- Paths to headers/libraries are defined in eb.conf.  Fix them.
+#	- Most packages use --with-eb-conf=... configure option to find
+#	  eb.conf file.  Make sure if this is valid.
+_CONFIGURE_PREREQ+=	eb-conf-buildlink-subst
+BUILDLINK_SUBST_MESSAGE.eb-conf=	\
+	"Fixing eb.conf file."
+BUILDLINK_SUBST_FILES.eb-conf=	\
+	${BUILDLINK_DIR}/etc/eb.conf
+BUILDLINK_SUBST_SED.eb-conf=	\
+	-e "s|-\([IL]\)${LOCALBASE}/|-\1${BUILDLINK_DIR}/|g"
+eb-conf-buildlink-subst: _BUILDLINK_SUBST_USE
+CONFIGURE_ARGS+=--with-eb-conf=${BUILDLINK_DIR}/etc/eb.conf
 
 BUILDLINK_TARGETS.eb=	eb-buildlink
 BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.eb}
diff --git a/textproc/eb/distinfo b/textproc/eb/distinfo
index 65192507c4a..53f99e7e64d 100644
--- a/textproc/eb/distinfo
+++ b/textproc/eb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/03/14 13:54:05 uebayasi Exp $
+$NetBSD: distinfo,v 1.4 2002/06/12 01:14:49 uebayasi Exp $
 
-SHA1 (eb/eb-3.2.1.tar.gz) = 1e34957cbb8e689e7e48f0d54c912acef7ddd455
-Size (eb/eb-3.2.1.tar.gz) = 998191 bytes
+SHA1 (eb/eb-3.2.2.tar.gz) = ae6fa87b996c239d95a8e24a4514eadb3cd9fb80
+Size (eb/eb-3.2.2.tar.gz) = 1010300 bytes
 SHA1 (eb/LIST) = 03cc7f7c41b415fd7ea9c119ee1cb9c445617cdd
 Size (eb/LIST) = 9136 bytes
 SHA1 (eb/LIST-ja) = f21e7765c637ad13beb8171edf70b0587f298e19
@@ -60,3 +60,5 @@ SHA1 (eb/readers2-2.0.tar.gz) = 08f6dc279a09ef1094d1b36152c857f6e3890d84
 Size (eb/readers2-2.0.tar.gz) = 2698 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
diff --git a/textproc/eb/patches/patch-aa b/textproc/eb/patches/patch-aa
new file mode 100644
index 00000000000..0195af39aea
--- /dev/null
+++ b/textproc/eb/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1 2002/06/12 01:14:49 uebayasi Exp $
+
+--- configure.orig	Sun Jun  9 12:06:40 2002
++++ configure
+@@ -9509,7 +9509,7 @@
+ fi;
+ 
+ if test "X$z_libdir" != X ; then
+-   ZLIBLIBS="-L$z_libdir -lz"
++   ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
+    ZLIBDEPS=''
+ else
+    ZLIBLIBS='-lz'
+@@ -11250,7 +11250,7 @@
+ 
+ if test $included_zlib = yes ; then
+    EBCONF_ZLIBINCS='-I$(includedir)'
+-   EBCONF_ZLIBLIBS='-L$(libdir) -lz'
++   EBCONF_ZLIBLIBS='-Wl,-R$(libdir) -L$(libdir) -lz'
+ else
+    EBCONF_ZLIBINCS=$ZLIBINCS
+    EBCONF_ZLIBLIBS=$ZLIBLIBS
+@@ -11269,7 +11269,7 @@
+ 
+ 
+ EBCONF_EBINCS='-I$(includedir)'
+-EBCONF_EBLIBS='-L$(libdir) -leb'
++EBCONF_EBLIBS='-Wl,-R$(libdir) -L$(libdir) -leb'
+ 
+ 
+ 
diff --git a/textproc/eb/patches/patch-ab b/textproc/eb/patches/patch-ab
new file mode 100644
index 00000000000..a62a6f294e9
--- /dev/null
+++ b/textproc/eb/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2002/06/12 01:14:50 uebayasi Exp $
+
+--- configure.ac.orig	Sat Mar 30 15:45:45 2002
++++ configure.ac
+@@ -160,7 +160,7 @@
+ [z_libdir="${withval}"], [z_libdir=''])
+ 
+ if test "X$z_libdir" != X ; then
+-   ZLIBLIBS="-L$z_libdir -lz"
++   ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
+    ZLIBDEPS=''
+ else
+    ZLIBLIBS='-lz'
+@@ -265,7 +265,7 @@
+ dnl *
+ if test $included_zlib = yes ; then
+    EBCONF_ZLIBINCS='-I$(includedir)'
+-   EBCONF_ZLIBLIBS='-L$(libdir) -lz'
++   EBCONF_ZLIBLIBS='-Wl,-R$(libdir) -L$(libdir) -lz'
+ else
+    EBCONF_ZLIBINCS=$ZLIBINCS
+    EBCONF_ZLIBLIBS=$ZLIBLIBS
+@@ -284,7 +284,7 @@
+ AC_SUBST(EBCONF_INTLLIBS)
+ 
+ EBCONF_EBINCS='-I$(includedir)'
+-EBCONF_EBLIBS='-L$(libdir) -leb'
++EBCONF_EBLIBS='-Wl,-R$(libdir) -L$(libdir) -leb'
+ AC_SUBST(EBCONF_EBINCS)
+ AC_SUBST(EBCONF_EBLIBS)
+