- Update to 2.9.3. [1]

- Add --disable-* options to CONFIGURE_ARGS to disable options actually.

PR:		ports/97543 [1]
Submitted by:	KIMURA Yasuhiro <yasu@utahime.org> [1]

6 files changed, 94 insertions, 44 deletions

diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 6603c32156f9..000bff9ab358 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mlterm
-PORTVERSION=	2.9.2
-PORTREVISION=	2
+PORTVERSION=	2.9.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,15 +24,18 @@ 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
+		UIM "uim support (experimental)" off \
+		M17NLIB "m17n library support (experimental)" off \
+		IIIMF "IIIMF support (experimental)" off \
+		SCIM "SCIM support (experimental)" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FRIBIDI)
 CONFIGURE_ARGS+=	--enable-fribidi
 LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
+.else
+CONFIGURE_ARGS+=	--disable-fribidi
 .endif
 
 .if defined(WITH_UIM)
@@ -42,6 +44,7 @@ MAKE_ENV=	LIBS_LOCAL=-L${LOCALBASE}/lib
 LIB_DEPENDS+=	uim.1:${PORTSDIR}/textproc/uim
 PLIST_SUB+=	UIM=""
 .else
+CONFIGURE_ARGS+=	--disable-uim
 PLIST_SUB+=	UIM="@comment "
 .endif
 
@@ -51,6 +54,7 @@ MAKE_ENV=	LIBS_LOCAL=-L${LOCALBASE}/lib
 LIB_DEPENDS+=	m17n.1:${PORTSDIR}/devel/m17n-lib
 PLIST_SUB+=	M17NLIB=""
 .else
+CONFIGURE_ARGS+=	--disable-m17nlib
 PLIST_SUB+=	M17NLIB="@comment "
 .endif
 
@@ -60,22 +64,33 @@ 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
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/iiim"
+LIB_DEPENDS+=	iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
 PLIST_SUB+=	IIIMF=""
 .else
+CONFIGURE_ARGS+=	--disable-iiimf
 PLIST_SUB+=	IIIMF="@comment "
 .endif
 
+.if defined(WITH_SCIM)
+CONFIGURE_ARGS+=	--enable-scim
+MAKE_ENV=	LIBS_LOCAL=-L${LOCALBASE}/lib
+LIB_DEPENDS+=	scim-1.0.9:${PORTSDIR}/textproc/scim
+PLIST_SUB+=	SCIM=""
+.else
+CONFIGURE_ARGS+=	--disable-scim
+PLIST_SUB+=	SCIM="@comment "
+.endif
+
 INSTALLS_SHLIB=	yes
 
 MAN1=	mlterm.1 mlclient.1
 
 .if ${X_WINDOW_SYSTEM:L} == xfree86-3
 PKGNAMESUFFIX=	-noaa
+CONFIGURE_ARGS+=	--with-type-engines=xcore
 .else
-CONFIGURE_ARGS+=	--enable-anti-alias
+CONFIGURE_ARGS+=	--with-type-engines="xcore,xft"
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .endif
 
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index a76dcd685b4d..d92b51f6a3db 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1,3 +1,3 @@
-MD5 (mlterm-2.9.2.tar.gz) = be561bfe646a112ce7400b9d0db41e82
-SHA256 (mlterm-2.9.2.tar.gz) = e5ff08c516c4edabc51b12e177b6e653a8d01ea5bec2684b9db2c75ec95d268a
-SIZE (mlterm-2.9.2.tar.gz) = 1980109
+MD5 (mlterm-2.9.3.tar.gz) = 20188c0981a49dbb95c3ff5b8eb25365
+SHA256 (mlterm-2.9.3.tar.gz) = 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f
+SIZE (mlterm-2.9.3.tar.gz) = 1984977
diff --git a/x11/mlterm/files/extra-patch-inputmethod:iiimf:im_iiimf.c b/x11/mlterm/files/extra-patch-inputmethod:iiimf:im_iiimf.c
deleted file mode 100644
index c9240fd279ed..000000000000
--- a/x11/mlterm/files/extra-patch-inputmethod:iiimf:im_iiimf.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/patch-kiklib:configure b/x11/mlterm/files/patch-kiklib:configure
index 2f1c0bd3cabc..3ffa704128ef 100644
--- a/x11/mlterm/files/patch-kiklib:configure
+++ b/x11/mlterm/files/patch-kiklib:configure
@@ -1,19 +1,74 @@
---- kiklib/configure.orig	Sun Feb 19 02:28:35 2006
-+++ kiklib/configure	Sun Feb 19 03:03:42 2006
-@@ -7261,11 +7261,7 @@
+--- kiklib/configure.orig	Sun May 21 13:21:24 2006
++++ kiklib/configure	Sun May 21 13:24:06 2006
+@@ -7299,66 +7299,7 @@
  	if test "$kik_cv_mingw32" = yes ; then
  		kik_cv_pty=win32
  	else
--		if test -c /dev/ptmx ; then
+-		echo $ac_n "checking for posix_openpt""... $ac_c" 1>&6
+-echo "configure:7304: checking for posix_openpt" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_posix_openpt'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7309 "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char posix_openpt(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char posix_openpt();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_posix_openpt) || defined (__stub___posix_openpt)
+-choke me
+-#else
+-posix_openpt();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_func_posix_openpt=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_posix_openpt=no"
+-fi
+-rm -f conftest*
+-fi
+-
+-if eval "test \"`echo '$ac_cv_func_'posix_openpt`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  
+-			cat >> confdefs.h <<\EOF
+-#define HAVE_POSIX_OPENPT 
+-EOF
+-
 -			kik_cv_pty=streams
--		else
--			kik_cv_pty=bsd
--		fi
+-			
+-else
+-  echo "$ac_t""no" 1>&6
+-
+-			if test -c /dev/ptmx ; then
+-				kik_cv_pty=streams
+-			else
+-				kik_cv_pty=bsd
+-			fi
+-fi
+-
 +		kik_cv_pty=bsd
  	fi
  fi
  
-@@ -7535,11 +7531,6 @@
+@@ -7623,11 +7564,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/x11/mlterm/files/patch-mkf:configure b/x11/mlterm/files/patch-mkf:configure
deleted file mode 100644
index 9c815b5619a3..000000000000
--- a/x11/mlterm/files/patch-mkf:configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- mkf/configure.orig	Fri Jun 20 10:53:36 2003
-+++ mkf/configure	Fri Jun 20 10:53:51 2003
-@@ -5796,11 +5796,6 @@
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
-   esac
- 
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
--
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist
index ecc5dfe46970..c1b07c2cc6c0 100644
--- a/x11/mlterm/pkg-plist
+++ b/x11/mlterm/pkg-plist
@@ -34,6 +34,9 @@ lib/mlterm/libim-kbd.so
 %%M17NLIB%%lib/mlterm/libim-m17nlib.a
 %%M17NLIB%%lib/mlterm/libim-m17nlib.la
 %%M17NLIB%%lib/mlterm/libim-m17nlib.so
+%%SCIM%%lib/mlterm/libim-scim.a
+%%SCIM%%lib/mlterm/libim-scim.la
+%%SCIM%%lib/mlterm/libim-scim.so
 %%UIM%%lib/mlterm/libim-uim.a
 %%UIM%%lib/mlterm/libim-uim.la
 %%UIM%%lib/mlterm/libim-uim.so
@@ -59,6 +62,7 @@ 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/vi/LC_MESSAGES/mlconfig.mo
 share/locale/zh_TW/LC_MESSAGES/mlconfig.mo
 @dirrm etc/mlterm
 @dirrm lib/mlterm