Attachment #53664 for bug #81184

View | Details | Raw Unified | Return to bug 81184
Collapse All | Expand All




#

PORTNAME=	client-lib
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method Client Framework

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
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/lib/iiimcf
WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
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

CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"

post-patch:
	${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
	@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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-client-lib/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Lines 1-10 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_EIMILJournal.c (-10 lines)
1	--- lib/EIMIL/EIMILJournal.c Mon Aug 2 23:39:10 2004
2	+++ lib/EIMIL/EIMILJournal.c Thu Feb 17 01:55:38 2005
3	@@ -61,7 +61,6 @@
4	pjh = NULL;
5	pj = ped->pjst;
6	for (i = 0; i < EIMIL_JOURNAL_MAX_SLOT_SIZE; i++) {
7	- fprintf(stderr, "hoge\n");
8	if (!pj) break;
9	if (pj->pv) EIMIL_RMREF(*pj->pv);
10	if ((pj->next - pj) < 0) pjh = pj->next;

Line 0 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_Makefile.am (+9 lines)
	1	--- lib/EIMIL/Makefile.am.orig Fri May 13 18:03:49 2005
	2	+++ lib/EIMIL/Makefile.am Fri May 13 18:04:12 2005
	3	@@ -1,5 +1,5 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	-ACLOCAL_AMFLAGS = -I ../../acfiles
	6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
	7	SUBDIRS = . test
	8	#libdir = /usr/local/lib
	9	#libEIMIL_la_LDFLAGS = -module -version-info $(LIBEIMIL_MAJOR_VERSION):$(LIBEIMIL_MINOR_VERSION) \

Lines 1-11 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am (-5 / +8 lines)
1	--- lib/iiimcf/Makefile.am.orig Wed Mar 2 05:50:46 2005	1	--- lib/iiimcf/Makefile.am.orig Mon May 9 16:47:15 2005
2	+++ lib/iiimcf/Makefile.am Wed Mar 2 05:51:11 2005	2	+++ lib/iiimcf/Makefile.am Mon May 9 16:48:31 2005
3	@@ -2,7 +2,7 @@	3	@@ -1,9 +1,9 @@
		4	AUTOMAKE_OPTIONS = foreign
		5	-ACLOCAL_AMFLAGS = -I ../../acfiles
		6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
4	SUBDIRS = . test	7	SUBDIRS = . test
5	#libdir = /usr/local/lib	8	#libdir = /usr/local/lib
6	libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \	9	libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
7	- -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la	10	- -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la -ldl
8	+ -export-dynamic -export-symbols libiiimcf.sym -liiimp	11	+ -export-dynamic -export-symbols libiiimcf.sym -liiimp
9	libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""	12	libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\"" -I../CSConv
10	libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \	13	libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \
11	lookup_choice.c message.c preedit.c status.c trigger.c \	14	lookup_choice.c message.c preedit.c status.c trigger.c \




--- 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




--- 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);

Lines 1-4 Link Here

(-)ports/textproc/iiimf-client-lib/pkg-plist (-3 / +6 lines)
1	lib/libiiimcf.a	1	include/iiim/iiimcf.h
		2	lib/libiiimcf.so.3
2	lib/libiiimcf.so	3	lib/libiiimcf.so
3	lib/libiiimcf.so.2	4	lib/libiiimcf.la
4	include/iiimcf.h	5	lib/libiiimcf.a
		6	libdata/pkgconfig/iiimf-lib-client.pc
		7	@unexec rmdir %D/include/iiim > /dev/null 2>&1 \|\| true




#

PORTNAME=	csconv
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method Framework encoding convert library

ONLY_FOR_ARCHS=	i386

USE_BZIP2=	yes
USE_ICONV=	yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_REINPLACE=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/lib/CSConv
WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
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

CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../../acfiles/im_common.m4 \
		${WRKSRC}/configure.ac \
		${WRKSRC}/csconv.h \
		${WRKSRC}/converterPI/configure.in \
		${WRKSRC}/converterPI/test/icutest4linux.c \
		${WRKSRC}/converterPI/icuconv_relay.c \
		${WRKSRC}/converterPI/icuconv/common/config.h
	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
		${WRKSRC}/converterPI/icuconv/common/icuconv.c
	for MKFLIN in `find ${WRKSRC} -name "Makefile.in"`; do \
		${REINPLACE_CMD} -e "/(CC)/s,-lc,,g" $${MKFLIN}; \
		${REINPLACE_CMD} -e "/(CC)/s,-ldl,,g" $${MKFLIN}; \
		${REINPLACE_CMD} -e '/(CC)/s,(LIBS),(LDFLAGS),g' $${MKFLIN}; \
		${REINPLACE_CMD} -e '/(CC)/s,{LIBS},{LDFLAGS},g' $${MKFLIN}; \
		${REINPLACE_CMD} -e "s,LIBS = @LIBS@,LDFLAGS = @LDFLAGS@,g" $${MKFLIN}; \
	done

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}/converterPI/ && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}

post-configure:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
		${BUILDDIR}/csconv.h

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-csconv/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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/CSConv
+#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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-lib_CSConv_Makefile.am (+11 lines)
	1	--- lib/CSConv/Makefile.am.orig Fri May 13 17:52:28 2005
	2	+++ lib/CSConv/Makefile.am Fri May 13 17:52:42 2005
	3	@@ -2,7 +2,7 @@
	4	EXTRA_DIST= encoding.norm
	5	SUBDIRS=test
	6	AUTOMAKE_OPTIONS = foreign
	7	-ACLOCAL_AMFLAGS = -I ../../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
	9	csconv_la_CFLAGS = -DCSCONV_DIR="\"${csconvdir}\""
	10	csconv_la_LDFLAGS = -avoid-version -module
	11	csconv_la_LIBADD = @LTLIBICONV@




--- lib/CSConv/configure.ac.orig	Fri Jun 13 01:27:08 2003
+++ lib/CSConv/configure.ac	Wed Mar  2 08:43:13 2005
@@ -28,7 +28,7 @@
 AC_INIT(csconv.h)
 
 AC_CONFIG_AUX_DIR(../../acfiles)
-AC_PREFIX_DEFAULT(/usr/lib/im)
+AC_PREFIX_DEFAULT(${LOCALBASE}/lib/im)
 IM_INIT(../..)
 
 AC_CONFIG_HEADER(config.h)
@@ -297,6 +297,9 @@
 	if test x"${CC}" = x"gcc" ; then
 		SHLIBCFLAGS='-fpic'
 		SHLIBLDFLAGS='-shared'
+	elif test x"${CC}" = x"cc" ; then
+		SHLIBCFLAGS='-fpic'
+		SHLIBLDFLAGS='-shared'
 	else
 		SHLIBCFLAGS=
 		SHLIBLDFLAGS=
@@ -314,6 +317,7 @@
 case "${host}" in
 	*solaris*) 	platform=SOLARIS ;;
 	*linux*) 	platform=LINUX ;;
+	*freebsd*)	platform=FREEBSD ;;
 esac
 AC_SUBST(platform)
 
@@ -337,6 +341,12 @@
 		## Shared object suffix
 		SO=so
 	;;
+        *freebsd*)
+                ## Commands to generate dependency files
+                GEN_DEPS="${CC} -E -MM ${DEFINES}  ${INCLUDES}"
+                ## Shared object suffix
+                SO=so
+        ;;
 esac
 
 
@@ -400,6 +410,7 @@
 AC_SUBST(ARFLAGS)
 AC_SUBST(SHLIBCFLAGS)
 AC_SUBST(SHLIBLDFLAGS)
+AC_SUBST(LDFLAGS)
 AC_SUBST(SUBDIR)
 AC_SUBST(ICONV_INCLUDES)
 AC_SUBST(OBJS_ICONV)

Line 0 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-lib_CSConv_csconv.c (+11 lines)
	1	--- lib/CSConv/csconv.c.orig Tue May 17 04:10:30 2005
	2	+++ lib/CSConv/csconv.c Tue May 17 04:11:40 2005
	3	@@ -64,7 +64,7 @@
	4	/* should we read other configuration files
	5	* such as ~/.iiim/encoding.norm ?
	6	*/
	7	- fp = fopen(CSCONV_DIR "/encoding.norm", "r");
	8	+ fp = fopen(CSC_BASE_DIR_DEFAULT "/encoding.norm", "r");
	9	if (!fp) return -1;
	10
	11	while((fgets(buf, sizeof(buf), fp) != NULL)) {




lib/iiim/csconv/csconv.la
lib/iiim/csconv/csconv.so
lib/iiim/csconv/encoding.norm
@dirrm lib/iiim/csconv
@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
lib/im/csconv/compoundtext/ct_en_US
lib/im/csconv/compoundtext/ct_es
lib/im/csconv/compoundtext/ct_fr
lib/im/csconv/compoundtext/ct_it
lib/im/csconv/compoundtext/ct_ja
lib/im/csconv/compoundtext/ct_ko
lib/im/csconv/compoundtext/ct_sv
lib/im/csconv/compoundtext/ct_zh
lib/im/csconv/compoundtext/ct_zh.GBK
lib/im/csconv/compoundtext/ct_zh_TW
lib/im/csconv/compoundtext/ct_zh_TW.GBK
lib/im/csconv/csconv.conf
lib/im/csconv/csconv.so
lib/im/csconv/ct_big5.so
lib/im/csconv/ct_big5w.so
lib/im/csconv/ct_cns.so
lib/im/csconv/ct_cnsw.so
lib/im/csconv/ct_euc.so
lib/im/csconv/ct_eucw.so
lib/im/csconv/ct_pck.so
lib/im/csconv/ct_pckw.so
lib/im/csconv/ct_utf16.so
lib/im/csconv/ct_utf8.so
lib/im/csconv/ct_utf8w.so
lib/im/csconv/ctex_mbs.so
lib/im/csconv/ctex_wcs.so
lib/im/csconv/encoding.norm
lib/im/csconv/euc_ct.so
lib/im/csconv/eucw_ct.so
lib/im/csconv/iconv_relay.so
lib/im/csconv/iconv_relay_mb_wc.so
lib/im/csconv/iconv_relay_wc_mb.so
lib/im/csconv/icuconv_relay.so
lib/im/csconv/icuconv_relay_mb_wc.so
lib/im/csconv/icuconv_relay_wc_mb.so
lib/im/csconv/libicuconv.so
lib/im/csconv/mbs_ctex.so
lib/im/csconv/mbs_wcs.so
lib/im/csconv/nil.so
lib/im/csconv/pck_ct.so
lib/im/csconv/pckw_ct.so
lib/im/csconv/utf16_ct.so
lib/im/csconv/utf8_ct.so
lib/im/csconv/utf8w_ct.so
lib/im/csconv/wcs_ctex.so
lib/im/csconv/wcs_mbs.so
lib/im/icuconv/libicu-toolutil.so
lib/im/share/icu/1.4.0/cnvalias.dat
lib/im/share/icu/1.4.0/icudata_cnvalias.dat
lib/im/share/icu/1.4.0/ibm-1004.cnv
lib/im/share/icu/1.4.0/ibm-1006.cnv
lib/im/share/icu/1.4.0/ibm-1008.cnv
lib/im/share/icu/1.4.0/ibm-1038.cnv
lib/im/share/icu/1.4.0/ibm-1041.cnv
lib/im/share/icu/1.4.0/ibm-1043.cnv
lib/im/share/icu/1.4.0/ibm-1047.cnv
lib/im/share/icu/1.4.0/ibm-1051.cnv
lib/im/share/icu/1.4.0/ibm-1088.cnv
lib/im/share/icu/1.4.0/ibm-1089.cnv
lib/im/share/icu/1.4.0/ibm-1098.cnv
lib/im/share/icu/1.4.0/ibm-1112.cnv
lib/im/share/icu/1.4.0/ibm-1114.cnv
lib/im/share/icu/1.4.0/ibm-1115.cnv
lib/im/share/icu/1.4.0/ibm-1116.cnv
lib/im/share/icu/1.4.0/ibm-1117.cnv
lib/im/share/icu/1.4.0/ibm-1118.cnv
lib/im/share/icu/1.4.0/ibm-1119.cnv
lib/im/share/icu/1.4.0/ibm-1123.cnv
lib/im/share/icu/1.4.0/ibm-1140-s390.cnv
lib/im/share/icu/1.4.0/ibm-1140.cnv
lib/im/share/icu/1.4.0/ibm-1141.cnv
lib/im/share/icu/1.4.0/ibm-1142-s390.cnv
lib/im/share/icu/1.4.0/ibm-1142.cnv
lib/im/share/icu/1.4.0/ibm-1143-s390.cnv
lib/im/share/icu/1.4.0/ibm-1143.cnv
lib/im/share/icu/1.4.0/ibm-1144-s390.cnv
lib/im/share/icu/1.4.0/ibm-1144.cnv
lib/im/share/icu/1.4.0/ibm-1145-s390.cnv
lib/im/share/icu/1.4.0/ibm-1145.cnv
lib/im/share/icu/1.4.0/ibm-1146-s390.cnv
lib/im/share/icu/1.4.0/ibm-1146.cnv
lib/im/share/icu/1.4.0/ibm-1147-s390.cnv
lib/im/share/icu/1.4.0/ibm-1147.cnv
lib/im/share/icu/1.4.0/ibm-1148-s390.cnv
lib/im/share/icu/1.4.0/ibm-1148.cnv
lib/im/share/icu/1.4.0/ibm-1149-s390.cnv
lib/im/share/icu/1.4.0/ibm-1149.cnv
lib/im/share/icu/1.4.0/ibm-1153-s390.cnv
lib/im/share/icu/1.4.0/ibm-1153.cnv
lib/im/share/icu/1.4.0/ibm-1154.cnv
lib/im/share/icu/1.4.0/ibm-1155.cnv
lib/im/share/icu/1.4.0/ibm-1156.cnv
lib/im/share/icu/1.4.0/ibm-1157.cnv
lib/im/share/icu/1.4.0/ibm-1158.cnv
lib/im/share/icu/1.4.0/ibm-1159.cnv
lib/im/share/icu/1.4.0/ibm-1160.cnv
lib/im/share/icu/1.4.0/ibm-1164.cnv
lib/im/share/icu/1.4.0/ibm-1250.cnv
lib/im/share/icu/1.4.0/ibm-1251.cnv
lib/im/share/icu/1.4.0/ibm-1252.cnv
lib/im/share/icu/1.4.0/ibm-1253.cnv
lib/im/share/icu/1.4.0/ibm-1254.cnv
lib/im/share/icu/1.4.0/ibm-1255.cnv
lib/im/share/icu/1.4.0/ibm-1256.cnv
lib/im/share/icu/1.4.0/ibm-1257.cnv
lib/im/share/icu/1.4.0/ibm-1258.cnv
lib/im/share/icu/1.4.0/ibm-12712-s390.cnv
lib/im/share/icu/1.4.0/ibm-12712.cnv
lib/im/share/icu/1.4.0/ibm-1275.cnv
lib/im/share/icu/1.4.0/ibm-1276.cnv
lib/im/share/icu/1.4.0/ibm-1277.cnv
lib/im/share/icu/1.4.0/ibm-1280.cnv
lib/im/share/icu/1.4.0/ibm-1281.cnv
lib/im/share/icu/1.4.0/ibm-1282.cnv
lib/im/share/icu/1.4.0/ibm-1283.cnv
lib/im/share/icu/1.4.0/ibm-1361.cnv
lib/im/share/icu/1.4.0/ibm-1362.cnv
lib/im/share/icu/1.4.0/ibm-1363.cnv
lib/im/share/icu/1.4.0/ibm-1364.cnv
lib/im/share/icu/1.4.0/ibm-1370.cnv
lib/im/share/icu/1.4.0/ibm-1371.cnv
lib/im/share/icu/1.4.0/ibm-1383.cnv
lib/im/share/icu/1.4.0/ibm-1386.cnv
lib/im/share/icu/1.4.0/ibm-1390.cnv
lib/im/share/icu/1.4.0/ibm-1399.cnv
lib/im/share/icu/1.4.0/ibm-16684.cnv
lib/im/share/icu/1.4.0/ibm-16804-s390.cnv
lib/im/share/icu/1.4.0/ibm-16804.cnv
lib/im/share/icu/1.4.0/ibm-17248.cnv
lib/im/share/icu/1.4.0/ibm-21427.cnv
lib/im/share/icu/1.4.0/ibm-273.cnv
lib/im/share/icu/1.4.0/ibm-277.cnv
lib/im/share/icu/1.4.0/ibm-278.cnv
lib/im/share/icu/1.4.0/ibm-280.cnv
lib/im/share/icu/1.4.0/ibm-284.cnv
lib/im/share/icu/1.4.0/ibm-285.cnv
lib/im/share/icu/1.4.0/ibm-297.cnv
lib/im/share/icu/1.4.0/ibm-37-s390.cnv
lib/im/share/icu/1.4.0/ibm-37.cnv
lib/im/share/icu/1.4.0/ibm-420.cnv
lib/im/share/icu/1.4.0/ibm-424.cnv
lib/im/share/icu/1.4.0/ibm-437.cnv
lib/im/share/icu/1.4.0/ibm-4899.cnv
lib/im/share/icu/1.4.0/ibm-4909.cnv
lib/im/share/icu/1.4.0/ibm-4930.cnv
lib/im/share/icu/1.4.0/ibm-4971.cnv
lib/im/share/icu/1.4.0/ibm-500.cnv
lib/im/share/icu/1.4.0/ibm-5104.cnv
lib/im/share/icu/1.4.0/ibm-5123.cnv
lib/im/share/icu/1.4.0/ibm-5210.cnv
lib/im/share/icu/1.4.0/ibm-5346.cnv
lib/im/share/icu/1.4.0/ibm-5347.cnv
lib/im/share/icu/1.4.0/ibm-5349.cnv
lib/im/share/icu/1.4.0/ibm-5350.cnv
lib/im/share/icu/1.4.0/ibm-5351.cnv
lib/im/share/icu/1.4.0/ibm-5352.cnv
lib/im/share/icu/1.4.0/ibm-5353.cnv
lib/im/share/icu/1.4.0/ibm-5354.cnv
lib/im/share/icu/1.4.0/ibm-803.cnv
lib/im/share/icu/1.4.0/ibm-808.cnv
lib/im/share/icu/1.4.0/ibm-813.cnv
lib/im/share/icu/1.4.0/ibm-833.cnv
lib/im/share/icu/1.4.0/ibm-834.cnv
lib/im/share/icu/1.4.0/ibm-835.cnv
lib/im/share/icu/1.4.0/ibm-848.cnv
lib/im/share/icu/1.4.0/ibm-8482.cnv
lib/im/share/icu/1.4.0/ibm-849.cnv
lib/im/share/icu/1.4.0/ibm-850.cnv
lib/im/share/icu/1.4.0/ibm-852.cnv
lib/im/share/icu/1.4.0/ibm-855.cnv
lib/im/share/icu/1.4.0/ibm-856.cnv
lib/im/share/icu/1.4.0/ibm-857.cnv
lib/im/share/icu/1.4.0/ibm-858.cnv
lib/im/share/icu/1.4.0/ibm-859.cnv
lib/im/share/icu/1.4.0/ibm-860.cnv
lib/im/share/icu/1.4.0/ibm-861.cnv
lib/im/share/icu/1.4.0/ibm-862.cnv
lib/im/share/icu/1.4.0/ibm-863.cnv
lib/im/share/icu/1.4.0/ibm-864.cnv
lib/im/share/icu/1.4.0/ibm-865.cnv
lib/im/share/icu/1.4.0/ibm-866.cnv
lib/im/share/icu/1.4.0/ibm-867.cnv
lib/im/share/icu/1.4.0/ibm-868.cnv
lib/im/share/icu/1.4.0/ibm-869.cnv
lib/im/share/icu/1.4.0/ibm-871.cnv
lib/im/share/icu/1.4.0/ibm-872.cnv
lib/im/share/icu/1.4.0/ibm-874.cnv
lib/im/share/icu/1.4.0/ibm-878.cnv
lib/im/share/icu/1.4.0/ibm-891.cnv
lib/im/share/icu/1.4.0/ibm-897.cnv
lib/im/share/icu/1.4.0/ibm-901.cnv
lib/im/share/icu/1.4.0/ibm-902.cnv
lib/im/share/icu/1.4.0/ibm-9027.cnv
lib/im/share/icu/1.4.0/ibm-903.cnv
lib/im/share/icu/1.4.0/ibm-904.cnv
lib/im/share/icu/1.4.0/ibm-9044.cnv
lib/im/share/icu/1.4.0/ibm-9049.cnv
lib/im/share/icu/1.4.0/ibm-9061.cnv
lib/im/share/icu/1.4.0/ibm-907.cnv
lib/im/share/icu/1.4.0/ibm-909.cnv
lib/im/share/icu/1.4.0/ibm-910.cnv
lib/im/share/icu/1.4.0/ibm-912.cnv
lib/im/share/icu/1.4.0/ibm-913.cnv
lib/im/share/icu/1.4.0/ibm-914.cnv
lib/im/share/icu/1.4.0/ibm-915.cnv
lib/im/share/icu/1.4.0/ibm-916.cnv
lib/im/share/icu/1.4.0/ibm-920.cnv
lib/im/share/icu/1.4.0/ibm-921.cnv
lib/im/share/icu/1.4.0/ibm-922.cnv
lib/im/share/icu/1.4.0/ibm-923.cnv
lib/im/share/icu/1.4.0/ibm-9238.cnv
lib/im/share/icu/1.4.0/ibm-924.cnv
lib/im/share/icu/1.4.0/ibm-930.cnv
lib/im/share/icu/1.4.0/ibm-933.cnv
lib/im/share/icu/1.4.0/ibm-935.cnv
lib/im/share/icu/1.4.0/ibm-937.cnv
lib/im/share/icu/1.4.0/ibm-939.cnv
lib/im/share/icu/1.4.0/ibm-941.cnv
lib/im/share/icu/1.4.0/ibm-942.cnv
lib/im/share/icu/1.4.0/ibm-943.cnv
lib/im/share/icu/1.4.0/ibm-944.cnv
lib/im/share/icu/1.4.0/ibm-946.cnv
lib/im/share/icu/1.4.0/ibm-947.cnv
lib/im/share/icu/1.4.0/ibm-948.cnv
lib/im/share/icu/1.4.0/ibm-949.cnv
lib/im/share/icu/1.4.0/ibm-950.cnv
lib/im/share/icu/1.4.0/ibm-953.cnv
lib/im/share/icu/1.4.0/ibm-954.cnv
lib/im/share/icu/1.4.0/ibm-955.cnv
lib/im/share/icu/1.4.0/ibm-970.cnv
@dirrm lib/im/share/icu/1.4.0
@dirrm lib/im/share/icu
@dirrm lib/im/share
@dirrm lib/im/icuconv
@dirrm lib/im/csconv/compoundtext
@dirrm lib/im/csconv
@unexec rmdir %D/lib/im > /dev/null 2>&1 || true




#

PORTNAME=	gnome-im-switcher
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	IIIMF gnome input method switcher

ONLY_FOR_ARCHS=	i386

USE_X_PREFIX=	yes

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_REINPLACE=  yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_GNOME=	intltool gconf2 libglade2 libgnomeui \
		gnomepanel gnomeprefix gnomehack
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/gnome-im-switcher

WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher
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

CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"
TLZ_ARGS=	--copy --force
BNB_PATH=	bonobo/server

post-patch:
	${REINPLACE_CMD} \
		-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
		-e '/^uidir/s,$$[(]datadir[)]/,&gnome/,g' \
		${BUILDDIR}/src/Makefile.am
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		${BUILDDIR}/src/Makefile.am
	${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
		${BUILDDIR}/configure.ac
	${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
		${BUILDDIR}/configure.ac
	${REINPLACE_CMD} -e "/^omf_dest_dir/s,[(]datadir[)]/,&gnome/,g" \
		${BUILDDIR}/help/omf.make

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	@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 '/^pkgdatadir/s,[(]datadir[)]/,&gnome/,g' \
		-e '/^iconsdir/s,[(]datadir[)]/,&gnome/,g' \
		${BUILDDIR}/src/Makefile
	 ${WRKSRC}/src/Makefile
	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
	 ${WRKSRC}/help/C/Makefile
	${REINPLACE_CMD} \
	 -e "/^datadir/s,${PREFIX}/share/gnome,${PREFIX}/share,g" \
	 ${WRKSRC}/po/Makefile

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
 
-INTLDIRS = iiimgcf gnome-im-switcher
+INTLDIRS = 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 = 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
 
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
 
 all: compile
 
 config:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_Makefile.am (+10 lines)
	1	--- gnome-im-switcher/Makefile.am.orig Fri May 13 17:44:10 2005
	2	+++ gnome-im-switcher/Makefile.am Fri May 13 17:44:57 2005
	3	@@ -1,5 +1,7 @@
	4	SUBDIRS = src po capplet help
	5
	6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I %%PREFIX%%/share/aclocal -I ../acfiles
	7	+
	8	@INTLTOOL_DESKTOP_RULE@
	9
	10	EXTRA_DIST = \

Lines 1-9 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in (-9 lines)
1	--- gnome-im-switcher/configure.in.orig Thu Oct 14 23:10:11 2004
2	+++ gnome-im-switcher/configure.in Wed Mar 2 22:17:35 2005
3	@@ -40,6 +40,7 @@
4	GIMLET_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $GIMLET_LIBS"
5	GIMLET_CFLAGS="$X_CFLAGS $GIMLET_CFLAGS"
6	CFLAGS="$GIMLET_CFLAGS $CFLAGS"
7	+LDFLAGS="${LDFLAGS}"
8
9	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)

Lines 1-5 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c (-2 / +2 lines)
1	--- gnome-im-switcher/src/widgets.c Thu Oct 14 23:10:11 2004	1	--- gnome-im-switcher/src/widgets.c.orig Tue May 10 16:29:36 2005
2	+++ gnome-im-switcher/src/widgets.c Wed Feb 16 16:51:26 2005	2	+++ gnome-im-switcher/src/widgets.c Tue May 10 16:30:04 2005
3	@@ -29,7 +29,11 @@	3	@@ -29,7 +29,11 @@
4	#include <gnome.h>	4	#include <gnome.h>
5		5




bin/gnome-im-properties
bin/gnome-im-settings-daemon
libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
libexec/gnome-im-switcher-applet
share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/de/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/es/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/fr/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/gu/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/hi/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/hu/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/it/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/ja/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/ko/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/pa/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/pl/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/pt_BR/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/ru/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/sv/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
share/icons/hicolor/48x48/apps/gnome-settings-im.png
share/gnome/pixmaps/gnome-settings-im.png
share/gnome/pixmaps/gimlet-off.png
share/gnome/pixmaps/gimlet-on.png
share/gnome/pixmaps/gimlet-disable.png
share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
share/gnome/help/imswitcher/C/legal.xml
share/gnome/help/imswitcher/C/imswitcher.xml
@dirrm share/gnome/help/imswitcher/C
@dirrm share/gnome/help/imswitcher
share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
@dirrm share/gnome/iiimf-im-switcher/glade
@dirrm share/gnome/iiimf-im-switcher
share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
@comment
@comment 'do scrollkeeper-update'
@comment
share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
@dirrm share/gnome/omf/iiimf-im-switcher
@comment
@comment 'do gconftool-2'
@comment
@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
etc/gconf/schemas/gnome-im-switcher.schemas
@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null || true
@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
etc/gconf/schemas/gnome-im-properties.schemas
@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null || true
@comment
@comment 'rm files in LOCALBASE.'
@comment
@cwd %%LOCALBASE%%
libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
@dirrm share/gnome/gnome-im-switcher/glade
@dirrm share/gnome/gnome-im-switcher
share/gnome/help/imswitcher/C/legal.xml
share/gnome/help/imswitcher/C/imswitcher.xml
@dirrm share/gnome/help/imswitcher/C
@dirrm share/gnome/help/imswitcher
share/gnome/icons/hicolor/48x48/apps/gnome-settings-im.png
@unexec rmdir %D/share/gnome/icons/hicolor/48x48/apps > /dev/null 2>&1 || true
@unexec rmdir %D/share/gnome/icons/hicolor/48x48 > /dev/null 2>&1 || true
@unexec rmdir %D/share/gnome/icons/hicolor > /dev/null 2>&1 || true
@unexec rmdir %D/share/gnome/icons > /dev/null 2>&1 || true
share/locale/ja/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 || true
share/locale/ko/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 || true
share/locale/zh_CN/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 || true
share/locale/zh_TW/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 || true
share/locale/zh_HK/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true
share/locale/de/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/de/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/de > /dev/null 2>&1 || true
share/locale/fr/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/fr/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/fr > /dev/null 2>&1 || true
share/locale/pl/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/pl/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/pl > /dev/null 2>&1 || true
share/locale/ru/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/ru/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/ru > /dev/null 2>&1 || true
share/locale/es/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/es/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/es > /dev/null 2>&1 || true
share/locale/it/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/it/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/it > /dev/null 2>&1 || true
share/locale/pt_BR/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/pt_BR > /dev/null 2>&1 || true
share/locale/sv/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/sv/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/sv > /dev/null 2>&1 || true
share/locale/cs/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/cs/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/cs > /dev/null 2>&1 || true
share/locale/hu/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/hu/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/hu > /dev/null 2>&1 || true
share/locale/bn/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/bn/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/bn > /dev/null 2>&1 || true
share/locale/gu/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/gu/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/gu > /dev/null 2>&1 || true
share/locale/hi/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/hi/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/hi > /dev/null 2>&1 || true
share/locale/pa/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/pa/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/pa > /dev/null 2>&1 || true
share/locale/ta/LC_MESSAGES/gnome-im-switcher.mo
@unexec rmdir %D/share/locale/ta/LC_MESSAGES > /dev/null 2>&1 || true
@unexec rmdir %D/share/locale/ta > /dev/null 2>&1 || true




#

PORTNAME=	gtk
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method Server Framework

LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib

ONLY_FOR_ARCHS=	i386

USE_X_PREFIX=	yes

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_ICONV=	yes
USE_REINPLACE=  yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_GNOME=	intltool gtk20
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/iiimgcf

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 defined(WITH_DEBUG)
CFLAGS+=	-DDEBUG
.endif

CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv -lintl ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"
TLZ_ARGS=	--copy --force

post-patch:
	${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} bootstrap
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	@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-install:
	${X11BASE}/bin/gtk-query-immodules-2.0 > \

Lines 1-2 Link Here

(-)ports/textproc/iiimf-gtk/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
 
-INTLDIRS = iiimgcf gnome-im-switcher
+INTLDIRS = iiimgcf
 
-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 = iiimgcf
+#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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;




--- iiimgcf/Makefile.am.orig	Thu Apr 14 05:29:08 2005
+++ iiimgcf/Makefile.am	Tue May 17 22:33:56 2005
@@ -5,11 +5,11 @@
 @INTLTOOL_DESKTOP_RULE@
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I /usr/local/share/aclocal -I /usr/X11R6/share/aclocal -I ../acfiles
 
 moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
 
-im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -I $(CSCONV_DIR)
 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 \
@@ -18,8 +18,7 @@
                      imswitcher.c imswitcher.h
 
 im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
-                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
-                    $(IM_LIBDIR)/iiimp/libiiimp.la
+		    -liiimp -liiimcf
 
 module_LTLIBRARIES = im-iiim.la
 




--- iiimgcf/configure.ac.orig	Tue Nov 18 12:17:57 2003
+++ iiimgcf/configure.ac	Wed Mar  2 22:59:24 2005
@@ -5,7 +5,6 @@
 AC_PREREG(2.50)
 AC_INIT(im-iiim.so, 0.5, im@OpenI18N.org)
 dnl common initialization
-AC_CONFIG_AUX_DIR(../acfiles)
 IM_INIT(..)
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
@@ -63,13 +62,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




--- iiimgcf/gtkimcontextiiim.c.orig	Fri Apr 22 07:46:48 2005
+++ iiimgcf/gtkimcontextiiim.c	Tue May 17 23:33:11 2005
@@ -39,6 +39,7 @@
 #include "imaux.h"
 #include "imswitcher.h"
 #include "IIIMGdkEventKey.h"
+#include "iconv.h"
 
 #ifdef DEBUG
 #define DEBUG_DO(x) (x)
@@ -147,6 +148,8 @@
 static GdkAtom im_settings_atom = GDK_NONE;
 static const char *_IM_SETTINGS = "_IM_SETTINGS";
 
+static iconv_t                 ic_u16_to_u8 = (iconv_t)-1;
+
 static gboolean on_status_toplevel_configure (GtkWidget         *toplevel,
 					      GdkEventConfigure *event,
 					      StatusWindow      *status_window);
@@ -305,6 +308,7 @@
       return;
     }
   utf8 = utf16_to_utf8 (text);
+  if (!utf8) utf8 = g_strdup("");
 
   if (current_setting_enabled &&
       (current_setting.im_enabled == IM_OFF ||
@@ -593,9 +597,12 @@
 	    IIIMCF_text text;
 	    gchar *utf8 = NULL;
 	    st = iiimcf_get_committed_text (c, &text);
+	    if (st != IIIMF_STATUS_SUCCESS) break;
 	    utf8 = utf16_to_utf8 (text);
-	    g_signal_emit_by_name (context_iiim, "commit", utf8);
-	    g_free (utf8);
+	    if (utf8) {
+	      g_signal_emit_by_name (context_iiim, "commit", utf8);
+	      g_free (utf8);
+	    }
 	  }
 	  break;
 	default:
@@ -936,7 +943,7 @@
       return;
     }
 
-  gtk_frame_set_label(GTK_FRAME (cw->frame), title_u8);
+  gtk_frame_set_label(GTK_FRAME (cw->frame), (title_u8 ? title_u8 : ""));
 
   if (title_u8)
     g_free (title_u8);
@@ -975,6 +982,7 @@
       if (label)
 	label_u8 = utf16_to_utf8 (label);
       candidate_u8 = utf16_to_utf8 (candidate);
+      if (!candidate_u8) candidate_u8 = g_strdup("");
       DEBUG_DO (g_message ("candidate %s", candidate_u8));
       if (label_u8)
 	{
@@ -997,12 +1005,9 @@
 	    gtk_tree_view_get_selection (GTK_TREE_VIEW (cw->tree));
 	  gtk_tree_selection_select_iter (selection, &iter);
 	}
-      if (result)
-	{
-	  g_free (result);
-	  g_free (label_u8);
-	}
-      g_free (candidate_u8);
+      if (result) g_free(result);
+      if (candidate_u8) g_free (candidate_u8);
+      if (label_u8) g_free(label_u8);
     }
   gtk_widget_realize (w);
   iiim_candidate_move (context_iiim, w);
