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

8 files changed, 179 insertions, 28 deletions

diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile
index a58ac5e30a2d..596683456294 100644
--- a/textproc/iiimf-gtk/Makefile
+++ b/textproc/iiimf-gtk/Makefile
@@ -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
+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
 
-PLIST_FILES=	lib/gtk-2.0/2.4.0/immodules/im-iiim.so
+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 --git a/textproc/iiimf-gtk/distinfo b/textproc/iiimf-gtk/distinfo
index 29d049a782bc..440e49d16220 100644
--- a/textproc/iiimf-gtk/distinfo
+++ b/textproc/iiimf-gtk/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-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile
new file mode 100644
index 000000000000..85df0e345035
--- /dev/null
+++ b/textproc/iiimf-gtk/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-gtk/files/patch-iiimgcf_Makefile.am b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
index 1662f6f2d89e..73e32f812d61 100644
--- a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am
@@ -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 --git a/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh b/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh
new file mode 100644
index 000000000000..db71f9c186bd
--- /dev/null
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh
@@ -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 --git a/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac b/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac
new file mode 100644
index 000000000000..c96ee88f74af
--- /dev/null
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac
@@ -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 --git a/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c b/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c
new file mode 100644
index 000000000000..ffc17a98f5df
--- /dev/null
+++ b/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c
@@ -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 --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
new file mode 100644
index 000000000000..20ba7596cbc3
--- /dev/null
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -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