o Update to 4.2. [1]

o Fix minor bug. [2]

PR:		ports/81629 [1]
Submitted by:	KIMURA Yasuhiro <yasu@utahime.org> [1]
Obtained from:	ndtpd/01982 [2]
Approved by:	maintainer timeout

9 files changed, 31 insertions, 18 deletions

diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index ad75d36cb115..aa2c07bb22e0 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	eb
-PORTVERSION=	4.1.3
-PORTREVISION=	1
+PORTVERSION=	4.2
+PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 DISTFILES=	${EBFILES} \
@@ -15,9 +15,6 @@ DISTFILES=	${EBFILES} \
 		${APPENDIXFILES}
 EXTRACT_ONLY=	${EBFILES}
 
-PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	${DISTNAME}+.diff ${DISTNAME}+2.diff
-
 MAINTAINER=	takamune2004@yahoo.co.jp
 COMMENT=	C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
 
@@ -57,6 +54,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 
+USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_LIBTOOL_VER=	15
diff --git a/japanese/eb/distinfo b/japanese/eb/distinfo
index d574b68010cc..c7a41dc341c6 100644
--- a/japanese/eb/distinfo
+++ b/japanese/eb/distinfo
@@ -1,5 +1,5 @@
-MD5 (eb/eb-4.1.3.tar.gz) = 178abafd7b7d176904334170614e2b99
-SIZE (eb/eb-4.1.3.tar.gz) = 1053101
+MD5 (eb/eb-4.2.tar.bz2) = c47e1116fb9c0008b7051abd43d9ab47
+SIZE (eb/eb-4.2.tar.bz2) = 479270
 MD5 (eb/appendix/LIST) = 07bef37d1fbd4876077f95fe2ca630a1
 SIZE (eb/appendix/LIST) = 11210
 MD5 (eb/appendix/LIST-ja) = ec3c7c980b131d1dcdbe9eddee62e2e1
diff --git a/japanese/eb/files/patch-eb-book.c b/japanese/eb/files/patch-eb-book.c
new file mode 100644
index 000000000000..0927dc95ae57
--- /dev/null
+++ b/japanese/eb/files/patch-eb-book.c
@@ -0,0 +1,15 @@
+--- eb/book.c.orig	Sun May 29 09:42:54 2005
++++ eb/book.c	Sun Jul 31 16:06:39 2005
+@@ -658,8 +658,11 @@
+ 	    error_code = EB_ERR_FAIL_READ_CAT;
+ 	    break;
+ 	}
+-	if (*(buffer + 4) == '\0')
++	if (*(buffer + 4) == '\0') {
++	    strcpy(subbook->sound_file_name, subbook->text_file_name);
++	    strcpy(subbook->graphic_file_name, subbook->text_file_name);
+ 	    continue;
++	}
+ 
+ 	/*
+ 	 * Set a text file name and its compression hint.
diff --git a/japanese/eb/pkg-plist b/japanese/eb/pkg-plist
index 8250a8e7b412..d92c350b2a0e 100644
--- a/japanese/eb/pkg-plist
+++ b/japanese/eb/pkg-plist
@@ -20,7 +20,7 @@ include/eb/zio.h
 @dirrm include/eb
 lib/libeb.a
 lib/libeb.so
-lib/libeb.so.9
+lib/libeb.so.10
 share/aclocal/eb4.m4
 %%DOCSDIR%%/eb-01.html
 %%DOCSDIR%%/eb-02.html
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index c1a942ea84b7..798b3a3bbb5e 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eblook
 PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/eblook/dist/
 DIST_SUBDIR=	eb
@@ -15,7 +15,7 @@ DIST_SUBDIR=	eb
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive EB interface command for seraching words in electoric dictionaries
 
-LIB_DEPENDS=	eb.9:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.10:${PORTSDIR}/japanese/eb
 
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index a2987a588e0d..6a50f22e5f66 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebnetd
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese ipv6
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/net/ndtp/eb/
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 MAINTAINER=	takamune2004@yahoo.co.jp
 COMMENT=	Servers for accessing CD-ROM books via TCP/IP
 
-LIB_DEPENDS=	eb.9:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.10:${PORTSDIR}/japanese/eb
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 08c4683106c6..9d6dbee1b070 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-gtk2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Electronic Book Viewer
 
-LIB_DEPENDS=	eb.9:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.10:${PORTSDIR}/japanese/eb
 
 CONFLICTS=	ja-ebview-0*
 
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 6568fee6ead8..bd7197b1f830 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Electronic Book Viewer
 
-LIB_DEPENDS=	eb.9:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.10:${PORTSDIR}/japanese/eb
 
 CONFLICTS=	ja-ebview-gtk2-*
 
diff --git a/japanese/ruby-eb/Makefile b/japanese/ruby-eb/Makefile
index f7ea2c23e59c..cdab3ae7b22d 100644
--- a/japanese/ruby-eb/Makefile
+++ b/japanese/ruby-eb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eb
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese ruby
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITE_SUBDIR=	ruby${PORTNAME}
@@ -18,7 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby bind of EB library
 
-LIB_DEPENDS=	eb.9:${PORTSDIR}/japanese/eb
+LIB_DEPENDS=	eb.10:${PORTSDIR}/japanese/eb
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes