IIIMF-related ports: Update to r12_1-svn2002 and bug fixes

PR:		ports/77927
Submitted by:	Masanori OZAWA <ozawa@ongs.co.jp>
Approved by:	maintainer
Pointed out by:	ume, nork, hrs

13 files changed, 249 insertions, 148 deletions

diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 198702d11d99..c166b3bcd397 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -10,73 +10,60 @@ PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk
-DISTFILES=	${DISTNAME}-src-${IIIMF_VER}.tgz
+DISTNAME=	im-sdk-src-${IIIMF_VER}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	kcwu@csie.org
 COMMENT=	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
+	(cd ${WRKSRC}/../EIMIL && ./autogen.sh)
+	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
+
+post-configure:
+	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
+		${WRKSRC}/Makefile
 
-do-build:
-.for DIR in ${DIRS}
-	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
-.endfor
+pre-build:
+	(cd ${WRKSRC}/../EIMIL && ${GMAKE} ${MAKE_ARGS})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/iiimf-client-lib/distinfo b/textproc/iiimf-client-lib/distinfo
index 29d049a782bc..440e49d16220 100644
--- a/textproc/iiimf-client-lib/distinfo
+++ b/textproc/iiimf-client-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe
-SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118
+MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
+SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile
new file mode 100644
index 000000000000..85df0e345035
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-Makefile
@@ -0,0 +1,19 @@
+--- Makefile	Thu Apr  8 03:28:00 2004
++++ Makefile	Wed Feb 16 14:09:34 2005
+@@ -2,6 +2,7 @@
+ AUTOMAKE = automake
+ AUTOHEADER = autoheader
+ AUTOCONF = autoconf
++LIBTOOLIZE = libtoolize
+ 
+ CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+              $(AUTOHEADER) && \
+@@ -21,7 +22,7 @@
+ 
+ update-acfiles:
+ 	cd acfiles && \
+-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
++        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
+         rm -f Makefile.in aclocal.m4
+ 
+ config:
diff --git a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
deleted file mode 100644
index 974f159f9098..000000000000
--- a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
+++ /dev/null
@@ -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 --git a/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am b/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am
deleted file mode 100644
index ef7a9f7c6d37..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am
+++ /dev/null
@@ -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 --git a/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am b/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am
deleted file mode 100644
index ca6083353dc2..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am
+++ /dev/null
@@ -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 --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
new file mode 100644
index 000000000000..d98acce9a275
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
@@ -0,0 +1,10 @@
+--- lib/EIMIL/EIMILJournal.c	Mon Aug  2 23:39:10 2004
++++ lib/EIMIL/EIMILJournal.c	Thu Feb 17 01:55:38 2005
+@@ -61,7 +61,6 @@
+     pjh = NULL;
+     pj = ped->pjst;
+     for (i = 0; i < EIMIL_JOURNAL_MAX_SLOT_SIZE; i++) {
+-        fprintf(stderr, "hoge\n");
+         if (!pj) break;
+ 	if (pj->pv) EIMIL_RMREF(*pj->pv);
+ 	if ((pj->next - pj) < 0) pjh = pj->next;
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh
new file mode 100644
index 000000000000..cee0709c90ed
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh
@@ -0,0 +1,72 @@
+--- lib/EIMIL/autogen.sh	Wed May  5 02:15:22 2004
++++ lib/EIMIL/autogen.sh	Wed Feb 16 14:57:02 2005
+@@ -12,7 +12,14 @@
+ 
+ DIE=0
+ 
+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
++LIBTOOL=libtool15
++INTLTOOLIZE=intltoolize15
++ACLOCAL=aclocal15
++AUTOHEADER=autoheader253
++AUTOMAKE=automake15
++AUTOCONF=autoconf253
++
++(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
+ 	echo
+ 	echo "You must have libtool installed to compile $PROJECT."
+ 	echo "Install the appropriate package for your distribution,"
+@@ -30,7 +37,7 @@
+ }
+ 
+ (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
+-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
++  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
+     echo
+     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
+     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
+@@ -39,7 +46,7 @@
+   }
+ }
+ 
+-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
++(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
+ 	echo
+ 	echo "You must have autoconf installed to compile $PROJECT."
+ 	echo "libtool the appropriate package for your distribution,"
+@@ -48,8 +55,8 @@
+ }
+ 
+ have_automake=false
+-if automake --version < /dev/null > /dev/null 2>&1 ; then
+-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
++if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
++	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+ 	case $automake_version in
+ 	   1.2*|1.3*|1.4) 
+ 		;;
+@@ -96,19 +103,19 @@
+ fi
+ if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
+   echo "Running intltoolize..."
+-  intltoolize --copy --force --automake
++  ${INTLTOOLIZE} --copy --force --automake
+ fi
+ 
+ # intentionally we don't call "libtoolize --force"
+ # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
+ 
+-aclocal -I ../../acfiles $ACLOCAL_FLAGS
++${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
+ 
+ # optionally feature autoheader
+-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
++(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
+ 
+-automake -a $am_opt
+-autoconf
++${AUTOMAKE} -a $am_opt
++${AUTOCONF}
+ cd $ORIGDIR
+ 
+ if test -z "$AUTOGEN_SUBDIR_MODE"; then
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am
deleted file mode 100644
index 49f751fa36cc..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am
+++ /dev/null
@@ -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 --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
new file mode 100644
index 000000000000..d30c6cffd03a
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
@@ -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 --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh
new file mode 100644
index 000000000000..2b25d5acb3fe
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh
@@ -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 --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
new file mode 100644
index 000000000000..1ef1efadc305
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
@@ -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 --git a/textproc/iiimf-client-lib/pkg-plist b/textproc/iiimf-client-lib/pkg-plist
index 119ec6209e8d..6ce22e367c32 100644
--- a/textproc/iiimf-client-lib/pkg-plist
+++ b/textproc/iiimf-client-lib/pkg-plist
@@ -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