IIIMF-related ports:

    - drop maintainership
    - update to r12.2
    - some bug fixes

PR:		81184
Submitted by:	Masanori OZAWA <ozawa@ongs.co.jp>
Approved by:	maintainer

9 files changed, 110 insertions, 160 deletions

diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile
index ff9f9a693e5a..3cd213807ee4 100644
--- a/japanese/iiimf-le-canna/Makefile
+++ b/japanese/iiimf-le-canna/Makefile
@@ -6,84 +6,56 @@
 #
 
 PORTNAME=	le-canna
-PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
-PORTREVISION=	2
+PORTVERSION=	12.2
 CATEGORIES=	japanese 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=	daichi@freebsd.org
+MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	Canna language engine for IIIMF
 
 LIB_DEPENDS=	canna16.1:${PORTSDIR}/japanese/Canna
-RUN_DEPENDS=	${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
+RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server \
+		${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
+
+ONLY_FOR_ARCHS=	i386
 
-IIIMF_VER=	r12_1-svn2002
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_REINPLACE=  yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	259
-USE_AUTOHEADER_VER=	259
-USE_AUTOMAKE_VER=	19
+USE_GNOME=	gtk20
+USE_XLIB=	yes
+WANT_AUTOCONF_VER=	259
+WANT_AUTOHEADER_VER=	259
+WANT_AUTOMAKE_VER=	19
 WANT_LIBTOOL_VER=	15
 
-AUTOMAKE_ARGS+=		--add-missing
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
-
-.if !defined(WITHOUT_XAUX)
-USE_XLIB=	yes
-USE_GNOME=	gtk20
-CFLAGS+=	-I${X11BASE}/include
-LDFLAGS+=	-L${X11BASE}/lib
-PLIST_SUB+=	WANT_XAUX=""
-RUN_DEPENDS+=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
-.else
-CONFIGURE_ARGS+=--without-x
-PLIST_SUB+=	WANT_XAUX="@comment "
-.endif
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/leif
 
 .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 -liconv ${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}"
+CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
-	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
-		${WRKSRC}/../acfiles/im_common.m4 \
-		${WRKSRC}/../lib/CSConv/csconv.h
-
-pre-configure:
-	@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
-.if defined(WITHOUT_XAUX)
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e "/GTK/s,^.*$$,,g" configure.ac
-.endif
-	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
-	@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}
+	${REINPLACE_CMD} \
+		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
+		-e "s,%%PREFIX%%,${PREFIX},g" \
+		${WRKSRC}/Makefile ${BUILDDIR}/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/japanese/iiimf-le-canna/distinfo b/japanese/iiimf-le-canna/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/japanese/iiimf-le-canna/distinfo
+++ b/japanese/iiimf-le-canna/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/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/japanese/iiimf-le-canna/files/patch-Makefile
+++ b/japanese/iiimf-le-canna/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 = leif
++#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/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4 b/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4
+++ b/japanese/iiimf-le-canna/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/japanese/iiimf-le-canna/files/patch-leif_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c b/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
deleted file mode 100644
index 4c96bb2874fe..000000000000
--- a/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- leif/canna/CannaLE.c.orig	Wed Oct 13 00:26:27 2004
-+++ leif/canna/CannaLE.c	Wed Mar  2 23:37:14 2005
-@@ -86,7 +86,7 @@
- 
- #include <dlfcn.h>
- #include "csconv.h"
--#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
-+#define CSC_PATH	(IMDIR "/csconv/csconv.so")
- #define CSC_OPEN_LOCALE	"csconv_open_locale"
- #define CSC_OPEN	"csconv_open"
- #define CSC_CONV	"csconv"
-@@ -104,11 +104,11 @@
- 				       char **, size_t *);
- typedef int		(* csc_close_t)(csconv_t);
- 
--static void *			csc_handle;	
--static csc_open_locale_t	csc_open_locale;
--static csc_open_t		csc_open;
--static csc_conv_t		csc_conv;
--static csc_close_t		csc_close;
-+static void *			csc_handle = NULL;	
-+static csc_open_locale_t	csc_open_locale = NULL;
-+static csc_open_t		csc_open = NULL;
-+static csc_conv_t		csc_conv = NULL;
-+static csc_close_t		csc_close = NULL;
- static csconv_t                 csconv_cd = NULL;
- 
- Bool    if_canna_OpenIF();
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am
deleted file mode 100644
index 5283440c90a9..000000000000
--- a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- leif/canna/Makefile.am.orig	Mon Sep  6 17:40:47 2004
-+++ leif/canna/Makefile.am	Wed Mar  2 23:37:26 2005
-@@ -1,10 +1,9 @@
--SUBDIRS = xaux
--
- LE_FILES = CannaLE.so
- CannaLE_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
-                     -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
-                     -I$(IM_INCLUDEDIR)/iml \
--                    -I$(CSCONV_DIR) -g
-+                    -I$(CSCONV_DIR) \
-+		    -DIMDIR="\"$(IMDIR)\""
- CannaLE_la_LDFLAGS = -avoid-version -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- CannaLE_la_LIBADD = -lcanna $(THREAD_LIBS)
- CannaLE_la_SOURCES = CannaLE.c
diff --git a/japanese/iiimf-le-canna/files/patch-leif_configure.ac b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
index 4028da90cd4e..d38ee647dcde 100644
--- a/japanese/iiimf-le-canna/files/patch-leif_configure.ac
+++ b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
@@ -1,45 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 18:29:16 2005
-@@ -45,11 +45,11 @@
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
- IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_FREEWNN
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_X
- IM_CHECK_GTK
--IM_CHECK_MOTIF
-+dnl IM_CHECK_MOTIF
- PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
- AC_SUBST(GTK2_CFLAGS)
- AC_SUBST(GTK2_LIBS)
-@@ -63,23 +63,17 @@
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
 +LE_TARGETS="canna"
  
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
-+IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/japanese/iiimf-le-canna/pkg-plist b/japanese/iiimf-le-canna/pkg-plist
index 385ebd7c4c6b..739e6727c515 100644
--- a/japanese/iiimf-le-canna/pkg-plist
+++ b/japanese/iiimf-le-canna/pkg-plist
@@ -1,7 +1,7 @@
-lib/im/leif/CannaLE.so
-%%WANT_XAUX%%lib/im/locale/ja/CannaLE/aux.so
-%%WANT_XAUX%%lib/im/locale/ja/CannaLE/auxmenu
-%%WANT_XAUX%%@dirrm lib/im/locale/ja/CannaLE
-%%WANT_XAUX%%@dirrm lib/im/locale/ja
-@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
-@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
+lib/iiim/le/CannaLE/CannaLE.so
+lib/iiim/le/CannaLE/aux.so
+lib/iiim/le/CannaLE/aux.la
+lib/iiim/le/CannaLE/aux.a
+lib/iiim/le/CannaLE/auxmenu
+@dirrm lib/iiim/le/CannaLE
+@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true