Update to 3.3+2(patches), and include a temporary patch (3.3.1 release

candidate, but not tested).

Approved by:	maintainer timeout (1week)

8 files changed, 124 insertions, 24 deletions

diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index e53abf697d25..5339465109d3 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	eb
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/network/ndtp/eb/
@@ -16,12 +17,11 @@ DISTFILES=	${EBFILES} \
 EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	${DISTNAME}+.diff
+PATCHFILES=	${DISTNAME}+.diff ${DISTNAME}+2.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 COMMENT=	C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -33,9 +33,12 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/chujiten6-2.3.tar.gz \
 		appendix/colloc-2.0.tar.gz \
 		appendix/crownfj-2.0.tar.gz \
+		appendix/crownfj2-1.0.tar.gz \
+		appendix/crowngj-1.0.tar.gz \
 		appendix/daihyakka-1.0.tar.gz \
 		appendix/daijirin-2.0.tar.gz \
 		appendix/dd75-2.0.tar.gz \
+		appendix/gendai2000-1.0.tar.gz \
 		appendix/genius-1.0.tar.gz \
 		appendix/genius2-1.1.tar.gz \
 		appendix/global-2.0.tar.gz \
@@ -58,21 +61,23 @@ DIST_SUBDIR=	eb
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-nls \
+		--enable-pthread \
+		--with-pthread-cflags="${PTHREAD_CFLAGS}" \
+		--with-pthread-ldflags="${PTHREAD_LIBS}" \
 		--with-gettext-includes=${PREFIX}/include \
 		--with-gettext-libraries=${PREFIX}/lib \
 		--with-iconv-includes=${PREFIX}/include \
 		--with-iconv-libraries=${PREFIX}/lib
 
-INSTALLS_SHLIB=	yes
-
 APPENDIXDIR=	${PREFIX}/share/eb/appendix
 
-pre-configure:
-	cd ${WRKSRC}; autoconf
-	${MKDIR} ${WRKDIR}/appendix
+post-extract:
+	@${RM} -fr ${WRKSRC}/zlib
+	@${MKDIR} ${WRKDIR}/appendix
 .for file in ${APPENDIXFILES}
