4 files changed, 73 insertions, 20 deletions

diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index 578555b59843..6b271d1fbd5e 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -6,36 +6,36 @@
 #
 
 PORTNAME=	m17n-lib
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib-download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for the multilingual text handling
 
-BUILD_DEPENDS=	${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
+BUILD_DEPENDS=	m17n-db>=1.4.0:${PORTSDIR}/devel/m17n-db
 LIB_DEPENDS=	fribidi.0:${PORTSDIR}/converters/fribidi \
 		gd.4:${PORTSDIR}/graphics/gd \
-		otf.0:${PORTSDIR}/print/libotf \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
-RUN_DEPENDS=	${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
+		otf.0:${PORTSDIR}/print/libotf
+RUN_DEPENDS=	m17n-db>=1.4.0:${PORTSDIR}/devel/m17n-db
 
-USE_AUTOTOOLS=	libtool:15
-USE_XLIB=	yes
+USE_XORG=	xaw xft xt
 USE_GNOME=	gnometarget libxml2 pkgconfig
+USE_AUTOTOOLS=	autoconf:261 libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
 OPTIONS=	ANTHY	"With Anthy support" off \
-		ISPELL	"With Ispell support" off
+		ISPELL	"With Ispell support" off \
+		THAI	"With libThai support" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_ANTHY)
 LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
 .else
-CONFIGURE_ENV+=	ac_cv_lib_anthydic_anthy_init_sessions=no
+CONFIGURE_ARGS+=	--without-anthy
 .endif
 
 .if defined(WITH_ISPELL)
@@ -45,10 +45,15 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 CONFIGURE_ENV+=	HAVE_ISPELL=no
 .endif
 
+.if defined(WITH_THAI)
+LIB_DEPENDS+=	thai.0:${PORTSDIR}/devel/libthai
+.else
+CONFIGURE_ARGS+=	--without-libthai
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g ; \
 		 s|-ldl||g'
-	@${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/devel/m17n-lib/distinfo b/devel/m17n-lib/distinfo
index d344919aa3ea..8221953ad35e 100644
--- a/devel/m17n-lib/distinfo
+++ b/devel/m17n-lib/distinfo
@@ -1,3 +1,3 @@
-MD5 (m17n-lib-1.3.4.tar.gz) = 2941f70281baaaced75fc2715476cfa9
-SHA256 (m17n-lib-1.3.4.tar.gz) = fc6ffc8615db261a6d57951d445b41a72fa33bc5f19bbce1009d639e4a769e5f
-SIZE (m17n-lib-1.3.4.tar.gz) = 965402
+MD5 (m17n-lib-1.4.0.tar.gz) = 195b16500349f874dd094fa7cccd7a6c
+SHA256 (m17n-lib-1.4.0.tar.gz) = 0fc31f26f87e909a63fa957c4b7c968721789fe2cf7afb0be43745014b216e27
+SIZE (m17n-lib-1.4.0.tar.gz) = 969682
diff --git a/devel/m17n-lib/files/patch-configure.ac b/devel/m17n-lib/files/patch-configure.ac
new file mode 100644
index 000000000000..78fc419f3da5
--- /dev/null
+++ b/devel/m17n-lib/files/patch-configure.ac
@@ -0,0 +1,48 @@
+--- configure.ac.orig	Thu May 24 21:42:48 2007
++++ configure.ac	Mon Oct 15 03:04:55 2007
+@@ -324,6 +324,10 @@
+ AC_SUBST(XML2_LD_FLAGS)
+ 
+ dnl Check for Anthy usability.
++AC_ARG_WITH(anthy,
++            AC_HELP_STRING([--with-anthy],
++                           [with Anthy library (default is YES)]))
++if test "x$with_anthy" != "xno"; then
+ 
+ PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
+ if test "x$HAVE_ANTHY" = "xyes"; then
+@@ -333,6 +337,8 @@
+   ANTHY_LD_FLAGS="$ANTHY_LIBS"
+   CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
+ fi
++
++fi
+ AC_SUBST(ANTHY_LD_FLAGS)
+ 
+ dnl Check for Ispell usability.
+@@ -347,11 +353,15 @@
+ dnl If we have one, define HAVE_THAI_WORDSEG and one of these:
+ dnl   HAVE_LIBTHAI, HAVE_WORDCUT, or HAVE_WORDCUT_OLD
+ dnl In addition, set THAI_WORDSEG_LD_FLAGS to a proper value.
++AC_ARG_WITH(libthai,
++            AC_HELP_STRING([--with-libthai],
++                           [with libThai library (default is YES)]))
++if test "x$with_libthai" != "xno"; then
+ 
+ PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no)
+ PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no)
+ 
+-if test "x$HAVE_LIBTHAI" == "xyes"; then
++if test "x$HAVE_LIBTHAI" = "xyes"; then
+ 
+   AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai])
+   THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS"
+@@ -406,6 +416,8 @@
+ if test "x$HAVE_THAI_WORDSEG" = "xyes"; then
+   AC_DEFINE(HAVE_THAI_WORDSEG, 1,
+             [Define if you have some Thai word-segmentation library])
++fi
++
+ fi
+ AC_SUBST(THAI_WORDSEG_LD_FLAGS)
+ 
diff --git a/devel/m17n-lib/pkg-plist b/devel/m17n-lib/pkg-plist
index 2ed6a1a84f4d..d8b04e663769 100644
--- a/devel/m17n-lib/pkg-plist
+++ b/devel/m17n-lib/pkg-plist
@@ -12,31 +12,31 @@ include/m17n.h
 lib/libm17n-X.a
 lib/libm17n-X.la
 lib/libm17n-X.so
-lib/libm17n-X.so.1
+lib/libm17n-X.so.2
 lib/libm17n-core.a
 lib/libm17n-core.la
 lib/libm17n-core.so
-lib/libm17n-core.so.1
+lib/libm17n-core.so.2
 lib/libm17n-gd.a
 lib/libm17n-gd.la
 lib/libm17n-gd.so
-lib/libm17n-gd.so.1
+lib/libm17n-gd.so.2
 lib/libm17n-gui.a
 lib/libm17n-gui.la
 lib/libm17n-gui.so
-lib/libm17n-gui.so.1
+lib/libm17n-gui.so.2
 lib/libm17n.a
 lib/libm17n.la
 lib/libm17n.so
-lib/libm17n.so.1
+lib/libm17n.so.2
 lib/libmimx-anthy.a
 lib/libmimx-anthy.la
 lib/libmimx-anthy.so
-lib/libmimx-anthy.so.1
+lib/libmimx-anthy.so.2
 lib/libmimx-ispell.a
 lib/libmimx-ispell.la
 lib/libmimx-ispell.so
-lib/libmimx-ispell.so.1
+lib/libmimx-ispell.so.2
 libdata/pkgconfig/m17n-core.pc
 libdata/pkgconfig/m17n-gui.pc
 libdata/pkgconfig/m17n-shell.pc