7 files changed, 101 insertions, 168 deletions

diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index ed494d89d5bd..67408b25a711 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	client-lib
 PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
@@ -23,12 +24,12 @@ INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_GNOME=	intltool
-USE_ICONV=	yes
-WANT_AUTOCONF_VER=253
-WANT_AUTOHEADER_VER=253
-WANT_AUTOMAKE_VER=15
-WANT_LIBTOOL_VER=15
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
+USE_AUTOMAKE_VER=	19
+WANT_LIBTOOL_VER=	15
+
+CONFIGURE_TARGET=       --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
 PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
@@ -43,28 +44,48 @@ IGNORE=         "It is supported on FreeBSD 5.3 and later"
 IGNORE=	"${ARCH} is not support."
 .endif
 
-MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
+CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
 		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
+		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
 		${WRKSRC}/../../acfiles/im_common.m4
 
 pre-configure:
-	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
-	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
-
-do-configure:
-	(cd ${WRKSRC}/../EIMIL && ./autogen.sh)
-	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
+	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles
+	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
+	@cd ${WRKSRC}/../EIMIL && ${REINPLACE_CMD} \
+	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+	 ${LIBTOOLFILES}
+	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
+	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE}
+	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
+	@cd ${WRKSRC}/../EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \
+	 CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
+	 ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
+	 -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
+	@cd ${WRKSRC} && ${REINPLACE_CMD} \
+	 -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
+	 -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
+	 -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
+	 ${LIBTOOLFILES}
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
 
 post-configure:
 	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
 		${WRKSRC}/Makefile
 
 pre-build:
-	(cd ${WRKSRC}/../EIMIL && ${GMAKE} ${MAKE_ARGS})
+	@cd ${WRKSRC}/../EIMIL && \
+	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile
index 85df0e345035..bcc2cb24a1c8 100644
--- a/textproc/iiimf-client-lib/files/patch-Makefile
+++ b/textproc/iiimf-client-lib/files/patch-Makefile
@@ -13,7 +13,7 @@
  update-acfiles:
  	cd acfiles && \
 -        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
++        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
          rm -f Makefile.in aclocal.m4
  
  config:
diff --git a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
new file mode 100644
index 000000000000..8626eeae1fd1
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
@@ -0,0 +1,38 @@
+--- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
++++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
+@@ -203,6 +203,11 @@
+ 		    CXX=${CC}
+ 		fi
+ 		;;
++	    cc*:*)
++		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
++		SHLIBCFLAGS='-fpic'
++		SHLIBLDFLAGS='-shared'
++		;;
+ 	    *)
+ 		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
+ 		;;
+@@ -249,8 +254,8 @@
+ 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
+ 		;;
+ 	    *freebsd*)
+-		THREAD_LDFLAGS="-pthread"
+-		PTHREAD_LIBS=""
++		THREAD_LDFLAGS=""
++		PTHREAD_LIBS="${PTHREAD_LIBS}"
+ 		;;
+ 	esac
+ 
+@@ -288,9 +293,9 @@
+ 		THREAD_CXX_CFLAGS="-mt"
+ 		HAVE_THREAD="uithread"
+ 		;;
+-	    *freebsd*@gcc:*)
+-		THREAD_LDFLAGS="-pthread"
+-		THREAD_LIBS=""
++	    *freebsd*@cc:*|*freebsd*@gcc:*)
++		THREAD_LDFLAGS=""
++		THREAD_LIBS="${PTHREAD_LIBS}"
+ 		HAVE_THREAD="freebsd-pthread"
+ 		;;
+ 	    *linux*)
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh
deleted file mode 100644
index cee0709c90ed..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh
+++ /dev/null
@@ -1,72 +0,0 @@
---- 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_iiimcf_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
index d30c6cffd03a..a5499285555e 100644
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
@@ -1,12 +1,11 @@
---- 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
+--- lib/iiimcf/Makefile.am.orig	Wed Mar  2 05:50:46 2005
++++ lib/iiimcf/Makefile.am	Wed Mar  2 05:51:11 2005
+@@ -2,7 +2,7 @@
  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
+-                       -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
++                       -export-dynamic -export-symbols libiiimcf.sym -liiimp
  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
+ 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_autogen.sh b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh
deleted file mode 100644
index 2b25d5acb3fe..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh
+++ /dev/null
@@ -1,72 +0,0 @@
---- 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_configure.ac b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac
new file mode 100644
index 000000000000..1f9239eeefb3
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac
@@ -0,0 +1,19 @@
+--- lib/iiimcf/configure.ac.orig	Wed Mar  2 06:27:04 2005
++++ lib/iiimcf/configure.ac	Wed Mar  2 06:27:29 2005
+@@ -82,13 +82,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} ${CFLAGS}"
+ 
+ CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
+           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
+-          ${THREAD_COMMON_CXX_CFLAGS}"
++          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
+ 
+-LDFLAGS="${COMMON_LDFLAGS}"
++LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
+ 
+ dnl --------------------------------------------------------------------------------
+ dnl                       Section 6: compilation test