185 files changed, 2068 insertions, 2886 deletions

diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile
index a598a48db4a2..f1dd1cf3ba83 100644
--- a/chinese/iiimf-le-newpy/Makefile
+++ b/chinese/iiimf-le-newpy/Makefile
@@ -6,42 +6,40 @@
 #
 
 PORTNAME=	le-newpy
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	IIIMF New PinYin input method engine
 
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/leif
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+LE_TARGETS=	newpy
 
 .if !defined(WITHOUT_XAUX)
+LE_TARGETS+=	newpy/xaux
 USE_MOTIF=	yes
 CFLAGS+=	-I${X11BASE}/include
 LDFLAGS+=	-L${X11BASE}/lib
 PLIST_SUB+=	WANT_XAUX=""
-RUN_DEPENDS+=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
 .else
-CONFIGURE_ARGS+=--without-x
 PLIST_SUB+=	WANT_XAUX="@comment "
 .endif
 
@@ -51,33 +49,26 @@ PLIST_SUB+=	WANT_XAUX="@comment "
 IGNORE=		"It is supported on FreeBSD 5.3 and later"
 .endif
 
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
-.endif
-
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/../lib/CSConv/csconv.h
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/newpy/xaux/aux_win.c \
+		${BUILDDIR}/newpy/xaux/aux_so.c
 
-pre-configure:
-	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+do-configure:
+.if defined(WITHOUT_XAUX)
+	@cd ${WRKSRC} && \
+	 ${REINPLACE_CMD} -e '/^CONFIG_FLAGS =/s,$$, --without-x,' Makefile
+.endif
+	@cd ${BUILDDIR} && ${REINPLACE_CMD} \
+	 -e "/LE_TARGETS=/s,%%LE_TARGETS%%,${LE_TARGETS}," configure.ac
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/chinese/iiimf-le-newpy/distinfo b/chinese/iiimf-le-newpy/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/chinese/iiimf-le-newpy/distinfo
+++ b/chinese/iiimf-le-newpy/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/chinese/iiimf-le-newpy/files/patch-Makefile
+++ b/chinese/iiimf-le-newpy/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4
+++ b/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/chinese/iiimf-le-newpy/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
index 184e6f1835cd..db087f1857a0 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac
@@ -1,52 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 17:50:52 2005
-@@ -44,15 +44,15 @@
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
--IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_CANNA
-+dnl IM_CHECK_FREEWNN
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
- IM_CHECK_X
--IM_CHECK_GTK
-+dnl IM_CHECK_GTK
- IM_CHECK_MOTIF
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
--AC_SUBST(GTK2_CFLAGS)
--AC_SUBST(GTK2_LIBS)
-+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-+dnl AC_SUBST(GTK2_CFLAGS)
-+dnl AC_SUBST(GTK2_LIBS)
- 
- dnl --------------------------------------------------------------------------------
- dnl                      Section 5: compilation options
-@@ -63,23 +63,17 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-+LE_TARGETS="newpy"
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
++LE_TARGETS="%%LE_TARGETS%%"
  
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
- IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am
deleted file mode 100644
index 11207f269a2f..000000000000
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- leif/newpy/Makefile.am.orig	Wed Mar  2 23:57:32 2005
-+++ leif/newpy/Makefile.am	Wed Mar  2 23:57:57 2005
-@@ -3,7 +3,8 @@
- datadir = $(IM_LOCALEDIR)/zh_CN/newpy/data
- newpy_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
-                   -DCompByNewPinyin -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
--                  -I$(IM_INCLUDEDIR)/iml
-+                  -I$(IM_INCLUDEDIR)/iml \
-+		  -DIMDIR="\"${IMDIR}\""
- newpy_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- newpy_la_LIBADD = $(THREAD_LIBS)
- newpy_la_SOURCES = NewPY.c NewPYLE.c KeysymType.c OnKeySym.c CikuOper.c \
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c
deleted file mode 100644
index abb3adb1bddf..000000000000
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/newpy/NewPY.c	Fri Jul 16 17:38:30 2004
-+++ leif/newpy/NewPY.c	Wed Feb 16 20:42:06 2005
-@@ -321,7 +321,7 @@
- #ifdef  WIN32
-     l->path = "d:\\newpy_obj.jar";  
- #else
--    l->path = "/usr/lib/im/locale/zh_CN/newpy/newpy_obj.jar";  /* path */
-+    l->path = (IMDIR "/locale/zh_CN/newpy/newpy_obj.jar");  /* path */
- #endif
- 
-     l->signature = "";
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am
deleted file mode 100644
index 14ed8d141bbc..000000000000
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/newpy/xaux/Makefile.am.orig	Thu Mar  3 00:00:36 2005
-+++ leif/newpy/xaux/Makefile.am	Thu Mar  3 00:01:03 2005
-@@ -3,7 +3,7 @@
- datadir = $(IM_LOCALEDIR)/zh_CN/newpy
- COMMONCFLAGS = $(X_CFLAGS) $(THREAD_CXX_CFLAGS) \
-                -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO -DUSE_CSCONV \
--               -I$(CSCONV_DIR)
-+               -I$(CSCONV_DIR) -DIMDIR="\"${IMDIR}\""
- COMMONLDFLAGS = -module $(THREAD_LDFLAGS)
- aux_la_CFLAGS = $(COMMONCFLAGS)
- aux_win_CFLAGS = $(COMMONCFLAGS)
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c
index e9d2299d8bcb..1ba276de8c97 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c
@@ -1,11 +1,11 @@
---- leif/newpy/xaux/aux_so.c	Mon Sep  1 17:42:44 2003
-+++ leif/newpy/xaux/aux_so.c	Wed Feb 16 20:42:14 2005
+--- leif/newpy/xaux/aux_so.c.orig	Mon May 16 23:20:32 2005
++++ leif/newpy/xaux/aux_so.c	Mon May 16 23:21:59 2005
 @@ -56,7 +56,7 @@
  
  #define HASH_SIZE 137
  #define ME			"aux_so"
 -#define	AUX_EXT			"/usr/lib/im/locale/zh_CN/newpy/aux_win"