@@ -1187,7 +1192,7 @@
   w->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_container_set_border_width (GTK_CONTAINER (w->toplevel), 2);
 
-  w->frame = gtk_frame_new (title_u8);
+  w->frame = gtk_frame_new (title_u8 ? title_u8 : "");
   gtk_frame_set_shadow_type (GTK_FRAME (w->frame), GTK_SHADOW_ETCHED_OUT);
 
   w->tree = gtk_tree_view_new ();
@@ -1539,14 +1544,52 @@
 }
 
 static gchar *
+iconv_utf16_to_utf8(const gunichar2 *utf16, int length)
+{
+  if (!utf16 || 0 >= length) return g_strdup("");
+
+  if ((iconv_t)-1 == ic_u16_to_u8) {
+    ic_u16_to_u8 = iconv_open("UTF-8", "UTF-16");
+
+    if ((iconv_t)-1 == ic_u16_to_u8) {
+      fprintf(stderr, "iiimgcf: Unable to open UTF-16 -> UTF-8 converter.");
+      return NULL;
+    }
+  }
+
+  int inlen = length * sizeof(gunichar2);
+  int outlen = (length +1) * 4;
+  const char *inbuf = (char*)utf16;
+  char *outbuf = g_malloc0(outlen + 4);
+  gchar *utf8 = (gchar*)outbuf;
+
+  if (!outbuf) {
+    fprintf(stderr, "iiimgcf: Out of memory error.");
+    return NULL;
+  }
+
+  if ((size_t)-1 == iconv(ic_u16_to_u8, &inbuf, &inlen, &outbuf, &outlen)) {
+    fprintf(stderr, "iiimgcf: Unable to convert the string.");
+    g_free(utf8);
+    return NULL;
+  }
+
+  return utf8;
+}
+
+static gchar *
 utf16_to_utf8 (IIIMCF_text text)
 {
   IIIMF_status st;
+
+  int len = 0;
   IIIMP_card16 *u16str = NULL;
   st = iiimcf_get_text_utf16string (text, (const IIIMP_card16 **) &u16str);
-  return (u16str != NULL ?
-	  g_utf16_to_utf8 ((const gunichar2 *) u16str, -1, NULL, NULL, NULL) :
-	  NULL);
+  st = iiimcf_get_text_length(text, &len);
+
+  if (st != IIIMF_STATUS_SUCCESS) return NULL;
+
+  return iconv_utf16_to_utf8((const gunichar2 *)u16str, len);
 }
 
 static void
@@ -2094,7 +2137,7 @@
     goto Error;
   utf8 = utf16_to_utf8 (text);
 
-  if (attrs)
+  if (attrs && utf8)
     {
       gint i;
       gint j;

Lines 1-11 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c (-11 lines)
1	--- iiimgcf/imaux.c Thu Jul 29 20:44:21 2004
2	+++ iiimgcf/imaux.c Wed Feb 16 20:40:51 2005
3	@@ -36,7 +36,7 @@
4
5	static void iiim_aux_download (IIIMCF_downloaded_object obj);
6
7	-#define AUX_BASE_DIR "/usr/lib/im/"
8	+#define AUX_BASE_DIR IMDIR
9
10	#define IS_SPACE(len, ptr) ((0 < (len)) && \
11	(('\t' == (p)) \|\| (' ' == (p))))




#

PORTNAME=	headers
PORTVERSION=	12.2
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Header files for Internet/Intranet Input Method Framework

IIIMF_VER=	r12_1-svn2002
WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
USE_BZIP2=	yes
NO_BUILD=	yes

do-install:
	${MKDIR} ${PREFIX}/include/iiim
.for file in IMArg.h IMCharSubsets.h IMProtocolStruct.h syscfg.h threaddef.h
	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiim
.endfor
	${MKDIR} ${PREFIX}/include/iiim/iml
	${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiim/iml

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-headers/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




include/iiim/IMArg.h
include/iiim/IMCharSubsets.h
include/iiim/IMProtocolStruct.h
include/iiim/syscfg.h
include/iiim/threaddef.h
include/iiim/iml/SunIM.h
include/iiim/iml/SunIMCore.h
include/iiim/iml/SunIMLock.h
include/iiim/iml/SunIMMMan.h
include/iiim/iml/SunIMMthd.h
include/iiim/iml/SunIMPriv.h
include/iiim/iml/SunIMProt.h
include/iiim/iml/SunIMPub.h
include/iiim/iml/iml_fop.h
@dirrm include/iiim/iml
@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true




#

PORTNAME=	le-unit
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	IIIMF UNIcode Table based generic composition engine

LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server

ONLY_FOR_ARCHS=	i386

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_ICONV=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_XLIB=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/leif

WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
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

CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
		-DIMDIR="\\\"\$${IMDIR}\\\""
LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		${BUILDDIR}/../lib/EIMIL/Makefile.am

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	 -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}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE}
	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \
	 CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
	 ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
	@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}

pre-build:
	@cd ${WRKSRC}/../lib/EIMIL && \
	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-le-unit/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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 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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_Makefile.am (+8 lines)
	1	--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
	2	+++ leif/Makefile.am Fri May 13 15:46:03 2005
	3	@@ -1,4 +1,4 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = $(LE_TARGETS)
	6
	7	-ACLOCAL_AMFLAGS = -I ../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles




--- 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 @@
 
 LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
 
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="default template testEIMIL unit fop_test"
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
 
 dnl --------------------------------------------------------------------------------
 dnl                      Section 5: compilation options
@@ -63,23 +63,16 @@
 
 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 testEIMIL unit"
 
-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_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

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c (-11 lines)
1	--- leif/sampleja3/sampleja3.c Mon Apr 26 21:16:13 2004
2	+++ leif/sampleja3/sampleja3.c Wed Feb 16 20:42:52 2005
3	@@ -171,7 +171,7 @@
4	objects[obj_id].name_length = 9;
5	objects[obj_id].domain = "com.sun";
6	objects[obj_id].scope = "sampleja3";
7	- objects[obj_id].path = "/usr/lib/im/locale/ja/sampleja3/aux.jar";
8	+ objects[obj_id].path = IMDIR "/locale/ja/sampleja3/aux.jar";
9	objects[obj_id].signature = "";
10	objects[obj_id].class_names = class_names;
11	objects[obj_id].count_names = 1;

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h (-11 lines)
1	--- leif/sampleja3/xaux_common/csconv.h Fri Mar 16 00:52:22 2001
2	+++ leif/sampleja3/xaux_common/csconv.h Wed Feb 16 20:48:24 2005
3	@@ -63,7 +63,7 @@
4	# define CSC_BASE_DIR_SYSTEM "/etc/lib/im/csconv/"
5	#endif /* !CSC_BASE_DIR_SYSTEM */
6	#if !defined(CSC_BASE_DIR_DEFAULT)
7	-# define CSC_BASE_DIR_DEFAULT "/usr/lib/im/csconv/"
8	+# define CSC_BASE_DIR_DEFAULT (IMDIR "/csconv/")
9	#endif /* !CSC_BASE_DIR_DEFAULT */
10
11	#define CSC_IS_PATH_ABS(path) (('/' == *(path)) \|\| \




--- leif/sampleja3/xaux_common/xaux_ext_common.c	Fri Mar 16 00:52:22 2001
+++ leif/sampleja3/xaux_common/xaux_ext_common.c	Wed Feb 16 20:43:12 2005
@@ -633,7 +633,7 @@
 
 #else /* defined(USE_DTACTIONINVOKE) */
 
-#define DTACTION_CMD    "/usr/dt/bin/dtaction"
+#define DTACTION_CMD    "/usr/local/bin/dtaction"
 
 static int help_available = 0;
 static char tmp_file[256];
@@ -803,7 +803,11 @@
     fprintf(fp, "%s%s\n", rdb.help_basepath, path_);
     fclose(fp);
 
+#ifdef __FreeBSD__
+    pid = vfork();
+#else
     pid = fork1();
