Attachment 51274 Details for Bug 77927 – file.diff

[patch] file.diff

file.diff (text/plain), 222.55 KB, created by Daichi GOTO on 2005-02-22 14:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daichi GOTO

Created: 2005-02-22 14:00:23 UTC

Size: 222.55 KB

patch

obsolete

>diff -r -u -N ports.orig/japanese/iiimf-le-canna/Makefile ports/japanese/iiimf-le-canna/Makefile
>--- ports.orig/japanese/iiimf-le-canna/Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/Makefile	Tue Feb 22 22:48:08 2005
>@@ -0,0 +1,69 @@
>+# New ports collection makefile for:	iiimf-le-canna
>+# Date created:		18 Feb 2005
>+# Whom:			Masanori OZAWA <ozawa@ongs.co.jp>
>+#
>+# $FreeBSD$
>+#
>+
>+PORTNAME=	le-canna
>+PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
>+CATEGORIES=	japanese
>+MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
>+PKGNAMEPREFIX=	iiimf-
>+DISTNAME=	im-sdk-src-${IIIMF_VER}
>+EXTRACT_SUFX=	.tar.bz2
>+
>+MAINTAINER=	daichi@freebsd.org
>+COMMENT=	Canna Module of IIIMF LEIF
>+
>+LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
>+		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib\
>+		canna16.1:${PORTSDIR}/japanese/Canna
>+
>+IIIMF_VER=	r12_1-svn2002
>+USE_ICONV=	yes
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool
>+USE_XLIB=	yes
>+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} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+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}/../lib/CSConv/csconv.h
>+
>+pre-configure:
>+	(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.post.mk>
>diff -r -u -N ports.orig/japanese/iiimf-le-canna/distinfo ports/japanese/iiimf-le-canna/distinfo
>--- ports.orig/japanese/iiimf-le-canna/distinfo	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/distinfo	Thu Feb 17 23:46:09 2005
>@@ -0,0 +1,2 @@
>+MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
>+SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
>diff -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-Makefile ports/japanese/iiimf-le-canna/files/patch-Makefile
>--- ports.orig/japanese/iiimf-le-canna/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-Makefile	Thu Feb 17 23:46:09 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-leif_autogen.sh ports/japanese/iiimf-le-canna/files/patch-leif_autogen.sh
>--- ports.orig/japanese/iiimf-le-canna/files/patch-leif_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-leif_autogen.sh	Thu Feb 17 23:46:09 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c ports/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
>--- ports.orig/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c	Thu Feb 17 23:58:27 2005
>@@ -0,0 +1,28 @@
>+--- leif/canna/CannaLE.c	Wed Oct 13 00:26:27 2004
>++++ leif/canna/CannaLE.c	Thu Feb 17 01:55:18 2005
>+@@ -86,7 +86,7 @@
>+ 
>+ #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"
>+@@ -104,11 +104,11 @@
>+ 				       char **, size_t *);
>+ typedef int		(* csc_close_t)(csconv_t);
>+ 
>+-static void *			csc_handle;	
>+-static csc_open_locale_t	csc_open_locale;
>+-static csc_open_t		csc_open;
>+-static csc_conv_t		csc_conv;
>+-static csc_close_t		csc_close;
>++static void *			csc_handle = NULL;	
>++static csc_open_locale_t	csc_open_locale = NULL;
>++static csc_open_t		csc_open = NULL;
>++static csc_conv_t		csc_conv = NULL;
>++static csc_close_t		csc_close = NULL;
>+ static csconv_t                 csconv_cd = NULL;
>+ 
>+ Bool    if_canna_OpenIF();
>diff -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am ports/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am
>--- ports.orig/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am	Thu Feb 17 23:59:17 2005
>@@ -0,0 +1,11 @@
>+--- leif/canna/xaux/Makefile.am	Mon Sep  6 17:41:11 2004
>++++ leif/canna/xaux/Makefile.am	Wed Feb 16 14:20:49 2005
>+@@ -10,7 +10,7 @@
>+ 	-g				\
>+ 	$(NULL)
>+ 
>+-AM_LDFLAGS =				\
>++LDFLAGS =				\
>+ 	$(THREAD_LDFLAGS)		\
>+ 	$(NULL)
>+ 
>diff -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-leif_configure.ac ports/japanese/iiimf-le-canna/files/patch-leif_configure.ac
>--- ports.orig/japanese/iiimf-le-canna/files/patch-leif_configure.ac	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-leif_configure.ac	Fri Feb 18 01:26:40 2005
>@@ -0,0 +1,32 @@
>+--- leif/configure.ac	Wed Oct  6 23:00:36 2004
>++++ leif/configure.ac	Fri Feb 18 01:19:12 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="canna"
>+ 
>+-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 -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-lib_EIMIL_EIMILJournal.c ports/japanese/iiimf-le-canna/files/patch-lib_EIMIL_EIMILJournal.c
>--- ports.orig/japanese/iiimf-le-canna/files/patch-lib_EIMIL_EIMILJournal.c	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-lib_EIMIL_EIMILJournal.c	Thu Feb 17 23:46:09 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-canna/files/patch-lib_EIMIL_autogen.sh ports/japanese/iiimf-le-canna/files/patch-lib_EIMIL_autogen.sh
>--- ports.orig/japanese/iiimf-le-canna/files/patch-lib_EIMIL_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/files/patch-lib_EIMIL_autogen.sh	Thu Feb 17 23:46:09 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-canna/pkg-descr ports/japanese/iiimf-le-canna/pkg-descr
>--- ports.orig/japanese/iiimf-le-canna/pkg-descr	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/pkg-descr	Mon Feb 21 21:54:41 2005
>@@ -0,0 +1,18 @@
>+IIIMF stands for Internet/Intranet Input Method Framework.
>+IIIMF is designed to be the next generation of input method framework
>+which provides the following capabilities;
>+
>+* Multiplatform, platform independent.
>+* Multlingual and Full UNICODE support, but satisfactory for native speakers.
>+* Windowing System Independent.
>+* Multiple language engines concurrently run.
>+* Multiuser.
>+* Distributed, lightweight clients and scalable server.
>+* Extensible in multiple means.
>+* Input method protocol efficient enough to be used over low-speed modem
>+  connection.
>+* Easy input method engine development with plugin API.
>+* Easy input method enabling with libiiimcf, even on console apps.
>+* Small core part to start from.
>+
>+WWW: http://www.openi18n.org/subgroups/im/IIIMF/
>diff -r -u -N ports.orig/japanese/iiimf-le-canna/pkg-plist ports/japanese/iiimf-le-canna/pkg-plist
>--- ports.orig/japanese/iiimf-le-canna/pkg-plist	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-canna/pkg-plist	Fri Feb 18 19:34:06 2005
>@@ -0,0 +1,5 @@
>+lib/im/leif/CannaLE.so
>+lib/im/locale/ja/CannaLE/aux.so
>+lib/im/locale/ja/CannaLE/auxmenu
>+@dirrm lib/im/locale/ja/CannaLE
>+@dirrm lib/im/locale/ja
>diff -r -u -N ports.orig/japanese/iiimf-le-freewnn/Makefile ports/japanese/iiimf-le-freewnn/Makefile
>--- ports.orig/japanese/iiimf-le-freewnn/Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/Makefile	Tue Feb 22 22:48:17 2005
>@@ -0,0 +1,69 @@
>+# New ports collection makefile for:	iiimf-le-freewnn
>+# Date created:		18 Feb 2005
>+# Whom:			Masanori OZAWA <ozawa@ongs.co.jp>
>+#
>+# $FreeBSD$
>+#
>+
>+PORTNAME=	le-freewnn
>+PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
>+CATEGORIES=	japanese
>+MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
>+PKGNAMEPREFIX=	iiimf-
>+DISTNAME=	im-sdk-src-${IIIMF_VER}
>+EXTRACT_SUFX=	.tar.bz2
>+
>+MAINTAINER=	daichi@freebsd.org
>+COMMENT=	FreeWnn Module of IIIMF LEIF
>+
>+LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
>+		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib\
>+		wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
>+
>+IIIMF_VER=	r12_1-svn2002
>+USE_ICONV=	yes
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool
>+USE_XLIB=	yes
>+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} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+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}/../lib/CSConv/csconv.h
>+
>+pre-configure:
>+	(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.post.mk>
>diff -r -u -N ports.orig/japanese/iiimf-le-freewnn/distinfo ports/japanese/iiimf-le-freewnn/distinfo
>--- ports.orig/japanese/iiimf-le-freewnn/distinfo	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/distinfo	Sun Feb 20 14:19:10 2005
>@@ -0,0 +1,2 @@
>+MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
>+SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
>diff -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-Makefile ports/japanese/iiimf-le-freewnn/files/patch-Makefile
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-Makefile	Sun Feb 20 14:19:10 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh ports/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh	Sun Feb 20 14:19:10 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac ports/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac	Sun Feb 20 14:21:20 2005
>@@ -0,0 +1,32 @@
>+--- leif/configure.ac	Wed Oct  6 23:00:36 2004
>++++ leif/configure.ac	Fri Feb 18 01:19:12 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="freewnn"
>+ 
>+-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 -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am ports/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am	Sun Feb 20 14:49:11 2005
>@@ -0,0 +1,13 @@
>+--- leif/freewnn/Makefile.am.orig	Sun Feb 20 14:47:50 2005
>++++ leif/freewnn/Makefile.am	Sun Feb 20 14:48:49 2005
>+@@ -3,8 +3,8 @@
>+                     -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
>+                     -I$(IM_INCLUDEDIR)/iml \
>+                     -I$(CSCONV_DIR) \
>+-                    -I/usr/include/wnn
>+-FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
>++                    -I/usr/local/include/wnn
>++FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) -L/usr/local/lib
>+ FreeWnnLE_la_LIBADD = -lwnn $(THREAD_LIBS)
>+ FreeWnnLE_la_SOURCES = freewnn.c
>+ noinst_LTLIBRARIES = FreeWnnLE.la
>diff -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c ports/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c	Sun Feb 20 17:58:34 2005
>@@ -0,0 +1,32 @@
>+--- leif/freewnn/freewnn.c.orig	Mon Oct  4 19:13:52 2004
>++++ leif/freewnn/freewnn.c	Sun Feb 20 15:43:20 2005
>+@@ -59,9 +59,9 @@
>+ #define BUFSIZE 1024
>+ #endif
>+ 
>+-#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
>++#define WNNRCFILE "/usr/local/lib/wnn/ja_JP/wnnenvrc"
>+ 
>+-#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"
>+@@ -163,7 +163,7 @@
>+   int count = 0;
>+ 
>+   if( str == NULL ) return NULL;
>+-  if( *str == '\0' ) return NULL;
>++  if( *str == '\0' ) return "";
>+ 
>+   for(i=0;i<strlen(str);i++) {
>+     count++;
>+@@ -202,7 +202,7 @@
>+ 
>+   if( wstr == NULL ) return NULL;
>+ 
>+-  if( *wstr == 0 ) return NULL;
>++  if( *wstr == 0 ) return "";
>+ 
>+   for(i=0;wstr[i] != 0;i++) 
>+     count++;
>diff -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_EIMILJournal.c ports/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_EIMILJournal.c
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_EIMILJournal.c	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_EIMILJournal.c	Sun Feb 20 14:19:10 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_autogen.sh ports/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_autogen.sh
>--- ports.orig/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/files/patch-lib_EIMIL_autogen.sh	Sun Feb 20 14:19:10 2005
>@@ -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 -r -u -N ports.orig/japanese/iiimf-le-freewnn/pkg-descr ports/japanese/iiimf-le-freewnn/pkg-descr
>--- ports.orig/japanese/iiimf-le-freewnn/pkg-descr	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/pkg-descr	Mon Feb 21 21:55:34 2005
>@@ -0,0 +1,18 @@
>+IIIMF stands for Internet/Intranet Input Method Framework.
>+IIIMF is designed to be the next generation of input method framework
>+which provides the following capabilities;
>+
>+* Multiplatform, platform independent.
>+* Multlingual and Full UNICODE support, but satisfactory for native speakers.
>+* Windowing System Independent.
>+* Multiple language engines concurrently run.
>+* Multiuser.
>+* Distributed, lightweight clients and scalable server.
>+* Extensible in multiple means.
>+* Input method protocol efficient enough to be used over low-speed modem
>+  connection.
>+* Easy input method engine development with plugin API.
>+* Easy input method enabling with libiiimcf, even on console apps.
>+* Small core part to start from.
>+
>+WWW: http://www.openi18n.org/subgroups/im/IIIMF/
>diff -r -u -N ports.orig/japanese/iiimf-le-freewnn/pkg-plist ports/japanese/iiimf-le-freewnn/pkg-plist
>--- ports.orig/japanese/iiimf-le-freewnn/pkg-plist	Thu Jan  1 09:00:00 1970
>+++ ports/japanese/iiimf-le-freewnn/pkg-plist	Sun Feb 20 14:40:51 2005
>@@ -0,0 +1 @@
>+lib/im/leif/FreeWnnLE.so
>Binary files ports.orig/textproc/iiimf-client-lib/.Makefile.swp and ports/textproc/iiimf-client-lib/.Makefile.swp differ
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/Makefile ports/textproc/iiimf-client-lib/Makefile
>--- ports.orig/textproc/iiimf-client-lib/Makefile	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/Makefile	Tue Feb 22 22:18:33 2005
>@@ -10,73 +10,60 @@
> 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=	Internet/Intranet Input Method Client Framework
> 
> LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}
>-INSTALL_WRKSRC=	${WRKSRC}/lib/iiimcf
>-USE_GMAKE=	yes
>+IIIMF_VER=	r12_1-svn2002
> INSTALLS_SHLIB=	yes
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool
> USE_ICONV=	yes
>-USE_REINPLACE=	yes
>-USE_AUTOCONF_VER=	259
>-USE_AUTOHEADER_VER=	259
>-USE_AUTOMAKE_VER=	19
>-USE_LIBTOOL_VER=	15
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
>-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
>-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
>-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/iiimf
>-DIRS=		lib/EIMIL lib/iiimcf
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
>+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
>+		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
>+		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
> 
> post-patch:
>-.for DIR in ${DIRS}
>-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
>-		${WRKSRC}/${DIR}/configure.ac
>-.endfor
> 	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
>-		${WRKSRC}/acfiles/im_common.m4
>+		${WRKSRC}/../../acfiles/im_common.m4
> 
> pre-configure:
>-.for DIR in ${DIRS}
>-	cd ${WRKSRC}/${DIR} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles
>-	${TOUCH} ${WRKSRC}/${DIR}/config.h.in
>-.endfor
>-
>-# XXX following are dup what bsd.*.mk do. how to deal this neatly?
>-run-autotools:
>-.for DIR in ${DIRS}
>-	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
>-		${AUTOMAKE_ARGS})
>-	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
>-		${AUTOCONF_ARGS})
>-	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
>-		${AUTOHEADER_ARGS})
>-.endfor
>-
>-patch-autotools:
>-.for DIR in ${DIRS}
>-	cd ${WRKSRC}/${DIR} && ${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}
>-.endfor
>+	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
> 
> do-configure:
>-.for DIR in ${DIRS}
>-	cd ${WRKSRC}/${DIR} && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}
>-.endfor
>-
>-do-build:
>-.for DIR in ${DIRS}
>-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
>-.endfor
>+	(cd ${WRKSRC}/../EIMIL && ./autogen.sh)
>+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
>+
>+post-configure:
>+	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
>+		${WRKSRC}/Makefile
>+
>+pre-build:
>+	(cd ${WRKSRC}/../EIMIL && ${GMAKE} ${MAKE_ARGS})
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/distinfo ports/textproc/iiimf-client-lib/distinfo
>--- ports.orig/textproc/iiimf-client-lib/distinfo	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/distinfo	Thu Feb 17 19:58:57 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-Makefile ports/textproc/iiimf-client-lib/files/patch-Makefile
>--- ports.orig/textproc/iiimf-client-lib/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-client-lib/files/patch-Makefile	Thu Feb 17 20:21:36 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 ports/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
>--- ports.orig/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4	Thu Jan  1 09:00:00 1970
>@@ -1,36 +0,0 @@
>---- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
>-+++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
>-@@ -74,6 +74,11 @@
>- ## Checks for thread library.
>- 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
>- 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
>-+
>-+	case "${target}" in
>-+		*freebsd*) HAVE_LIBPTHREAD="yes";;
>-+	esac
>-+
>- 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
>- 		HAVE_THREAD="pthread"
>- 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
>-@@ -210,8 +215,6 @@
>- 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
>- 		;;
>- 	    *freebsd*)
>--		THREAD_LDFLAGS="-pthread"
>--		PTHREAD_LIBS=""
>- 		;;
>- 	esac
>- 
>-@@ -249,9 +252,9 @@
>- 		THREAD_CXX_CFLAGS="-mt"
>- 		HAVE_THREAD="uithread"
>- 		;;
>--	    *freebsd*@gcc:*)
>--		THREAD_LDFLAGS="-pthread"
>--		THREAD_LIBS=""
>-+	    *freebsd*)
>-+		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
>-+		THREAD_LIBS="${PTHREAD_LIBS}"
>- 		HAVE_THREAD="freebsd-pthread"
>- 		;;
>- 	    *linux*)
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- lib/iiimcf/Makefile.am.orig	Wed Aug 25 08:46:38 2004
>-+++ lib/iiimcf/Makefile.am	Sun Sep  5 02:30:16 2004
>-@@ -2,7 +2,7 @@
>- SUBDIRS = . test
>- #libdir = /usr/local/lib
>- libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
>--                       -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
>-+                       -export-dynamic -export-symbols libiiimcf.sym -L$(LOCALBASE)/lib -liiimp
>- libiiimcf_la_CFLAGS = -DDEBUG
>- libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \
>-                        lookup_choice.c message.c preedit.c status.c trigger.c \
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -1,20 +0,0 @@
>---- lib/iiimcf/test/check/Makefile.am.orig	Wed Mar 26 02:24:03 2003
>-+++ lib/iiimcf/test/check/Makefile.am	Wed Sep  8 17:16:00 2004
>-@@ -1,13 +1,13 @@
>- IIIMCF_DIR = ../..
>- TEST_LIBS = -L$(IIIMCF_DIR) -liiimcf \
>--            -L$(IIIMCF_DIR)/../iiimp -liiimp
>-+            -L$(LOCALBASE)/lib -liiimp
>- TEST_LIBPATH = $(IIIMCF_DIR)/.libs:$(IIIMCF_DIR)/../EIMIL/.libs:$(IIIMCF_DIR)/../iiimp/.libs
>- basic_SOURCES = basic.c common.c
>--basic_LDADD = $(TEST_LIBS)
>-+basic_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
>- sendkey1_SOURCES = sendkey1.c common.c
>--sendkey1_LDADD = $(TEST_LIBS)
>-+sendkey1_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
>- sendkey2_SOURCES = sendkey2.c common.c
>--sendkey2_LDADD = $(TEST_LIBS)
>-+sendkey2_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
>- noinst_PROGRAMS = basic sendkey1 sendkey2
>- 
>- TEST_SETLDPATH = env LD_LIBRARY_PATH=$(TEST_LIBPATH):$$LD_LIBRARY_PATH
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c	Thu Feb 17 20:21:36 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh	Thu Feb 17 20:21:36 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -1,23 +0,0 @@
>---- lib/EIMIL/test/Makefile.am.orig	Wed Sep  8 22:08:11 2004
>-+++ lib/EIMIL/test/Makefile.am	Wed Sep  8 22:09:19 2004
>-@@ -1,14 +1,14 @@
>- TEST_CFLAGS = -ggdb -DDEBUG 
>- EIMILLIB = -L.. -lEIMIL
>--parsertest_CFLAGS = $(TEST_CFLAGS)
>-+parsertest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
>- parsertest_SOURCES = parsertest.c
>--parsertest_LDADD = $(EIMILLIB)
>--arithtest_CFLAGS = $(TEST_CFLAGS)
>-+parsertest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
>-+arithtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
>- arithtest_SOURCES = arithtest.c
>--arithtest_LDADD = $(EIMILLIB)
>--flowtest_CFLAGS = $(TEST_CFLAGS)
>-+arithtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
>-+flowtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
>- flowtest_SOURCES = flowtest.c
>--flowtest_LDADD = $(EIMILLIB)
>-+flowtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
>- bin_PROGRAMS = parsertest arithtest flowtest
>- 
>- test: parsertest arithtest flowtest
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am	Thu Feb 17 20:36:45 2005
>@@ -0,0 +1,12 @@
>+--- lib/iiimcf/Makefile.am	Wed Oct 13 18:07:24 2004
>++++ lib/iiimcf/Makefile.am	Wed Feb 16 15:14:51 2005
>+@@ -1,6 +1,7 @@
>+ AUTOMAKE_OPTIONS = foreign
>+ SUBDIRS = . test
>+ #libdir = /usr/local/lib
>++LDFLAGS = -lpthread -liiimp -L/usr/local/lib
>+ libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
>+-                        -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
>++                        -export-dynamic -export-symbols libiiimcf.sym
>+ libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""
>+diff -urN --exclude --Makefile --exclude config.* --exclude *.m4 --exclude *.cache --exclude *.Plo im-sdk-r12_1-svn2002.orig/lib/iiimcf/Makefile.in im-sdk-r12_1-svn2002/lib/iiimcf/Makefile.in
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh	Thu Feb 17 20:06:40 2005
>@@ -0,0 +1,72 @@
>+--- lib/iiimcf/autogen.sh	Fri Jan  9 03:56:37 2004
>++++ lib/iiimcf/autogen.sh	Wed Feb 16 15:06:45 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 -r -u -N ports.orig/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
>--- ports.orig/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c	Thu Feb 17 20:08:31 2005
>@@ -0,0 +1,19 @@
>+--- lib/iiimcf/iiimcf.c	Tue Sep 14 13:19:47 2004
>++++ lib/iiimcf/iiimcf.c	Wed Feb 16 22:59:51 2005
>+@@ -440,7 +440,7 @@
>+ )
>+ {
>+     IIIMF_status st;
>+-    IIIMP_message *pmes;
>++    IIIMP_message *pmes = NULL;
>+ 
>+     if (!ph->data_s) ph->data_s = iiimp_data_s_new();
>+     if (!ph->data_s) return IIIMF_STATUS_MALLOC;
>+@@ -501,6 +501,7 @@
>+     iiimp_message_delete(ph->data_s, pmes);
>+     if (st != IIIMF_STATUS_SUCCESS) goto reconnect;
>+ 
>++    pmes = NULL;
>+     st = iiimcf_wait_message(ph, NULL, IM_CONNECT_REPLY, &pmes);
>+     if (st != IIIMF_STATUS_SUCCESS) {
>+         if (pmes) iiimp_message_delete(ph->data_s, pmes);
>diff -r -u -N ports.orig/textproc/iiimf-client-lib/pkg-plist ports/textproc/iiimf-client-lib/pkg-plist
>--- ports.orig/textproc/iiimf-client-lib/pkg-plist	Tue Feb 22 22:13:44 2005
>+++ ports/textproc/iiimf-client-lib/pkg-plist	Fri Feb 18 15:39:06 2005
>@@ -1,4 +1,4 @@
>-include/iiimf/iiimcf.h
>-lib/libiiimcf.so.2
>-lib/libiiimcf.so
> lib/libiiimcf.a
>+lib/libiiimcf.so
>+lib/libiiimcf.so.2
>+include/iiimcf.h
>diff -r -u -N ports.orig/textproc/iiimf-csconv/Makefile ports/textproc/iiimf-csconv/Makefile
>--- ports.orig/textproc/iiimf-csconv/Makefile	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-csconv/Makefile	Tue Feb 22 22:19:34 2005
>@@ -10,41 +10,62 @@
> 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=	Internet/Intranet Input Method Framework encoding convert library
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/CSConv
>-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}-${IIIMF_VER}
>+IIIMF_VER=	r12_1-svn2002
> USE_ICONV=	yes
> USE_GMAKE=	yes
>+USE_GNOME=	intltool
> USE_REINPLACE=	yes
>-USE_AUTOCONF_VER=259
>-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
>-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
>-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
>+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS+=CC=gcc CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
>+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
>+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}/aclocal.m4 \
> 		${WRKSRC}/csconv.h \
>+		${WRKSRC}/converterPI/configure.in \
> 		${WRKSRC}/converterPI/test/icutest4linux.c \
> 		${WRKSRC}/converterPI/icuconv_relay.c \
>-		${WRKSRC}/converterPI/configure.in \
> 		${WRKSRC}/converterPI/icuconv/common/config.h
>-	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" -e "s,-ldl,," -e 's,-lc$$,,' \
>-		${WRKSRC}/converterPI/icuconv/common/Makefile.in \
>-		${WRKSRC}/converterPI/icuconv/tools/toolutil/Makefile.in \
>-		${WRKSRC}/converter/compoundtext/Makefile.in
>-	${REINPLACE_CMD} -e "s,ELIBBAD,-2," \
>+	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
> 		${WRKSRC}/converterPI/icuconv/common/icuconv.c
>-	${REINPLACE_CMD} -e "s,(LIBS),(LIBS) ${PTHREAD_LIBS},g" \
>-		${WRKSRC}/converterPI/icuconv/tools/makeconv/Makefile.in \
>-		${WRKSRC}/converterPI/icuconv/tools/gencnval/Makefile.in
> 
>-.include <bsd.port.mk>
>+pre-configure:
>+	(cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC} && ${ACLOCAL} -I ../../acfiles && ${AUTOCONF})
>+	(cd ${WRKSRC}/converterPI/ && ${AUTOCONF})
>+
>+post-configure:
>+	${REINPLACE_CMD} \
>+		-e "s,prefix = ${PREFIX},prefix = ${PREFIX}/lib/im," \
>+		`${FIND} ${WRKSRC} -type f -name Makefile`
>+
>+.include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-csconv/distinfo ports/textproc/iiimf-csconv/distinfo
>--- ports.orig/textproc/iiimf-csconv/distinfo	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-csconv/distinfo	Fri Feb 18 15:14:05 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-csconv/files/patch-Makefile ports/textproc/iiimf-csconv/files/patch-Makefile
>--- ports.orig/textproc/iiimf-csconv/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-csconv/files/patch-Makefile	Thu Feb 17 17:25:23 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in ports/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in
>--- ports.orig/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in	Thu Feb 17 18:53:18 2005
>@@ -0,0 +1,11 @@
>+--- lib/CSConv/converterPI/icuconv/common/Makefile.in	Fri Jun 13 01:27:08 2003
>++++ lib/CSConv/converterPI/icuconv/common/Makefile.in	Wed Feb 16 14:46:02 2005
>+@@ -168,7 +168,7 @@
>+ 
>+ $(TARGET) : $(OBJECTS)
>+ 	@$(RM) $@
>+-	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -ldl -lpthread -lm -lc
>++	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -lpthread -lm -lc
>+ 	@$(AR) $(ARFLAGS) $(CSC_ARCHIVE) $@
>+ 
>+ #	$(SHLIB.cc) -o $@ $^ $(LIBS)
>diff -r -u -N ports.orig/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in ports/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in
>--- ports.orig/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in	Thu Feb 17 18:55:14 2005
>@@ -0,0 +1,11 @@
>+--- lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in	Fri Jun 13 01:27:08 2003
>++++ lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in	Wed Feb 16 14:45:29 2005
>+@@ -138,7 +138,7 @@
>+ 
>+ 
>+ $(TARGET) : $(OBJECTS)
>+-	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -ldl -lpthread -lm -lc
>++	$(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -lpthread -lm -lc
>+ 
>+ 
>+ 
>diff -r -u -N ports.orig/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac ports/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac
>--- ports.orig/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac	Thu Feb 17 18:17:34 2005
>@@ -1,35 +1,23 @@
>---- lib/CSConv/configure.ac.orig	Fri Jun 13 00:27:08 2003
>-+++ lib/CSConv/configure.ac	Sat Sep  4 05:39:51 2004
>-@@ -55,8 +55,6 @@
>- AC_PATH_PROG(RM, rm)
>- AC_PATH_PROG(SED, sed)
>- 
>--AC_CHECK_LIB(c, main)
>--AC_CHECK_LIB(dl, main)
>- 
>- 
>- dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
>-@@ -294,13 +292,8 @@
>- 	CDEBUGFLAGS=
>- 	ARFLAGS=ru
>- 
>--	if test x"${CC}" = x"gcc" ; then
>--		SHLIBCFLAGS='-fpic'
>--		SHLIBLDFLAGS='-shared'
>--	else
>--		SHLIBCFLAGS=
>--		SHLIBLDFLAGS=
>--	fi
>-+	SHLIBCFLAGS='-fpic'
>-+	SHLIBLDFLAGS='-shared'
>- 
>- 	csc_system_name="`uname -s`"
>- 	;;
>-@@ -314,6 +307,7 @@
>+--- lib/CSConv/configure.ac	Fri Jun 13 01:27:08 2003
>++++ lib/CSConv/configure.ac	Wed Feb 16 14:41:13 2005
>+@@ -314,6 +314,7 @@
>  case "${host}" in
>  	*solaris*) 	platform=SOLARIS ;;
>  	*linux*) 	platform=LINUX ;;
> +	*freebsd*)	platform=FREEBSD ;;
>  esac
>  AC_SUBST(platform)
>+ 
>+@@ -337,6 +338,12 @@
>+ 		## Shared object suffix
>+ 		SO=so
>+ 	;;
>++        *freebsd*)
>++                ## Commands to generate dependency files
>++                GEN_DEPS="${CC} -E -MM ${DEFINES}  ${INCLUDES}"
>++                ## Shared object suffix
>++                SO=so
>++        ;;
>+ esac
>+ 
>  
>diff -r -u -N ports.orig/textproc/iiimf-csconv/pkg-plist ports/textproc/iiimf-csconv/pkg-plist
>--- ports.orig/textproc/iiimf-csconv/pkg-plist	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-csconv/pkg-plist	Sat Feb 19 06:06:14 2005
>@@ -1,240 +1,242 @@
>-csconv/big5_ct.so
>-csconv/big5w_ct.so
>-csconv/cns_ct.so
>-csconv/cnsw_ct.so
>-csconv/compoundtext/ct_de
>-csconv/compoundtext/ct_en_US
>-csconv/compoundtext/ct_es
>-csconv/compoundtext/ct_fr
>-csconv/compoundtext/ct_it
>-csconv/compoundtext/ct_ja
>-csconv/compoundtext/ct_ko
>-csconv/compoundtext/ct_sv
>-csconv/compoundtext/ct_zh
>-csconv/compoundtext/ct_zh.GBK
>-csconv/compoundtext/ct_zh_TW
>-csconv/compoundtext/ct_zh_TW.GBK
>-csconv/csconv.conf
>-csconv/csconv.so
>-csconv/ct_big5.so
>-csconv/ct_big5w.so
>-csconv/ct_cns.so
>-csconv/ct_cnsw.so
>-csconv/ct_euc.so
>-csconv/ct_eucw.so
>-csconv/ct_pck.so
>-csconv/ct_pckw.so
>-csconv/ct_utf16.so
>-csconv/ct_utf8.so
>-csconv/ct_utf8w.so
>-csconv/ctex_mbs.so
>-csconv/ctex_wcs.so
>-csconv/encoding.norm
>-csconv/euc_ct.so
>-csconv/eucw_ct.so
>-csconv/iconv_relay.so
>-csconv/iconv_relay_mb_wc.so
>-csconv/iconv_relay_wc_mb.so
>-csconv/icuconv_relay.so
>-csconv/icuconv_relay_mb_wc.so
>-csconv/icuconv_relay_wc_mb.so
>-csconv/libicuconv.so
>-csconv/mbs_ctex.so
>-csconv/mbs_wcs.so
>-csconv/nil.so
>-csconv/pck_ct.so
>-csconv/pckw_ct.so
>-csconv/utf16_ct.so
>-csconv/utf8_ct.so
>-csconv/utf8w_ct.so
>-csconv/wcs_ctex.so
>-csconv/wcs_mbs.so
>-icuconv/libicu-toolutil.so
>-share/icu/1.4.0/cnvalias.dat
>-share/icu/1.4.0/ibm-1004.cnv
>-share/icu/1.4.0/ibm-1006.cnv
>-share/icu/1.4.0/ibm-1008.cnv
>-share/icu/1.4.0/ibm-1038.cnv
>-share/icu/1.4.0/ibm-1041.cnv
>-share/icu/1.4.0/ibm-1043.cnv
>-share/icu/1.4.0/ibm-1047.cnv
>-share/icu/1.4.0/ibm-1051.cnv
>-share/icu/1.4.0/ibm-1088.cnv
>-share/icu/1.4.0/ibm-1089.cnv
>-share/icu/1.4.0/ibm-1098.cnv
>-share/icu/1.4.0/ibm-1112.cnv
>-share/icu/1.4.0/ibm-1114.cnv
>-share/icu/1.4.0/ibm-1115.cnv
>-share/icu/1.4.0/ibm-1116.cnv
>-share/icu/1.4.0/ibm-1117.cnv
>-share/icu/1.4.0/ibm-1118.cnv
>-share/icu/1.4.0/ibm-1119.cnv
>-share/icu/1.4.0/ibm-1123.cnv
>-share/icu/1.4.0/ibm-1140-s390.cnv
>-share/icu/1.4.0/ibm-1140.cnv
>-share/icu/1.4.0/ibm-1141.cnv
>-share/icu/1.4.0/ibm-1142-s390.cnv
>-share/icu/1.4.0/ibm-1142.cnv
>-share/icu/1.4.0/ibm-1143-s390.cnv
>-share/icu/1.4.0/ibm-1143.cnv
>-share/icu/1.4.0/ibm-1144-s390.cnv
>-share/icu/1.4.0/ibm-1144.cnv
>-share/icu/1.4.0/ibm-1145-s390.cnv
>-share/icu/1.4.0/ibm-1145.cnv
>-share/icu/1.4.0/ibm-1146-s390.cnv
>-share/icu/1.4.0/ibm-1146.cnv
>-share/icu/1.4.0/ibm-1147-s390.cnv
>-share/icu/1.4.0/ibm-1147.cnv
>-share/icu/1.4.0/ibm-1148-s390.cnv
>-share/icu/1.4.0/ibm-1148.cnv
>-share/icu/1.4.0/ibm-1149-s390.cnv
>-share/icu/1.4.0/ibm-1149.cnv
>-share/icu/1.4.0/ibm-1153-s390.cnv
>-share/icu/1.4.0/ibm-1153.cnv
>-share/icu/1.4.0/ibm-1154.cnv
>-share/icu/1.4.0/ibm-1155.cnv
>-share/icu/1.4.0/ibm-1156.cnv
>-share/icu/1.4.0/ibm-1157.cnv
>-share/icu/1.4.0/ibm-1158.cnv
>-share/icu/1.4.0/ibm-1159.cnv
>-share/icu/1.4.0/ibm-1160.cnv
>-share/icu/1.4.0/ibm-1164.cnv
>-share/icu/1.4.0/ibm-1250.cnv
>-share/icu/1.4.0/ibm-1251.cnv
>-share/icu/1.4.0/ibm-1252.cnv
>-share/icu/1.4.0/ibm-1253.cnv
>-share/icu/1.4.0/ibm-1254.cnv
>-share/icu/1.4.0/ibm-1255.cnv
>-share/icu/1.4.0/ibm-1256.cnv
>-share/icu/1.4.0/ibm-1257.cnv
>-share/icu/1.4.0/ibm-1258.cnv
>-share/icu/1.4.0/ibm-12712-s390.cnv
>-share/icu/1.4.0/ibm-12712.cnv
>-share/icu/1.4.0/ibm-1275.cnv
>-share/icu/1.4.0/ibm-1276.cnv
>-share/icu/1.4.0/ibm-1277.cnv
>-share/icu/1.4.0/ibm-1280.cnv
>-share/icu/1.4.0/ibm-1281.cnv
>-share/icu/1.4.0/ibm-1282.cnv
>-share/icu/1.4.0/ibm-1283.cnv
>-share/icu/1.4.0/ibm-1361.cnv
>-share/icu/1.4.0/ibm-1362.cnv
>-share/icu/1.4.0/ibm-1363.cnv
>-share/icu/1.4.0/ibm-1364.cnv
>-share/icu/1.4.0/ibm-1370.cnv
>-share/icu/1.4.0/ibm-1371.cnv
>-share/icu/1.4.0/ibm-1383.cnv
>-share/icu/1.4.0/ibm-1386.cnv
>-share/icu/1.4.0/ibm-1390.cnv
>-share/icu/1.4.0/ibm-1399.cnv
>-share/icu/1.4.0/ibm-16684.cnv
>-share/icu/1.4.0/ibm-16804-s390.cnv
>-share/icu/1.4.0/ibm-16804.cnv
>-share/icu/1.4.0/ibm-17248.cnv
>-share/icu/1.4.0/ibm-21427.cnv
>-share/icu/1.4.0/ibm-273.cnv
>-share/icu/1.4.0/ibm-277.cnv
>-share/icu/1.4.0/ibm-278.cnv
>-share/icu/1.4.0/ibm-280.cnv
>-share/icu/1.4.0/ibm-284.cnv
>-share/icu/1.4.0/ibm-285.cnv
>-share/icu/1.4.0/ibm-297.cnv
>-share/icu/1.4.0/ibm-37-s390.cnv
>-share/icu/1.4.0/ibm-37.cnv
>-share/icu/1.4.0/ibm-420.cnv
>-share/icu/1.4.0/ibm-424.cnv
>-share/icu/1.4.0/ibm-437.cnv
>-share/icu/1.4.0/ibm-4899.cnv
>-share/icu/1.4.0/ibm-4909.cnv
>-share/icu/1.4.0/ibm-4930.cnv
>-share/icu/1.4.0/ibm-4971.cnv
>-share/icu/1.4.0/ibm-500.cnv
>-share/icu/1.4.0/ibm-5104.cnv
>-share/icu/1.4.0/ibm-5123.cnv
>-share/icu/1.4.0/ibm-5210.cnv
>-share/icu/1.4.0/ibm-5346.cnv
>-share/icu/1.4.0/ibm-5347.cnv
>-share/icu/1.4.0/ibm-5349.cnv
>-share/icu/1.4.0/ibm-5350.cnv
>-share/icu/1.4.0/ibm-5351.cnv
>-share/icu/1.4.0/ibm-5352.cnv
>-share/icu/1.4.0/ibm-5353.cnv
>-share/icu/1.4.0/ibm-5354.cnv
>-share/icu/1.4.0/ibm-803.cnv
>-share/icu/1.4.0/ibm-808.cnv
>-share/icu/1.4.0/ibm-813.cnv
>-share/icu/1.4.0/ibm-833.cnv
>-share/icu/1.4.0/ibm-834.cnv
>-share/icu/1.4.0/ibm-835.cnv
>-share/icu/1.4.0/ibm-848.cnv
>-share/icu/1.4.0/ibm-8482.cnv
>-share/icu/1.4.0/ibm-849.cnv
>-share/icu/1.4.0/ibm-850.cnv
>-share/icu/1.4.0/ibm-852.cnv
>-share/icu/1.4.0/ibm-855.cnv
>-share/icu/1.4.0/ibm-856.cnv
>-share/icu/1.4.0/ibm-857.cnv
>-share/icu/1.4.0/ibm-858.cnv
>-share/icu/1.4.0/ibm-859.cnv
>-share/icu/1.4.0/ibm-860.cnv
>-share/icu/1.4.0/ibm-861.cnv
>-share/icu/1.4.0/ibm-862.cnv
>-share/icu/1.4.0/ibm-863.cnv
>-share/icu/1.4.0/ibm-864.cnv
>-share/icu/1.4.0/ibm-865.cnv
>-share/icu/1.4.0/ibm-866.cnv
>-share/icu/1.4.0/ibm-867.cnv
>-share/icu/1.4.0/ibm-868.cnv
>-share/icu/1.4.0/ibm-869.cnv
>-share/icu/1.4.0/ibm-871.cnv
>-share/icu/1.4.0/ibm-872.cnv
>-share/icu/1.4.0/ibm-874.cnv
>-share/icu/1.4.0/ibm-878.cnv
>-share/icu/1.4.0/ibm-891.cnv
>-share/icu/1.4.0/ibm-897.cnv
>-share/icu/1.4.0/ibm-901.cnv
>-share/icu/1.4.0/ibm-902.cnv
>-share/icu/1.4.0/ibm-9027.cnv
>-share/icu/1.4.0/ibm-903.cnv
>-share/icu/1.4.0/ibm-904.cnv
>-share/icu/1.4.0/ibm-9044.cnv
>-share/icu/1.4.0/ibm-9049.cnv
>-share/icu/1.4.0/ibm-9061.cnv
>-share/icu/1.4.0/ibm-907.cnv
>-share/icu/1.4.0/ibm-909.cnv
>-share/icu/1.4.0/ibm-910.cnv
>-share/icu/1.4.0/ibm-912.cnv
>-share/icu/1.4.0/ibm-913.cnv
>-share/icu/1.4.0/ibm-914.cnv
>-share/icu/1.4.0/ibm-915.cnv
>-share/icu/1.4.0/ibm-916.cnv
>-share/icu/1.4.0/ibm-920.cnv
>-share/icu/1.4.0/ibm-921.cnv
>-share/icu/1.4.0/ibm-922.cnv
>-share/icu/1.4.0/ibm-923.cnv
>-share/icu/1.4.0/ibm-9238.cnv
>-share/icu/1.4.0/ibm-924.cnv
>-share/icu/1.4.0/ibm-930.cnv
>-share/icu/1.4.0/ibm-933.cnv
>-share/icu/1.4.0/ibm-935.cnv
>-share/icu/1.4.0/ibm-937.cnv
>-share/icu/1.4.0/ibm-939.cnv
>-share/icu/1.4.0/ibm-941.cnv
>-share/icu/1.4.0/ibm-942.cnv
>-share/icu/1.4.0/ibm-943.cnv
>-share/icu/1.4.0/ibm-944.cnv
>-share/icu/1.4.0/ibm-946.cnv
>-share/icu/1.4.0/ibm-947.cnv
>-share/icu/1.4.0/ibm-948.cnv
>-share/icu/1.4.0/ibm-949.cnv
>-share/icu/1.4.0/ibm-950.cnv
>-share/icu/1.4.0/ibm-953.cnv
>-share/icu/1.4.0/ibm-954.cnv
>-share/icu/1.4.0/ibm-955.cnv
>-share/icu/1.4.0/ibm-970.cnv
>-share/icu/1.4.0/icudata_cnvalias.dat
>-@dirrm share/icu/1.4.0
>-@dirrm share/icu
>-@dirrm icuconv
>-@dirrm csconv/compoundtext
>-@dirrm csconv
>+lib/im/csconv/big5_ct.so
>+lib/im/csconv/big5w_ct.so
>+lib/im/csconv/cns_ct.so
>+lib/im/csconv/cnsw_ct.so
>+lib/im/csconv/compoundtext/ct_de
>+lib/im/csconv/compoundtext/ct_en_US
>+lib/im/csconv/compoundtext/ct_es
>+lib/im/csconv/compoundtext/ct_fr
>+lib/im/csconv/compoundtext/ct_it
>+lib/im/csconv/compoundtext/ct_ja
>+lib/im/csconv/compoundtext/ct_ko
>+lib/im/csconv/compoundtext/ct_sv
>+lib/im/csconv/compoundtext/ct_zh
>+lib/im/csconv/compoundtext/ct_zh.GBK
>+lib/im/csconv/compoundtext/ct_zh_TW
>+lib/im/csconv/compoundtext/ct_zh_TW.GBK
>+lib/im/csconv/csconv.conf
>+lib/im/csconv/csconv.so
>+lib/im/csconv/ct_big5.so
>+lib/im/csconv/ct_big5w.so
>+lib/im/csconv/ct_cns.so
>+lib/im/csconv/ct_cnsw.so
>+lib/im/csconv/ct_euc.so
>+lib/im/csconv/ct_eucw.so
>+lib/im/csconv/ct_pck.so
>+lib/im/csconv/ct_pckw.so
>+lib/im/csconv/ct_utf16.so
>+lib/im/csconv/ct_utf8.so
>+lib/im/csconv/ct_utf8w.so
>+lib/im/csconv/ctex_mbs.so
>+lib/im/csconv/ctex_wcs.so
>+lib/im/csconv/encoding.norm
>+lib/im/csconv/euc_ct.so
>+lib/im/csconv/eucw_ct.so
>+lib/im/csconv/iconv_relay.so
>+lib/im/csconv/iconv_relay_mb_wc.so
>+lib/im/csconv/iconv_relay_wc_mb.so
>+lib/im/csconv/icuconv_relay.so
>+lib/im/csconv/icuconv_relay_mb_wc.so
>+lib/im/csconv/icuconv_relay_wc_mb.so
>+lib/im/csconv/libicuconv.so
>+lib/im/csconv/mbs_ctex.so
>+lib/im/csconv/mbs_wcs.so
>+lib/im/csconv/nil.so
>+lib/im/csconv/pck_ct.so
>+lib/im/csconv/pckw_ct.so
>+lib/im/csconv/utf16_ct.so
>+lib/im/csconv/utf8_ct.so
>+lib/im/csconv/utf8w_ct.so
>+lib/im/csconv/wcs_ctex.so
>+lib/im/csconv/wcs_mbs.so
>+lib/im/icuconv/libicu-toolutil.so
>+lib/im/share/icu/1.4.0/cnvalias.dat
>+lib/im/share/icu/1.4.0/icudata_cnvalias.dat
>+lib/im/share/icu/1.4.0/ibm-1004.cnv
>+lib/im/share/icu/1.4.0/ibm-1006.cnv
>+lib/im/share/icu/1.4.0/ibm-1008.cnv
>+lib/im/share/icu/1.4.0/ibm-1038.cnv
>+lib/im/share/icu/1.4.0/ibm-1041.cnv
>+lib/im/share/icu/1.4.0/ibm-1043.cnv
>+lib/im/share/icu/1.4.0/ibm-1047.cnv
>+lib/im/share/icu/1.4.0/ibm-1051.cnv
>+lib/im/share/icu/1.4.0/ibm-1088.cnv
>+lib/im/share/icu/1.4.0/ibm-1089.cnv
>+lib/im/share/icu/1.4.0/ibm-1098.cnv
>+lib/im/share/icu/1.4.0/ibm-1112.cnv
>+lib/im/share/icu/1.4.0/ibm-1114.cnv
>+lib/im/share/icu/1.4.0/ibm-1115.cnv
>+lib/im/share/icu/1.4.0/ibm-1116.cnv
>+lib/im/share/icu/1.4.0/ibm-1117.cnv
>+lib/im/share/icu/1.4.0/ibm-1118.cnv
>+lib/im/share/icu/1.4.0/ibm-1119.cnv
>+lib/im/share/icu/1.4.0/ibm-1123.cnv
>+lib/im/share/icu/1.4.0/ibm-1140-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1140.cnv
>+lib/im/share/icu/1.4.0/ibm-1141.cnv
>+lib/im/share/icu/1.4.0/ibm-1142-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1142.cnv
>+lib/im/share/icu/1.4.0/ibm-1143-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1143.cnv
>+lib/im/share/icu/1.4.0/ibm-1144-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1144.cnv
>+lib/im/share/icu/1.4.0/ibm-1145-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1145.cnv
>+lib/im/share/icu/1.4.0/ibm-1146-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1146.cnv
>+lib/im/share/icu/1.4.0/ibm-1147-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1147.cnv
>+lib/im/share/icu/1.4.0/ibm-1148-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1148.cnv
>+lib/im/share/icu/1.4.0/ibm-1149-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1149.cnv
>+lib/im/share/icu/1.4.0/ibm-1153-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-1153.cnv
>+lib/im/share/icu/1.4.0/ibm-1154.cnv
>+lib/im/share/icu/1.4.0/ibm-1155.cnv
>+lib/im/share/icu/1.4.0/ibm-1156.cnv
>+lib/im/share/icu/1.4.0/ibm-1157.cnv
>+lib/im/share/icu/1.4.0/ibm-1158.cnv
>+lib/im/share/icu/1.4.0/ibm-1159.cnv
>+lib/im/share/icu/1.4.0/ibm-1160.cnv
>+lib/im/share/icu/1.4.0/ibm-1164.cnv
>+lib/im/share/icu/1.4.0/ibm-1250.cnv
>+lib/im/share/icu/1.4.0/ibm-1251.cnv
>+lib/im/share/icu/1.4.0/ibm-1252.cnv
>+lib/im/share/icu/1.4.0/ibm-1253.cnv
>+lib/im/share/icu/1.4.0/ibm-1254.cnv
>+lib/im/share/icu/1.4.0/ibm-1255.cnv
>+lib/im/share/icu/1.4.0/ibm-1256.cnv
>+lib/im/share/icu/1.4.0/ibm-1257.cnv
>+lib/im/share/icu/1.4.0/ibm-1258.cnv
>+lib/im/share/icu/1.4.0/ibm-12712-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-12712.cnv
>+lib/im/share/icu/1.4.0/ibm-1275.cnv
>+lib/im/share/icu/1.4.0/ibm-1276.cnv
>+lib/im/share/icu/1.4.0/ibm-1277.cnv
>+lib/im/share/icu/1.4.0/ibm-1280.cnv
>+lib/im/share/icu/1.4.0/ibm-1281.cnv
>+lib/im/share/icu/1.4.0/ibm-1282.cnv
>+lib/im/share/icu/1.4.0/ibm-1283.cnv
>+lib/im/share/icu/1.4.0/ibm-1361.cnv
>+lib/im/share/icu/1.4.0/ibm-1362.cnv
>+lib/im/share/icu/1.4.0/ibm-1363.cnv
>+lib/im/share/icu/1.4.0/ibm-1364.cnv
>+lib/im/share/icu/1.4.0/ibm-1370.cnv
>+lib/im/share/icu/1.4.0/ibm-1371.cnv
>+lib/im/share/icu/1.4.0/ibm-1383.cnv
>+lib/im/share/icu/1.4.0/ibm-1386.cnv
>+lib/im/share/icu/1.4.0/ibm-1390.cnv
>+lib/im/share/icu/1.4.0/ibm-1399.cnv
>+lib/im/share/icu/1.4.0/ibm-16684.cnv
>+lib/im/share/icu/1.4.0/ibm-16804-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-16804.cnv
>+lib/im/share/icu/1.4.0/ibm-17248.cnv
>+lib/im/share/icu/1.4.0/ibm-21427.cnv
>+lib/im/share/icu/1.4.0/ibm-273.cnv
>+lib/im/share/icu/1.4.0/ibm-277.cnv
>+lib/im/share/icu/1.4.0/ibm-278.cnv
>+lib/im/share/icu/1.4.0/ibm-280.cnv
>+lib/im/share/icu/1.4.0/ibm-284.cnv
>+lib/im/share/icu/1.4.0/ibm-285.cnv
>+lib/im/share/icu/1.4.0/ibm-297.cnv
>+lib/im/share/icu/1.4.0/ibm-37-s390.cnv
>+lib/im/share/icu/1.4.0/ibm-37.cnv
>+lib/im/share/icu/1.4.0/ibm-420.cnv
>+lib/im/share/icu/1.4.0/ibm-424.cnv
>+lib/im/share/icu/1.4.0/ibm-437.cnv
>+lib/im/share/icu/1.4.0/ibm-4899.cnv
>+lib/im/share/icu/1.4.0/ibm-4909.cnv
>+lib/im/share/icu/1.4.0/ibm-4930.cnv
>+lib/im/share/icu/1.4.0/ibm-4971.cnv
>+lib/im/share/icu/1.4.0/ibm-500.cnv
>+lib/im/share/icu/1.4.0/ibm-5104.cnv
>+lib/im/share/icu/1.4.0/ibm-5123.cnv
>+lib/im/share/icu/1.4.0/ibm-5210.cnv
>+lib/im/share/icu/1.4.0/ibm-5346.cnv
>+lib/im/share/icu/1.4.0/ibm-5347.cnv
>+lib/im/share/icu/1.4.0/ibm-5349.cnv
>+lib/im/share/icu/1.4.0/ibm-5350.cnv
>+lib/im/share/icu/1.4.0/ibm-5351.cnv
>+lib/im/share/icu/1.4.0/ibm-5352.cnv
>+lib/im/share/icu/1.4.0/ibm-5353.cnv
>+lib/im/share/icu/1.4.0/ibm-5354.cnv
>+lib/im/share/icu/1.4.0/ibm-803.cnv
>+lib/im/share/icu/1.4.0/ibm-808.cnv
>+lib/im/share/icu/1.4.0/ibm-813.cnv
>+lib/im/share/icu/1.4.0/ibm-833.cnv
>+lib/im/share/icu/1.4.0/ibm-834.cnv
>+lib/im/share/icu/1.4.0/ibm-835.cnv
>+lib/im/share/icu/1.4.0/ibm-848.cnv
>+lib/im/share/icu/1.4.0/ibm-8482.cnv
>+lib/im/share/icu/1.4.0/ibm-849.cnv
>+lib/im/share/icu/1.4.0/ibm-850.cnv
>+lib/im/share/icu/1.4.0/ibm-852.cnv
>+lib/im/share/icu/1.4.0/ibm-855.cnv
>+lib/im/share/icu/1.4.0/ibm-856.cnv
>+lib/im/share/icu/1.4.0/ibm-857.cnv
>+lib/im/share/icu/1.4.0/ibm-858.cnv
>+lib/im/share/icu/1.4.0/ibm-859.cnv
>+lib/im/share/icu/1.4.0/ibm-860.cnv
>+lib/im/share/icu/1.4.0/ibm-861.cnv
>+lib/im/share/icu/1.4.0/ibm-862.cnv
>+lib/im/share/icu/1.4.0/ibm-863.cnv
>+lib/im/share/icu/1.4.0/ibm-864.cnv
>+lib/im/share/icu/1.4.0/ibm-865.cnv
>+lib/im/share/icu/1.4.0/ibm-866.cnv
>+lib/im/share/icu/1.4.0/ibm-867.cnv
>+lib/im/share/icu/1.4.0/ibm-868.cnv
>+lib/im/share/icu/1.4.0/ibm-869.cnv
>+lib/im/share/icu/1.4.0/ibm-871.cnv
>+lib/im/share/icu/1.4.0/ibm-872.cnv
>+lib/im/share/icu/1.4.0/ibm-874.cnv
>+lib/im/share/icu/1.4.0/ibm-878.cnv
>+lib/im/share/icu/1.4.0/ibm-891.cnv
>+lib/im/share/icu/1.4.0/ibm-897.cnv
>+lib/im/share/icu/1.4.0/ibm-901.cnv
>+lib/im/share/icu/1.4.0/ibm-902.cnv
>+lib/im/share/icu/1.4.0/ibm-9027.cnv
>+lib/im/share/icu/1.4.0/ibm-903.cnv
>+lib/im/share/icu/1.4.0/ibm-904.cnv
>+lib/im/share/icu/1.4.0/ibm-9044.cnv
>+lib/im/share/icu/1.4.0/ibm-9049.cnv
>+lib/im/share/icu/1.4.0/ibm-9061.cnv
>+lib/im/share/icu/1.4.0/ibm-907.cnv
>+lib/im/share/icu/1.4.0/ibm-909.cnv
>+lib/im/share/icu/1.4.0/ibm-910.cnv
>+lib/im/share/icu/1.4.0/ibm-912.cnv
>+lib/im/share/icu/1.4.0/ibm-913.cnv
>+lib/im/share/icu/1.4.0/ibm-914.cnv
>+lib/im/share/icu/1.4.0/ibm-915.cnv
>+lib/im/share/icu/1.4.0/ibm-916.cnv
>+lib/im/share/icu/1.4.0/ibm-920.cnv
>+lib/im/share/icu/1.4.0/ibm-921.cnv
>+lib/im/share/icu/1.4.0/ibm-922.cnv
>+lib/im/share/icu/1.4.0/ibm-923.cnv
>+lib/im/share/icu/1.4.0/ibm-9238.cnv
>+lib/im/share/icu/1.4.0/ibm-924.cnv
>+lib/im/share/icu/1.4.0/ibm-930.cnv
>+lib/im/share/icu/1.4.0/ibm-933.cnv
>+lib/im/share/icu/1.4.0/ibm-935.cnv
>+lib/im/share/icu/1.4.0/ibm-937.cnv
>+lib/im/share/icu/1.4.0/ibm-939.cnv
>+lib/im/share/icu/1.4.0/ibm-941.cnv
>+lib/im/share/icu/1.4.0/ibm-942.cnv
>+lib/im/share/icu/1.4.0/ibm-943.cnv
>+lib/im/share/icu/1.4.0/ibm-944.cnv
>+lib/im/share/icu/1.4.0/ibm-946.cnv
>+lib/im/share/icu/1.4.0/ibm-947.cnv
>+lib/im/share/icu/1.4.0/ibm-948.cnv
>+lib/im/share/icu/1.4.0/ibm-949.cnv
>+lib/im/share/icu/1.4.0/ibm-950.cnv
>+lib/im/share/icu/1.4.0/ibm-953.cnv
>+lib/im/share/icu/1.4.0/ibm-954.cnv
>+lib/im/share/icu/1.4.0/ibm-955.cnv
>+lib/im/share/icu/1.4.0/ibm-970.cnv
>+@dirrm lib/im/share/icu/1.4.0
>+@dirrm lib/im/share/icu
>+@dirrm lib/im/share
>+@dirrm lib/im/icuconv
>+@dirrm lib/im/csconv/compoundtext
>+@dirrm lib/im/csconv
>+@dirrm lib/im
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/Makefile ports/textproc/iiimf-gnome-im-switcher/Makefile
>--- ports.orig/textproc/iiimf-gnome-im-switcher/Makefile	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/Makefile	Tue Feb 22 22:20:45 2005
>@@ -7,49 +7,65 @@
> 
> PORTNAME=	gnome-im-switcher
> PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
>-PORTREVISION=	1
> 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 gnome input method switcher
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/gnome-im-switcher
>-USE_GNOME=	gconf2 libglade2 libgnomeui gnomepanel gnomehack
>-USE_REINPLACE=	yes
> USE_X_PREFIX=	yes
>+
>+IIIMF_VER=	r12_1-svn2002
>+USE_REINPLACE=  yes
> USE_GMAKE=	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}
>+USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
>+		gnomepanel gnomeprefix gnomehack
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher
>+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+GNU_CONFIGURE=	yes
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+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
>-	${FIND} ${WRKSRC} -name "Makefile.am*" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \
>-		s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \
>-		s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
>-		s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
>-		s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
>-		s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
>-		s|[(]datadir[)]/gnome/|(datadir)/|g ; \
>-		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
>-		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
>-		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
> 
> pre-configure:
>-	cd ${WRKSRC} && glib-gettextize --force --copy
>-	cd ${WRKSRC} && intltoolize --copy --force --automake
>-	cd ${WRKSRC} && ${LIBTOOLIZE} --force --copy
>-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
>-	${TOUCH} ${WRKSRC}/config.h.in
>+	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
>+	(cd ${WRKSRC} && ${TOUCH} ltconfig)
>+	(cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize --copy --force --automake)
>+	(cd ${WRKSRC} && ${LIBTOOLIZE} --force --copy)
>+	(cd ${WRKSRC} && ${ACLOCAL} -I ../acfiles -I /usr/local/share/aclocal)
>+	(cd ${WRKSRC} && ${AUTOHEADER})
>+	(cd ${WRKSRC} && ${AUTOMAKE} --add-missing --gnu)
>+	(cd ${WRKSRC} && ${AUTOCONF})
>+
>+post-configure:
>+	${REINPLACE_CMD} -e "s,[(]libdir[)]/bonobo/server,{exec_prefix}/libdata/bonobo/server,g" \
>+		${WRKSRC}/src/Makefile
>+	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
>+		${WRKSRC}/help/C/Makefile
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/distinfo ports/textproc/iiimf-gnome-im-switcher/distinfo
>--- ports.orig/textproc/iiimf-gnome-im-switcher/distinfo	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/distinfo	Thu Feb 17 22:13:12 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-Makefile ports/textproc/iiimf-gnome-im-switcher/files/patch-Makefile
>--- ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gnome-im-switcher/files/patch-Makefile	Thu Feb 17 22:13:12 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh
>--- ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh	Thu Feb 17 22:23:26 2005
>@@ -0,0 +1,71 @@
>+--- gnome-im-switcher/autogen.sh	Fri Dec  5 12:25:06 2003
>++++ gnome-im-switcher/autogen.sh	Wed Feb 16 16:50:27 2005
>+@@ -13,15 +13,20 @@
>+ 
>+ DIE=0
>+ 
>+-AUTOMAKE=automake-1.4
>+-ACLOCAL=aclocal-1.4
>++LIBTOOL=libtool15
>++INTLTOOLIZE=intltoolize
>++LIBTOOLIZE=libtoolize15
>++ACLOCAL=aclocal15
>++AUTOHEADER=autoheader253
>++AUTOMAKE=automake15
>++AUTOCONF=autoconf253
>+ 
>+ ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
>+         AUTOMAKE=automake
>+         ACLOCAL=aclocal
>+ }
>+ 
>+-(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 "Download the appropriate package for your distribution,"
>+@@ -38,7 +43,7 @@
>+ }
>+ 
>+ (grep "^AM_PROG_LIBTOOL" configure.in >/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 to compile $PROJECT."
>+     echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
>+@@ -57,7 +62,7 @@
>+ }
>+ 
>+ (grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/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"
>+@@ -115,22 +120,22 @@
>+       fi
>+       if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
>+         echo "Running intltoolize..."
>+-	intltoolize --copy --force --automake
>++	$INTLTOOLIZE --copy --force --automake
>+       fi
>+       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
>+ 	echo "Running libtoolize..."
>+-	libtoolize --force --copy
>++	$LIBTOOLIZE --force --copy
>+       fi
>+       echo "Running $ACLOCAL $aclocalinclude ..."
>+       $ACLOCAL $aclocalinclude
>+       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
>+ 	echo "Running autoheader..."
>+-	autoheader
>++	$AUTOHEADER
>+       fi
>+       echo "Running $AUTOMAKE --gnu $am_opt ..."
>+       $AUTOMAKE --add-missing --gnu $am_opt
>+       echo "Running autoconf ..."
>+-      autoconf
>++      $AUTOCONF
>+     )
>+   fi
>+ done
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c
>--- ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c	Thu Feb 17 22:26:04 2005
>@@ -0,0 +1,14 @@
>+--- gnome-im-switcher/src/widgets.c	Thu Oct 14 23:10:11 2004
>++++ gnome-im-switcher/src/widgets.c	Wed Feb 16 16:51:26 2005
>+@@ -29,7 +29,11 @@
>+ #include <gnome.h>
>+ 
>+ #include <signal.h>
>++#ifdef __FreeBSD__
>++#include <sys/wait.h>
>++#else
>+ #include <wait.h>
>++#endif
>+ 
>+ #include "gnome-im-switcher.h"
>+ #include "iiim-interface.h"
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-src_language.c ports/textproc/iiimf-gnome-im-switcher/files/patch-src_language.c
>--- ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-src_language.c	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/files/patch-src_language.c	Thu Jan  1 09:00:00 1970
>@@ -1,12 +0,0 @@
>---- src/language.c.orig	Thu Apr 29 20:23:29 2004
>-+++ src/language.c	Wed Oct 13 22:52:28 2004
>-@@ -946,8 +946,8 @@
>- gimlet_language_get_conversion_mode (char *iiim_lang_name)
>- {
>-   GSList *tmp;
>--  tmp = active_languages;
>-   GimletLanguage *lang;
>-+  tmp = active_languages;
>- 
>-   while (tmp != NULL)
>-     {
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-src_quick-access-menu.c ports/textproc/iiimf-gnome-im-switcher/files/patch-src_quick-access-menu.c
>--- ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-src_quick-access-menu.c	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/files/patch-src_quick-access-menu.c	Thu Jan  1 09:00:00 1970
>@@ -1,13 +0,0 @@
>---- src/quick-access-menu.c.orig	Fri Jul 16 00:32:39 2004
>-+++ src/quick-access-menu.c	Wed Oct 13 23:01:48 2004
>-@@ -279,9 +279,9 @@
>- 	  GtkWidget *le_submenu;
>- 	  GtkWidget *le_submenu_item;
>- 	  GSList *legroup = NULL;
>-+	  int i, len;
>- 
>- 	  le_submenu = gtk_menu_new ();
>--	  int i, len;
>- 	  len = g_list_length (lelist);
>- 	  le_submenu_item = gtk_radio_menu_item_new_with_label (legroup, lelist->data);
>- 	  legroup = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (le_submenu_item));
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-src_widgets.c ports/textproc/iiimf-gnome-im-switcher/files/patch-src_widgets.c
>--- ports.orig/textproc/iiimf-gnome-im-switcher/files/patch-src_widgets.c	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/files/patch-src_widgets.c	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/widgets.c.orig	Fri Sep 10 16:41:33 2004
>-+++ src/widgets.c	Fri Sep 10 16:42:03 2004
>-@@ -29,7 +29,7 @@
>- #include <gnome.h>
>- 
>- #include <signal.h>
>--#include <wait.h>
>-+#include <sys/wait.h>
>- 
>- #include "gnome-im-switcher.h"
>- #include "widgets.h"
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/pkg-descr ports/textproc/iiimf-gnome-im-switcher/pkg-descr
>--- ports.orig/textproc/iiimf-gnome-im-switcher/pkg-descr	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/pkg-descr	Thu Feb 17 22:13:12 2005
>@@ -1,19 +1,19 @@
> IIIMF stands for Internet/Intranet Input Method Framework.
> IIIMF is designed to be the next generation of input method framework
>+which provides the following capabilities;
> 
>-This port provides two input method utility applications for GNOME desktop
>-environments.
>-
>-  GIMLET - GNOME Input Method Language Enabling Tool
>-
>-As a gnome-panel applet, this UI is used to select input languages for IIIM
>-client applications (IIIMGCF and IIIMXCF).
>-
>-  GIMPET - GNOME Input Method Property Edittingggg Tool
>-
>-As a gnome capplet, this UI is to allow user to customize input methods,
>-for enabling/disabling input method infrastucuture itself, and
>-enabling/disabling input method statur bar and candidate choice window.
>+* Multiplatform, platform independent.
>+* Multlingual and Full UNICODE support, but satisfactory for native speakers.
>+* Windowing System Independent.
>+* Multiple language engines concurrently run.
>+* Multiuser.
>+* Distributed, lightweight clients and scalable server.
>+* Extensible in multiple means.
>+* Input method protocol efficient enough to be used over low-speed modem
>+  connection.
>+* Easy input method engine development with plugin API.
>+* Easy input method enabling with libiiimcf, even on console apps.
>+* Small core part to start from.
> 
> WWW: http://www.openi18n.org/subgroups/im/IIIMF/
> 
>diff -r -u -N ports.orig/textproc/iiimf-gnome-im-switcher/pkg-plist ports/textproc/iiimf-gnome-im-switcher/pkg-plist
>--- ports.orig/textproc/iiimf-gnome-im-switcher/pkg-plist	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gnome-im-switcher/pkg-plist	Sat Feb 19 23:33:04 2005
>@@ -1,23 +1,32 @@
> bin/gnome-im-properties
> bin/gnome-im-settings-daemon
>-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas >/dev/null || /usr/bin/true
>-etc/gconf/schemas/gnome-im-properties.schemas
>-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas >/dev/null || /usr/bin/true
>-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas >/dev/null || /usr/bin/true
>-etc/gconf/schemas/gnome-im-switcher.schemas
>-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas >/dev/null || /usr/bin/true
> libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
> libexec/gnome-im-switcher-applet
>-share/control-center-2.0/capplets/gnome-im-properties.desktop
>-share/control-center-2.0/interfaces/gnome-im-properties.glade2
>-share/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
>-share/gnome-im-switcher/glade/gnome-im-switcher.glade2
>-share/icons/hicolor/48x48/apps/gnome-settings-im.png
>-share/pixmaps/gnome-settings-im.png
>-@dirrm share/control-center-2.0/capplets
>-@dirrm share/control-center-2.0/interfaces
>-@dirrm share/control-center-2.0
>-@dirrm share/gnome-2.0/ui
>-@dirrm share/gnome-2.0
>-@dirrm share/gnome-im-switcher/glade
>-@dirrm share/gnome-im-switcher
>+share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
>+share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
>+share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
>+share/gnome/pixmaps/gnome-settings-im.png
>+share/gnome/pixmaps/gimlet-off.png
>+share/gnome/pixmaps/gimlet-on.png
>+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
>+etc/gconf/schemas/gnome-im-switcher.schemas
>+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
>+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
>+etc/gconf/schemas/gnome-im-properties.schemas
>+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
>+@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
>+share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
>+@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
>+@dirrm share/gnome/omf/gnome-im-switcher
>+share/gnome/gnome-im-switcher/glade/gnome-im-switcher.glade2
>+@dirrm share/gnome/gnome-im-switcher/glade
>+@dirrm share/gnome/gnome-im-switcher
>+share/gnome/help/imswitcher/C/legal.xml
>+share/gnome/help/imswitcher/C/imswitcher.xml
>+@dirrm share/gnome/help/imswitcher/C
>+@dirrm share/gnome/help/imswitcher
>+share/gnome/icons/hicolor/48x48/apps/gnome-settings-im.png
>+@unexec rmdir %D/share/gnome/icons/hicolor/48x48/apps > /dev/null 2>&1 || true
>+@unexec rmdir %D/share/gnome/icons/hicolor/48x48 > /dev/null 2>&1 || true
>+@unexec rmdir %D/share/gnome/icons/hicolor > /dev/null 2>&1 || true
>+@unexec rmdir %D/share/gnome/icons > /dev/null 2>&1 || true
>diff -r -u -N ports.orig/textproc/iiimf-gtk/Makefile ports/textproc/iiimf-gtk/Makefile
>--- ports.orig/textproc/iiimf-gtk/Makefile	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gtk/Makefile	Tue Feb 22 22:21:25 2005
>@@ -7,42 +7,60 @@
> 
> PORTNAME=	gtk
> PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
>-PORTREVISION=	1
> 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=	Internet/Intranet Input Method Gtk Client Framework
>+COMMENT=	Internet/Intranet Input Method Server Framework
> 
> LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
> 		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
> 
>-USE_GNOME=	gtk20
> USE_X_PREFIX=	yes
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimgcf
>-USE_REINPLACE=	yes
>-USE_AUTOCONF_VER=	259
>-USE_AUTOHEADER_VER=	259
>-USE_AUTOMAKE_VER=	19
>-USE_LIBTOOL_VER=	15
>-
>-PLIST_FILES=	lib/gtk-2.0/2.4.0/immodules/im-iiim.so
>+IIIMF_VER=	r12_1-svn2002
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool gtk20
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf
>+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+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}/imaux.c
>+		${WRKSRC}/../acfiles/im_common.m4
> 
> pre-configure:
>-	cd ${WRKSRC} && glib-gettextize --force --copy
>-	cd ${WRKSRC} && ${MV} po ../acfiles && ${LN} -s ../acfiles/po && intltoolize --copy --force --automake
>-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
>-	${TOUCH} ${WRKSRC}/config.h.in
>+	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
>+
>+do-configure:
>+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
>+
>+post-install:
>+	${X11BASE}/bin/gtk-query-immodules-2.0 > \
>+		${X11BASE}/etc/gtk-2.0/gtk.immodules
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-gtk/distinfo ports/textproc/iiimf-gtk/distinfo
>--- ports.orig/textproc/iiimf-gtk/distinfo	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gtk/distinfo	Thu Feb 17 21:52:44 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-gtk/files/patch-Makefile ports/textproc/iiimf-gtk/files/patch-Makefile
>--- ports.orig/textproc/iiimf-gtk/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gtk/files/patch-Makefile	Thu Feb 17 21:52:44 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am ports/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
>--- ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am	Thu Feb 17 22:06:58 2005
>@@ -1,12 +1,20 @@
>---- Makefile.am.orig	Tue Sep  7 22:44:25 2004
>-+++ Makefile.am	Tue Sep  7 22:45:11 2004
>-@@ -15,8 +15,7 @@
>+--- iiimgcf/Makefile.am	Thu Jan 15 10:51:58 2004
>++++ iiimgcf/Makefile.am	Thu Feb 17 22:05:59 2005
>+@@ -9,14 +9,13 @@
>+ moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
>+ 
>+ im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
>+-im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
>++im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined \
>++		     -liiimcf -liiimp
>+ 
>+ im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
>                       gtkimcontextiiim.c gtkimcontextiiim.h \
>                       imiiim.c imswitcher.c imaux.c
>- im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
>+-im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
> -                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
> -                    $(IM_LIBDIR)/iiimp/libiiimp.la
>-+		    -L$(prefix)/lib -liiimcf -liiimp
>++im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS)
>  
>  module_LTLIBRARIES = im-iiim.la
>  
>diff -r -u -N ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh ports/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh
>--- ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh	Thu Feb 17 21:58:15 2005
>@@ -0,0 +1,73 @@
>+--- iiimgcf/autogen.sh	Thu Dec 11 17:29:28 2003
>++++ iiimgcf/autogen.sh	Wed Feb 16 16:48:14 2005
>+@@ -12,7 +12,15 @@
>+ 
>+ DIE=0
>+ 
>+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
>++LIBTOOL=libtool15
>++INTLTOOLIZE=intltoolize
>++LIBTOOLIZE=libtoolize15
>++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 +38,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 +47,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 +56,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 +104,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 -r -u -N ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac ports/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac
>--- ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac	Thu Feb 17 21:58:58 2005
>@@ -0,0 +1,19 @@
>+--- iiimgcf/configure.ac	Tue Nov 18 12:17:57 2003
>++++ iiimgcf/configure.ac	Thu Feb 17 15:26:50 2005
>+@@ -63,13 +63,13 @@
>+ COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
>+ CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
>+         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
>+-        ${THREAD_COMMON_CXX_CFLAGS}"
>++        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
>+ 
>+ CXXFLAGS="${COMMON_INCLUDE} ${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}"
>++LDFLAGS="${COMMON_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
>+ 
>+ dnl --------------------------------------------------------------------------------
>+ dnl                       Section 6: compilation test
>diff -r -u -N ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c ports/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c
>--- ports.orig/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c	Thu Feb 17 21:59:29 2005
>@@ -0,0 +1,11 @@
>+--- iiimgcf/imaux.c	Thu Jul 29 20:44:21 2004
>++++ iiimgcf/imaux.c	Wed Feb 16 20:40:51 2005
>+@@ -36,7 +36,7 @@
>+ 
>+ static void iiim_aux_download (IIIMCF_downloaded_object obj);
>+ 
>+-#define AUX_BASE_DIR		"/usr/lib/im/"
>++#define AUX_BASE_DIR		"/usr/local/lib/im/"
>+ 
>+ #define IS_SPACE(len, ptr)	((0 < (len)) &&				\
>+ 				 (('\t' == *(p)) || (' ' == *(p))))
>diff -r -u -N ports.orig/textproc/iiimf-gtk/pkg-plist ports/textproc/iiimf-gtk/pkg-plist
>--- ports.orig/textproc/iiimf-gtk/pkg-plist	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-gtk/pkg-plist	Fri Feb 18 19:44:47 2005
>@@ -0,0 +1,3 @@
>+lib/gtk-2.0/2.4.0/immodules/im-iiim.so
>+@exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
>+@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
>diff -r -u -N ports.orig/textproc/iiimf-le-unit/Makefile ports/textproc/iiimf-le-unit/Makefile
>--- ports.orig/textproc/iiimf-le-unit/Makefile	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/Makefile	Tue Feb 22 22:22:11 2005
>@@ -10,48 +10,60 @@
> 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
> 
>-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
>+BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
>+LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
>+		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
> 
>-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 -r -u -N ports.orig/textproc/iiimf-le-unit/distinfo ports/textproc/iiimf-le-unit/distinfo
>--- ports.orig/textproc/iiimf-le-unit/distinfo	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/distinfo	Thu Feb 17 22:39:09 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-Makefile ports/textproc/iiimf-le-unit/files/patch-Makefile
>--- ports.orig/textproc/iiimf-le-unit/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-Makefile	Thu Feb 17 22:39:09 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_autogen.sh ports/textproc/iiimf-le-unit/files/patch-leif_autogen.sh
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_autogen.sh	Thu Feb 17 22:50:07 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_configure.ac ports/textproc/iiimf-le-unit/files/patch-leif_configure.ac
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_configure.ac	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_configure.ac	Thu Feb 17 23:33:59 2005
>@@ -1,10 +1,28 @@
>---- 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])
>+--- leif/configure.ac	Wed Oct  6 23:00:36 2004
>++++ leif/configure.ac	Thu Feb 17 23:32:54 2005
>+@@ -61,20 +61,20 @@
>+ IM_CONSTRUCT_FLAGS
>+ IM_CONSTRUCT_THREAD_FLAGS
>  
>- AM_INIT_AUTOMAKE(im-sdk, 11.0)
>- AM_CONFIG_HEADER(config.h)
>+ 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"
>+ 
>+-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
>+-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
>++dnl IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
>++dnl 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)
>diff -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_newpy_NewPY.c ports/textproc/iiimf-le-unit/files/patch-leif_newpy_NewPY.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_newpy_NewPY.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_newpy_NewPY.c	Thu Feb 17 22:53:57 2005
>@@ -0,0 +1,11 @@
>+--- 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 = "/usr/local/lib/im/locale/zh_CN/newpy/newpy_obj.jar";  /* path */
>+ #endif
>+ 
>+     l->signature = "";
>diff -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_so.c	Thu Feb 17 22:55:27 2005
>@@ -0,0 +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
>+@@ -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			"/usr/local/lib/im/locale/zh_CN/newpy/aux_win"
>+ 
>+ typedef struct _aux_icid {
>+         aux_t *                 aux;
>diff -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_win.c ports/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_win.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_win.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_newpy_xaux_aux_win.c	Thu Feb 17 22:55:57 2005
>@@ -0,0 +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
>+@@ -61,7 +61,7 @@
>+ #include "gif_lib.h"
>+ #include "getarg.h"
>+ 
>+-#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/"
>++#define IMAGE_PATH "/usr/local/lib/im/locale/zh_CN/newpy/"
>+ 
>+ Pixmap LoadGIFFile(char * filename);
>+ static void AllocateColors1(void);
>diff -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c	Thu Feb 17 22:57:58 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h	Thu Feb 17 22:58:40 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.c	Thu Feb 17 22:59:47 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h	Thu Feb 17 23:00:25 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c	Thu Feb 17 23:01:21 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c	Thu Feb 17 23:01:55 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c	Thu Feb 17 23:02:21 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h	Thu Feb 17 23:02:38 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c	Thu Feb 17 23:03:10 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c	Thu Feb 17 22:56:40 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c	Thu Feb 17 22:57:18 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c	Thu Feb 17 23:04:06 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c	Thu Feb 17 23:04:45 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c	Thu Feb 17 23:05:17 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c	Thu Feb 17 23:05:46 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c	Thu Feb 17 23:06:23 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h	Thu Feb 17 23:06:58 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c	Thu Feb 17 23:09:23 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c	Thu Feb 17 23:22:02 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c	Thu Feb 17 23:22:51 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h	Thu Feb 17 23:24:21 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h	Thu Feb 17 23:23:24 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h	Thu Feb 17 23:23:52 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c	Thu Feb 17 23:25:28 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c	Thu Feb 17 23:24:51 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c	Thu Feb 17 23:10:19 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c	Thu Feb 17 23:10:57 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c	Thu Feb 17 23:11:27 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c	Thu Feb 17 23:12:33 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c	Thu Feb 17 23:13:13 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c	Thu Feb 17 23:13:53 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c	Thu Feb 17 23:14:51 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c	Thu Feb 17 23:15:30 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h	Thu Feb 17 23:16:43 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c	Thu Feb 17 23:17:31 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c	Thu Feb 17 23:18:42 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c	Thu Feb 17 23:19:10 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h	Thu Feb 17 23:20:00 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c	Thu Feb 17 23:20:54 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c	Thu Feb 17 23:21:26 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_ude_UDEngine.c ports/textproc/iiimf-le-unit/files/patch-leif_ude_UDEngine.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_ude_UDEngine.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_ude_UDEngine.c	Thu Feb 17 23:26:24 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h ports/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h	Thu Feb 17 23:29:24 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am	Thu Feb 17 23:30:42 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am ports/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am
>--- ports.orig/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am	Thu Feb 17 23:31:33 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c ports/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c
>--- ports.orig/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c	Thu Feb 17 23:40:27 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh ports/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh
>--- ports.orig/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh	Thu Feb 17 23:40:27 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-le-unit/pkg-descr ports/textproc/iiimf-le-unit/pkg-descr
>--- ports.orig/textproc/iiimf-le-unit/pkg-descr	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/pkg-descr	Thu Feb 17 22:39:09 2005
>@@ -1,11 +1,19 @@
> IIIMF stands for Internet/Intranet Input Method Framework.
> IIIMF is designed to be the next generation of input method framework
>+which provides the following capabilities;
> 
>-UNIcode Table based generic composition engine with lookup-choice capability,
>-originally shipped with Solaris 9 update. Since the Unit started as hile,
>-the HIndi LE, this engine comes with Indic scripts tables, but it does not
>-mean this engine only supports Indic, it can be enhanced to wider scripts
>-coverage.
>+* Multiplatform, platform independent.
>+* Multlingual and Full UNICODE support, but satisfactory for native speakers.
>+* Windowing System Independent.
>+* Multiple language engines concurrently run.
>+* Multiuser.
>+* Distributed, lightweight clients and scalable server.
>+* Extensible in multiple means.
>+* Input method protocol efficient enough to be used over low-speed modem
>+  connection.
>+* Easy input method engine development with plugin API.
>+* Easy input method enabling with libiiimcf, even on console apps.
>+* Small core part to start from.
> 
> WWW: http://www.openi18n.org/subgroups/im/IIIMF/
> 
>diff -r -u -N ports.orig/textproc/iiimf-le-unit/pkg-plist ports/textproc/iiimf-le-unit/pkg-plist
>--- ports.orig/textproc/iiimf-le-unit/pkg-plist	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-le-unit/pkg-plist	Fri Feb 18 19:25:32 2005
>@@ -1,17 +1,25 @@
>+lib/im/leif/chewing.so
>+lib/im/leif/default.so
>+lib/im/leif/hangul.so
>+lib/im/leif/newpy.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 +49,68 @@
> 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
>+lib/im/locale/ko_KR/hangul.conf
>+lib/im/locale/ko_KR/tables/candidate.txt
>+lib/im/locale/zh_CN/newpy/aux.so
>+lib/im/locale/zh_CN/newpy/aux.so.0
>+lib/im/locale/zh_CN/newpy/aux_win
>+lib/im/locale/zh_CN/newpy/data/PyCiku.dat
>+lib/im/locale/zh_CN/newpy/data/UdCiku.dat
>+lib/im/locale/zh_CN/newpy/full.gif
>+lib/im/locale/zh_CN/newpy/gb.gif
>+lib/im/locale/zh_CN/newpy/gbk.gif
>+lib/im/locale/zh_CN/newpy/half.gif
>+lib/im/locale/zh_CN/newpy/help.gif
>+lib/im/locale/zh_CN/newpy/newpy_obj.jar
>+lib/libchewing.a
>+lib/libchewing.so
>+lib/libchewing.so.0
>+share/chewing/ch_index.dat
>+share/chewing/dict.dat
>+share/chewing/fonetree.dat
>+share/chewing/ph_index.dat
>+share/chewing/us_freq.dat
> @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
>+@dirrm lib/im/locale/ko_KR/tables
>+@dirrm lib/im/locale/ko_KR
>+@dirrm lib/im/locale/zh_CN/newpy/data
>+@dirrm lib/im/locale/zh_CN/newpy
>+@dirrm lib/im/locale/zh_CN
>+@dirrm lib/im/leif
>+@dirrm lib/im/locale
>+@dirrm share/chewing
>diff -r -u -N ports.orig/textproc/iiimf-protocol-lib/Makefile ports/textproc/iiimf-protocol-lib/Makefile
>--- ports.orig/textproc/iiimf-protocol-lib/Makefile	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-protocol-lib/Makefile	Tue Feb 22 22:22:49 2005
>@@ -10,31 +10,49 @@
> 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=	Internet/Intranet Input Method Framework protocol library
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/iiimp
>+IIIMF_VER=	r12_1-svn2002
> INSTALLS_SHLIB=	yes
>-USE_REINPLACE=	yes
>-USE_OPENSSL=	yes
>-USE_AUTOCONF_VER=	259
>-USE_AUTOHEADER_VER=	259
>-USE_AUTOMAKE_VER=	19
>-USE_LIBTOOL_VER=	15
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/iiimf/iiimp
>+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-//}/lib/iiimp
>+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
>+.endif
>+
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+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}/../../acfiles/im_common.m4
> 
> pre-configure:
>-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles
>-	${TOUCH} ${WRKSRC}/config.h.in
>+	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
>+
>+do-configure:
>+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-protocol-lib/distinfo ports/textproc/iiimf-protocol-lib/distinfo
>--- ports.orig/textproc/iiimf-protocol-lib/distinfo	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-protocol-lib/distinfo	Thu Feb 17 19:26:19 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-protocol-lib/files/patch-Makefile ports/textproc/iiimf-protocol-lib/files/patch-Makefile
>--- ports.orig/textproc/iiimf-protocol-lib/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-protocol-lib/files/patch-Makefile	Thu Feb 17 19:37:42 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h ports/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h
>--- ports.orig/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-protocol-lib/files/patch-lib-iiimp-data-iiimp-dataP.h	Thu Jan  1 09:00:00 1970
>@@ -1,26 +0,0 @@
>---- data/iiimp-dataP.h.orig	Tue Aug 24 13:38:12 2004
>-+++ data/iiimp-dataP.h	Wed Sep  8 23:04:47 2004
>-@@ -14,8 +14,13 @@
>- extern "C" {
>- #endif
>- 
>-+#if defined(BIG_ENDIAN) && defined(BYTE_ORDER) && (BIG_ENDIAN==BYTE_ORDER)
>-+#define _IT_IS_BIG_ENDIAN_LALALA_
>-+#elif defined(_BIG_ENDIAN) && defined(_BYTE_ORDER) && (_BIG_ENDIAN==_BYTE_ORDER)
>-+#define _IT_IS_BIG_ENDIAN_LALALA_
>-+#endif
>- 
>--#if defined(_BIG_ENDIAN) || defined(WORDS_BIGENDIAN)
>-+#if defined(_IT_IS_BIG_ENDIAN_LALALA_)
>- 
>- #define	GETU16(n, r, p, b)	(((n) = ((0 == (b)) ? \
>- 					 (((*((uchar_t *)(p + 0))) << 8) + \
>-@@ -113,7 +118,7 @@
>- 
>- #else /* !(_BIG_ENDIAN || WORDS_BIGENDIAN) */
>- 
>--#define	GET_SCOPE_FOR_HOTKEY(n, p, b) \	
>-+#define	GET_SCOPE_FOR_HOTKEY(n, p, b) \
>-                                    if (0 == (b)) { \
>-                                      if ((*((uchar_t *)(p + 1)) & 0x80)) \
>-                                        (n) = 1; \
>diff -r -u -N ports.orig/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh
>--- ports.orig/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh	Thu Feb 17 19:30:41 2005
>@@ -0,0 +1,72 @@
>+--- lib/iiimp/autogen.sh	Wed Mar 24 05:43:35 2004
>++++ lib/iiimp/autogen.sh	Wed Feb 16 15:03:52 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 -r -u -N ports.orig/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c
>--- ports.orig/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c	Thu Feb 17 19:32:14 2005
>@@ -0,0 +1,29 @@
>+--- lib/iiimp/data/comp-string.c	Fri Nov  1 14:32:45 2002
>++++ lib/iiimp/data/comp-string.c	Wed Feb 16 22:48:21 2005
>+@@ -63,9 +63,12 @@
>+ #if defined(lint) && defined(HAVE_NOTE_H)
>+     NOTE(ARGUNUSED(data_s))
>+ #endif /* lint && HAVE_NOTE_H */
>+-    if (NULL == str) return;
>+-    free(str->ptr);
>+-    free(str);
>++    if (str) {
>++        if (str->ptr)
>++            free(str->ptr);
>++        str->ptr = NULL;
>++        free(str);
>++    }
>+     return;
>+ }
>+ 
>+@@ -79,7 +82,9 @@
>+     IIIMP_string *	str_next;
>+     for (; NULL != str; str = str_next) {
>+ 	str_next = str->next;
>+-	free(str->ptr);
>++	if (str->ptr)
>++            free(str->ptr);
>++        str->ptr = NULL;
>+ 	free(str);
>+     }
>+     return;
>diff -r -u -N ports.orig/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c
>--- ports.orig/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c	Thu Feb 17 19:33:15 2005
>@@ -0,0 +1,22 @@
>+--- lib/iiimp/data/im-connect.c	Fri Jun 20 12:06:33 2003
>++++ lib/iiimp/data/im-connect.c	Wed Feb 16 22:43:17 2005
>+@@ -41,10 +41,15 @@
>+ void
>+ iiimp_connect_delete(IIIMP_data_s * data_s, IIIMP_message * m)
>+ {
>+-    if (NULL == m) return;
>+-    iiimp_string_delete(data_s, m->v.connect.user_name);
>+-    iiimp_string_list_delete(data_s, m->v.connect.auth);
>+-    free(m);
>++    if (m) {
>++        if (m->v.connect.user_name) 
>++            iiimp_string_delete(data_s, m->v.connect.user_name);
>++        m->v.connect.user_name = NULL;
>++        if (m->v.connect.auth)
>++            iiimp_string_list_delete(data_s, m->v.connect.auth);
>++        m->v.connect.auth = NULL;
>++        free(m);
>++    }
>+     return;
>+ }
>+ 
>diff -r -u -N ports.orig/textproc/iiimf-protocol-lib/pkg-plist ports/textproc/iiimf-protocol-lib/pkg-plist
>--- ports.orig/textproc/iiimf-protocol-lib/pkg-plist	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-protocol-lib/pkg-plist	Fri Feb 18 15:31:11 2005
>@@ -1,10 +1,8 @@
>-include/iiimf/iiimp/iiimp.h
>-include/iiimf/iiimp/iiimp-opcode.h
>-include/iiimf/iiimp/iiimp-keycode.h
>-include/iiimf/iiimp/iiimp-data.h
>-include/iiimf/iiimp/iiimp-character-subsets.h
>-lib/libiiimp.so.0
>-lib/libiiimp.so
> lib/libiiimp.a
>-@dirrm include/iiimf/iiimp
>-@unexec rmdir %D/include/iiimf 2>/dev/null || true
>+lib/libiiimp.so
>+lib/libiiimp.so.0
>+include/iiimp-character-subsets.h
>+include/iiimp-data.h
>+include/iiimp-keycode.h
>+include/iiimp-opcode.h
>+include/iiimp.h
>diff -r -u -N ports.orig/textproc/iiimf-server/Makefile ports/textproc/iiimf-server/Makefile
>--- ports.orig/textproc/iiimf-server/Makefile	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-server/Makefile	Tue Feb 22 22:25:44 2005
>@@ -10,42 +10,59 @@
> 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=	Internet/Intranet Input Method Server Framework
> 
>-LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
>+LIB_DEPENDS=    iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimsf
>-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}-${IIIMF_VER}
>-USE_OPENSSL=	yes
>-USE_REINPLACE=	yes
>-USE_AUTOCONF_VER=	259
>-USE_AUTOHEADER_VER=	259
>-USE_AUTOMAKE_VER=	19
>-USE_LIBTOOL_VER=	15
>-LIBTOOLFILES=	${WRKSRC}/aclocal.m4
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
>+IIIMF_VER=	r12_1-svn2002
>+USE_RC_SUBR=	htt.sh
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool pkgconfig libxml2
>+USE_OPENSSL=    yes
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf
>+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "sparc64"
>-BROKEN=		"Does not build on sparc64"
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
>+.if ${ARCH} != "i386"
>+IGNORE=	"${ARCH} is not support."
> .endif
> 
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+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}/src/IMSvrCfg.cpp \
>-		${WRKSRC}/src/watchdog.c
>+		${WRKSRC}/src/le.xml.conf
>+	${MV} ${WRKSRC}/htt.xml.conf ${WRKSRC}/htt.xml.conf.sample
>+	${MV} ${WRKSRC}/src/le.xml.conf ${WRKSRC}/src/le.xml.conf.sample
> 
> pre-configure:
>-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles
>-	${TOUCH} ${WRKSRC}/config.h.in
>+	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
>+
>+do-configure:
>+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
>+
>+post-configure:
>+	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
>+		${WRKSRC}/src/Makefile
> 
> .include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-server/distinfo ports/textproc/iiimf-server/distinfo
>--- ports.orig/textproc/iiimf-server/distinfo	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-server/distinfo	Thu Feb 17 20:42:13 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-server/files/htt.sh.in ports/textproc/iiimf-server/files/htt.sh.in
>--- ports.orig/textproc/iiimf-server/files/htt.sh.in	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/htt.sh.in	Tue Feb 22 17:08:37 2005
>@@ -0,0 +1,21 @@
>+#!/bin/sh
>+
>+# $FreeBSD$
>+
>+# PROVIDE: htt
>+# REQUIRE: DAEMON
>+# KEYWORD: FreeBSD shutdown
>+
>+prefix=%%PREFIX%%
>+
>+htt_enable=${htt_enable:-"NO"}
>+
>+. %%RC_SUBR%%
>+
>+name="htt"
>+rcvar=`set_rcvar`
>+command="${prefix}/lib/im/htt"
>+
>+load_rc_config $name
>+command_args="> /dev/null 2>&1 &"
>+run_rc_command "$1"
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-Makefile ports/textproc/iiimf-server/files/patch-Makefile
>--- ports.orig/textproc/iiimf-server/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-Makefile	Thu Feb 17 20:42:13 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 ports/textproc/iiimf-server/files/patch-acfiles_check_sys.m4
>--- ports.orig/textproc/iiimf-server/files/patch-acfiles_check_sys.m4	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-server/files/patch-acfiles_check_sys.m4	Thu Jan  1 09:00:00 1970
>@@ -1,36 +0,0 @@
>---- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
>-+++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
>-@@ -74,6 +74,11 @@
>- ## Checks for thread library.
>- 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
>- 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
>-+
>-+	case "${target}" in
>-+		*freebsd*) HAVE_LIBPTHREAD="yes";;
>-+	esac
>-+
>- 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
>- 		HAVE_THREAD="pthread"
>- 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
>-@@ -210,8 +215,6 @@
>- 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
>- 		;;
>- 	    *freebsd*)
>--		THREAD_LDFLAGS="-pthread"
>--		PTHREAD_LIBS=""
>- 		;;
>- 	esac
>- 
>-@@ -249,9 +252,9 @@
>- 		THREAD_CXX_CFLAGS="-mt"
>- 		HAVE_THREAD="uithread"
>- 		;;
>--	    *freebsd*@gcc:*)
>--		THREAD_LDFLAGS="-pthread"
>--		THREAD_LIBS=""
>-+	    *freebsd*)
>-+		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
>-+		THREAD_LIBS="${PTHREAD_LIBS}"
>- 		HAVE_THREAD="freebsd-pthread"
>- 		;;
>- 	    *linux*)
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am ports/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am	Thu Jan  1 09:00:00 1970
>@@ -1,9 +0,0 @@
>---- iiimsf/src/Makefile.am.orig	Sun Sep  5 04:47:50 2004
>-+++ iiimsf/src/Makefile.am	Sun Sep  5 04:48:50 2004
>-@@ -29,5 +29,5 @@
>- 
>- htt_SOURCES = watchdog.c
>- 
>--htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS)
>-+htt_server_LDADD = $(LIB_DIR)/iml/libiml.la -L$(LOCALBASE)/lib -liiimp $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS)
>- bin_PROGRAMS = htt_server htt
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_Makefile.am ports/textproc/iiimf-server/files/patch-iiimsf_Makefile.am
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_Makefile.am	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_Makefile.am	Sat Feb 19 03:34:28 2005
>@@ -0,0 +1,8 @@
>+--- iiimsf/Makefile.am.orig	Sat Feb 19 03:33:28 2005
>++++ iiimsf/Makefile.am	Sat Feb 19 03:33:48 2005
>+@@ -2,4 +2,4 @@
>+ SUBDIRS = lib src
>+ 
>+ confdir = $(XMLCONFDIR)
>+-conf_DATA = htt.xml.conf
>++conf_DATA = htt.xml.conf.sample src/le.xml.conf.sample
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_autogen.sh ports/textproc/iiimf-server/files/patch-iiimsf_autogen.sh
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_autogen.sh	Thu Feb 17 20:52:09 2005
>@@ -0,0 +1,93 @@
>+--- iiimsf/autogen.sh	Wed Mar 24 06:05:08 2004
>++++ iiimsf/autogen.sh	Wed Feb 16 16:17:26 2005
>+@@ -6,6 +6,14 @@
>+ 
>+ DIE=0
>+ 
>++LIBTOOL=libtool15
>++INTLTOOLIZE=intltoolize15
>++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 -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp ports/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp	Thu Feb 17 20:51:58 2005
>@@ -1,11 +1,12 @@
>---- iiimsf/src/IMAuth.cpp.orig	Sat Dec  6 02:39:41 2003
>-+++ iiimsf/src/IMAuth.cpp	Sat Dec  6 02:39:50 2003
>-@@ -47,7 +47,7 @@
>+--- iiimsf/src/IMAuth.cpp	Sun Jun 20 06:46:28 2004
>++++ iiimsf/src/IMAuth.cpp	Wed Feb 16 16:21:47 2005
>+@@ -47,7 +47,9 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <ctype.h>
>--#include <alloca.h>
>-+#include <sys/types.h>
>++#ifdef HAVE_ALLOCA_H
>+ #include <alloca.h>
>++#endif
>  #include <sys/socket.h>
>  #include <netinet/in.h>
>  #include <arpa/inet.h>
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp ports/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_IMSignal.cpp	Sun Feb 20 18:44:09 2005
>@@ -0,0 +1,27 @@
>+--- iiimsf/src/IMSignal.cpp.orig	Sat Oct 16 10:28:13 2004
>++++ iiimsf/src/IMSignal.cpp	Sun Feb 20 18:43:18 2005
>+@@ -1,7 +1,11 @@
>+ #include <config.h>
>+ #include <sstream>
>+ #include <sys/types.h>
>++#ifdef __FreeBSD__
>++#include <sys/wait.h>
>++#else
>+ #include <wait.h>
>++#endif
>+ #include <unistd.h>
>+ #ifdef HAVE_SIGNAL
>+ #include <signal.h>
>+@@ -67,10 +71,8 @@
>+     stringstream s;
>+     string spid, signum;
>+ 
>+-    s << getpid();
>+-    spid = s.str();
>+-    s << num;
>+-    signum = s.str();
>++    s << getpid() << " " << num;
>++    s >> spid >> signum;
>+ 
>+     in_segv++;
>+ 
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp ports/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp	Thu Feb 17 20:54:18 2005
>@@ -0,0 +1,28 @@
>+--- iiimsf/src/IMSvrCfg.cpp	Mon Oct  4 18:07:05 2004
>++++ iiimsf/src/IMSvrCfg.cpp	Wed Feb 16 20:38:05 2005
>+@@ -90,14 +90,14 @@
>+ void
>+ IMSvrCfg::initialize()
>+ {
>+-    initstr(IMDIR, "IM main directory.", "/usr/lib/im");
>++    initstr(IMDIR, "IM main directory.", "/usr/local/lib/im");
>+     initstr(BASICLOCALE, "Locale used by default", "C");
>+ #ifdef WIN32
>+     initstr(IFPATHNAME, "Language Engine module directory",
>+ 	   "D:\\WINNT\\System32\\iiimf");
>+ #else
>+     initstr(IFPATHNAME, "Language Engine module directory",
>+-	   "/usr/lib/im/leif");
>++	   "/usr/local/lib/im/leif");
>+ #endif
>+     initstr(IFNAME, "Language Engine name", "");
>+     initstr(PORT, "Port or service name", "9010");
>+@@ -115,7 +115,7 @@
>+     initstr(CONVERSIONKEYS, "Conversion ON keys", "<Ctrl>space");
>+     initstr(LABEL, "Label type", "numeric");
>+     initbool(SETTRIGGEROFFKEYS, "set trigger off keys", false);
>+-    // initstr(IMCONFIG, "/usr/lib/im/etc/im.config");
>++    // initstr(IMCONFIG, "/usr/local/lib/im/etc/im.config");
>+     // initbool(DIRECT_XSUNIM, true);
>+     initstr(LOG_FACILITY, "syslog facility", "USER");
>+     initstr(LOG_LEVEL, "log level", "NORMAL");
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp ports/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp	Thu Feb 17 20:54:59 2005
>@@ -0,0 +1,20 @@
>+--- iiimsf/src/IMXMLUtil.cpp	Mon Oct  4 18:07:05 2004
>++++ iiimsf/src/IMXMLUtil.cpp	Wed Feb 16 20:38:34 2005
>+@@ -78,7 +78,7 @@
>+ {
>+     IMXMLModifier xml((const char *)argv[1]);
>+     IMModuleInfoVec *lev;
>+-    string mod("/usr/lib/im/leif/freewnnle.so");
>++    string mod("/usr/local/lib/im/leif/freewnnle.so");
>+     string lang("ja");
>+     string out("foo.conf");
>+ 
>+@@ -101,7 +101,7 @@
>+       }
>+     */
>+     printf("\n\n*** remove\n");
>+-    mod = "/usr/lib/im/leif/CannaLE.so";
>++    mod = "/usr/local/lib/im/leif/CannaLE.so";
>+     xml.removemodule(mod, lang);
>+     /*
>+       for (IMModuleInfoVec::iterator i = lev->begin (); i != lev->end (); i++) {
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am ports/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am	Sun Feb 20 19:44:29 2005
>@@ -0,0 +1,34 @@
>+--- iiimsf/src/Makefile.am.orig	Fri Oct 15 03:39:38 2004
>++++ iiimsf/src/Makefile.am	Sun Feb 20 19:42:40 2005
>+@@ -22,6 +22,7 @@
>+ libiiimsf_la_LIBADD =		\
>+ 	$(TLS_LIBS)		\
>+ 	$(XML_LIBS)		\
>++	-liiimp			\
>+ 	$(NULL)
>+ 
>+ sbindir = $(IMBINDIR)
>+@@ -56,7 +57,6 @@
>+ 
>+ htt_server_LDADD =			\
>+ 	$(LIB_DIR)/iml/libiml.la	\
>+-	$(IM_LIBDIR)/iiimp/libiiimp.la	\
>+ 	$(SOCKET_LIBS)			\
>+ 	$(LIBCRYPT_FLAGS)		\
>+ 	$(LIBPAM_FLAGS)			\
>+@@ -72,7 +72,6 @@
>+ 	$(NULL)
>+ iiimf_le_tools_LDADD =		\
>+ 	$(XML_LIBS)		\
>+-	-ldl			\
>+ 	libiiimsf.la		\
>+ 	$(NULL)
>+ 
>+@@ -82,6 +81,7 @@
>+ iiimf_segv_logger_CFLAGS =				\
>+ 	-DLOGDIR="\"$(localstatedir)/log/iiim\""	\
>+ 	-DDATADIR="\"$(gdbcmddir)\""			\
>++	-DIMBINDIR="\"$(IMBINDIR)\""			\
>+ 	-g						\
>+ 	$(NULL)
>+ gdbcmddir = $(datadir)/iiim
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c ports/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_iwrap.c	Tue Feb 22 16:49:21 2005
>@@ -0,0 +1,35 @@
>+Index: iiimsf/src/iwrap.c
>+diff -u -p iiimsf/src/iwrap.c.orig iiimsf/src/iwrap.c
>+--- iiimsf/src/iwrap.c.orig	Thu Sep  9 06:17:09 2004
>++++ iiimsf/src/iwrap.c	Tue Feb 22 15:22:41 2005
>+@@ -72,6 +72,15 @@ int permit_access(
>+ {
>+ #ifdef HAVE_LIBWRAP
>+     struct request_info req;
>++    struct sockaddr_storage ss;
>++    struct sockaddr *pname = (struct sockaddr*) &ss;
>++    socklen_t size;
>++
>++    size = sizeof(ss);
>++    if (getpeername(h, pname, &size) < 0)
>++	return 0;
>++    if (pname->sa_family == AF_UNIX)
>++    	return 1;
>+ 
>+     request_init(&req, RQ_DAEMON, cmdname, RQ_FILE, h, 0);
>+     fromhost(&req);
>+@@ -177,6 +186,14 @@ authenticate_with_unix(
>+ #ifdef HAVE_GETPEEREID
>+     /* OpenBSD */
>+     git_t gid;
>++
>++    if (getpeereid(sock, &uid, &gid) != 0) {
>++      return 0;
>++    }
>++
>++#elif defined(__FreeBSD__)
>++    /* FreeBSD */
>++    gid_t gid = -1;
>+ 
>+     if (getpeereid(sock, &uid, &gid) != 0) {
>+       return 0;
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c ports/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_segvlogger.c	Sun Feb 20 19:43:52 2005
>@@ -0,0 +1,24 @@
>+--- iiimsf/src/segvlogger.c.orig	Sat Oct 16 10:28:13 2004
>++++ iiimsf/src/segvlogger.c	Sun Feb 20 19:43:06 2005
>+@@ -19,6 +19,10 @@
>+ #include <time.h>
>+ #include <dirent.h>
>+ 
>++#ifdef __FreeBSD__
>++#include <sys/syslimits.h>
>++#endif
>++
>+ int
>+ main(int argc, char **argv)
>+ {
>+@@ -43,8 +47,8 @@
>+ 	exit(1);
>+     }
>+ 
>+-    snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
>+-	     DATADIR, ppid);
>++    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/htt_server %d",
>++	     DATADIR, IMBINDIR, ppid);
>+ 
>+     if ((fpr = popen(buffer, "r")) != NULL) {
>+ 	char logfile[PATH_MAX];
>diff -r -u -N ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c ports/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c
>--- ports.orig/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c	Thu Feb 17 20:57:24 2005
>@@ -1,11 +1,20 @@
>---- iiimsf/src/watchdog.c.orig	Sat Dec  6 02:47:06 2003
>-+++ iiimsf/src/watchdog.c	Sat Dec  6 02:47:34 2003
>-@@ -324,6 +324,8 @@
>+--- iiimsf/src/watchdog.c	Thu Oct 14 23:07:37 2004
>++++ iiimsf/src/watchdog.c	Wed Feb 16 19:03:59 2005
>+@@ -220,7 +220,7 @@
>+     int		argc;
>+     char	**argv;
>+ {
>+-    const char *httpath="/usr/lib/im/htt_server" ; /* SUNWiiimf Only */
>++    const char *httpath="/usr/local/lib/im/htt_server" ; /* SUNWiiimf Only */
>+     pid_t pgrp;
>+     void (*disp)(int);
>+     char **new_argv, **pp;
>+@@ -361,6 +361,8 @@
>      if ((pid_t)(-1) == pgrp)
>        fprintf (stderr,"cannot set session id");
>  
> +#elif defined(__FreeBSD__)
>-+    setsid();
>++    pgrp = setsid();
>  #else /* !SunOS */
>      pgrp = setpgrp(); 
>  #endif /* !SunOS */
>diff -r -u -N ports.orig/textproc/iiimf-server/pkg-plist ports/textproc/iiimf-server/pkg-plist
>--- ports.orig/textproc/iiimf-server/pkg-plist	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-server/pkg-plist	Tue Feb 22 16:46:21 2005
>@@ -1,4 +1,18 @@
>-lib/im/htt_server
>+bin/iiimf-le-tools
>+etc/iiim/htt.xml.conf.sample
>+etc/iiim/le.xml.conf.sample
> lib/im/htt
>-lib/im/htt.conf
>-@dirrm lib/im
>+lib/im/htt_server
>+libexec/iiimf-segv-logger
>+share/iiim/gdbcmd
>+@dirrm etc/iiim
>+@dirrm share/iiim
>+@exec mkdir -p /var/log/iiim
>+@unexec rm -f /var/log/iiim/*.log
>+@unexec rmdir /var/log/iiim > /dev/null 2>&1 || true
>+@exec mkdir -p /var/run/iiim
>+@unexec rm -f /var/run/iiim/.iiimp-unix/[0-9]* > /dev/null 2>&1 || true
>+@unexec rm -f /var/run/iiim/.iiimp-unix-*/[0-9]* > /dev/null 2>&1 || true
>+@unexec rmdir /var/run/iiim/.iiimp-unix > /dev/null 2>&1 || true
>+@unexec rmdir /var/run/iiim/.iiimp-unix-* > /dev/null 2>&1 || true
>+@unexec rmdir /var/run/iiim > /dev/null 2>&1 || true
>diff -r -u -N ports.orig/textproc/iiimf-x/Makefile ports/textproc/iiimf-x/Makefile
>--- ports.orig/textproc/iiimf-x/Makefile	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-x/Makefile	Tue Feb 22 22:24:45 2005
>@@ -10,8 +10,8 @@
> 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=	Internet/Intranet Input Method X Client Framework
>@@ -20,34 +20,43 @@
> 		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
> RUN_DEPENDS=	${LOCALBASE}/lib/im/xiiimp.so:${PORTSDIR}/textproc/iiimf-x-lib
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimxcf/htt_xbe
>-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}-${IIIMF_VER}
>-USE_REINPLACE=	yes
>+IIIMF_VER=	r12_1-svn2002
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool
> USE_XLIB=	yes
>-USE_AUTOCONF_VER=	259
>-USE_AUTOHEADER_VER=	259
>-USE_AUTOMAKE_VER=	19
>-USE_LIBTOOL_VER=	15
>-LIBTOOLFILES=	${WRKSRC}/aclocal.m4
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/htt_xbe
>+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
> .if ${ARCH} != "i386"
>-BROKEN=		"Does not compile on !i386"
>+IGNORE=	"${ARCH} is not support."
> .endif
> 
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+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}/lib/IMdkit/common/XIMPublic.cpp \
>-		${WRKSRC}/src/watchdog.c
>+		${WRKSRC}/../../acfiles/im_common.m4
> 
> pre-configure:
>-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles
>-	${TOUCH} ${WRKSRC}/config.h.in
>+	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
>+
>+do-configure:
>+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
> 
> .include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-x/distinfo ports/textproc/iiimf-x/distinfo
>--- ports.orig/textproc/iiimf-x/distinfo	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-x/distinfo	Thu Feb 17 21:37:46 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-x/files/patch-Makefile ports/textproc/iiimf-x/files/patch-Makefile
>--- ports.orig/textproc/iiimf-x/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x/files/patch-Makefile	Thu Feb 17 21:37:46 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-x/files/patch-acfiles_check_sys.m4 ports/textproc/iiimf-x/files/patch-acfiles_check_sys.m4
>--- ports.orig/textproc/iiimf-x/files/patch-acfiles_check_sys.m4	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-x/files/patch-acfiles_check_sys.m4	Thu Jan  1 09:00:00 1970
>@@ -1,36 +0,0 @@
>---- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
>-+++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
>-@@ -74,6 +74,11 @@
>- ## Checks for thread library.
>- 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
>- 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
>-+
>-+	case "${target}" in
>-+		*freebsd*) HAVE_LIBPTHREAD="yes";;
>-+	esac
>-+
>- 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
>- 		HAVE_THREAD="pthread"
>- 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
>-@@ -210,8 +215,6 @@
>- 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
>- 		;;
>- 	    *freebsd*)
>--		THREAD_LDFLAGS="-pthread"
>--		PTHREAD_LIBS=""
>- 		;;
>- 	esac
>- 
>-@@ -249,9 +252,9 @@
>- 		THREAD_CXX_CFLAGS="-mt"
>- 		HAVE_THREAD="uithread"
>- 		;;
>--	    *freebsd*@gcc:*)
>--		THREAD_LDFLAGS="-pthread"
>--		THREAD_LIBS=""
>-+	    *freebsd*)
>-+		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
>-+		THREAD_LIBS="${PTHREAD_LIBS}"
>- 		HAVE_THREAD="freebsd-pthread"
>- 		;;
>- 	    *linux*)
>diff -r -u -N ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh
>--- ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh	Thu Feb 17 21:41:51 2005
>@@ -0,0 +1,93 @@
>+--- iiimxcf/htt_xbe/autogen.sh	Wed Mar 24 04:54:26 2004
>++++ iiimxcf/htt_xbe/autogen.sh	Wed Feb 16 16:34:40 2005
>+@@ -6,6 +6,14 @@
>+ 
>+ DIE=0
>+ 
>++LIBTOOL=libtool15
>++INTLTOOLIZE=intltoolize15
>++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 -r -u -N ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac
>--- ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac	Thu Feb 17 22:02:05 2005
>@@ -0,0 +1,21 @@
>+--- iiimxcf/htt_xbe/configure.ac	Wed Mar 24 04:54:26 2004
>++++ iiimxcf/htt_xbe/configure.ac	Wed Feb 16 19:38:26 2005
>+@@ -140,15 +140,15 @@
>+ COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} ${DLOPEN_CXX_CFLAGS} -DSUPPORT_R6IM"
>+ LIBS="${LIBS} ${DLOPEN_LIBS}"
>+ 
>+ CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
>+         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
>+-        ${THREAD_COMMON_CXX_CFLAGS}"
>++        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/X11R6/include"
>+ 
>+ CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
>+           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
>+-          ${THREAD_COMMON_CXX_CFLAGS}"
>++          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/X11R6/include"
>+ 
>+-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
>++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/X11R6/lib"
>+ 
>+ dnl --------------------------------------------------------------------------------
>+ dnl                       Section 6: compilation test
>diff -r -u -N ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp
>--- ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp	Thu Feb 17 21:45:39 2005
>@@ -0,0 +1,11 @@
>+--- iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp	Wed Mar 24 04:54:26 2004
>++++ iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp	Wed Feb 16 21:31:00 2005
>+@@ -68,7 +68,7 @@
>+ #ifdef sun
>+ #define XIIIMP_PATH     "/usr/openwin/lib/locale/common/xiiimp.so.2"
>+ #else /* Linux */
>+-#define XIIIMP_PATH     "/usr/lib/im/xiiimp.so.2"
>++#define XIIIMP_PATH     "/usr/local/lib/im/xiiimp.so.2"
>+ #endif /* Linux */
>+ 
>+ #include <stdio.h>
>diff -r -u -N ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c
>--- ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_r6im_i18nX.c	Thu Feb 17 21:47:22 2005
>@@ -0,0 +1,13 @@
>+--- iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nX.c	Fri Nov  1 09:15:38 2002
>++++ iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nX.c	Wed Feb 16 19:33:10 2005
>+@@ -389,8 +389,8 @@
>+     extern void _Xi18nMessageHandler(XIMS, CARD16,
>+ 				     unsigned char*, Bool*);
>+     Bool delete = True;
>+-    unsigned char *packet;
>+-    int connect_id;
>++    unsigned char *packet = NULL;
>++    int connect_id = 0;
>+ 
>+     if (((XClientMessageEvent *)ev)->message_type ==
>+ 	spec->xim_request) {
>diff -r -u -N ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IMdkit_Makefile.in ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IMdkit_Makefile.in
>--- ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IMdkit_Makefile.in	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IMdkit_Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,13 +0,0 @@
>---- iiimxcf/htt_xbe/lib/IMdkit/Makefile.in.orig	Sat Dec  6 05:14:14 2003
>-+++ iiimxcf/htt_xbe/lib/IMdkit/Makefile.in	Sat Dec  6 05:52:09 2003
>-@@ -74,8 +74,8 @@
>- LINKER = @LINKER@
>- RANLIB = @RANLIB@
>- 
>--CFLAGS = @CFLAGS@
>--CXXFLAGS = @CXXFLAGS@
>-+CFLAGS = @CFLAGS@ @X_CFLAGS@
>-+CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@
>- LDFLAGS = @LDFLAGS@
>- LIBS = @LIBS@
>- 
>diff -r -u -N ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c
>--- ports.orig/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c	Thu Feb 17 21:48:56 2005
>@@ -1,42 +1,19 @@
>---- iiimxcf/htt_xbe/src/watchdog.c.orig	Tue Jul 13 07:25:40 2004
>-+++ iiimxcf/htt_xbe/src/watchdog.c	Sun Sep  5 05:43:59 2004
>-@@ -187,11 +187,15 @@
>-    * Setup the signal handlers to monitor htt_server, htt_props
>-    * abnormal termination
>-    */
>-+#if defined(__FreeBSD__)
>-+  setsid();
>-+#else
>- #ifdef SETPGRP_VOID
>-   grpid = setpgrp();
>- #else
>-   grpid = setpgrp(0, 0);
>+--- iiimxcf/htt_xbe/src/watchdog.c	Tue Jul 13 08:25:40 2004
>++++ iiimxcf/htt_xbe/src/watchdog.c	Wed Feb 16 19:12:34 2005
>+@@ -81,7 +81,7 @@
>  #endif
>-+#endif
>+ #define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/dt/lib/libXm.so.3"
>  
>- #ifdef SunOS
>-   sigset(SIGTERM, clean_up);
>-@@ -708,11 +712,15 @@
>-      */
>-     sleep(1);
>+-#define IMDIR "/usr/lib/im"
>++#define IMDIR "/usr/local/lib/im"
>  
>-+#if defined(__FreeBSD__)
>-+    setsid();
>-+#else
>- #ifdef SETPGRP_VOID
>-     setpgrp();
>- #else
>-     setpgrp(0, 0);
>- #endif
>-+#endif
>- 
>- #ifdef SunOS
>-     if (flag == OPENWIN_PATH) {
>-@@ -744,7 +752,11 @@
>+ static void     start_htt_server(int *, char *argv[]);
>+ static void     start_htt_props(int *, char *argv[]);
>+@@ -744,7 +744,11 @@
>      perror("watchdog:fork\n");
>      exit(errno);
>    case 0:
>-+#if defined(__FreeBSD__)
>++#ifdef __FreeBSD__
> +    setsid();
> +#else
>      setpgrp();
>diff -r -u -N ports.orig/textproc/iiimf-x/pkg-plist ports/textproc/iiimf-x/pkg-plist
>--- ports.orig/textproc/iiimf-x/pkg-plist	Tue Feb 22 22:14:16 2005
>+++ ports/textproc/iiimf-x/pkg-plist	Fri Feb 18 18:30:46 2005
>@@ -1,2 +1,2 @@
>-lib/im/htt_xbe
> lib/im/httx
>+lib/im/htt_xbe
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/Makefile ports/textproc/iiimf-x-lib/Makefile
>--- ports.orig/textproc/iiimf-x-lib/Makefile	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/Makefile	Tue Feb 22 22:26:53 2005
>@@ -10,50 +10,54 @@
> 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=	Internet/Intranet Input Method X Client Framework
> 
> LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
> 		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
>-RUN_DEPENDS=	${LOCALBASE}/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
>+RUN_DEPENDS=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
> 
>-IIIMF_VER=	r12_0_1-svn1891
>-WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimxcf/xiiimp.so
>-INSTALLS_SHLIB=	yes
>-USE_MOTIF=	yes
>-USE_REINPLACE=	yes
>-USE_OPENSSL=	yes
>-USE_AUTOCONF_VER=	259
>-USE_AUTOHEADER_VER=	259
>-USE_AUTOMAKE_VER=	19
>-USE_LIBTOOL_VER=	15
>-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+IIIMF_VER=	r12_1-svn2002
>+USE_REINPLACE=  yes
>+USE_GMAKE=	yes
>+USE_GNOME=	intltool
>+USE_MOTIF=      yes
>+USE_OPENSSL=    yes
>+WANT_AUTOCONF_VER=253
>+WANT_AUTOHEADER_VER=253
>+WANT_AUTOMAKE_VER=15
>+WANT_LIBTOOL_VER=15
>+
>+WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so
>+PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${OSVERSION} < 503000
>+IGNORE=         "It is supported on FreeBSD 5.3 and later"
>+.endif
>+
> .if ${ARCH} != "i386"
>-BROKEN=		"Does not compile on !i386"
>+IGNORE=	"${ARCH} is not support."
> .endif
> 
>+MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
>+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}/iiimp/iiimpAux.c \
>-		${WRKSRC}/iiimp/iiimpDL.c \
>-		${WRKSRC}/iiimp/iiimpIM.c \
>-		${WRKSRC}/iiimp/iiimpConv.c \
>-		${WRKSRC}/iiimp/csconv.h
>-.if ${OSVERSION} == 502010
>-	${REINPLACE_CMD} -e "s,-DARCH=[^ ]*,," \
>-		${WRKSRC}/../../acfiles/check_sys.m4
>-.endif
>+		${WRKSRC}/../../acfiles/im_common.m4
> 
> pre-configure:
>-	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles
>-	${TOUCH} ${WRKSRC}/config.h.in
>+	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
>+	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
>+
>+do-configure:
>+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
> 
> .include <bsd.port.post.mk>
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/distinfo ports/textproc/iiimf-x-lib/distinfo
>--- ports.orig/textproc/iiimf-x-lib/distinfo	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/distinfo	Thu Feb 17 21:16:12 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-Makefile ports/textproc/iiimf-x-lib/files/patch-Makefile
>--- ports.orig/textproc/iiimf-x-lib/files/patch-Makefile	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x-lib/files/patch-Makefile	Thu Feb 17 21:16:12 2005
>@@ -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 -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh	Thu Feb 17 21:23:07 2005
>@@ -0,0 +1,57 @@
>+--- iiimxcf/xiiimp.so/autogen.sh	Wed Mar 24 10:15:03 2004
>++++ iiimxcf/xiiimp.so/autogen.sh	Wed Feb 16 16:29:24 2005
>+@@ -12,7 +12,15 @@
>+ 
>+ DIE=0
>+ 
>+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
>++LIBTOOL=libtool15
>++INTLTOOLIZE=intltoolize15
>++LIBTOOLIZE=libtoolize15
>++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,"
>+@@ -20,7 +28,7 @@
>+ 	DIE=1
>+ }
>+ 
>+-(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,"
>+@@ -29,8 +37,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) 
>+ 		;;
>+@@ -66,13 +74,13 @@
>+ # 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 -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac	Thu Feb 17 21:24:38 2005
>@@ -0,0 +1,21 @@
>+--- iiimxcf/xiiimp.so/configure.ac	Wed May  7 12:31:34 2003
>++++ iiimxcf/xiiimp.so/configure.ac	Wed Feb 16 21:06:50 2005
>+@@ -71,15 +71,15 @@
>+ 
>+ COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
>+ 
>+ CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
>+         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
>+-        ${THREAD_COMMON_CXX_CFLAGS}"
>++        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include"
>+ 
>+ CXXFLAGS="${COMMON_INCLUDE} ${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 -lintl"
>+ 
>+ dnl --------------------------------------------------------------------------------
>+ dnl                       Section 6: compilation test
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am	Sun Feb 20 21:21:23 2005
>@@ -1,12 +1,21 @@
>---- iiimp/Makefile.am.orig	Sun Sep  5 05:33:03 2004
>-+++ iiimp/Makefile.am	Sun Sep  5 05:33:26 2004
>-@@ -9,7 +9,7 @@
>+--- iiimxcf/xiiimp.so/iiimp/Makefile.am	Tue Mar 23 07:37:51 2004
>++++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Thu Feb 17 21:32:52 2005
>+@@ -1,15 +1,14 @@
>+ moduledir = $(IMDIR)
>+ xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \
>+                    $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
>+-                   -I$(CSCONV_DIR)
>++                   -I$(CSCONV_DIR) -I/usr/local/include -DUSE_CSCONV
>+ xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \
>+-                    -module -export-dynamic -no-undefined
>++                    -module -export-dynamic -no-undefined -L/usr/local/include \
>++		    -liiimcf -liiimp
>+ # On GNU/Linux system, libtool does not take care of -no-undefined so that
>+ # you have to add the following by yourself to check undefined symbols.
>  #                   -Wl,-z -Wl,defs
>  xiiimp_la_LIBADD = $(X_LIBS)  \
> -		   $(IM_LIBDIR)/iiimcf/libiiimcf.la \
> -		   $(IM_LIBDIR)/iiimp/libiiimp.la \
>-+ 		   -L$(LOCALBASE)/lib -liiimcf \
>-+		   -L$(LOCALBASE)/lib -liiimp \
>                     $(DLOPEN_LIBS) $(THREAD_LIBS)
>  xiiimp_la_SOURCES = \
>  	genutil.c \
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h	Thu Feb 17 21:26:34 2005
>@@ -0,0 +1,11 @@
>+--- iiimxcf/xiiimp.so/iiimp/csconv.h	Fri Mar 16 00:52:22 2001
>++++ iiimxcf/xiiimp.so/iiimp/csconv.h	Wed Feb 16 20:48:14 2005
>+@@ -64,7 +64,7 @@
>+ #    define	CSC_BASE_DIR_SYSTEM	"/etc/lib/im/csconv/"
>+ #endif /* !CSC_BASE_DIR_SYSTEM */
>+ #if !defined(CSC_BASE_DIR_DEFAULT)
>+-#    define	CSC_BASE_DIR_DEFAULT	"/usr/lib/im/csconv/"
>++#    define	CSC_BASE_DIR_DEFAULT	"/usr/local/lib/im/csconv/"
>+ #endif /* !CSC_BASE_DIR_DEFAULT */
>+ 
>+ #define CSC_IS_PATH_ABS(path)	(('/' == *(path)) ||			\
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c	Thu Feb 17 21:27:08 2005
>@@ -1,16 +1,11 @@
>---- iiimp/iiimpAux.c.orig	Wed Oct 13 21:13:37 2004
>-+++ iiimp/iiimpAux.c	Wed Oct 13 21:14:40 2004
>-@@ -1997,11 +1997,12 @@
>- static void
>- service_set_conversion_mode(aux_t * aux, int conversion_mode)
>- {
>-+  XVaNestedList preedit_attr;
>-   XIC xic = (XIC)aux->ic;
>-   XIMPreeditState preedit_state;
>+--- iiimxcf/xiiimp.so/iiimp/iiimpAux.c	Sat Sep 11 01:41:45 2004
>++++ iiimxcf/xiiimp.so/iiimp/iiimpAux.c	Wed Feb 16 20:40:57 2005
>+@@ -80,7 +80,7 @@
>+ #include "trace_message.h"
>  
>-   preedit_state = (conversion_mode == 1 ? XIMPreeditEnable : XIMPreeditDisable);
>--  XVaNestedList preedit_attr = XVaCreateNestedList(0,
>-+  preedit_attr = XVaCreateNestedList(0,
>- 						   XNPreeditState, preedit_state,
>- 						   0);
>-   XSetICValues((XIC)xic,
>+ 
>+-#define AUX_BASE_DIR		"/usr/lib/im/"
>++#define AUX_BASE_DIR		"/usr/local/lib/im/"
>+ 
>+ #if defined(__sparcv9)
>+ #define SPARCV9_DIR		"sparcv9/"
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c	Thu Feb 17 21:27:35 2005
>@@ -1,11 +1,11 @@
>---- iiimp/iiimpConv.c.orig	Tue Sep  7 20:42:04 2004
>-+++ iiimp/iiimpConv.c	Tue Sep  7 20:42:22 2004
>-@@ -44,7 +44,7 @@
>- #if defined(sun)
>- #define USE_ICONV
>- #else
>--#define USE_ICONV
>-+#define USE_CSCONV
>- #endif
>- #endif
>- 
>+--- iiimxcf/xiiimp.so/iiimp/iiimpConv.c	Wed Apr 28 18:28:59 2004
>++++ iiimxcf/xiiimp.so/iiimp/iiimpConv.c	Wed Feb 16 20:41:07 2005
>+@@ -68,7 +68,7 @@
>+ #ifdef USE_CSCONV
>+ #include <dlfcn.h>
>+ #include "csconv.h"
>+-#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
>++#define CSC_PATH	"/usr/local/lib/im/csconv/csconv.so"
>+ #define CSC_OPEN_LOCALE	"csconv_open_locale"
>+ #define CSC_OPEN	"csconv_open"
>+ #define CSC_CONV	"csconv"
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c	Thu Feb 17 21:28:35 2005
>@@ -0,0 +1,11 @@
>+--- iiimxcf/xiiimp.so/iiimp/iiimpDL.c	Wed May  5 03:55:05 2004
>++++ iiimxcf/xiiimp.so/iiimp/iiimpDL.c	Wed Feb 16 20:41:14 2005
>+@@ -108,7 +108,7 @@
>+ }
>+ 
>+ #ifndef XLOCALEDIR
>+-#define XLOCALEDIR "/usr/lib/im/modules"
>++#define XLOCALEDIR "/usr/local/lib/im/modules"
>+ #endif
>+ 
>+ static const char*
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c	Thu Jan  1 09:00:00 1970
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c	Thu Feb 17 21:29:03 2005
>@@ -0,0 +1,20 @@
>+--- iiimxcf/xiiimp.so/iiimp/iiimpIM.c	Wed Aug 25 15:09:50 2004
>++++ iiimxcf/xiiimp.so/iiimp/iiimpIM.c	Wed Feb 16 22:06:57 2005
>+@@ -189,7 +189,7 @@
>+ };
>+ 
>+ #ifndef IMLOCALEDIR
>+-#define IMLOCALEDIR "/usr/lib/im/locale"
>++#define IMLOCALEDIR "/usr/local/lib/im/locale"
>+ #endif
>+ 
>+ #define	iscomment(ch)	((ch) == '\0' || (ch) == '#')
>+@@ -625,7 +625,7 @@
>+ 	if (mod) {
>+ 	    mod += strlen(MODIFIER);
>+ 
>+-	    if (!strncmp(mod, "iiimp/", 6) || !strncmp(mod, "IIIMP/", 6)) {
>++	    if (!strncasecmp(mod, "iiimp/", 6)) {
>+ 		mod += 6;
>+ 
>+ 		if (index(mod, ':')) {
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c
>--- ports.orig/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c	Thu Jan  1 09:00:00 1970
>@@ -1,22 +0,0 @@
>---- iiimp/iiimpSwitcher.c.orig	Thu Apr 29 23:04:48 2004
>-+++ iiimp/iiimpSwitcher.c	Wed Oct 13 21:25:32 2004
>-@@ -108,14 +108,16 @@
>- char *
>- my_stpcpy (char *dest, const char *src)
>- {
>-+#ifndef HAVE_STPCPY
>-+  register char *d = dest;
>-+  register const char *s = src;
>-+#endif
>-+
>-   if (dest == NULL || src == NULL)
>-     return NULL;
>- #ifdef HAVE_STPCPY
>-   return stpcpy (dest, src);
>- #else
>--  register char *d = dest;
>--  register const char *s = src;
>--
>-   do
>-     *d++ = *s;
>-   while (*s++ != '\0');
>diff -r -u -N ports.orig/textproc/iiimf-x-lib/pkg-plist ports/textproc/iiimf-x-lib/pkg-plist
>--- ports.orig/textproc/iiimf-x-lib/pkg-plist	Tue Feb 22 22:14:17 2005
>+++ ports/textproc/iiimf-x-lib/pkg-plist	Fri Feb 18 18:22:39 2005
>@@ -1,3 +1,2 @@
>-lib/im/xiiimp.so.2
> lib/im/xiiimp.so
>-@unexec rmdir %D/lib/im 2>/dev/null || true
>+lib/im/xiiimp.so.2

Actions: View | Diff

Attachments on bug 77927: 51274