-+#define	AUX_EXT			(IMDIR "/locale/zh_CN/newpy/aux_win")
++#define	AUX_EXT			"%%LOCALBASE%%" "/lib/iiim/le/newpy/aux_win"
  
  typedef struct _aux_icid {
          aux_t *                 aux;
diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c
index de604ccf0d31..b4c10a87f77c 100644
--- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c
+++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c
@@ -1,11 +1,11 @@
---- leif/newpy/xaux/aux_win.c	Fri Mar 16 00:52:22 2001
-+++ leif/newpy/xaux/aux_win.c	Wed Feb 16 20:42:20 2005
+--- leif/newpy/xaux/aux_win.c.orig	Mon May 16 23:16:54 2005
++++ leif/newpy/xaux/aux_win.c	Mon May 16 23:19:12 2005
 @@ -61,7 +61,7 @@
  #include "gif_lib.h"
  #include "getarg.h"
  
 -#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/"
-+#define IMAGE_PATH (IMDIR "/locale/zh_CN/newpy/")
++#define IMAGE_PATH "%%LOCALBASE%%" "/lib/iiim/le/newpy/"
  
  Pixmap LoadGIFFile(char * filename);
  static void AllocateColors1(void);
diff --git a/chinese/iiimf-le-newpy/pkg-plist b/chinese/iiimf-le-newpy/pkg-plist
index 23bd3b3687b4..d02b7a045aa0 100644
--- a/chinese/iiimf-le-newpy/pkg-plist
+++ b/chinese/iiimf-le-newpy/pkg-plist
@@ -1,17 +1,17 @@
-lib/im/leif/newpy.so
-lib/im/locale/zh_CN/newpy/data/PyCiku.dat
-lib/im/locale/zh_CN/newpy/data/UdCiku.dat
-lib/im/locale/zh_CN/newpy/newpy_obj.jar
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux.so.0
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux.so
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/aux_win
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/full.gif
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/gb.gif
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/gbk.gif
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/half.gif
-%%WANT_XAUX%%lib/im/locale/zh_CN/newpy/help.gif
-@dirrm lib/im/locale/zh_CN/newpy/data
-@dirrm lib/im/locale/zh_CN/newpy
-@unexec rmdir %D/lib/im/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/lib/im/locale 2>/dev/null || true
-@unexec rmdir %D/lib/im/leif 2>/dev/null || true
+lib/iiim/le/newpy/newpy.so
+lib/iiim/le/newpy/newpy_obj.jar
+lib/iiim/le/newpy/data/PyCiku.dat
+lib/iiim/le/newpy/data/UdCiku.dat
+%%WANT_XAUX%%lib/iiim/le/newpy/aux.so.0
+%%WANT_XAUX%%lib/iiim/le/newpy/aux.so
+%%WANT_XAUX%%lib/iiim/le/newpy/aux.la
+%%WANT_XAUX%%lib/iiim/le/newpy/aux.a
+%%WANT_XAUX%%lib/iiim/le/newpy/aux_win
+%%WANT_XAUX%%lib/iiim/le/newpy/full.gif
+%%WANT_XAUX%%lib/iiim/le/newpy/gb.gif
+%%WANT_XAUX%%lib/iiim/le/newpy/gbk.gif
+%%WANT_XAUX%%lib/iiim/le/newpy/half.gif
+%%WANT_XAUX%%lib/iiim/le/newpy/help.gif
+@dirrm lib/iiim/le/newpy/data
+@dirrm lib/iiim/le/newpy
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index 97a73d62a9d8..05048bf2d9d3 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -6,58 +6,50 @@
 #
 
 PORTNAME=	le-ude
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	chinese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	IIIMF User Defined language Engine for Simplified Chinese conversion
 
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=      yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
+
+.include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/leif
-BUILD_WRKSRC=	${WRKSRC}/ude
-INSTALL_WRKSRC=	${WRKSRC}/ude
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+.if ${OSVERSION} < 503000
+IGNORE=	It is supported on FreeBSD 5.3 and later.
+.endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/ude/UDEngine.c
 
 pre-configure:
-	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
-
-.include <bsd.port.mk>
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
+
+.include <bsd.port.post.mk>
diff --git a/chinese/iiimf-le-ude/distinfo b/chinese/iiimf-le-ude/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/chinese/iiimf-le-ude/distinfo
+++ b/chinese/iiimf-le-ude/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/chinese/iiimf-le-ude/files/patch-Makefile
+++ b/chinese/iiimf-le-ude/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4
+++ b/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/chinese/iiimf-le-ude/files/patch-leif_Makefile.am b/chinese/iiimf-le-ude/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/chinese/iiimf-le-ude/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/chinese/iiimf-le-ude/files/patch-leif_configure.ac b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
index cfce1eedb62a..d899318fb5d8 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
@@ -1,54 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 17:44:36 2005
-@@ -44,15 +44,15 @@
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
--IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_CANNA
-+dnl IM_CHECK_FREEWNN
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
--IM_CHECK_X
--IM_CHECK_GTK
--IM_CHECK_MOTIF
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
--AC_SUBST(GTK2_CFLAGS)
--AC_SUBST(GTK2_LIBS)
-+dnl IM_CHECK_X
-+dnl IM_CHECK_GTK
-+dnl IM_CHECK_MOTIF
-+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-+dnl AC_SUBST(GTK2_CFLAGS)
-+dnl AC_SUBST(GTK2_LIBS)
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
++LE_TARGETS="ude"
  
- dnl --------------------------------------------------------------------------------
- dnl                      Section 5: compilation options
-@@ -63,23 +63,15 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
--
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
-+LE_TARGETS="udt"
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c b/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c
new file mode 100644
index 000000000000..99f323c55cb1
--- /dev/null
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c
@@ -0,0 +1,11 @@
+--- leif/ude/IMHandler.c.orig	Wed May 18 03:17:57 2005
++++ leif/ude/IMHandler.c	Wed May 18 03:18:24 2005
+@@ -71,7 +71,7 @@
+ 	if(ct_list == NULL) {
+ 
+ #ifndef WIN32
+-		strcat(ct_path, "/../locale/zh_CN/ude/data");
++		strcat(ct_path, "data");
+ #else
+ 		strcat(ct_path, "\\..\\locale\\zh_CN\\ude\\data");
+ #endif
diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am b/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am
index 6d80b3552733..474d850529be 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am
@@ -1,11 +1,24 @@
---- leif/ude/Makefile.am.orig	Thu Mar  3 00:07:57 2005
-+++ leif/ude/Makefile.am	Thu Mar  3 00:08:15 2005
-@@ -2,7 +2,7 @@
- datadir = $(IM_LOCALEDIR)/zh_CN/ude/data
- udengine_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
+--- leif/ude/Makefile.am.orig	Thu Apr 14 00:30:34 2005
++++ leif/ude/Makefile.am	Wed May 18 02:42:34 2005
+@@ -1,13 +1,14 @@
+-LE_FILES = udengine.so
+-datadir = $(IM_LEIFDIR)/ude/data
+-udengine_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
++LENAME = ude
++LE_FILES = ude.so
++datadir = $(IM_LEIFDIR)/$(LENAME)/data
++ude_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
                       -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
--                     -I$(IM_INCLUDEDIR)/iml
-+                     -I$(IM_INCLUDEDIR)/iml -DIMDIR="\"${IMDIR}\""
- udengine_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- udengine_la_LIBADD = $(THREAD_LIBS)
- udengine_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
+                      -I$(IM_INCLUDEDIR)/iml
+-udengine_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
+-udengine_la_LIBADD = $(THREAD_LIBS)
+-udengine_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
++ude_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
++ude_la_LIBADD = $(THREAD_LIBS)
++ude_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
+                       CodeTable.c MakeCodeTable.c
+-noinst_LTLIBRARIES = udengine.la
++noinst_LTLIBRARIES = ude.la
+ data_DATA = data/pinyin.mb
+ 
+ include $(top_srcdir)/install-leif.mak
diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
index c70fc4bea433..a645ed5fd6cf 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
@@ -1,11 +1,29 @@
---- leif/ude/UDEngine.c	Fri Mar 16 00:52:22 2001
-+++ leif/ude/UDEngine.c	Wed Feb 16 20:47:14 2005
-@@ -302,7 +302,7 @@
+--- leif/ude/UDEngine.c.orig	Fri Mar 16 00:52:22 2001
++++ leif/ude/UDEngine.c	Wed May 18 03:06:05 2005
+@@ -94,7 +94,7 @@
+ UTFCHAR zhhrn_string[] = {0x7b80, 0x4f53, 0x4e2d, 0x872d, 0x0};
+ 
+ static IMLEName lename = {
+-    "udengine", lename_string	/* LE id, HRN */
++    "ude", lename_string	/* LE id, HRN */
+ };
+ 
+ static IMLocale locales[] = {
+@@ -295,14 +295,14 @@
+     objects = (IMObjectDescriptorStruct *) calloc(2, sizeof(IMObjectDescriptorStruct));
+     l = objects;
+ 
+-    l->leid = "udengine";       /* engine id */
++    l->leid = "ude";       /* engine id */
+     l->type = IM_DOWNLOADINGOBJECT_JARGUI_TYPE; /* object type */
+     l->name = (UTFCHAR *) calloc(1, sizeof(UTFCHAR) * (UTFCHARLen(aux_name_panel) + 1));
+     UTFCHARCpy(l->name, aux_name_panel);
      l->name_length = UTFCHARLen(aux_name_panel);
      l->domain = "com.sun.udengine";
-     l->scope = "udengine";      
+-    l->scope = "udengine";      
 -    l->path = "/usr/lib/im/locale/zh_CN/udengine/udengine_obj.jar";  /* path */
-+    l->path = (IMDIR "/locale/zh_CN/udengine/udengine_obj.jar");  /* path */
++    l->scope = "ude";      
++    l->path = "%%PREFIX%%" "/lib/iiim/le/ude/ude.so";  /* path */
      l->signature = "";
      l->basepath = NULL;         /* only for CCDEF */
      l->encoding = NULL;         /* only for CCDEF */
diff --git a/chinese/iiimf-le-ude/pkg-plist b/chinese/iiimf-le-ude/pkg-plist
index 7c4969855f28..353765143b79 100644
--- a/chinese/iiimf-le-ude/pkg-plist
+++ b/chinese/iiimf-le-ude/pkg-plist
@@ -1,7 +1,5 @@
-lib/im/leif/udengine.so
-lib/im/locale/zh_CN/ude/data/pinyin.mb
-@dirrm lib/im/locale/zh_CN/ude/data
-@dirrm lib/im/locale/zh_CN/ude
-@unexec rmdir %D/lib/im/locale/zh_CN > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
+lib/iiim/le/ude/ude.so
+lib/iiim/le/ude/data/pinyin.mb
+@dirrm lib/iiim/le/ude/data
+@dirrm lib/iiim/le/ude
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index ff9f9a693e5a..3cd213807ee4 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -6,84 +6,56 @@
 #
 
 PORTNAME=	le-canna
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	daichi@freebsd.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Canna language engine for IIIMF
 
 LIB_DEPENDS=	canna16.1:${PORTSDIR}/japanese/Canna
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server \
+		${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+USE_GNOME=	gtk20
+USE_XLIB=	yes
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
-
-.if !defined(WITHOUT_XAUX)
-USE_XLIB=	yes
-USE_GNOME=	gtk20
-CFLAGS+=	-I${X11BASE}/include
-LDFLAGS+=	-L${X11BASE}/lib
-PLIST_SUB+=	WANT_XAUX=""
-RUN_DEPENDS+=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
-.else
-CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	WANT_XAUX="@comment "
-.endif
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
-CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/../lib/CSConv/csconv.h
-
-pre-configure:
-	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-.if defined(WITHOUT_XAUX)
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "/GTK/s,^.*$$,,g" configure.ac
-.endif
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
+		${WRKSRC}/lib/CSConv/csconv.h
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/japanese/iiimf-le-canna/distinfo b/japanese/iiimf-le-canna/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/japanese/iiimf-le-canna/distinfo
+++ b/japanese/iiimf-le-canna/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/japanese/iiimf-le-canna/files/patch-Makefile
+++ b/japanese/iiimf-le-canna/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4 b/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4
+++ b/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/japanese/iiimf-le-canna/files/patch-leif_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c b/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
deleted file mode 100644
index 4c96bb2874fe..000000000000
--- a/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- leif/canna/CannaLE.c.orig	Wed Oct 13 00:26:27 2004
-+++ leif/canna/CannaLE.c	Wed Mar  2 23:37:14 2005
-@@ -86,7 +86,7 @@
- 
- #include <dlfcn.h>
- #include "csconv.h"
--#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH	(IMDIR "/csconv/csconv.so")
- #define CSC_OPEN_LOCALE	"csconv_open_locale"
- #define CSC_OPEN	"csconv_open"
- #define CSC_CONV	"csconv"
-@@ -104,11 +104,11 @@
- 				       char **, size_t *);
- typedef int		(* csc_close_t)(csconv_t);
- 
--static void *			csc_handle;	
--static csc_open_locale_t	csc_open_locale;
--static csc_open_t		csc_open;
--static csc_conv_t		csc_conv;
--static csc_close_t		csc_close;
-+static void *			csc_handle = NULL;	
-+static csc_open_locale_t	csc_open_locale = NULL;
-+static csc_open_t		csc_open = NULL;
-+static csc_conv_t		csc_conv = NULL;
-+static csc_close_t		csc_close = NULL;
- static csconv_t                 csconv_cd = NULL;
- 
- Bool    if_canna_OpenIF();
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am
deleted file mode 100644
index 5283440c90a9..000000000000
--- a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- leif/canna/Makefile.am.orig	Mon Sep  6 17:40:47 2004
-+++ leif/canna/Makefile.am	Wed Mar  2 23:37:26 2005
-@@ -1,10 +1,9 @@
--SUBDIRS = xaux
--
- LE_FILES = CannaLE.so
- CannaLE_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
-                     -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
-                     -I$(IM_INCLUDEDIR)/iml \
--                    -I$(CSCONV_DIR) -g
-+                    -I$(CSCONV_DIR) \
-+		    -DIMDIR="\"$(IMDIR)\""
- CannaLE_la_LDFLAGS = -avoid-version -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- CannaLE_la_LIBADD = -lcanna $(THREAD_LIBS)
- CannaLE_la_SOURCES = CannaLE.c
diff --git a/japanese/iiimf-le-canna/files/patch-leif_configure.ac b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
index 4028da90cd4e..d38ee647dcde 100644
--- a/japanese/iiimf-le-canna/files/patch-leif_configure.ac
+++ b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
@@ -1,45 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 18:29:16 2005
-@@ -45,11 +45,11 @@
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
- IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_FREEWNN
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_X
- IM_CHECK_GTK
--IM_CHECK_MOTIF
-+dnl IM_CHECK_MOTIF
- PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
- AC_SUBST(GTK2_CFLAGS)
- AC_SUBST(GTK2_LIBS)
-@@ -63,23 +63,17 @@
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
 +LE_TARGETS="canna"
  
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
-+IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/japanese/iiimf-le-canna/pkg-plist b/japanese/iiimf-le-canna/pkg-plist
index 385ebd7c4c6b..739e6727c515 100644
--- a/japanese/iiimf-le-canna/pkg-plist
+++ b/japanese/iiimf-le-canna/pkg-plist
@@ -1,7 +1,7 @@
-lib/im/leif/CannaLE.so
-%%WANT_XAUX%%lib/im/locale/ja/CannaLE/aux.so
-%%WANT_XAUX%%lib/im/locale/ja/CannaLE/auxmenu
-%%WANT_XAUX%%@dirrm lib/im/locale/ja/CannaLE
-%%WANT_XAUX%%@dirrm lib/im/locale/ja
-@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
+lib/iiim/le/CannaLE/CannaLE.so
+lib/iiim/le/CannaLE/aux.so
+lib/iiim/le/CannaLE/aux.la
+lib/iiim/le/CannaLE/aux.a
+lib/iiim/le/CannaLE/auxmenu
+@dirrm lib/iiim/le/CannaLE
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile
index db4b1f0af62c..793fa28d9df7 100644
--- a/japanese/iiimf-le-freewnn/Makefile
+++ b/japanese/iiimf-le-freewnn/Makefile
@@ -6,71 +6,57 @@
 #
 
 PORTNAME=	le-freewnn
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	daichi@freebsd.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	FreeWnn language engine for IIIMF
 
 LIB_DEPENDS=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server \
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server \
+		${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv \
 		${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/FreeWnn-server
 
-IIIMF_VER=	r12_1-svn2002
+ONLY_FOR_ARCHS=	i386
+
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/wnn \
 		${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/../lib/CSConv/csconv.h
-
-pre-configure:
-	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/freewnn/freewnn.c
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
+		${WRKSRC}/lib/CSConv/csconv.h
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/japanese/iiimf-le-freewnn/distinfo b/japanese/iiimf-le-freewnn/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/japanese/iiimf-le-freewnn/distinfo
+++ b/japanese/iiimf-le-freewnn/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/japanese/iiimf-le-freewnn/files/patch-Makefile b/japanese/iiimf-le-freewnn/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/japanese/iiimf-le-freewnn/files/patch-Makefile
+++ b/japanese/iiimf-le-freewnn/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4 b/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4
+++ b/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_Makefile.am b/japanese/iiimf-le-freewnn/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/japanese/iiimf-le-freewnn/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac b/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac
index a2cf10fddb2c..120f7044166f 100644
--- a/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac
+++ b/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac
@@ -1,53 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 18:13:32 2005
-@@ -44,15 +44,15 @@
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
--IM_CHECK_CANNA
-+dnl IM_CHECK_CANNA
- IM_CHECK_FREEWNN
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
--IM_CHECK_X
--IM_CHECK_GTK
--IM_CHECK_MOTIF
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
--AC_SUBST(GTK2_CFLAGS)
--AC_SUBST(GTK2_LIBS)
-+dnl IM_CHECK_X
-+dnl IM_CHECK_GTK
-+dnl IM_CHECK_MOTIF
-+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-+dnl AC_SUBST(GTK2_CFLAGS)
-+dnl AC_SUBST(GTK2_LIBS)
- 
- dnl --------------------------------------------------------------------------------
- dnl                      Section 5: compilation options
-@@ -63,23 +63,16 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
 +LE_TARGETS="freewnn"
  
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am
deleted file mode 100644
index 88801a97abe2..000000000000
--- a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
---- leif/freewnn/Makefile.am.orig	Wed Mar  2 23:48:30 2005
-+++ leif/freewnn/Makefile.am	Wed Mar  2 23:49:21 2005
-@@ -3,7 +3,8 @@
-                     -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
-                     -I$(IM_INCLUDEDIR)/iml \
-                     -I$(CSCONV_DIR) \
--                    -I/usr/include/wnn
-+		    -DLOCALBASE="\"${LOCALBASE}\"" \
-+		    -DIMDIR="\"${IMDIR}\""
- FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- FreeWnnLE_la_LIBADD = -lwnn $(THREAD_LIBS)
- FreeWnnLE_la_SOURCES = freewnn.c
diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
index 255f856ea558..e7b91d4f17c0 100644
--- a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
+++ b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
@@ -1,18 +1,15 @@
---- leif/freewnn/freewnn.c.orig	Mon Oct  4 19:13:52 2004
-+++ leif/freewnn/freewnn.c	Sun Feb 20 15:43:20 2005
-@@ -59,9 +59,9 @@
+--- leif/freewnn/freewnn.c.orig	Sun Mar 20 11:41:29 2005
++++ leif/freewnn/freewnn.c	Wed May 18 01:20:56 2005
+@@ -59,7 +59,7 @@
  #define BUFSIZE 1024
  #endif
  
 -#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
-+#define WNNRCFILE (LOCALBASE "/lib/wnn/ja_JP/wnnenvrc")
++#define WNNRCFILE "%%LOCALBASE%%" "/lib/wnn/ja_JP/wnnenvrc"
  
--#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH (IMDIR "/csconv/csconv.so")
  #define CSC_OPEN_LOCALE "csconv_open_locale"
  #define CSC_OPEN        "csconv_open"
- #define CSC_CONV        "csconv"
-@@ -163,7 +163,7 @@
+@@ -162,7 +162,7 @@
    int count = 0;
  
    if( str == NULL ) return NULL;
@@ -21,7 +18,7 @@
  
    for(i=0;i<strlen(str);i++) {
      count++;
-@@ -202,7 +202,7 @@
+@@ -201,7 +201,7 @@
  
    if( wstr == NULL ) return NULL;
  
@@ -30,3 +27,114 @@
  
    for(i=0;wstr[i] != 0;i++) 
      count++;
+@@ -388,14 +388,14 @@
+ 
+ UTFCHAR*
+ UTF8_to_UTFCHAR(unsigned char* str) {
+-  UTFCHAR *p, *ustr = NULL;
++  UTFCHAR *ustr = NULL;
+   int len, ulen;
+ 
+   const char *csc_arg_str_ccp; /* For compiler optimization */
+   char *csc_arg_str_cp; /* For compiler optimization */
+ 
+   if( str == NULL ) return NULL;
+-  if( *str == '\0' ) return NULL;
++  if( *str == '\0' ) return "";
+ 
+   if( csconv_utf8_cd == NULL ) {
+     csconv_utf8_cd = csc_open("UTF-16", "UTF-8");
+@@ -408,30 +408,34 @@
+   len = strlen(str);
+ 
+   ulen = sizeof(UTFCHAR)*(len+1);
+-  p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
++  ustr = (UTFCHAR*)malloc(ulen);
++  if (!ustr) return NULL;
++  memset(ustr, 0, ulen);
++  ulen--;
+ 
+   /* Below 2 lines are to prevent gcc's warning and for the sake
+      of compiler optimization */
+   csc_arg_str_ccp = (const char*)str;
+   csc_arg_str_cp = (char*)ustr;
+ 
+-  csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
+-
+-  *ustr = 0;
++  if ((size_t)-1 == csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
++    free(ustr);
++    return NULL;
++  }
+ 
+-  return p;
++  return ustr;
+ }
+ 
+ UTFCHAR*
+ euc2UTFCHAR(unsigned char* str) {
+-  UTFCHAR *p, *ustr = NULL;
++  UTFCHAR *ustr = NULL;
+   int len, ulen;
+ 
+   const char *csc_arg_str_ccp; /* For compiler optimization */
+   char *csc_arg_str_cp; /* For compiler optimization */
+ 
+   if( str == NULL ) return NULL;
+-  if( *str == '\0' ) return NULL;
++  if( *str == '\0' ) return "";
+ 
+   if( csconv_cd == NULL ) {
+     csconv_cd = csc_open_locale("ja_JP.eucJP", "UTF-16", "MultiByte");
+@@ -444,18 +448,22 @@
+   len = strlen(str);
+ 
+   ulen = sizeof(UTFCHAR)*(len+1);
+-  p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
++  ustr = (UTFCHAR*)malloc(ulen);
++  if (!ustr) return NULL;
++  memset(ustr, 0, ulen);
++  ulen--;
+ 
+   /* Below 2 lines are to prevent gcc's warning and for the sake
+      of compiler optimization */
+   csc_arg_str_ccp = (const char*)str;
+   csc_arg_str_cp = (char*)ustr;
+ 
+-  csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
+-
+-  *ustr = 0;
++  if ((size_t)-1 == csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
++    free(ustr);
++    return NULL;
++  }
+ 
+-  return p;
++  return ustr;
+ }
+ 
+ IMText*
+@@ -466,7 +474,10 @@
+   ustr = UTF8_to_UTFCHAR(str);
+ 
+   p = create_IMText(s, ustrlen(ustr));
+-  memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  if (p && ustr) {
++    memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  }
++  if (ustr) free(ustr);
+ 
+   return p;
+ }
+@@ -479,7 +490,10 @@
+   ustr = euc2UTFCHAR(str);
+ 
+   p = create_IMText(s, ustrlen(ustr));
+-  memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  if (p && ustr) {
++    memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
++  }
++  if (ustr) free(ustr);
+ 
+   return p;
+ }
diff --git a/japanese/iiimf-le-freewnn/pkg-plist b/japanese/iiimf-le-freewnn/pkg-plist
index 9a469125e284..fdc944d0defc 100644
--- a/japanese/iiimf-le-freewnn/pkg-plist
+++ b/japanese/iiimf-le-freewnn/pkg-plist
@@ -1,2 +1,3 @@
-lib/im/leif/FreeWnnLE.so
-@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
+lib/iiim/le/FreeWnnLE/FreeWnnLE.so
+@dirrm lib/iiim/le/FreeWnnLE
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile
index c544ebb2a999..8b79dd91986a 100644
--- a/korean/iiimf-le-hangul/Makefile
+++ b/korean/iiimf-le-hangul/Makefile
@@ -6,67 +6,50 @@
 #
 
 PORTNAME=	le-hangul
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	korean textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	daichi@FreeBSD.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	IIIMF Hangul input method engine
 
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/leif
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=		"It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=       -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/../lib/CSConv/csconv.h
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
 
 pre-configure:
-	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/korean/iiimf-le-hangul/distinfo b/korean/iiimf-le-hangul/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/korean/iiimf-le-hangul/distinfo
+++ b/korean/iiimf-le-hangul/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/korean/iiimf-le-hangul/files/patch-Makefile b/korean/iiimf-le-hangul/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/korean/iiimf-le-hangul/files/patch-Makefile
+++ b/korean/iiimf-le-hangul/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/korean/iiimf-le-hangul/files/patch-leif_Makefile.am b/korean/iiimf-le-hangul/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/korean/iiimf-le-hangul/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/korean/iiimf-le-hangul/files/patch-leif_configure.ac b/korean/iiimf-le-hangul/files/patch-leif_configure.ac
index 8ff937c6020d..e9eeed725ade 100644
--- a/korean/iiimf-le-hangul/files/patch-leif_configure.ac
+++ b/korean/iiimf-le-hangul/files/patch-leif_configure.ac
@@ -1,53 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 18:06:01 2005
-@@ -44,15 +44,15 @@
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
--IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_CANNA
-+dnl IM_CHECK_FREEWNN
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
- IM_CHECK_X
--IM_CHECK_GTK
--IM_CHECK_MOTIF
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
--AC_SUBST(GTK2_CFLAGS)
--AC_SUBST(GTK2_LIBS)
-+dnl IM_CHECK_GTK
-+dnl IM_CHECK_MOTIF
-+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-+dnl AC_SUBST(GTK2_CFLAGS)
-+dnl AC_SUBST(GTK2_LIBS)
- 
- dnl --------------------------------------------------------------------------------
- dnl                      Section 5: compilation options
-@@ -63,23 +63,15 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
++LE_TARGETS="hangul"
  
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
--
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
-+LE_TARGETS="hangul"
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/korean/iiimf-le-hangul/pkg-plist b/korean/iiimf-le-hangul/pkg-plist
index e3a4870503c9..242686ebf17e 100644
--- a/korean/iiimf-le-hangul/pkg-plist
+++ b/korean/iiimf-le-hangul/pkg-plist
@@ -1,7 +1,6 @@
-lib/im/leif/hangul.so
-lib/im/locale/ko_KR/hangul.conf
-lib/im/locale/ko_KR/tables/candidate.txt
-@dirrm lib/im/locale/ko_KR/tables
-@dirrm lib/im/locale/ko_KR
-@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
+lib/iiim/le/hangul/hangul.so
+lib/iiim/le/hangul/hangul.conf
+lib/iiim/le/hangul/tables/candidate.txt
+@dirrm lib/iiim/le/hangul/tables
+@dirrm lib/iiim/le/hangul
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 67408b25a711..58b583a58ac0 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -6,86 +6,58 @@
 #
 
 PORTNAME=	client-lib
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Client Framework
 
-LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
+LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
+RUN_DEPENDS=	${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=       --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/lib/iiimcf
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../../acfiles/im_common.m4
-
-pre-configure:
-	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC}/../EIMIL && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
-	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE}
-	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
-	@cd ${WRKSRC}/../EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \
-	 CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
-	 ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
-
-post-configure:
-	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
-		${WRKSRC}/Makefile
-
-pre-build:
-	@cd ${WRKSRC}/../EIMIL && \
-	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+	${REINPLACE_CMD} \
+		-e '/^pkgconfigdir/s,$$(libdir),%%PREFIX%%/libdata,g' \
+		${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile \
+		${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/../EIMIL/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
+		${WRKSRC}/lib/CSConv/csconv.h
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-client-lib/distinfo b/textproc/iiimf-client-lib/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-client-lib/distinfo
+++ b/textproc/iiimf-client-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile
index bcc2cb24a1c8..93b6c7871efe 100644
--- a/textproc/iiimf-client-lib/files/patch-Makefile
+++ b/textproc/iiimf-client-lib/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = lib/EIMIL lib/iiimcf
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
deleted file mode 100644
index d98acce9a275..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/EIMIL/EIMILJournal.c	Mon Aug  2 23:39:10 2004
-+++ lib/EIMIL/EIMILJournal.c	Thu Feb 17 01:55:38 2005
-@@ -61,7 +61,6 @@
-     pjh = NULL;
-     pj = ped->pjst;
-     for (i = 0; i < EIMIL_JOURNAL_MAX_SLOT_SIZE; i++) {
--        fprintf(stderr, "hoge\n");
-         if (!pj) break;
- 	if (pj->pv) EIMIL_RMREF(*pj->pv);
- 	if ((pj->next - pj) < 0) pjh = pj->next;
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_Makefile.am
new file mode 100644
index 000000000000..8e23e8b2eef4
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_Makefile.am
@@ -0,0 +1,9 @@
+--- lib/EIMIL/Makefile.am.orig	Fri May 13 18:03:49 2005
++++ lib/EIMIL/Makefile.am	Fri May 13 18:04:12 2005
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ SUBDIRS = . test
+ #libdir = /usr/local/lib
+ #libEIMIL_la_LDFLAGS = -module -version-info $(LIBEIMIL_MAJOR_VERSION):$(LIBEIMIL_MINOR_VERSION) \
diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
index a5499285555e..89e3fcd66cc2 100644
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
@@ -1,11 +1,14 @@
---- lib/iiimcf/Makefile.am.orig	Wed Mar  2 05:50:46 2005
-+++ lib/iiimcf/Makefile.am	Wed Mar  2 05:51:11 2005
-@@ -2,7 +2,7 @@
+--- lib/iiimcf/Makefile.am.orig	Mon May  9 16:47:15 2005
++++ lib/iiimcf/Makefile.am	Mon May  9 16:48:31 2005
+@@ -1,9 +1,9 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
  SUBDIRS = . test
  #libdir = /usr/local/lib
  libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
--                       -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
+-                       -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la -ldl
 +                       -export-dynamic -export-symbols libiiimcf.sym -liiimp
- libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""
+ libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\"" -I../CSConv
  libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \
                         lookup_choice.c message.c preedit.c status.c trigger.c \
diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac
deleted file mode 100644
index 1f9239eeefb3..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/iiimcf/configure.ac.orig	Wed Mar  2 06:27:04 2005
-+++ lib/iiimcf/configure.ac	Wed Mar  2 06:27:29 2005
-@@ -82,13 +82,13 @@
- COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
- CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
- 
- dnl --------------------------------------------------------------------------------
- dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
deleted file mode 100644
index 1ef1efadc305..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/iiimcf/iiimcf.c	Tue Sep 14 13:19:47 2004
-+++ lib/iiimcf/iiimcf.c	Wed Feb 16 22:59:51 2005
-@@ -440,7 +440,7 @@
- )
- {
-     IIIMF_status st;
--    IIIMP_message *pmes;
-+    IIIMP_message *pmes = NULL;
- 
-     if (!ph->data_s) ph->data_s = iiimp_data_s_new();
-     if (!ph->data_s) return IIIMF_STATUS_MALLOC;
-@@ -501,6 +501,7 @@
-     iiimp_message_delete(ph->data_s, pmes);
-     if (st != IIIMF_STATUS_SUCCESS) goto reconnect;
- 
-+    pmes = NULL;
-     st = iiimcf_wait_message(ph, NULL, IM_CONNECT_REPLY, &pmes);
-     if (st != IIIMF_STATUS_SUCCESS) {
-         if (pmes) iiimp_message_delete(ph->data_s, pmes);
diff --git a/textproc/iiimf-client-lib/pkg-plist b/textproc/iiimf-client-lib/pkg-plist
index 6ce22e367c32..95711009b635 100644
--- a/textproc/iiimf-client-lib/pkg-plist
+++ b/textproc/iiimf-client-lib/pkg-plist
@@ -1,4 +1,7 @@
-lib/libiiimcf.a
+include/iiim/iiimcf.h
+lib/libiiimcf.so.3
 lib/libiiimcf.so
-lib/libiiimcf.so.2
-include/iiimcf.h
+lib/libiiimcf.la
+lib/libiiimcf.a
+libdata/pkgconfig/iiimf-lib-client.pc
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile
index 8313328bbdd9..d680198a38fb 100644
--- a/textproc/iiimf-csconv/Makefile
+++ b/textproc/iiimf-csconv/Makefile
@@ -6,79 +6,50 @@
 #
 
 PORTNAME=	csconv
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Framework encoding convert library
 
-IIIMF_VER=	r12_1-svn2002
+ONLY_FOR_ARCHS=	i386
+
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool
 USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	259
-#USE_AUTOHEADER_VER=	259
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
 WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/lib/CSConv
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../../acfiles/im_common.m4 \
-		${WRKSRC}/configure.ac \
-		${WRKSRC}/csconv.h \
-		${WRKSRC}/converterPI/configure.in \
-		${WRKSRC}/converterPI/test/icutest4linux.c \
-		${WRKSRC}/converterPI/icuconv_relay.c \
-		${WRKSRC}/converterPI/icuconv/common/config.h
-	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
-		${WRKSRC}/converterPI/icuconv/common/icuconv.c
-	for MKFLIN in `find ${WRKSRC} -name "Makefile.in"`; do \
-		${REINPLACE_CMD} -e "/(CC)/s,-lc,,g" $${MKFLIN}; \
-		${REINPLACE_CMD} -e "/(CC)/s,-ldl,,g" $${MKFLIN}; \
-		${REINPLACE_CMD} -e '/(CC)/s,(LIBS),(LDFLAGS),g' $${MKFLIN}; \
-		${REINPLACE_CMD} -e '/(CC)/s,{LIBS},{LDFLAGS},g' $${MKFLIN}; \
-		${REINPLACE_CMD} -e "s,LIBS = @LIBS@,LDFLAGS = @LDFLAGS@,g" $${MKFLIN}; \
-	done
-
-pre-configure:
-	@cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC}/converterPI/ && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
-
-post-configure:
 	${REINPLACE_CMD} \
-		-e "s,prefix = ${PREFIX},prefix = ${PREFIX}/lib/im," \
-		`${FIND} ${WRKSRC} -type f -name Makefile`
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
+		${BUILDDIR}/csconv.h
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-csconv/distinfo b/textproc/iiimf-csconv/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-csconv/distinfo
+++ b/textproc/iiimf-csconv/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile
index bcc2cb24a1c8..78d014fc08d2 100644
--- a/textproc/iiimf-csconv/files/patch-Makefile
+++ b/textproc/iiimf-csconv/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = lib/CSConv
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_Makefile.am b/textproc/iiimf-csconv/files/patch-lib_CSConv_Makefile.am
new file mode 100644
index 000000000000..0825264fe707
--- /dev/null
+++ b/textproc/iiimf-csconv/files/patch-lib_CSConv_Makefile.am
@@ -0,0 +1,11 @@
+--- lib/CSConv/Makefile.am.orig	Fri May 13 17:52:28 2005
++++ lib/CSConv/Makefile.am	Fri May 13 17:52:42 2005
+@@ -2,7 +2,7 @@
+ EXTRA_DIST= encoding.norm
+ SUBDIRS=test
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ csconv_la_CFLAGS = -DCSCONV_DIR="\"${csconvdir}\""
+ csconv_la_LDFLAGS = -avoid-version -module
+ csconv_la_LIBADD = @LTLIBICONV@
diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac b/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac
deleted file mode 100644
index 01fe3194d24a..000000000000
--- a/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac
+++ /dev/null
@@ -1,50 +0,0 @@
---- lib/CSConv/configure.ac.orig	Fri Jun 13 01:27:08 2003
-+++ lib/CSConv/configure.ac	Wed Mar  2 08:43:13 2005
-@@ -28,7 +28,7 @@
- AC_INIT(csconv.h)
- 
- AC_CONFIG_AUX_DIR(../../acfiles)
--AC_PREFIX_DEFAULT(/usr/lib/im)
-+AC_PREFIX_DEFAULT(${LOCALBASE}/lib/im)
- IM_INIT(../..)
- 
- AC_CONFIG_HEADER(config.h)
-@@ -297,6 +297,9 @@
- 	if test x"${CC}" = x"gcc" ; then
- 		SHLIBCFLAGS='-fpic'
- 		SHLIBLDFLAGS='-shared'
-+	elif test x"${CC}" = x"cc" ; then
-+		SHLIBCFLAGS='-fpic'
-+		SHLIBLDFLAGS='-shared'
- 	else
- 		SHLIBCFLAGS=
- 		SHLIBLDFLAGS=
-@@ -314,6 +317,7 @@
- case "${host}" in
- 	*solaris*) 	platform=SOLARIS ;;
- 	*linux*) 	platform=LINUX ;;
-+	*freebsd*)	platform=FREEBSD ;;
- esac
- AC_SUBST(platform)
- 
-@@ -337,6 +341,12 @@
- 		## Shared object suffix
- 		SO=so
- 	;;
-+        *freebsd*)
-+                ## Commands to generate dependency files
-+                GEN_DEPS="${CC} -E -MM ${DEFINES}  ${INCLUDES}"
-+                ## Shared object suffix
-+                SO=so
-+        ;;
- esac
- 
- 
-@@ -400,6 +410,7 @@
- AC_SUBST(ARFLAGS)
- AC_SUBST(SHLIBCFLAGS)
- AC_SUBST(SHLIBLDFLAGS)
-+AC_SUBST(LDFLAGS)
- AC_SUBST(SUBDIR)
- AC_SUBST(ICONV_INCLUDES)
- AC_SUBST(OBJS_ICONV)
diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_csconv.c b/textproc/iiimf-csconv/files/patch-lib_CSConv_csconv.c
new file mode 100644
index 000000000000..be8927594ec0
--- /dev/null
+++ b/textproc/iiimf-csconv/files/patch-lib_CSConv_csconv.c
@@ -0,0 +1,11 @@
+--- lib/CSConv/csconv.c.orig	Tue May 17 04:10:30 2005
++++ lib/CSConv/csconv.c	Tue May 17 04:11:40 2005
+@@ -64,7 +64,7 @@
+     /* should we read other configuration files 
+      * such as ~/.iiim/encoding.norm ?
+      */
+-    fp = fopen(CSCONV_DIR "/encoding.norm", "r");
++    fp = fopen(CSC_BASE_DIR_DEFAULT "/encoding.norm", "r");
+     if (!fp) return -1;
+ 
+     while((fgets(buf, sizeof(buf), fp) != NULL)) {
diff --git a/textproc/iiimf-csconv/pkg-plist b/textproc/iiimf-csconv/pkg-plist
index f18c34dccc02..32d6596f9bad 100644
--- a/textproc/iiimf-csconv/pkg-plist
+++ b/textproc/iiimf-csconv/pkg-plist
@@ -1,242 +1,5 @@
-lib/im/csconv/big5_ct.so
-lib/im/csconv/big5w_ct.so
-lib/im/csconv/cns_ct.so
-lib/im/csconv/cnsw_ct.so
-lib/im/csconv/compoundtext/ct_de
-lib/im/csconv/compoundtext/ct_en_US
-lib/im/csconv/compoundtext/ct_es
-lib/im/csconv/compoundtext/ct_fr
-lib/im/csconv/compoundtext/ct_it
-lib/im/csconv/compoundtext/ct_ja
-lib/im/csconv/compoundtext/ct_ko
-lib/im/csconv/compoundtext/ct_sv
-lib/im/csconv/compoundtext/ct_zh
-lib/im/csconv/compoundtext/ct_zh.GBK
-lib/im/csconv/compoundtext/ct_zh_TW
-lib/im/csconv/compoundtext/ct_zh_TW.GBK
-lib/im/csconv/csconv.conf
-lib/im/csconv/csconv.so
-lib/im/csconv/ct_big5.so
-lib/im/csconv/ct_big5w.so
-lib/im/csconv/ct_cns.so
-lib/im/csconv/ct_cnsw.so
-lib/im/csconv/ct_euc.so
-lib/im/csconv/ct_eucw.so
-lib/im/csconv/ct_pck.so
-lib/im/csconv/ct_pckw.so
-lib/im/csconv/ct_utf16.so
-lib/im/csconv/ct_utf8.so
-lib/im/csconv/ct_utf8w.so
-lib/im/csconv/ctex_mbs.so
-lib/im/csconv/ctex_wcs.so
-lib/im/csconv/encoding.norm
-lib/im/csconv/euc_ct.so
-lib/im/csconv/eucw_ct.so
-lib/im/csconv/iconv_relay.so
-lib/im/csconv/iconv_relay_mb_wc.so
-lib/im/csconv/iconv_relay_wc_mb.so
-lib/im/csconv/icuconv_relay.so
-lib/im/csconv/icuconv_relay_mb_wc.so
-lib/im/csconv/icuconv_relay_wc_mb.so
-lib/im/csconv/libicuconv.so
-lib/im/csconv/mbs_ctex.so
-lib/im/csconv/mbs_wcs.so
-lib/im/csconv/nil.so
-lib/im/csconv/pck_ct.so
-lib/im/csconv/pckw_ct.so
-lib/im/csconv/utf16_ct.so
-lib/im/csconv/utf8_ct.so
-lib/im/csconv/utf8w_ct.so
-lib/im/csconv/wcs_ctex.so
-lib/im/csconv/wcs_mbs.so
-lib/im/icuconv/libicu-toolutil.so
-lib/im/share/icu/1.4.0/cnvalias.dat
-lib/im/share/icu/1.4.0/icudata_cnvalias.dat
-lib/im/share/icu/1.4.0/ibm-1004.cnv
-lib/im/share/icu/1.4.0/ibm-1006.cnv
-lib/im/share/icu/1.4.0/ibm-1008.cnv
-lib/im/share/icu/1.4.0/ibm-1038.cnv
-lib/im/share/icu/1.4.0/ibm-1041.cnv
-lib/im/share/icu/1.4.0/ibm-1043.cnv
-lib/im/share/icu/1.4.0/ibm-1047.cnv
-lib/im/share/icu/1.4.0/ibm-1051.cnv
-lib/im/share/icu/1.4.0/ibm-1088.cnv
-lib/im/share/icu/1.4.0/ibm-1089.cnv
-lib/im/share/icu/1.4.0/ibm-1098.cnv
-lib/im/share/icu/1.4.0/ibm-1112.cnv
-lib/im/share/icu/1.4.0/ibm-1114.cnv
-lib/im/share/icu/1.4.0/ibm-1115.cnv
-lib/im/share/icu/1.4.0/ibm-1116.cnv
-lib/im/share/icu/1.4.0/ibm-1117.cnv
-lib/im/share/icu/1.4.0/ibm-1118.cnv
-lib/im/share/icu/1.4.0/ibm-1119.cnv
-lib/im/share/icu/1.4.0/ibm-1123.cnv
-lib/im/share/icu/1.4.0/ibm-1140-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1140.cnv
-lib/im/share/icu/1.4.0/ibm-1141.cnv
-lib/im/share/icu/1.4.0/ibm-1142-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1142.cnv
-lib/im/share/icu/1.4.0/ibm-1143-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1143.cnv
-lib/im/share/icu/1.4.0/ibm-1144-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1144.cnv
-lib/im/share/icu/1.4.0/ibm-1145-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1145.cnv
-lib/im/share/icu/1.4.0/ibm-1146-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1146.cnv
-lib/im/share/icu/1.4.0/ibm-1147-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1147.cnv
-lib/im/share/icu/1.4.0/ibm-1148-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1148.cnv
-lib/im/share/icu/1.4.0/ibm-1149-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1149.cnv
-lib/im/share/icu/1.4.0/ibm-1153-s390.cnv
-lib/im/share/icu/1.4.0/ibm-1153.cnv
-lib/im/share/icu/1.4.0/ibm-1154.cnv
-lib/im/share/icu/1.4.0/ibm-1155.cnv
-lib/im/share/icu/1.4.0/ibm-1156.cnv
-lib/im/share/icu/1.4.0/ibm-1157.cnv
-lib/im/share/icu/1.4.0/ibm-1158.cnv
-lib/im/share/icu/1.4.0/ibm-1159.cnv
-lib/im/share/icu/1.4.0/ibm-1160.cnv
-lib/im/share/icu/1.4.0/ibm-1164.cnv
-lib/im/share/icu/1.4.0/ibm-1250.cnv
-lib/im/share/icu/1.4.0/ibm-1251.cnv
-lib/im/share/icu/1.4.0/ibm-1252.cnv
-lib/im/share/icu/1.4.0/ibm-1253.cnv
-lib/im/share/icu/1.4.0/ibm-1254.cnv
-lib/im/share/icu/1.4.0/ibm-1255.cnv
-lib/im/share/icu/1.4.0/ibm-1256.cnv
-lib/im/share/icu/1.4.0/ibm-1257.cnv
-lib/im/share/icu/1.4.0/ibm-1258.cnv
-lib/im/share/icu/1.4.0/ibm-12712-s390.cnv
-lib/im/share/icu/1.4.0/ibm-12712.cnv
-lib/im/share/icu/1.4.0/ibm-1275.cnv
-lib/im/share/icu/1.4.0/ibm-1276.cnv
-lib/im/share/icu/1.4.0/ibm-1277.cnv
-lib/im/share/icu/1.4.0/ibm-1280.cnv
-lib/im/share/icu/1.4.0/ibm-1281.cnv
-lib/im/share/icu/1.4.0/ibm-1282.cnv
-lib/im/share/icu/1.4.0/ibm-1283.cnv
-lib/im/share/icu/1.4.0/ibm-1361.cnv
-lib/im/share/icu/1.4.0/ibm-1362.cnv
-lib/im/share/icu/1.4.0/ibm-1363.cnv
-lib/im/share/icu/1.4.0/ibm-1364.cnv
-lib/im/share/icu/1.4.0/ibm-1370.cnv
-lib/im/share/icu/1.4.0/ibm-1371.cnv
-lib/im/share/icu/1.4.0/ibm-1383.cnv
-lib/im/share/icu/1.4.0/ibm-1386.cnv
-lib/im/share/icu/1.4.0/ibm-1390.cnv
-lib/im/share/icu/1.4.0/ibm-1399.cnv
-lib/im/share/icu/1.4.0/ibm-16684.cnv
-lib/im/share/icu/1.4.0/ibm-16804-s390.cnv
-lib/im/share/icu/1.4.0/ibm-16804.cnv
-lib/im/share/icu/1.4.0/ibm-17248.cnv
-lib/im/share/icu/1.4.0/ibm-21427.cnv
-lib/im/share/icu/1.4.0/ibm-273.cnv
-lib/im/share/icu/1.4.0/ibm-277.cnv
-lib/im/share/icu/1.4.0/ibm-278.cnv
-lib/im/share/icu/1.4.0/ibm-280.cnv
-lib/im/share/icu/1.4.0/ibm-284.cnv
-lib/im/share/icu/1.4.0/ibm-285.cnv
-lib/im/share/icu/1.4.0/ibm-297.cnv
-lib/im/share/icu/1.4.0/ibm-37-s390.cnv
-lib/im/share/icu/1.4.0/ibm-37.cnv
-lib/im/share/icu/1.4.0/ibm-420.cnv
-lib/im/share/icu/1.4.0/ibm-424.cnv
-lib/im/share/icu/1.4.0/ibm-437.cnv
-lib/im/share/icu/1.4.0/ibm-4899.cnv
-lib/im/share/icu/1.4.0/ibm-4909.cnv
-lib/im/share/icu/1.4.0/ibm-4930.cnv
-lib/im/share/icu/1.4.0/ibm-4971.cnv
-lib/im/share/icu/1.4.0/ibm-500.cnv
-lib/im/share/icu/1.4.0/ibm-5104.cnv
-lib/im/share/icu/1.4.0/ibm-5123.cnv
-lib/im/share/icu/1.4.0/ibm-5210.cnv
-lib/im/share/icu/1.4.0/ibm-5346.cnv
-lib/im/share/icu/1.4.0/ibm-5347.cnv
-lib/im/share/icu/1.4.0/ibm-5349.cnv
-lib/im/share/icu/1.4.0/ibm-5350.cnv
-lib/im/share/icu/1.4.0/ibm-5351.cnv
-lib/im/share/icu/1.4.0/ibm-5352.cnv
-lib/im/share/icu/1.4.0/ibm-5353.cnv
-lib/im/share/icu/1.4.0/ibm-5354.cnv
-lib/im/share/icu/1.4.0/ibm-803.cnv
-lib/im/share/icu/1.4.0/ibm-808.cnv
-lib/im/share/icu/1.4.0/ibm-813.cnv
-lib/im/share/icu/1.4.0/ibm-833.cnv
-lib/im/share/icu/1.4.0/ibm-834.cnv
-lib/im/share/icu/1.4.0/ibm-835.cnv
-lib/im/share/icu/1.4.0/ibm-848.cnv
-lib/im/share/icu/1.4.0/ibm-8482.cnv
-lib/im/share/icu/1.4.0/ibm-849.cnv
-lib/im/share/icu/1.4.0/ibm-850.cnv
-lib/im/share/icu/1.4.0/ibm-852.cnv
-lib/im/share/icu/1.4.0/ibm-855.cnv
-lib/im/share/icu/1.4.0/ibm-856.cnv
-lib/im/share/icu/1.4.0/ibm-857.cnv
-lib/im/share/icu/1.4.0/ibm-858.cnv
-lib/im/share/icu/1.4.0/ibm-859.cnv
-lib/im/share/icu/1.4.0/ibm-860.cnv
-lib/im/share/icu/1.4.0/ibm-861.cnv
-lib/im/share/icu/1.4.0/ibm-862.cnv
-lib/im/share/icu/1.4.0/ibm-863.cnv
-lib/im/share/icu/1.4.0/ibm-864.cnv
-lib/im/share/icu/1.4.0/ibm-865.cnv
-lib/im/share/icu/1.4.0/ibm-866.cnv
-lib/im/share/icu/1.4.0/ibm-867.cnv
-lib/im/share/icu/1.4.0/ibm-868.cnv
-lib/im/share/icu/1.4.0/ibm-869.cnv
-lib/im/share/icu/1.4.0/ibm-871.cnv
-lib/im/share/icu/1.4.0/ibm-872.cnv
-lib/im/share/icu/1.4.0/ibm-874.cnv
-lib/im/share/icu/1.4.0/ibm-878.cnv
-lib/im/share/icu/1.4.0/ibm-891.cnv
-lib/im/share/icu/1.4.0/ibm-897.cnv
-lib/im/share/icu/1.4.0/ibm-901.cnv
-lib/im/share/icu/1.4.0/ibm-902.cnv
-lib/im/share/icu/1.4.0/ibm-9027.cnv
-lib/im/share/icu/1.4.0/ibm-903.cnv
-lib/im/share/icu/1.4.0/ibm-904.cnv
-lib/im/share/icu/1.4.0/ibm-9044.cnv
-lib/im/share/icu/1.4.0/ibm-9049.cnv
-lib/im/share/icu/1.4.0/ibm-9061.cnv
-lib/im/share/icu/1.4.0/ibm-907.cnv
-lib/im/share/icu/1.4.0/ibm-909.cnv
-lib/im/share/icu/1.4.0/ibm-910.cnv
-lib/im/share/icu/1.4.0/ibm-912.cnv
-lib/im/share/icu/1.4.0/ibm-913.cnv
-lib/im/share/icu/1.4.0/ibm-914.cnv
-lib/im/share/icu/1.4.0/ibm-915.cnv
-lib/im/share/icu/1.4.0/ibm-916.cnv
-lib/im/share/icu/1.4.0/ibm-920.cnv
-lib/im/share/icu/1.4.0/ibm-921.cnv
-lib/im/share/icu/1.4.0/ibm-922.cnv
-lib/im/share/icu/1.4.0/ibm-923.cnv
-lib/im/share/icu/1.4.0/ibm-9238.cnv
-lib/im/share/icu/1.4.0/ibm-924.cnv
-lib/im/share/icu/1.4.0/ibm-930.cnv
-lib/im/share/icu/1.4.0/ibm-933.cnv
-lib/im/share/icu/1.4.0/ibm-935.cnv
-lib/im/share/icu/1.4.0/ibm-937.cnv
-lib/im/share/icu/1.4.0/ibm-939.cnv
-lib/im/share/icu/1.4.0/ibm-941.cnv
-lib/im/share/icu/1.4.0/ibm-942.cnv
-lib/im/share/icu/1.4.0/ibm-943.cnv
-lib/im/share/icu/1.4.0/ibm-944.cnv
-lib/im/share/icu/1.4.0/ibm-946.cnv
-lib/im/share/icu/1.4.0/ibm-947.cnv
-lib/im/share/icu/1.4.0/ibm-948.cnv
-lib/im/share/icu/1.4.0/ibm-949.cnv
-lib/im/share/icu/1.4.0/ibm-950.cnv
-lib/im/share/icu/1.4.0/ibm-953.cnv
-lib/im/share/icu/1.4.0/ibm-954.cnv
-lib/im/share/icu/1.4.0/ibm-955.cnv
-lib/im/share/icu/1.4.0/ibm-970.cnv
-@dirrm lib/im/share/icu/1.4.0
-@dirrm lib/im/share/icu
-@dirrm lib/im/share
-@dirrm lib/im/icuconv
-@dirrm lib/im/csconv/compoundtext
-@dirrm lib/im/csconv
-@unexec rmdir %D/lib/im > /dev/null 2>&1 || true
+lib/iiim/csconv/csconv.la
+lib/iiim/csconv/csconv.so
+lib/iiim/csconv/encoding.norm
+@dirrm lib/iiim/csconv
+@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index 7eb9393f5e33..1ee8652681fd 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -6,88 +6,68 @@
 #
 
 PORTNAME=	gnome-im-switcher
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	IIIMF gnome input method switcher
 
-BROKEN=		Incorrect pkg-plist
+ONLY_FOR_ARCHS=	i386
 
 USE_X_PREFIX=	yes
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
 		gnomepanel gnomeprefix gnomehack
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/gnome-im-switcher
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
-TLZ_ARGS=	--copy --force
-BNB_PATH=	bonobo/server
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4
+	${REINPLACE_CMD} \
+		-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
+		-e '/^uidir/s,$$[(]datadir[)]/,&gnome/,g' \
+		${BUILDDIR}/src/Makefile.am
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/src/Makefile.am
 	${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
-		${WRKSRC}/configure.in
+		${BUILDDIR}/configure.ac
+	${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
+		${BUILDDIR}/configure.ac
+	${REINPLACE_CMD} -e "/^omf_dest_dir/s,[(]datadir[)]/,&gnome/,g" \
+		${BUILDDIR}/help/omf.make
 
-pre-configure:
-	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS}
-	@cd ${WRKSRC} && intltoolize ${TLZ_ARGS}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 post-configure:
-	${REINPLACE_CMD} \
-	 -e "s,[(]libdir[)]/${BNB_PATH},{exec_prefix}/libdata/${BNB_PATH},g" \
-	 -e "/-D.*LOCALEDIR=/s,[(]datadir[)]/,&../,g" \
-	 ${WRKSRC}/src/Makefile
-	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
-	 ${WRKSRC}/help/C/Makefile
-	${REINPLACE_CMD} \
-	 -e "/^datadir/s,${PREFIX}/share/gnome,${PREFIX}/share,g" \
-	 ${WRKSRC}/po/Makefile
+	${REINPLACE_CMD} -e '/^pkgdatadir/s,[(]datadir[)]/,&gnome/,g' \
+		-e '/^iconsdir/s,[(]datadir[)]/,&gnome/,g' \
+		${BUILDDIR}/src/Makefile
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gnome-im-switcher/distinfo b/textproc/iiimf-gnome-im-switcher/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-gnome-im-switcher/distinfo
+++ b/textproc/iiimf-gnome-im-switcher/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
index bcc2cb24a1c8..e069a637ace3 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++INTLDIRS = gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = gnome-im-switcher
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am
new file mode 100644
index 000000000000..2bc8e140d7db
--- /dev/null
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am
@@ -0,0 +1,10 @@
+--- gnome-im-switcher/Makefile.am.orig	Fri May 13 17:44:10 2005
++++ gnome-im-switcher/Makefile.am	Fri May 13 17:44:57 2005
+@@ -1,5 +1,7 @@
+ SUBDIRS = src po capplet help
+ 
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I %%PREFIX%%/share/aclocal -I ../acfiles
++
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ EXTRA_DIST = 				\
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in
deleted file mode 100644
index 873ae1283978..000000000000
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-im-switcher/configure.in.orig	Thu Oct 14 23:10:11 2004
-+++ gnome-im-switcher/configure.in	Wed Mar  2 22:17:35 2005
-@@ -40,6 +40,7 @@
- GIMLET_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $GIMLET_LIBS"
- GIMLET_CFLAGS="$X_CFLAGS $GIMLET_CFLAGS"
- CFLAGS="$GIMLET_CFLAGS $CFLAGS"
-+LDFLAGS="${LDFLAGS}"
- 
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c
index b1e61d27581f..6e4b9f2bc006 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c
@@ -1,5 +1,5 @@
---- gnome-im-switcher/src/widgets.c	Thu Oct 14 23:10:11 2004
-+++ gnome-im-switcher/src/widgets.c	Wed Feb 16 16:51:26 2005
+--- gnome-im-switcher/src/widgets.c.orig	Tue May 10 16:29:36 2005
++++ gnome-im-switcher/src/widgets.c	Tue May 10 16:30:04 2005
 @@ -29,7 +29,11 @@
  #include <gnome.h>
  
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index b8c4fa91c1a7..ea1ddd711017 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -1,92 +1,59 @@
 bin/gnome-im-properties
 bin/gnome-im-settings-daemon
-libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
 libexec/gnome-im-switcher-applet
-share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
-share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
-share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
+share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/de/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/es/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/fr/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/gu/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/hi/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/hu/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/it/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/ja/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/ko/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/pa/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/pl/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/pt_BR/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/ru/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/sv/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
+share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
+share/icons/hicolor/48x48/apps/gnome-settings-im.png
 share/gnome/pixmaps/gnome-settings-im.png
 share/gnome/pixmaps/gimlet-off.png
 share/gnome/pixmaps/gimlet-on.png
+share/gnome/pixmaps/gimlet-disable.png
+share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
+share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
+share/gnome/help/imswitcher/C/legal.xml
+share/gnome/help/imswitcher/C/imswitcher.xml
+@dirrm share/gnome/help/imswitcher/C
+@dirrm share/gnome/help/imswitcher
+share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+@dirrm share/gnome/iiimf-im-switcher/glade
+@dirrm share/gnome/iiimf-im-switcher
+share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
+@comment
+@comment 'do scrollkeeper-update'
+@comment
+share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
+@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
+@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
+@dirrm share/gnome/omf/iiimf-im-switcher
+@comment
+@comment 'do gconftool-2'
+@comment
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
 etc/gconf/schemas/gnome-im-switcher.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
 @unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
 etc/gconf/schemas/gnome-im-properties.schemas
 @exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
-@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
-share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
-@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
-@dirrm share/gnome/omf/gnome-im-switcher
-share/gnome/gnome-im-switcher/glade/gnome-im-switcher.glade2
-@dirrm share/gnome/gnome-im-switcher/glade
-@dirrm share/gnome/gnome-im-switcher
-share/gnome/help/imswitcher/C/legal.xml
-share/gnome/help/imswitcher/C/imswitcher.xml
-@dirrm share/gnome/help/imswitcher/C
-@dirrm share/gnome/help/imswitcher
-share/gnome/icons/hicolor/48x48/apps/gnome-settings-im.png
-@unexec rmdir %D/share/gnome/icons/hicolor/48x48/apps > /dev/null 2>&1 || true
-@unexec rmdir %D/share/gnome/icons/hicolor/48x48 > /dev/null 2>&1 || true
-@unexec rmdir %D/share/gnome/icons/hicolor > /dev/null 2>&1 || true
-@unexec rmdir %D/share/gnome/icons > /dev/null 2>&1 || true
-share/locale/ja/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 || true
-share/locale/ko/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 || true
-share/locale/zh_CN/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 || true
-share/locale/zh_TW/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 || true
-share/locale/zh_HK/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true
-share/locale/de/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/de/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/de > /dev/null 2>&1 || true
-share/locale/fr/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/fr > /dev/null 2>&1 || true
-share/locale/pl/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/pl > /dev/null 2>&1 || true
-share/locale/ru/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/ru > /dev/null 2>&1 || true
-share/locale/es/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/es/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/es > /dev/null 2>&1 || true
-share/locale/it/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/it/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/it > /dev/null 2>&1 || true
-share/locale/pt_BR/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/pt_BR > /dev/null 2>&1 || true
-share/locale/sv/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/sv > /dev/null 2>&1 || true
-share/locale/cs/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/cs > /dev/null 2>&1 || true
-share/locale/hu/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/hu > /dev/null 2>&1 || true
-share/locale/bn/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/bn/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/bn > /dev/null 2>&1 || true
-share/locale/gu/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/gu/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/gu > /dev/null 2>&1 || true
-share/locale/hi/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/hi/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/hi > /dev/null 2>&1 || true
-share/locale/pa/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/pa/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/pa > /dev/null 2>&1 || true
-share/locale/ta/LC_MESSAGES/gnome-im-switcher.mo
-@unexec rmdir %D/share/locale/ta/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/ta > /dev/null 2>&1 || true
+@comment
+@comment 'rm files in LOCALBASE.'
+@comment
+@cwd %%LOCALBASE%%
+libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index 148bfd8183eb..d6e5561c3261 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -6,75 +6,60 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Server Framework
 
-LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
-		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
+LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
+		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
+
+ONLY_FOR_ARCHS=	i386
 
 USE_X_PREFIX=	yes
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
+USE_ICONV=	yes
 USE_REINPLACE=  yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	intltool gtk20
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/iiimgcf
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+.if defined(WITH_DEBUG)
+CFLAGS+=	-DDEBUG
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
-TLZ_ARGS=	--copy --force
+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv -lintl ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
 
-pre-configure:
-	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS}
-	@cd ${WRKSRC} && intltoolize ${TLZ_ARGS}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 post-install:
 	${X11BASE}/bin/gtk-query-immodules-2.0 > \
diff --git a/textproc/iiimf-gtk/distinfo b/textproc/iiimf-gtk/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-gtk/distinfo
+++ b/textproc/iiimf-gtk/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile
index bcc2cb24a1c8..70065ec45e00 100644
--- a/textproc/iiimf-gtk/files/patch-Makefile
+++ b/textproc/iiimf-gtk/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++INTLDIRS = iiimgcf
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = iiimgcf
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
index 7588f7b783df..78725fc307d2 100644
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
@@ -1,21 +1,26 @@
---- iiimgcf/Makefile.am	Thu Jan 15 10:51:58 2004
-+++ iiimgcf/Makefile.am	Thu Feb 17 22:05:59 2005
-@@ -9,14 +9,13 @@
+--- iiimgcf/Makefile.am.orig	Thu Apr 14 05:29:08 2005
++++ iiimgcf/Makefile.am	Tue May 17 22:33:56 2005
+@@ -5,11 +5,11 @@
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I /usr/local/share/aclocal -I /usr/X11R6/share/aclocal -I ../acfiles
+ 
  moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
  
 -im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
-+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -DIMDIR="\"${IMDIR}\""
--im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
-+im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined \
-+		     -liiimcf -liiimp
++im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -I $(CSCONV_DIR)
+ im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
  
  im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
-                      gtkimcontextiiim.c gtkimcontextiiim.h \
-                      imiiim.c imswitcher.c imaux.c
--im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
+@@ -18,8 +18,7 @@
+                      imswitcher.c imswitcher.h
+ 
+ im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
 -                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
 -                    $(IM_LIBDIR)/iiimp/libiiimp.la
-+im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS)
++		    -liiimp -liiimcf
  
  module_LTLIBRARIES = im-iiim.la
  
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac b/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac
deleted file mode 100644
index 375a272d8a40..000000000000
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac
+++ /dev/null
@@ -1,27 +0,0 @@
---- iiimgcf/configure.ac.orig	Tue Nov 18 12:17:57 2003
-+++ iiimgcf/configure.ac	Wed Mar  2 22:59:24 2005
-@@ -5,7 +5,6 @@
- AC_PREREG(2.50)
- AC_INIT(im-iiim.so, 0.5, im@OpenI18N.org)
- dnl common initialization
--AC_CONFIG_AUX_DIR(../acfiles)
- IM_INIT(..)
- 
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-@@ -63,13 +62,13 @@
- COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
- CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
- 
- dnl --------------------------------------------------------------------------------
- dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c b/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c
new file mode 100644
index 000000000000..7a460ff263bb
--- /dev/null
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c
@@ -0,0 +1,149 @@
+--- iiimgcf/gtkimcontextiiim.c.orig	Fri Apr 22 07:46:48 2005
++++ iiimgcf/gtkimcontextiiim.c	Tue May 17 23:33:11 2005
+@@ -39,6 +39,7 @@
+ #include "imaux.h"
+ #include "imswitcher.h"
+ #include "IIIMGdkEventKey.h"
++#include "iconv.h"
+ 
+ #ifdef DEBUG
+ #define DEBUG_DO(x) (x)
+@@ -147,6 +148,8 @@
+ static GdkAtom im_settings_atom = GDK_NONE;
+ static const char *_IM_SETTINGS = "_IM_SETTINGS";
+ 
++static iconv_t                 ic_u16_to_u8 = (iconv_t)-1;
++
+ static gboolean on_status_toplevel_configure (GtkWidget         *toplevel,
+ 					      GdkEventConfigure *event,
+ 					      StatusWindow      *status_window);
+@@ -305,6 +308,7 @@
+       return;
+     }
+   utf8 = utf16_to_utf8 (text);
++  if (!utf8) utf8 = g_strdup("");
+ 
+   if (current_setting_enabled &&
+       (current_setting.im_enabled == IM_OFF ||
+@@ -593,9 +597,12 @@
+ 	    IIIMCF_text text;
+ 	    gchar *utf8 = NULL;
+ 	    st = iiimcf_get_committed_text (c, &text);
++	    if (st != IIIMF_STATUS_SUCCESS) break;
+ 	    utf8 = utf16_to_utf8 (text);
+-	    g_signal_emit_by_name (context_iiim, "commit", utf8);
+-	    g_free (utf8);
++	    if (utf8) {
++	      g_signal_emit_by_name (context_iiim, "commit", utf8);
++	      g_free (utf8);
++	    }
+ 	  }
+ 	  break;
+ 	default:
+@@ -936,7 +943,7 @@
+       return;
+     }
+ 
+-  gtk_frame_set_label(GTK_FRAME (cw->frame), title_u8);
++  gtk_frame_set_label(GTK_FRAME (cw->frame), (title_u8 ? title_u8 : ""));
+ 
+   if (title_u8)
+     g_free (title_u8);
+@@ -975,6 +982,7 @@
+       if (label)
+ 	label_u8 = utf16_to_utf8 (label);
+       candidate_u8 = utf16_to_utf8 (candidate);
++      if (!candidate_u8) candidate_u8 = g_strdup("");
+       DEBUG_DO (g_message ("candidate %s", candidate_u8));
+       if (label_u8)
+ 	{
+@@ -997,12 +1005,9 @@
+ 	    gtk_tree_view_get_selection (GTK_TREE_VIEW (cw->tree));
+ 	  gtk_tree_selection_select_iter (selection, &iter);
+ 	}
+-      if (result)
+-	{
+-	  g_free (result);
+-	  g_free (label_u8);
+-	}
+-      g_free (candidate_u8);
++      if (result) g_free(result);
++      if (candidate_u8) g_free (candidate_u8);
++      if (label_u8) g_free(label_u8);
+     }
+   gtk_widget_realize (w);
+   iiim_candidate_move (context_iiim, w);
+@@ -1187,7 +1192,7 @@
+   w->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
+   gtk_container_set_border_width (GTK_CONTAINER (w->toplevel), 2);
+ 
+-  w->frame = gtk_frame_new (title_u8);
++  w->frame = gtk_frame_new (title_u8 ? title_u8 : "");
+   gtk_frame_set_shadow_type (GTK_FRAME (w->frame), GTK_SHADOW_ETCHED_OUT);
+ 
+   w->tree = gtk_tree_view_new ();
+@@ -1539,14 +1544,52 @@
+ }
+ 
+ static gchar *
++iconv_utf16_to_utf8(const gunichar2 *utf16, int length)
++{
++  if (!utf16 || 0 >= length) return g_strdup("");
++
++  if ((iconv_t)-1 == ic_u16_to_u8) {
++    ic_u16_to_u8 = iconv_open("UTF-8", "UTF-16");
++
++    if ((iconv_t)-1 == ic_u16_to_u8) {
++      fprintf(stderr, "iiimgcf: Unable to open UTF-16 -> UTF-8 converter.");
++      return NULL;
++    }
++  }
++
++  int inlen = length * sizeof(gunichar2);
++  int outlen = (length +1) * 4;
++  const char *inbuf = (char*)utf16;
++  char *outbuf = g_malloc0(outlen + 4);
++  gchar *utf8 = (gchar*)outbuf;
++
++  if (!outbuf) {
++    fprintf(stderr, "iiimgcf: Out of memory error.");
++    return NULL;
++  }
++
++  if ((size_t)-1 == iconv(ic_u16_to_u8, &inbuf, &inlen, &outbuf, &outlen)) {
++    fprintf(stderr, "iiimgcf: Unable to convert the string.");
++    g_free(utf8);
++    return NULL;
++  }
++
++  return utf8;
++}
++
++static gchar *
+ utf16_to_utf8 (IIIMCF_text text)
+ {
+   IIIMF_status st;
++
++  int len = 0;
+   IIIMP_card16 *u16str = NULL;
+   st = iiimcf_get_text_utf16string (text, (const IIIMP_card16 **) &u16str);
+-  return (u16str != NULL ?
+-	  g_utf16_to_utf8 ((const gunichar2 *) u16str, -1, NULL, NULL, NULL) :
+-	  NULL);
++  st = iiimcf_get_text_length(text, &len);
++
++  if (st != IIIMF_STATUS_SUCCESS) return NULL;
++
++  return iconv_utf16_to_utf8((const gunichar2 *)u16str, len);
+ }
+ 
+ static void
+@@ -2094,7 +2137,7 @@
+     goto Error;
+   utf8 = utf16_to_utf8 (text);
+ 
+-  if (attrs)
++  if (attrs && utf8)
+     {
+       gint i;
+       gint j;
diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c b/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c
deleted file mode 100644
index dda9b5a7c069..000000000000
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimgcf/imaux.c	Thu Jul 29 20:44:21 2004
-+++ iiimgcf/imaux.c	Wed Feb 16 20:40:51 2005
-@@ -36,7 +36,7 @@
- 
- static void iiim_aux_download (IIIMCF_downloaded_object obj);
- 
--#define AUX_BASE_DIR		"/usr/lib/im/"
-+#define AUX_BASE_DIR		IMDIR
- 
- #define IS_SPACE(len, ptr)	((0 < (len)) &&				\
- 				 (('\t' == *(p)) || (' ' == *(p))))
diff --git a/textproc/iiimf-headers/Makefile b/textproc/iiimf-headers/Makefile
index dc6d8f779a6f..b39a053fd3f8 100644
--- a/textproc/iiimf-headers/Makefile
+++ b/textproc/iiimf-headers/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	headers
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Header files for Internet/Intranet Input Method Framework
 
-IIIMF_VER=	r12_1-svn2002
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
 do-install:
-	${MKDIR} ${PREFIX}/include/iiimf
+	${MKDIR} ${PREFIX}/include/iiim
 .for file in IMArg.h IMCharSubsets.h IMProtocolStruct.h syscfg.h threaddef.h
-	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiimf
+	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiim
 .endfor
-	${MKDIR} ${PREFIX}/include/iiimf/iml
-	${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiimf/iml
+	${MKDIR} ${PREFIX}/include/iiim/iml
+	${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiim/iml
 
 .include <bsd.port.mk>
diff --git a/textproc/iiimf-headers/distinfo b/textproc/iiimf-headers/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-headers/distinfo
+++ b/textproc/iiimf-headers/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-headers/pkg-plist b/textproc/iiimf-headers/pkg-plist
index 41e135a467cb..170f9e84f1fb 100644
--- a/textproc/iiimf-headers/pkg-plist
+++ b/textproc/iiimf-headers/pkg-plist
@@ -1,15 +1,16 @@
-include/iiimf/IMArg.h
-include/iiimf/IMCharSubsets.h
-include/iiimf/IMProtocolStruct.h
-include/iiimf/syscfg.h
-include/iiimf/threaddef.h
-include/iiimf/iml/SunIM.h
-include/iiimf/iml/SunIMCore.h
-include/iiimf/iml/SunIMLock.h
-include/iiimf/iml/SunIMMMan.h
-include/iiimf/iml/SunIMMthd.h
-include/iiimf/iml/SunIMPriv.h
-include/iiimf/iml/SunIMProt.h
-include/iiimf/iml/SunIMPub.h
-@dirrm include/iiimf/iml
-@dirrm include/iiimf
+include/iiim/IMArg.h
+include/iiim/IMCharSubsets.h
+include/iiim/IMProtocolStruct.h
+include/iiim/syscfg.h
+include/iiim/threaddef.h
+include/iiim/iml/SunIM.h
+include/iiim/iml/SunIMCore.h
+include/iiim/iml/SunIMLock.h
+include/iiim/iml/SunIMMMan.h
+include/iiim/iml/SunIMMthd.h
+include/iiim/iml/SunIMPriv.h
+include/iiim/iml/SunIMProt.h
+include/iiim/iml/SunIMPub.h
+include/iiim/iml/iml_fop.h
+@dirrm include/iiim/iml
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 6ecae1ae7565..20c3d93f887b 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -6,87 +6,54 @@
 #
 
 PORTNAME=	le-unit
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	IIIMF UNIcode Table based generic composition engine
 
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
+		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} \
-		-DIMDIR="\\\"\$${IMDIR}\\\""
+CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/../lib/CSConv/csconv.h
-
-pre-configure:
-	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC}/../lib/EIMIL && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
-	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE}
-	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
-	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \
-	 CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
-	 ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
-
-pre-build:
-	@cd ${WRKSRC}/../lib/EIMIL && \
-	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/../lib/EIMIL/Makefile.am
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-le-unit/distinfo b/textproc/iiimf-le-unit/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-le-unit/distinfo
+++ b/textproc/iiimf-le-unit/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-le-unit/files/patch-Makefile b/textproc/iiimf-le-unit/files/patch-Makefile
index bcc2cb24a1c8..687ccf0b6813 100644
--- a/textproc/iiimf-le-unit/files/patch-Makefile
+++ b/textproc/iiimf-le-unit/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = lib/EIMIL leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-le-unit/files/patch-leif_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/textproc/iiimf-le-unit/files/patch-leif_configure.ac b/textproc/iiimf-le-unit/files/patch-leif_configure.ac
index 2289a05c4a93..836f246b6ba7 100644
--- a/textproc/iiimf-le-unit/files/patch-leif_configure.ac
+++ b/textproc/iiimf-le-unit/files/patch-leif_configure.ac
@@ -1,53 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 17:47:49 2005
-@@ -44,15 +44,15 @@
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
--IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_CANNA
-+dnl IM_CHECK_FREEWNN
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
- IM_CHECK_X
--IM_CHECK_GTK
--IM_CHECK_MOTIF
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
--AC_SUBST(GTK2_CFLAGS)
--AC_SUBST(GTK2_LIBS)
-+dnl IM_CHECK_GTK
-+dnl IM_CHECK_MOTIF
-+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-+dnl AC_SUBST(GTK2_CFLAGS)
-+dnl AC_SUBST(GTK2_LIBS)
- 
- dnl --------------------------------------------------------------------------------
- dnl                      Section 5: compilation options
-@@ -63,23 +63,16 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-+LE_TARGETS="default template sampleja sampleja2 sampleja3 testEIMIL unit"
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
++LE_TARGETS="default template testEIMIL unit fop_test"
  
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c
deleted file mode 100644
index 9d0ba2089572..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja3/sampleja3.c	Mon Apr 26 21:16:13 2004
-+++ leif/sampleja3/sampleja3.c	Wed Feb 16 20:42:52 2005
-@@ -171,7 +171,7 @@
- 		objects[obj_id].name_length = 9;
- 		objects[obj_id].domain = "com.sun";
- 		objects[obj_id].scope = "sampleja3";
--		objects[obj_id].path = "/usr/lib/im/locale/ja/sampleja3/aux.jar";
-+		objects[obj_id].path = IMDIR "/locale/ja/sampleja3/aux.jar";
- 		objects[obj_id].signature = "";
- 		objects[obj_id].class_names = class_names;
- 		objects[obj_id].count_names = 1;
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h
deleted file mode 100644
index 88a908b383c9..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja3/xaux_common/csconv.h	Fri Mar 16 00:52:22 2001
-+++ leif/sampleja3/xaux_common/csconv.h	Wed Feb 16 20:48:24 2005
-@@ -63,7 +63,7 @@
- #    define	CSC_BASE_DIR_SYSTEM	"/etc/lib/im/csconv/"
- #endif /* !CSC_BASE_DIR_SYSTEM */
- #if !defined(CSC_BASE_DIR_DEFAULT)
--#    define	CSC_BASE_DIR_DEFAULT	"/usr/lib/im/csconv/"
-+#    define	CSC_BASE_DIR_DEFAULT	(IMDIR "/csconv/")
- #endif /* !CSC_BASE_DIR_DEFAULT */
- 
- #define CSC_IS_PATH_ABS(path)	(('/' == *(path)) ||			\
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c
deleted file mode 100644
index e86cbdf37dec..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- leif/sampleja3/xaux_common/xaux_ext_common.c	Fri Mar 16 00:52:22 2001
-+++ leif/sampleja3/xaux_common/xaux_ext_common.c	Wed Feb 16 20:43:12 2005
-@@ -633,7 +633,7 @@
- 
- #else /* defined(USE_DTACTIONINVOKE) */
- 
--#define DTACTION_CMD    "/usr/dt/bin/dtaction"
-+#define DTACTION_CMD    "/usr/local/bin/dtaction"
- 
- static int help_available = 0;
- static char tmp_file[256];
-@@ -803,7 +803,11 @@
-     fprintf(fp, "%s%s\n", rdb.help_basepath, path_);
-     fclose(fp);
- 
-+#ifdef __FreeBSD__
-+    pid = vfork();
-+#else
-     pid = fork1();
-+#endif
- 
-     if (pid == (pid_t) (-1)) {
-         return;
-@@ -834,6 +838,8 @@
- 
- #ifdef linux
-     pid = fork();
-+#elif defined(__FreeBSD__)
-+    pid = vfork();
- #else
-     pid = fork1();
- #endif
-@@ -853,7 +859,11 @@
-     if (pid == (pid_t) (-1)) {
-         return;
-     } else if (0 == pid) {
-+#ifdef __FreeBSD__
-+        pid2 = vfork();
-+#else
-         pid2 = fork();
-+#endif
-         if(pid2 == -1) {
-             _exit(1);
-         } else if(pid2 == 0) {
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h
deleted file mode 100644
index 2adf385af32c..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja3/xaux_common/xaux_ext_common.h	Fri Mar 16 00:52:22 2001
-+++ leif/sampleja3/xaux_common/xaux_ext_common.h	Wed Feb 16 20:48:29 2005
-@@ -97,7 +97,7 @@
- extern void HelpInvoke(char *);
- #endif
- 
--#define	DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja3/help/"
-+#define	DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja3/help/")
- 
- #endif	/* !XAUX_EXT_COMMON_H */
- 
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c
deleted file mode 100644
index d172f71175fc..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja3/xaux_motif/sampleja3_xaux_so.c	Fri Mar 16 00:52:22 2001
-+++ leif/sampleja3/xaux_motif/sampleja3_xaux_so.c	Wed Feb 16 20:43:20 2005
-@@ -63,7 +63,7 @@
-                         'L','o','o','k','u','p','A','u','x',
- };
- 
--#define		XAUX_EXT_DIR	"/usr/lib/im/locale/ja/sampleja3/xaux/motif/"
-+#define		XAUX_EXT_DIR	(IMDIR "/locale/ja/sampleja3/xaux/motif/")
- 
- xaux_class_t xaux_classes[AUX_CLASS_MAX + 1] = {
- 	{
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c
deleted file mode 100644
index 73dee74c23c1..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja4/xaux/xaux_ext_conv.c	Fri Jun 27 11:41:21 2003
-+++ leif/sampleja4/xaux/xaux_ext_conv.c	Wed Feb 16 20:43:31 2005
-@@ -79,7 +79,7 @@
- #ifdef USE_CSCONV
- #include <dlfcn.h>
- #include "csconv.h"
--#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH	(IMDIR "/csconv/csconv.so")
- #define CSC_OPEN_LOCALE	"csconv_open_locale"
- #define CSC_OPEN	"csconv_open"
- #define CSC_CONV	"csconv"
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c
deleted file mode 100644
index 9225f0ad9d07..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja4/xaux/xaux_ext_help.c	Fri Jun 27 11:41:21 2003
-+++ leif/sampleja4/xaux/xaux_ext_help.c	Wed Feb 16 20:43:43 2005
-@@ -66,7 +66,7 @@
- 
- #else /* defined(USE_DTACTIONINVOKE) */
- 
--#define DTACTION_CMD    "/usr/dt/bin/dtaction"
-+#define DTACTION_CMD    "/usr/local/bin/dtaction"
- 
- static int help_available = 0;
- static char tmp_file[256];
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h
deleted file mode 100644
index fe92be9b45da..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- leif/sampleja4/xaux/xaux_ext_help.h	Fri Jun 27 11:41:21 2003
-+++ leif/sampleja4/xaux/xaux_ext_help.h	Wed Feb 16 20:48:34 2005
-@@ -52,6 +52,6 @@
- extern void HelpInvoke(char *);
- #endif /* USE_CDE_HELP */
- 
--#define	DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja4/help/"
-+#define	DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja4/help/")
- 
- #endif	/* !XAUX_EXT_HELP_H */
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c
deleted file mode 100644
index b71286ef0c4c..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- leif/sampleja4/xaux/xaux_so_sampleja4.c	Fri Jun 27 11:41:21 2003
-+++ leif/sampleja4/xaux/xaux_so_sampleja4.c	Wed Feb 16 20:43:49 2005
-@@ -334,4 +334,4 @@
- /*
-  * primary path for external executables
-  */
--const char *xaux_so_extexec_path = "/usr/lib/im/locale/ja/sampleja4/xaux";
-+const char *xaux_so_extexec_path = IMDIR "/locale/ja/sampleja4/xaux";
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c
deleted file mode 100644
index 36c2ab4a4775..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja/sampleja.c	Fri Mar 16 00:52:22 2001
-+++ leif/sampleja/sampleja.c	Wed Feb 16 20:42:34 2005
-@@ -331,7 +331,7 @@
- #ifdef	WIN32
-     l->path = "d:\\sampleja_obj.jar";		/* path */
- #else
--    l->path = "/usr/lib/im/locale/ja/sampleja/sampleja_obj.jar";	/* path */
-+    l->path = IMDIR "/locale/ja/sampleja/sampleja_obj.jar";	/* path */
- #endif
-     l->signature = "";
-     l->class_names = class_names;
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c
deleted file mode 100644
index b93bd2182665..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sampleja/xaux/aux_so.c	Fri Mar 16 00:52:22 2001
-+++ leif/sampleja/xaux/aux_so.c	Wed Feb 16 20:42:40 2005
-@@ -72,7 +72,7 @@
- #define HTT_AUX_PROP_NAME	"htt_aux_sample_prop"
- #define HTT_AUX_PROP1_NAME	"htt_aux_sample_prop1"
- 
--#define	AUX_EXT			"/usr/lib/im/locale/ja/sampleja/aux_ext"
-+#define	AUX_EXT			(IMDIR "/locale/ja/sampleja/aux_ext")
- 
- typedef struct _aux_icid {
- 	aux_t *			aux;
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c
deleted file mode 100644
index d05cba8a0ca8..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- leif/sun_le_asia/common/auxwin/KeyboardConfig.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/common/auxwin/KeyboardConfig.c	Wed Feb 16 20:44:10 2005
-@@ -145,7 +145,7 @@
- zh_CN.GBK/keyboard_layout2.txt
- common/keyboard_layout.txt
- 
--base directory:  /usr/lib/im/locale/<locale>/
-+base directory:  /usr/local/lib/im/locale/<locale>/
- 
- */
- int read_keyboard_config_file(char *path_name, char *file_name)
-@@ -557,7 +557,7 @@
- 	nLocaleID = get_encodeid_from_locale(sLocaleName);
- 
- 	lang_name = (char *)get_langname_from_locale(sLocaleName);
--	sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
-+	sprintf(path_name, IMDIR "/locale/%s", lang_name);
- 
- 	DEBUG_printf("path_name:%s\n", path_name);
- 
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c
deleted file mode 100644
index 6a928a74cf4e..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/common/auxwin/LookupImpl.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/common/auxwin/LookupImpl.c	Wed Feb 16 20:44:18 2005
-@@ -475,7 +475,7 @@
- 	sLocaleName = setlocale(LC_ALL, NULL);
- 	lang_name = (char *)get_langname_from_locale(sLocaleName);
- 
--	sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
-+	sprintf(path_name, IMDIR "/locale/%s", lang_name);
- 	ret = read_keyboard_config_file(path_name, DEFAULT_SYMBOLS_CONFIG_FILE);
- }
- 
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c
deleted file mode 100644
index 6943cf08d998..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/common/auxwin/OptionMessage.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/common/auxwin/OptionMessage.c	Wed Feb 16 20:44:22 2005
-@@ -127,7 +127,7 @@
- 
- 	nLocaleID = get_encodeid_from_locale(locale_name);
- 	lang_name = get_langname_from_locale(locale_name);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
- 	gCatd = catopen(file_name, 0);
- 	if (gCatd == (nl_catd)-1)
- 		printf("WARNING: Could not open message catalog: %s\n", name);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c
deleted file mode 100644
index 0757a751d2b6..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/common/auxwin/SelectMessage.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/common/auxwin/SelectMessage.c	Wed Feb 16 20:44:30 2005
-@@ -139,7 +139,7 @@
- 
- 	nLocaleID = get_encodeid_from_locale(locale_name);
- 	lang_name = get_langname_from_locale(locale_name);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
- 	gCatd = catopen(file_name, 0);
- 	if (gCatd == (nl_catd)-1)
- 		printf("WARNING: Could not open message catalog: %s\n", name);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c
deleted file mode 100644
index ee83935a6dc7..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/common/auxwin/UtilityConfig.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/common/auxwin/UtilityConfig.c	Wed Feb 16 20:44:37 2005
-@@ -122,7 +122,7 @@
- 	lang_name = (char *)get_langname_from_locale(locale_name);
- 	DEBUG_printf("lang_name:%s\n", lang_name);
- 
--	sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
- 	DEBUG_printf("file_name:%s\n", file_name);
- 
- 	read_utility_config_file(file_name);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h b/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h
deleted file mode 100644
index 2edbc6c99ebe..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/common/include/hzinput.h	Fri May 28 16:52:29 2004
-+++ leif/sun_le_asia/common/include/hzinput.h	Wed Feb 16 20:48:38 2005
-@@ -63,7 +63,7 @@
- #define ENGINE_NOT_INITIATED 		2
- #define ENGINE_INITIATED     		3
- 
--#define DEFAULT_ENGINE_PATH		"/usr/lib/im/locale"
-+#define DEFAULT_ENGINE_PATH		(IMDIR "/locale")
- #define DEFAULT_DICT_PATH		"data"
- #define COMMON_ENGINE_PATH		"common"
- #define CODETABLE_ENGINE_NAME    	"ctim"
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c
deleted file mode 100644
index 94ec2b9e4f11..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- leif/sun_le_asia/common/leif/qjbj_punct.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/common/leif/qjbj_punct.c	Wed Feb 16 20:44:53 2005
-@@ -384,7 +384,7 @@
- 
- 	lang_name = (char *)get_langname_from_langid(lang_id);
- 	DEBUG_printf("lang_name:%s\n", lang_name);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
- 	DEBUG_printf("file_name:%s\n", file_name);
- 
- 	fd = fopen(file_name, "r");
-@@ -441,7 +441,7 @@
- 	PunctCharListByLang[lang_id].bInit = 1;
- 
- 	lang_name = (char *)get_langname_from_langid(lang_id);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
- 	DEBUG_printf("file_name:%s\n", file_name);
- 
- 	fd = fopen(file_name, "r");
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c
deleted file mode 100644
index 3e4228b44977..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_korea/auxobj/xaux_so.c	Sat Mar 27 10:46:45 2004
-+++ leif/sun_le_korea/auxobj/xaux_so.c	Wed Feb 16 20:46:40 2005
-@@ -19,7 +19,7 @@
- 
- #define	XAUX_CLASS_MAX		7
- 
--#define	XAUX_EXT_DIR 		"/usr/lib/im/locale/ko_KR/"
-+#define	XAUX_EXT_DIR 		(IMDIR "/locale/ko_KR/")
- 
- CARD16	aux_utfname_palette[] = {
- 	'c','o','m','.','s','u','n','.',
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c
deleted file mode 100644
index f590d7d2c29e..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_korea/auxwin_gtk/keyboard_config.c	Sat Mar 27 10:46:45 2004
-+++ leif/sun_le_korea/auxwin_gtk/keyboard_config.c	Wed Feb 16 20:46:48 2005
-@@ -432,7 +432,7 @@
-     g_virtual_keyboards[i] = NULL;
- 
-   lang_name = (char *) strdup ("ko_KR");
--  sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
-+  sprintf(path_name, IMDIR "/locale/%s", lang_name);
-   free (lang_name);
- 
- 
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h
deleted file mode 100644
index a36049c8c07c..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- leif/sun_le_korea/korean/hanja_dic.h	Sat Mar 27 10:46:45 2004
-+++ leif/sun_le_korea/korean/hanja_dic.h	Wed Feb 16 20:49:10 2005
-@@ -19,9 +19,9 @@
- 
- #define USRNAME		".usrhjd"
- #ifdef __STDC__
--#define SYSPATH		"/usr/lib/im/locale/ko_KR/common/data"
-+#define SYSPATH		(IMDIR "/locale/ko_KR/common/data")
- #else
--#define SYSPATH		"/usr/lib/im/locale/ko_KR/common/data"
-+#define SYSPATH		(IMDIR "/locale/ko_KR/common/data")
- #endif
- #define SYSNAME		"syshjd"
- #define NULNAME		"nulhjd"
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h
deleted file mode 100644
index d74d5276e73c..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_korea/include/koinput.h	Fri Apr 23 15:40:46 2004
-+++ leif/sun_le_korea/include/koinput.h	Wed Feb 16 20:48:57 2005
-@@ -76,7 +76,7 @@
- #define ENGINE_NOT_INITIATED 		2
- #define ENGINE_INITIATED     		3
- 
--#define DEFAULT_ENGINE_PATH		"/usr/lib/im/locale"
-+#define DEFAULT_ENGINE_PATH		(IMDIR "/locale")
- #define DEFAULT_DICT_PATH		"data"
- #define COMMON_ENGINE_PATH		"common"
- #define LANGNAME                        "ko_KR"
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h
deleted file mode 100644
index 99d8f185d771..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_korea/include/le-options.h	Tue Apr 20 08:53:49 2004
-+++ leif/sun_le_korea/include/le-options.h	Wed Feb 16 20:49:02 2005
-@@ -29,7 +29,7 @@
- #define Bool Boolean
- #endif
- 
--#define DEFAULT_KOLE_OPTION_FILE "/usr/lib/im/locale/ko_KR/kole.conf"
-+#define DEFAULT_KOLE_OPTION_FILE (IMDIR "/locale/ko_KR/kole.conf")
- /* NAME of Options */
- #define STR_OPTION_CHARSET "charset"
- #define STR_OPTION_DELETION "delete by jaso"
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c
deleted file mode 100644
index 43866369af87..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- leif/sun_le_korea/leif/qjbj_punct.c	Sat Mar 27 10:46:45 2004
-+++ leif/sun_le_korea/leif/qjbj_punct.c	Wed Feb 16 20:47:08 2005
-@@ -350,7 +350,7 @@
- 
- 	lang_name = (char *)get_langname_from_langid(lang_id);
- 	logf("lang_name:%s\n", lang_name);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
- 	logf("file_name:%s\n", file_name);
- 
- 	fd = fopen(file_name, "r");
-@@ -407,7 +407,7 @@
- 	PunctCharListByLang[lang_id].bInit = 1;
- 
- 	lang_name = (char *)get_langname_from_langid(lang_id);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
- 	logf("file_name:%s\n", file_name);
- 
- 	fd = fopen(file_name, "r");
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c
deleted file mode 100644
index e2ce32bd7fa7..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_korea/korean/lookupbuf.c	Sat Mar 27 10:46:45 2004
-+++ leif/sun_le_korea/korean/lookupbuf.c	Wed Feb 16 20:46:54 2005
-@@ -547,7 +547,7 @@
-   }
-   fp = fopen (argv[1], "w");
-   
--  construct_binary_tree_from_file ("/usr/lib/im/locale/ko_KR/common/data/hhdict",
-+  construct_binary_tree_from_file (IMDIR "/locale/ko_KR/common/data/hhdict",
- 				   &trees, &n_trees);
-   mthd_return = dictionary_search_hanja_candidates_in_utf16
-     (ga, &n_candidates, &cand );
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c
deleted file mode 100644
index 61aaeeae6dd8..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/th_TH/auxobj/xaux_so.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/th_TH/auxobj/xaux_so.c	Wed Feb 16 20:45:01 2005
-@@ -62,7 +62,7 @@
- 
- #define	XAUX_CLASS_MAX		4
- 
--#define	XAUX_EXT_DIR 		"/usr/lib/im/locale/th_TH/"
-+#define	XAUX_EXT_DIR 		(IMDIR "/locale/th_TH/")
- 
- CARD16	aux_utfname_palette[] = {
- 	'c','o','m','.','s','u','n','.',
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c
deleted file mode 100644
index 008cb30d2e53..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/th_TH/auxwin/OptionMessage.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/th_TH/auxwin/OptionMessage.c	Wed Feb 16 20:45:06 2005
-@@ -123,7 +123,7 @@
- 
- 	nLocaleID = get_encodeid_from_locale(locale_name);
- 	lang_name = get_langname_from_locale(locale_name);
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
- 	gCatd = catopen(file_name, 0);
- 	if (gCatd == (nl_catd)-1)
- 		printf("WARNING: Could not open message catalog: %s\n", name);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c
deleted file mode 100644
index fbe0c5aa4bf2..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/th_TH/auxwin/UtilityConfig.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/th_TH/auxwin/UtilityConfig.c	Wed Feb 16 20:45:11 2005
-@@ -118,7 +118,7 @@
- 	lang_name = (char *)get_langname_from_locale(locale_name);
- 	DEBUG_printf("lang_name:%s\n", lang_name);
- 
--	sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
- 	DEBUG_printf("file_name:%s\n", file_name);
- 
- 	read_utility_config_file(file_name);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c
deleted file mode 100644
index d6722bfb459b..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/th_TH/leif/thai_le.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/th_TH/leif/thai_le.c	Wed Feb 16 20:45:29 2005
-@@ -173,7 +173,7 @@
- /* Open the IF interface */
- Bool if_le_OpenIF(iml_if_t * If)
- {
--	char *keymap_config_file = "/usr/lib/im/locale/th_TH/thai_keymap.cfg";
-+	char *keymap_config_file = IMDIR "/locale/th_TH/thai_keymap.cfg";
- 	TThaiKeymapList *pThaiKeymapList = &gThaiKeymapList;
- 
-     	DEBUG_printf("if_le_OpenIF ====\n");
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c
deleted file mode 100644
index 5cdb2980ca60..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_CN/auxobj/xaux_so.c	Mon May 17 21:10:12 2004
-+++ leif/sun_le_asia/zh_CN/auxobj/xaux_so.c	Wed Feb 16 20:45:35 2005
-@@ -65,7 +65,7 @@
- #define XAUX_CLASS_MAX		3
- #endif
- 
--#define	XAUX_EXT_DIR 		"/usr/lib/im/locale/zh_CN/"
-+#define	XAUX_EXT_DIR 		(IMDIR "/locale/zh_CN/")
- 
- CARD16	aux_utfname_palette[] = {
- 	'c','o','m','.','s','u','n','.',
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c
deleted file mode 100644
index 2cbf82f6ebfa..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_CN/auxwin_gtk/UtilityConfig.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/zh_CN/auxwin_gtk/UtilityConfig.c	Wed Feb 16 20:45:41 2005
-@@ -124,7 +124,7 @@
- 	lang_name = (char *)get_langname_from_locale(locale_name);
- 	DEBUG_printf("lang_name:%s\n", lang_name);
- 
--	sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
-+	sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
- 	DEBUG_printf("file_name:%s\n", file_name);
- 
- 	read_utility_config_file(file_name);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c
deleted file mode 100644
index 89f0a0a06427..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_CN/newpy/NewPY.c	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/zh_CN/newpy/NewPY.c	Wed Feb 16 20:45:45 2005
-@@ -126,7 +126,7 @@
- #define  PUNCT_CHINESE      0
- #define  PUNCT_ENGLISH      1
- 
--#define  CIKU_DATA_PATH     "/usr/lib/im/locale/zh_CN/common/data"
-+#define  CIKU_DATA_PATH     (IMDIR "/locale/zh_CN/common/data")
- 
- JINT      nGlobalSpMode;      /* ZRM, CStar, ABC */
- 
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c
deleted file mode 100644
index c49a92bca109..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_HK/auxobj/xaux_so.c	Mon May 17 21:13:43 2004
-+++ leif/sun_le_asia/zh_HK/auxobj/xaux_so.c	Wed Feb 16 20:45:51 2005
-@@ -65,7 +65,7 @@
- #define	XAUX_CLASS_MAX		3
- #endif
- 
--#define	XAUX_EXT_DIR 		"/usr/lib/im/locale/zh_HK/"
-+#define	XAUX_EXT_DIR 		(IMDIR "/locale/zh_HK/")
- 
- CARD16	aux_utfname_palette[] = {
- 	'c','o','m','.','s','u','n','.',
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h
deleted file mode 100644
index a62d350b5916..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_HK/input_methods/newzy/CikuOper.h	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/zh_HK/input_methods/newzy/CikuOper.h	Wed Feb 16 20:48:43 2005
-@@ -64,7 +64,7 @@
- #define SINGLEHZ_DSP_SIMP      1
- #define SINGLEHZ_DSP_FULL      2
- 
--#define  CIKU_DATA_PATH     "/usr/lib/im/locale/zh_HK/common/data"
-+#define  CIKU_DATA_PATH     (IMDIR "/locale/zh_HK/common/data")
- 
- typedef struct _CizuItem {
- 	UCHAR     szLine[CIZU_ITEM_LEN];           /* Org Line read from file */
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c
deleted file mode 100644
index 6d53fc6b8eb3..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_TW/auxobj/xaux_so.c	Mon May 17 21:13:43 2004
-+++ leif/sun_le_asia/zh_TW/auxobj/xaux_so.c	Wed Feb 16 20:45:59 2005
-@@ -65,7 +65,7 @@
- #define XAUX_CLASS_MAX		3
- #endif
- 
--#define	XAUX_EXT_DIR 		"/usr/lib/im/locale/zh_TW/"
-+#define	XAUX_EXT_DIR 		(IMDIR "/locale/zh_TW/")
- 
- CARD16	aux_utfname_palette[] = {
- 	'c','o','m','.','s','u','n','.',
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c
deleted file mode 100644
index 356a2e3d730f..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_im.c	Thu May 13 19:23:13 2004
-+++ leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_im.c	Wed Feb 16 20:46:21 2005
-@@ -154,7 +154,7 @@
- 	if (pDayiData == NULL)
- 		return(-1);
- 
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/dayi.cfg", core->envinfo.lang_name);
-+	sprintf(file_name, IMDIR "/locale/%s/common/dayi.cfg", core->envinfo.lang_name);
- 	ret = DayiData_Init(file_name, pDayiData);
- 	if (ret == DAYI_ERROR) {
- 		DayiData_Free(pDayiData);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h
deleted file mode 100644
index baf98426a5df..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_TW/input_methods/newzy/CikuOper.h	Fri Mar 26 18:13:39 2004
-+++ leif/sun_le_asia/zh_TW/input_methods/newzy/CikuOper.h	Wed Feb 16 20:48:48 2005
-@@ -64,7 +64,7 @@
- #define SINGLEHZ_DSP_SIMP      1
- #define SINGLEHZ_DSP_FULL      2
- 
--#define  CIKU_DATA_PATH     "/usr/lib/im/locale/zh_TW/common/data"
-+#define  CIKU_DATA_PATH     (IMDIR "/locale/zh_TW/common/data")
- 
- typedef struct _CizuItem {
- 	UCHAR     szLine[CIZU_ITEM_LEN];           /* Org Line read from file */
diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c
deleted file mode 100644
index 64c4f0713dd1..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_im.c	Thu May 13 19:23:13 2004
-+++ leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_im.c	Wed Feb 16 20:46:35 2005
-@@ -155,7 +155,7 @@
- 	if (pZhuyinData == NULL)
- 		return(-1);
- 
--	sprintf(file_name, "/usr/lib/im/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name);
-+	sprintf(file_name, IMDIR "/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name);
- 	ret = ZhuyinData_Init(file_name, pZhuyinData);
- 	if (ret == ZHUYIN_ERROR) {
- 		ZhuyinData_Free(pZhuyinData);
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h b/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h
deleted file mode 100644
index 10545897d714..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- leif/unit/include/unit_input.h	Tue Oct 12 17:24:13 2004
-+++ leif/unit/include/unit_input.h	Wed Feb 16 20:49:15 2005
-@@ -109,7 +109,7 @@
- #define ENGINE_NOT_INITIATED 		2
- #define ENGINE_INITIATED     		3
- 
--#define DEFAULT_ENGINE_PATH		"/usr/lib/im/locale"
-+#define DEFAULT_ENGINE_PATH		(IMDIR "/locale")
- #define DEFAULT_DICT_PATH		"data"
- #define COMMON_ENGINE_PATH		"common"
- #define GENERIC_IM_TABLE_NAME    "GENERIC_IM_TABLE"
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_mapfile_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_mapfile_Makefile.am
deleted file mode 100644
index 59e9f0c8843d..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_mapfile_Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
---- leif/unit/phonetic_im/mapfile/Makefile.am.orig	Sat Apr  3 11:50:21 2004
-+++ leif/unit/phonetic_im/mapfile/Makefile.am	Wed Mar  2 20:35:05 2005
-@@ -1,5 +1,6 @@
- SUBDIRS = mapfile2c
- LEX = /usr/bin/lex
-+SED = /usr/bin/sed
- 
- MAPFILES = bengali.mapfile gurmukhi.mapfile hindi.mapfile kannada.mapfile malayalam.mapfile tamil.mapfile telugu.mapfile gujarati.mapfile
- 
-@@ -12,7 +13,7 @@
- .l.c:
- 	$(LEX) $(LFLAGS) $*.l
- 	mv lex.yy.c $*.tc
--	sed  \
-+	$(SED)  \
- 	-e "/^# line/d" \
- 	-e "s/parse_small_token/parse_$*/g" \
- 	-e "s/^void yyunput/static void yyunput/g" \
-@@ -57,10 +58,11 @@
- 	-e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
- 	-e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
- 	-e "/^#line/d" \
--	-e "/^static char \*global_ptr\;/i\
--#define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
--#define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
--#define input() (\*global_ptr++)" $*.tc > $*.c
-+	-e "/^static char \*global_ptr\;/{" \
-+	    -e "p" -e "s/.*/#define YY_NO_INPUT/" \
-+	    -e "p" -e "s/.*/#define YY_NO_UNPUT/" \
-+	    -e "p" -e "s/.*/#define input\(\) \(*global_ptr++\)/" \
-+	-e "}" $*.tc > $*.c
- 	rm -f  $*.tc
- 
- noinst_LTLIBRARIES = libphonetic_temp.la
diff --git a/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c
deleted file mode 100644
index d98acce9a275..000000000000
--- a/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/EIMIL/EIMILJournal.c	Mon Aug  2 23:39:10 2004
-+++ lib/EIMIL/EIMILJournal.c	Thu Feb 17 01:55:38 2005
-@@ -61,7 +61,6 @@
-     pjh = NULL;
-     pj = ped->pjst;
-     for (i = 0; i < EIMIL_JOURNAL_MAX_SLOT_SIZE; i++) {
--        fprintf(stderr, "hoge\n");
-         if (!pj) break;
- 	if (pj->pv) EIMIL_RMREF(*pj->pv);
- 	if ((pj->next - pj) < 0) pjh = pj->next;
diff --git a/textproc/iiimf-le-unit/files/patch-lib_EIMIL_Makefile.am b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_Makefile.am
new file mode 100644
index 000000000000..8e23e8b2eef4
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_Makefile.am
@@ -0,0 +1,9 @@
+--- lib/EIMIL/Makefile.am.orig	Fri May 13 18:03:49 2005
++++ lib/EIMIL/Makefile.am	Fri May 13 18:04:12 2005
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ SUBDIRS = . test
+ #libdir = /usr/local/lib
+ #libEIMIL_la_LDFLAGS = -module -version-info $(LIBEIMIL_MAJOR_VERSION):$(LIBEIMIL_MINOR_VERSION) \
diff --git a/textproc/iiimf-le-unit/pkg-plist b/textproc/iiimf-le-unit/pkg-plist
index 17586abf3c6f..ffee886cf218 100644
--- a/textproc/iiimf-le-unit/pkg-plist
+++ b/textproc/iiimf-le-unit/pkg-plist
@@ -1,86 +1,92 @@
-lib/im/leif/default.so
-lib/im/leif/unitle.so
-lib/im/locale/UNIT/AM_ET/data/amharic.data
-lib/im/locale/UNIT/ARABIC/data/arabic.data
-lib/im/locale/UNIT/BENGALI/data/inscript.data
-lib/im/locale/UNIT/BENGALI/data/probhat.data
-lib/im/locale/UNIT/BENGALI/phonetic.cfg
-lib/im/locale/UNIT/CYRILLIC/data/cyrillic.data
-lib/im/locale/UNIT/EUROPEAN/data/euro.data
-lib/im/locale/UNIT/GREEK/data/greek.data
-lib/im/locale/UNIT/GUJARATI/data/inscript.data
-lib/im/locale/UNIT/GUJARATI/data/phonetic.data
-lib/im/locale/UNIT/GUJARATI/phonetic.cfg
-lib/im/locale/UNIT/GURMUKHI/data/inscript.data
-lib/im/locale/UNIT/GURMUKHI/data/phonetic.data
-lib/im/locale/UNIT/GURMUKHI/phonetic.cfg
-lib/im/locale/UNIT/HEBREW/data/hebrew.data
-lib/im/locale/UNIT/HINDI/data/inscript.data
-lib/im/locale/UNIT/HINDI/data/phonetic.data
-lib/im/locale/UNIT/HINDI/data/trans.data
-lib/im/locale/UNIT/HINDI/phonetic.cfg
-lib/im/locale/UNIT/KANNADA/data/inscript.data
-lib/im/locale/UNIT/KANNADA/data/kgp.data
-lib/im/locale/UNIT/KANNADA/phonetic.cfg
-lib/im/locale/UNIT/MALAYALAM/data/inscript.data
-lib/im/locale/UNIT/MALAYALAM/phonetic.cfg
-lib/im/locale/UNIT/TAMIL/data/inscript.data
-lib/im/locale/UNIT/TAMIL/data/trans.data
-lib/im/locale/UNIT/TAMIL/phonetic.cfg
-lib/im/locale/UNIT/TELUGU/data/inscript.data
-lib/im/locale/UNIT/TELUGU/phonetic.cfg
-lib/im/locale/UNIT/TI_ER/data/eritrean.data
-lib/im/locale/UNIT/UNICODE-HEX/codepoint.cfg
-lib/im/locale/UNIT/UNICODE-OCTAL/codepoint.cfg
-lib/im/locale/UNIT/VIETNAMESE/data/vietnamese.data
-lib/im/locale/UNIT/common/bin2txt
-lib/im/locale/UNIT/common/codepoint_im.so
-lib/im/locale/UNIT/common/codepoint_im.so.0
-lib/im/locale/UNIT/common/ctim.so
-lib/im/locale/UNIT/common/ctim.so.0
-lib/im/locale/UNIT/common/phonetic_im.so
-lib/im/locale/UNIT/common/phonetic_im.so.0
-lib/im/locale/UNIT/common/search
-lib/im/locale/UNIT/common/txt2bin
-lib/im/locale/UNIT/common/x_txt2bin
-lib/im/locale/UNIT/common/xctim.so
-lib/im/locale/UNIT/common/xctim.so.0
-lib/im/locale/UNIT/sysime.cfg
-@dirrm lib/im/locale/UNIT/AM_ET/data
-@dirrm lib/im/locale/UNIT/AM_ET
-@dirrm lib/im/locale/UNIT/ARABIC/data
-@dirrm lib/im/locale/UNIT/ARABIC
-@dirrm lib/im/locale/UNIT/BENGALI/data
-@dirrm lib/im/locale/UNIT/BENGALI
-@dirrm lib/im/locale/UNIT/CYRILLIC/data
-@dirrm lib/im/locale/UNIT/CYRILLIC
-@dirrm lib/im/locale/UNIT/EUROPEAN/data
-@dirrm lib/im/locale/UNIT/EUROPEAN
-@dirrm lib/im/locale/UNIT/GREEK/data
-@dirrm lib/im/locale/UNIT/GREEK
-@dirrm lib/im/locale/UNIT/GUJARATI/data
-@dirrm lib/im/locale/UNIT/GUJARATI
-@dirrm lib/im/locale/UNIT/GURMUKHI/data
-@dirrm lib/im/locale/UNIT/GURMUKHI
-@dirrm lib/im/locale/UNIT/HEBREW/data
-@dirrm lib/im/locale/UNIT/HEBREW
-@dirrm lib/im/locale/UNIT/HINDI/data
-@dirrm lib/im/locale/UNIT/HINDI
-@dirrm lib/im/locale/UNIT/KANNADA/data
-@dirrm lib/im/locale/UNIT/KANNADA
-@dirrm lib/im/locale/UNIT/MALAYALAM/data
-@dirrm lib/im/locale/UNIT/MALAYALAM
-@dirrm lib/im/locale/UNIT/TAMIL/data
-@dirrm lib/im/locale/UNIT/TAMIL
-@dirrm lib/im/locale/UNIT/TELUGU/data
-@dirrm lib/im/locale/UNIT/TELUGU
-@dirrm lib/im/locale/UNIT/TI_ER/data
-@dirrm lib/im/locale/UNIT/TI_ER
-@dirrm lib/im/locale/UNIT/UNICODE-OCTAL
-@dirrm lib/im/locale/UNIT/UNICODE-HEX
-@dirrm lib/im/locale/UNIT/VIETNAMESE/data
-@dirrm lib/im/locale/UNIT/VIETNAMESE
-@dirrm lib/im/locale/UNIT/common
-@dirrm lib/im/locale/UNIT
-@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
+lib/iiim/le/default/default.so
+lib/iiim/le/unitle/common/ctim.so.0
+lib/iiim/le/unitle/common/ctim.so
+lib/iiim/le/unitle/common/ctim.la
+lib/iiim/le/unitle/common/ctim.a
+lib/iiim/le/unitle/common/txt2bin
+lib/iiim/le/unitle/common/bin2txt
+lib/iiim/le/unitle/common/search
+lib/iiim/le/unitle/common/xctim.so.0
+lib/iiim/le/unitle/common/xctim.so
+lib/iiim/le/unitle/common/xctim.la
+lib/iiim/le/unitle/common/xctim.a
+lib/iiim/le/unitle/common/x_txt2bin
+lib/iiim/le/unitle/common/codepoint_im.so.0
+lib/iiim/le/unitle/common/codepoint_im.so
+lib/iiim/le/unitle/common/codepoint_im.la
+lib/iiim/le/unitle/common/codepoint_im.a
+lib/iiim/le/unitle/HINDI/phonetic.cfg
+lib/iiim/le/unitle/HINDI/data/inscript.data
+lib/iiim/le/unitle/HINDI/data/trans.data
+lib/iiim/le/unitle/HINDI/data/phonetic.data
+lib/iiim/le/unitle/TAMIL/phonetic.cfg
+lib/iiim/le/unitle/TAMIL/data/inscript.data
+lib/iiim/le/unitle/TAMIL/data/trans.data
+lib/iiim/le/unitle/TAMIL/data/phonetic.data
+lib/iiim/le/unitle/KANNADA/phonetic.cfg
+lib/iiim/le/unitle/KANNADA/data/inscript.data
+lib/iiim/le/unitle/KANNADA/data/kgp.data
+lib/iiim/le/unitle/MALAYALAM/phonetic.cfg
+lib/iiim/le/unitle/MALAYALAM/data/inscript.data
+lib/iiim/le/unitle/TELUGU/phonetic.cfg
+lib/iiim/le/unitle/TELUGU/data/inscript.data
+lib/iiim/le/unitle/GUJARATI/phonetic.cfg
+lib/iiim/le/unitle/GUJARATI/data/inscript.data
+lib/iiim/le/unitle/GUJARATI/data/phonetic.data
+lib/iiim/le/unitle/BENGALI/phonetic.cfg
+lib/iiim/le/unitle/BENGALI/data/inscript.data
+lib/iiim/le/unitle/BENGALI/data/probhat.data
+lib/iiim/le/unitle/GURMUKHI/phonetic.cfg
+lib/iiim/le/unitle/GURMUKHI/data/inscript.data
+lib/iiim/le/unitle/GURMUKHI/data/phonetic.data
+lib/iiim/le/unitle/UNICODE-HEX/codepoint.cfg
+lib/iiim/le/unitle/UNICODE-OCTAL/codepoint.cfg
+lib/iiim/le/unitle/sysime.cfg
+lib/iiim/le/unitle/unitle.so
+lib/iiim/le/unitle/hotkey_config.xml
+lib/iiim/le/unitle/EUROPEAN/data/euro.data
+lib/iiim/le/unitle/CYRILLIC/data/cyrillic.data
+lib/iiim/le/unitle/GREEK/data/greek.data
+lib/iiim/le/unitle/ARABIC/data/arabic.data
+lib/iiim/le/unitle/HEBREW/data/hebrew.data
+lib/iiim/le/unitle/VIETNAMESE/data/vietnamese.data
+lib/iiim/le/unitle/TI_ER/data/eritrean.data
+lib/iiim/le/unitle/AM_ET/data/amharic.data
+@dirrm lib/iiim/le/default
+@dirrm lib/iiim/le/unitle/common
+@dirrm lib/iiim/le/unitle/HINDI/data
+@dirrm lib/iiim/le/unitle/HINDI
+@dirrm lib/iiim/le/unitle/TAMIL/data
+@dirrm lib/iiim/le/unitle/TAMIL
+@dirrm lib/iiim/le/unitle/KANNADA/data
+@dirrm lib/iiim/le/unitle/KANNADA
+@dirrm lib/iiim/le/unitle/MALAYALAM/data
+@dirrm lib/iiim/le/unitle/MALAYALAM
+@dirrm lib/iiim/le/unitle/TELUGU/data
+@dirrm lib/iiim/le/unitle/TELUGU
+@dirrm lib/iiim/le/unitle/GUJARATI/data
+@dirrm lib/iiim/le/unitle/GUJARATI
+@dirrm lib/iiim/le/unitle/BENGALI/data
+@dirrm lib/iiim/le/unitle/BENGALI
+@dirrm lib/iiim/le/unitle/GURMUKHI/data
+@dirrm lib/iiim/le/unitle/GURMUKHI
+@dirrm lib/iiim/le/unitle/UNICODE-HEX
+@dirrm lib/iiim/le/unitle/UNICODE-OCTAL
+@dirrm lib/iiim/le/unitle/EUROPEAN/data
+@dirrm lib/iiim/le/unitle/EUROPEAN
+@dirrm lib/iiim/le/unitle/CYRILLIC/data
+@dirrm lib/iiim/le/unitle/CYRILLIC
+@dirrm lib/iiim/le/unitle/GREEK/data
+@dirrm lib/iiim/le/unitle/GREEK
+@dirrm lib/iiim/le/unitle/ARABIC/data
+@dirrm lib/iiim/le/unitle/ARABIC
+@dirrm lib/iiim/le/unitle/HEBREW/data
+@dirrm lib/iiim/le/unitle/HEBREW
+@dirrm lib/iiim/le/unitle/VIETNAMESE/data
+@dirrm lib/iiim/le/unitle/VIETNAMESE
+@dirrm lib/iiim/le/unitle/TI_ER/data
+@dirrm lib/iiim/le/unitle/TI_ER
+@dirrm lib/iiim/le/unitle/AM_ET/data
+@dirrm lib/iiim/le/unitle/AM_ET
+@dirrm lib/iiim/le/unitle
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index a56549379441..62c0d6372246 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -6,61 +6,49 @@
 #
 
 PORTNAME=	protocol-lib
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Framework protocol library
 
-IIIMF_VER=	r12_1-svn2002
+ONLY_FOR_ARCHS=	i386
+
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/lib/iiimp
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
-.endif
-
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../../acfiles/im_common.m4
-
-pre-configure:
-	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	${REINPLACE_CMD} \
+		-e '/^pkgconfigdir/s,$$(libdir),%%PREFIX%%/libdata,g' \
+		${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-protocol-lib/distinfo b/textproc/iiimf-protocol-lib/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-protocol-lib/distinfo
+++ b/textproc/iiimf-protocol-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile
index bcc2cb24a1c8..3b1030c4343d 100644
--- a/textproc/iiimf-protocol-lib/files/patch-Makefile
+++ b/textproc/iiimf-protocol-lib/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = lib/iiimp
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_Makefile.am b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_Makefile.am
new file mode 100644
index 000000000000..af101797da71
--- /dev/null
+++ b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_Makefile.am
@@ -0,0 +1,9 @@
+--- lib/iiimp/Makefile.am.orig	Fri May 13 15:37:41 2005
++++ lib/iiimp/Makefile.am	Fri May 13 15:38:13 2005
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ #libdir = /usr/local/lib
+ libiiimp_la_LDFLAGS = -version-info $(LIBIIIMP_MAJOR_VERSION):$(LIBIIIMP_MINOR_VERSION) \
+                       -export-dynamic -g @TLS_LIBS@
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac
deleted file mode 100644
index 810ffa4fd184..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/iiimp/configure.ac.orig	Tue Jul 13 09:38:42 2004
-+++ lib/iiimp/configure.ac	Wed Mar  2 06:32:37 2005
-@@ -26,7 +26,7 @@
- 
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- AM_CONFIG_HEADER(config.h)
--AM_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
- 
- dnl --------------------------------------------------------------------------------
- dnl                          Section 2: Autoheader
-@@ -78,13 +78,13 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
- 
- dnl --------------------------------------------------------------------------------
- dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c
deleted file mode 100644
index 60d0a2d3fede..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/iiimp/data/comp-string.c	Fri Nov  1 14:32:45 2002
-+++ lib/iiimp/data/comp-string.c	Wed Feb 16 22:48:21 2005
-@@ -63,9 +63,12 @@
- #if defined(lint) && defined(HAVE_NOTE_H)
-     NOTE(ARGUNUSED(data_s))
- #endif /* lint && HAVE_NOTE_H */
--    if (NULL == str) return;
--    free(str->ptr);
--    free(str);
-+    if (str) {
-+        if (str->ptr)
-+            free(str->ptr);
-+        str->ptr = NULL;
-+        free(str);
-+    }
-     return;
- }
- 
-@@ -79,7 +82,9 @@
-     IIIMP_string *	str_next;
-     for (; NULL != str; str = str_next) {
- 	str_next = str->next;
--	free(str->ptr);
-+	if (str->ptr)
-+            free(str->ptr);
-+        str->ptr = NULL;
- 	free(str);
-     }
-     return;
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c
deleted file mode 100644
index 0896e8dc8236..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/iiimp/data/im-connect.c	Fri Jun 20 12:06:33 2003
-+++ lib/iiimp/data/im-connect.c	Wed Feb 16 22:43:17 2005
-@@ -41,10 +41,15 @@
- void
- iiimp_connect_delete(IIIMP_data_s * data_s, IIIMP_message * m)
- {
--    if (NULL == m) return;
--    iiimp_string_delete(data_s, m->v.connect.user_name);
--    iiimp_string_list_delete(data_s, m->v.connect.auth);
--    free(m);
-+    if (m) {
-+        if (m->v.connect.user_name) 
-+            iiimp_string_delete(data_s, m->v.connect.user_name);
-+        m->v.connect.user_name = NULL;
-+        if (m->v.connect.auth)
-+            iiimp_string_list_delete(data_s, m->v.connect.auth);
-+        m->v.connect.auth = NULL;
-+        free(m);
-+    }
-     return;
- }
- 
diff --git a/textproc/iiimf-protocol-lib/pkg-plist b/textproc/iiimf-protocol-lib/pkg-plist
index f8b7a5549ad1..c8734aec63bf 100644
--- a/textproc/iiimf-protocol-lib/pkg-plist
+++ b/textproc/iiimf-protocol-lib/pkg-plist
@@ -1,8 +1,11 @@
-lib/libiiimp.a
+include/iiim/iiimp.h
+include/iiim/iiimp-opcode.h
+include/iiim/iiimp-keycode.h
+include/iiim/iiimp-data.h
+include/iiim/iiimp-character-subsets.h
+lib/libiiimp.so.1
 lib/libiiimp.so
-lib/libiiimp.so.0
-include/iiimp-character-subsets.h
-include/iiimp-data.h
-include/iiimp-keycode.h
-include/iiimp-opcode.h
-include/iiimp.h
+lib/libiiimp.la
+lib/libiiimp.a
+libdata/pkgconfig/iiimf-lib-protocol.pc
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile
index 4c372a952c09..ee3aca7841a5 100644
--- a/textproc/iiimf-server/Makefile
+++ b/textproc/iiimf-server/Makefile
@@ -6,44 +6,39 @@
 #
 
 PORTNAME=	server
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Server Framework
 
-LIB_DEPENDS=    iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
+LIB_DEPENDS=    iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
 
-IIIMF_VER=	r12_1-svn2002
-USE_RC_SUBR=	htt.sh
+ONLY_FOR_ARCHS=	i386
+
+INSTALLS_SHLIB=	yes
+USE_RC_SUBR=	iiimd.sh
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig libxml2
 USE_OPENSSL=    yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/iiimsf
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 .if defined(WITH_DEBUG)
@@ -51,33 +46,25 @@ CFLAGS+=	-g -ggdb -DDEBUG
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CXXFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/src/le.xml.conf
-	${MV} ${WRKSRC}/htt.xml.conf ${WRKSRC}/htt.xml.conf.sample
-	${MV} ${WRKSRC}/src/le.xml.conf ${WRKSRC}/src/le.xml.conf.sample
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
+		${BUILDDIR}/src/le.xml.conf
+	${MV} ${BUILDDIR}/iiimd.xml.conf ${BUILDDIR}/iiimd.xml.conf.sample
+	${MV} ${BUILDDIR}/src/le.xml.conf ${BUILDDIR}/src/le.xml.conf.sample
 
-pre-configure:
-	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
-post-configure:
-	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
-		${WRKSRC}/src/Makefile
+post-install:
+	${INSTALL_DATA} ${BUILDDIR}/src/le.xml.conf.sample ${PREFIX}/etc/iiim/
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-server/distinfo b/textproc/iiimf-server/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-server/distinfo
+++ b/textproc/iiimf-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-server/files/htt.sh.in b/textproc/iiimf-server/files/iiimd.sh.in
index 27e47629c743..e34b5f2a7ffd 100644
--- a/textproc/iiimf-server/files/htt.sh.in
+++ b/textproc/iiimf-server/files/iiimd.sh.in
@@ -2,19 +2,19 @@
 
 # $FreeBSD$
 
-# PROVIDE: htt
+# PROVIDE: iiimd
 # REQUIRE: DAEMON
 # KEYWORD: FreeBSD shutdown
 
 prefix=%%PREFIX%%
 
-htt_enable=${htt_enable:-"NO"}
+iiimd_enable=${iiimd_enable:-"NO"}
 
 . %%RC_SUBR%%
 
-name="htt"
+name="iiimd"
 rcvar=`set_rcvar`
-command="${prefix}/lib/im/htt"
+command="${prefix}/bin/iiimd"
 
 load_rc_config $name
 command_args="> /dev/null 2>&1 &"
diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile
index bcc2cb24a1c8..3976fd7ed181 100644
--- a/textproc/iiimf-server/files/patch-Makefile
+++ b/textproc/iiimf-server/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = iiimsf
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_Makefile.am b/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
index a1398d6ca0e5..b0cba93b5afa 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
+++ b/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
@@ -1,8 +1,11 @@
---- iiimsf/Makefile.am.orig	Sat Feb 19 03:33:28 2005
-+++ iiimsf/Makefile.am	Sat Feb 19 03:33:48 2005
-@@ -2,4 +2,4 @@
+--- iiimsf/Makefile.am.orig	Fri Mar 18 04:26:28 2005
++++ iiimsf/Makefile.am	Mon May  9 19:00:14 2005
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
  SUBDIRS = lib src
  
  confdir = $(XMLCONFDIR)
--conf_DATA = htt.xml.conf
-+conf_DATA = htt.xml.conf.sample src/le.xml.conf.sample
+-conf_DATA = iiimd.xml.conf
++conf_DATA = iiimd.xml.conf.sample
diff --git a/textproc/iiimf-server/files/patch-iiimsf_configure.ac b/textproc/iiimf-server/files/patch-iiimsf_configure.ac
deleted file mode 100644
index 2993c93bca78..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- iiimsf/configure.ac.orig	Wed Mar  2 21:00:09 2005
-+++ iiimsf/configure.ac	Wed Mar  2 21:00:37 2005
-@@ -236,13 +236,13 @@
- 
- CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_CXX_CFLAGS}"
-+        ${THREAD_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_CXX_CFLAGS}"
-+          ${THREAD_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
- if test $HAVE_LIBCRYPT = "yes"; then
-     LIBCRYPT_FLAGS="-lcrypt"
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
index 85dbd9e5252a..74ca709db074 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
@@ -1,5 +1,5 @@
---- iiimsf/src/IMAuth.cpp	Sun Jun 20 06:46:28 2004
-+++ iiimsf/src/IMAuth.cpp	Wed Feb 16 16:21:47 2005
+--- iiimsf/src/IMAuth.cpp.orig	Mon May  9 18:08:19 2005
++++ iiimsf/src/IMAuth.cpp	Mon May  9 18:08:53 2005
 @@ -47,7 +47,9 @@
  #include <stdlib.h>
  #include <string.h>
@@ -7,6 +7,6 @@
 +#ifdef HAVE_ALLOCA_H
  #include <alloca.h>
 +#endif
+ #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
index 3073025f3c2c..bae379d11a8a 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
@@ -1,23 +1,12 @@
---- iiimsf/src/IMSignal.cpp.orig	Sat Oct 16 10:28:13 2004
-+++ iiimsf/src/IMSignal.cpp	Sun Feb 20 18:43:18 2005
-@@ -1,7 +1,11 @@
- #include <config.h>
- #include <sstream>
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #include <unistd.h>
- #ifdef HAVE_SIGNAL
- #include <signal.h>
-@@ -67,10 +71,8 @@
+--- iiimsf/src/IMSignal.cpp.orig	Mon May  9 18:00:02 2005
++++ iiimsf/src/IMSignal.cpp	Mon May  9 18:00:45 2005
+@@ -66,11 +66,8 @@
      stringstream s;
      string spid, signum;
  
 -    s << getpid();
 -    spid = s.str();
+-    s.str("");
 -    s << num;
 -    signum = s.str();
 +    s << getpid() << " " << num;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
deleted file mode 100644
index 6e598be003d4..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- iiimsf/src/IMSvrCfg.cpp	Mon Oct  4 18:07:05 2004
-+++ iiimsf/src/IMSvrCfg.cpp	Wed Feb 16 20:38:05 2005
-@@ -90,14 +90,14 @@
- void
- IMSvrCfg::initialize()
- {
--    initstr(IMDIR, "IM main directory.", "/usr/lib/im");
-+    initstr(IMDIR, "IM main directory.", IM_DIRECTORY);
-     initstr(BASICLOCALE, "Locale used by default", "C");
- #ifdef WIN32
-     initstr(IFPATHNAME, "Language Engine module directory",
- 	   "D:\\WINNT\\System32\\iiimf");
- #else
-     initstr(IFPATHNAME, "Language Engine module directory",
--	   "/usr/lib/im/leif");
-+	   (IM_DIRECTORY "/leif"));
- #endif
-     initstr(IFNAME, "Language Engine name", "");
-     initstr(PORT, "Port or service name", "9010");
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
deleted file mode 100644
index cf28bc34cfd1..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- iiimsf/src/IMXMLUtil.cpp	Mon Oct  4 18:07:05 2004
-+++ iiimsf/src/IMXMLUtil.cpp	Wed Feb 16 20:38:34 2005
-@@ -78,7 +78,7 @@
- {
-     IMXMLModifier xml((const char *)argv[1]);
-     IMModuleInfoVec *lev;
--    string mod("/usr/lib/im/leif/freewnnle.so");
-+    string mod(IM_DIRECTORY "/leif/freewnnle.so");
-     string lang("ja");
-     string out("foo.conf");
- 
-@@ -101,7 +101,7 @@
-       }
-     */
-     printf("\n\n*** remove\n");
--    mod = "/usr/lib/im/leif/CannaLE.so";
-+    mod = IM_DIRECTORY "/leif/CannaLE.so";
-     xml.removemodule(mod, lang);
-     /*
-       for (IMModuleInfoVec::iterator i = lev->begin (); i != lev->end (); i++) {
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
index b64512cc3310..1547a96b5970 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
@@ -1,44 +1,39 @@
---- iiimsf/src/Makefile.am.orig	Fri Oct 15 03:39:38 2004
-+++ iiimsf/src/Makefile.am	Wed Mar  2 21:18:10 2005
-@@ -4,7 +4,7 @@
- 	-DXMLCONFDIR="\"$(XMLCONFDIR)\""			\
- 	-DSOCKETDIR="\"$(SOCKETDIR)\""				\
- 	-DSEGVLOGGER="\"$(libexecdir)/iiimf-segv-logger\""	\
--	-g							\
-+	-DIM_DIRECTORY="\"${IMDIR}\"" \
- 	$(NULL)
- 
- libiiimsf_la_SOURCES =		\
-@@ -22,6 +21,7 @@
- libiiimsf_la_LIBADD =		\
- 	$(TLS_LIBS)		\
- 	$(XML_LIBS)		\
-+	-liiimp			\
- 	$(NULL)
+--- iiimsf/src/Makefile.am.orig	Thu Apr 21 16:04:56 2005
++++ iiimsf/src/Makefile.am	Mon May  9 18:33:14 2005
+@@ -97,7 +97,7 @@
  
- sbindir = $(IMBINDIR)
-@@ -56,7 +56,6 @@
- 
- htt_server_LDADD =			\
+ iiimd_LDADD =			\
  	$(LIB_DIR)/iml/libiml.la	\
 -	$(IM_LIBDIR)/iiimp/libiiimp.la	\
++	-liiimp	\
  	$(SOCKET_LIBS)			\
  	$(LIBCRYPT_FLAGS)		\
  	$(LIBPAM_FLAGS)			\
-@@ -72,7 +71,6 @@
+@@ -112,7 +112,6 @@
  	$(NULL)
  iiimf_le_tools_LDADD =		\
  	$(XML_LIBS)		\
 -	-ldl			\
- 	libiiimsf.la		\
+ 	libiiimutils.la		\
  	$(NULL)
  
-@@ -82,7 +80,7 @@
+@@ -122,6 +121,7 @@
  iiimf_segv_logger_CFLAGS =				\
  	-DLOGDIR="\"$(localstatedir)/log/iiim\""	\
  	-DDATADIR="\"$(gdbcmddir)\""			\
--	-g						\
-+	-DIMBINDIR="\"$(IMBINDIR)\""			\
++	-DPREFIX="\"$(prefix)\""			\
+ 	-g						\
  	$(NULL)
  gdbcmddir = $(datadir)/iiim
- gdbcmd_DATA =		\
+@@ -129,9 +129,9 @@
+ 	gdbcmd		\
+ 	$(NULL)
+ 
+-logdir = $(localstatedir)/log/iiim
++logdir = /var/log/iiim
+ log_DATA = $(NULL)
+-socketdir = $(localstatedir)/run/iiim
++socketdir = /var/run/iiim
+ socket_DATA = $(NULL)
+ 
+ iiimlibdir = $(libdir)/iiim
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c b/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
index c309e37a03f1..5fbc2ca89dff 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
@@ -1,8 +1,6 @@
-Index: iiimsf/src/iwrap.c
-diff -u -p iiimsf/src/iwrap.c.orig iiimsf/src/iwrap.c
---- iiimsf/src/iwrap.c.orig	Thu Sep  9 06:17:09 2004
-+++ iiimsf/src/iwrap.c	Tue Feb 22 15:22:41 2005
-@@ -72,6 +72,15 @@ int permit_access(
+--- iiimsf/src/iwrap.c.orig	Wed Apr 13 01:51:55 2005
++++ iiimsf/src/iwrap.c	Mon May  9 18:02:18 2005
+@@ -72,6 +72,15 @@
  {
  #ifdef HAVE_LIBWRAP
      struct request_info req;
@@ -12,13 +10,13 @@ diff -u -p iiimsf/src/iwrap.c.orig iiimsf/src/iwrap.c
 +
 +    size = sizeof(ss);
 +    if (getpeername(h, pname, &size) < 0)
-+	return 0;
++       return 0;
 +    if (pname->sa_family == AF_UNIX)
-+    	return 1;
++       return 1;
  
      request_init(&req, RQ_DAEMON, cmdname, RQ_FILE, h, 0);
      fromhost(&req);
-@@ -177,6 +186,14 @@ authenticate_with_unix(
+@@ -177,6 +186,14 @@
  #ifdef HAVE_GETPEEREID
      /* OpenBSD */
      git_t gid;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.cpp
new file mode 100644
index 000000000000..ad0fb280089c
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.cpp
@@ -0,0 +1,66 @@
+--- iiimsf/src/lexmlconf.cpp.orig	Fri Apr 22 16:53:03 2005
++++ iiimsf/src/lexmlconf.cpp	Mon May 16 19:00:55 2005
+@@ -114,6 +114,7 @@
+ 	list = (IIIMLEInfoList *)malloc(sizeof (IIIMLEInfoList) * 1);
+ 	list->data = leinfo;
+ 	list->next = NULL;
++	list->prev = NULL;
+ 
+ 	return list;
+ }
+@@ -128,6 +129,7 @@
+ 	if (list != NULL) {
+ 		for (ll = list; ll->next != NULL; ll = ll->next);
+ 		ll->next = l;
++		l->prev = ll;
+ 		ll = list;
+ 	} else {
+ 		ll = l;
+@@ -144,7 +146,12 @@
+ 
+ 	l = iiim_le_info_list_new(leinfo);
+ 	if (list != NULL) {
++                if (list->prev != NULL) {
++                        list->prev->next = l;
++                }
+ 		l->next = list;
++		l->prev = list->prev;
++		list->prev = l;
+ 	}
+ 
+ 	return l;
+@@ -154,22 +161,19 @@
+ iiim_le_info_list_remove(IIIMLEInfoList *list,
+ 			 IIIMLEInfo     *leinfo)
+ {
+-	IIIMLEInfoList *tmp, *prev = NULL;
++	IIIMLEInfoList *prev, *next;
+ 
+-	tmp = list;
+-	while (tmp) {
+-		if (tmp->data == leinfo) {
+-			if (prev)
+-				prev->next = tmp->next;
+-			else
+-				list = tmp->next;
+-			iiim_le_info_free(tmp->data);
+-			free(tmp);
+-
+-			break;
+-		}
+-		prev = tmp;
+-		tmp = prev->next;
++	for (; list && list->data != leinfo; list = list->next);
++
++	if (NULL != list) {
++	  prev = list->prev;
++	  next = list->next;
++
++	  if (NULL != prev) prev->next = next;
++	  if (NULL != next) next->prev = prev;
++
++	  if (list->data) iiim_le_info_free(list->data);
++	  free(list);
+ 	}
+ 
+ 	return list;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h
new file mode 100644
index 000000000000..dde5d312ff95
--- /dev/null
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h
@@ -0,0 +1,10 @@
+--- iiimsf/src/lexmlconf.h.orig	Fri Apr 22 16:53:03 2005
++++ iiimsf/src/lexmlconf.h	Mon May 16 19:00:59 2005
+@@ -63,6 +63,7 @@
+ struct _IIIMLEInfoList {
+ 	IIIMLEInfo     *data;
+ 	IIIMLEInfoList *next;
++	IIIMLEInfoList *prev;
+ };
+ struct _IIIMLEInfo {
+ 	char       *language;
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c b/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
index 0f6f42dcc947..a761c47e40cf 100644
--- a/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
+++ b/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
@@ -1,24 +1,16 @@
---- iiimsf/src/segvlogger.c.orig	Sat Oct 16 10:28:13 2004
-+++ iiimsf/src/segvlogger.c	Sun Feb 20 19:43:06 2005
-@@ -19,6 +19,10 @@
- #include <time.h>
- #include <dirent.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/syslimits.h>
-+#endif
-+
- int
- main(int argc, char **argv)
- {
-@@ -43,8 +47,8 @@
+--- iiimsf/src/segvlogger.c.orig	Mon May  9 17:50:07 2005
++++ iiimsf/src/segvlogger.c	Mon May  9 17:52:09 2005
+@@ -63,8 +63,13 @@
+ 	}
  	exit(1);
      }
- 
--    snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
--	     DATADIR, ppid);
-+    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/htt_server %d",
-+	     DATADIR, IMBINDIR, ppid);
++#ifndef __FreeBSD__
+     snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
+ 	     DATADIR, ppid);
++#else
++    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/bin/iiimd %d",
++	     DATADIR, PREFIX, ppid);
++#endif
  
      if ((fpr = popen(buffer, "r")) != NULL) {
  	char logfile[PATH_MAX];
diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
deleted file mode 100644
index 9124497e6753..000000000000
--- a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- iiimsf/src/watchdog.c	Thu Oct 14 23:07:37 2004
-+++ iiimsf/src/watchdog.c	Wed Feb 16 19:03:59 2005
-@@ -220,7 +220,7 @@
-     int		argc;
-     char	**argv;
- {
--    const char *httpath="/usr/lib/im/htt_server" ; /* SUNWiiimf Only */
-+    const char *httpath=IM_DIRECTORY "/htt_server" ; /* SUNWiiimf Only */
-     pid_t pgrp;
-     void (*disp)(int);
-     char **new_argv, **pp;
-@@ -361,6 +361,8 @@
-     if ((pid_t)(-1) == pgrp)
-       fprintf (stderr,"cannot set session id");
- 
-+#elif defined(__FreeBSD__)
-+    pgrp = setsid();
- #else /* !SunOS */
-     pgrp = setpgrp(); 
- #endif /* !SunOS */
diff --git a/textproc/iiimf-server/pkg-plist b/textproc/iiimf-server/pkg-plist
index 67408775f54c..a6a3bb8e50a8 100644
--- a/textproc/iiimf-server/pkg-plist
+++ b/textproc/iiimf-server/pkg-plist
@@ -1,13 +1,19 @@
 bin/iiimf-le-tools
-etc/iiim/htt.xml.conf.sample
+bin/iiimd
+etc/iiim/iiimd.xml.conf.sample
 etc/iiim/le.xml.conf.sample
-lib/im/htt
-lib/im/htt_server
+lib/libiiimutils.a
+lib/libiiimutils.la
+lib/libiiimutils.so
+lib/libiiimutils.so.0
+lib/iiim/iiimd-watchdog
 libexec/iiimf-segv-logger
+include/iiim/lexmlconf.h
 share/iiim/gdbcmd
 @dirrm etc/iiim
 @dirrm share/iiim
-@unexec rmdir %D/lib/im > /dev/null 2>&1 || true
+@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
 @exec mkdir -p /var/log/iiim
 @unexec rm -f /var/log/iiim/*.log
 @unexec rmdir /var/log/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 2363398e7ba8..f6f89341b302 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -6,69 +6,56 @@
 #
 
 PORTNAME=	x-lib
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method X Client Framework
 
-LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
-		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
-RUN_DEPENDS=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
+		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
+RUN_DEPENDS=	${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_MOTIF=      yes
 USE_OPENSSL=    yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../../acfiles/im_common.m4
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
+		${WRKSRC}/lib/CSConv/csconv.h
 
 pre-configure:
-	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	 ${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-x-lib/distinfo b/textproc/iiimf-x-lib/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-x-lib/distinfo
+++ b/textproc/iiimf-x-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile
index bcc2cb24a1c8..24542b8ac6b9 100644
--- a/textproc/iiimf-x-lib/files/patch-Makefile
+++ b/textproc/iiimf-x-lib/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = iiimxcf/xiiimp.so
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am
new file mode 100644
index 000000000000..661caf2c83f4
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am
@@ -0,0 +1,7 @@
+--- iiimxcf/xiiimp.so/Makefile.am.orig	Fri May 13 15:42:30 2005
++++ iiimxcf/xiiimp.so/Makefile.am	Fri May 13 15:42:47 2005
+@@ -1,3 +1,3 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ SUBDIRS = iiimp
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
deleted file mode 100644
index 33d427a3c4d0..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- iiimxcf/xiiimp.so/configure.ac	Wed May  7 12:31:34 2003
-+++ iiimxcf/xiiimp.so/configure.ac	Wed Feb 16 21:06:50 2005
-@@ -71,15 +71,15 @@
- 
- COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
- 
- CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
- dnl --------------------------------------------------------------------------------
- dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
index e9f06efa8ade..2b33855ddde3 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
@@ -1,21 +1,13 @@
---- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig	Tue Mar 23 07:37:51 2004
-+++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Thu Mar  3 00:37:54 2005
-@@ -1,15 +1,14 @@
- moduledir = $(IMDIR)
- xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \
-                    $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
--                   -I$(CSCONV_DIR)
-+                   -I$(CSCONV_DIR) -DUSE_CSCONV -DIMDIR="\"${IMDIR}\""
- xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \
--                    -module -export-dynamic -no-undefined
-+                    -module -export-dynamic -no-undefined \
-+		    -liiimcf -liiimp
- # On GNU/Linux system, libtool does not take care of -no-undefined so that
+--- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig	Mon May  9 19:38:54 2005
++++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Mon May  9 19:40:25 2005
+@@ -8,8 +8,8 @@
  # you have to add the following by yourself to check undefined symbols.
  #                   -Wl,-z -Wl,defs
  xiiimp_la_LIBADD = $(X_LIBS)  \
 -		   $(IM_LIBDIR)/iiimcf/libiiimcf.la \
 -		   $(IM_LIBDIR)/iiimp/libiiimp.la \
++		   -liiimcf \
++		   -liiimp \
                     $(DLOPEN_LIBS) $(THREAD_LIBS)
  xiiimp_la_SOURCES = \
- 	genutil.c \
+ 	KeyMap.c \
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
deleted file mode 100644
index 660c30c0fc1a..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimxcf/xiiimp.so/iiimp/csconv.h	Fri Mar 16 00:52:22 2001
-+++ iiimxcf/xiiimp.so/iiimp/csconv.h	Wed Feb 16 20:48:14 2005
-@@ -64,7 +64,7 @@
- #    define	CSC_BASE_DIR_SYSTEM	"/etc/lib/im/csconv/"
- #endif /* !CSC_BASE_DIR_SYSTEM */
- #if !defined(CSC_BASE_DIR_DEFAULT)
--#    define	CSC_BASE_DIR_DEFAULT	"/usr/lib/im/csconv/"
-+#    define	CSC_BASE_DIR_DEFAULT	(IMDIR "/csconv/")
- #endif /* !CSC_BASE_DIR_DEFAULT */
- 
- #define CSC_IS_PATH_ABS(path)	(('/' == *(path)) ||			\
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimcfFun.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimcfFun.c
new file mode 100644
index 000000000000..7085c7be594f
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimcfFun.c
@@ -0,0 +1,12 @@
+--- iiimxcf/xiiimp.so/iiimp/iiimcfFun.c.orig	Fri May 13 18:18:29 2005
++++ iiimxcf/xiiimp.so/iiimp/iiimcfFun.c	Fri May 13 18:18:47 2005
+@@ -61,7 +61,9 @@
+ #include <iiimcf.h>
+ #include <langinfo.h>
+ #include <limits.h>
++#ifndef __FreeBSD__
+ #include <values.h>
++#endif
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ 
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
deleted file mode 100644
index 3b08439ac146..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimxcf/xiiimp.so/iiimp/iiimpAux.c	Sat Sep 11 01:41:45 2004
-+++ iiimxcf/xiiimp.so/iiimp/iiimpAux.c	Wed Feb 16 20:40:57 2005
-@@ -80,7 +80,7 @@
- #include "trace_message.h"
- 
- 
--#define AUX_BASE_DIR		"/usr/lib/im/"
-+#define AUX_BASE_DIR		IMDIR
- 
- #if defined(__sparcv9)
- #define SPARCV9_DIR		"sparcv9/"
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
deleted file mode 100644
index bfeb601a75d0..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimxcf/xiiimp.so/iiimp/iiimpConv.c	Wed Apr 28 18:28:59 2004
-+++ iiimxcf/xiiimp.so/iiimp/iiimpConv.c	Wed Feb 16 20:41:07 2005
-@@ -68,7 +68,7 @@
- #ifdef USE_CSCONV
- #include <dlfcn.h>
- #include "csconv.h"
--#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH	(IMDIR "/csconv/csconv.so")
- #define CSC_OPEN_LOCALE	"csconv_open_locale"
- #define CSC_OPEN	"csconv_open"
- #define CSC_CONV	"csconv"
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
deleted file mode 100644
index dbbb091828df..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimxcf/xiiimp.so/iiimp/iiimpDL.c	Wed May  5 03:55:05 2004
-+++ iiimxcf/xiiimp.so/iiimp/iiimpDL.c	Wed Feb 16 20:41:14 2005
-@@ -108,7 +108,7 @@
- }
- 
- #ifndef XLOCALEDIR
--#define XLOCALEDIR "/usr/lib/im/modules"
-+#define XLOCALEDIR (IMDIR "/modules")
- #endif
- 
- static const char*
diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
deleted file mode 100644
index 2ba2ba2442de..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- iiimxcf/xiiimp.so/iiimp/iiimpIM.c	Wed Aug 25 15:09:50 2004
-+++ iiimxcf/xiiimp.so/iiimp/iiimpIM.c	Wed Feb 16 22:06:57 2005
-@@ -189,7 +189,7 @@
- };
- 
- #ifndef IMLOCALEDIR
--#define IMLOCALEDIR "/usr/lib/im/locale"
-+#define IMLOCALEDIR (IMDIR "/locale")
- #endif
- 
- #define	iscomment(ch)	((ch) == '\0' || (ch) == '#')
-@@ -625,7 +625,7 @@
- 	if (mod) {
- 	    mod += strlen(MODIFIER);
- 
--	    if (!strncmp(mod, "iiimp/", 6) || !strncmp(mod, "IIIMP/", 6)) {
-+	    if (!strncasecmp(mod, "iiimp/", 6)) {
- 		mod += 6;
- 
- 		if (index(mod, ':')) {
diff --git a/textproc/iiimf-x-lib/pkg-plist b/textproc/iiimf-x-lib/pkg-plist
index beae0f04291e..45fc6f1991b8 100644
--- a/textproc/iiimf-x-lib/pkg-plist
+++ b/textproc/iiimf-x-lib/pkg-plist
@@ -1,3 +1,5 @@
-lib/im/xiiimp.so
-lib/im/xiiimp.so.2
-@unexec rmdir %D/lib/im > /dev/null 2>&1 || true
+lib/iiim/xiiimp.a
+lib/iiim/xiiimp.la
+lib/iiim/xiiimp.so
+lib/iiim/xiiimp.so.2
+@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile
index 7a82a8f54d8f..163a818ae3b6 100644
--- a/textproc/iiimf-x/Makefile
+++ b/textproc/iiimf-x/Makefile
@@ -6,67 +6,54 @@
 #
 
 PORTNAME=	x
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method X Client Framework
 
-LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
-		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
-RUN_DEPENDS=	${LOCALBASE}/lib/im/xiiimp.so:${PORTSDIR}/textproc/iiimf-x-lib
+LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
+		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
+RUN_DEPENDS=	${LOCALBASE}/lib/iiim/xiiimp.so:${PORTSDIR}/textproc/iiimf-x-lib
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/htt_xbe
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
-.endif
-
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+CXXFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../../acfiles/im_common.m4
-
-pre-configure:
-	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
-	@cd ${WRKSRC} && ${REINPLACE_CMD} \
-	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
-	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
-	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
-	${LIBTOOLFILES}
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/src/watchdog.c
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-x/distinfo b/textproc/iiimf-x/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-x/distinfo
+++ b/textproc/iiimf-x/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-x/files/patch-Makefile b/textproc/iiimf-x/files/patch-Makefile
index bcc2cb24a1c8..84f3d2261920 100644
--- a/textproc/iiimf-x/files/patch-Makefile
+++ b/textproc/iiimf-x/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = iiimxcf/htt_xbe
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-x/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-x/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-x/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-x/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_Makefile.am b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_Makefile.am
new file mode 100644
index 000000000000..9c67f6753abc
--- /dev/null
+++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_Makefile.am
@@ -0,0 +1,7 @@
+--- iiimxcf/htt_xbe/Makefile.am.orig	Fri May 13 15:44:05 2005
++++ iiimxcf/htt_xbe/Makefile.am	Fri May 13 15:44:22 2005
+@@ -1,3 +1,3 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ SUBDIRS = lib src
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac
deleted file mode 100644
index 61e6d3e830bc..000000000000
--- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- iiimxcf/htt_xbe/configure.ac	Wed Mar 24 04:54:26 2004
-+++ iiimxcf/htt_xbe/configure.ac	Wed Feb 16 19:38:26 2005
-@@ -140,15 +140,15 @@
- COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} ${DLOPEN_CXX_CFLAGS} -DSUPPORT_R6IM"
- LIBS="${LIBS} ${DLOPEN_LIBS}"
- 
- CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
- dnl --------------------------------------------------------------------------------
- dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_Makefile.in b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_Makefile.in
deleted file mode 100644
index a3a3771ab9d4..000000000000
--- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- iiimxcf/htt_xbe/lib/IMdkit/Makefile.in.orig	Wed May  7 12:25:24 2003
-+++ iiimxcf/htt_xbe/lib/IMdkit/Makefile.in	Thu Mar  3 16:25:30 2005
-@@ -57,6 +57,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- 
-+IMDIR = @IMDIR@
- IM_TOPDIR = @IM_TOPDIR@
- IM_INCLUDEDIR = @IM_INCLUDEDIR@
- CSCONV_DIR = @CSCONV_DIR@
-@@ -74,8 +75,8 @@
- LINKER = @LINKER@
- RANLIB = @RANLIB@
- 
--CFLAGS = @CFLAGS@
--CXXFLAGS = @CXXFLAGS@
-+CFLAGS = -DIMDIR="\"${IMDIR}\"" @CFLAGS@
-+CXXFLAGS = -DIMDIR="\"${IMDIR}\"" @CXXFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- 
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp
deleted file mode 100644
index 3e6552ed63fc..000000000000
--- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp	Wed Mar 24 04:54:26 2004
-+++ iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp	Wed Feb 16 21:31:00 2005
-@@ -68,7 +68,7 @@
- #ifdef sun
- #define XIIIMP_PATH     "/usr/openwin/lib/locale/common/xiiimp.so.2"
- #else /* Linux */
--#define XIIIMP_PATH     "/usr/lib/im/xiiimp.so.2"
-+#define XIIIMP_PATH     (IMDIR "/xiiimp.so.2")
- #endif /* Linux */
- 
- #include <stdio.h>
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c
deleted file mode 100644
index 586641366c0b..000000000000
--- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nX.c	Fri Nov  1 09:15:38 2002
-+++ iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nX.c	Wed Feb 16 19:33:10 2005
-@@ -389,8 +389,8 @@
-     extern void _Xi18nMessageHandler(XIMS, CARD16,
- 				     unsigned char*, Bool*);
-     Bool delete = True;
--    unsigned char *packet;
--    int connect_id;
-+    unsigned char *packet = NULL;
-+    int connect_id = 0;
- 
-     if (((XClientMessageEvent *)ev)->message_type ==
- 	spec->xim_request) {
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am
deleted file mode 100644
index 9d24150b59be..000000000000
--- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- iiimxcf/htt_xbe/src/Makefile.am.orig	Thu Mar  3 00:29:58 2005
-+++ iiimxcf/htt_xbe/src/Makefile.am	Thu Mar  3 00:30:30 2005
-@@ -4,7 +4,7 @@
- htt_xbe_LDADD = -L../lib/IMdkit -lIMd_ximp -lIMd_r6im $(X_LIBS) -lXt $(THREAD_LIBS)
- htt_xbe_SOURCES = ResourceDB.cpp main.cpp
- 
--httx_CFLAGS = $(X_CFLAGS)
-+httx_CFLAGS = $(X_CFLAGS) -DIMDIR="\"${IMDIR}\""
- httx_LDADD = $(X_LIBS) -lXt
- httx_SOURCES = watchdog.c
- 
diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c
index 1136ab8d847e..31dc36352b89 100644
--- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c
+++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c
@@ -1,14 +1,15 @@
---- iiimxcf/htt_xbe/src/watchdog.c	Tue Jul 13 08:25:40 2004
-+++ iiimxcf/htt_xbe/src/watchdog.c	Wed Feb 16 19:12:34 2005
-@@ -81,7 +81,6 @@
+--- iiimxcf/htt_xbe/src/watchdog.c.orig	Thu Apr 28 15:09:27 2005
++++ iiimxcf/htt_xbe/src/watchdog.c	Mon May 16 23:39:28 2005
+@@ -79,7 +79,7 @@
+ #ifndef OPENWINHOME
+ #define OPENWINHOME "/usr/openwin"
  #endif
- #define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/dt/lib/libXm.so.3"
+-#define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/dt/lib/libXm.so.3"
++#define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/X11R6/lib/libXm.so.3"
  
--#define IMDIR "/usr/lib/im"
+ #define IMDIR IIIMLIBDIR
  
- static void     start_htt_server(int *, char *argv[]);
- static void     start_htt_props(int *, char *argv[]);
-@@ -744,7 +743,11 @@
+@@ -811,7 +811,11 @@
      perror("watchdog:fork\n");
      exit(errno);
    case 0:
@@ -20,3 +21,12 @@
      if (!my_rdb.respond_to_sm)
        sleep(10);
      execv(pathname, argv);
+@@ -828,7 +832,7 @@
+   extern int	errno;
+   int		pid;
+ 
+-  pathname = "/usr/bin/iiimd";
++  pathname = "%%PREFIX%%" "/bin/iiimd";
+ 
+   pid = (*iiimd_pid) = fork();
+   switch (*iiimd_pid) {
diff --git a/textproc/iiimf-x/pkg-plist b/textproc/iiimf-x/pkg-plist
index 2f8604c6a8e4..cb790e777d40 100644
--- a/textproc/iiimf-x/pkg-plist
+++ b/textproc/iiimf-x/pkg-plist
@@ -1,2 +1,2 @@
-lib/im/httx
-lib/im/htt_xbe
+bin/iiimx
+lib/iiim/iiim-xbe