+#endif
 
     if (pid == (pid_t) (-1)) {
         return;
@@ -834,6 +838,8 @@
 
 #ifdef linux
     pid = fork();
+#elif defined(__FreeBSD__)
+    pid = vfork();
 #else
     pid = fork1();
 #endif
@@ -853,7 +859,11 @@
     if (pid == (pid_t) (-1)) {
         return;
     } else if (0 == pid) {
+#ifdef __FreeBSD__
+        pid2 = vfork();
+#else
         pid2 = fork();
+#endif
         if(pid2 == -1) {
             _exit(1);
         } else if(pid2 == 0) {

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h (-11 lines)
1	--- leif/sampleja3/xaux_common/xaux_ext_common.h Fri Mar 16 00:52:22 2001
2	+++ leif/sampleja3/xaux_common/xaux_ext_common.h Wed Feb 16 20:48:29 2005
3	@@ -97,7 +97,7 @@
4	extern void HelpInvoke(char *);
5	#endif
6
7	-#define DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja3/help/"
8	+#define DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja3/help/")
9
10	#endif /* !XAUX_EXT_COMMON_H */
11

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c (-11 lines)
1	--- leif/sampleja3/xaux_motif/sampleja3_xaux_so.c Fri Mar 16 00:52:22 2001
2	+++ leif/sampleja3/xaux_motif/sampleja3_xaux_so.c Wed Feb 16 20:43:20 2005
3	@@ -63,7 +63,7 @@
4	'L','o','o','k','u','p','A','u','x',
5	};
6
7	-#define XAUX_EXT_DIR "/usr/lib/im/locale/ja/sampleja3/xaux/motif/"
8	+#define XAUX_EXT_DIR (IMDIR "/locale/ja/sampleja3/xaux/motif/")
9
10	xaux_class_t xaux_classes[AUX_CLASS_MAX + 1] = {
11	{

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c (-11 lines)
1	--- leif/sampleja4/xaux/xaux_ext_conv.c Fri Jun 27 11:41:21 2003
2	+++ leif/sampleja4/xaux/xaux_ext_conv.c Wed Feb 16 20:43:31 2005
3	@@ -79,7 +79,7 @@
4	#ifdef USE_CSCONV
5	#include <dlfcn.h>
6	#include "csconv.h"
7	-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
8	+#define CSC_PATH (IMDIR "/csconv/csconv.so")
9	#define CSC_OPEN_LOCALE "csconv_open_locale"
10	#define CSC_OPEN "csconv_open"
11	#define CSC_CONV "csconv"

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.c (-11 lines)
1	--- leif/sampleja4/xaux/xaux_ext_help.c Fri Jun 27 11:41:21 2003
2	+++ leif/sampleja4/xaux/xaux_ext_help.c Wed Feb 16 20:43:43 2005
3	@@ -66,7 +66,7 @@
4
5	#else /* defined(USE_DTACTIONINVOKE) */
6
7	-#define DTACTION_CMD "/usr/dt/bin/dtaction"
8	+#define DTACTION_CMD "/usr/local/bin/dtaction"
9
10	static int help_available = 0;
11	static char tmp_file[256];

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h (-10 lines)
1	--- leif/sampleja4/xaux/xaux_ext_help.h Fri Jun 27 11:41:21 2003
2	+++ leif/sampleja4/xaux/xaux_ext_help.h Wed Feb 16 20:48:34 2005
3	@@ -52,6 +52,6 @@
4	extern void HelpInvoke(char *);
5	#endif /* USE_CDE_HELP */
6
7	-#define DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja4/help/"
8	+#define DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja4/help/")
9
10	#endif /* !XAUX_EXT_HELP_H */

Lines 1-8 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c (-8 lines)
1	--- leif/sampleja4/xaux/xaux_so_sampleja4.c Fri Jun 27 11:41:21 2003
2	+++ leif/sampleja4/xaux/xaux_so_sampleja4.c Wed Feb 16 20:43:49 2005
3	@@ -334,4 +334,4 @@
4	/*
5	* primary path for external executables
6	*/
7	-const char *xaux_so_extexec_path = "/usr/lib/im/locale/ja/sampleja4/xaux";
8	+const char *xaux_so_extexec_path = IMDIR "/locale/ja/sampleja4/xaux";

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c (-11 lines)
1	--- leif/sampleja/sampleja.c Fri Mar 16 00:52:22 2001
2	+++ leif/sampleja/sampleja.c Wed Feb 16 20:42:34 2005
3	@@ -331,7 +331,7 @@
4	#ifdef WIN32
5	l->path = "d:\\sampleja_obj.jar"; /* path */
6	#else
7	- l->path = "/usr/lib/im/locale/ja/sampleja/sampleja_obj.jar"; /* path */
8	+ l->path = IMDIR "/locale/ja/sampleja/sampleja_obj.jar"; /* path */
9	#endif
10	l->signature = "";
11	l->class_names = class_names;

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c (-11 lines)
1	--- leif/sampleja/xaux/aux_so.c Fri Mar 16 00:52:22 2001
2	+++ leif/sampleja/xaux/aux_so.c Wed Feb 16 20:42:40 2005
3	@@ -72,7 +72,7 @@
4	#define HTT_AUX_PROP_NAME "htt_aux_sample_prop"
5	#define HTT_AUX_PROP1_NAME "htt_aux_sample_prop1"
6
7	-#define AUX_EXT "/usr/lib/im/locale/ja/sampleja/aux_ext"
8	+#define AUX_EXT (IMDIR "/locale/ja/sampleja/aux_ext")
9
10	typedef struct _aux_icid {
11	aux_t * aux;




--- leif/sun_le_asia/common/auxwin/KeyboardConfig.c	Fri Mar 26 18:13:39 2004
+++ leif/sun_le_asia/common/auxwin/KeyboardConfig.c	Wed Feb 16 20:44:10 2005
@@ -145,7 +145,7 @@
 zh_CN.GBK/keyboard_layout2.txt
 common/keyboard_layout.txt
 
-base directory:  /usr/lib/im/locale/<locale>/
+base directory:  /usr/local/lib/im/locale/<locale>/
 
 */
 int read_keyboard_config_file(char *path_name, char *file_name)
@@ -557,7 +557,7 @@
 	nLocaleID = get_encodeid_from_locale(sLocaleName);
 
 	lang_name = (char *)get_langname_from_locale(sLocaleName);
-	sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
+	sprintf(path_name, IMDIR "/locale/%s", lang_name);
 
 	DEBUG_printf("path_name:%s\n", path_name);
 

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c (-11 lines)
1	--- leif/sun_le_asia/common/auxwin/LookupImpl.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/common/auxwin/LookupImpl.c Wed Feb 16 20:44:18 2005
3	@@ -475,7 +475,7 @@
4	sLocaleName = setlocale(LC_ALL, NULL);
5	lang_name = (char *)get_langname_from_locale(sLocaleName);
6
7	- sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
8	+ sprintf(path_name, IMDIR "/locale/%s", lang_name);
9	ret = read_keyboard_config_file(path_name, DEFAULT_SYMBOLS_CONFIG_FILE);
10	}
11

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c (-11 lines)
1	--- leif/sun_le_asia/common/auxwin/OptionMessage.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/common/auxwin/OptionMessage.c Wed Feb 16 20:44:22 2005
3	@@ -127,7 +127,7 @@
4
5	nLocaleID = get_encodeid_from_locale(locale_name);
6	lang_name = get_langname_from_locale(locale_name);
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
9	gCatd = catopen(file_name, 0);
10	if (gCatd == (nl_catd)-1)
11	printf("WARNING: Could not open message catalog: %s\n", name);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c (-11 lines)
1	--- leif/sun_le_asia/common/auxwin/SelectMessage.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/common/auxwin/SelectMessage.c Wed Feb 16 20:44:30 2005
3	@@ -139,7 +139,7 @@
4
5	nLocaleID = get_encodeid_from_locale(locale_name);
6	lang_name = get_langname_from_locale(locale_name);
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
9	gCatd = catopen(file_name, 0);
10	if (gCatd == (nl_catd)-1)
11	printf("WARNING: Could not open message catalog: %s\n", name);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c (-11 lines)
1	--- leif/sun_le_asia/common/auxwin/UtilityConfig.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/common/auxwin/UtilityConfig.c Wed Feb 16 20:44:37 2005
3	@@ -122,7 +122,7 @@
4	lang_name = (char *)get_langname_from_locale(locale_name);
5	DEBUG_printf("lang_name:%s\n", lang_name);
6
7	- sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
9	DEBUG_printf("file_name:%s\n", file_name);
10
11	read_utility_config_file(file_name);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h (-11 lines)
1	--- leif/sun_le_asia/common/include/hzinput.h Fri May 28 16:52:29 2004
2	+++ leif/sun_le_asia/common/include/hzinput.h Wed Feb 16 20:48:38 2005
3	@@ -63,7 +63,7 @@
4	#define ENGINE_NOT_INITIATED 2
5	#define ENGINE_INITIATED 3
6
7	-#define DEFAULT_ENGINE_PATH "/usr/lib/im/locale"
8	+#define DEFAULT_ENGINE_PATH (IMDIR "/locale")
9	#define DEFAULT_DICT_PATH "data"
10	#define COMMON_ENGINE_PATH "common"
11	#define CODETABLE_ENGINE_NAME "ctim"




--- leif/sun_le_asia/common/leif/qjbj_punct.c	Fri Mar 26 18:13:39 2004
+++ leif/sun_le_asia/common/leif/qjbj_punct.c	Wed Feb 16 20:44:53 2005
@@ -384,7 +384,7 @@
 
 	lang_name = (char *)get_langname_from_langid(lang_id);
 	DEBUG_printf("lang_name:%s\n", lang_name);
-	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
 	DEBUG_printf("file_name:%s\n", file_name);
 
 	fd = fopen(file_name, "r");
@@ -441,7 +441,7 @@
 	PunctCharListByLang[lang_id].bInit = 1;
 
 	lang_name = (char *)get_langname_from_langid(lang_id);
-	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
 	DEBUG_printf("file_name:%s\n", file_name);
 
 	fd = fopen(file_name, "r");

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c (-11 lines)
1	--- leif/sun_le_korea/auxobj/xaux_so.c Sat Mar 27 10:46:45 2004
2	+++ leif/sun_le_korea/auxobj/xaux_so.c Wed Feb 16 20:46:40 2005
3	@@ -19,7 +19,7 @@
4
5	#define XAUX_CLASS_MAX 7
6
7	-#define XAUX_EXT_DIR "/usr/lib/im/locale/ko_KR/"
8	+#define XAUX_EXT_DIR (IMDIR "/locale/ko_KR/")
9
10	CARD16 aux_utfname_palette[] = {
11	'c','o','m','.','s','u','n','.',

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c (-11 lines)
1	--- leif/sun_le_korea/auxwin_gtk/keyboard_config.c Sat Mar 27 10:46:45 2004
2	+++ leif/sun_le_korea/auxwin_gtk/keyboard_config.c Wed Feb 16 20:46:48 2005
3	@@ -432,7 +432,7 @@
4	g_virtual_keyboards[i] = NULL;
5
6	lang_name = (char *) strdup ("ko_KR");
7	- sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
8	+ sprintf(path_name, IMDIR "/locale/%s", lang_name);
9	free (lang_name);
10
11




--- leif/sun_le_korea/korean/hanja_dic.h	Sat Mar 27 10:46:45 2004
+++ leif/sun_le_korea/korean/hanja_dic.h	Wed Feb 16 20:49:10 2005
@@ -19,9 +19,9 @@
 
 #define USRNAME		".usrhjd"
 #ifdef __STDC__
-#define SYSPATH		"/usr/lib/im/locale/ko_KR/common/data"
+#define SYSPATH		(IMDIR "/locale/ko_KR/common/data")
 #else
-#define SYSPATH		"/usr/lib/im/locale/ko_KR/common/data"
+#define SYSPATH		(IMDIR "/locale/ko_KR/common/data")
 #endif
 #define SYSNAME		"syshjd"
 #define NULNAME		"nulhjd"

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h (-11 lines)
1	--- leif/sun_le_korea/include/koinput.h Fri Apr 23 15:40:46 2004
2	+++ leif/sun_le_korea/include/koinput.h Wed Feb 16 20:48:57 2005
3	@@ -76,7 +76,7 @@
4	#define ENGINE_NOT_INITIATED 2
5	#define ENGINE_INITIATED 3
6
7	-#define DEFAULT_ENGINE_PATH "/usr/lib/im/locale"
8	+#define DEFAULT_ENGINE_PATH (IMDIR "/locale")
9	#define DEFAULT_DICT_PATH "data"
10	#define COMMON_ENGINE_PATH "common"
11	#define LANGNAME "ko_KR"

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h (-11 lines)
1	--- leif/sun_le_korea/include/le-options.h Tue Apr 20 08:53:49 2004
2	+++ leif/sun_le_korea/include/le-options.h Wed Feb 16 20:49:02 2005
3	@@ -29,7 +29,7 @@
4	#define Bool Boolean
5	#endif
6
7	-#define DEFAULT_KOLE_OPTION_FILE "/usr/lib/im/locale/ko_KR/kole.conf"
8	+#define DEFAULT_KOLE_OPTION_FILE (IMDIR "/locale/ko_KR/kole.conf")
9	/* NAME of Options */
10	#define STR_OPTION_CHARSET "charset"
11	#define STR_OPTION_DELETION "delete by jaso"




--- leif/sun_le_korea/leif/qjbj_punct.c	Sat Mar 27 10:46:45 2004
+++ leif/sun_le_korea/leif/qjbj_punct.c	Wed Feb 16 20:47:08 2005
@@ -350,7 +350,7 @@
 
 	lang_name = (char *)get_langname_from_langid(lang_id);
 	logf("lang_name:%s\n", lang_name);
-	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
 	logf("file_name:%s\n", file_name);
 
 	fd = fopen(file_name, "r");
@@ -407,7 +407,7 @@
 	PunctCharListByLang[lang_id].bInit = 1;
 
 	lang_name = (char *)get_langname_from_langid(lang_id);
-	sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
+	sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
 	logf("file_name:%s\n", file_name);
 
 	fd = fopen(file_name, "r");

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c (-11 lines)
1	--- leif/sun_le_korea/korean/lookupbuf.c Sat Mar 27 10:46:45 2004
2	+++ leif/sun_le_korea/korean/lookupbuf.c Wed Feb 16 20:46:54 2005
3	@@ -547,7 +547,7 @@
4	}
5	fp = fopen (argv[1], "w");
6
7	- construct_binary_tree_from_file ("/usr/lib/im/locale/ko_KR/common/data/hhdict",
8	+ construct_binary_tree_from_file (IMDIR "/locale/ko_KR/common/data/hhdict",
9	&trees, &n_trees);
10	mthd_return = dictionary_search_hanja_candidates_in_utf16
11	(ga, &n_candidates, &cand );

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c (-11 lines)
1	--- leif/sun_le_asia/th_TH/auxobj/xaux_so.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/th_TH/auxobj/xaux_so.c Wed Feb 16 20:45:01 2005
3	@@ -62,7 +62,7 @@
4
5	#define XAUX_CLASS_MAX 4
6
7	-#define XAUX_EXT_DIR "/usr/lib/im/locale/th_TH/"
8	+#define XAUX_EXT_DIR (IMDIR "/locale/th_TH/")
9
10	CARD16 aux_utfname_palette[] = {
11	'c','o','m','.','s','u','n','.',

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c (-11 lines)
1	--- leif/sun_le_asia/th_TH/auxwin/OptionMessage.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/th_TH/auxwin/OptionMessage.c Wed Feb 16 20:45:06 2005
3	@@ -123,7 +123,7 @@
4
5	nLocaleID = get_encodeid_from_locale(locale_name);
6	lang_name = get_langname_from_locale(locale_name);
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME);
9	gCatd = catopen(file_name, 0);
10	if (gCatd == (nl_catd)-1)
11	printf("WARNING: Could not open message catalog: %s\n", name);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c (-11 lines)
1	--- leif/sun_le_asia/th_TH/auxwin/UtilityConfig.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/th_TH/auxwin/UtilityConfig.c Wed Feb 16 20:45:11 2005
3	@@ -118,7 +118,7 @@
4	lang_name = (char *)get_langname_from_locale(locale_name);
5	DEBUG_printf("lang_name:%s\n", lang_name);
6
7	- sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
9	DEBUG_printf("file_name:%s\n", file_name);
10
11	read_utility_config_file(file_name);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c (-11 lines)
1	--- leif/sun_le_asia/th_TH/leif/thai_le.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/th_TH/leif/thai_le.c Wed Feb 16 20:45:29 2005
3	@@ -173,7 +173,7 @@
4	/* Open the IF interface */
5	Bool if_le_OpenIF(iml_if_t * If)
6	{
7	- char *keymap_config_file = "/usr/lib/im/locale/th_TH/thai_keymap.cfg";
8	+ char *keymap_config_file = IMDIR "/locale/th_TH/thai_keymap.cfg";
9	TThaiKeymapList *pThaiKeymapList = &gThaiKeymapList;
10
11	DEBUG_printf("if_le_OpenIF ====\n");

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c (-11 lines)
1	--- leif/sun_le_asia/zh_CN/auxobj/xaux_so.c Mon May 17 21:10:12 2004
2	+++ leif/sun_le_asia/zh_CN/auxobj/xaux_so.c Wed Feb 16 20:45:35 2005
3	@@ -65,7 +65,7 @@
4	#define XAUX_CLASS_MAX 3
5	#endif
6
7	-#define XAUX_EXT_DIR "/usr/lib/im/locale/zh_CN/"
8	+#define XAUX_EXT_DIR (IMDIR "/locale/zh_CN/")
9
10	CARD16 aux_utfname_palette[] = {
11	'c','o','m','.','s','u','n','.',

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c (-11 lines)
1	--- leif/sun_le_asia/zh_CN/auxwin_gtk/UtilityConfig.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/zh_CN/auxwin_gtk/UtilityConfig.c Wed Feb 16 20:45:41 2005
3	@@ -124,7 +124,7 @@
4	lang_name = (char *)get_langname_from_locale(locale_name);
5	DEBUG_printf("lang_name:%s\n", lang_name);
6
7	- sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME);
9	DEBUG_printf("file_name:%s\n", file_name);
10
11	read_utility_config_file(file_name);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c (-11 lines)
1	--- leif/sun_le_asia/zh_CN/newpy/NewPY.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/zh_CN/newpy/NewPY.c Wed Feb 16 20:45:45 2005
3	@@ -126,7 +126,7 @@
4	#define PUNCT_CHINESE 0
5	#define PUNCT_ENGLISH 1
6
7	-#define CIKU_DATA_PATH "/usr/lib/im/locale/zh_CN/common/data"
8	+#define CIKU_DATA_PATH (IMDIR "/locale/zh_CN/common/data")
9
10	JINT nGlobalSpMode; /* ZRM, CStar, ABC */
11

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c (-11 lines)
1	--- leif/sun_le_asia/zh_HK/auxobj/xaux_so.c Mon May 17 21:13:43 2004
2	+++ leif/sun_le_asia/zh_HK/auxobj/xaux_so.c Wed Feb 16 20:45:51 2005
3	@@ -65,7 +65,7 @@
4	#define XAUX_CLASS_MAX 3
5	#endif
6
7	-#define XAUX_EXT_DIR "/usr/lib/im/locale/zh_HK/"
8	+#define XAUX_EXT_DIR (IMDIR "/locale/zh_HK/")
9
10	CARD16 aux_utfname_palette[] = {
11	'c','o','m','.','s','u','n','.',

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h (-11 lines)
1	--- leif/sun_le_asia/zh_HK/input_methods/newzy/CikuOper.h Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/zh_HK/input_methods/newzy/CikuOper.h Wed Feb 16 20:48:43 2005
3	@@ -64,7 +64,7 @@
4	#define SINGLEHZ_DSP_SIMP 1
5	#define SINGLEHZ_DSP_FULL 2
6
7	-#define CIKU_DATA_PATH "/usr/lib/im/locale/zh_HK/common/data"
8	+#define CIKU_DATA_PATH (IMDIR "/locale/zh_HK/common/data")
9
10	typedef struct _CizuItem {
11	UCHAR szLine[CIZU_ITEM_LEN]; /* Org Line read from file */

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c (-11 lines)
1	--- leif/sun_le_asia/zh_TW/auxobj/xaux_so.c Mon May 17 21:13:43 2004
2	+++ leif/sun_le_asia/zh_TW/auxobj/xaux_so.c Wed Feb 16 20:45:59 2005
3	@@ -65,7 +65,7 @@
4	#define XAUX_CLASS_MAX 3
5	#endif
6
7	-#define XAUX_EXT_DIR "/usr/lib/im/locale/zh_TW/"
8	+#define XAUX_EXT_DIR (IMDIR "/locale/zh_TW/")
9
10	CARD16 aux_utfname_palette[] = {
11	'c','o','m','.','s','u','n','.',

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c (-11 lines)
1	--- leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_im.c Thu May 13 19:23:13 2004
2	+++ leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_im.c Wed Feb 16 20:46:21 2005
3	@@ -154,7 +154,7 @@
4	if (pDayiData == NULL)
5	return(-1);
6
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/dayi.cfg", core->envinfo.lang_name);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/dayi.cfg", core->envinfo.lang_name);
9	ret = DayiData_Init(file_name, pDayiData);
10	if (ret == DAYI_ERROR) {
11	DayiData_Free(pDayiData);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h (-11 lines)
1	--- leif/sun_le_asia/zh_TW/input_methods/newzy/CikuOper.h Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/zh_TW/input_methods/newzy/CikuOper.h Wed Feb 16 20:48:48 2005
3	@@ -64,7 +64,7 @@
4	#define SINGLEHZ_DSP_SIMP 1
5	#define SINGLEHZ_DSP_FULL 2
6
7	-#define CIKU_DATA_PATH "/usr/lib/im/locale/zh_TW/common/data"
8	+#define CIKU_DATA_PATH (IMDIR "/locale/zh_TW/common/data")
9
10	typedef struct _CizuItem {
11	UCHAR szLine[CIZU_ITEM_LEN]; /* Org Line read from file */

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c (-11 lines)
1	--- leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_im.c Thu May 13 19:23:13 2004
2	+++ leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_im.c Wed Feb 16 20:46:35 2005
3	@@ -155,7 +155,7 @@
4	if (pZhuyinData == NULL)
5	return(-1);
6
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name);
9	ret = ZhuyinData_Init(file_name, pZhuyinData);
10	if (ret == ZHUYIN_ERROR) {
11	ZhuyinData_Free(pZhuyinData);

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h (-11 lines)
1	--- leif/unit/include/unit_input.h Tue Oct 12 17:24:13 2004
2	+++ leif/unit/include/unit_input.h Wed Feb 16 20:49:15 2005
3	@@ -109,7 +109,7 @@
4	#define ENGINE_NOT_INITIATED 2
5	#define ENGINE_INITIATED 3
6
7	-#define DEFAULT_ENGINE_PATH "/usr/lib/im/locale"
8	+#define DEFAULT_ENGINE_PATH (IMDIR "/locale")
9	#define DEFAULT_DICT_PATH "data"
10	#define COMMON_ENGINE_PATH "common"
11	#define GENERIC_IM_TABLE_NAME "GENERIC_IM_TABLE"




--- leif/unit/phonetic_im/mapfile/Makefile.am.orig	Sat Apr  3 11:50:21 2004
+++ leif/unit/phonetic_im/mapfile/Makefile.am	Wed Mar  2 20:35:05 2005
@@ -1,5 +1,6 @@
 SUBDIRS = mapfile2c
 LEX = /usr/bin/lex
+SED = /usr/bin/sed
 
 MAPFILES = bengali.mapfile gurmukhi.mapfile hindi.mapfile kannada.mapfile malayalam.mapfile tamil.mapfile telugu.mapfile gujarati.mapfile
 
@@ -12,7 +13,7 @@
 .l.c:
 	$(LEX) $(LFLAGS) $*.l
 	mv lex.yy.c $*.tc
-	sed  \
+	$(SED)  \
 	-e "/^# line/d" \
 	-e "s/parse_small_token/parse_$*/g" \
 	-e "s/^void yyunput/static void yyunput/g" \
@@ -57,10 +58,11 @@
 	-e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
 	-e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
 	-e "/^#line/d" \
-	-e "/^static char \*global_ptr\;/i\
-#define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
-#define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
-#define input() (\*global_ptr++)" $*.tc > $*.c
+	-e "/^static char \*global_ptr\;/{" \
+	    -e "p" -e "s/.*/#define YY_NO_INPUT/" \
+	    -e "p" -e "s/.*/#define YY_NO_UNPUT/" \
+	    -e "p" -e "s/.*/#define input\(\) \(*global_ptr++\)/" \
+	-e "}" $*.tc > $*.c
 	rm -f  $*.tc
 
 noinst_LTLIBRARIES = libphonetic_temp.la

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-lib_EIMIL_EIMILJournal.c (-10 lines)
1	--- lib/EIMIL/EIMILJournal.c Mon Aug 2 23:39:10 2004
2	+++ lib/EIMIL/EIMILJournal.c Thu Feb 17 01:55:38 2005
3	@@ -61,7 +61,6 @@
4	pjh = NULL;
5	pj = ped->pjst;
6	for (i = 0; i < EIMIL_JOURNAL_MAX_SLOT_SIZE; i++) {
7	- fprintf(stderr, "hoge\n");
8	if (!pj) break;
9	if (pj->pv) EIMIL_RMREF(*pj->pv);
10	if ((pj->next - pj) < 0) pjh = pj->next;

Line 0 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-lib_EIMIL_Makefile.am (+9 lines)
	1	--- lib/EIMIL/Makefile.am.orig Fri May 13 18:03:49 2005
	2	+++ lib/EIMIL/Makefile.am Fri May 13 18:04:12 2005
	3	@@ -1,5 +1,5 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	-ACLOCAL_AMFLAGS = -I ../../acfiles
	6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
	7	SUBDIRS = . test
	8	#libdir = /usr/local/lib
	9	#libEIMIL_la_LDFLAGS = -module -version-info $(LIBEIMIL_MAJOR_VERSION):$(LIBEIMIL_MINOR_VERSION) \




lib/iiim/le/default/default.so
lib/iiim/le/unitle/common/ctim.so.0
lib/iiim/le/unitle/common/ctim.so
lib/iiim/le/unitle/common/ctim.la
lib/iiim/le/unitle/common/ctim.a
lib/iiim/le/unitle/common/txt2bin
lib/iiim/le/unitle/common/bin2txt
lib/iiim/le/unitle/common/search
lib/iiim/le/unitle/common/xctim.so.0
lib/iiim/le/unitle/common/xctim.so
lib/iiim/le/unitle/common/xctim.la
lib/iiim/le/unitle/common/xctim.a
lib/iiim/le/unitle/common/x_txt2bin
lib/iiim/le/unitle/common/codepoint_im.so.0
lib/iiim/le/unitle/common/codepoint_im.so
lib/iiim/le/unitle/common/codepoint_im.la
lib/iiim/le/unitle/common/codepoint_im.a
lib/iiim/le/unitle/HINDI/phonetic.cfg
lib/iiim/le/unitle/HINDI/data/inscript.data
lib/iiim/le/unitle/HINDI/data/trans.data
lib/iiim/le/unitle/HINDI/data/phonetic.data
lib/iiim/le/unitle/TAMIL/phonetic.cfg
lib/iiim/le/unitle/TAMIL/data/inscript.data
lib/iiim/le/unitle/TAMIL/data/trans.data
lib/iiim/le/unitle/TAMIL/data/phonetic.data
lib/iiim/le/unitle/KANNADA/phonetic.cfg
lib/iiim/le/unitle/KANNADA/data/inscript.data
lib/iiim/le/unitle/KANNADA/data/kgp.data
lib/iiim/le/unitle/MALAYALAM/phonetic.cfg
lib/iiim/le/unitle/MALAYALAM/data/inscript.data
lib/iiim/le/unitle/TELUGU/phonetic.cfg
lib/iiim/le/unitle/TELUGU/data/inscript.data
lib/iiim/le/unitle/GUJARATI/phonetic.cfg
lib/iiim/le/unitle/GUJARATI/data/inscript.data
lib/iiim/le/unitle/GUJARATI/data/phonetic.data
lib/iiim/le/unitle/BENGALI/phonetic.cfg
lib/iiim/le/unitle/BENGALI/data/inscript.data
lib/iiim/le/unitle/BENGALI/data/probhat.data
lib/iiim/le/unitle/GURMUKHI/phonetic.cfg
lib/iiim/le/unitle/GURMUKHI/data/inscript.data
lib/iiim/le/unitle/GURMUKHI/data/phonetic.data
lib/iiim/le/unitle/UNICODE-HEX/codepoint.cfg
lib/iiim/le/unitle/UNICODE-OCTAL/codepoint.cfg
lib/iiim/le/unitle/sysime.cfg
lib/iiim/le/unitle/unitle.so
lib/iiim/le/unitle/hotkey_config.xml
lib/iiim/le/unitle/EUROPEAN/data/euro.data
lib/iiim/le/unitle/CYRILLIC/data/cyrillic.data
lib/iiim/le/unitle/GREEK/data/greek.data
lib/iiim/le/unitle/ARABIC/data/arabic.data
lib/iiim/le/unitle/HEBREW/data/hebrew.data
lib/iiim/le/unitle/VIETNAMESE/data/vietnamese.data
lib/iiim/le/unitle/TI_ER/data/eritrean.data
lib/iiim/le/unitle/AM_ET/data/amharic.data
@dirrm lib/iiim/le/default
@dirrm lib/iiim/le/unitle/common
@dirrm lib/iiim/le/unitle/HINDI/data
@dirrm lib/iiim/le/unitle/HINDI
@dirrm lib/iiim/le/unitle/TAMIL/data
@dirrm lib/iiim/le/unitle/TAMIL
@dirrm lib/iiim/le/unitle/KANNADA/data
@dirrm lib/iiim/le/unitle/KANNADA
@dirrm lib/iiim/le/unitle/MALAYALAM/data
@dirrm lib/iiim/le/unitle/MALAYALAM
@dirrm lib/iiim/le/unitle/TELUGU/data
@dirrm lib/iiim/le/unitle/TELUGU
@dirrm lib/iiim/le/unitle/GUJARATI/data
@dirrm lib/iiim/le/unitle/GUJARATI
@dirrm lib/iiim/le/unitle/BENGALI/data
@dirrm lib/iiim/le/unitle/BENGALI
@dirrm lib/iiim/le/unitle/GURMUKHI/data
@dirrm lib/iiim/le/unitle/GURMUKHI
@dirrm lib/iiim/le/unitle/UNICODE-HEX
@dirrm lib/iiim/le/unitle/UNICODE-OCTAL
@dirrm lib/iiim/le/unitle/EUROPEAN/data
@dirrm lib/iiim/le/unitle/EUROPEAN
@dirrm lib/iiim/le/unitle/CYRILLIC/data
@dirrm lib/iiim/le/unitle/CYRILLIC
@dirrm lib/iiim/le/unitle/GREEK/data
@dirrm lib/iiim/le/unitle/GREEK
@dirrm lib/iiim/le/unitle/ARABIC/data
@dirrm lib/iiim/le/unitle/ARABIC
@dirrm lib/iiim/le/unitle/HEBREW/data
@dirrm lib/iiim/le/unitle/HEBREW
@dirrm lib/iiim/le/unitle/VIETNAMESE/data
@dirrm lib/iiim/le/unitle/VIETNAMESE
@dirrm lib/iiim/le/unitle/TI_ER/data
@dirrm lib/iiim/le/unitle/TI_ER
@dirrm lib/iiim/le/unitle/AM_ET/data
@dirrm lib/iiim/le/unitle/AM_ET
@dirrm lib/iiim/le/unitle
@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true




#

PORTNAME=	protocol-lib
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method Framework protocol library

ONLY_FOR_ARCHS=	i386

INSTALLS_SHLIB=	yes
USE_BZIP2=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/lib/iiimp
WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp
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

CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
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}"

post-patch:
	${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
	 ${LIBTOOLFILES}
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-protocol-lib/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-protocol-lib/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_Makefile.am (+9 lines)
	1	--- lib/iiimp/Makefile.am.orig Fri May 13 15:37:41 2005
	2	+++ lib/iiimp/Makefile.am Fri May 13 15:38:13 2005
	3	@@ -1,5 +1,5 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	-ACLOCAL_AMFLAGS = -I ../../acfiles
	6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
	7	#libdir = /usr/local/lib
	8	libiiimp_la_LDFLAGS = -version-info $(LIBIIIMP_MAJOR_VERSION):$(LIBIIIMP_MINOR_VERSION) \
	9	-export-dynamic -g @TLS_LIBS@




--- 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




--- 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;




--- 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;
 }
 

Lines 1-8 Link Here

(-)ports/textproc/iiimf-protocol-lib/pkg-plist (-7 / +10 lines)
1	lib/libiiimp.a	1	include/iiim/iiimp.h
		2	include/iiim/iiimp-opcode.h
		3	include/iiim/iiimp-keycode.h
		4	include/iiim/iiimp-data.h
		5	include/iiim/iiimp-character-subsets.h
		6	lib/libiiimp.so.1
2	lib/libiiimp.so	7	lib/libiiimp.so
3	lib/libiiimp.so.0	8	lib/libiiimp.la
4	include/iiimp-character-subsets.h	9	lib/libiiimp.a
5	include/iiimp-data.h	10	libdata/pkgconfig/iiimf-lib-protocol.pc
6	include/iiimp-keycode.h	11	@unexec rmdir %D/include/iiim > /dev/null 2>&1 \|\| true
7	include/iiimp-opcode.h
8	include/iiimp.h




#

PORTNAME=	server
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method Server Framework

LIB_DEPENDS=    iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib

ONLY_FOR_ARCHS=	i386

INSTALLS_SHLIB=	yes
USE_RC_SUBR=	iiimd.sh
USE_BZIP2=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	pkgconfig libxml2
USE_OPENSSL=    yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/iiimsf
WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf
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

.if defined(WITH_DEBUG)

.endif

CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
CXXFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
		${BUILDDIR}/src/le.xml.conf
	${MV} ${BUILDDIR}/iiimd.xml.conf ${BUILDDIR}/iiimd.xml.conf.sample
	${MV} ${BUILDDIR}/src/le.xml.conf ${BUILDDIR}/src/le.xml.conf.sample

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config

post-install:
	${INSTALL_DATA} ${BUILDDIR}/src/le.xml.conf.sample ${PREFIX}/etc/iiim/
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}

post-configure:
	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
		${WRKSRC}/src/Makefile

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-server/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




#!/bin/sh

# $FreeBSD: ports/textproc/iiimf-server/files/htt.sh.in,v 1.1 2005/02/28 04:17:01 daichi Exp $

# PROVIDE: htt
# REQUIRE: DAEMON
# KEYWORD: FreeBSD shutdown

prefix=%%PREFIX%%

htt_enable=${htt_enable:-"NO"}

. %%RC_SUBR%%

name="htt"
rcvar=`set_rcvar`
command="${prefix}/lib/im/htt"

load_rc_config $name
command_args="> /dev/null 2>&1 &"
run_rc_command "$1"




load_rc_config $name
command_args="> /dev/null 2>&1 &"
run_rc_command "$1"
#!/bin/sh

# $FreeBSD: ports/textproc/iiimf-server/files/htt.sh.in,v 1.1 2005/02/28 04:17:01 daichi Exp $

# PROVIDE: htt
# REQUIRE: DAEMON
# KEYWORD: FreeBSD shutdown

prefix=%%PREFIX%%

htt_enable=${htt_enable:-"NO"}

. %%RC_SUBR%%

name="htt"
rcvar=`set_rcvar`
command="${prefix}/bin/iiimd"

load_rc_config $name
command_args="> /dev/null 2>&1 &"
run_rc_command "$1"




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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 = iiimsf
+#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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Lines 1-8 Link Here

(-)ports/textproc/iiimf-server/files/patch-iiimsf_Makefile.am (-5 / +8 lines)
1	--- iiimsf/Makefile.am.orig Sat Feb 19 03:33:28 2005	1	--- iiimsf/Makefile.am.orig Fri Mar 18 04:26:28 2005
2	+++ iiimsf/Makefile.am Sat Feb 19 03:33:48 2005	2	+++ iiimsf/Makefile.am Mon May 9 19:00:14 2005
3	@@ -2,4 +2,4 @@	3	@@ -1,6 +1,6 @@
		4	AUTOMAKE_OPTIONS = foreign
		5	-ACLOCAL_AMFLAGS = -I ../acfiles
		6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
4	SUBDIRS = lib src	7	SUBDIRS = lib src
5		8
6	confdir = $(XMLCONFDIR)	9	confdir = $(XMLCONFDIR)
7	-conf_DATA = htt.xml.conf	10	-conf_DATA = iiimd.xml.conf
8	+conf_DATA = htt.xml.conf.sample src/le.xml.conf.sample	11	+conf_DATA = iiimd.xml.conf.sample




--- iiimsf/configure.ac.orig	Wed Mar  2 21:00:09 2005
+++ iiimsf/configure.ac	Wed Mar  2 21:00:37 2005
@@ -236,13 +236,13 @@
 
 CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
-        ${THREAD_CXX_CFLAGS}"
+        ${THREAD_CXX_CFLAGS} ${CFLAGS}"
 
 CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_CXX_CFLAGS}"
+          ${THREAD_CXX_CFLAGS} ${CXXFLAGS}"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 
 if test $HAVE_LIBCRYPT = "yes"; then
     LIBCRYPT_FLAGS="-lcrypt"

Lines 1-5 Link Here

(-)ports/textproc/iiimf-server/files/patch-iiimsf_src_IMAuth.cpp (-3 / +3 lines)
1	--- iiimsf/src/IMAuth.cpp Sun Jun 20 06:46:28 2004	1	--- iiimsf/src/IMAuth.cpp.orig Mon May 9 18:08:19 2005
2	+++ iiimsf/src/IMAuth.cpp Wed Feb 16 16:21:47 2005	2	+++ iiimsf/src/IMAuth.cpp Mon May 9 18:08:53 2005
3	@@ -47,7 +47,9 @@	3	@@ -47,7 +47,9 @@
4	#include <stdlib.h>	4	#include <stdlib.h>
5	#include <string.h>	5	#include <string.h>
Lines 7-12 Link Here
7	+#ifdef HAVE_ALLOCA_H	7	+#ifdef HAVE_ALLOCA_H
8	#include <alloca.h>	8	#include <alloca.h>
9	+#endif	9	+#endif
		10	#include <sys/types.h>
10	#include <sys/socket.h>	11	#include <sys/socket.h>
11	#include <netinet/in.h>	12	#include <netinet/in.h>
12	#include <arpa/inet.h>




--- iiimsf/src/IMSignal.cpp.orig	Mon May  9 18:00:02 2005
+++ iiimsf/src/IMSignal.cpp	Mon May  9 18:00:45 2005
@@ -66,11 +66,8 @@
 #include <config.h>
 #include <sstream>
 #include <sys/types.h>
+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#else
 #include <wait.h>
+#endif
 #include <unistd.h>
 #ifdef HAVE_SIGNAL
 #include <signal.h>
@@ -67,10 +71,8 @@
     stringstream s;
     string spid, signum;
 
-    s << getpid();
-    spid = s.str();
-    s.str("");
-    s << num;
-    signum = s.str();
+    s << getpid() << " " << num;




--- iiimsf/src/IMSvrCfg.cpp	Mon Oct  4 18:07:05 2004
+++ iiimsf/src/IMSvrCfg.cpp	Wed Feb 16 20:38:05 2005
@@ -90,14 +90,14 @@
 void
 IMSvrCfg::initialize()
 {
-    initstr(IMDIR, "IM main directory.", "/usr/lib/im");
+    initstr(IMDIR, "IM main directory.", IM_DIRECTORY);
     initstr(BASICLOCALE, "Locale used by default", "C");
 #ifdef WIN32
     initstr(IFPATHNAME, "Language Engine module directory",
 	   "D:\\WINNT\\System32\\iiimf");
 #else
     initstr(IFPATHNAME, "Language Engine module directory",
-	   "/usr/lib/im/leif");
+	   (IM_DIRECTORY "/leif"));
 #endif
     initstr(IFNAME, "Language Engine name", "");
     initstr(PORT, "Port or service name", "9010");




--- iiimsf/src/IMXMLUtil.cpp	Mon Oct  4 18:07:05 2004
+++ iiimsf/src/IMXMLUtil.cpp	Wed Feb 16 20:38:34 2005
@@ -78,7 +78,7 @@
 {
     IMXMLModifier xml((const char *)argv[1]);
     IMModuleInfoVec *lev;
-    string mod("/usr/lib/im/leif/freewnnle.so");
+    string mod(IM_DIRECTORY "/leif/freewnnle.so");
     string lang("ja");
     string out("foo.conf");
 
@@ -101,7 +101,7 @@
       }
     */
     printf("\n\n*** remove\n");
-    mod = "/usr/lib/im/leif/CannaLE.so";
+    mod = IM_DIRECTORY "/leif/CannaLE.so";
     xml.removemodule(mod, lang);
     /*
       for (IMModuleInfoVec::iterator i = lev->begin (); i != lev->end (); i++) {




--- iiimsf/src/Makefile.am.orig	Thu Apr 21 16:04:56 2005
+++ iiimsf/src/Makefile.am	Mon May  9 18:33:14 2005
@@ -97,7 +97,7 @@
 	-DXMLCONFDIR="\"$(XMLCONFDIR)\""			\
 	-DSOCKETDIR="\"$(SOCKETDIR)\""				\
 	-DSEGVLOGGER="\"$(libexecdir)/iiimf-segv-logger\""	\
-	-g							\
+	-DIM_DIRECTORY="\"${IMDIR}\"" \
 	$(NULL)
 
 libiiimsf_la_SOURCES =		\
@@ -22,6 +21,7 @@
 libiiimsf_la_LIBADD =		\
 	$(TLS_LIBS)		\
 	$(XML_LIBS)		\
+	-liiimp			\
 	$(NULL)
 
 iiimd_LDADD =			\
@@ -56,7 +56,6 @@
 
 htt_server_LDADD =			\
 	$(LIB_DIR)/iml/libiml.la	\
-	$(IM_LIBDIR)/iiimp/libiiimp.la	\
+	-liiimp	\
 	$(SOCKET_LIBS)			\
 	$(LIBCRYPT_FLAGS)		\
 	$(LIBPAM_FLAGS)			\
@@ -112,7 +112,6 @@
 	$(NULL)
 iiimf_le_tools_LDADD =		\
 	$(XML_LIBS)		\
-	-ldl			\
 	libiiimutils.la		\
 	$(NULL)
 
@@ -122,6 +121,7 @@
 iiimf_segv_logger_CFLAGS =				\
 	-DLOGDIR="\"$(localstatedir)/log/iiim\""	\
 	-DDATADIR="\"$(gdbcmddir)\""			\
+	-DPREFIX="\"$(prefix)\""			\
 	-g						\
 	$(NULL)
 gdbcmddir = $(datadir)/iiim
@@ -129,9 +129,9 @@
 	gdbcmd		\
 	$(NULL)
 
-logdir = $(localstatedir)/log/iiim
+logdir = /var/log/iiim
 log_DATA = $(NULL)
-socketdir = $(localstatedir)/run/iiim
+socketdir = /var/run/iiim
 socket_DATA = $(NULL)
 
 iiimlibdir = $(libdir)/iiim




--- iiimsf/src/iwrap.c.orig	Wed Apr 13 01:51:55 2005
+++ iiimsf/src/iwrap.c	Mon May  9 18:02:18 2005
@@ -72,6 +72,15 @@
+++ iiimsf/src/iwrap.c	Tue Feb 22 15:22:41 2005
@@ -72,6 +72,15 @@ int permit_access(
 {
 #ifdef HAVE_LIBWRAP
     struct request_info req;

+
+    size = sizeof(ss);
+    if (getpeername(h, pname, &size) < 0)
+       return 0;
+    if (pname->sa_family == AF_UNIX)
+       return 1;
 
     request_init(&req, RQ_DAEMON, cmdname, RQ_FILE, h, 0);
     fromhost(&req);
@@ -177,6 +186,14 @@
 #ifdef HAVE_GETPEEREID
     /* OpenBSD */
     git_t gid;




--- iiimsf/src/lexmlconf.cpp.orig	Fri Apr 22 16:53:03 2005
+++ iiimsf/src/lexmlconf.cpp	Mon May 16 19:00:55 2005
@@ -114,6 +114,7 @@
 	list = (IIIMLEInfoList *)malloc(sizeof (IIIMLEInfoList) * 1);
 	list->data = leinfo;
 	list->next = NULL;
+	list->prev = NULL;
 
 	return list;
 }
@@ -128,6 +129,7 @@
 	if (list != NULL) {
 		for (ll = list; ll->next != NULL; ll = ll->next);
 		ll->next = l;
+		l->prev = ll;
 		ll = list;
 	} else {
 		ll = l;
@@ -144,7 +146,12 @@
 
 	l = iiim_le_info_list_new(leinfo);
 	if (list != NULL) {
+                if (list->prev != NULL) {
+                        list->prev->next = l;
+                }
 		l->next = list;
+		l->prev = list->prev;
+		list->prev = l;
 	}
 
 	return l;
@@ -154,22 +161,19 @@
 iiim_le_info_list_remove(IIIMLEInfoList *list,
 			 IIIMLEInfo     *leinfo)
 {
-	IIIMLEInfoList *tmp, *prev = NULL;
+	IIIMLEInfoList *prev, *next;
 
-	tmp = list;
-	while (tmp) {
-		if (tmp->data == leinfo) {
-			if (prev)
-				prev->next = tmp->next;
-			else
-				list = tmp->next;
-			iiim_le_info_free(tmp->data);
-			free(tmp);
-
-			break;
-		}
-		prev = tmp;
-		tmp = prev->next;
+	for (; list && list->data != leinfo; list = list->next);
+
+	if (NULL != list) {
+	  prev = list->prev;
+	  next = list->next;
+
+	  if (NULL != prev) prev->next = next;
+	  if (NULL != next) next->prev = prev;
+
+	  if (list->data) iiim_le_info_free(list->data);
+	  free(list);
 	}
 
 	return list;

Line 0 Link Here

(-)ports/textproc/iiimf-server/files/patch-iiimsf_src_lexmlconf.h (+10 lines)
	1	--- iiimsf/src/lexmlconf.h.orig Fri Apr 22 16:53:03 2005
	2	+++ iiimsf/src/lexmlconf.h Mon May 16 19:00:59 2005
	3	@@ -63,6 +63,7 @@
	4	struct _IIIMLEInfoList {
	5	IIIMLEInfo *data;
	6	IIIMLEInfoList *next;
	7	+ IIIMLEInfoList *prev;
	8	};
	9	struct _IIIMLEInfo {
	10	char *language;




--- iiimsf/src/segvlogger.c.orig	Mon May  9 17:50:07 2005
+++ iiimsf/src/segvlogger.c	Mon May  9 17:52:09 2005
@@ -63,8 +63,13 @@
 	}
 #include <dirent.h>
 
+#ifdef __FreeBSD__
+#include <sys/syslimits.h>
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -43,8 +47,8 @@
 	exit(1);
     }
+#ifndef __FreeBSD__
     snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
 	     DATADIR, ppid);
+#else
+    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/bin/iiimd %d",
+	     DATADIR, PREFIX, ppid);
+#endif
 
     if ((fpr = popen(buffer, "r")) != NULL) {
 	char logfile[PATH_MAX];




--- iiimsf/src/watchdog.c	Thu Oct 14 23:07:37 2004
+++ iiimsf/src/watchdog.c	Wed Feb 16 19:03:59 2005
@@ -220,7 +220,7 @@
     int		argc;
     char	**argv;
 {
-    const char *httpath="/usr/lib/im/htt_server" ; /* SUNWiiimf Only */
+    const char *httpath=IM_DIRECTORY "/htt_server" ; /* SUNWiiimf Only */
     pid_t pgrp;
     void (*disp)(int);
     char **new_argv, **pp;
@@ -361,6 +361,8 @@
     if ((pid_t)(-1) == pgrp)
       fprintf (stderr,"cannot set session id");
 
+#elif defined(__FreeBSD__)
+    pgrp = setsid();
 #else /* !SunOS */
     pgrp = setpgrp(); 
 #endif /* !SunOS */




bin/iiimf-le-tools
bin/iiimd
etc/iiim/iiimd.xml.conf.sample
etc/iiim/le.xml.conf.sample
lib/libiiimutils.a
lib/libiiimutils.la
lib/libiiimutils.so
lib/libiiimutils.so.0
lib/iiim/iiimd-watchdog
libexec/iiimf-segv-logger
include/iiim/lexmlconf.h
share/iiim/gdbcmd
@dirrm etc/iiim
@dirrm share/iiim
@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
@exec mkdir -p /var/log/iiim
@unexec rm -f /var/log/iiim/*.log
@unexec rmdir /var/log/iiim > /dev/null 2>&1 || true




#

PORTNAME=	x
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method X Client Framework

LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
RUN_DEPENDS=	${LOCALBASE}/lib/iiim/xiiimp.so:${PORTSDIR}/textproc/iiimf-x-lib

ONLY_FOR_ARCHS=	i386

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_XLIB=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/iiimxcf/htt_xbe
WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/htt_xbe
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

CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
CXXFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		${BUILDDIR}/src/watchdog.c

do-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	 -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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-x/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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 = iiimxcf/htt_xbe
+#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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-x/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_Makefile.am (+7 lines)
	1	--- iiimxcf/htt_xbe/Makefile.am.orig Fri May 13 15:44:05 2005
	2	+++ iiimxcf/htt_xbe/Makefile.am Fri May 13 15:44:22 2005
	3	@@ -1,3 +1,3 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	-ACLOCAL_AMFLAGS = -I ../../acfiles
	6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
	7	SUBDIRS = lib src




--- iiimxcf/htt_xbe/configure.ac	Wed Mar 24 04:54:26 2004
+++ iiimxcf/htt_xbe/configure.ac	Wed Feb 16 19:38:26 2005
@@ -140,15 +140,15 @@
 COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} ${DLOPEN_CXX_CFLAGS} -DSUPPORT_R6IM"
 LIBS="${LIBS} ${DLOPEN_LIBS}"
 
 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} ${CFLAGS}"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 
 dnl --------------------------------------------------------------------------------
 dnl                       Section 6: compilation test




--- iiimxcf/htt_xbe/lib/IMdkit/Makefile.in.orig	Wed May  7 12:25:24 2003
+++ iiimxcf/htt_xbe/lib/IMdkit/Makefile.in	Thu Mar  3 16:25:30 2005
@@ -57,6 +57,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
+IMDIR = @IMDIR@
 IM_TOPDIR = @IM_TOPDIR@
 IM_INCLUDEDIR = @IM_INCLUDEDIR@
 CSCONV_DIR = @CSCONV_DIR@
@@ -74,8 +75,8 @@
 LINKER = @LINKER@
 RANLIB = @RANLIB@
 
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
+CFLAGS = -DIMDIR="\"${IMDIR}\"" @CFLAGS@
+CXXFLAGS = -DIMDIR="\"${IMDIR}\"" @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 

Lines 1-11 Link Here

(-)ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp (-11 lines)
1	--- iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp Wed Mar 24 04:54:26 2004
2	+++ iiimxcf/htt_xbe/lib/IMdkit/common/XIMPublic.cpp Wed Feb 16 21:31:00 2005
3	@@ -68,7 +68,7 @@
4	#ifdef sun
5	#define XIIIMP_PATH "/usr/openwin/lib/locale/common/xiiimp.so.2"
6	#else /* Linux */
7	-#define XIIIMP_PATH "/usr/lib/im/xiiimp.so.2"
8	+#define XIIIMP_PATH (IMDIR "/xiiimp.so.2")
9	#endif /* Linux */
10
11	#include <stdio.h>




--- iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nX.c	Fri Nov  1 09:15:38 2002
+++ iiimxcf/htt_xbe/lib/IMdkit/r6im/i18nX.c	Wed Feb 16 19:33:10 2005
@@ -389,8 +389,8 @@
     extern void _Xi18nMessageHandler(XIMS, CARD16,
 				     unsigned char*, Bool*);
     Bool delete = True;
-    unsigned char *packet;
-    int connect_id;
+    unsigned char *packet = NULL;
+    int connect_id = 0;
 
     if (((XClientMessageEvent *)ev)->message_type ==
 	spec->xim_request) {

Lines 1-11 Link Here

(-)ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am (-11 lines)
1	--- iiimxcf/htt_xbe/src/Makefile.am.orig Thu Mar 3 00:29:58 2005
2	+++ iiimxcf/htt_xbe/src/Makefile.am Thu Mar 3 00:30:30 2005
3	@@ -4,7 +4,7 @@
4	htt_xbe_LDADD = -L../lib/IMdkit -lIMd_ximp -lIMd_r6im $(X_LIBS) -lXt $(THREAD_LIBS)
5	htt_xbe_SOURCES = ResourceDB.cpp main.cpp
6
7	-httx_CFLAGS = $(X_CFLAGS)
8	+httx_CFLAGS = $(X_CFLAGS) -DIMDIR="\"${IMDIR}\""
9	httx_LDADD = $(X_LIBS) -lXt
10	httx_SOURCES = watchdog.c
11

Lines 1-14 Link Here

(-)ports/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c (-8 / +18 lines)
1	--- iiimxcf/htt_xbe/src/watchdog.c Tue Jul 13 08:25:40 2004	1	--- iiimxcf/htt_xbe/src/watchdog.c.orig Thu Apr 28 15:09:27 2005
2	+++ iiimxcf/htt_xbe/src/watchdog.c Wed Feb 16 19:12:34 2005	2	+++ iiimxcf/htt_xbe/src/watchdog.c Mon May 16 23:39:28 2005
3	@@ -81,7 +81,6 @@	3	@@ -79,7 +79,7 @@
		4	#ifndef OPENWINHOME
		5	#define OPENWINHOME "/usr/openwin"
4	#endif	6	#endif
5	#define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/dt/lib/libXm.so.3"	7	-#define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/dt/lib/libXm.so.3"
		8	+#define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/X11R6/lib/libXm.so.3"
6		9
7	-#define IMDIR "/usr/lib/im"	10	#define IMDIR IIIMLIBDIR
8		11
9	static void start_htt_server(int , char argv[]);	12	@@ -811,7 +811,11 @@
10	static void start_htt_props(int , char argv[]);
11	@@ -744,7 +743,11 @@
12	perror("watchdog:fork\n");	13	perror("watchdog:fork\n");
13	exit(errno);	14	exit(errno);
14	case 0:	15	case 0:
Lines 20-22 Link Here
20	if (!my_rdb.respond_to_sm)	21	if (!my_rdb.respond_to_sm)
21	sleep(10);	22	sleep(10);
22	execv(pathname, argv);	23	execv(pathname, argv);
		24	@@ -828,7 +832,7 @@
		25	extern int errno;
		26	int pid;
		27
		28	- pathname = "/usr/bin/iiimd";
		29	+ pathname = "%%PREFIX%%" "/bin/iiimd";
		30
		31	pid = (*iiimd_pid) = fork();
		32	switch (*iiimd_pid) {

Lines 1-2 Link Here

(-)ports/textproc/iiimf-x/pkg-plist (-2 / +2 lines)
1	lib/im/httx	1	bin/iiimx
2	lib/im/htt_xbe	2	lib/iiim/iiim-xbe




#

PORTNAME=	x-lib
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	Internet/Intranet Input Method X Client Framework

LIB_DEPENDS=	iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
RUN_DEPENDS=	${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv

ONLY_FOR_ARCHS=	i386

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_REINPLACE=  yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_MOTIF=      yes
USE_OPENSSL=    yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/iiimxcf/xiiimp.so
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"
IGNORE=	"${ARCH} is not support."
.endif

CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"

post-patch:
	${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

pre-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	 -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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-x-lib/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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 = iiimxcf/xiiimp.so
+#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:

Lines 1-10 Link Here

(-)ports/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am (+7 lines)
	1	--- iiimxcf/xiiimp.so/Makefile.am.orig Fri May 13 15:42:30 2005
	2	+++ iiimxcf/xiiimp.so/Makefile.am Fri May 13 15:42:47 2005
	3	@@ -1,3 +1,3 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	-ACLOCAL_AMFLAGS = -I ../../acfiles
	6	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
	7	SUBDIRS = iiimp




--- 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} ${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} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 
 dnl --------------------------------------------------------------------------------
 dnl                       Section 6: compilation test




--- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig	Mon May  9 19:38:54 2005
+++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Mon May  9 19:40:25 2005
@@ -8,8 +8,8 @@
 moduledir = $(IMDIR)
 xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \
                    $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
-                   -I$(CSCONV_DIR)
+                   -I$(CSCONV_DIR) -DUSE_CSCONV -DIMDIR="\"${IMDIR}\""
 xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \
-                    -module -export-dynamic -no-undefined
+                    -module -export-dynamic -no-undefined \
+		    -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 \
+		   -liiimcf \
+		   -liiimp \
                    $(DLOPEN_LIBS) $(THREAD_LIBS)
 xiiimp_la_SOURCES = \
 	KeyMap.c \

Lines 1-11 Link Here

(-)ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h (-11 lines)
1	--- iiimxcf/xiiimp.so/iiimp/csconv.h Fri Mar 16 00:52:22 2001
2	+++ iiimxcf/xiiimp.so/iiimp/csconv.h Wed Feb 16 20:48:14 2005
3	@@ -64,7 +64,7 @@
4	# define CSC_BASE_DIR_SYSTEM "/etc/lib/im/csconv/"
5	#endif /* !CSC_BASE_DIR_SYSTEM */
6	#if !defined(CSC_BASE_DIR_DEFAULT)
7	-# define CSC_BASE_DIR_DEFAULT "/usr/lib/im/csconv/"
8	+# define CSC_BASE_DIR_DEFAULT (IMDIR "/csconv/")
9	#endif /* !CSC_BASE_DIR_DEFAULT */
10
11	#define CSC_IS_PATH_ABS(path) (('/' == *(path)) \|\| \




--- iiimxcf/xiiimp.so/iiimp/iiimcfFun.c.orig	Fri May 13 18:18:29 2005
+++ iiimxcf/xiiimp.so/iiimp/iiimcfFun.c	Fri May 13 18:18:47 2005
@@ -61,7 +61,9 @@
 #include <iiimcf.h>
 #include <langinfo.h>
 #include <limits.h>
+#ifndef __FreeBSD__
 #include <values.h>
+#endif
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 

Lines 1-11 Link Here

(-)ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c (-11 lines)
1	--- iiimxcf/xiiimp.so/iiimp/iiimpAux.c Sat Sep 11 01:41:45 2004
2	+++ iiimxcf/xiiimp.so/iiimp/iiimpAux.c Wed Feb 16 20:40:57 2005
3	@@ -80,7 +80,7 @@
4	#include "trace_message.h"
5
6
7	-#define AUX_BASE_DIR "/usr/lib/im/"
8	+#define AUX_BASE_DIR IMDIR
9
10	#if defined(__sparcv9)
11	#define SPARCV9_DIR "sparcv9/"

Lines 1-11 Link Here

(-)ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c (-11 lines)
1	--- iiimxcf/xiiimp.so/iiimp/iiimpConv.c Wed Apr 28 18:28:59 2004
2	+++ iiimxcf/xiiimp.so/iiimp/iiimpConv.c Wed Feb 16 20:41:07 2005
3	@@ -68,7 +68,7 @@
4	#ifdef USE_CSCONV
5	#include <dlfcn.h>
6	#include "csconv.h"
7	-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
8	+#define CSC_PATH (IMDIR "/csconv/csconv.so")
9	#define CSC_OPEN_LOCALE "csconv_open_locale"
10	#define CSC_OPEN "csconv_open"
11	#define CSC_CONV "csconv"

Lines 1-11 Link Here

(-)ports/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c (-11 lines)
1	--- iiimxcf/xiiimp.so/iiimp/iiimpDL.c Wed May 5 03:55:05 2004
2	+++ iiimxcf/xiiimp.so/iiimp/iiimpDL.c Wed Feb 16 20:41:14 2005
3	@@ -108,7 +108,7 @@
4	}
5
6	#ifndef XLOCALEDIR
7	-#define XLOCALEDIR "/usr/lib/im/modules"
8	+#define XLOCALEDIR (IMDIR "/modules")
9	#endif
10
11	static const char*




--- 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 (IMDIR "/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, ':')) {

Lines 1-3 Link Here

(-)ports/textproc/iiimf-x-lib/pkg-plist (-3 / +5 lines)
1	lib/im/xiiimp.so	1	lib/iiim/xiiimp.a
2	lib/im/xiiimp.so.2	2	lib/iiim/xiiimp.la
3	@unexec rmdir %D/lib/im > /dev/null 2>&1 \|\| true	3	lib/iiim/xiiimp.so
		4	lib/iiim/xiiimp.so.2
		5	@unexec rmdir %D/lib/iiim > /dev/null 2>&1 \|\| true




#

PORTNAME=	le-hangul
PORTVERSION=	12.2
PORTREVISION=	1
CATEGORIES=	korean textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	daichi@FreeBSD.org
COMMENT=	IIIMF Hangul input method engine

RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server

ONLY_FOR_ARCHS=	i386

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
USE_XLIB=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/leif

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}/leif
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

CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=       -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am

pre-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	@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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/korean/iiimf-le-hangul/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Line 0 Link Here

(-)ports/korean/iiimf-le-hangul/files/patch-leif_Makefile.am (+8 lines)
	1	--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
	2	+++ leif/Makefile.am Fri May 13 15:46:03 2005
	3	@@ -1,4 +1,4 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = $(LE_TARGETS)
	6
	7	-ACLOCAL_AMFLAGS = -I ../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles




--- 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 @@
 
 LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
 
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="hangul"
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
 
 dnl --------------------------------------------------------------------------------
 dnl                      Section 5: compilation options
@@ -63,23 +63,15 @@
 
 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"
-
-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_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

Lines 1-7 Link Here

(-)ports/korean/iiimf-le-hangul/pkg-plist (-7 / +6 lines)
1	lib/im/leif/hangul.so	1	lib/iiim/le/hangul/hangul.so
2	lib/im/locale/ko_KR/hangul.conf	2	lib/iiim/le/hangul/hangul.conf
3	lib/im/locale/ko_KR/tables/candidate.txt	3	lib/iiim/le/hangul/tables/candidate.txt
4	@dirrm lib/im/locale/ko_KR/tables	4	@dirrm lib/iiim/le/hangul/tables
5	@dirrm lib/im/locale/ko_KR	5	@dirrm lib/iiim/le/hangul
6	@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 \|\| true	6	@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 \|\| true
7	@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 \|\| true




#

PORTNAME=	le-newpy
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	chinese textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	IIIMF New PinYin input method engine

RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server

ONLY_FOR_ARCHS=	i386

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/leif

LE_TARGETS=	newpy
PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}

.if !defined(WITHOUT_XAUX)
LE_TARGETS+=	newpy/xaux
USE_MOTIF=	yes
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


IGNORE=		"It is supported on FreeBSD 5.3 and later"
.endif

.if ${ARCH} != "i386"
IGNORE=	"${ARCH} is not support."
.endif

CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		${BUILDDIR}/newpy/xaux/aux_win.c \
		${BUILDDIR}/newpy/xaux/aux_so.c

do-configure:
.if defined(WITHOUT_XAUX)
	@cd ${WRKSRC} && \
	 ${REINPLACE_CMD} -e '/^CONFIG_FLAGS =/s,$$, --without-x,' Makefile
.endif
	@cd ${BUILDDIR} && ${REINPLACE_CMD} \
	 -e "/LE_TARGETS=/s,%%LE_TARGETS%%,${LE_TARGETS}," configure.ac
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/chinese/iiimf-le-newpy/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Lines 1-10 Link Here

(-)ports/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/chinese/iiimf-le-newpy/files/patch-leif_Makefile.am (+8 lines)
	1	--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
	2	+++ leif/Makefile.am Fri May 13 15:46:03 2005
	3	@@ -1,4 +1,4 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = $(LE_TARGETS)
	6
	7	-ACLOCAL_AMFLAGS = -I ../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles




--- 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 @@
 
 LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
 
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="%%LE_TARGETS%%"
+dnl IM_CHECK_GTK
 IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
 
 dnl --------------------------------------------------------------------------------
 dnl                      Section 5: compilation options
@@ -63,23 +63,17 @@
 
 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="newpy"
 
-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_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




--- leif/newpy/Makefile.am.orig	Wed Mar  2 23:57:32 2005
+++ leif/newpy/Makefile.am	Wed Mar  2 23:57:57 2005
@@ -3,7 +3,8 @@
 datadir = $(IM_LOCALEDIR)/zh_CN/newpy/data
 newpy_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
                   -DCompByNewPinyin -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
-                  -I$(IM_INCLUDEDIR)/iml
+                  -I$(IM_INCLUDEDIR)/iml \
+		  -DIMDIR="\"${IMDIR}\""
 newpy_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
 newpy_la_LIBADD = $(THREAD_LIBS)
 newpy_la_SOURCES = NewPY.c NewPYLE.c KeysymType.c OnKeySym.c CikuOper.c \

Lines 1-11 Link Here

(-)ports/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c (-11 lines)
1	--- leif/newpy/NewPY.c Fri Jul 16 17:38:30 2004
2	+++ leif/newpy/NewPY.c Wed Feb 16 20:42:06 2005
3	@@ -321,7 +321,7 @@
4	#ifdef WIN32
5	l->path = "d:\\newpy_obj.jar";
6	#else
7	- l->path = "/usr/lib/im/locale/zh_CN/newpy/newpy_obj.jar"; /* path */
8	+ l->path = (IMDIR "/locale/zh_CN/newpy/newpy_obj.jar"); /* path */
9	#endif
10
11	l->signature = "";

Lines 1-11 Link Here

(-)ports/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am (-11 lines)
1	--- leif/newpy/xaux/Makefile.am.orig Thu Mar 3 00:00:36 2005
2	+++ leif/newpy/xaux/Makefile.am Thu Mar 3 00:01:03 2005
3	@@ -3,7 +3,7 @@
4	datadir = $(IM_LOCALEDIR)/zh_CN/newpy
5	COMMONCFLAGS = $(X_CFLAGS) $(THREAD_CXX_CFLAGS) \
6	-DNO_COLOR_FEEDBACK -DNO_CARET_NEGO -DUSE_CSCONV \
7	- -I$(CSCONV_DIR)
8	+ -I$(CSCONV_DIR) -DIMDIR="\"${IMDIR}\""
9	COMMONLDFLAGS = -module $(THREAD_LDFLAGS)
10	aux_la_CFLAGS = $(COMMONCFLAGS)
11	aux_win_CFLAGS = $(COMMONCFLAGS)

Lines 1-11 Link Here

(-)ports/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c (-3 / +3 lines)
1	--- leif/newpy/xaux/aux_so.c Mon Sep 1 17:42:44 2003	1	--- leif/newpy/xaux/aux_so.c.orig Mon May 16 23:20:32 2005
2	+++ leif/newpy/xaux/aux_so.c Wed Feb 16 20:42:14 2005	2	+++ leif/newpy/xaux/aux_so.c Mon May 16 23:21:59 2005
3	@@ -56,7 +56,7 @@	3	@@ -56,7 +56,7 @@
4		4
5	#define HASH_SIZE 137	5	#define HASH_SIZE 137
6	#define ME "aux_so"	6	#define ME "aux_so"
7	-#define AUX_EXT "/usr/lib/im/locale/zh_CN/newpy/aux_win"	7	-#define AUX_EXT "/usr/lib/im/locale/zh_CN/newpy/aux_win"
8	+#define AUX_EXT (IMDIR "/locale/zh_CN/newpy/aux_win")	8	+#define AUX_EXT "%%LOCALBASE%%" "/lib/iiim/le/newpy/aux_win"
9		9
10	typedef struct _aux_icid {	10	typedef struct _aux_icid {
11	aux_t * aux;	11	aux_t * aux;

Lines 1-11 Link Here

(-)ports/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c (-3 / +3 lines)
1	--- leif/newpy/xaux/aux_win.c Fri Mar 16 00:52:22 2001	1	--- leif/newpy/xaux/aux_win.c.orig Mon May 16 23:16:54 2005
2	+++ leif/newpy/xaux/aux_win.c Wed Feb 16 20:42:20 2005	2	+++ leif/newpy/xaux/aux_win.c Mon May 16 23:19:12 2005
3	@@ -61,7 +61,7 @@	3	@@ -61,7 +61,7 @@
4	#include "gif_lib.h"	4	#include "gif_lib.h"
5	#include "getarg.h"	5	#include "getarg.h"
6		6
7	-#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/"	7	-#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/"
8	+#define IMAGE_PATH (IMDIR "/locale/zh_CN/newpy/")	8	+#define IMAGE_PATH "%%LOCALBASE%%" "/lib/iiim/le/newpy/"
9		9
10	Pixmap LoadGIFFile(char * filename);	10	Pixmap LoadGIFFile(char * filename);
11	static void AllocateColors1(void);	11	static void AllocateColors1(void);




lib/iiim/le/newpy/newpy.so
lib/iiim/le/newpy/newpy_obj.jar
lib/iiim/le/newpy/data/PyCiku.dat
lib/iiim/le/newpy/data/UdCiku.dat
%%WANT_XAUX%%lib/iiim/le/newpy/aux.so.0
%%WANT_XAUX%%lib/iiim/le/newpy/aux.so
%%WANT_XAUX%%lib/iiim/le/newpy/aux.la
%%WANT_XAUX%%lib/iiim/le/newpy/aux.a
%%WANT_XAUX%%lib/iiim/le/newpy/aux_win
%%WANT_XAUX%%lib/iiim/le/newpy/full.gif
%%WANT_XAUX%%lib/iiim/le/newpy/gb.gif
%%WANT_XAUX%%lib/iiim/le/newpy/gbk.gif
%%WANT_XAUX%%lib/iiim/le/newpy/half.gif
%%WANT_XAUX%%lib/iiim/le/newpy/help.gif
@dirrm lib/iiim/le/newpy/data
@dirrm lib/iiim/le/newpy
@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true




#

PORTNAME=	le-ude
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	chinese textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	kcwu@csie.org
COMMENT=	IIIMF User Defined language Engine for Simplified Chinese conversion

RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server

ONLY_FOR_ARCHS=	i386

IIIMF_VER=	r12_1-svn2002
USE_BZIP2=	yes
USE_REINPLACE=	yes
USE_GMAKE=      yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

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
PATCH_WRKSRC=	${WRKDIR}/${DISTNAME:S/src-//}

CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		${BUILDDIR}/ude/UDEngine.c

pre-configure:
	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
	@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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/chinese/iiimf-le-ude/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Lines 1-10 Link Here

(-)ports/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/chinese/iiimf-le-ude/files/patch-leif_Makefile.am (+8 lines)
	1	--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
	2	+++ leif/Makefile.am Fri May 13 15:46:03 2005
	3	@@ -1,4 +1,4 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = $(LE_TARGETS)
	6
	7	-ACLOCAL_AMFLAGS = -I ../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles




--- 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 @@
 
 LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
 
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="ude"
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_X
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
 
 dnl --------------------------------------------------------------------------------
 dnl                      Section 5: compilation options
@@ -63,23 +63,15 @@
 
 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"
-
-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_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

Line 0 Link Here

(-)ports/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c (+11 lines)
	1	--- leif/ude/IMHandler.c.orig Wed May 18 03:17:57 2005
	2	+++ leif/ude/IMHandler.c Wed May 18 03:18:24 2005
	3	@@ -71,7 +71,7 @@
	4	if(ct_list == NULL) {
	5
	6	#ifndef WIN32
	7	- strcat(ct_path, "/../locale/zh_CN/ude/data");
	8	+ strcat(ct_path, "data");
	9	#else
	10	strcat(ct_path, "\\..\\locale\\zh_CN\\ude\\data");
	11	#endif




--- leif/ude/Makefile.am.orig	Thu Apr 14 00:30:34 2005
+++ leif/ude/Makefile.am	Wed May 18 02:42:34 2005
@@ -1,13 +1,14 @@
-LE_FILES = udengine.so
-datadir = $(IM_LEIFDIR)/ude/data
-udengine_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
+LENAME = ude
+LE_FILES = ude.so
+datadir = $(IM_LEIFDIR)/$(LENAME)/data
+ude_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
                      -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
                      -I$(IM_INCLUDEDIR)/iml
-udengine_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
-udengine_la_LIBADD = $(THREAD_LIBS)
-udengine_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
+ude_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
+ude_la_LIBADD = $(THREAD_LIBS)
+ude_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
                       CodeTable.c MakeCodeTable.c
-noinst_LTLIBRARIES = udengine.la
+noinst_LTLIBRARIES = ude.la
 data_DATA = data/pinyin.mb
 
 include $(top_srcdir)/install-leif.mak




--- leif/ude/UDEngine.c.orig	Fri Mar 16 00:52:22 2001
+++ leif/ude/UDEngine.c	Wed May 18 03:06:05 2005
@@ -94,7 +94,7 @@
 UTFCHAR zhhrn_string[] = {0x7b80, 0x4f53, 0x4e2d, 0x872d, 0x0};
 
 static IMLEName lename = {
-    "udengine", lename_string	/* LE id, HRN */
+    "ude", lename_string	/* LE id, HRN */
 };
 
 static IMLocale locales[] = {
@@ -295,14 +295,14 @@
     objects = (IMObjectDescriptorStruct *) calloc(2, sizeof(IMObjectDescriptorStruct));
     l = objects;
 
-    l->leid = "udengine";       /* engine id */
+    l->leid = "ude";       /* engine id */
     l->type = IM_DOWNLOADINGOBJECT_JARGUI_TYPE; /* object type */
     l->name = (UTFCHAR *) calloc(1, sizeof(UTFCHAR) * (UTFCHARLen(aux_name_panel) + 1));
     UTFCHARCpy(l->name, aux_name_panel);
     l->name_length = UTFCHARLen(aux_name_panel);
     l->domain = "com.sun.udengine";
-    l->scope = "udengine";      
-    l->path = "/usr/lib/im/locale/zh_CN/udengine/udengine_obj.jar";  /* path */
+    l->scope = "ude";      
+    l->path = "%%PREFIX%%" "/lib/iiim/le/ude/ude.so";  /* path */
     l->signature = "";
     l->basepath = NULL;         /* only for CCDEF */
     l->encoding = NULL;         /* only for CCDEF */

Lines 1-7 Link Here

(-)ports/chinese/iiimf-le-ude/pkg-plist (-7 / +5 lines)
1	lib/im/leif/udengine.so	1	lib/iiim/le/ude/ude.so
2	lib/im/locale/zh_CN/ude/data/pinyin.mb	2	lib/iiim/le/ude/data/pinyin.mb
3	@dirrm lib/im/locale/zh_CN/ude/data	3	@dirrm lib/iiim/le/ude/data
4	@dirrm lib/im/locale/zh_CN/ude	4	@dirrm lib/iiim/le/ude
5	@unexec rmdir %D/lib/im/locale/zh_CN > /dev/null 2>&1 \|\| true	5	@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 \|\| true
6	@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 \|\| true
7	@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 \|\| true




#

PORTNAME=	le-canna
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	japanese textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	daichi@freebsd.org
COMMENT=	Canna language engine for IIIMF

LIB_DEPENDS=	canna16.1:${PORTSDIR}/japanese/Canna
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_GNOME=	gtk20
USE_XLIB=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/leif

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

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 503000
IGNORE=	It is supported on FreeBSD 5.3 and later.
.endif

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}"

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}"

post-patch:
	${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
	@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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/japanese/iiimf-le-canna/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Lines 1-10 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-leif_Makefile.am (+8 lines)
	1	--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
	2	+++ leif/Makefile.am Fri May 13 15:46:03 2005
	3	@@ -1,4 +1,4 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = $(LE_TARGETS)
	6
	7	-ACLOCAL_AMFLAGS = -I ../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles




--- 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();




--- 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




--- 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_SYSTEM
 IM_CHECK_DLOPEN
 IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_FREEWNN
 
 LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 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 @@
 
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
         ${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="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_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

Lines 1-7 Link Here

(-)ports/japanese/iiimf-le-canna/pkg-plist (-7 / +7 lines)
1	lib/im/leif/CannaLE.so	1	lib/iiim/le/CannaLE/CannaLE.so
2	%%WANT_XAUX%%lib/im/locale/ja/CannaLE/aux.so	2	lib/iiim/le/CannaLE/aux.so
3	%%WANT_XAUX%%lib/im/locale/ja/CannaLE/auxmenu	3	lib/iiim/le/CannaLE/aux.la
4	%%WANT_XAUX%%@dirrm lib/im/locale/ja/CannaLE	4	lib/iiim/le/CannaLE/aux.a
5	%%WANT_XAUX%%@dirrm lib/im/locale/ja	5	lib/iiim/le/CannaLE/auxmenu
6	@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 \|\| true	6	@dirrm lib/iiim/le/CannaLE
7	@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 \|\| true	7	@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 \|\| true




#

PORTNAME=	le-freewnn
PORTVERSION=	12.2
PORTREVISION=	2
CATEGORIES=	japanese textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	iiimf-src-${PORTVERSION}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	daichi@freebsd.org
COMMENT=	FreeWnn language engine for IIIMF

LIB_DEPENDS=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
RUN_DEPENDS=	iiimd:${PORTSDIR}/textproc/iiimf-server \
		${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv \
		${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/FreeWnn-server

ONLY_FOR_ARCHS=	i386

USE_BZIP2=	yes
USE_ICONV=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
WANT_AUTOCONF_VER=	259
WANT_AUTOHEADER_VER=	259
WANT_AUTOMAKE_VER=	19
WANT_LIBTOOL_VER=	15

WRKSRC=		${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR=	${WRKSRC}/leif

WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/leif
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

CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/wnn \
		${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" 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}"

post-patch:
	${REINPLACE_CMD} \
		-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		-e "s,%%PREFIX%%,${PREFIX},g" \
		${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		${BUILDDIR}/freewnn/freewnn.c
	${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
	 -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}

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/japanese/iiimf-le-freewnn/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a	1	MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292	2	SIZE (iiimf-src-12.2.tar.bz2) = 11452670




--- 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)
 
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
 BOOTSTRAP = $(AUTORECONF) --install --force
 INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
 
-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:

Lines 1-10 Link Here

(-)ports/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4 (-5 / +7 lines)
1	--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004	1	--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
2	+++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005	2	+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
3	@@ -203,6 +203,11 @@	3	@@ -203,6 +203,13 @@
4	CXX=${CC}	4	CXX=${CC}
5	fi	5	fi
6	;;	6	;;
7	+ cc:)	7	+ cc:)
		8	+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
		9	+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
8	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"	10	+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
9	+ SHLIBCFLAGS='-fpic'	11	+ SHLIBCFLAGS='-fpic'
10	+ SHLIBLDFLAGS='-shared'	12	+ SHLIBLDFLAGS='-shared'
Lines 12-18 Link Here
12	*)	14	*)
13	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"	15	DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
14	;;	16	;;
15	@@ -249,8 +254,8 @@	17	@@ -249,8 +256,8 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"	18	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;	19	;;
18	freebsd)	20	freebsd)
Lines 23-29 Link Here
23	;;	25	;;
24	esac	26	esac
25		27
26	@@ -288,9 +293,9 @@	28	@@ -288,9 +295,9 @@
27	THREAD_CXX_CFLAGS="-mt"	29	THREAD_CXX_CFLAGS="-mt"
28	HAVE_THREAD="uithread"	30	HAVE_THREAD="uithread"
29	;;	31	;;

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/files/patch-leif_Makefile.am (+8 lines)
	1	--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
	2	+++ leif/Makefile.am Fri May 13 15:46:03 2005
	3	@@ -1,4 +1,4 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = $(LE_TARGETS)
	6
	7	-ACLOCAL_AMFLAGS = -I ../acfiles
	8	+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles




--- 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 @@
 
 LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
 IM_CHECK_DLOPEN
-IM_CHECK_CANNA
+dnl IM_CHECK_CANNA
 IM_CHECK_FREEWNN
 
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_X
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
 
 dnl --------------------------------------------------------------------------------
 dnl                      Section 5: compilation options
@@ -63,23 +63,16 @@
 
 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="freewnn"
 
-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_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




--- leif/freewnn/Makefile.am.orig	Wed Mar  2 23:48:30 2005
+++ leif/freewnn/Makefile.am	Wed Mar  2 23:49:21 2005
@@ -3,7 +3,8 @@
                     -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
                     -I$(IM_INCLUDEDIR)/iml \
                     -I$(CSCONV_DIR) \
-                    -I/usr/include/wnn
+		    -DLOCALBASE="\"${LOCALBASE}\"" \
+		    -DIMDIR="\"${IMDIR}\""
 FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
 FreeWnnLE_la_LIBADD = -lwnn $(THREAD_LIBS)
 FreeWnnLE_la_SOURCES = freewnn.c




--- leif/freewnn/freewnn.c.orig	Sun Mar 20 11:41:29 2005
+++ leif/freewnn/freewnn.c	Wed May 18 01:20:56 2005
@@ -59,7 +59,7 @@
 #define BUFSIZE 1024
 #endif
 
-#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
+#define WNNRCFILE "%%LOCALBASE%%" "/lib/wnn/ja_JP/wnnenvrc"
 
-#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"
@@ -162,7 +162,7 @@
@@ -163,7 +163,7 @@
   int count = 0;
 
   if( str == NULL ) return NULL;

 
   for(i=0;i<strlen(str);i++) {
     count++;
@@ -201,7 +201,7 @@
 
   if( wstr == NULL ) return NULL;
 

 
   for(i=0;wstr[i] != 0;i++) 
     count++;
@@ -388,14 +388,14 @@
 
 UTFCHAR*
 UTF8_to_UTFCHAR(unsigned char* str) {
-  UTFCHAR *p, *ustr = NULL;
+  UTFCHAR *ustr = NULL;
   int len, ulen;
 
   const char *csc_arg_str_ccp; /* For compiler optimization */
   char *csc_arg_str_cp; /* For compiler optimization */
 
   if( str == NULL ) return NULL;
-  if( *str == '\0' ) return NULL;
+  if( *str == '\0' ) return "";
 
   if( csconv_utf8_cd == NULL ) {
     csconv_utf8_cd = csc_open("UTF-16", "UTF-8");
@@ -408,30 +408,34 @@
   len = strlen(str);
 
   ulen = sizeof(UTFCHAR)*(len+1);
-  p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
+  ustr = (UTFCHAR*)malloc(ulen);
+  if (!ustr) return NULL;
+  memset(ustr, 0, ulen);
+  ulen--;
 
   /* Below 2 lines are to prevent gcc's warning and for the sake
      of compiler optimization */
   csc_arg_str_ccp = (const char*)str;
   csc_arg_str_cp = (char*)ustr;
 
-  csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
-
-  *ustr = 0;
+  if ((size_t)-1 == csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
+    free(ustr);
+    return NULL;
+  }
 
-  return p;
+  return ustr;
 }
 
 UTFCHAR*
 euc2UTFCHAR(unsigned char* str) {
-  UTFCHAR *p, *ustr = NULL;
+  UTFCHAR *ustr = NULL;
   int len, ulen;
 
   const char *csc_arg_str_ccp; /* For compiler optimization */
   char *csc_arg_str_cp; /* For compiler optimization */
 
   if( str == NULL ) return NULL;
-  if( *str == '\0' ) return NULL;
+  if( *str == '\0' ) return "";
 
   if( csconv_cd == NULL ) {
     csconv_cd = csc_open_locale("ja_JP.eucJP", "UTF-16", "MultiByte");
@@ -444,18 +448,22 @@
   len = strlen(str);
 
   ulen = sizeof(UTFCHAR)*(len+1);
-  p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
+  ustr = (UTFCHAR*)malloc(ulen);
+  if (!ustr) return NULL;
+  memset(ustr, 0, ulen);
+  ulen--;
 
   /* Below 2 lines are to prevent gcc's warning and for the sake
      of compiler optimization */
   csc_arg_str_ccp = (const char*)str;
   csc_arg_str_cp = (char*)ustr;
 
-  csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
-
-  *ustr = 0;
+  if ((size_t)-1 == csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
+    free(ustr);
+    return NULL;
+  }
 
-  return p;
+  return ustr;
 }
 
 IMText*
@@ -466,7 +474,10 @@
   ustr = UTF8_to_UTFCHAR(str);
 
   p = create_IMText(s, ustrlen(ustr));
-  memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+  if (p && ustr) {
+    memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+  }
+  if (ustr) free(ustr);
 
   return p;
 }
@@ -479,7 +490,10 @@
   ustr = euc2UTFCHAR(str);
 
   p = create_IMText(s, ustrlen(ustr));
-  memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+  if (p && ustr) {
+    memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+  }
+  if (ustr) free(ustr);
 
   return p;
 }

Lines 1-2 Link Here

(-)ports/japanese/iiimf-le-freewnn/pkg-plist (-2 / +3 lines)
1	lib/im/leif/FreeWnnLE.so	1	lib/iiim/le/FreeWnnLE/FreeWnnLE.so
2	@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 \|\| true	2	@dirrm lib/iiim/le/FreeWnnLE
		3	@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 \|\| true

Return to bug 81184

Lines 6-91 Link Here

(-)ports/textproc/iiimf-client-lib/Makefile (-56 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= client-lib	8	PORTNAME= client-lib
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 1
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= Internet/Intranet Input Method Client Framework	17	COMMENT= Internet/Intranet Input Method Client Framework
19		18
20	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib	19	LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
		20	RUN_DEPENDS= ${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
		21
		22	ONLY_FOR_ARCHS= i386
21		23
22	IIIMF_VER= r12_1-svn2002
23	INSTALLS_SHLIB= yes	24	INSTALLS_SHLIB= yes
24	USE_BZIP2= yes	25	USE_BZIP2= yes
25	USE_REINPLACE= yes	26	USE_REINPLACE= yes
26	USE_GMAKE= yes	27	USE_GMAKE= yes
27	USE_AUTOCONF_VER= 259	28	WANT_AUTOCONF_VER= 259
28	USE_AUTOHEADER_VER= 259	29	WANT_AUTOHEADER_VER= 259
29	USE_AUTOMAKE_VER= 19	30	WANT_AUTOMAKE_VER= 19
30	WANT_LIBTOOL_VER= 15	31	WANT_LIBTOOL_VER= 15
31		32
32	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	33	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
33		34	BUILDDIR= ${WRKSRC}/lib/iiimcf
34	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
35	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
36		35
37	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
38		37
39	.if ${OSVERSION} < 503000	38	.if ${OSVERSION} < 503000
40	IGNORE= "It is supported on FreeBSD 5.3 and later"	39	IGNORE= It is supported on FreeBSD 5.3 and later.
41	.endif
42
43	.if ${ARCH} != "i386"
44	IGNORE= "${ARCH} is not support."
45	.endif	40	.endif
46		41
47	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	42	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
48	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	43	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
49	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"	44	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
50	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
51	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
52	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
53	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
54		45
55	post-patch:	46	post-patch:
56	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	47	${REINPLACE_CMD} \
57	${WRKSRC}/../../acfiles/im_common.m4	48	-e '/^pkgconfigdir/s,$$(libdir),%%PREFIX%%/libdata,g' \
58		49	${BUILDDIR}/Makefile.am
59	pre-configure:	50	${REINPLACE_CMD} \
60	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles	51	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
61	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \	52	-e "s,%%PREFIX%%,${PREFIX},g" \
62	-I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}	53	${WRKSRC}/Makefile \
63	@cd ${WRKSRC}/../EIMIL && ${REINPLACE_CMD} \	54	${BUILDDIR}/Makefile.am \
64	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \	55	${BUILDDIR}/../EIMIL/Makefile.am
65	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \	56	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
66	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \	57	${WRKSRC}/lib/CSConv/csconv.h
67	${LIBTOOLFILES}	58
68	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}	59	do-configure:
69	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE}	60	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
70	@cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}	61	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
71	@cd ${WRKSRC}/../EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \
72	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
73	./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
74	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
75	-I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
76	@cd ${WRKSRC} && ${REINPLACE_CMD} \
77	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
78	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
79	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
80	${LIBTOOLFILES}
81	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
82
83	post-configure:
84	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
85	${WRKSRC}/Makefile
86
87	pre-build:
88	@cd ${WRKSRC}/../EIMIL && \
89	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
90		62
91	.include <bsd.port.post.mk>	63	.include <bsd.port.post.mk>

Lines 1-19 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-Makefile (-18 / +46 lines)
1	--- Makefile Thu Apr 8 03:28:00 2004	1	--- Makefile.orig Mon May 9 15:32:45 2005
2	+++ Makefile Wed Feb 16 14:09:34 2005	2	+++ Makefile Mon May 9 15:35:03 2005
3	@@ -2,6 +2,7 @@	3	@@ -1,29 +1,31 @@
4	AUTOMAKE = automake	4	## deprecated in favour of AUTORECONF
5	AUTOHEADER = autoheader	5	-#ACLOCAL = aclocal
6	AUTOCONF = autoconf	6	-#AUTOMAKE = automake --add-missing --copy
7	+LIBTOOLIZE = libtoolize	7	-#LIBTOOLIZE = libtoolize --force --copy
8		8	-#AUTOHEADER = autoheader
9	CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \	9	-#AUTOCONF = autoconf
10	$(AUTOHEADER) && \	10	+ACLOCAL = aclocal19
11	@@ -21,7 +22,7 @@	11	+AUTOMAKE = automake19 --add-missing --copy
12		12	+LIBTOOLIZE = libtoolize15 --force --copy
13	update-acfiles:	13	+AUTOHEADER = autoheader259
14	cd acfiles && \	14	+AUTOCONF = autoconf259
15	- $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \	15	#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
16	+ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \	16	# $(LIBTOOLIZE) && \
17	rm -f Makefile.in aclocal.m4	17	# $(AUTOHEADER) && \
		18	# $(AUTOMAKE) && \
		19	# $(AUTOCONF)
		20
		21	-AUTORECONF = autoreconf
		22	+AUTORECONF = autoreconf259
		23	BOOTSTRAP = $(AUTORECONF) --install --force
		24	INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
		25
		26	-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
		27	+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
		28
		29	-INTLDIRS = iiimgcf gnome-im-switcher
		30	+#INTLDIRS = iiimgcf gnome-im-switcher
		31
		32	-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
		33	- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
		34	- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
		35	- iiimgcf gnome-im-switcher doc
		36	+BUILDDIRS = lib/EIMIL lib/iiimcf
		37	+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
		38	+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
		39	+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
		40	+# iiimgcf gnome-im-switcher doc
		41
		42	-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
		43	+CONFIGDIRS = $(BUILDDIRS)
		44	+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
		45
		46	all: compile
18		47
19	config:

Lines 1-19 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac (-19 lines)
1	--- lib/iiimcf/configure.ac.orig Wed Mar 2 06:27:04 2005
2	+++ lib/iiimcf/configure.ac Wed Mar 2 06:27:29 2005
3	@@ -82,13 +82,13 @@
4	COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
5	CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
6	${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
7	- ${THREAD_COMMON_CXX_CFLAGS}"
8	+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
9
10	CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
11	${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
12	- ${THREAD_COMMON_CXX_CFLAGS}"
13	+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
14
15	-LDFLAGS="${COMMON_LDFLAGS}"
16	+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
17
18	dnl --------------------------------------------------------------------------------
19	dnl Section 6: compilation test

Lines 1-19 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_iiimcf.c (-19 lines)
1	--- lib/iiimcf/iiimcf.c Tue Sep 14 13:19:47 2004
2	+++ lib/iiimcf/iiimcf.c Wed Feb 16 22:59:51 2005
3	@@ -440,7 +440,7 @@
4	)
5	{
6	IIIMF_status st;
7	- IIIMP_message *pmes;
8	+ IIIMP_message *pmes = NULL;
9
10	if (!ph->data_s) ph->data_s = iiimp_data_s_new();
11	if (!ph->data_s) return IIIMF_STATUS_MALLOC;
12	@@ -501,6 +501,7 @@
13	iiimp_message_delete(ph->data_s, pmes);
14	if (st != IIIMF_STATUS_SUCCESS) goto reconnect;
15
16	+ pmes = NULL;
17	st = iiimcf_wait_message(ph, NULL, IM_CONNECT_REPLY, &pmes);
18	if (st != IIIMF_STATUS_SUCCESS) {
19	if (pmes) iiimp_message_delete(ph->data_s, pmes);

Lines 6-84 Link Here

(-)ports/textproc/iiimf-csconv/Makefile (-48 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= csconv	8	PORTNAME= csconv
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 1
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= Internet/Intranet Input Method Framework encoding convert library	17	COMMENT= Internet/Intranet Input Method Framework encoding convert library
19		18
20	IIIMF_VER= r12_1-svn2002	19	ONLY_FOR_ARCHS= i386
		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USE_ICONV= yes	22	USE_ICONV= yes
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	USE_GNOME= intltool
25	USE_REINPLACE= yes	24	USE_REINPLACE= yes
26	USE_AUTOCONF_VER= 259	25	WANT_AUTOCONF_VER= 259
27	#USE_AUTOHEADER_VER= 259	26	WANT_AUTOHEADER_VER= 259
28	WANT_AUTOMAKE_VER= 19	27	WANT_AUTOMAKE_VER= 19
29	WANT_LIBTOOL_VER= 15	28	WANT_LIBTOOL_VER= 15
30		29
31	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	30	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
32		31	BUILDDIR= ${WRKSRC}/lib/CSConv
33	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
34	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
35		32
36	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
37		34
38	.if ${OSVERSION} < 503000	35	.if ${OSVERSION} < 503000
39	IGNORE= "It is supported on FreeBSD 5.3 and later"	36	IGNORE= It is supported on FreeBSD 5.3 and later.
40	.endif
41
42	.if ${ARCH} != "i386"
43	IGNORE= "${ARCH} is not support."
44	.endif	37	.endif
45		38
46	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	39	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
47	LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}	40	LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
48	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"	41	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
49	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
50	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
51	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
52	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
53		42
54	post-patch:	43	post-patch:
55	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
56	${WRKSRC}/../../acfiles/im_common.m4 \
57	${WRKSRC}/configure.ac \
58	${WRKSRC}/csconv.h \
59	${WRKSRC}/converterPI/configure.in \
60	${WRKSRC}/converterPI/test/icutest4linux.c \
61	${WRKSRC}/converterPI/icuconv_relay.c \
62	${WRKSRC}/converterPI/icuconv/common/config.h
63	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
64	${WRKSRC}/converterPI/icuconv/common/icuconv.c
65	for MKFLIN in `find ${WRKSRC} -name "Makefile.in"`; do \
66	${REINPLACE_CMD} -e "/(CC)/s,-lc,,g" $${MKFLIN}; \
67	${REINPLACE_CMD} -e "/(CC)/s,-ldl,,g" $${MKFLIN}; \
68	${REINPLACE_CMD} -e '/(CC)/s,(LIBS),(LDFLAGS),g' $${MKFLIN}; \
69	${REINPLACE_CMD} -e '/(CC)/s,{LIBS},{LDFLAGS},g' $${MKFLIN}; \
70	${REINPLACE_CMD} -e "s,LIBS = @LIBS@,LDFLAGS = @LDFLAGS@,g" $${MKFLIN}; \
71	done
72
73	pre-configure:
74	@cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
75	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
76	-I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
77	@cd ${WRKSRC}/converterPI/ && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
78
79	post-configure:
80	${REINPLACE_CMD} \	44	${REINPLACE_CMD} \
81	-e "s,prefix = ${PREFIX},prefix = ${PREFIX}/lib/im," \	45	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
82	`${FIND} ${WRKSRC} -type f -name Makefile`	46	-e "s,%%PREFIX%%,${PREFIX},g" \
		47	${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
		48	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
		49	${BUILDDIR}/csconv.h
		50
		51	do-configure:
		52	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
		53	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
83		54
84	.include <bsd.port.post.mk>	55	.include <bsd.port.post.mk>

Lines 1-50 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac (-50 lines)
1	--- lib/CSConv/configure.ac.orig Fri Jun 13 01:27:08 2003
2	+++ lib/CSConv/configure.ac Wed Mar 2 08:43:13 2005
3	@@ -28,7 +28,7 @@
4	AC_INIT(csconv.h)
5
6	AC_CONFIG_AUX_DIR(../../acfiles)
7	-AC_PREFIX_DEFAULT(/usr/lib/im)
8	+AC_PREFIX_DEFAULT(${LOCALBASE}/lib/im)
9	IM_INIT(../..)
10
11	AC_CONFIG_HEADER(config.h)
12	@@ -297,6 +297,9 @@
13	if test x"${CC}" = x"gcc" ; then
14	SHLIBCFLAGS='-fpic'
15	SHLIBLDFLAGS='-shared'
16	+ elif test x"${CC}" = x"cc" ; then
17	+ SHLIBCFLAGS='-fpic'
18	+ SHLIBLDFLAGS='-shared'
19	else
20	SHLIBCFLAGS=
21	SHLIBLDFLAGS=
22	@@ -314,6 +317,7 @@
23	case "${host}" in
24	solaris) platform=SOLARIS ;;
25	linux) platform=LINUX ;;
26	+ freebsd) platform=FREEBSD ;;
27	esac
28	AC_SUBST(platform)
29
30	@@ -337,6 +341,12 @@
31	## Shared object suffix
32	SO=so
33	;;
34	+ freebsd)
35	+ ## Commands to generate dependency files
36	+ GEN_DEPS="${CC} -E -MM ${DEFINES} ${INCLUDES}"
37	+ ## Shared object suffix
38	+ SO=so
39	+ ;;
40	esac
41
42
43	@@ -400,6 +410,7 @@
44	AC_SUBST(ARFLAGS)
45	AC_SUBST(SHLIBCFLAGS)
46	AC_SUBST(SHLIBLDFLAGS)
47	+AC_SUBST(LDFLAGS)
48	AC_SUBST(SUBDIR)
49	AC_SUBST(ICONV_INCLUDES)
50	AC_SUBST(OBJS_ICONV)

Lines 1-242 Link Here

(-)ports/textproc/iiimf-csconv/pkg-plist (-242 / +5 lines)
1	lib/im/csconv/big5_ct.so	1	lib/iiim/csconv/csconv.la
2	lib/im/csconv/big5w_ct.so	2	lib/iiim/csconv/csconv.so
3	lib/im/csconv/cns_ct.so	3	lib/iiim/csconv/encoding.norm
4	lib/im/csconv/cnsw_ct.so	4	@dirrm lib/iiim/csconv
5	lib/im/csconv/compoundtext/ct_de	5	@unexec rmdir %D/lib/iiim > /dev/null 2>&1 \|\| true
6	lib/im/csconv/compoundtext/ct_en_US
7	lib/im/csconv/compoundtext/ct_es
8	lib/im/csconv/compoundtext/ct_fr
9	lib/im/csconv/compoundtext/ct_it
10	lib/im/csconv/compoundtext/ct_ja
11	lib/im/csconv/compoundtext/ct_ko
12	lib/im/csconv/compoundtext/ct_sv
13	lib/im/csconv/compoundtext/ct_zh
14	lib/im/csconv/compoundtext/ct_zh.GBK
15	lib/im/csconv/compoundtext/ct_zh_TW
16	lib/im/csconv/compoundtext/ct_zh_TW.GBK
17	lib/im/csconv/csconv.conf
18	lib/im/csconv/csconv.so
19	lib/im/csconv/ct_big5.so
20	lib/im/csconv/ct_big5w.so
21	lib/im/csconv/ct_cns.so
22	lib/im/csconv/ct_cnsw.so
23	lib/im/csconv/ct_euc.so
24	lib/im/csconv/ct_eucw.so
25	lib/im/csconv/ct_pck.so
26	lib/im/csconv/ct_pckw.so
27	lib/im/csconv/ct_utf16.so
28	lib/im/csconv/ct_utf8.so
29	lib/im/csconv/ct_utf8w.so
30	lib/im/csconv/ctex_mbs.so
31	lib/im/csconv/ctex_wcs.so
32	lib/im/csconv/encoding.norm
33	lib/im/csconv/euc_ct.so
34	lib/im/csconv/eucw_ct.so
35	lib/im/csconv/iconv_relay.so
36	lib/im/csconv/iconv_relay_mb_wc.so
37	lib/im/csconv/iconv_relay_wc_mb.so
38	lib/im/csconv/icuconv_relay.so
39	lib/im/csconv/icuconv_relay_mb_wc.so
40	lib/im/csconv/icuconv_relay_wc_mb.so
41	lib/im/csconv/libicuconv.so
42	lib/im/csconv/mbs_ctex.so
43	lib/im/csconv/mbs_wcs.so
44	lib/im/csconv/nil.so
45	lib/im/csconv/pck_ct.so
46	lib/im/csconv/pckw_ct.so
47	lib/im/csconv/utf16_ct.so
48	lib/im/csconv/utf8_ct.so
49	lib/im/csconv/utf8w_ct.so
50	lib/im/csconv/wcs_ctex.so
51	lib/im/csconv/wcs_mbs.so
52	lib/im/icuconv/libicu-toolutil.so
53	lib/im/share/icu/1.4.0/cnvalias.dat
54	lib/im/share/icu/1.4.0/icudata_cnvalias.dat
55	lib/im/share/icu/1.4.0/ibm-1004.cnv
56	lib/im/share/icu/1.4.0/ibm-1006.cnv
57	lib/im/share/icu/1.4.0/ibm-1008.cnv
58	lib/im/share/icu/1.4.0/ibm-1038.cnv
59	lib/im/share/icu/1.4.0/ibm-1041.cnv
60	lib/im/share/icu/1.4.0/ibm-1043.cnv
61	lib/im/share/icu/1.4.0/ibm-1047.cnv
62	lib/im/share/icu/1.4.0/ibm-1051.cnv
63	lib/im/share/icu/1.4.0/ibm-1088.cnv
64	lib/im/share/icu/1.4.0/ibm-1089.cnv
65	lib/im/share/icu/1.4.0/ibm-1098.cnv
66	lib/im/share/icu/1.4.0/ibm-1112.cnv
67	lib/im/share/icu/1.4.0/ibm-1114.cnv
68	lib/im/share/icu/1.4.0/ibm-1115.cnv
69	lib/im/share/icu/1.4.0/ibm-1116.cnv
70	lib/im/share/icu/1.4.0/ibm-1117.cnv
71	lib/im/share/icu/1.4.0/ibm-1118.cnv
72	lib/im/share/icu/1.4.0/ibm-1119.cnv
73	lib/im/share/icu/1.4.0/ibm-1123.cnv
74	lib/im/share/icu/1.4.0/ibm-1140-s390.cnv
75	lib/im/share/icu/1.4.0/ibm-1140.cnv
76	lib/im/share/icu/1.4.0/ibm-1141.cnv
77	lib/im/share/icu/1.4.0/ibm-1142-s390.cnv
78	lib/im/share/icu/1.4.0/ibm-1142.cnv
79	lib/im/share/icu/1.4.0/ibm-1143-s390.cnv
80	lib/im/share/icu/1.4.0/ibm-1143.cnv
81	lib/im/share/icu/1.4.0/ibm-1144-s390.cnv
82	lib/im/share/icu/1.4.0/ibm-1144.cnv
83	lib/im/share/icu/1.4.0/ibm-1145-s390.cnv
84	lib/im/share/icu/1.4.0/ibm-1145.cnv
85	lib/im/share/icu/1.4.0/ibm-1146-s390.cnv
86	lib/im/share/icu/1.4.0/ibm-1146.cnv
87	lib/im/share/icu/1.4.0/ibm-1147-s390.cnv
88	lib/im/share/icu/1.4.0/ibm-1147.cnv
89	lib/im/share/icu/1.4.0/ibm-1148-s390.cnv
90	lib/im/share/icu/1.4.0/ibm-1148.cnv
91	lib/im/share/icu/1.4.0/ibm-1149-s390.cnv
92	lib/im/share/icu/1.4.0/ibm-1149.cnv
93	lib/im/share/icu/1.4.0/ibm-1153-s390.cnv
94	lib/im/share/icu/1.4.0/ibm-1153.cnv
95	lib/im/share/icu/1.4.0/ibm-1154.cnv
96	lib/im/share/icu/1.4.0/ibm-1155.cnv
97	lib/im/share/icu/1.4.0/ibm-1156.cnv
98	lib/im/share/icu/1.4.0/ibm-1157.cnv
99	lib/im/share/icu/1.4.0/ibm-1158.cnv
100	lib/im/share/icu/1.4.0/ibm-1159.cnv
101	lib/im/share/icu/1.4.0/ibm-1160.cnv
102	lib/im/share/icu/1.4.0/ibm-1164.cnv
103	lib/im/share/icu/1.4.0/ibm-1250.cnv
104	lib/im/share/icu/1.4.0/ibm-1251.cnv
105	lib/im/share/icu/1.4.0/ibm-1252.cnv
106	lib/im/share/icu/1.4.0/ibm-1253.cnv
107	lib/im/share/icu/1.4.0/ibm-1254.cnv
108	lib/im/share/icu/1.4.0/ibm-1255.cnv
109	lib/im/share/icu/1.4.0/ibm-1256.cnv
110	lib/im/share/icu/1.4.0/ibm-1257.cnv
111	lib/im/share/icu/1.4.0/ibm-1258.cnv
112	lib/im/share/icu/1.4.0/ibm-12712-s390.cnv
113	lib/im/share/icu/1.4.0/ibm-12712.cnv
114	lib/im/share/icu/1.4.0/ibm-1275.cnv
115	lib/im/share/icu/1.4.0/ibm-1276.cnv
116	lib/im/share/icu/1.4.0/ibm-1277.cnv
117	lib/im/share/icu/1.4.0/ibm-1280.cnv
118	lib/im/share/icu/1.4.0/ibm-1281.cnv
119	lib/im/share/icu/1.4.0/ibm-1282.cnv
120	lib/im/share/icu/1.4.0/ibm-1283.cnv
121	lib/im/share/icu/1.4.0/ibm-1361.cnv
122	lib/im/share/icu/1.4.0/ibm-1362.cnv
123	lib/im/share/icu/1.4.0/ibm-1363.cnv
124	lib/im/share/icu/1.4.0/ibm-1364.cnv
125	lib/im/share/icu/1.4.0/ibm-1370.cnv
126	lib/im/share/icu/1.4.0/ibm-1371.cnv
127	lib/im/share/icu/1.4.0/ibm-1383.cnv
128	lib/im/share/icu/1.4.0/ibm-1386.cnv
129	lib/im/share/icu/1.4.0/ibm-1390.cnv
130	lib/im/share/icu/1.4.0/ibm-1399.cnv
131	lib/im/share/icu/1.4.0/ibm-16684.cnv
132	lib/im/share/icu/1.4.0/ibm-16804-s390.cnv
133	lib/im/share/icu/1.4.0/ibm-16804.cnv
134	lib/im/share/icu/1.4.0/ibm-17248.cnv
135	lib/im/share/icu/1.4.0/ibm-21427.cnv
136	lib/im/share/icu/1.4.0/ibm-273.cnv
137	lib/im/share/icu/1.4.0/ibm-277.cnv
138	lib/im/share/icu/1.4.0/ibm-278.cnv
139	lib/im/share/icu/1.4.0/ibm-280.cnv
140	lib/im/share/icu/1.4.0/ibm-284.cnv
141	lib/im/share/icu/1.4.0/ibm-285.cnv
142	lib/im/share/icu/1.4.0/ibm-297.cnv
143	lib/im/share/icu/1.4.0/ibm-37-s390.cnv
144	lib/im/share/icu/1.4.0/ibm-37.cnv
145	lib/im/share/icu/1.4.0/ibm-420.cnv
146	lib/im/share/icu/1.4.0/ibm-424.cnv
147	lib/im/share/icu/1.4.0/ibm-437.cnv
148	lib/im/share/icu/1.4.0/ibm-4899.cnv
149	lib/im/share/icu/1.4.0/ibm-4909.cnv
150	lib/im/share/icu/1.4.0/ibm-4930.cnv
151	lib/im/share/icu/1.4.0/ibm-4971.cnv
152	lib/im/share/icu/1.4.0/ibm-500.cnv
153	lib/im/share/icu/1.4.0/ibm-5104.cnv
154	lib/im/share/icu/1.4.0/ibm-5123.cnv
155	lib/im/share/icu/1.4.0/ibm-5210.cnv
156	lib/im/share/icu/1.4.0/ibm-5346.cnv
157	lib/im/share/icu/1.4.0/ibm-5347.cnv
158	lib/im/share/icu/1.4.0/ibm-5349.cnv
159	lib/im/share/icu/1.4.0/ibm-5350.cnv
160	lib/im/share/icu/1.4.0/ibm-5351.cnv
161	lib/im/share/icu/1.4.0/ibm-5352.cnv
162	lib/im/share/icu/1.4.0/ibm-5353.cnv
163	lib/im/share/icu/1.4.0/ibm-5354.cnv
164	lib/im/share/icu/1.4.0/ibm-803.cnv
165	lib/im/share/icu/1.4.0/ibm-808.cnv
166	lib/im/share/icu/1.4.0/ibm-813.cnv
167	lib/im/share/icu/1.4.0/ibm-833.cnv
168	lib/im/share/icu/1.4.0/ibm-834.cnv
169	lib/im/share/icu/1.4.0/ibm-835.cnv
170	lib/im/share/icu/1.4.0/ibm-848.cnv
171	lib/im/share/icu/1.4.0/ibm-8482.cnv
172	lib/im/share/icu/1.4.0/ibm-849.cnv
173	lib/im/share/icu/1.4.0/ibm-850.cnv
174	lib/im/share/icu/1.4.0/ibm-852.cnv
175	lib/im/share/icu/1.4.0/ibm-855.cnv
176	lib/im/share/icu/1.4.0/ibm-856.cnv
177	lib/im/share/icu/1.4.0/ibm-857.cnv
178	lib/im/share/icu/1.4.0/ibm-858.cnv
179	lib/im/share/icu/1.4.0/ibm-859.cnv
180	lib/im/share/icu/1.4.0/ibm-860.cnv
181	lib/im/share/icu/1.4.0/ibm-861.cnv
182	lib/im/share/icu/1.4.0/ibm-862.cnv
183	lib/im/share/icu/1.4.0/ibm-863.cnv
184	lib/im/share/icu/1.4.0/ibm-864.cnv
185	lib/im/share/icu/1.4.0/ibm-865.cnv
186	lib/im/share/icu/1.4.0/ibm-866.cnv
187	lib/im/share/icu/1.4.0/ibm-867.cnv
188	lib/im/share/icu/1.4.0/ibm-868.cnv
189	lib/im/share/icu/1.4.0/ibm-869.cnv
190	lib/im/share/icu/1.4.0/ibm-871.cnv
191	lib/im/share/icu/1.4.0/ibm-872.cnv
192	lib/im/share/icu/1.4.0/ibm-874.cnv
193	lib/im/share/icu/1.4.0/ibm-878.cnv
194	lib/im/share/icu/1.4.0/ibm-891.cnv
195	lib/im/share/icu/1.4.0/ibm-897.cnv
196	lib/im/share/icu/1.4.0/ibm-901.cnv
197	lib/im/share/icu/1.4.0/ibm-902.cnv
198	lib/im/share/icu/1.4.0/ibm-9027.cnv
199	lib/im/share/icu/1.4.0/ibm-903.cnv
200	lib/im/share/icu/1.4.0/ibm-904.cnv
201	lib/im/share/icu/1.4.0/ibm-9044.cnv
202	lib/im/share/icu/1.4.0/ibm-9049.cnv
203	lib/im/share/icu/1.4.0/ibm-9061.cnv
204	lib/im/share/icu/1.4.0/ibm-907.cnv
205	lib/im/share/icu/1.4.0/ibm-909.cnv
206	lib/im/share/icu/1.4.0/ibm-910.cnv
207	lib/im/share/icu/1.4.0/ibm-912.cnv
208	lib/im/share/icu/1.4.0/ibm-913.cnv
209	lib/im/share/icu/1.4.0/ibm-914.cnv
210	lib/im/share/icu/1.4.0/ibm-915.cnv
211	lib/im/share/icu/1.4.0/ibm-916.cnv
212	lib/im/share/icu/1.4.0/ibm-920.cnv
213	lib/im/share/icu/1.4.0/ibm-921.cnv
214	lib/im/share/icu/1.4.0/ibm-922.cnv
215	lib/im/share/icu/1.4.0/ibm-923.cnv
216	lib/im/share/icu/1.4.0/ibm-9238.cnv
217	lib/im/share/icu/1.4.0/ibm-924.cnv
218	lib/im/share/icu/1.4.0/ibm-930.cnv
219	lib/im/share/icu/1.4.0/ibm-933.cnv
220	lib/im/share/icu/1.4.0/ibm-935.cnv
221	lib/im/share/icu/1.4.0/ibm-937.cnv
222	lib/im/share/icu/1.4.0/ibm-939.cnv
223	lib/im/share/icu/1.4.0/ibm-941.cnv
224	lib/im/share/icu/1.4.0/ibm-942.cnv
225	lib/im/share/icu/1.4.0/ibm-943.cnv
226	lib/im/share/icu/1.4.0/ibm-944.cnv
227	lib/im/share/icu/1.4.0/ibm-946.cnv
228	lib/im/share/icu/1.4.0/ibm-947.cnv
229	lib/im/share/icu/1.4.0/ibm-948.cnv
230	lib/im/share/icu/1.4.0/ibm-949.cnv
231	lib/im/share/icu/1.4.0/ibm-950.cnv
232	lib/im/share/icu/1.4.0/ibm-953.cnv
233	lib/im/share/icu/1.4.0/ibm-954.cnv
234	lib/im/share/icu/1.4.0/ibm-955.cnv
235	lib/im/share/icu/1.4.0/ibm-970.cnv
236	@dirrm lib/im/share/icu/1.4.0
237	@dirrm lib/im/share/icu
238	@dirrm lib/im/share
239	@dirrm lib/im/icuconv
240	@dirrm lib/im/csconv/compoundtext
241	@dirrm lib/im/csconv
242	@unexec rmdir %D/lib/im > /dev/null 2>&1 \|\| true

Lines 6-93 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/Makefile (-51 / +31 lines)
6	#	6	#
7		7
8	PORTNAME= gnome-im-switcher	8	PORTNAME= gnome-im-switcher
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 2
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= IIIMF gnome input method switcher	17	COMMENT= IIIMF gnome input method switcher
19		18
20	BROKEN= Incorrect pkg-plist	19	ONLY_FOR_ARCHS= i386
21		20
22	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
23		22
24	IIIMF_VER= r12_1-svn2002
25	USE_BZIP2= yes	23	USE_BZIP2= yes
26	USE_REINPLACE= yes	24	USE_REINPLACE= yes
27	USE_GETTEXT= yes	25	USE_GETTEXT= yes
28	USE_GMAKE= yes	26	USE_GMAKE= yes
29	USE_GNOME= intltool gconf2 libglade2 libgnomeui \	27	USE_GNOME= intltool gconf2 libglade2 libgnomeui \
30	gnomepanel gnomeprefix gnomehack	28	gnomepanel gnomeprefix gnomehack
31	USE_AUTOCONF_VER= 259	29	WANT_AUTOCONF_VER= 259
32	USE_AUTOHEADER_VER= 259	30	WANT_AUTOHEADER_VER= 259
33	USE_AUTOMAKE_VER= 19	31	WANT_AUTOMAKE_VER= 19
34	WANT_LIBTOOL_VER= 15	32	WANT_LIBTOOL_VER= 15
35		33
36	AUTOMAKE_ARGS+= --add-missing	34	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
37	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	35	BUILDDIR= ${WRKSRC}/gnome-im-switcher
38
39	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher
40	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
41		36
42	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
43		38
44	.if ${OSVERSION} < 503000	39	.if ${OSVERSION} < 503000
45	IGNORE= "It is supported on FreeBSD 5.3 and later"	40	IGNORE= It is supported on FreeBSD 5.3 and later.
46	.endif
47
48	.if ${ARCH} != "i386"
49	IGNORE= "${ARCH} is not support."
50	.endif	41	.endif
51		42
52	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}	43	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
53	LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}	44	LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}
54	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"	45	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
55	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
56	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
57	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
58	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
59	TLZ_ARGS= --copy --force
60	BNB_PATH= bonobo/server
61		46
62	post-patch:	47	post-patch:
63	${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \	48	${REINPLACE_CMD} \
64	${WRKSRC}/../acfiles/im_common.m4	49	-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
		50	-e '/^uidir/s,$$[(]datadir[)]/,&gnome/,g' \
		51	${BUILDDIR}/src/Makefile.am
		52	${REINPLACE_CMD} \
		53	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		54	-e "s,%%PREFIX%%,${PREFIX},g" \
		55	${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
		56	${BUILDDIR}/src/Makefile.am
65	${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \	57	${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
66	${WRKSRC}/configure.in	58	${BUILDDIR}/configure.ac
67		59	${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
68	pre-configure:	60	${BUILDDIR}/configure.ac
69	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles	61	${REINPLACE_CMD} -e "/^omf_dest_dir/s,[(]datadir[)]/,&gnome/,g" \
70	@cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS}	62	${BUILDDIR}/help/omf.make
71	@cd ${WRKSRC} && intltoolize ${TLZ_ARGS}	63
72	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS}	64	do-configure:
73	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \	65	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
74	-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}	66	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
75	@cd ${WRKSRC} && ${REINPLACE_CMD} \
76	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
77	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
78	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
79	${LIBTOOLFILES}
80	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
81		67
82	post-configure:	68	post-configure:
83	${REINPLACE_CMD} \	69	${REINPLACE_CMD} -e '/^pkgdatadir/s,[(]datadir[)]/,&gnome/,g' \
84	-e "s,[(]libdir[)]/${BNB_PATH},{exec_prefix}/libdata/${BNB_PATH},g" \	70	-e '/^iconsdir/s,[(]datadir[)]/,&gnome/,g' \
85	-e "/-D.*LOCALEDIR=/s,[(]datadir[)]/,&../,g" \	71	${BUILDDIR}/src/Makefile
86	${WRKSRC}/src/Makefile
87	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
88	${WRKSRC}/help/C/Makefile
89	${REINPLACE_CMD} \
90	-e "/^datadir/s,${PREFIX}/share/gnome,${PREFIX}/share,g" \
91	${WRKSRC}/po/Makefile
92		72
93	.include <bsd.port.post.mk>	73	.include <bsd.port.post.mk>

Lines 1-92 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/pkg-plist (-80 / +47 lines)
1	bin/gnome-im-properties	1	bin/gnome-im-properties
2	bin/gnome-im-settings-daemon	2	bin/gnome-im-settings-daemon
3	libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
4	libexec/gnome-im-switcher-applet	3	libexec/gnome-im-switcher-applet
5	share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop	4	share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
6	share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2	5	share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
7	share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml	6	share/locale/de/LC_MESSAGES/iiimf-im-switcher.mo
		7	share/locale/es/LC_MESSAGES/iiimf-im-switcher.mo
		8	share/locale/fr/LC_MESSAGES/iiimf-im-switcher.mo
		9	share/locale/gu/LC_MESSAGES/iiimf-im-switcher.mo
		10	share/locale/hi/LC_MESSAGES/iiimf-im-switcher.mo
		11	share/locale/hu/LC_MESSAGES/iiimf-im-switcher.mo
		12	share/locale/it/LC_MESSAGES/iiimf-im-switcher.mo
		13	share/locale/ja/LC_MESSAGES/iiimf-im-switcher.mo
		14	share/locale/ko/LC_MESSAGES/iiimf-im-switcher.mo
		15	share/locale/pa/LC_MESSAGES/iiimf-im-switcher.mo
		16	share/locale/pl/LC_MESSAGES/iiimf-im-switcher.mo
		17	share/locale/pt_BR/LC_MESSAGES/iiimf-im-switcher.mo
		18	share/locale/ru/LC_MESSAGES/iiimf-im-switcher.mo
		19	share/locale/sv/LC_MESSAGES/iiimf-im-switcher.mo
		20	share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
		21	share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
		22	share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
		23	share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
		24	share/icons/hicolor/48x48/apps/gnome-settings-im.png
8	share/gnome/pixmaps/gnome-settings-im.png	25	share/gnome/pixmaps/gnome-settings-im.png
9	share/gnome/pixmaps/gimlet-off.png	26	share/gnome/pixmaps/gimlet-off.png
10	share/gnome/pixmaps/gimlet-on.png	27	share/gnome/pixmaps/gimlet-on.png
		28	share/gnome/pixmaps/gimlet-disable.png
		29	share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
		30	share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
		31	share/gnome/help/imswitcher/C/legal.xml
		32	share/gnome/help/imswitcher/C/imswitcher.xml
		33	@dirrm share/gnome/help/imswitcher/C
		34	@dirrm share/gnome/help/imswitcher
		35	share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
		36	@dirrm share/gnome/iiimf-im-switcher/glade
		37	@dirrm share/gnome/iiimf-im-switcher
		38	share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
		39	@comment
		40	@comment 'do scrollkeeper-update'
		41	@comment
		42	share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
		43	@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
		44	@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
		45	@dirrm share/gnome/omf/iiimf-im-switcher
		46	@comment
		47	@comment 'do gconftool-2'
		48	@comment
11	@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null \|\| true	49	@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null \|\| true
12	etc/gconf/schemas/gnome-im-switcher.schemas	50	etc/gconf/schemas/gnome-im-switcher.schemas
13	@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null \|\| true	51	@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas > /dev/null \|\| true
14	@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null \|\| true	52	@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null \|\| true
15	etc/gconf/schemas/gnome-im-properties.schemas	53	etc/gconf/schemas/gnome-im-properties.schemas
16	@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null \|\| true	54	@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas > /dev/null \|\| true
17	@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher	55	@comment
18	share/gnome/omf/gnome-im-switcher/imswitcher-C.omf	56	@comment 'rm files in LOCALBASE.'
19	@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher	57	@comment
20	@dirrm share/gnome/omf/gnome-im-switcher	58	@cwd %%LOCALBASE%%
21	share/gnome/gnome-im-switcher/glade/gnome-im-switcher.glade2	59	libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
22	@dirrm share/gnome/gnome-im-switcher/glade
23	@dirrm share/gnome/gnome-im-switcher
24	share/gnome/help/imswitcher/C/legal.xml
25	share/gnome/help/imswitcher/C/imswitcher.xml
26	@dirrm share/gnome/help/imswitcher/C
27	@dirrm share/gnome/help/imswitcher
28	share/gnome/icons/hicolor/48x48/apps/gnome-settings-im.png
29	@unexec rmdir %D/share/gnome/icons/hicolor/48x48/apps > /dev/null 2>&1 \|\| true
30	@unexec rmdir %D/share/gnome/icons/hicolor/48x48 > /dev/null 2>&1 \|\| true
31	@unexec rmdir %D/share/gnome/icons/hicolor > /dev/null 2>&1 \|\| true
32	@unexec rmdir %D/share/gnome/icons > /dev/null 2>&1 \|\| true
33	share/locale/ja/LC_MESSAGES/gnome-im-switcher.mo
34	@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 \|\| true
35	@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 \|\| true
36	share/locale/ko/LC_MESSAGES/gnome-im-switcher.mo
37	@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 \|\| true
38	@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 \|\| true
39	share/locale/zh_CN/LC_MESSAGES/gnome-im-switcher.mo
40	@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 \|\| true
41	@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 \|\| true
42	share/locale/zh_TW/LC_MESSAGES/gnome-im-switcher.mo
43	@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 \|\| true
44	@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 \|\| true
45	share/locale/zh_HK/LC_MESSAGES/gnome-im-switcher.mo
46	@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 \|\| true
47	@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 \|\| true
48	share/locale/de/LC_MESSAGES/gnome-im-switcher.mo
49	@unexec rmdir %D/share/locale/de/LC_MESSAGES > /dev/null 2>&1 \|\| true
50	@unexec rmdir %D/share/locale/de > /dev/null 2>&1 \|\| true
51	share/locale/fr/LC_MESSAGES/gnome-im-switcher.mo
52	@unexec rmdir %D/share/locale/fr/LC_MESSAGES > /dev/null 2>&1 \|\| true
53	@unexec rmdir %D/share/locale/fr > /dev/null 2>&1 \|\| true
54	share/locale/pl/LC_MESSAGES/gnome-im-switcher.mo
55	@unexec rmdir %D/share/locale/pl/LC_MESSAGES > /dev/null 2>&1 \|\| true
56	@unexec rmdir %D/share/locale/pl > /dev/null 2>&1 \|\| true
57	share/locale/ru/LC_MESSAGES/gnome-im-switcher.mo
58	@unexec rmdir %D/share/locale/ru/LC_MESSAGES > /dev/null 2>&1 \|\| true
59	@unexec rmdir %D/share/locale/ru > /dev/null 2>&1 \|\| true
60	share/locale/es/LC_MESSAGES/gnome-im-switcher.mo
61	@unexec rmdir %D/share/locale/es/LC_MESSAGES > /dev/null 2>&1 \|\| true
62	@unexec rmdir %D/share/locale/es > /dev/null 2>&1 \|\| true
63	share/locale/it/LC_MESSAGES/gnome-im-switcher.mo
64	@unexec rmdir %D/share/locale/it/LC_MESSAGES > /dev/null 2>&1 \|\| true
65	@unexec rmdir %D/share/locale/it > /dev/null 2>&1 \|\| true
66	share/locale/pt_BR/LC_MESSAGES/gnome-im-switcher.mo
67	@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES > /dev/null 2>&1 \|\| true
68	@unexec rmdir %D/share/locale/pt_BR > /dev/null 2>&1 \|\| true
69	share/locale/sv/LC_MESSAGES/gnome-im-switcher.mo
70	@unexec rmdir %D/share/locale/sv/LC_MESSAGES > /dev/null 2>&1 \|\| true
71	@unexec rmdir %D/share/locale/sv > /dev/null 2>&1 \|\| true
72	share/locale/cs/LC_MESSAGES/gnome-im-switcher.mo
73	@unexec rmdir %D/share/locale/cs/LC_MESSAGES > /dev/null 2>&1 \|\| true
74	@unexec rmdir %D/share/locale/cs > /dev/null 2>&1 \|\| true
75	share/locale/hu/LC_MESSAGES/gnome-im-switcher.mo
76	@unexec rmdir %D/share/locale/hu/LC_MESSAGES > /dev/null 2>&1 \|\| true
77	@unexec rmdir %D/share/locale/hu > /dev/null 2>&1 \|\| true
78	share/locale/bn/LC_MESSAGES/gnome-im-switcher.mo
79	@unexec rmdir %D/share/locale/bn/LC_MESSAGES > /dev/null 2>&1 \|\| true
80	@unexec rmdir %D/share/locale/bn > /dev/null 2>&1 \|\| true
81	share/locale/gu/LC_MESSAGES/gnome-im-switcher.mo
82	@unexec rmdir %D/share/locale/gu/LC_MESSAGES > /dev/null 2>&1 \|\| true
83	@unexec rmdir %D/share/locale/gu > /dev/null 2>&1 \|\| true
84	share/locale/hi/LC_MESSAGES/gnome-im-switcher.mo
85	@unexec rmdir %D/share/locale/hi/LC_MESSAGES > /dev/null 2>&1 \|\| true
86	@unexec rmdir %D/share/locale/hi > /dev/null 2>&1 \|\| true
87	share/locale/pa/LC_MESSAGES/gnome-im-switcher.mo
88	@unexec rmdir %D/share/locale/pa/LC_MESSAGES > /dev/null 2>&1 \|\| true
89	@unexec rmdir %D/share/locale/pa > /dev/null 2>&1 \|\| true
90	share/locale/ta/LC_MESSAGES/gnome-im-switcher.mo
91	@unexec rmdir %D/share/locale/ta/LC_MESSAGES > /dev/null 2>&1 \|\| true
92	@unexec rmdir %D/share/locale/ta > /dev/null 2>&1 \|\| true

Lines 6-80 Link Here

(-)ports/textproc/iiimf-gtk/Makefile (-40 / +25 lines)
6	#	6	#
7		7
8	PORTNAME= gtk	8	PORTNAME= gtk
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 2
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= Internet/Intranet Input Method Server Framework	17	COMMENT= Internet/Intranet Input Method Server Framework
19		18
20	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \	19	LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
21	iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib	20	iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
		21
		22	ONLY_FOR_ARCHS= i386
22		23
23	USE_X_PREFIX= yes	24	USE_X_PREFIX= yes
24		25
25	IIIMF_VER= r12_1-svn2002
26	USE_BZIP2= yes	26	USE_BZIP2= yes
		27	USE_ICONV= yes
27	USE_REINPLACE= yes	28	USE_REINPLACE= yes
28	USE_GETTEXT= yes	29	USE_GETTEXT= yes
29	USE_GMAKE= yes	30	USE_GMAKE= yes
30	USE_GNOME= intltool gtk20	31	USE_GNOME= intltool gtk20
31	USE_AUTOCONF_VER= 259	32	WANT_AUTOCONF_VER= 259
32	USE_AUTOHEADER_VER= 259	33	WANT_AUTOHEADER_VER= 259
33	USE_AUTOMAKE_VER= 19	34	WANT_AUTOMAKE_VER= 19
34	WANT_LIBTOOL_VER= 15	35	WANT_LIBTOOL_VER= 15
35		36
36	AUTOMAKE_ARGS+= --add-missing	37	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
37	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	38	BUILDDIR= ${WRKSRC}/iiimgcf
38
39	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf
40	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
41		39
42	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
43		41
44	.if ${OSVERSION} < 503000	42	.if ${OSVERSION} < 503000
45	IGNORE= "It is supported on FreeBSD 5.3 and later"	43	IGNORE= It is supported on FreeBSD 5.3 and later.
46	.endif	44	.endif
47		45
48	.if ${ARCH} != "i386"	46	.if defined(WITH_DEBUG)
49	IGNORE= "${ARCH} is not support."	47	CFLAGS+= -DDEBUG
50	.endif	48	.endif
51		49
52	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}	50	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
53	LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}	51	LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv -lintl ${PTHREAD_LIBS}
54	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"	52	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
55	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
56	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
57	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
58	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
59	TLZ_ARGS= --copy --force
60		53
61	post-patch:	54	post-patch:
62	${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \	55	${REINPLACE_CMD} \
63	${WRKSRC}/../acfiles/im_common.m4	56	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
64		57	-e "s,%%PREFIX%%,${PREFIX},g" \
65	pre-configure:	58	${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
66	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles	59
67	@cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS}	60	do-configure:
68	@cd ${WRKSRC} && intltoolize ${TLZ_ARGS}	61	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
69	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS}	62	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
70	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
71	-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
72	@cd ${WRKSRC} && ${REINPLACE_CMD} \
73	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
74	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
75	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
76	${LIBTOOLFILES}
77	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
78		63
79	post-install:	64	post-install:
80	${X11BASE}/bin/gtk-query-immodules-2.0 > \	65	${X11BASE}/bin/gtk-query-immodules-2.0 > \

Lines 1-21 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am (-11 / +16 lines)
1	--- iiimgcf/Makefile.am Thu Jan 15 10:51:58 2004	1	--- iiimgcf/Makefile.am.orig Thu Apr 14 05:29:08 2005
2	+++ iiimgcf/Makefile.am Thu Feb 17 22:05:59 2005	2	+++ iiimgcf/Makefile.am Tue May 17 22:33:56 2005
3	@@ -9,14 +9,13 @@	3	@@ -5,11 +5,11 @@
		4	@INTLTOOL_DESKTOP_RULE@
		5
		6	AUTOMAKE_OPTIONS = foreign
		7	-ACLOCAL_AMFLAGS = -I ../acfiles
		8	+ACLOCAL_AMFLAGS = -I /usr/local/share/aclocal -I /usr/X11R6/share/aclocal -I ../acfiles
		9
4	moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules	10	moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
5		11
6	-im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)	12	-im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
7	+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -DIMDIR="\"${IMDIR}\""	13	+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -I $(CSCONV_DIR)
8	-im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined	14	im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
9	+im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined \
10	+ -liiimcf -liiimp
11		15
12	im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \	16	im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
13	gtkimcontextiiim.c gtkimcontextiiim.h \	17	@@ -18,8 +18,7 @@
14	imiiim.c imswitcher.c imaux.c	18	imswitcher.c imswitcher.h
15	-im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \	19
		20	im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
16	- $(IM_LIBDIR)/iiimcf/libiiimcf.la \	21	- $(IM_LIBDIR)/iiimcf/libiiimcf.la \
17	- $(IM_LIBDIR)/iiimp/libiiimp.la	22	- $(IM_LIBDIR)/iiimp/libiiimp.la
18	+im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS)	23	+ -liiimp -liiimcf
19		24
20	module_LTLIBRARIES = im-iiim.la	25	module_LTLIBRARIES = im-iiim.la
21		26

Lines 1-27 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac (-27 lines)
1	--- iiimgcf/configure.ac.orig Tue Nov 18 12:17:57 2003
2	+++ iiimgcf/configure.ac Wed Mar 2 22:59:24 2005
3	@@ -5,7 +5,6 @@
4	AC_PREREG(2.50)
5	AC_INIT(im-iiim.so, 0.5, im@OpenI18N.org)
6	dnl common initialization
7	-AC_CONFIG_AUX_DIR(../acfiles)
8	IM_INIT(..)
9
10	AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
11	@@ -63,13 +62,13 @@
12	COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
13	CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
14	${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
15	- ${THREAD_COMMON_CXX_CFLAGS}"
16	+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
17
18	CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
19	${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
20	- ${THREAD_COMMON_CXX_CFLAGS}"
21	+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
22
23	-LDFLAGS="${COMMON_LDFLAGS}"
24	+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
25
26	dnl --------------------------------------------------------------------------------
27	dnl Section 6: compilation test

Line 0 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-iiimgcf_gtkimcontextiiim.c (+149 lines)
		1	--- iiimgcf/gtkimcontextiiim.c.orig Fri Apr 22 07:46:48 2005
		2	+++ iiimgcf/gtkimcontextiiim.c Tue May 17 23:33:11 2005
		3	@@ -39,6 +39,7 @@
		4	#include "imaux.h"
		5	#include "imswitcher.h"
		6	#include "IIIMGdkEventKey.h"
		7	+#include "iconv.h"
		8
		9	#ifdef DEBUG
		10	#define DEBUG_DO(x) (x)
		11	@@ -147,6 +148,8 @@
		12	static GdkAtom im_settings_atom = GDK_NONE;
		13	static const char *_IM_SETTINGS = "_IM_SETTINGS";
		14
		15	+static iconv_t ic_u16_to_u8 = (iconv_t)-1;
		16	+
		17	static gboolean on_status_toplevel_configure (GtkWidget *toplevel,
		18	GdkEventConfigure *event,
		19	StatusWindow *status_window);
		20	@@ -305,6 +308,7 @@
		21	return;
		22	}
		23	utf8 = utf16_to_utf8 (text);
		24	+ if (!utf8) utf8 = g_strdup("");
		25
		26	if (current_setting_enabled &&
		27	(current_setting.im_enabled == IM_OFF \|\|
		28	@@ -593,9 +597,12 @@
		29	IIIMCF_text text;
		30	gchar *utf8 = NULL;
		31	st = iiimcf_get_committed_text (c, &text);
		32	+ if (st != IIIMF_STATUS_SUCCESS) break;
		33	utf8 = utf16_to_utf8 (text);
		34	- g_signal_emit_by_name (context_iiim, "commit", utf8);
		35	- g_free (utf8);
		36	+ if (utf8) {
		37	+ g_signal_emit_by_name (context_iiim, "commit", utf8);
		38	+ g_free (utf8);
		39	+ }
		40	}
		41	break;
		42	default:
		43	@@ -936,7 +943,7 @@
		44	return;
		45	}
		46
		47	- gtk_frame_set_label(GTK_FRAME (cw->frame), title_u8);
		48	+ gtk_frame_set_label(GTK_FRAME (cw->frame), (title_u8 ? title_u8 : ""));
		49
		50	if (title_u8)
		51	g_free (title_u8);
		52	@@ -975,6 +982,7 @@
		53	if (label)
		54	label_u8 = utf16_to_utf8 (label);
		55	candidate_u8 = utf16_to_utf8 (candidate);
		56	+ if (!candidate_u8) candidate_u8 = g_strdup("");
		57	DEBUG_DO (g_message ("candidate %s", candidate_u8));
		58	if (label_u8)
		59	{
		60	@@ -997,12 +1005,9 @@
		61	gtk_tree_view_get_selection (GTK_TREE_VIEW (cw->tree));
		62	gtk_tree_selection_select_iter (selection, &iter);
		63	}
		64	- if (result)
65	- {
66	- g_free (result);
67	- g_free (label_u8);
68	- }
69	- g_free (candidate_u8);
70	+ if (result) g_free(result);
71	+ if (candidate_u8) g_free (candidate_u8);
72	+ if (label_u8) g_free(label_u8);
73	}
74	gtk_widget_realize (w);
75	iiim_candidate_move (context_iiim, w);
76	@@ -1187,7 +1192,7 @@
77	w->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
78	gtk_container_set_border_width (GTK_CONTAINER (w->toplevel), 2);
79
80	- w->frame = gtk_frame_new (title_u8);
81	+ w->frame = gtk_frame_new (title_u8 ? title_u8 : "");
82	gtk_frame_set_shadow_type (GTK_FRAME (w->frame), GTK_SHADOW_ETCHED_OUT);
83
84	w->tree = gtk_tree_view_new ();
85	@@ -1539,14 +1544,52 @@
86	}
87
88	static gchar *
89	+iconv_utf16_to_utf8(const gunichar2 *utf16, int length)
90	+{
91	+ if (!utf16 \|\| 0 >= length) return g_strdup("");
92	+
93	+ if ((iconv_t)-1 == ic_u16_to_u8) {
94	+ ic_u16_to_u8 = iconv_open("UTF-8", "UTF-16");
95	+
96	+ if ((iconv_t)-1 == ic_u16_to_u8) {
97	+ fprintf(stderr, "iiimgcf: Unable to open UTF-16 -> UTF-8 converter.");
98	+ return NULL;
99	+ }
100	+ }
101	+
102	+ int inlen = length * sizeof(gunichar2);
103	+ int outlen = (length +1) * 4;
104	+ const char inbuf = (char)utf16;
105	+ char *outbuf = g_malloc0(outlen + 4);
106	+ gchar utf8 = (gchar)outbuf;
107	+
108	+ if (!outbuf) {
109	+ fprintf(stderr, "iiimgcf: Out of memory error.");
110	+ return NULL;
111	+ }
112	+
113	+ if ((size_t)-1 == iconv(ic_u16_to_u8, &inbuf, &inlen, &outbuf, &outlen)) {
114	+ fprintf(stderr, "iiimgcf: Unable to convert the string.");
115	+ g_free(utf8);
116	+ return NULL;
117	+ }
118	+
119	+ return utf8;
120	+}
121	+
122	+static gchar *
123	utf16_to_utf8 (IIIMCF_text text)
124	{
125	IIIMF_status st;
126	+
127	+ int len = 0;
128	IIIMP_card16 *u16str = NULL;
129	st = iiimcf_get_text_utf16string (text, (const IIIMP_card16 **) &u16str);
130	- return (u16str != NULL ?
131	- g_utf16_to_utf8 ((const gunichar2 *) u16str, -1, NULL, NULL, NULL) :
132	- NULL);
133	+ st = iiimcf_get_text_length(text, &len);
134	+
135	+ if (st != IIIMF_STATUS_SUCCESS) return NULL;
136	+
137	+ return iconv_utf16_to_utf8((const gunichar2 *)u16str, len);
138	}
139
140	static void
141	@@ -2094,7 +2137,7 @@
142	goto Error;
143	utf8 = utf16_to_utf8 (text);
144
145	- if (attrs)
146	+ if (attrs && utf8)
147	{
148	gint i;
149	gint j;

Lines 6-32 Link Here

(-)ports/textproc/iiimf-headers/Makefile (-7 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= headers	8	PORTNAME= headers
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	CATEGORIES= textproc	10	CATEGORIES= textproc
11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
12	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
13	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
14	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
15		15
16	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
17	COMMENT= Header files for Internet/Intranet Input Method Framework	17	COMMENT= Header files for Internet/Intranet Input Method Framework
18		18
19	IIIMF_VER= r12_1-svn2002
20	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}	19	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
21	USE_BZIP2= yes	20	USE_BZIP2= yes
22	NO_BUILD= yes	21	NO_BUILD= yes
23		22
24	do-install:	23	do-install:
25	${MKDIR} ${PREFIX}/include/iiimf	24	${MKDIR} ${PREFIX}/include/iiim
26	.for file in IMArg.h IMCharSubsets.h IMProtocolStruct.h syscfg.h threaddef.h	25	.for file in IMArg.h IMCharSubsets.h IMProtocolStruct.h syscfg.h threaddef.h
27	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiimf	26	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiim
28	.endfor	27	.endfor
29	${MKDIR} ${PREFIX}/include/iiimf/iml	28	${MKDIR} ${PREFIX}/include/iiim/iml
30	${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiimf/iml	29	${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiim/iml
31		30
32	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)ports/textproc/iiimf-headers/pkg-plist (-15 / +16 lines)
1	include/iiimf/IMArg.h	1	include/iiim/IMArg.h
2	include/iiimf/IMCharSubsets.h	2	include/iiim/IMCharSubsets.h
3	include/iiimf/IMProtocolStruct.h	3	include/iiim/IMProtocolStruct.h
4	include/iiimf/syscfg.h	4	include/iiim/syscfg.h
5	include/iiimf/threaddef.h	5	include/iiim/threaddef.h
6	include/iiimf/iml/SunIM.h	6	include/iiim/iml/SunIM.h
7	include/iiimf/iml/SunIMCore.h	7	include/iiim/iml/SunIMCore.h
8	include/iiimf/iml/SunIMLock.h	8	include/iiim/iml/SunIMLock.h
9	include/iiimf/iml/SunIMMMan.h	9	include/iiim/iml/SunIMMMan.h
10	include/iiimf/iml/SunIMMthd.h	10	include/iiim/iml/SunIMMthd.h
11	include/iiimf/iml/SunIMPriv.h	11	include/iiim/iml/SunIMPriv.h
12	include/iiimf/iml/SunIMProt.h	12	include/iiim/iml/SunIMProt.h
13	include/iiimf/iml/SunIMPub.h	13	include/iiim/iml/SunIMPub.h
14	@dirrm include/iiimf/iml	14	include/iiim/iml/iml_fop.h
15	@dirrm include/iiimf	15	@dirrm include/iiim/iml
		16	@unexec rmdir %D/include/iiim > /dev/null 2>&1 \|\| true

Lines 6-92 Link Here

(-)ports/textproc/iiimf-le-unit/Makefile (-57 / +24 lines)
6	#	6	#
7		7
8	PORTNAME= le-unit	8	PORTNAME= le-unit
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 2
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= IIIMF UNIcode Table based generic composition engine	17	COMMENT= IIIMF UNIcode Table based generic composition engine
19		18
20	RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server	19	LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
		20	iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
		21	RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
		22
		23	ONLY_FOR_ARCHS= i386
21		24
22	IIIMF_VER= r12_1-svn2002
23	USE_BZIP2= yes	25	USE_BZIP2= yes
24	USE_ICONV= yes	26	USE_ICONV= yes
25	USE_REINPLACE= yes	27	USE_REINPLACE= yes
26	USE_GMAKE= yes	28	USE_GMAKE= yes
27	USE_XLIB= yes	29	USE_XLIB= yes
28	USE_AUTOCONF_VER= 259	30	WANT_AUTOCONF_VER= 259
29	USE_AUTOHEADER_VER= 259	31	WANT_AUTOHEADER_VER= 259
30	USE_AUTOMAKE_VER= 19	32	WANT_AUTOMAKE_VER= 19
31	WANT_LIBTOOL_VER= 15	33	WANT_LIBTOOL_VER= 15
32		34
33	AUTOMAKE_ARGS+= --add-missing	35	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
34	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	36	BUILDDIR= ${WRKSRC}/leif
35
36	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif
37	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
38		37
39	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
40		39
41	.if ${OSVERSION} < 503000	40	.if ${OSVERSION} < 503000
42	IGNORE= "It is supported on FreeBSD 5.3 and later"	41	IGNORE= It is supported on FreeBSD 5.3 and later.
43	.endif
44
45	.if ${ARCH} != "i386"
46	IGNORE= "${ARCH} is not support."
47	.endif	42	.endif
48		43
49	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} \	44	CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
50	-DIMDIR="\\\"\$${IMDIR}\\\""
51	LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}	45	LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}
52	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"	46	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
53	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
54	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
55	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
56	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
57		47
58	post-patch:	48	post-patch:
59	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	49	${REINPLACE_CMD} \
60	${WRKSRC}/../acfiles/im_common.m4 \	50	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
61	${WRKSRC}/../lib/CSConv/csconv.h	51	-e "s,%%PREFIX%%,${PREFIX},g" \
62		52	${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
63	pre-configure:	53	${BUILDDIR}/../lib/EIMIL/Makefile.am
64	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles	54
65	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \	55	do-configure:
66	-I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}	56	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
67	@cd ${WRKSRC}/../lib/EIMIL && ${REINPLACE_CMD} \	57	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
68	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
69	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
70	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
71	${LIBTOOLFILES}
72	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
73	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE}
74	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
75	@cd ${WRKSRC}/../lib/EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \
76	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \
77	./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
78	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy
79	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
80	-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
81	@cd ${WRKSRC} && ${REINPLACE_CMD} \
82	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
83	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
84	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
85	${LIBTOOLFILES}
86	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
87
88	pre-build:
89	@cd ${WRKSRC}/../lib/EIMIL && \
90	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
91		58
92	.include <bsd.port.post.mk>	59	.include <bsd.port.post.mk>

Lines 1-53 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_configure.ac (-40 / +15 lines)
1	--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004	1	--- leif/configure.ac.orig Wed May 11 13:01:08 2005
2	+++ leif/configure.ac Thu Mar 24 17:47:49 2005	2	+++ leif/configure.ac Wed May 11 13:02:22 2005
3	@@ -44,15 +44,15 @@	3	@@ -75,16 +75,16 @@
4		4
5	IM_CHECK_SYSTEM	5	LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
6	IM_CHECK_DLOPEN
7	-IM_CHECK_CANNA
8	-IM_CHECK_FREEWNN
9	+dnl IM_CHECK_CANNA
10	+dnl IM_CHECK_FREEWNN
11		6
12	IM_CHECK_X	7	-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
13	-IM_CHECK_GTK	8	+LE_TARGETS="default template testEIMIL unit fop_test"
14	-IM_CHECK_MOTIF
15	-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
16	-AC_SUBST(GTK2_CFLAGS)
17	-AC_SUBST(GTK2_LIBS)
18	+dnl IM_CHECK_GTK
19	+dnl IM_CHECK_MOTIF
20	+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
21	+dnl AC_SUBST(GTK2_CFLAGS)
22	+dnl AC_SUBST(GTK2_LIBS)
23
24	dnl --------------------------------------------------------------------------------
25	dnl Section 5: compilation options
26	@@ -63,23 +63,16 @@
27
28	CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
29	${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
30	- ${THREAD_COMMON_CXX_CFLAGS}"
31	+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
32
33	CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
34	${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
35	- ${THREAD_COMMON_CXX_CFLAGS}"
36	+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
37
38	-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
39	+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
40
41	-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
42	+LE_TARGETS="default template sampleja sampleja2 sampleja3 testEIMIL unit"
43		9
44	-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)	10	-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
45	-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)	11	-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
		12	-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
46	-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)	13	-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
47	-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)	14	-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
48	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)	15	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
49	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)	16	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
50	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)	17	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
		18	+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
		19	+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
		20	+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
		21	+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
		22	+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
		23	+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
		24	+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
		25	+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
