Update to 1.6. Support EB 4.x. Add pbm, xbm, bmp, bmp2ppm, bmp2tiff,

jpg, jpeg commands.  Bug fixes.

Bl3'ify.

3 files changed, 50 insertions, 9 deletions

diff --git a/textproc/eblook/Makefile b/textproc/eblook/Makefile
index a178048efcb..ece324774da 100644
--- a/textproc/eblook/Makefile
+++ b/textproc/eblook/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/08/09 11:27:46 seb Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/19 16:02:17 uebayasi Exp $
 #
 
-DISTNAME=	eblook-1.5.1
-PKGREVISION=	2
+DISTNAME=	eblook-1.6
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/eblook/dist/
 
@@ -10,11 +9,12 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://openlab.ring.gr.jp/edict/eblook/
 COMMENT=	Interactive command-line interface for EPWING electric dictionaries
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 INFO_FILES=	eblook.info
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/eb/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/eb/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/eblook/distinfo b/textproc/eblook/distinfo
index 8fbdd0c33d6..a85e51ac964 100644
--- a/textproc/eblook/distinfo
+++ b/textproc/eblook/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/12 01:31:02 uebayasi Exp $
+$NetBSD: distinfo,v 1.2 2004/03/19 16:02:17 uebayasi Exp $
 
-SHA1 (eblook-1.5.1.tar.gz) = dfdcddcdda9e2a9c134ba9d373906de1cdc75207
-Size (eblook-1.5.1.tar.gz) = 195934 bytes
+SHA1 (eblook-1.6.tar.gz) = 5b8fc0b85edb044e43b16608e7f3afd5b9db0148
+Size (eblook-1.6.tar.gz) = 418216 bytes
+SHA1 (patch-aa) = 1b0b6b4132e67fc51b23e60c45264fddec5b711a
diff --git a/textproc/eblook/patches/patch-aa b/textproc/eblook/patches/patch-aa
new file mode 100644
index 00000000000..ba9a124cf60
--- /dev/null
+++ b/textproc/eblook/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2004/03/19 16:02:17 uebayasi Exp $
+
+--- codeconv.c.orig	Sat Mar  8 23:29:47 2003
++++ codeconv.c	Sat Mar 20 00:27:25 2004
+@@ -213,7 +213,7 @@
+     olen=TEST_LENGTH;
+ 
+     /* euc-jp => current code の変換テスト */
+-    if (iconv(etoc,&test1,&ilen,&test2,&olen) == ((size_t)-1))
++    if (iconv(etoc,(const char **)&test1,&ilen,&test2,&olen) == ((size_t)-1))
+         return 0;
+     if (iconv(etoc,NULL,&ilen,&test2,&olen) == ((size_t)-1))
+         return 0;
+@@ -222,7 +222,7 @@
+     test2=test2_0;
+     ilen=TEST_LENGTH-olen;
+     olen=TEST_LENGTH;
+-    if (iconv(ctoe,&test2,&ilen,&test3,&olen) == ((size_t)-1)) 
++    if (iconv(ctoe,(const char **)&test2,&ilen,&test3,&olen) == ((size_t)-1)) 
+         return 0;
+     if (iconv(ctoe,NULL,&ilen,&test3,&olen) == ((size_t)-1))
+         return 0;
+@@ -661,7 +661,7 @@
+         size_t ret;
+         if (cur_to_euc == (iconv_t) -1)
+ 	    return CODECONV_ERROR;
+-        ret = iconv(cur_to_euc,in_buf,in_len,out_buf,out_len);
++        ret = iconv(cur_to_euc,(const char **)in_buf,in_len,out_buf,out_len);
+ 	if (ret != ((size_t)-1)) 
+ 	    ret = iconv(cur_to_euc, NULL, in_len, out_buf, out_len);
+ #if defined (HAVE_ERRNO_H) && defined (E2BIG)
+@@ -770,7 +770,7 @@
+         size_t ret;
+         if (euc_to_cur == (iconv_t) -1)
+ 	    return CODECONV_ERROR;
+-        ret = iconv(euc_to_cur,in_buf,in_len,out_buf,out_len);
++        ret = iconv(euc_to_cur,(const char **)in_buf,in_len,out_buf,out_len);
+         if (ret != ((size_t)-1))
+ 	    ret = iconv(euc_to_cur,NULL,in_len,out_buf,out_len);
+ #if defined (HAVE_ERRNO_H) && defined (E2BIG)