- Update to 2.9.0.

- Use OPTIONS.
- Add three knobs(WITH_UIM, WITH_M17NLIB, WITH_IIIMF).

Note: IIIMF support is currently broken.

4 files changed, 69 insertions, 34 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 0a7647a5e98f..b86efb35f597 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mlterm
-PORTVERSION=	2.8.0
-PORTREVISION=	1
+PORTVERSION=	2.9.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,22 +15,61 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Multilingual X11 terminal emulator
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gdkpixbuf
-USE_LIBTOOL_VER=13
+USE_GNOME=	gtk20 lthack
+USE_INC_LIBTOOL_VER=13
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf1 --enable-utmp
+USE_PERL5_BUILD=yes
+CONFIGURE_ARGS=	--with-imagelib=gdk-pixbuf --enable-utmp
+CONFIGURE_ENV=	LIBS=-L${LOCALBASE}/lib CFLAGS=-I${LOCALBASE}/include
+
+OPTIONS=	FRIBIDI	"Use Fribidi for BiDi rendering" off \
+		UIM "uim support" off \
+		M17NLIB "m17n library support" off \
+		IIIMF "IIIMF support (broken)" off
+
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_FRIBIDI)
-CONFIGURE_ARGS=	--enable-fribidi
-LIB_DEPENDS=	fribidi.0:${PORTSDIR}/converters/fribidi
+CONFIGURE_ARGS+=	--enable-fribidi
+LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
+.endif
+
+.if defined(WITH_UIM)
+CONFIGURE_ARGS+=	--enable-uim
+MAKE_ENV=	LIBS_LOCAL=-L${LOCALBASE}/lib
+LIB_DEPENDS+=	uim.0:${PORTSDIR}/japanese/uim
+PLIST_SUB+=	UIM=""
+.else
+PLIST_SUB+=	UIM="@comment "
+.endif
+
+.if defined(WITH_M17NLIB)
+CONFIGURE_ARGS+=	--enable-m17nlib
+MAKE_ENV=	LIBS_LOCAL=-L${LOCALBASE}/lib
+LIB_DEPENDS+=	m17n.1:${PORTSDIR}/devel/m17n-lib
+PLIST_SUB+=	M17NLIB=""
+.else
+PLIST_SUB+=	M17NLIB="@comment "
+.endif
+
+.if defined(WITH_IIIMF)
+.if ${OSVERSION} < 500043
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-inputmethod:iiimf:im_iiimf.c
+.endif
+
+CONFIGURE_ARGS+=	--enable-iiimf
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CFLAGS=-I${LOCALBASE}/include
+MAKE_ENV=	LIBS_LOCAL="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CFLAGS_LOCAL="-I${LOCALBASE}/include/iiimf -I${LOCALBASE}/include/iiimf/iiimp"
+LIB_DEPENDS+=	iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
+PLIST_SUB+=	IIIMF=""
+.else
+PLIST_SUB+=	IIIMF="@comment "
 .endif
 
 INSTALLS_SHLIB=	yes
 
 MAN1=	mlterm.1 mlclient.1
 
-.include <bsd.port.pre.mk>
-
 .if ${X_WINDOW_SYSTEM:L} == xfree86-3
 PKGNAMESUFFIX=	-noaa
 .else
@@ -39,18 +77,12 @@ CONFIGURE_ARGS+=	--enable-anti-alias
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif
 
-pre-everything::
-.if !defined(WITH_FRIBIDI)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "You may enable BiDi support by using the"
-	@${ECHO_MSG} "WITH_FRIBIDI option."
-	@${ECHO_MSG}
-.endif
-
 post-configure:
 	${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
 		-e "s,%%PERL%%,${PERL}," \
 		${WRKSRC}/tool/w3mmlconfig/Makefile
+	${CP} ${WRKSRC}/libtool ${WRKSRC}/kiklib/
+	${CP} ${WRKSRC}/libtool ${WRKSRC}/mkf/
 
 post-build:
 	(cd ${WRKSRC}/tool/w3mmlconfig; ${MAKE})
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index 12436ccbcd0a..99ec07004e96 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,2 +1,2 @@
-MD5 (mlterm-2.8.0.tar.gz) = 69b38c6909ba8cd2e81edd18fc612b1f
-SIZE (mlterm-2.8.0.tar.gz) = 1819417
+MD5 (mlterm-2.9.0.tar.gz) = fb0c077b4ac1a2cf7ca455dc79b6cf6a
+SIZE (mlterm-2.9.0.tar.gz) = 1884906
diff --git a/x11/mlterm/files/extra-patch-inputmethod:iiimf:im_iiimf.c b/x11/mlterm/files/extra-patch-inputmethod:iiimf:im_iiimf.c
new file mode 100644
index 000000000000..c9240fd279ed
--- /dev/null
+++ b/x11/mlterm/files/extra-patch-inputmethod:iiimf:im_iiimf.c
@@ -0,0 +1,10 @@
+--- inputmethod/iiimf/im_iiimf.c.orig	Sun Nov 14 21:01:46 2004
++++ inputmethod/iiimf/im_iiimf.c	Sun Nov 14 21:02:13 2004
+@@ -30,7 +30,6 @@
+  *	$Id: im_iiimf.c,v 1.15 2004/10/21 21:02:34 seiichi Exp $
+  */
+ 
+-#define  HAVE_STDINT_H 1	/* FIXME */
+ #include  <iiimcf.h>
+ 
+ #include  <string.h>		/* strncmp */
diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist
index e5d4209c24ed..3200b37859d5 100644
--- a/x11/mlterm/pkg-plist
+++ b/x11/mlterm/pkg-plist
@@ -15,36 +15,29 @@ etc/mlterm/vaafont
 etc/mlterm/vfont
 etc/mlterm/xim
 lib/libkik.a
-lib/libkik.la
 lib/libkik.so
-lib/libkik.so.9
+lib/libkik.so.10
 lib/libmkf.a
-lib/libmkf.la
 lib/libmkf.so
 lib/libmkf.so.13
-lib/mlterm/libathena.a
-lib/mlterm/libathena.la
 lib/mlterm/libathena.so
-lib/mlterm/libmotif.a
-lib/mlterm/libmotif.la
+%%IIIMF%%lib/mlterm/libim-iiimf.so
+lib/mlterm/libim-kbd.so
+%%M17NLIB%%lib/mlterm/libim-m17nlib.so
+%%UIM%%lib/mlterm/libim-uim.so
 lib/mlterm/libmotif.so
-lib/mlterm/libmozmodern.a
-lib/mlterm/libmozmodern.la
 lib/mlterm/libmozmodern.so
-lib/mlterm/libnext.a
-lib/mlterm/libnext.la
 lib/mlterm/libnext.so
-lib/mlterm/libsample.a
-lib/mlterm/libsample.la
 lib/mlterm/libsample.so
-lib/mlterm/libsample2.a
-lib/mlterm/libsample2.la
 lib/mlterm/libsample2.so
 libexec/mlconfig
 libexec/mlterm-menu
 libexec/w3mmlconfig/mlconfig-data.pl
 libexec/w3mmlconfig/mlconfig.cgi
 %%PORTDOCS%%share/doc/ja/mlterm/README.ja
+share/locale/de/LC_MESSAGES/mlconfig.mo
+share/locale/ja/LC_MESSAGES/mlconfig.mo
+share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
 @dirrm etc/mlterm
 @dirrm lib/mlterm
 @dirrm libexec/w3mmlconfig