51		26
52	dnl --------------------------------------------------------------------------------	27	dnl --------------------------------------------------------------------------------
53	dnl Section 6: compilation test	28	dnl Section 6: compilation test

Lines 1-20 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c (-20 lines)
1	--- leif/sun_le_asia/common/auxwin/KeyboardConfig.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/common/auxwin/KeyboardConfig.c Wed Feb 16 20:44:10 2005
3	@@ -145,7 +145,7 @@
4	zh_CN.GBK/keyboard_layout2.txt
5	common/keyboard_layout.txt
6
7	-base directory: /usr/lib/im/locale/<locale>/
8	+base directory: /usr/local/lib/im/locale/<locale>/
9
10	*/
11	int read_keyboard_config_file(char path_name, char file_name)
12	@@ -557,7 +557,7 @@
13	nLocaleID = get_encodeid_from_locale(sLocaleName);
14
15	lang_name = (char *)get_langname_from_locale(sLocaleName);
16	- sprintf(path_name, "/usr/lib/im/locale/%s", lang_name);
17	+ sprintf(path_name, IMDIR "/locale/%s", lang_name);
18
19	DEBUG_printf("path_name:%s\n", path_name);
20

Lines 1-20 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c (-20 lines)
1	--- leif/sun_le_asia/common/leif/qjbj_punct.c Fri Mar 26 18:13:39 2004
2	+++ leif/sun_le_asia/common/leif/qjbj_punct.c Wed Feb 16 20:44:53 2005
3	@@ -384,7 +384,7 @@
4
5	lang_name = (char *)get_langname_from_langid(lang_id);
6	DEBUG_printf("lang_name:%s\n", lang_name);
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
9	DEBUG_printf("file_name:%s\n", file_name);
10
11	fd = fopen(file_name, "r");
12	@@ -441,7 +441,7 @@
13	PunctCharListByLang[lang_id].bInit = 1;
14
15	lang_name = (char *)get_langname_from_langid(lang_id);
16	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
17	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
18	DEBUG_printf("file_name:%s\n", file_name);
19
20	fd = fopen(file_name, "r");

Lines 1-14 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h (-14 lines)
1	--- leif/sun_le_korea/korean/hanja_dic.h Sat Mar 27 10:46:45 2004
2	+++ leif/sun_le_korea/korean/hanja_dic.h Wed Feb 16 20:49:10 2005
3	@@ -19,9 +19,9 @@
4
5	#define USRNAME ".usrhjd"
6	#ifdef __STDC__
7	-#define SYSPATH "/usr/lib/im/locale/ko_KR/common/data"
8	+#define SYSPATH (IMDIR "/locale/ko_KR/common/data")
9	#else
10	-#define SYSPATH "/usr/lib/im/locale/ko_KR/common/data"
11	+#define SYSPATH (IMDIR "/locale/ko_KR/common/data")
12	#endif
13	#define SYSNAME "syshjd"
14	#define NULNAME "nulhjd"

Lines 1-20 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c (-20 lines)
1	--- leif/sun_le_korea/leif/qjbj_punct.c Sat Mar 27 10:46:45 2004
2	+++ leif/sun_le_korea/leif/qjbj_punct.c Wed Feb 16 20:47:08 2005
3	@@ -350,7 +350,7 @@
4
5	lang_name = (char *)get_langname_from_langid(lang_id);
6	logf("lang_name:%s\n", lang_name);
7	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
8	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME);
9	logf("file_name:%s\n", file_name);
10
11	fd = fopen(file_name, "r");
12	@@ -407,7 +407,7 @@
13	PunctCharListByLang[lang_id].bInit = 1;
14
15	lang_name = (char *)get_langname_from_langid(lang_id);
16	- sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
17	+ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
18	logf("file_name:%s\n", file_name);
19
20	fd = fopen(file_name, "r");

Lines 1-34 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_mapfile_Makefile.am (-34 lines)
1	--- leif/unit/phonetic_im/mapfile/Makefile.am.orig Sat Apr 3 11:50:21 2004
2	+++ leif/unit/phonetic_im/mapfile/Makefile.am Wed Mar 2 20:35:05 2005
3	@@ -1,5 +1,6 @@
4	SUBDIRS = mapfile2c
5	LEX = /usr/bin/lex
6	+SED = /usr/bin/sed
7
8	MAPFILES = bengali.mapfile gurmukhi.mapfile hindi.mapfile kannada.mapfile malayalam.mapfile tamil.mapfile telugu.mapfile gujarati.mapfile
9
10	@@ -12,7 +13,7 @@
11	.l.c:
12	$(LEX) $(LFLAGS) $*.l
13	mv lex.yy.c $*.tc
14	- sed \
15	+ $(SED) \
16	-e "/^# line/d" \
17	-e "s/parse_small_token/parse_$*/g" \
18	-e "s/^void yyunput/static void yyunput/g" \
19	@@ -57,10 +58,11 @@
20	-e "s/^# define unput(c)./# define unput(c) (\--global_ptr=c)/g" \
21	-e "s/^#define unput(c)./#define unput(c) (\--global_ptr=c)/g" \
22	-e "/^#line/d" \
23	- -e "/^static char \*global_ptr\;/i\
24	-#define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
25	-#define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
26	-#define input() (\global_ptr++)" $.tc > $*.c
27	+ -e "/^static char \*global_ptr\;/{" \
28	+ -e "p" -e "s/.*/#define YY_NO_INPUT/" \
29	+ -e "p" -e "s/.*/#define YY_NO_UNPUT/" \
30	+ -e "p" -e "s/./#define input\(\) \(global_ptr++\)/" \
31	+ -e "}" $.tc > $.c
32	rm -f $*.tc
33
34	noinst_LTLIBRARIES = libphonetic_temp.la

