56 files changed, 839 insertions, 135 deletions

diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 85e95e5aa7b1..7eced22160da 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -10,48 +10,59 @@ PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk
-DISTFILES=	${DISTNAME}-src-${IIIMF_VER}.tgz
+DISTNAME=	im-sdk-src-${IIIMF_VER}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kcwu@csie.org
 COMMENT=	IIIMF UNIcode Table based generic composition engine
 
+BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
 
-IIIMF_VER=	r12_0_1-svn1891
-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif
-BUILD_WRKSRC=	${WRKSRC}/unit
-INSTALL_WRKSRC=	${WRKSRC}/unit
+IIIMF_VER=	r12_1-svn2002
 USE_ICONV=	yes
+USE_REINPLACE=  yes
+USE_GMAKE=	yes
+USE_GNOME=	intltool
 USE_XLIB=	yes
-USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
-USE_LIBTOOL_VER=	15
-AUTOMAKE_ARGS=	--add-missing --copy --gnu
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+WANT_AUTOCONF_VER=253
+WANT_AUTOHEADER_VER=253
+WANT_AUTOMAKE_VER=15
+WANT_LIBTOOL_VER=15
+
+WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		does not build on FreBSD 4.x because of missing fputwc() function in libc
+.if ${OSVERSION} < 503000
+IGNORE=         "It is supported on FreeBSD 5.3 and later"
 .endif
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Segfault during build on amd64 and ia64"
+.if ${ARCH} != "i386"
+IGNORE=	"${ARCH} is not support."
 .endif
 
+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX" SED=gsed
+UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
+		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
+		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
+
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
 		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/configure.ac \
-		${WRKSRC}/unit/include/unit_input.h \
-		${WRKSRC}/unit/phonetic_im/phonetic_im.c
+		${WRKSRC}/../lib/CSConv/csconv.h
 
 pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
