3 files changed, 25 insertions, 14 deletions

diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index e95e71072f85..7d2e5d7e3c42 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eb
-PORTVERSION=	2.3.8
+PORTVERSION=	3.2.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 DISTFILES=	${EBFILES} \
@@ -15,10 +15,14 @@ DISTFILES=	${EBFILES} \
 EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	${DISTNAME}+.diff
+#PATCHFILES=	${DISTNAME}+.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		iconv.2:${PORTSDIR}/converters/iconv
+
 EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 LISTFILES=	appendix/LIST \
 		appendix/LIST-ja
@@ -49,15 +53,20 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/superdic98-1.0.tar.gz
 
 DIST_SUBDIR=	eb
-USE_LIBTOOL=	yes
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-nls \
+		--with-gettext-includes=${PREFIX}/include \
+		--with-gettext-libraries=${PREFIX}/lib \
+		--with-iconv-includes=${PREFIX}/include \
+		--with-iconv-libraries=${PREFIX}/lib
+
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-zlib
 
 APPENDIXDIR=	${PREFIX}/share/eb/appendix
 
-post-extract:
-	cd ${WRKSRC} && ${RM} -rf zlib
-
+pre-configure:
+	cd ${WRKSRC}; autoconf
 post-install:
 .for file in ${LISTFILES}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${APPENDIXDIR}
diff --git a/japanese/eb/distinfo b/japanese/eb/distinfo
index 2a3ef483865a..efa84a34e0d5 100644
--- a/japanese/eb/distinfo
+++ b/japanese/eb/distinfo
@@ -1,4 +1,4 @@
-MD5 (eb/eb-2.3.8.tar.gz) = fd4e150cf1fc45123a2d82eba0253604
+MD5 (eb/eb-3.2.1.tar.gz) = bd7d8ceb8a994ac9584ab46f44d293c6
 MD5 (eb/appendix/LIST) = c7119dfcaf285b4db78b586f22f677ca
 MD5 (eb/appendix/LIST-ja) = b878956caacf2e72a9eeafc3292494d8
 MD5 (eb/appendix/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
@@ -26,4 +26,3 @@ 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-2.3.8+.diff) = 49feb40cf4388d54ae3deb4027078cbe
diff --git a/japanese/eb/pkg-plist b/japanese/eb/pkg-plist
index 07bcb47d9780..6eb3a191df12 100644
--- a/japanese/eb/pkg-plist
+++ b/japanese/eb/pkg-plist
@@ -5,16 +5,17 @@ bin/ebrefile
 bin/ebunzip
 bin/ebzip
 bin/ebzipinfo
+etc/eb.conf
 include/eb/appendix.h
+include/eb/binary.h
 include/eb/defs.h
 include/eb/eb.h
 include/eb/error.h
 include/eb/font.h
-include/eb/language.h
 include/eb/text.h
+include/eb/zio.h
 @dirrm include/eb
 @unexec install-info --delete %D/info/eb-ja.info %D/info/dir
-@unexec install-info --delete %D/info/eb.info %D/info/dir
 @unexec install-info --delete %D/info/ebfont-ja.info %D/info/dir
 @unexec install-info --delete %D/info/ebfont.info %D/info/dir
 @unexec install-info --delete %D/info/ebinfo-ja.info %D/info/dir
@@ -24,7 +25,6 @@ include/eb/text.h
 @unexec install-info --delete %D/info/ebzip-ja.info %D/info/dir
 @unexec install-info --delete %D/info/ebzip.info %D/info/dir
 info/eb-ja.info
-info/eb.info
 info/ebfont-ja.info
 info/ebfont.info
 info/ebinfo-ja.info
@@ -34,7 +34,6 @@ info/ebrefile.info
 info/ebzip-ja.info
 info/ebzip.info
 @exec install-info %D/info/eb-ja.info %D/info/dir
-@exec install-info %D/info/eb.info %D/info/dir
 @exec install-info %D/info/ebfont-ja.info %D/info/dir
 @exec install-info %D/info/ebfont.info %D/info/dir
 @exec install-info %D/info/ebinfo-ja.info %D/info/dir
@@ -44,8 +43,9 @@ info/ebzip.info
 @exec install-info %D/info/ebzip-ja.info %D/info/dir
 @exec install-info %D/info/ebzip.info %D/info/dir
 lib/libeb.a
+lib/libeb.la
 lib/libeb.so
-lib/libeb.so.3
+lib/libeb.so.6
 share/eb/appendix/LIST
 share/eb/appendix/LIST-ja
 share/eb/appendix/cencro-1.0/catalog
@@ -203,6 +203,9 @@ 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
 @dirrm share/eb/appendix/cencro-1.0
 @dirrm share/eb/appendix/genius-1.0/genius