Lines 1-86 Link Here

(-)ports/textproc/iiimf-le-unit/pkg-plist (-86 / +92 lines)
1	lib/im/leif/default.so	1	lib/iiim/le/default/default.so
2	lib/im/leif/unitle.so	2	lib/iiim/le/unitle/common/ctim.so.0
3	lib/im/locale/UNIT/AM_ET/data/amharic.data	3	lib/iiim/le/unitle/common/ctim.so
4	lib/im/locale/UNIT/ARABIC/data/arabic.data	4	lib/iiim/le/unitle/common/ctim.la
5	lib/im/locale/UNIT/BENGALI/data/inscript.data	5	lib/iiim/le/unitle/common/ctim.a
6	lib/im/locale/UNIT/BENGALI/data/probhat.data	6	lib/iiim/le/unitle/common/txt2bin
7	lib/im/locale/UNIT/BENGALI/phonetic.cfg	7	lib/iiim/le/unitle/common/bin2txt
8	lib/im/locale/UNIT/CYRILLIC/data/cyrillic.data	8	lib/iiim/le/unitle/common/search
9	lib/im/locale/UNIT/EUROPEAN/data/euro.data	9	lib/iiim/le/unitle/common/xctim.so.0
10	lib/im/locale/UNIT/GREEK/data/greek.data	10	lib/iiim/le/unitle/common/xctim.so
11	lib/im/locale/UNIT/GUJARATI/data/inscript.data	11	lib/iiim/le/unitle/common/xctim.la
12	lib/im/locale/UNIT/GUJARATI/data/phonetic.data	12	lib/iiim/le/unitle/common/xctim.a
13	lib/im/locale/UNIT/GUJARATI/phonetic.cfg	13	lib/iiim/le/unitle/common/x_txt2bin
14	lib/im/locale/UNIT/GURMUKHI/data/inscript.data	14	lib/iiim/le/unitle/common/codepoint_im.so.0
15	lib/im/locale/UNIT/GURMUKHI/data/phonetic.data	15	lib/iiim/le/unitle/common/codepoint_im.so
16	lib/im/locale/UNIT/GURMUKHI/phonetic.cfg	16	lib/iiim/le/unitle/common/codepoint_im.la
17	lib/im/locale/UNIT/HEBREW/data/hebrew.data	17	lib/iiim/le/unitle/common/codepoint_im.a
18	lib/im/locale/UNIT/HINDI/data/inscript.data	18	lib/iiim/le/unitle/HINDI/phonetic.cfg
19	lib/im/locale/UNIT/HINDI/data/phonetic.data	19	lib/iiim/le/unitle/HINDI/data/inscript.data
20	lib/im/locale/UNIT/HINDI/data/trans.data	20	lib/iiim/le/unitle/HINDI/data/trans.data
21	lib/im/locale/UNIT/HINDI/phonetic.cfg	21	lib/iiim/le/unitle/HINDI/data/phonetic.data
22	lib/im/locale/UNIT/KANNADA/data/inscript.data	22	lib/iiim/le/unitle/TAMIL/phonetic.cfg
23	lib/im/locale/UNIT/KANNADA/data/kgp.data	23	lib/iiim/le/unitle/TAMIL/data/inscript.data
24	lib/im/locale/UNIT/KANNADA/phonetic.cfg	24	lib/iiim/le/unitle/TAMIL/data/trans.data
25	lib/im/locale/UNIT/MALAYALAM/data/inscript.data	25	lib/iiim/le/unitle/TAMIL/data/phonetic.data
26	lib/im/locale/UNIT/MALAYALAM/phonetic.cfg	26	lib/iiim/le/unitle/KANNADA/phonetic.cfg
27	lib/im/locale/UNIT/TAMIL/data/inscript.data	27	lib/iiim/le/unitle/KANNADA/data/inscript.data
28	lib/im/locale/UNIT/TAMIL/data/trans.data	28	lib/iiim/le/unitle/KANNADA/data/kgp.data
29	lib/im/locale/UNIT/TAMIL/phonetic.cfg	29	lib/iiim/le/unitle/MALAYALAM/phonetic.cfg
30	lib/im/locale/UNIT/TELUGU/data/inscript.data	30	lib/iiim/le/unitle/MALAYALAM/data/inscript.data
31	lib/im/locale/UNIT/TELUGU/phonetic.cfg	31	lib/iiim/le/unitle/TELUGU/phonetic.cfg
32	lib/im/locale/UNIT/TI_ER/data/eritrean.data	32	lib/iiim/le/unitle/TELUGU/data/inscript.data
33	lib/im/locale/UNIT/UNICODE-HEX/codepoint.cfg	33	lib/iiim/le/unitle/GUJARATI/phonetic.cfg
34	lib/im/locale/UNIT/UNICODE-OCTAL/codepoint.cfg	34	lib/iiim/le/unitle/GUJARATI/data/inscript.data
35	lib/im/locale/UNIT/VIETNAMESE/data/vietnamese.data	35	lib/iiim/le/unitle/GUJARATI/data/phonetic.data
36	lib/im/locale/UNIT/common/bin2txt	36	lib/iiim/le/unitle/BENGALI/phonetic.cfg
37	lib/im/locale/UNIT/common/codepoint_im.so	37	lib/iiim/le/unitle/BENGALI/data/inscript.data
38	lib/im/locale/UNIT/common/codepoint_im.so.0	38	lib/iiim/le/unitle/BENGALI/data/probhat.data
39	lib/im/locale/UNIT/common/ctim.so	39	lib/iiim/le/unitle/GURMUKHI/phonetic.cfg
40	lib/im/locale/UNIT/common/ctim.so.0	40	lib/iiim/le/unitle/GURMUKHI/data/inscript.data
41	lib/im/locale/UNIT/common/phonetic_im.so	41	lib/iiim/le/unitle/GURMUKHI/data/phonetic.data
42	lib/im/locale/UNIT/common/phonetic_im.so.0	42	lib/iiim/le/unitle/UNICODE-HEX/codepoint.cfg
43	lib/im/locale/UNIT/common/search	43	lib/iiim/le/unitle/UNICODE-OCTAL/codepoint.cfg
44	lib/im/locale/UNIT/common/txt2bin	44	lib/iiim/le/unitle/sysime.cfg
45	lib/im/locale/UNIT/common/x_txt2bin	45	lib/iiim/le/unitle/unitle.so
46	lib/im/locale/UNIT/common/xctim.so	46	lib/iiim/le/unitle/hotkey_config.xml
47	lib/im/locale/UNIT/common/xctim.so.0	47	lib/iiim/le/unitle/EUROPEAN/data/euro.data
48	lib/im/locale/UNIT/sysime.cfg	48	lib/iiim/le/unitle/CYRILLIC/data/cyrillic.data
49	@dirrm lib/im/locale/UNIT/AM_ET/data	49	lib/iiim/le/unitle/GREEK/data/greek.data
50	@dirrm lib/im/locale/UNIT/AM_ET	50	lib/iiim/le/unitle/ARABIC/data/arabic.data
51	@dirrm lib/im/locale/UNIT/ARABIC/data	51	lib/iiim/le/unitle/HEBREW/data/hebrew.data
52	@dirrm lib/im/locale/UNIT/ARABIC	52	lib/iiim/le/unitle/VIETNAMESE/data/vietnamese.data
53	@dirrm lib/im/locale/UNIT/BENGALI/data	53	lib/iiim/le/unitle/TI_ER/data/eritrean.data
54	@dirrm lib/im/locale/UNIT/BENGALI	54	lib/iiim/le/unitle/AM_ET/data/amharic.data
55	@dirrm lib/im/locale/UNIT/CYRILLIC/data	55	@dirrm lib/iiim/le/default
56	@dirrm lib/im/locale/UNIT/CYRILLIC	56	@dirrm lib/iiim/le/unitle/common
57	@dirrm lib/im/locale/UNIT/EUROPEAN/data	57	@dirrm lib/iiim/le/unitle/HINDI/data
58	@dirrm lib/im/locale/UNIT/EUROPEAN	58	@dirrm lib/iiim/le/unitle/HINDI
59	@dirrm lib/im/locale/UNIT/GREEK/data	59	@dirrm lib/iiim/le/unitle/TAMIL/data
60	@dirrm lib/im/locale/UNIT/GREEK	60	@dirrm lib/iiim/le/unitle/TAMIL
61	@dirrm lib/im/locale/UNIT/GUJARATI/data	61	@dirrm lib/iiim/le/unitle/KANNADA/data
62	@dirrm lib/im/locale/UNIT/GUJARATI	62	@dirrm lib/iiim/le/unitle/KANNADA
63	@dirrm lib/im/locale/UNIT/GURMUKHI/data	63	@dirrm lib/iiim/le/unitle/MALAYALAM/data
64	@dirrm lib/im/locale/UNIT/GURMUKHI	64	@dirrm lib/iiim/le/unitle/MALAYALAM
65	@dirrm lib/im/locale/UNIT/HEBREW/data	65	@dirrm lib/iiim/le/unitle/TELUGU/data
66	@dirrm lib/im/locale/UNIT/HEBREW	66	@dirrm lib/iiim/le/unitle/TELUGU
67	@dirrm lib/im/locale/UNIT/HINDI/data	67	@dirrm lib/iiim/le/unitle/GUJARATI/data
68	@dirrm lib/im/locale/UNIT/HINDI	68	@dirrm lib/iiim/le/unitle/GUJARATI
69	@dirrm lib/im/locale/UNIT/KANNADA/data	69	@dirrm lib/iiim/le/unitle/BENGALI/data
70	@dirrm lib/im/locale/UNIT/KANNADA	70	@dirrm lib/iiim/le/unitle/BENGALI
71	@dirrm lib/im/locale/UNIT/MALAYALAM/data	71	@dirrm lib/iiim/le/unitle/GURMUKHI/data
72	@dirrm lib/im/locale/UNIT/MALAYALAM	72	@dirrm lib/iiim/le/unitle/GURMUKHI
73	@dirrm lib/im/locale/UNIT/TAMIL/data	73	@dirrm lib/iiim/le/unitle/UNICODE-HEX
74	@dirrm lib/im/locale/UNIT/TAMIL	74	@dirrm lib/iiim/le/unitle/UNICODE-OCTAL
75	@dirrm lib/im/locale/UNIT/TELUGU/data	75	@dirrm lib/iiim/le/unitle/EUROPEAN/data
76	@dirrm lib/im/locale/UNIT/TELUGU	76	@dirrm lib/iiim/le/unitle/EUROPEAN
77	@dirrm lib/im/locale/UNIT/TI_ER/data	77	@dirrm lib/iiim/le/unitle/CYRILLIC/data
78	@dirrm lib/im/locale/UNIT/TI_ER	78	@dirrm lib/iiim/le/unitle/CYRILLIC
79	@dirrm lib/im/locale/UNIT/UNICODE-OCTAL	79	@dirrm lib/iiim/le/unitle/GREEK/data
80	@dirrm lib/im/locale/UNIT/UNICODE-HEX	80	@dirrm lib/iiim/le/unitle/GREEK
81	@dirrm lib/im/locale/UNIT/VIETNAMESE/data	81	@dirrm lib/iiim/le/unitle/ARABIC/data
82	@dirrm lib/im/locale/UNIT/VIETNAMESE	82	@dirrm lib/iiim/le/unitle/ARABIC
83	@dirrm lib/im/locale/UNIT/common	83	@dirrm lib/iiim/le/unitle/HEBREW/data
84	@dirrm lib/im/locale/UNIT	84	@dirrm lib/iiim/le/unitle/HEBREW
85	@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 \|\| true	85	@dirrm lib/iiim/le/unitle/VIETNAMESE/data
86	@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 \|\| true	86	@dirrm lib/iiim/le/unitle/VIETNAMESE
		87	@dirrm lib/iiim/le/unitle/TI_ER/data
		88	@dirrm lib/iiim/le/unitle/TI_ER
		89	@dirrm lib/iiim/le/unitle/AM_ET/data
		90	@dirrm lib/iiim/le/unitle/AM_ET
		91	@dirrm lib/iiim/le/unitle
		92	@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 \|\| true