-	${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \
+	@${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \
 	  ${DISTDIR}/${DIST_SUBDIR}/${file}
 .endfor
 
diff --git a/japanese/eb/distinfo b/japanese/eb/distinfo
index 7877774d3bfe..2b9c7c3e312a 100644
--- a/japanese/eb/distinfo
+++ b/japanese/eb/distinfo
@@ -1,4 +1,4 @@
-MD5 (eb/eb-3.2.3.tar.gz) = e5592556de2a1c23cd84f44b393a7a87
+MD5 (eb/eb-3.3.tar.gz) = cdf5439f2d0dd50709f44bac5ca7f3eb
 MD5 (eb/appendix/LIST) = 60c2a8b4b24edddef010255b20f1b0f4
 MD5 (eb/appendix/LIST-ja) = 68d9baa8b90292da0ce552626670705f
 MD5 (eb/appendix/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
@@ -7,9 +7,12 @@ MD5 (eb/appendix/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
 MD5 (eb/appendix/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
 MD5 (eb/appendix/colloc-2.0.tar.gz) = d8a4faa20b9ef4eca5d0a92aa1bfdad5
 MD5 (eb/appendix/crownfj-2.0.tar.gz) = 7637ea60ee8bae58da1606ffba4c1815
+MD5 (eb/appendix/crownfj2-1.0.tar.gz) = 14303dafe2c08657a67813774ca82087
+MD5 (eb/appendix/crowngj-1.0.tar.gz) = b4e9388e6e687a2235a2b8c66fc43b3c
 MD5 (eb/appendix/daihyakka-1.0.tar.gz) = 203a0a47b353c90ac16a04d847787913
 MD5 (eb/appendix/daijirin-2.0.tar.gz) = d56b2f50a2fd8a9dc49dcda2b075781c
 MD5 (eb/appendix/dd75-2.0.tar.gz) = 7979cfb612d8f2ab97fc1c3e7af5d653
+MD5 (eb/appendix/gendai2000-1.0.tar.gz) = 26a018aec162c4f4250295da54d59262
 MD5 (eb/appendix/genius-1.0.tar.gz) = 534571189137c7f508fdea767399d0f4
 MD5 (eb/appendix/genius2-1.1.tar.gz) = f0b22fa6b94214c56b068033e1730d13
 MD5 (eb/appendix/global-2.0.tar.gz) = 3750ea2d2c78ad786f1d2bc47a8c5b82
@@ -27,3 +30,5 @@ MD5 (eb/appendix/plus-2.0.tar.gz) = 4f03b6808fdd9032471b654b80e0c7a1
 MD5 (eb/appendix/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
 MD5 (eb/appendix/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
 MD5 (eb/appendix/superdic98-1.0.tar.gz) = cc38fde2e6d5b12dba6f494a8a979b03
+MD5 (eb/eb-3.3+.diff) = 6005ed01e9ff762eaa2f81a13793d964
+MD5 (eb/eb-3.3+2.diff) = 34fc5cab076b8c43deb9c2f127e9c75c
diff --git a/japanese/eb/files/patch-eb::match.c b/japanese/eb/files/patch-eb::match.c
new file mode 100644
index 000000000000..2ea79a73cb43
--- /dev/null
+++ b/japanese/eb/files/patch-eb::match.c
@@ -0,0 +1,20 @@
+--- eb/match.c.orig	Tue Aug 14 10:04:25 2001
++++ eb/match.c	Sat Mar  1 02:34:57 2003
+@@ -43,7 +43,7 @@
+ 
+     for (;;) {
+ 	if (length <= i) {
+-	    result = *word_p;
++	    result = 0;
+ 	    break;
+ 	}
+ 	if (*word_p == '\0') {
+@@ -92,7 +92,7 @@
+ 
+     for (;;) {
+ 	if (length <= i) {
+-	    result = *word_p;
++	    result = 0;
+ 	    break;
+ 	}
+ 	if (*word_p == '\0') {
diff --git a/japanese/eb/pkg-plist b/japanese/eb/pkg-plist
index a106987aa053..9467ea4b7667 100644
--- a/japanese/eb/pkg-plist
+++ b/japanese/eb/pkg-plist
@@ -45,7 +45,7 @@ info/ebzip.info
 lib/libeb.a
 lib/libeb.la
 lib/libeb.so
-lib/libeb.so.6
+lib/libeb.so.7
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
@@ -76,6 +76,14 @@ share/eb/appendix/crownfj-2.0/crown_fj.app
 share/eb/appendix/crownfj-2.0/crown_fj/data/furoku
 share/eb/appendix/crownfj-2.0/daily_ei.app
 share/eb/appendix/crownfj-2.0/daily_ei/data/furoku
+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/crger/appendix
 share/eb/appendix/daihyakka-1.0/catalog
 share/eb/appendix/daihyakka-1.0/catalog.app
 share/eb/appendix/daihyakka-1.0/dhk01.app
@@ -90,6 +98,12 @@ 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/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
@@ -207,7 +221,6 @@ 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/locale/ja/LC_MESSAGES/eb.mo
 share/locale/ja/LC_MESSAGES/ebutils.mo
 @dirrm share/eb/appendix/cencro-1.0/cencro
@@ -217,6 +230,9 @@ share/locale/ja/LC_MESSAGES/ebutils.mo
 @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/gendai2000-1.0/gn00eb02
+@dirrm share/eb/appendix/gendai2000-1.0/gn00eb01
+@dirrm share/eb/appendix/gendai2000-1.0
 @dirrm share/eb/appendix/chujiten-2.3/eiwa
 @dirrm share/eb/appendix/chujiten-2.3/waei
 @dirrm share/eb/appendix/chujiten-2.3
@@ -228,6 +244,10 @@ share/locale/ja/LC_MESSAGES/ebutils.mo
 @dirrm share/eb/appendix/colloc-2.0/colloc/data
 @dirrm share/eb/appendix/colloc-2.0/colloc
 @dirrm share/eb/appendix/colloc-2.0
+@dirrm share/eb/appendix/crowngj-1.0/crger
+@dirrm share/eb/appendix/crowngj-1.0
+@dirrm share/eb/appendix/crownfj2-1.0/crfre
+@dirrm share/eb/appendix/crownfj2-1.0
 @dirrm share/eb/appendix/crownfj-2.0/crown_fj/data
 @dirrm share/eb/appendix/crownfj-2.0/crown_fj
 @dirrm share/eb/appendix/crownfj-2.0/daily_ei/data
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index e53abf697d25..5339465109d3 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	eb
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3
+PORTREVISION=	2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/network/ndtp/eb/
@@ -16,12 +17,11 @@ DISTFILES=	${EBFILES} \
 EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-#PATCHFILES=	${DISTNAME}+.diff
+PATCHFILES=	${DISTNAME}+.diff ${DISTNAME}+2.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 COMMENT=	C library for accessing EB, EBG, EBXA and EPWING CD-ROM dictionaries
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -33,9 +33,12 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/chujiten6-2.3.tar.gz \
 		appendix/colloc-2.0.tar.gz \
 		appendix/crownfj-2.0.tar.gz \
+		appendix/crownfj2-1.0.tar.gz \
+		appendix/crowngj-1.0.tar.gz \
 		appendix/daihyakka-1.0.tar.gz \
 		appendix/daijirin-2.0.tar.gz \
 		appendix/dd75-2.0.tar.gz \
+		appendix/gendai2000-1.0.tar.gz \
 		appendix/genius-1.0.tar.gz \
 		appendix/genius2-1.1.tar.gz \
 		appendix/global-2.0.tar.gz \
@@ -58,21 +61,23 @@ DIST_SUBDIR=	eb
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-nls \
+		--enable-pthread \
+		--with-pthread-cflags="${PTHREAD_CFLAGS}" \
+		--with-pthread-ldflags="${PTHREAD_LIBS}" \
 		--with-gettext-includes=${PREFIX}/include \
 		--with-gettext-libraries=${PREFIX}/lib \
 		--with-iconv-includes=${PREFIX}/include \
 		--with-iconv-libraries=${PREFIX}/lib
 
-INSTALLS_SHLIB=	yes
-
 APPENDIXDIR=	${PREFIX}/share/eb/appendix
 
-pre-configure:
-	cd ${WRKSRC}; autoconf
-	${MKDIR} ${WRKDIR}/appendix
+post-extract:
+	@${RM} -fr ${WRKSRC}/zlib
+	@${MKDIR} ${WRKDIR}/appendix
 .for file in ${APPENDIXFILES}
-	${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \
+	@${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \
 	  ${DISTDIR}/${DIST_SUBDIR}/${file}
 .endfor
 
diff --git a/japanese/eb3/distinfo b/japanese/eb3/distinfo
index 7877774d3bfe..2b9c7c3e312a 100644
--- a/japanese/eb3/distinfo
+++ b/japanese/eb3/distinfo
@@ -1,4 +1,4 @@
-MD5 (eb/eb-3.2.3.tar.gz) = e5592556de2a1c23cd84f44b393a7a87
+MD5 (eb/eb-3.3.tar.gz) = cdf5439f2d0dd50709f44bac5ca7f3eb
 MD5 (eb/appendix/LIST) = 60c2a8b4b24edddef010255b20f1b0f4
 MD5 (eb/appendix/LIST-ja) = 68d9baa8b90292da0ce552626670705f
 MD5 (eb/appendix/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
@@ -7,9 +7,12 @@ MD5 (eb/appendix/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
 MD5 (eb/appendix/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
 MD5 (eb/appendix/colloc-2.0.tar.gz) = d8a4faa20b9ef4eca5d0a92aa1bfdad5
 MD5 (eb/appendix/crownfj-2.0.tar.gz) = 7637ea60ee8bae58da1606ffba4c1815
+MD5 (eb/appendix/crownfj2-1.0.tar.gz) = 14303dafe2c08657a67813774ca82087
+MD5 (eb/appendix/crowngj-1.0.tar.gz) = b4e9388e6e687a2235a2b8c66fc43b3c
 MD5 (eb/appendix/daihyakka-1.0.tar.gz) = 203a0a47b353c90ac16a04d847787913
 MD5 (eb/appendix/daijirin-2.0.tar.gz) = d56b2f50a2fd8a9dc49dcda2b075781c
 MD5 (eb/appendix/dd75-2.0.tar.gz) = 7979cfb612d8f2ab97fc1c3e7af5d653
+MD5 (eb/appendix/gendai2000-1.0.tar.gz) = 26a018aec162c4f4250295da54d59262
 MD5 (eb/appendix/genius-1.0.tar.gz) = 534571189137c7f508fdea767399d0f4
 MD5 (eb/appendix/genius2-1.1.tar.gz) = f0b22fa6b94214c56b068033e1730d13
 MD5 (eb/appendix/global-2.0.tar.gz) = 3750ea2d2c78ad786f1d2bc47a8c5b82
@@ -27,3 +30,5 @@ MD5 (eb/appendix/plus-2.0.tar.gz) = 4f03b6808fdd9032471b654b80e0c7a1
 MD5 (eb/appendix/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
 MD5 (eb/appendix/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
 MD5 (eb/appendix/superdic98-1.0.tar.gz) = cc38fde2e6d5b12dba6f494a8a979b03
+MD5 (eb/eb-3.3+.diff) = 6005ed01e9ff762eaa2f81a13793d964
+MD5 (eb/eb-3.3+2.diff) = 34fc5cab076b8c43deb9c2f127e9c75c
diff --git a/japanese/eb3/files/patch-eb::match.c b/japanese/eb3/files/patch-eb::match.c
new file mode 100644
index 000000000000..2ea79a73cb43
--- /dev/null
+++ b/japanese/eb3/files/patch-eb::match.c
@@ -0,0 +1,20 @@
+--- eb/match.c.orig	Tue Aug 14 10:04:25 2001
++++ eb/match.c	Sat Mar  1 02:34:57 2003
+@@ -43,7 +43,7 @@
+ 
+     for (;;) {
+ 	if (length <= i) {
+-	    result = *word_p;
++	    result = 0;
+ 	    break;
+ 	}
+ 	if (*word_p == '\0') {
+@@ -92,7 +92,7 @@
+ 
+     for (;;) {
+ 	if (length <= i) {
+-	    result = *word_p;
++	    result = 0;
+ 	    break;
+ 	}
+ 	if (*word_p == '\0') {
diff --git a/japanese/eb3/pkg-plist b/japanese/eb3/pkg-plist
index a106987aa053..9467ea4b7667 100644
--- a/japanese/eb3/pkg-plist
+++ b/japanese/eb3/pkg-plist
@@ -45,7 +45,7 @@ info/ebzip.info
 lib/libeb.a
 lib/libeb.la
 lib/libeb.so
-lib/libeb.so.6
+lib/libeb.so.7
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
@@ -76,6 +76,14 @@ share/eb/appendix/crownfj-2.0/crown_fj.app
 share/eb/appendix/crownfj-2.0/crown_fj/data/furoku
 share/eb/appendix/crownfj-2.0/daily_ei.app
 share/eb/appendix/crownfj-2.0/daily_ei/data/furoku
+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/crger/appendix
 share/eb/appendix/daihyakka-1.0/catalog
 share/eb/appendix/daihyakka-1.0/catalog.app
 share/eb/appendix/daihyakka-1.0/dhk01.app
@@ -90,6 +98,12 @@ 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/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
@@ -207,7 +221,6 @@ 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/locale/ja/LC_MESSAGES/eb.mo
 share/locale/ja/LC_MESSAGES/ebutils.mo
 @dirrm share/eb/appendix/cencro-1.0/cencro
@@ -217,6 +230,9 @@ share/locale/ja/LC_MESSAGES/ebutils.mo
 @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/gendai2000-1.0/gn00eb02
+@dirrm share/eb/appendix/gendai2000-1.0/gn00eb01
+@dirrm share/eb/appendix/gendai2000-1.0
 @dirrm share/eb/appendix/chujiten-2.3/eiwa
 @dirrm share/eb/appendix/chujiten-2.3/waei
 @dirrm share/eb/appendix/chujiten-2.3
@@ -228,6 +244,10 @@ share/locale/ja/LC_MESSAGES/ebutils.mo
 @dirrm share/eb/appendix/colloc-2.0/colloc/data
 @dirrm share/eb/appendix/colloc-2.0/colloc
 @dirrm share/eb/appendix/colloc-2.0
+@dirrm share/eb/appendix/crowngj-1.0/crger
+@dirrm share/eb/appendix/crowngj-1.0
+@dirrm share/eb/appendix/crownfj2-1.0/crfre
+@dirrm share/eb/appendix/crownfj2-1.0
 @dirrm share/eb/appendix/crownfj-2.0/crown_fj/data
 @dirrm share/eb/appendix/crownfj-2.0/crown_fj
 @dirrm share/eb/appendix/crownfj-2.0/daily_ei/data