-	${TOUCH} ${WRKSRC}/config.h.in
-	cd ${WRKSRC} && ${LIBTOOLIZE} --copy --force --automake
+	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
+	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
+	(cd ${WRKSRC} && ${TOUCH} ltconfig)
+
+do-configure:
+	(cd ${WRKSRC}/../lib/EIMIL && ./autogen.sh)
+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
+
+pre-build:
+	(cd ${WRKSRC}/../lib/EIMIL && ${GMAKE} ${MAKE_ARGS})
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-le-unit/distinfo b/textproc/iiimf-le-unit/distinfo
index 29d049a782bc..440e49d16220 100644
--- a/textproc/iiimf-le-unit/distinfo
+++ b/textproc/iiimf-le-unit/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe
-SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118
+MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
+SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
diff --git a/textproc/iiimf-le-unit/files/patch-Makefile b/textproc/iiimf-le-unit/files/patch-Makefile
new file mode 100644
index 000000000000..85df0e345035
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-Makefile
@@ -0,0 +1,19 @@
+--- 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
+ 
+ CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+              $(AUTOHEADER) && \
+@@ -21,7 +22,7 @@
+ 
+ update-acfiles:
+ 	cd acfiles && \
+-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
++        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
+         rm -f Makefile.in aclocal.m4
+ 
+ config:
diff --git a/textproc/iiimf-le-unit/files/patch-leif_autogen.sh b/textproc/iiimf-le-unit/files/patch-leif_autogen.sh
new file mode 100644
index 000000000000..d38d31e628c7
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_autogen.sh
@@ -0,0 +1,93 @@
+--- leif/autogen.sh	Thu Dec 11 15:29:55 2003
++++ leif/autogen.sh	Wed Feb 16 16:53:53 2005
+@@ -6,6 +6,14 @@
+ 
+ DIE=0
+ 
++LIBTOOL=libtool15
++INTLTOOLIZE=intltoolize
++LIBTOOLIZE=libtoolize15
++ACLOCAL=aclocal15
++AUTOHEADER=autoheader253
++AUTOMAKE=automake15
++AUTOCONF=autoconf253
++
+ ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
+ 
+ if [ -n "$GNOME2_DIR" ]; then
+@@ -22,7 +30,7 @@
+     exit 1
+ }
+ 
+-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
++(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
+   echo
+   echo "**Error**: You must have \`autoconf' installed."
+   echo "Download the appropriate package for your distribution,"
+@@ -31,7 +39,7 @@
+ }
+ 
+ (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
+-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
++  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
+     echo 
+     echo "**Error**: You must have \`intltool' installed."
+     echo "You can get it from:"
+@@ -41,7 +49,7 @@
+ }
+ 
+ (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
++  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
+     echo
+     echo "**Error**: You must have \`libtool' installed."
+     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+@@ -59,7 +67,7 @@
+   }
+ }
+ 
+-(automake --version) < /dev/null > /dev/null 2>&1 || {
++(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
+   echo
+   echo "**Error**: You must have \`automake' installed."
+   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
+@@ -69,7 +77,7 @@
+ 
+ 
+ # if no automake, don't bother testing for aclocal
+-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
++test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
+   echo
+   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
+   echo "installed doesn't appear recent enough."
+@@ -114,24 +122,24 @@
+       fi
+       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
+         echo "Running intltoolize..."
+-	intltoolize --copy --force --automake
++	${INTLTOOLIZE} --copy --force --automake
+       fi
+       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
+ 	if test -z "$NO_LIBTOOLIZE" ; then 
+ 	  echo "Running libtoolize..."
+-	  libtoolize --force --copy
++	  ${LIBTOOLIZE} --force --copy
+ 	fi
+       fi
+       echo "Running aclocal $aclocalinclude ..."
+-      aclocal $aclocalinclude
++      ${ACLOCAL} $aclocalinclude
+       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
+ 	echo "Running autoheader..."
+-	autoheader
++	${AUTOHEADER}
+       fi
+       echo "Running automake --gnu $am_opt ..."
+-      automake --add-missing --copy --gnu $am_opt
++      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
+       echo "Running autoconf ..."
+-      autoconf
++      ${AUTOCONF}
+     )
+   fi
+ done
diff --git a/textproc/iiimf-le-unit/files/patch-leif_configure.ac b/textproc/iiimf-le-unit/files/patch-leif_configure.ac
index a28012caf7aa..8e401d47deef 100644
--- a/textproc/iiimf-le-unit/files/patch-leif_configure.ac
+++ b/textproc/iiimf-le-unit/files/patch-leif_configure.ac
@@ -1,10 +1,32 @@
---- configure.ac.orig	Wed Sep  8 00:00:58 2004
-+++ configure.ac	Wed Sep  8 00:02:34 2004
-@@ -10,6 +10,7 @@
- dnl common initialization
- dnl AC_CONFIG_AUX_DIR(../acfiles)
- IM_INIT(..)
-+m4_pattern_allow([AM_ET])
- 
- AM_INIT_AUTOMAKE(im-sdk, 11.0)
- AM_CONFIG_HEADER(config.h)
+--- leif/configure.ac	Wed Oct  6 23:00:36 2004
++++ leif/configure.ac	Thu Feb 17 23:32:54 2005
+@@ -61,25 +61,18 @@
+ IM_CONSTRUCT_FLAGS
+ IM_CONSTRUCT_THREAD_FLAGS
+ 
+ CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
+         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
+-        ${THREAD_COMMON_CXX_CFLAGS}"
++        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
+ 
+ CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
+           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
+-          ${THREAD_COMMON_CXX_CFLAGS}"
++          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
+ 
+-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
+ 
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
++LE_TARGETS="default template sampleja sampleja2 sampleja3 testEIMIL unit"
+ 
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-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
new file mode 100644
index 000000000000..e0e203a88c8c
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c
@@ -0,0 +1,11 @@
+--- 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 = "/usr/local/lib/im/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
new file mode 100644
index 000000000000..24d32c1913c5
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h
@@ -0,0 +1,11 @@
+--- 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	"/usr/local/lib/im/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
new file mode 100644
index 000000000000..e86cbdf37dec
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c
@@ -0,0 +1,44 @@
+--- 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
new file mode 100644
index 000000000000..227cf0807c96
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h
@@ -0,0 +1,11 @@
+--- 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:/usr/local/lib/im/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
new file mode 100644
index 000000000000..7a243140c742
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c
@@ -0,0 +1,11 @@
+--- 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	"/usr/local/lib/im/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
new file mode 100644
index 000000000000..41f47001a213
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c
@@ -0,0 +1,11 @@
+--- 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	"/usr/local/lib/im/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
new file mode 100644
index 000000000000..9225f0ad9d07
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..9680d0b5ec0f
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h
@@ -0,0 +1,10 @@
+--- 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:/usr/local/lib/im/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
new file mode 100644
index 000000000000..1c952cd93ff0
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c
@@ -0,0 +1,8 @@
+--- 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 = "/usr/local/lib/im/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
new file mode 100644
index 000000000000..5e3752c68d00
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c
@@ -0,0 +1,11 @@
+--- 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 = "/usr/local/lib/im/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
new file mode 100644
index 000000000000..0fa480eff443
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c
@@ -0,0 +1,11 @@
+--- 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			"/usr/local/lib/im/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
new file mode 100644
index 000000000000..d0f499a61e8c
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c
@@ -0,0 +1,20 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..3c9e9fa63826
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..22805cfea104
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..1b4518abf5b7
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..6a8702a37fb2
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..0ea0099c530f
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h
@@ -0,0 +1,11 @@
+--- 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		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..449c4352b8a7
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c
@@ -0,0 +1,20 @@
+--- 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, "/usr/local/lib/im/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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..2084f4a76ba2
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c
@@ -0,0 +1,11 @@
+--- 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 		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..06aba51136f1
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..319e418ef8af
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h
@@ -0,0 +1,14 @@
+--- 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		"/usr/local/lib/im/locale/ko_KR/common/data"
+ #else
+-#define SYSPATH		"/usr/lib/im/locale/ko_KR/common/data"
++#define SYSPATH		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..0a799e5ec9bb
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h
@@ -0,0 +1,11 @@
+--- 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		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..c828a80203ca
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h
@@ -0,0 +1,11 @@
+--- 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 "/usr/local/lib/im/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
new file mode 100644
index 000000000000..7a7d2137ec28
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c
@@ -0,0 +1,20 @@
+--- 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, "/usr/local/lib/im/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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..8b369307cc42
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c
@@ -0,0 +1,11 @@
+--- 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 ("/usr/local/lib/im/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
new file mode 100644
index 000000000000..9d15475f37a5
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c
@@ -0,0 +1,11 @@
+--- 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 		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..6a02587f5c8c
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..1b236c5e0b4f
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..d1f1d636f027
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c
@@ -0,0 +1,11 @@
+--- 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 = "/usr/local/lib/im/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
new file mode 100644
index 000000000000..300812b876f7
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c
@@ -0,0 +1,11 @@
+--- 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 		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..a2b1a7ff5b7f
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..946a1e129f9a
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c
@@ -0,0 +1,11 @@
+--- 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     "/usr/local/lib/im/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
new file mode 100644
index 000000000000..bd0b13cff264
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c
@@ -0,0 +1,11 @@
+--- 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 		"/usr/local/lib/im/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
new file mode 100644
index 000000000000..731a57ee5e88
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h
@@ -0,0 +1,11 @@
+--- 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     "/usr/local/lib/im/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
new file mode 100644
index 000000000000..11aafb385f52
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c
@@ -0,0 +1,11 @@
+--- 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 		"/usr/local/lib/im/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_config.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c
new file mode 100644
index 000000000000..fd656f3815d5
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c
@@ -0,0 +1,11 @@
+--- leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_config.c	Fri Mar 26 18:13:39 2004
++++ leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_config.c	Wed Feb 16 20:46:10 2005
+@@ -63,7 +63,7 @@
+ The format of Dayi configure file as follow:
+ 
+ [ base_dir ]
+-path=/usr/lib/im/locale/zh_TW
++path=/usr/lcoal/lib/im/locale/zh_TW
+ 
+ [ data_file ]
+ file=data/dayi.data
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
new file mode 100644
index 000000000000..91ed4aa466a3
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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
new file mode 100644
index 000000000000..b0cb267418d6
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h
@@ -0,0 +1,11 @@
+--- 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     "/usr/local/lib/im/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_config.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c
new file mode 100644
index 000000000000..92c124ff99bf
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c
@@ -0,0 +1,11 @@
+--- leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_config.c	Fri Mar 26 18:13:39 2004
++++ leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_config.c	Wed Feb 16 20:46:28 2005
+@@ -64,7 +64,7 @@
+ The format of Zhuyin configure file as follow:
+ 
+ [base_dir]
+-path=/usr/lib/im/locale/zh_TW
++path=/usr/local/lib/im/locale/zh_TW
+ 
+ [data_file]
+ file=data/zhuyin.data
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
new file mode 100644
index 000000000000..ebf1bdaeec5e
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c
@@ -0,0 +1,11 @@
+--- 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, "/usr/local/lib/im/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_Xctim_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am
deleted file mode 100644
index 626249c666dc..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- unit/Xctim/Makefile.am.orig	Wed Sep  8 02:37:17 2004
-+++ unit/Xctim/Makefile.am	Wed Sep  8 02:37:32 2004
-@@ -1,6 +1,6 @@
- moduledir = $(IM_LOCALEDIR)/UNIT/common
- xctim_la_SOURCES = ctim.c codetable.c ctfilter.c keymap.c
--xctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
-+xctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
- xctim_la_LDFLAGS = -module -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- xctim_la_LIBADD = ../xaux_common/libxaux_common.la
- module_LTLIBRARIES = xctim.la
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am
deleted file mode 100644
index d591ef60f0d5..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- unit/codepoint_im/Makefile.am.orig	Wed Sep  8 02:38:05 2004
-+++ unit/codepoint_im/Makefile.am	Wed Sep  8 02:38:34 2004
-@@ -1,6 +1,6 @@
- moduledir = $(IM_LOCALEDIR)/UNIT/common
- codepoint_im_la_SOURCES = codepoint_im.c codepoint_table.c codepoint_filter.c
--codepoint_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
-+codepoint_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
- codepoint_im_la_LDFLAGS = -module --no-undefined -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- codepoint_im_la_LIBADD = ../xaux_common/libxaux_common.la
- module_LTLIBRARIES = codepoint_im.la
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am
deleted file mode 100644
index 66da5e85e4df..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- unit/ctim/Makefile.am.orig	Wed Sep  8 02:25:12 2004
-+++ unit/ctim/Makefile.am	Wed Sep  8 02:25:23 2004
-@@ -1,6 +1,6 @@
- moduledir = $(IM_LOCALEDIR)/UNIT/common
- ctim_la_SOURCES = ctim.c codetable.c ctfilter.c keymap.c
--ctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
-+ctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
- ctim_la_LDFLAGS = -module -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- ctim_la_LIBADD = ../xaux_common/libxaux_common.la
- module_LTLIBRARIES = ctim.la
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
new file mode 100644
index 000000000000..a6f957e6a1e2
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h
@@ -0,0 +1,11 @@
+--- 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		"/usr/local/lib/im/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_leif_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am
deleted file mode 100644
index 7a273b576c9a..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- unit/leif/Makefile.am.orig	Wed Sep  8 02:23:43 2004
-+++ unit/leif/Makefile.am	Wed Sep  8 02:24:01 2004
-@@ -1,6 +1,6 @@
- LE_FILES = unitle.so
- unitle_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
--                    -I$(IM_INCLUDEDIR)/iml -I../include
-+                    -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
- unitle_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- unitle_la_LIBADD = $(THREAD_LIBS) ../xaux_common/libxaux_common.la
- unitle_la_SOURCES = define.c unit_input.c le.c \
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am
deleted file mode 100644
index f3c17e9bcad0..000000000000
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- unit/phonetic_im/Makefile.am.orig	Wed Sep  8 02:40:35 2004
-+++ unit/phonetic_im/Makefile.am	Wed Sep  8 02:40:42 2004
-@@ -1,7 +1,7 @@
- SUBDIRS = mapfile
- moduledir = $(IM_LOCALEDIR)/UNIT/common
- phonetic_im_la_SOURCES = phonetic_im.c phonetic_table.c phonetic_filter.c phonetic_im.h
--phonetic_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
-+phonetic_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
- phonetic_im_la_LDFLAGS = -module -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- phonetic_im_la_LIBADD = \
- 	../xaux_common/libxaux_common.la \
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am
index 1bd823913b32..48e1554bfb15 100644
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am
+++ b/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am
@@ -1,17 +1,31 @@
---- unit/phonetic_im/mapfile/Makefile.am.orig	Wed Sep  8 03:11:55 2004
-+++ unit/phonetic_im/mapfile/Makefile.am	Wed Sep  8 03:47:23 2004
-@@ -57,10 +57,10 @@
- 	-e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
+--- leif/unit/phonetic_im/mapfile/Makefile.am	Sat Apr  3 11:50:21 2004
++++ leif/unit/phonetic_im/mapfile/Makefile.am	Wed Feb 16 17:04:08 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" \
+@@ -58,9 +59,9 @@
  	-e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
  	-e "/^#line/d" \
--	-e "/^static char \*global_ptr\;/i\
+ 	-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
-+	$*.tc | (echo '\
-+#define YY_NO_INPUT'; echo '\
-+#define YY_NO_UNPUT'; echo '\
-+#define input() (*global_ptr++)'; cat ) > $*.c
++	#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
  	rm -f  $*.tc
  
  noinst_LTLIBRARIES = libphonetic_temp.la
diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am
index 997fa57a642d..07ce24b9d565 100644
--- a/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am
+++ b/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am
@@ -1,9 +1,8 @@
---- unit/xaux_common/Makefile.am.orig	Thu Jun 12 19:41:27 2003
-+++ unit/xaux_common/Makefile.am	Wed Sep  8 02:22:47 2004
+--- leif/unit/xaux_common/Makefile.am	Thu Jun 12 20:41:27 2003
++++ leif/unit/xaux_common/Makefile.am	Wed Feb 16 17:01:09 2005
 @@ -1,4 +1,5 @@
--libxaux_common_la_CFLAGS = -I../include
-+libxaux_common_la_CFLAGS = -I../include -I${LOCALBASE}/include $(X_CFLAGS)
-+libxaux_common_la_LIBADD = -L${LOCALBASE}/lib -liconv
+ libxaux_common_la_CFLAGS = -I../include
++libxaux_common_la_LDFLAGS = -lintl
  libxaux_common_la_SOURCES = logf.c encode.c
  noinst_LTLIBRARIES = libxaux_common.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
new file mode 100644
index 000000000000..d98acce9a275
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c
@@ -0,0 +1,10 @@
+--- 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_autogen.sh b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh
new file mode 100644
index 000000000000..cee0709c90ed
--- /dev/null
+++ b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh
@@ -0,0 +1,72 @@
+--- lib/EIMIL/autogen.sh	Wed May  5 02:15:22 2004
++++ lib/EIMIL/autogen.sh	Wed Feb 16 14:57:02 2005
+@@ -12,7 +12,14 @@
+ 
+ DIE=0
+ 
+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
++LIBTOOL=libtool15
++INTLTOOLIZE=intltoolize15
++ACLOCAL=aclocal15
++AUTOHEADER=autoheader253
++AUTOMAKE=automake15
++AUTOCONF=autoconf253
++
++(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
+ 	echo
+ 	echo "You must have libtool installed to compile $PROJECT."
+ 	echo "Install the appropriate package for your distribution,"
+@@ -30,7 +37,7 @@
+ }
+ 
+ (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
+-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
++  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
+     echo
+     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
+     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
+@@ -39,7 +46,7 @@
+   }
+ }
+ 
+-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
++(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
+ 	echo
+ 	echo "You must have autoconf installed to compile $PROJECT."
+ 	echo "libtool the appropriate package for your distribution,"
+@@ -48,8 +55,8 @@
+ }
+ 
+ have_automake=false
+-if automake --version < /dev/null > /dev/null 2>&1 ; then
+-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
++if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
++	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+ 	case $automake_version in
+ 	   1.2*|1.3*|1.4) 
+ 		;;
+@@ -96,19 +103,19 @@
+ fi
+ if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
+   echo "Running intltoolize..."
+-  intltoolize --copy --force --automake
++  ${INTLTOOLIZE} --copy --force --automake
+ fi
+ 
+ # intentionally we don't call "libtoolize --force"
+ # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
+ 
+-aclocal -I ../../acfiles $ACLOCAL_FLAGS
++${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
+ 
+ # optionally feature autoheader
+-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
++(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
+ 
+-automake -a $am_opt
+-autoconf
++${AUTOMAKE} -a $am_opt
++${AUTOCONF}
+ cd $ORIGDIR
+ 
+ if test -z "$AUTOGEN_SUBDIR_MODE"; then
diff --git a/textproc/iiimf-le-unit/pkg-plist b/textproc/iiimf-le-unit/pkg-plist
index 286bea619699..17586abf3c6f 100644
--- a/textproc/iiimf-le-unit/pkg-plist
+++ b/textproc/iiimf-le-unit/pkg-plist
@@ -1,17 +1,22 @@
+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
@@ -41,41 +46,41 @@ 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/common
-@dirrm lib/im/locale/UNIT/VIETNAMESE/data
-@dirrm lib/im/locale/UNIT/VIETNAMESE
-@dirrm lib/im/locale/UNIT/UNICODE-OCTAL
-@dirrm lib/im/locale/UNIT/UNICODE-HEX
-@dirrm lib/im/locale/UNIT/TI_ER/data
-@dirrm lib/im/locale/UNIT/TI_ER
-@dirrm lib/im/locale/UNIT/TELUGU/data
-@dirrm lib/im/locale/UNIT/TELUGU
-@dirrm lib/im/locale/UNIT/TAMIL/data
-@dirrm lib/im/locale/UNIT/TAMIL
-@dirrm lib/im/locale/UNIT/MALAYALAM/data
-@dirrm lib/im/locale/UNIT/MALAYALAM
-@dirrm lib/im/locale/UNIT/KANNADA/data
-@dirrm lib/im/locale/UNIT/KANNADA
-@dirrm lib/im/locale/UNIT/HINDI/data
-@dirrm lib/im/locale/UNIT/HINDI
-@dirrm lib/im/locale/UNIT/HEBREW/data
-@dirrm lib/im/locale/UNIT/HEBREW
-@dirrm lib/im/locale/UNIT/GURMUKHI/data
-@dirrm lib/im/locale/UNIT/GURMUKHI
-@dirrm lib/im/locale/UNIT/GUJARATI/data
-@dirrm lib/im/locale/UNIT/GUJARATI
-@dirrm lib/im/locale/UNIT/GREEK/data
-@dirrm lib/im/locale/UNIT/GREEK
-@dirrm lib/im/locale/UNIT/EUROPEAN/data
-@dirrm lib/im/locale/UNIT/EUROPEAN
-@dirrm lib/im/locale/UNIT/CYRILLIC/data
-@dirrm lib/im/locale/UNIT/CYRILLIC
-@dirrm lib/im/locale/UNIT/BENGALI/data
-@dirrm lib/im/locale/UNIT/BENGALI
-@dirrm lib/im/locale/UNIT/ARABIC/data
-@dirrm lib/im/locale/UNIT/ARABIC
 @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/locale 2>/dev/null || true
-@unexec rmdir %D/lib/im/leif 2>/dev/null || true
+@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
+@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true