Lines 6-66 Link Here

(-)ports/textproc/iiimf-protocol-lib/Makefile (-34 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= protocol-lib	8	PORTNAME= protocol-lib
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 1
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= Internet/Intranet Input Method Framework protocol library	17	COMMENT= Internet/Intranet Input Method Framework protocol library
19		18
20	IIIMF_VER= r12_1-svn2002	19	ONLY_FOR_ARCHS= i386
		20
21	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
22	USE_BZIP2= yes	22	USE_BZIP2= yes
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
24	USE_GMAKE= yes	24	USE_GMAKE= yes
25	USE_AUTOCONF_VER= 259	25	WANT_AUTOCONF_VER= 259
26	USE_AUTOHEADER_VER= 259	26	WANT_AUTOHEADER_VER= 259
27	USE_AUTOMAKE_VER= 19	27	WANT_AUTOMAKE_VER= 19
28	WANT_LIBTOOL_VER= 15	28	WANT_LIBTOOL_VER= 15
29		29
30	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	30	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
31		31	BUILDDIR= ${WRKSRC}/lib/iiimp
32	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp
33	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
34		32
35	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
36		34
37	.if ${OSVERSION} < 503000	35	.if ${OSVERSION} < 503000
38	IGNORE= "It is supported on FreeBSD 5.3 and later"	36	IGNORE= It is supported on FreeBSD 5.3 and later.
39	.endif	37	.endif
40		38
41	.if ${ARCH} != "i386"	39	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
42	IGNORE= "${ARCH} is not support."
43	.endif
44
45	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
46	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
47	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
48	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
49	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
50		40
51	post-patch:	41	post-patch:
52	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	42	${REINPLACE_CMD} \
53	${WRKSRC}/../../acfiles/im_common.m4	43	-e '/^pkgconfigdir/s,$$(libdir),%%PREFIX%%/libdata,g' \
54		44	${BUILDDIR}/Makefile.am
55	pre-configure:	45	${REINPLACE_CMD} \
56	@cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles	46	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
57	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \	47	-e "s,%%PREFIX%%,${PREFIX},g" \
58	-I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}	48	${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
59	@cd ${WRKSRC} && ${REINPLACE_CMD} \	49
60	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \	50	do-configure:
61	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \	51	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
62	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \	52	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
63	${LIBTOOLFILES}
64	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
65		53
66	.include <bsd.port.post.mk>	54	.include <bsd.port.post.mk>

Lines 1-28 Link Here

(-)ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac (-28 lines)
1	--- lib/iiimp/configure.ac.orig Tue Jul 13 09:38:42 2004
2	+++ lib/iiimp/configure.ac Wed Mar 2 06:32:37 2005
3	@@ -26,7 +26,7 @@
4
5	AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
6	AM_CONFIG_HEADER(config.h)
7	-AM_PROG_LIBTOOL
8	+AC_PROG_LIBTOOL
9
10	dnl --------------------------------------------------------------------------------
11	dnl Section 2: Autoheader
12	@@ -78,13 +78,13 @@
13
14	CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
15	${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
16	- ${THREAD_COMMON_CXX_CFLAGS}"
17	+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
18
19	CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
20	${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
21	- ${THREAD_COMMON_CXX_CFLAGS}"
22	+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
23
24	-LDFLAGS="${COMMON_LDFLAGS}"
25	+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
26
27	dnl --------------------------------------------------------------------------------
28	dnl Section 6: compilation test

Lines 1-29 Link Here

(-)ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_comp-string.c (-29 lines)
1	--- lib/iiimp/data/comp-string.c Fri Nov 1 14:32:45 2002
2	+++ lib/iiimp/data/comp-string.c Wed Feb 16 22:48:21 2005
3	@@ -63,9 +63,12 @@
4	#if defined(lint) && defined(HAVE_NOTE_H)
5	NOTE(ARGUNUSED(data_s))
6	#endif /* lint && HAVE_NOTE_H */
7	- if (NULL == str) return;
8	- free(str->ptr);
9	- free(str);
10	+ if (str) {
11	+ if (str->ptr)
12	+ free(str->ptr);
13	+ str->ptr = NULL;
14	+ free(str);
15	+ }
16	return;
17	}
18
19	@@ -79,7 +82,9 @@
20	IIIMP_string * str_next;
21	for (; NULL != str; str = str_next) {
22	str_next = str->next;
23	- free(str->ptr);
24	+ if (str->ptr)
25	+ free(str->ptr);
26	+ str->ptr = NULL;
27	free(str);
28	}
29	return;

Lines 1-22 Link Here

(-)ports/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_data_im-connect.c (-22 lines)
1	--- lib/iiimp/data/im-connect.c Fri Jun 20 12:06:33 2003
2	+++ lib/iiimp/data/im-connect.c Wed Feb 16 22:43:17 2005
3	@@ -41,10 +41,15 @@
4	void
5	iiimp_connect_delete(IIIMP_data_s * data_s, IIIMP_message * m)
6	{
7	- if (NULL == m) return;
8	- iiimp_string_delete(data_s, m->v.connect.user_name);
9	- iiimp_string_list_delete(data_s, m->v.connect.auth);
10	- free(m);
11	+ if (m) {
12	+ if (m->v.connect.user_name)
13	+ iiimp_string_delete(data_s, m->v.connect.user_name);
14	+ m->v.connect.user_name = NULL;
15	+ if (m->v.connect.auth)
16	+ iiimp_string_list_delete(data_s, m->v.connect.auth);
17	+ m->v.connect.auth = NULL;
18	+ free(m);
19	+ }
20	return;
21	}
22

Lines 6-49 Link Here

(-)ports/textproc/iiimf-server/Makefile (-43 / +30 lines)
6	#	6	#
7		7
8	PORTNAME= server	8	PORTNAME= server
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= 12.2
10	PORTREVISION= 1
11	CATEGORIES= textproc	10	CATEGORIES= textproc
12	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/	11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
13	PKGNAMEPREFIX= iiimf-	12	PKGNAMEPREFIX= iiimf-
14	DISTNAME= im-sdk-src-${IIIMF_VER}	13	DISTNAME= iiimf-src-${PORTVERSION}
15	EXTRACT_SUFX= .tar.bz2	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= Internet/Intranet Input Method Server Framework	17	COMMENT= Internet/Intranet Input Method Server Framework
19		18
20	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib	19	LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
21		20
22	IIIMF_VER= r12_1-svn2002	21	ONLY_FOR_ARCHS= i386
23	USE_RC_SUBR= htt.sh	22
		23	INSTALLS_SHLIB= yes
		24	USE_RC_SUBR= iiimd.sh
24	USE_BZIP2= yes	25	USE_BZIP2= yes
25	USE_REINPLACE= yes	26	USE_REINPLACE= yes
26	USE_GMAKE= yes	27	USE_GMAKE= yes
27	USE_GNOME= pkgconfig libxml2	28	USE_GNOME= pkgconfig libxml2
28	USE_OPENSSL= yes	29	USE_OPENSSL= yes
29	USE_AUTOCONF_VER= 259	30	WANT_AUTOCONF_VER= 259
30	USE_AUTOHEADER_VER= 259	31	WANT_AUTOHEADER_VER= 259
31	USE_AUTOMAKE_VER= 19	32	WANT_AUTOMAKE_VER= 19
32	WANT_LIBTOOL_VER= 15	33	WANT_LIBTOOL_VER= 15
33		34
34	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	35	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
35		36	BUILDDIR= ${WRKSRC}/iiimsf
36	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf
37	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
38		37
39	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
40		39
41	.if ${OSVERSION} < 503000	40	.if ${OSVERSION} < 503000
42	IGNORE= "It is supported on FreeBSD 5.3 and later"	41	IGNORE= It is supported on FreeBSD 5.3 and later.
43	.endif
44
45	.if ${ARCH} != "i386"
46	IGNORE= "${ARCH} is not support."
47	.endif	42	.endif
48		43
49	.if defined(WITH_DEBUG)	44	.if defined(WITH_DEBUG)
Lines 51-83 Link Here
51	.endif	46	.endif
52		47
53	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	48	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		49	CXXFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
54	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	50	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
55	CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"	51	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
56	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
57	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
58	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
59	ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
60		52
61	post-patch:	53	post-patch:
62	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	54	${REINPLACE_CMD} \
63	${WRKSRC}/../acfiles/im_common.m4 \	55	-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
64	${WRKSRC}/src/le.xml.conf	56	-e "s,%%PREFIX%%,${PREFIX},g" \
65	${MV} ${WRKSRC}/htt.xml.conf ${WRKSRC}/htt.xml.conf.sample	57	${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
66	${MV} ${WRKSRC}/src/le.xml.conf ${WRKSRC}/src/le.xml.conf.sample	58	${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
67		59	${BUILDDIR}/src/le.xml.conf
68	pre-configure:	60	${MV} ${BUILDDIR}/iiimd.xml.conf ${BUILDDIR}/iiimd.xml.conf.sample
69	@cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles	61	${MV} ${BUILDDIR}/src/le.xml.conf ${BUILDDIR}/src/le.xml.conf.sample
70	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \	62
71	-I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}	63	do-configure:
72	@cd ${WRKSRC} && ${REINPLACE_CMD} \	64	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
73	-e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \	65	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
74	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \	66
75	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \	67	post-install:
76	${LIBTOOLFILES}	68	${INSTALL_DATA} ${BUILDDIR}/src/le.xml.conf.sample ${PREFIX}/etc/iiim/
77	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER}
78
79	post-configure:
80	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
81	${WRKSRC}/src/Makefile
82		69
83	.include <bsd.port.post.mk>	70	.include <bsd.port.post.mk>

Lines 1-21 Link Here

(-)ports/textproc/iiimf-server/files/htt.sh.in (-21 lines)
1	#!/bin/sh
2
3	# $FreeBSD: ports/textproc/iiimf-server/files/htt.sh.in,v 1.1 2005/02/28 04:17:01 daichi Exp $
4
5	# PROVIDE: htt
6	# REQUIRE: DAEMON
7	# KEYWORD: FreeBSD shutdown
8
9	prefix=%%PREFIX%%
10
11	htt_enable=${htt_enable:-"NO"}
12
13	. %%RC_SUBR%%
14
15	name="htt"
16	rcvar=`set_rcvar`
17	command="${prefix}/lib/im/htt"
18
19	load_rc_config $name
20	command_args="> /dev/null 2>&1 &"
21	run_rc_command "$1"

Lines 19-21 Link Here

(-)ports/textproc/iiimf-server/files/iiimd.sh.in (+21 lines)
19	load_rc_config $name	19	load_rc_config $name
20	command_args="> /dev/null 2>&1 &"	20	command_args="> /dev/null 2>&1 &"
21	run_rc_command "$1"	21	run_rc_command "$1"
		22	#!/bin/sh
		23
		24	# $FreeBSD: ports/textproc/iiimf-server/files/htt.sh.in,v 1.1 2005/02/28 04:17:01 daichi Exp $
		25
		26	# PROVIDE: htt
		27	# REQUIRE: DAEMON
		28	# KEYWORD: FreeBSD shutdown
		29
		30	prefix=%%PREFIX%%
		31
		32	htt_enable=${htt_enable:-"NO"}
		33
		34	. %%RC_SUBR%%
		35
		36	name="htt"
		37	rcvar=`set_rcvar`
		38	command="${prefix}/bin/iiimd"
		39
		40	load_rc_config $name
		41	command_args="> /dev/null 2>&1 &"
		42	run_rc_command "$1"