22 files changed, 293 insertions, 278 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