10 files changed, 105 insertions, 136 deletions

diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile
index 67408b25a711..58b583a58ac0 100644
--- a/textproc/iiimf-client-lib/Makefile
+++ b/textproc/iiimf-client-lib/Makefile
@@ -6,86 +6,58 @@
 #
 
 PORTNAME=	client-lib
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	1
+PORTVERSION=	12.2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
 PKGNAMEPREFIX=	iiimf-
-DISTNAME=	im-sdk-src-${IIIMF_VER}
+DISTNAME=	iiimf-src-${PORTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	kcwu@csie.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Internet/Intranet Input Method Client Framework
 
-LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
+LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
+RUN_DEPENDS=	${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-CONFIGURE_TARGET=       --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/lib/iiimcf
 
 .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."
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
-UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
-		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
-		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
-		ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../../acfiles/im_common.m4
-
-pre-configure:
-	@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 && \
-	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+	${REINPLACE_CMD} \
+		-e '/^pkgconfigdir/s,$$(libdir),%%PREFIX%%/libdata,g' \
+		${BUILDDIR}/Makefile.am
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile \
+		${BUILDDIR}/Makefile.am \
+		${BUILDDIR}/../EIMIL/Makefile.am
+	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
+		${WRKSRC}/lib/CSConv/csconv.h
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
 
 .include <bsd.port.post.mk>
diff --git a/textproc/iiimf-client-lib/distinfo b/textproc/iiimf-client-lib/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-client-lib/distinfo
+++ b/textproc/iiimf-client-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
-SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
+MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
+SIZE (iiimf-src-12.2.tar.bz2) = 11452670
diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile
index bcc2cb24a1c8..93b6c7871efe 100644
--- a/textproc/iiimf-client-lib/files/patch-Makefile
+++ b/textproc/iiimf-client-lib/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = lib/EIMIL lib/iiimcf
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
deleted file mode 100644
index d98acce9a275..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_Makefile.am
new file mode 100644
index 000000000000..8e23e8b2eef4
--- /dev/null
+++ b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_Makefile.am
@@ -0,0 +1,9 @@
+--- lib/EIMIL/Makefile.am.orig	Fri May 13 18:03:49 2005
++++ lib/EIMIL/Makefile.am	Fri May 13 18:04:12 2005
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ SUBDIRS = . test
+ #libdir = /usr/local/lib
+ #libEIMIL_la_LDFLAGS = -module -version-info $(LIBEIMIL_MAJOR_VERSION):$(LIBEIMIL_MINOR_VERSION) \
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 a5499285555e..89e3fcd66cc2 100644
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
+++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am
@@ -1,11 +1,14 @@
---- 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 @@
+--- lib/iiimcf/Makefile.am.orig	Mon May  9 16:47:15 2005
++++ lib/iiimcf/Makefile.am	Mon May  9 16:48:31 2005
+@@ -1,9 +1,9 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
  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 ../iiimp/libiiimp.la -ldl
 +                       -export-dynamic -export-symbols libiiimcf.sym -liiimp
- libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""
+ libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\"" -I../CSConv
  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_configure.ac b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac
deleted file mode 100644
index 1f9239eeefb3..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
deleted file mode 100644
index 1ef1efadc305..000000000000
--- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 6ce22e367c32..95711009b635 100644
--- a/textproc/iiimf-client-lib/pkg-plist
+++ b/textproc/iiimf-client-lib/pkg-plist
@@ -1,4 +1,7 @@
-lib/libiiimcf.a
+include/iiim/iiimcf.h
+lib/libiiimcf.so.3
 lib/libiiimcf.so
-lib/libiiimcf.so.2
-include/iiimcf.h
+lib/libiiimcf.la
+lib/libiiimcf.a
+libdata/pkgconfig/iiimf-lib-client.pc
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true