7 files changed, 189 insertions, 32 deletions

diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile
index 17b6e19d6b55..6e5a7f7c0885 100644
--- a/chinese/iiimf-le-ude/Makefile
+++ b/chinese/iiimf-le-ude/Makefile
@@ -10,35 +10,47 @@ PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
 CATEGORIES=	chinese 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 User Defined language Engine for Simplified Chinese conversion
 
 RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
 
-IIIMF_VER=	r12_0_1-svn1891
-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif
+IIIMF_VER=	r12_1-svn2002
+USE_REINPLACE=	yes
+USE_GMAKE=      yes
+USE_GNOME=      intltool
+WANT_AUTOCONF_VER=253
+WANT_AUTOHEADER_VER=253
+WANT_AUTOMAKE_VER=15
+WANT_LIBTOOL_VER=15
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/leif
 BUILD_WRKSRC=	${WRKSRC}/ude
 INSTALL_WRKSRC=	${WRKSRC}/ude
-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}
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+
+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
+UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
+		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
+		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
+AUTOGEN_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+		--prefix=${PREFIX}
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/configure.ac \
-		${WRKSRC}/ude/UDEngine.c
+		${WRKSRC}/../acfiles/im_common.m4
 
 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}/ && ./autogen.sh ${AUTOGEN_ARGS})
 
 .include <bsd.port.mk>
diff --git a/chinese/iiimf-le-ude/distinfo b/chinese/iiimf-le-ude/distinfo
index 29d049a782bc..440e49d16220 100644
--- a/chinese/iiimf-le-ude/distinfo
+++ b/chinese/iiimf-le-ude/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/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile
new file mode 100644
index 000000000000..85df0e345035
--- /dev/null
+++ b/chinese/iiimf-le-ude/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/chinese/iiimf-le-ude/files/patch-leif_autogen.sh b/chinese/iiimf-le-ude/files/patch-leif_autogen.sh
new file mode 100644
index 000000000000..d38d31e628c7
--- /dev/null
+++ b/chinese/iiimf-le-ude/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/chinese/iiimf-le-ude/files/patch-leif_configure.ac b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
index a28012caf7aa..8391f93be414 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-ude/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,19 @@
+ 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"
+ 
+ CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
+           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
+-          ${THREAD_COMMON_CXX_CFLAGS}"
++          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include"
+ 
+-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib"
+ 
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
++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_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_UDEngine.c b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
new file mode 100644
index 000000000000..bec75c081379
--- /dev/null
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
@@ -0,0 +1,11 @@
+--- 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 @@
+     l->name_length = UTFCHARLen(aux_name_panel);
+     l->domain = "com.sun.udengine";
+     l->scope = "udengine";      
+-    l->path = "/usr/lib/im/locale/zh_CN/udengine/udengine_obj.jar";  /* path */
++    l->path = "/usr/local/lib/im/locale/zh_CN/udengine/udengine_obj.jar";  /* 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 6b771800f5b2..7c4969855f28 100644
--- a/chinese/iiimf-le-ude/pkg-plist
+++ b/chinese/iiimf-le-ude/pkg-plist
@@ -2,6 +2,6 @@ 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 2>/dev/null || true
-@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/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