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, 211 insertions, 86 deletions

diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile
index 24ba3371977a..fbd7d5d699ce 100644
--- a/textproc/iiimf-x-lib/Makefile
+++ b/textproc/iiimf-x-lib/Makefile
@@ -10,50 +10,54 @@ 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 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
-
-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}
+RUN_DEPENDS=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+
+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 --git a/textproc/iiimf-x-lib/distinfo b/textproc/iiimf-x-lib/distinfo
index 29d049a782bc..440e49d16220 100644
--- a/textproc/iiimf-x-lib/distinfo
+++ b/textproc/iiimf-x-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-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile
new file mode 100644
index 000000000000..85df0e345035
--- /dev/null
+++ b/textproc/iiimf-x-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-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh
new file mode 100644
index 000000000000..b0e62e6664b6
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
new file mode 100644
index 000000000000..457376dd7d64
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
index 0f410643b08e..cbedc9d9dfef 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
new file mode 100644
index 000000000000..dbac66f5ec97
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
index 706ace9314bb..cad0f0123107 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
index cb4570473b80..29d74ccbad92 100644
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
new file mode 100644
index 000000000000..aaf2ea2f6f0a
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
new file mode 100644
index 000000000000..7390a9f3fd88
--- /dev/null
+++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c
@@ -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 --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c
deleted file mode 100644
index 26dc0f2441b0..000000000000
--- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpSwitcher.c
+++ /dev/null
@@ -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 --git a/textproc/iiimf-x-lib/pkg-plist b/textproc/iiimf-x-lib/pkg-plist
index df789b5b13a4..beae0f04291e 100644
--- a/textproc/iiimf-x-lib/pkg-plist
+++ b/textproc/iiimf-x-lib/pkg-plist
@@ -1,3 +1,3 @@
-lib/im/xiiimp.so.2
 lib/im/xiiimp.so
-@unexec rmdir %D/lib/im 2>/dev/null || true
+lib/im/xiiimp.so.2
+@unexec rmdir %D/lib/im > /dev/null 2>&1 || true