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, 95 insertions, 144 deletions

diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile
index a56549379441..62c0d6372246 100644
--- a/textproc/iiimf-protocol-lib/Makefile
+++ b/textproc/iiimf-protocol-lib/Makefile
@@ -6,61 +6,49 @@
 #
 
 PORTNAME=	protocol-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 Framework protocol library
 
-IIIMF_VER=	r12_1-svn2002
+ONLY_FOR_ARCHS=	i386
+
 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/iiimp
-PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
+BUILDDIR=	${WRKSRC}/lib/iiimp
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-IGNORE=         "It is supported on FreeBSD 5.3 and later"
+IGNORE=	It is supported on FreeBSD 5.3 and later.
 .endif
 
-.if ${ARCH} != "i386"
-IGNORE=	"${ARCH} is not support."
-.endif
-
-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} && ${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 '/^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
+
+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-protocol-lib/distinfo b/textproc/iiimf-protocol-lib/distinfo
index 440e49d16220..4416cce728d0 100644
--- a/textproc/iiimf-protocol-lib/distinfo
+++ b/textproc/iiimf-protocol-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-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile
index bcc2cb24a1c8..3b1030c4343d 100644
--- a/textproc/iiimf-protocol-lib/files/patch-Makefile
+++ b/textproc/iiimf-protocol-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/iiimp
++#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-protocol-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4
+++ b/textproc/iiimf-protocol-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-protocol-lib/files/patch-lib_iiimp_Makefile.am b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_Makefile.am
new file mode 100644
index 000000000000..af101797da71
--- /dev/null
+++ b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_Makefile.am
@@ -0,0 +1,9 @@
+--- lib/iiimp/Makefile.am.orig	Fri May 13 15:37:41 2005
++++ lib/iiimp/Makefile.am	Fri May 13 15:38:13 2005
+@@ -1,5 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
+-ACLOCAL_AMFLAGS = -I ../../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
+ #libdir = /usr/local/lib
+ libiiimp_la_LDFLAGS = -version-info $(LIBIIIMP_MAJOR_VERSION):$(LIBIIIMP_MINOR_VERSION) \
+                       -export-dynamic -g @TLS_LIBS@
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac
deleted file mode 100644
index 810ffa4fd184..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/iiimp/configure.ac.orig	Tue Jul 13 09:38:42 2004
-+++ lib/iiimp/configure.ac	Wed Mar  2 06:32:37 2005
-@@ -26,7 +26,7 @@
- 
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- AM_CONFIG_HEADER(config.h)
--AM_PROG_LIBTOOL
-+AC_PROG_LIBTOOL
- 
- dnl --------------------------------------------------------------------------------
- dnl                          Section 2: Autoheader
-@@ -78,13 +78,13 @@
- 
- 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}"
-+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
- 
- dnl --------------------------------------------------------------------------------
- dnl                       Section 6: compilation test
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c
deleted file mode 100644
index 60d0a2d3fede..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/iiimp/data/comp-string.c	Fri Nov  1 14:32:45 2002
-+++ lib/iiimp/data/comp-string.c	Wed Feb 16 22:48:21 2005
-@@ -63,9 +63,12 @@
- #if defined(lint) && defined(HAVE_NOTE_H)
-     NOTE(ARGUNUSED(data_s))
- #endif /* lint && HAVE_NOTE_H */
--    if (NULL == str) return;
--    free(str->ptr);
--    free(str);
-+    if (str) {
-+        if (str->ptr)
-+            free(str->ptr);
-+        str->ptr = NULL;
-+        free(str);
-+    }
-     return;
- }
- 
-@@ -79,7 +82,9 @@
-     IIIMP_string *	str_next;
-     for (; NULL != str; str = str_next) {
- 	str_next = str->next;
--	free(str->ptr);
-+	if (str->ptr)
-+            free(str->ptr);
-+        str->ptr = NULL;
- 	free(str);
-     }
-     return;
diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c
deleted file mode 100644
index 0896e8dc8236..000000000000
--- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/iiimp/data/im-connect.c	Fri Jun 20 12:06:33 2003
-+++ lib/iiimp/data/im-connect.c	Wed Feb 16 22:43:17 2005
-@@ -41,10 +41,15 @@
- void
- iiimp_connect_delete(IIIMP_data_s * data_s, IIIMP_message * m)
- {
--    if (NULL == m) return;
--    iiimp_string_delete(data_s, m->v.connect.user_name);
--    iiimp_string_list_delete(data_s, m->v.connect.auth);
--    free(m);
-+    if (m) {
-+        if (m->v.connect.user_name) 
-+            iiimp_string_delete(data_s, m->v.connect.user_name);
-+        m->v.connect.user_name = NULL;
-+        if (m->v.connect.auth)
-+            iiimp_string_list_delete(data_s, m->v.connect.auth);
-+        m->v.connect.auth = NULL;
-+        free(m);
-+    }
-     return;
- }
- 
diff --git a/textproc/iiimf-protocol-lib/pkg-plist b/textproc/iiimf-protocol-lib/pkg-plist
index f8b7a5549ad1..c8734aec63bf 100644
--- a/textproc/iiimf-protocol-lib/pkg-plist
+++ b/textproc/iiimf-protocol-lib/pkg-plist
@@ -1,8 +1,11 @@
-lib/libiiimp.a
+include/iiim/iiimp.h
+include/iiim/iiimp-opcode.h
+include/iiim/iiimp-keycode.h
+include/iiim/iiimp-data.h
+include/iiim/iiimp-character-subsets.h
+lib/libiiimp.so.1
 lib/libiiimp.so
-lib/libiiimp.so.0
-include/iiimp-character-subsets.h
-include/iiimp-data.h
-include/iiimp-keycode.h
-include/iiimp-opcode.h
-include/iiimp.h
+lib/libiiimp.la
+lib/libiiimp.a
+libdata/pkgconfig/iiimf-lib-protocol.pc
+@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true