Attachment #51274 for bug #77927

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




# New ports collection makefile for:	iiimf-le-canna
# Date created:		18 Feb 2005
# Whom:			Masanori OZAWA <ozawa@ongs.co.jp>
#
# $FreeBSD$
#

PORTNAME=	le-canna
PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
CATEGORIES=	japanese
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	im-sdk-src-${IIIMF_VER}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	daichi@freebsd.org
COMMENT=	Canna Module of IIIMF LEIF

LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib\
		canna16.1:${PORTSDIR}/japanese/Canna

IIIMF_VER=	r12_1-svn2002
USE_ICONV=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_XLIB=	yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
AUTOGEN_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
		--prefix=${PREFIX}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../acfiles/im_common.m4 \
		${WRKSRC}/../lib/CSConv/csconv.h

pre-configure:
	(cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
	(cd ${WRKSRC}/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS})

.include <bsd.port.post.mk>

Line 0 Link Here

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




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- leif/autogen.sh	Thu Dec 11 15:29:55 2003
+++ leif/autogen.sh	Wed Feb 16 16:53:53 2005
@@ -6,6 +6,14 @@
 
 DIE=0
 
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
 ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
 
 if [ -n "$GNOME2_DIR" ]; then
@@ -22,7 +30,7 @@
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."
   echo "Download the appropriate package for your distribution,"
@@ -31,7 +39,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltool' installed."
     echo "You can get it from:"
@@ -41,7 +49,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -59,7 +67,7 @@
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -69,7 +77,7 @@
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -114,24 +122,24 @@
       fi
       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
         echo "Running intltoolize..."
-	intltoolize --copy --force --automake
+	${INTLTOOLIZE} --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  ${LIBTOOLIZE} --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      ${ACLOCAL} $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	${AUTOHEADER}
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --copy --gnu $am_opt
+      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      ${AUTOCONF}
     )
   fi
 done




--- leif/canna/CannaLE.c	Wed Oct 13 00:26:27 2004
+++ leif/canna/CannaLE.c	Thu Feb 17 01:55:18 2005
@@ -86,7 +86,7 @@
 
 #include <dlfcn.h>
 #include "csconv.h"
-#define CSC_PATH	"/usr/lib/im/csconv/csconv.so"
+#define CSC_PATH	"/usr/local/lib/im/csconv/csconv.so"
 #define CSC_OPEN_LOCALE	"csconv_open_locale"
 #define CSC_OPEN	"csconv_open"
 #define CSC_CONV	"csconv"
@@ -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();

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am (+11 lines)
	1	--- leif/canna/xaux/Makefile.am Mon Sep 6 17:41:11 2004
	2	+++ leif/canna/xaux/Makefile.am Wed Feb 16 14:20:49 2005
	3	@@ -10,7 +10,7 @@
	4	-g \
	5	$(NULL)
	6
	7	-AM_LDFLAGS = \
	8	+LDFLAGS = \
	9	$(THREAD_LDFLAGS) \
	10	$(NULL)
	11




--- leif/configure.ac	Wed Oct  6 23:00:36 2004
+++ leif/configure.ac	Fri Feb 18 01:19:12 2005
@@ -61,25 +61,18 @@
 IM_CONSTRUCT_FLAGS
 IM_CONSTRUCT_THREAD_FLAGS
 
 CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
-        ${THREAD_COMMON_CXX_CFLAGS}"
+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
 CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_COMMON_CXX_CFLAGS}"
+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
 
-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_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/japanese/iiimf-le-canna/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;




--- lib/EIMIL/autogen.sh	Wed May  5 02:15:22 2004
+++ lib/EIMIL/autogen.sh	Wed Feb 16 14:57:02 2005
@@ -12,7 +12,14 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +37,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +46,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +55,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +103,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




IIIMF stands for Internet/Intranet Input Method Framework.
IIIMF is designed to be the next generation of input method framework
which provides the following capabilities;

* Multiplatform, platform independent.
* Multlingual and Full UNICODE support, but satisfactory for native speakers.
* Windowing System Independent.
* Multiple language engines concurrently run.
* Multiuser.
* Distributed, lightweight clients and scalable server.
* Extensible in multiple means.
* Input method protocol efficient enough to be used over low-speed modem
  connection.
* Easy input method engine development with plugin API.
* Easy input method enabling with libiiimcf, even on console apps.
* Small core part to start from.

WWW: http://www.openi18n.org/subgroups/im/IIIMF/

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/pkg-plist (+5 lines)
	1	lib/im/leif/CannaLE.so
	2	lib/im/locale/ja/CannaLE/aux.so
	3	lib/im/locale/ja/CannaLE/auxmenu
	4	@dirrm lib/im/locale/ja/CannaLE
	5	@dirrm lib/im/locale/ja




# New ports collection makefile for:	iiimf-le-freewnn
# Date created:		18 Feb 2005
# Whom:			Masanori OZAWA <ozawa@ongs.co.jp>
#
# $FreeBSD$
#

PORTNAME=	le-freewnn
PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
CATEGORIES=	japanese
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	im-sdk-src-${IIIMF_VER}
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	daichi@freebsd.org
COMMENT=	FreeWnn Module of IIIMF LEIF

LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib\
		wnn.0:${PORTSDIR}/japanese/FreeWnn-lib

IIIMF_VER=	r12_1-svn2002
USE_ICONV=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_XLIB=	yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
AUTOGEN_ARGS+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
		--prefix=${PREFIX}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../acfiles/im_common.m4 \
		${WRKSRC}/../lib/CSConv/csconv.h

pre-configure:
	(cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
	(cd ${WRKSRC}/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS})

.include <bsd.port.post.mk>

Line 0 Link Here

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




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- leif/autogen.sh	Thu Dec 11 15:29:55 2003
+++ leif/autogen.sh	Wed Feb 16 16:53:53 2005
@@ -6,6 +6,14 @@
 
 DIE=0
 
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
 ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
 
 if [ -n "$GNOME2_DIR" ]; then
@@ -22,7 +30,7 @@
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."
   echo "Download the appropriate package for your distribution,"
@@ -31,7 +39,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltool' installed."
     echo "You can get it from:"
@@ -41,7 +49,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -59,7 +67,7 @@
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -69,7 +77,7 @@
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -114,24 +122,24 @@
       fi
       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
         echo "Running intltoolize..."
-	intltoolize --copy --force --automake
+	${INTLTOOLIZE} --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  ${LIBTOOLIZE} --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      ${ACLOCAL} $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	${AUTOHEADER}
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --copy --gnu $am_opt
+      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      ${AUTOCONF}
     )
   fi
 done




--- leif/configure.ac	Wed Oct  6 23:00:36 2004
+++ leif/configure.ac	Fri Feb 18 01:19:12 2005
@@ -61,25 +61,18 @@
 IM_CONSTRUCT_FLAGS
 IM_CONSTRUCT_THREAD_FLAGS
 
 CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
-        ${THREAD_COMMON_CXX_CFLAGS}"
+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
 CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_COMMON_CXX_CFLAGS}"
+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
 
-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_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	Sun Feb 20 14:47:50 2005
+++ leif/freewnn/Makefile.am	Sun Feb 20 14:48:49 2005
@@ -3,8 +3,8 @@
                     -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
                     -I$(IM_INCLUDEDIR)/iml \
                     -I$(CSCONV_DIR) \
-                    -I/usr/include/wnn
-FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
+                    -I/usr/local/include/wnn
+FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) -L/usr/local/lib
 FreeWnnLE_la_LIBADD = -lwnn $(THREAD_LIBS)
 FreeWnnLE_la_SOURCES = freewnn.c
 noinst_LTLIBRARIES = FreeWnnLE.la




--- leif/freewnn/freewnn.c.orig	Mon Oct  4 19:13:52 2004
+++ leif/freewnn/freewnn.c	Sun Feb 20 15:43:20 2005
@@ -59,9 +59,9 @@
 #define BUFSIZE 1024
 #endif
 
-#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
+#define WNNRCFILE "/usr/local/lib/wnn/ja_JP/wnnenvrc"
 
-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
+#define CSC_PATH "/usr/local/lib/im/csconv/csconv.so"
 #define CSC_OPEN_LOCALE "csconv_open_locale"
 #define CSC_OPEN        "csconv_open"
 #define CSC_CONV        "csconv"
@@ -163,7 +163,7 @@
   int count = 0;
 
   if( str == NULL ) return NULL;
-  if( *str == '\0' ) return NULL;
+  if( *str == '\0' ) return "";
 
   for(i=0;i<strlen(str);i++) {
     count++;
@@ -202,7 +202,7 @@
 
   if( wstr == NULL ) return NULL;
 
-  if( *wstr == 0 ) return NULL;
+  if( *wstr == 0 ) return "";
 
   for(i=0;wstr[i] != 0;i++) 
     count++;

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/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;




--- lib/EIMIL/autogen.sh	Wed May  5 02:15:22 2004
+++ lib/EIMIL/autogen.sh	Wed Feb 16 14:57:02 2005
@@ -12,7 +12,14 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +37,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +46,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +55,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +103,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




IIIMF stands for Internet/Intranet Input Method Framework.
IIIMF is designed to be the next generation of input method framework
which provides the following capabilities;

* Multiplatform, platform independent.
* Multlingual and Full UNICODE support, but satisfactory for native speakers.
* Windowing System Independent.
* Multiple language engines concurrently run.
* Multiuser.
* Distributed, lightweight clients and scalable server.
* Extensible in multiple means.
* Input method protocol efficient enough to be used over low-speed modem
  connection.
* Easy input method engine development with plugin API.
* Easy input method enabling with libiiimcf, even on console apps.
* Small core part to start from.

WWW: http://www.openi18n.org/subgroups/im/IIIMF/

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/pkg-plist (+1 lines)
	1	lib/im/leif/FreeWnnLE.so




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

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

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

IIIMF_VER=	r12_1-svn2002
WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}
INSTALL_WRKSRC=	${WRKSRC}/lib/iiimcf
USE_GMAKE=	yes
INSTALLS_SHLIB=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_ICONV=	yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
.for DIR in ${DIRS}
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/${DIR}/configure.ac
.endfor
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../../acfiles/im_common.m4

pre-configure:
	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
	${TOUCH} ${WRKSRC}/${DIR}/config.h.in
.endfor

# XXX following are dup what bsd.*.mk do. how to deal this neatly?
run-autotools:
.for DIR in ${DIRS}
	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
		${AUTOMAKE_ARGS})
	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
		${AUTOCONF_ARGS})
	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
		${AUTOHEADER_ARGS})
.endfor

patch-autotools:
.for DIR in ${DIRS}
	cd ${WRKSRC}/${DIR} && ${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}
.endfor

do-configure:
	(cd ${WRKSRC}/../EIMIL && ./autogen.sh)
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

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

pre-build:
	(cd ${WRKSRC}/../EIMIL && ${GMAKE} ${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_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
+++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
@@ -74,6 +74,11 @@
 ## Checks for thread library.
 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
+
+	case "${target}" in
+		*freebsd*) HAVE_LIBPTHREAD="yes";;
+	esac
+
 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
 		HAVE_THREAD="pthread"
 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
@@ -210,8 +215,6 @@
 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
 		;;
 	    *freebsd*)
-		THREAD_LDFLAGS="-pthread"
-		PTHREAD_LIBS=""
 		;;
 	esac
 
@@ -249,9 +252,9 @@
 		THREAD_CXX_CFLAGS="-mt"
 		HAVE_THREAD="uithread"
 		;;
-	    *freebsd*@gcc:*)
-		THREAD_LDFLAGS="-pthread"
-		THREAD_LIBS=""
+	    *freebsd*)
+		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
+		THREAD_LIBS="${PTHREAD_LIBS}"
 		HAVE_THREAD="freebsd-pthread"
 		;;
 	    *linux*)

Lines 1-11 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-Makefile.am (-11 lines)
1	--- lib/iiimcf/Makefile.am.orig Wed Aug 25 08:46:38 2004
2	+++ lib/iiimcf/Makefile.am Sun Sep 5 02:30:16 2004
3	@@ -2,7 +2,7 @@
4	SUBDIRS = . test
5	#libdir = /usr/local/lib
6	libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
7	- -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
8	+ -export-dynamic -export-symbols libiiimcf.sym -L$(LOCALBASE)/lib -liiimp
9	libiiimcf_la_CFLAGS = -DDEBUG
10	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 \




--- lib/iiimcf/test/check/Makefile.am.orig	Wed Mar 26 02:24:03 2003
+++ lib/iiimcf/test/check/Makefile.am	Wed Sep  8 17:16:00 2004
@@ -1,13 +1,13 @@
 IIIMCF_DIR = ../..
 TEST_LIBS = -L$(IIIMCF_DIR) -liiimcf \
-            -L$(IIIMCF_DIR)/../iiimp -liiimp
+            -L$(LOCALBASE)/lib -liiimp
 TEST_LIBPATH = $(IIIMCF_DIR)/.libs:$(IIIMCF_DIR)/../EIMIL/.libs:$(IIIMCF_DIR)/../iiimp/.libs
 basic_SOURCES = basic.c common.c
-basic_LDADD = $(TEST_LIBS)
+basic_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
 sendkey1_SOURCES = sendkey1.c common.c
-sendkey1_LDADD = $(TEST_LIBS)
+sendkey1_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
 sendkey2_SOURCES = sendkey2.c common.c
-sendkey2_LDADD = $(TEST_LIBS)
+sendkey2_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
 noinst_PROGRAMS = basic sendkey1 sendkey2
 
 TEST_SETLDPATH = env LD_LIBRARY_PATH=$(TEST_LIBPATH):$$LD_LIBRARY_PATH

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




--- lib/EIMIL/autogen.sh	Wed May  5 02:15:22 2004
+++ lib/EIMIL/autogen.sh	Wed Feb 16 14:57:02 2005
@@ -12,7 +12,14 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +37,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +46,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +55,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +103,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




--- lib/EIMIL/test/Makefile.am.orig	Wed Sep  8 22:08:11 2004
+++ lib/EIMIL/test/Makefile.am	Wed Sep  8 22:09:19 2004
@@ -1,14 +1,14 @@
 TEST_CFLAGS = -ggdb -DDEBUG 
 EIMILLIB = -L.. -lEIMIL
-parsertest_CFLAGS = $(TEST_CFLAGS)
+parsertest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
 parsertest_SOURCES = parsertest.c
-parsertest_LDADD = $(EIMILLIB)
-arithtest_CFLAGS = $(TEST_CFLAGS)
+parsertest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
+arithtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
 arithtest_SOURCES = arithtest.c
-arithtest_LDADD = $(EIMILLIB)
-flowtest_CFLAGS = $(TEST_CFLAGS)
+arithtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
+flowtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
 flowtest_SOURCES = flowtest.c
-flowtest_LDADD = $(EIMILLIB)
+flowtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
 bin_PROGRAMS = parsertest arithtest flowtest
 
 test: parsertest arithtest flowtest




--- lib/iiimcf/Makefile.am	Wed Oct 13 18:07:24 2004
+++ lib/iiimcf/Makefile.am	Wed Feb 16 15:14:51 2005
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = . test
 #libdir = /usr/local/lib
+LDFLAGS = -lpthread -liiimp -L/usr/local/lib
 libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
-                        -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
+                        -export-dynamic -export-symbols libiiimcf.sym
 libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""
diff -urN --exclude --Makefile --exclude config.* --exclude *.m4 --exclude *.cache --exclude *.Plo im-sdk-r12_1-svn2002.orig/lib/iiimcf/Makefile.in im-sdk-r12_1-svn2002/lib/iiimcf/Makefile.in




--- lib/iiimcf/autogen.sh	Fri Jan  9 03:56:37 2004
+++ lib/iiimcf/autogen.sh	Wed Feb 16 15:06:45 2005
@@ -12,7 +12,14 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +37,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +46,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +55,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +103,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




--- 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 / +3 lines)
1	include/iiimf/iiimcf.h
2	lib/libiiimcf.so.2
3	lib/libiiimcf.so
4	lib/libiiimcf.a	1	lib/libiiimcf.a
		2	lib/libiiimcf.so
		3	lib/libiiimcf.so.2
		4	include/iiimcf.h




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

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

IIIMF_VER=	r12_1-svn2002
WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/CSConv
PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}-${IIIMF_VER}
USE_ICONV=	yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_REINPLACE=	yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=CC=gcc CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../../acfiles/im_common.m4 \
		${WRKSRC}/configure.ac \
		${WRKSRC}/aclocal.m4 \
		${WRKSRC}/csconv.h \
		${WRKSRC}/converterPI/configure.in \
		${WRKSRC}/converterPI/test/icutest4linux.c \
		${WRKSRC}/converterPI/icuconv_relay.c \
		${WRKSRC}/converterPI/configure.in \
		${WRKSRC}/converterPI/icuconv/common/config.h
	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
		${WRKSRC}/converterPI/icuconv/common/Makefile.in \
		${WRKSRC}/converterPI/icuconv/tools/toolutil/Makefile.in \
		${WRKSRC}/converter/compoundtext/Makefile.in
	${REINPLACE_CMD} -e "s,ELIBBAD,-2," \
		${WRKSRC}/converterPI/icuconv/common/icuconv.c
	${REINPLACE_CMD} -e "s,(LIBS),(LIBS) ${PTHREAD_LIBS},g" \
		${WRKSRC}/converterPI/icuconv/tools/makeconv/Makefile.in \
		${WRKSRC}/converterPI/icuconv/tools/gencnval/Makefile.in

pre-configure:
	(cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC} && ${ACLOCAL} -I ../../acfiles && ${AUTOCONF})
	(cd ${WRKSRC}/converterPI/ && ${AUTOCONF})

post-configure:
	${REINPLACE_CMD} \
		-e "s,prefix = ${PREFIX},prefix = ${PREFIX}/lib/im," \
		`${FIND} ${WRKSRC} -type f -name Makefile`

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-csconv/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:

Line 0 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in (+11 lines)
	1	--- lib/CSConv/converterPI/icuconv/common/Makefile.in Fri Jun 13 01:27:08 2003
	2	+++ lib/CSConv/converterPI/icuconv/common/Makefile.in Wed Feb 16 14:46:02 2005
	3	@@ -168,7 +168,7 @@
	4
	5	$(TARGET) : $(OBJECTS)
	6	@$(RM) $@
	7	- $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -ldl -lpthread -lm -lc
	8	+ $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -lpthread -lm -lc
	9	@$(AR) $(ARFLAGS) $(CSC_ARCHIVE) $@
	10
	11	# $(SHLIB.cc) -o $@ $^ $(LIBS)

Line 0 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in (+11 lines)
	1	--- lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in Fri Jun 13 01:27:08 2003
	2	+++ lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in Wed Feb 16 14:45:29 2005
	3	@@ -138,7 +138,7 @@
	4
	5
	6	$(TARGET) : $(OBJECTS)
	7	- $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -ldl -lpthread -lm -lc
	8	+ $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -lpthread -lm -lc
	9
	10
	11




--- lib/CSConv/configure.ac	Fri Jun 13 01:27:08 2003
+++ lib/CSConv/configure.ac	Wed Feb 16 14:41:13 2005
@@ -314,6 +314,7 @@
 AC_PATH_PROG(RM, rm)
 AC_PATH_PROG(SED, sed)
 
-AC_CHECK_LIB(c, main)
-AC_CHECK_LIB(dl, main)
 
 
 dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
@@ -294,13 +292,8 @@
 	CDEBUGFLAGS=
 	ARFLAGS=ru
 
-	if test x"${CC}" = x"gcc" ; then
-		SHLIBCFLAGS='-fpic'
-		SHLIBLDFLAGS='-shared'
-	else
-		SHLIBCFLAGS=
-		SHLIBLDFLAGS=
-	fi
+	SHLIBCFLAGS='-fpic'
+	SHLIBLDFLAGS='-shared'
 
 	csc_system_name="`uname -s`"
 	;;
@@ -314,6 +307,7 @@
 case "${host}" in
 	*solaris*) 	platform=SOLARIS ;;
 	*linux*) 	platform=LINUX ;;
+	*freebsd*)	platform=FREEBSD ;;
 esac
 AC_SUBST(platform)
 
@@ -337,6 +338,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
 
 




lib/im/csconv/big5_ct.so
lib/im/csconv/big5w_ct.so
lib/im/csconv/cns_ct.so
lib/im/csconv/cnsw_ct.so
lib/im/csconv/compoundtext/ct_de
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
@dirrm lib/im





PORTNAME=	gnome-im-switcher
PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	im-sdk-src-${IIIMF_VER}
EXTRACT_SUFX=	.tar.bz2

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

IIIMF_VER=	r12_0_1-svn1891
WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/gnome-im-switcher
USE_GNOME=	gconf2 libglade2 libgnomeui gnomepanel gnomehack
USE_REINPLACE=	yes
USE_X_PREFIX=	yes

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

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

GNU_CONFIGURE=	yes
MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../acfiles/im_common.m4
	${FIND} ${WRKSRC} -name "Makefile.am*" | ${XARGS} ${REINPLACE_CMD} -e \
		's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \
		s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \
		s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
		s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
		s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \
		s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \
		s|[(]datadir[)]/gnome/|(datadir)/|g ; \
		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'

pre-configure:
	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
	(cd ${WRKSRC} && ${TOUCH} ltconfig)
	(cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize --copy --force --automake)
	(cd ${WRKSRC} && ${LIBTOOLIZE} --force --copy)
	(cd ${WRKSRC} && ${ACLOCAL} -I ../acfiles -I /usr/local/share/aclocal)
	(cd ${WRKSRC} && ${AUTOHEADER})
	(cd ${WRKSRC} && ${AUTOMAKE} --add-missing --gnu)
	(cd ${WRKSRC} && ${AUTOCONF})

post-configure:
	${REINPLACE_CMD} -e "s,[(]libdir[)]/bonobo/server,{exec_prefix}/libdata/bonobo/server,g" \
		${WRKSRC}/src/Makefile
	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
		${WRKSRC}/help/C/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_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- gnome-im-switcher/autogen.sh	Fri Dec  5 12:25:06 2003
+++ gnome-im-switcher/autogen.sh	Wed Feb 16 16:50:27 2005
@@ -13,15 +13,20 @@
 
 DIE=0
 
-AUTOMAKE=automake-1.4
-ACLOCAL=aclocal-1.4
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
 
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
         AUTOMAKE=automake
         ACLOCAL=aclocal
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "Download the appropriate package for your distribution,"
@@ -38,7 +43,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed to compile $PROJECT."
     echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
@@ -57,7 +62,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -115,22 +120,22 @@
       fi
       if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
         echo "Running intltoolize..."
-	intltoolize --copy --force --automake
+	$INTLTOOLIZE --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
 	echo "Running libtoolize..."
-	libtoolize --force --copy
+	$LIBTOOLIZE --force --copy
       fi
       echo "Running $ACLOCAL $aclocalinclude ..."
       $ACLOCAL $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	$AUTOHEADER
       fi
       echo "Running $AUTOMAKE --gnu $am_opt ..."
       $AUTOMAKE --add-missing --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      $AUTOCONF
     )
   fi
 done




--- gnome-im-switcher/src/widgets.c	Thu Oct 14 23:10:11 2004
+++ gnome-im-switcher/src/widgets.c	Wed Feb 16 16:51:26 2005
@@ -29,7 +29,11 @@
 #include <gnome.h>
 
 #include <signal.h>
+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#else
 #include <wait.h>
+#endif
 
 #include "gnome-im-switcher.h"
 #include "iiim-interface.h"




--- src/language.c.orig	Thu Apr 29 20:23:29 2004
+++ src/language.c	Wed Oct 13 22:52:28 2004
@@ -946,8 +946,8 @@
 gimlet_language_get_conversion_mode (char *iiim_lang_name)
 {
   GSList *tmp;
-  tmp = active_languages;
   GimletLanguage *lang;
+  tmp = active_languages;
 
   while (tmp != NULL)
     {




--- src/quick-access-menu.c.orig	Fri Jul 16 00:32:39 2004
+++ src/quick-access-menu.c	Wed Oct 13 23:01:48 2004
@@ -279,9 +279,9 @@
 	  GtkWidget *le_submenu;
 	  GtkWidget *le_submenu_item;
 	  GSList *legroup = NULL;
+	  int i, len;
 
 	  le_submenu = gtk_menu_new ();
-	  int i, len;
 	  len = g_list_length (lelist);
 	  le_submenu_item = gtk_radio_menu_item_new_with_label (legroup, lelist->data);
 	  legroup = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (le_submenu_item));

Lines 1-11 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-src_widgets.c (-11 lines)
1	--- src/widgets.c.orig Fri Sep 10 16:41:33 2004
2	+++ src/widgets.c Fri Sep 10 16:42:03 2004
3	@@ -29,7 +29,7 @@
4	#include <gnome.h>
5
6	#include <signal.h>
7	-#include <wait.h>
8	+#include <sys/wait.h>
9
10	#include "gnome-im-switcher.h"
11	#include "widgets.h"




IIIMF stands for Internet/Intranet Input Method Framework.
IIIMF is designed to be the next generation of input method framework
which provides the following capabilities;

* Multiplatform, platform independent.
* Multlingual and Full UNICODE support, but satisfactory for native speakers.
* Windowing System Independent.
* Multiple language engines concurrently run.
* Multiuser.
* Distributed, lightweight clients and scalable server.
* Extensible in multiple means.
* Input method protocol efficient enough to be used over low-speed modem
  connection.
* Easy input method engine development with plugin API.
* Easy input method enabling with libiiimcf, even on console apps.
* Small core part to start from.
enabling/disabling input method statur bar and candidate choice window.

WWW: http://www.openi18n.org/subgroups/im/IIIMF/





bin/gnome-im-properties
bin/gnome-im-settings-daemon
@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas >/dev/null || /usr/bin/true
etc/gconf/schemas/gnome-im-properties.schemas
@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas >/dev/null || /usr/bin/true
@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas >/dev/null || /usr/bin/true
etc/gconf/schemas/gnome-im-switcher.schemas
@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas >/dev/null || /usr/bin/true
libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
libexec/gnome-im-switcher-applet
share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
share/gnome/pixmaps/gnome-settings-im.png
share/gnome/pixmaps/gimlet-off.png
share/gnome/pixmaps/gimlet-on.png
@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
@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
@dirrm share/gnome/omf/gnome-im-switcher
share/gnome/gnome-im-switcher/glade/gnome-im-switcher.glade2
@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





PORTNAME=	gtk
PORTVERSION=	${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX=	iiimf-
DISTNAME=	im-sdk-src-${IIIMF_VER}
EXTRACT_SUFX=	.tar.bz2

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

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

USE_GNOME=	gtk20
USE_X_PREFIX=	yes

IIIMF_VER=	r12_1-svn2002
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool gtk20
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

.include <bsd.port.pre.mk>

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

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../acfiles/im_common.m4
		${WRKSRC}/configure.ac \
		${WRKSRC}/imaux.c

pre-configure:
	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

post-install:
	${X11BASE}/bin/gtk-query-immodules-2.0 > \
		${X11BASE}/etc/gtk-2.0/gtk.immodules

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-gtk/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- iiimgcf/Makefile.am	Thu Jan 15 10:51:58 2004
+++ iiimgcf/Makefile.am	Thu Feb 17 22:05:59 2005
@@ -9,14 +9,13 @@
 moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
 
 im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
-im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
+im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined \
+		     -liiimcf -liiimp
 
 im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
                      gtkimcontextiiim.c gtkimcontextiiim.h \
                      imiiim.c imswitcher.c imaux.c
-im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
-                    $(IM_LIBDIR)/iiimcf/libiiimcf.la \
-                    $(IM_LIBDIR)/iiimp/libiiimp.la
+im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS)
 
 module_LTLIBRARIES = im-iiim.la
 




--- iiimgcf/autogen.sh	Thu Dec 11 17:29:28 2003
+++ iiimgcf/autogen.sh	Wed Feb 16 16:48:14 2005
@@ -12,7 +12,15 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +38,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +47,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +56,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +104,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




--- iiimgcf/configure.ac	Tue Nov 18 12:17:57 2003
+++ iiimgcf/configure.ac	Thu Feb 17 15:26:50 2005
@@ -63,13 +63,13 @@
 COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
 CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
-        ${THREAD_COMMON_CXX_CFLAGS}"
+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
 CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_COMMON_CXX_CFLAGS}"
+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
-LDFLAGS="${COMMON_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
 
 dnl --------------------------------------------------------------------------------
 dnl                       Section 6: compilation test

Line 0 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 "/usr/local/lib/im/"
	9
	10	#define IS_SPACE(len, ptr) ((0 < (len)) && \
	11	(('\t' == (p)) \|\| (' ' == (p))))

Line 0 Link Here

(-)ports/textproc/iiimf-gtk/pkg-plist (+3 lines)
	1	lib/gtk-2.0/2.4.0/immodules/im-iiim.so
	2	@exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
	3	@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules




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

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

BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib

IIIMF_VER=	r12_1-svn2002
WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif
BUILD_WRKSRC=	${WRKSRC}/unit
INSTALL_WRKSRC=	${WRKSRC}/unit
USE_ICONV=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_XLIB=	yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX" SED=gsed
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../acfiles/im_common.m4 \
		${WRKSRC}/../lib/CSConv/csconv.h
		${WRKSRC}/unit/include/unit_input.h \
		${WRKSRC}/unit/phonetic_im/phonetic_im.c

pre-configure:
	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
	(cd ${WRKSRC} && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC}/../lib/EIMIL && ./autogen.sh)
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

pre-build:
	(cd ${WRKSRC}/../lib/EIMIL && ${GMAKE} ${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_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- leif/autogen.sh	Thu Dec 11 15:29:55 2003
+++ leif/autogen.sh	Wed Feb 16 16:53:53 2005
@@ -6,6 +6,14 @@
 
 DIE=0
 
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
 ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
 
 if [ -n "$GNOME2_DIR" ]; then
@@ -22,7 +30,7 @@
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."
   echo "Download the appropriate package for your distribution,"
@@ -31,7 +39,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltool' installed."
     echo "You can get it from:"
@@ -41,7 +49,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -59,7 +67,7 @@
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -69,7 +77,7 @@
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -114,24 +122,24 @@
       fi
       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
         echo "Running intltoolize..."
-	intltoolize --copy --force --automake
+	${INTLTOOLIZE} --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  ${LIBTOOLIZE} --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      ${ACLOCAL} $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	${AUTOHEADER}
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --copy --gnu $am_opt
+      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      ${AUTOCONF}
     )
   fi
 done




--- leif/configure.ac	Wed Oct  6 23:00:36 2004
+++ leif/configure.ac	Thu Feb 17 23:32:54 2005
@@ -61,20 +61,20 @@
 IM_CONSTRUCT_FLAGS
 IM_CONSTRUCT_THREAD_FLAGS
 IM_INIT(..)
+m4_pattern_allow([AM_ET])
 
 CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
-        ${THREAD_COMMON_CXX_CFLAGS}"
+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
 CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_COMMON_CXX_CFLAGS}"
+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
 
 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)
+dnl IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+dnl IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
 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)

Line 0 Link Here

(-)ports/textproc/iiimf-le-unit/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 = "/usr/local/lib/im/locale/zh_CN/newpy/newpy_obj.jar"; /* path */
	9	#endif
	10
	11	l->signature = "";

Line 0 Link Here

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

Line 0 Link Here

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

Line 0 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 = "/usr/local/lib/im/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;

Line 0 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 "/usr/local/lib/im/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) {

Line 0 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:/usr/local/lib/im/locale/ja/sampleja3/help/"
	9
	10	#endif /* !XAUX_EXT_COMMON_H */
	11

Line 0 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 "/usr/local/lib/im/locale/ja/sampleja3/xaux/motif/"
	9
	10	xaux_class_t xaux_classes[AUX_CLASS_MAX + 1] = {
	11	{

Line 0 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 "/usr/local/lib/im/csconv/csconv.so"
	9	#define CSC_OPEN_LOCALE "csconv_open_locale"
	10	#define CSC_OPEN "csconv_open"
	11	#define CSC_CONV "csconv"

Line 0 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];

Line 0 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:/usr/local/lib/im/locale/ja/sampleja4/help/"
	9
	10	#endif /* !XAUX_EXT_HELP_H */

Line 0 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 = "/usr/local/lib/im/locale/ja/sampleja4/xaux";

Line 0 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 = "/usr/local/lib/im/locale/ja/sampleja/sampleja_obj.jar"; /* path */
	9	#endif
	10	l->signature = "";
	11	l->class_names = class_names;

Line 0 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 "/usr/local/lib/im/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, "/usr/local/lib/im/locale/%s", lang_name);
 
 	DEBUG_printf("path_name:%s\n", path_name);
 

Line 0 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, "/usr/local/lib/im/locale/%s", lang_name);
	9	ret = read_keyboard_config_file(path_name, DEFAULT_SYMBOLS_CONFIG_FILE);
	10	}
	11

Line 0 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, "/usr/local/lib/im/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);

Line 0 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, "/usr/local/lib/im/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);

Line 0 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, "/usr/local/lib/im/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);

Line 0 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 "/usr/local/lib/im/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, "/usr/local/lib/im/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, "/usr/local/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
 	DEBUG_printf("file_name:%s\n", file_name);
 
 	fd = fopen(file_name, "r");

Line 0 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 "/usr/local/lib/im/locale/ko_KR/"
	9
	10	CARD16 aux_utfname_palette[] = {
	11	'c','o','m','.','s','u','n','.',

Line 0 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, "/usr/local/lib/im/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		"/usr/local/lib/im/locale/ko_KR/common/data"
 #else
-#define SYSPATH		"/usr/lib/im/locale/ko_KR/common/data"
+#define SYSPATH		"/usr/local/lib/im/locale/ko_KR/common/data"
 #endif
 #define SYSNAME		"syshjd"
 #define NULNAME		"nulhjd"

Line 0 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 "/usr/local/lib/im/locale"
	9	#define DEFAULT_DICT_PATH "data"
	10	#define COMMON_ENGINE_PATH "common"
	11	#define LANGNAME "ko_KR"

Line 0 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 "/usr/local/lib/im/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, "/usr/local/lib/im/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, "/usr/local/lib/im/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME);
 	logf("file_name:%s\n", file_name);
 
 	fd = fopen(file_name, "r");

Line 0 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 ("/usr/local/lib/im/locale/ko_KR/common/data/hhdict",
	9	&trees, &n_trees);
	10	mthd_return = dictionary_search_hanja_candidates_in_utf16
	11	(ga, &n_candidates, &cand );

Line 0 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 "/usr/local/lib/im/locale/th_TH/"
	9
	10	CARD16 aux_utfname_palette[] = {
	11	'c','o','m','.','s','u','n','.',

Line 0 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, "/usr/local/lib/im/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);

Line 0 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, "/usr/local/lib/im/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);

Line 0 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 = "/usr/local/lib/im/locale/th_TH/thai_keymap.cfg";
	9	TThaiKeymapList *pThaiKeymapList = &gThaiKeymapList;
	10
	11	DEBUG_printf("if_le_OpenIF ====\n");

Line 0 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 "/usr/local/lib/im/locale/zh_CN/"
	9
	10	CARD16 aux_utfname_palette[] = {
	11	'c','o','m','.','s','u','n','.',

Line 0 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, "/usr/local/lib/im/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);

Line 0 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 "/usr/local/lib/im/locale/zh_CN/common/data"
	9
	10	JINT nGlobalSpMode; /* ZRM, CStar, ABC */
	11

Line 0 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 "/usr/local/lib/im/locale/zh_HK/"
	9
	10	CARD16 aux_utfname_palette[] = {
	11	'c','o','m','.','s','u','n','.',

Line 0 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 "/usr/local/lib/im/locale/zh_HK/common/data"
	9
	10	typedef struct _CizuItem {
	11	UCHAR szLine[CIZU_ITEM_LEN]; /* Org Line read from file */

Line 0 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 "/usr/local/lib/im/locale/zh_TW/"
	9
	10	CARD16 aux_utfname_palette[] = {
	11	'c','o','m','.','s','u','n','.',

Line 0 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c (+11 lines)
	1	--- leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_config.c Fri Mar 26 18:13:39 2004
	2	+++ leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_config.c Wed Feb 16 20:46:10 2005
	3	@@ -63,7 +63,7 @@
	4	The format of Dayi configure file as follow:
	5
	6	[ base_dir ]
	7	-path=/usr/lib/im/locale/zh_TW
	8	+path=/usr/lcoal/lib/im/locale/zh_TW
	9
	10	[ data_file ]
	11	file=data/dayi.data

Line 0 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, "/usr/local/lib/im/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);

Line 0 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 "/usr/local/lib/im/locale/zh_TW/common/data"
	9
	10	typedef struct _CizuItem {
	11	UCHAR szLine[CIZU_ITEM_LEN]; /* Org Line read from file */

Line 0 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c (+11 lines)
	1	--- leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_config.c Fri Mar 26 18:13:39 2004
	2	+++ leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_config.c Wed Feb 16 20:46:28 2005
	3	@@ -64,7 +64,7 @@
	4	The format of Zhuyin configure file as follow:
	5
	6	[base_dir]
	7	-path=/usr/lib/im/locale/zh_TW
	8	+path=/usr/local/lib/im/locale/zh_TW
	9
	10	[data_file]
	11	file=data/zhuyin.data

Line 0 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, "/usr/local/lib/im/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);

Line 0 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_ude_UDEngine.c (+11 lines)
	1	--- leif/ude/UDEngine.c Fri Mar 16 00:52:22 2001
	2	+++ leif/ude/UDEngine.c Wed Feb 16 20:47:14 2005
	3	@@ -302,7 +302,7 @@
	4	l->name_length = UTFCHARLen(aux_name_panel);
	5	l->domain = "com.sun.udengine";
	6	l->scope = "udengine";
	7	- l->path = "/usr/lib/im/locale/zh_CN/udengine/udengine_obj.jar"; /* path */
	8	+ l->path = "/usr/local/lib/im/locale/zh_CN/udengine/udengine_obj.jar"; /* path */
	9	l->signature = "";
	10	l->basepath = NULL; /* only for CCDEF */
	11	l->encoding = NULL; /* only for CCDEF */

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_Xctim_Makefile.am (-10 lines)
1	--- unit/Xctim/Makefile.am.orig Wed Sep 8 02:37:17 2004
2	+++ unit/Xctim/Makefile.am Wed Sep 8 02:37:32 2004
3	@@ -1,6 +1,6 @@
4	moduledir = $(IM_LOCALEDIR)/UNIT/common
5	xctim_la_SOURCES = ctim.c codetable.c ctfilter.c keymap.c
6	-xctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
7	+xctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
8	xctim_la_LDFLAGS = -module -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
9	xctim_la_LIBADD = ../xaux_common/libxaux_common.la
10	module_LTLIBRARIES = xctim.la

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_codepoint_im_Makefile.am (-10 lines)
1	--- unit/codepoint_im/Makefile.am.orig Wed Sep 8 02:38:05 2004
2	+++ unit/codepoint_im/Makefile.am Wed Sep 8 02:38:34 2004
3	@@ -1,6 +1,6 @@
4	moduledir = $(IM_LOCALEDIR)/UNIT/common
5	codepoint_im_la_SOURCES = codepoint_im.c codepoint_table.c codepoint_filter.c
6	-codepoint_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
7	+codepoint_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
8	codepoint_im_la_LDFLAGS = -module --no-undefined -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
9	codepoint_im_la_LIBADD = ../xaux_common/libxaux_common.la
10	module_LTLIBRARIES = codepoint_im.la

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_ctim_Makefile.am (-10 lines)
1	--- unit/ctim/Makefile.am.orig Wed Sep 8 02:25:12 2004
2	+++ unit/ctim/Makefile.am Wed Sep 8 02:25:23 2004
3	@@ -1,6 +1,6 @@
4	moduledir = $(IM_LOCALEDIR)/UNIT/common
5	ctim_la_SOURCES = ctim.c codetable.c ctfilter.c keymap.c
6	-ctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
7	+ctim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
8	ctim_la_LDFLAGS = -module -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
9	ctim_la_LIBADD = ../xaux_common/libxaux_common.la
10	module_LTLIBRARIES = ctim.la

Line 0 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 "/usr/local/lib/im/locale"
	9	#define DEFAULT_DICT_PATH "data"
	10	#define COMMON_ENGINE_PATH "common"
	11	#define GENERIC_IM_TABLE_NAME "GENERIC_IM_TABLE"

Lines 1-10 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_leif_Makefile.am (-10 lines)
1	--- unit/leif/Makefile.am.orig Wed Sep 8 02:23:43 2004
2	+++ unit/leif/Makefile.am Wed Sep 8 02:24:01 2004
3	@@ -1,6 +1,6 @@
4	LE_FILES = unitle.so
5	unitle_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
6	- -I$(IM_INCLUDEDIR)/iml -I../include
7	+ -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
8	unitle_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
9	unitle_la_LIBADD = $(THREAD_LIBS) ../xaux_common/libxaux_common.la
10	unitle_la_SOURCES = define.c unit_input.c le.c \

Lines 1-11 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_Makefile.am (-11 lines)
1	--- unit/phonetic_im/Makefile.am.orig Wed Sep 8 02:40:35 2004
2	+++ unit/phonetic_im/Makefile.am Wed Sep 8 02:40:42 2004
3	@@ -1,7 +1,7 @@
4	SUBDIRS = mapfile
5	moduledir = $(IM_LOCALEDIR)/UNIT/common
6	phonetic_im_la_SOURCES = phonetic_im.c phonetic_table.c phonetic_filter.c phonetic_im.h
7	-phonetic_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include
8	+phonetic_im_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) -I$(IM_INCLUDEDIR)/iml -I../include $(X_CFLAGS)
9	phonetic_im_la_LDFLAGS = -module -rpath $(moduledir) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
10	phonetic_im_la_LIBADD = \
11	../xaux_common/libxaux_common.la \




--- leif/unit/phonetic_im/mapfile/Makefile.am	Sat Apr  3 11:50:21 2004
+++ leif/unit/phonetic_im/mapfile/Makefile.am	Wed Feb 16 17:04:08 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" \
@@ -58,9 +59,9 @@
 	-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
+	#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
+#define input() (*global_ptr++)'; cat ) > $*.c
 	rm -f  $*.tc
 
 noinst_LTLIBRARIES = libphonetic_temp.la

Lines 1-9 Link Here

(-)ports/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am (-5 / +4 lines)
1	--- unit/xaux_common/Makefile.am.orig Thu Jun 12 19:41:27 2003	1	--- leif/unit/xaux_common/Makefile.am Thu Jun 12 20:41:27 2003
2	+++ unit/xaux_common/Makefile.am Wed Sep 8 02:22:47 2004	2	+++ leif/unit/xaux_common/Makefile.am Wed Feb 16 17:01:09 2005
3	@@ -1,4 +1,5 @@	3	@@ -1,4 +1,5 @@
4	-libxaux_common_la_CFLAGS = -I../include	4	libxaux_common_la_CFLAGS = -I../include
5	+libxaux_common_la_CFLAGS = -I../include -I${LOCALBASE}/include $(X_CFLAGS)	5	+libxaux_common_la_LDFLAGS = -lintl
6	+libxaux_common_la_LIBADD = -L${LOCALBASE}/lib -liconv
7	libxaux_common_la_SOURCES = logf.c encode.c	6	libxaux_common_la_SOURCES = logf.c encode.c
8	noinst_LTLIBRARIES = libxaux_common.la	7	noinst_LTLIBRARIES = libxaux_common.la
9		8

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




--- lib/EIMIL/autogen.sh	Wed May  5 02:15:22 2004
+++ lib/EIMIL/autogen.sh	Wed Feb 16 14:57:02 2005
@@ -12,7 +12,14 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +37,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +46,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +55,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +103,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




IIIMF stands for Internet/Intranet Input Method Framework.
IIIMF is designed to be the next generation of input method framework
which provides the following capabilities;

* Multiplatform, platform independent.
* Multlingual and Full UNICODE support, but satisfactory for native speakers.
* Windowing System Independent.
* Multiple language engines concurrently run.
* Multiuser.
* Distributed, lightweight clients and scalable server.
* Extensible in multiple means.
* Input method protocol efficient enough to be used over low-speed modem
  connection.
* Easy input method engine development with plugin API.
* Easy input method enabling with libiiimcf, even on console apps.
* Small core part to start from.

WWW: http://www.openi18n.org/subgroups/im/IIIMF/





lib/im/leif/chewing.so
lib/im/leif/default.so
lib/im/leif/hangul.so
lib/im/leif/newpy.so
lib/im/leif/unitle.so
lib/im/locale/UNIT/AM_ET/data/amharic.data
lib/im/locale/UNIT/ARABIC/data/arabic.data
lib/im/locale/UNIT/BENGALI/data/inscript.data
lib/im/locale/UNIT/BENGALI/data/probhat.data
lib/im/locale/UNIT/BENGALI/phonetic.cfg
lib/im/locale/UNIT/CYRILLIC/data/cyrillic.data
lib/im/locale/UNIT/EUROPEAN/data/euro.data
lib/im/locale/UNIT/GREEK/data/greek.data
lib/im/locale/UNIT/GUJARATI/data/inscript.data
lib/im/locale/UNIT/GUJARATI/data/phonetic.data
lib/im/locale/UNIT/GUJARATI/phonetic.cfg
lib/im/locale/UNIT/GURMUKHI/data/inscript.data
lib/im/locale/UNIT/GURMUKHI/data/phonetic.data
lib/im/locale/UNIT/GURMUKHI/phonetic.cfg
lib/im/locale/UNIT/HEBREW/data/hebrew.data
lib/im/locale/UNIT/HINDI/data/inscript.data
lib/im/locale/UNIT/HINDI/data/phonetic.data
lib/im/locale/UNIT/HINDI/data/trans.data
lib/im/locale/UNIT/HINDI/phonetic.cfg
lib/im/locale/UNIT/KANNADA/data/inscript.data

lib/im/locale/UNIT/common/xctim.so
lib/im/locale/UNIT/common/xctim.so.0
lib/im/locale/UNIT/sysime.cfg
lib/im/locale/ko_KR/hangul.conf
lib/im/locale/ko_KR/tables/candidate.txt
lib/im/locale/zh_CN/newpy/aux.so
lib/im/locale/zh_CN/newpy/aux.so.0
lib/im/locale/zh_CN/newpy/aux_win
lib/im/locale/zh_CN/newpy/data/PyCiku.dat
lib/im/locale/zh_CN/newpy/data/UdCiku.dat
lib/im/locale/zh_CN/newpy/full.gif
lib/im/locale/zh_CN/newpy/gb.gif
lib/im/locale/zh_CN/newpy/gbk.gif
lib/im/locale/zh_CN/newpy/half.gif
lib/im/locale/zh_CN/newpy/help.gif
lib/im/locale/zh_CN/newpy/newpy_obj.jar
lib/libchewing.a
lib/libchewing.so
lib/libchewing.so.0
share/chewing/ch_index.dat
share/chewing/dict.dat
share/chewing/fonetree.dat
share/chewing/ph_index.dat
share/chewing/us_freq.dat
@dirrm lib/im/locale/UNIT/GUJARATI/data
@dirrm lib/im/locale/UNIT/GUJARATI
@dirrm lib/im/locale/UNIT/GREEK/data
@dirrm lib/im/locale/UNIT/GREEK
@dirrm lib/im/locale/UNIT/EUROPEAN/data
@dirrm lib/im/locale/UNIT/EUROPEAN
@dirrm lib/im/locale/UNIT/CYRILLIC/data
@dirrm lib/im/locale/UNIT/CYRILLIC
@dirrm lib/im/locale/UNIT/BENGALI/data
@dirrm lib/im/locale/UNIT/BENGALI
@dirrm lib/im/locale/UNIT/ARABIC/data
@dirrm lib/im/locale/UNIT/ARABIC
@dirrm lib/im/locale/UNIT/AM_ET/data
@dirrm lib/im/locale/UNIT/AM_ET
@dirrm lib/im/locale/UNIT/ARABIC/data
@dirrm lib/im/locale/UNIT/ARABIC
@dirrm lib/im/locale/UNIT/BENGALI/data
@dirrm lib/im/locale/UNIT/BENGALI
@dirrm lib/im/locale/UNIT/CYRILLIC/data
@dirrm lib/im/locale/UNIT/CYRILLIC
@dirrm lib/im/locale/UNIT/EUROPEAN/data
@dirrm lib/im/locale/UNIT/EUROPEAN
@dirrm lib/im/locale/UNIT/GREEK/data
@dirrm lib/im/locale/UNIT/GREEK
@dirrm lib/im/locale/UNIT/GUJARATI/data
@dirrm lib/im/locale/UNIT/GUJARATI
@dirrm lib/im/locale/UNIT/GURMUKHI/data
@dirrm lib/im/locale/UNIT/GURMUKHI
@dirrm lib/im/locale/UNIT/HEBREW/data
@dirrm lib/im/locale/UNIT/HEBREW
@dirrm lib/im/locale/UNIT/HINDI/data
@dirrm lib/im/locale/UNIT/HINDI
@dirrm lib/im/locale/UNIT/KANNADA/data
@dirrm lib/im/locale/UNIT/KANNADA
@dirrm lib/im/locale/UNIT/MALAYALAM/data
@dirrm lib/im/locale/UNIT/MALAYALAM
@dirrm lib/im/locale/UNIT/TAMIL/data
@dirrm lib/im/locale/UNIT/TAMIL
@dirrm lib/im/locale/UNIT/TELUGU/data
@dirrm lib/im/locale/UNIT/TELUGU
@dirrm lib/im/locale/UNIT/TI_ER/data
@dirrm lib/im/locale/UNIT/TI_ER
@dirrm lib/im/locale/UNIT/UNICODE-OCTAL
@dirrm lib/im/locale/UNIT/UNICODE-HEX
@dirrm lib/im/locale/UNIT/VIETNAMESE/data
@dirrm lib/im/locale/UNIT/VIETNAMESE
@dirrm lib/im/locale/UNIT/common
@dirrm lib/im/locale/UNIT
@dirrm lib/im/locale/ko_KR/tables
@dirrm lib/im/locale/ko_KR
@dirrm lib/im/locale/zh_CN/newpy/data
@dirrm lib/im/locale/zh_CN/newpy
@dirrm lib/im/locale/zh_CN
@dirrm lib/im/leif
@dirrm lib/im/locale
@dirrm share/chewing




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

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

IIIMF_VER=	r12_1-svn2002
WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/iiimp
INSTALLS_SHLIB=	yes
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../../acfiles/im_common.m4
		${WRKSRC}/configure.ac

pre-configure:
	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-protocol-lib/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- data/iiimp-dataP.h.orig	Tue Aug 24 13:38:12 2004
+++ data/iiimp-dataP.h	Wed Sep  8 23:04:47 2004
@@ -14,8 +14,13 @@
 extern "C" {
 #endif
 
+#if defined(BIG_ENDIAN) && defined(BYTE_ORDER) && (BIG_ENDIAN==BYTE_ORDER)
+#define _IT_IS_BIG_ENDIAN_LALALA_
+#elif defined(_BIG_ENDIAN) && defined(_BYTE_ORDER) && (_BIG_ENDIAN==_BYTE_ORDER)
+#define _IT_IS_BIG_ENDIAN_LALALA_
+#endif
 
-#if defined(_BIG_ENDIAN) || defined(WORDS_BIGENDIAN)
+#if defined(_IT_IS_BIG_ENDIAN_LALALA_)
 
 #define	GETU16(n, r, p, b)	(((n) = ((0 == (b)) ? \
 					 (((*((uchar_t *)(p + 0))) << 8) + \
@@ -113,7 +118,7 @@
 
 #else /* !(_BIG_ENDIAN || WORDS_BIGENDIAN) */
 
-#define	GET_SCOPE_FOR_HOTKEY(n, p, b) \	
+#define	GET_SCOPE_FOR_HOTKEY(n, p, b) \
                                    if (0 == (b)) { \
                                      if ((*((uchar_t *)(p + 1)) & 0x80)) \
                                        (n) = 1; \




--- lib/iiimp/autogen.sh	Wed Mar 24 05:43:35 2004
+++ lib/iiimp/autogen.sh	Wed Feb 16 15:03:52 2005
@@ -12,7 +12,14 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -30,7 +37,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
     echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
@@ -39,7 +46,7 @@
   }
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -48,8 +55,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -96,19 +103,19 @@
 fi
 if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
   echo "Running intltoolize..."
-  intltoolize --copy --force --automake
+  ${INTLTOOLIZE} --copy --force --automake
 fi
 
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




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




include/iiimf/iiimp/iiimp.h
include/iiimf/iiimp/iiimp-opcode.h
include/iiimf/iiimp/iiimp-keycode.h
include/iiimf/iiimp/iiimp-data.h
include/iiimf/iiimp/iiimp-character-subsets.h
lib/libiiimp.so.0
lib/libiiimp.so
lib/libiiimp.a
lib/libiiimp.so
lib/libiiimp.so.0
include/iiimp-character-subsets.h
include/iiimp-data.h
include/iiimp-keycode.h
include/iiimp-opcode.h
include/iiimp.h




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

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

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

IIIMF_VER=	r12_1-svn2002
USE_RC_SUBR=	htt.sh
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool pkgconfig libxml2
USE_OPENSSL=    yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../acfiles/im_common.m4 \
		${WRKSRC}/src/le.xml.conf
	${MV} ${WRKSRC}/htt.xml.conf ${WRKSRC}/htt.xml.conf.sample
	${MV} ${WRKSRC}/src/le.xml.conf ${WRKSRC}/src/le.xml.conf.sample

pre-configure:
	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

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_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




#!/bin/sh

# $FreeBSD$

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




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
+++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
@@ -74,6 +74,11 @@
 ## Checks for thread library.
 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
+
+	case "${target}" in
+		*freebsd*) HAVE_LIBPTHREAD="yes";;
+	esac
+
 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
 		HAVE_THREAD="pthread"
 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
@@ -210,8 +215,6 @@
 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
 		;;
 	    *freebsd*)
-		THREAD_LDFLAGS="-pthread"
-		PTHREAD_LIBS=""
 		;;
 	esac
 
@@ -249,9 +252,9 @@
 		THREAD_CXX_CFLAGS="-mt"
 		HAVE_THREAD="uithread"
 		;;
-	    *freebsd*@gcc:*)
-		THREAD_LDFLAGS="-pthread"
-		THREAD_LIBS=""
+	    *freebsd*)
+		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
+		THREAD_LIBS="${PTHREAD_LIBS}"
 		HAVE_THREAD="freebsd-pthread"
 		;;
 	    *linux*)

Lines 1-9 Link Here

(-)ports/textproc/iiimf-server/files/patch-iiimsf-src-Makefile.am (-9 lines)
1	--- iiimsf/src/Makefile.am.orig Sun Sep 5 04:47:50 2004
2	+++ iiimsf/src/Makefile.am Sun Sep 5 04:48:50 2004
3	@@ -29,5 +29,5 @@
4
5	htt_SOURCES = watchdog.c
6
7	-htt_server_LDADD = $(LIB_DIR)/iml/libiml.la $(IM_LIBDIR)/iiimp/libiiimp.la $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS)
8	+htt_server_LDADD = $(LIB_DIR)/iml/libiml.la -L$(LOCALBASE)/lib -liiimp $(SOCKET_LIBS) $(LIBCRYPT_FLAGS) $(LIBPAM_FLAGS) $(LIBWRAP_FLAGS) $(THREAD_LIBS) $(TLS_LIBS)
9	bin_PROGRAMS = htt_server htt

Line 0 Link Here

(-)ports/textproc/iiimf-server/files/patch-iiimsf_Makefile.am (+8 lines)
	1	--- iiimsf/Makefile.am.orig Sat Feb 19 03:33:28 2005
	2	+++ iiimsf/Makefile.am Sat Feb 19 03:33:48 2005
	3	@@ -2,4 +2,4 @@
	4	SUBDIRS = lib src
	5
	6	confdir = $(XMLCONFDIR)
	7	-conf_DATA = htt.xml.conf
	8	+conf_DATA = htt.xml.conf.sample src/le.xml.conf.sample




--- iiimsf/autogen.sh	Wed Mar 24 06:05:08 2004
+++ iiimsf/autogen.sh	Wed Feb 16 16:17:26 2005
@@ -6,6 +6,14 @@
 
 DIE=0
 
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
 ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
 
 if [ -n "$GNOME2_DIR" ]; then
@@ -22,7 +30,7 @@
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."
   echo "Download the appropriate package for your distribution,"
@@ -31,7 +39,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltool' installed."
     echo "You can get it from:"
@@ -41,7 +49,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -59,7 +67,7 @@
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -69,7 +77,7 @@
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -114,24 +122,24 @@
       fi
       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
         echo "Running intltoolize..."
-	intltoolize --copy --force --automake
+	${INTLTOOLIZE} --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  ${LIBTOOLIZE} --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      ${ACLOCAL} $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	${AUTOHEADER}
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --copy --gnu $am_opt
+      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      ${AUTOCONF}
     )
   fi
 done




--- iiimsf/src/IMAuth.cpp	Sun Jun 20 06:46:28 2004
+++ iiimsf/src/IMAuth.cpp	Wed Feb 16 16:21:47 2005
@@ -47,7 +47,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
+#endif
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>




--- iiimsf/src/IMSignal.cpp.orig	Sat Oct 16 10:28:13 2004
+++ iiimsf/src/IMSignal.cpp	Sun Feb 20 18:43:18 2005
@@ -1,7 +1,11 @@
 #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 << num;
-    signum = s.str();
+    s << getpid() << " " << num;
+    s >> spid >> signum;
 
     in_segv++;
 




--- 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.", "/usr/local/lib/im");
     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");
+	   "/usr/local/lib/im/leif");
 #endif
     initstr(IFNAME, "Language Engine name", "");
     initstr(PORT, "Port or service name", "9010");
@@ -115,7 +115,7 @@
     initstr(CONVERSIONKEYS, "Conversion ON keys", "<Ctrl>space");
     initstr(LABEL, "Label type", "numeric");
     initbool(SETTRIGGEROFFKEYS, "set trigger off keys", false);
-    // initstr(IMCONFIG, "/usr/lib/im/etc/im.config");
+    // initstr(IMCONFIG, "/usr/local/lib/im/etc/im.config");
     // initbool(DIRECT_XSUNIM, true);
     initstr(LOG_FACILITY, "syslog facility", "USER");
     initstr(LOG_LEVEL, "log level", "NORMAL");




--- 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("/usr/local/lib/im/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 = "/usr/local/lib/im/leif/CannaLE.so";
     xml.removemodule(mod, lang);
     /*
       for (IMModuleInfoVec::iterator i = lev->begin (); i != lev->end (); i++) {




--- iiimsf/src/Makefile.am.orig	Fri Oct 15 03:39:38 2004
+++ iiimsf/src/Makefile.am	Sun Feb 20 19:42:40 2005
@@ -22,6 +22,7 @@
 libiiimsf_la_LIBADD =		\
 	$(TLS_LIBS)		\
 	$(XML_LIBS)		\
+	-liiimp			\
 	$(NULL)
 
 sbindir = $(IMBINDIR)
@@ -56,7 +57,6 @@
 
 htt_server_LDADD =			\
 	$(LIB_DIR)/iml/libiml.la	\
-	$(IM_LIBDIR)/iiimp/libiiimp.la	\
 	$(SOCKET_LIBS)			\
 	$(LIBCRYPT_FLAGS)		\
 	$(LIBPAM_FLAGS)			\
@@ -72,7 +72,6 @@
 	$(NULL)
 iiimf_le_tools_LDADD =		\
 	$(XML_LIBS)		\
-	-ldl			\
 	libiiimsf.la		\
 	$(NULL)
 
@@ -82,6 +81,7 @@
 iiimf_segv_logger_CFLAGS =				\
 	-DLOGDIR="\"$(localstatedir)/log/iiim\""	\
 	-DDATADIR="\"$(gdbcmddir)\""			\
+	-DIMBINDIR="\"$(IMBINDIR)\""			\
 	-g						\
 	$(NULL)
 gdbcmddir = $(datadir)/iiim




Index: iiimsf/src/iwrap.c
diff -u -p iiimsf/src/iwrap.c.orig iiimsf/src/iwrap.c
--- iiimsf/src/iwrap.c.orig	Thu Sep  9 06:17:09 2004
+++ 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;
+    struct sockaddr_storage ss;
+    struct sockaddr *pname = (struct sockaddr*) &ss;
+    socklen_t size;
+
+    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 @@ authenticate_with_unix(
 #ifdef HAVE_GETPEEREID
     /* OpenBSD */
     git_t gid;
+
+    if (getpeereid(sock, &uid, &gid) != 0) {
+      return 0;
+    }
+
+#elif defined(__FreeBSD__)
+    /* FreeBSD */
+    gid_t gid = -1;
 
     if (getpeereid(sock, &uid, &gid) != 0) {
       return 0;




--- iiimsf/src/segvlogger.c.orig	Sat Oct 16 10:28:13 2004
+++ iiimsf/src/segvlogger.c	Sun Feb 20 19:43:06 2005
@@ -19,6 +19,10 @@
 #include <time.h>
 #include <dirent.h>
 
+#ifdef __FreeBSD__
+#include <sys/syslimits.h>
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -43,8 +47,8 @@
 	exit(1);
     }
 
-    snprintf(buffer, 1024, "gdb --batch --quiet --command %s/gdbcmd --pid %d",
-	     DATADIR, ppid);
+    snprintf(buffer, 1024, "gdb -batch -q -x %s/gdbcmd %s/htt_server %d",
+	     DATADIR, IMBINDIR, ppid);
 
     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="/usr/local/lib/im/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 */

Lines 1-4 Link Here

(-)ports/textproc/iiimf-server/pkg-plist (-3 / +17 lines)
1	lib/im/htt_server	1	bin/iiimf-le-tools
		2	etc/iiim/htt.xml.conf.sample
		3	etc/iiim/le.xml.conf.sample
2	lib/im/htt	4	lib/im/htt
3	lib/im/htt.conf	5	lib/im/htt_server
4	@dirrm lib/im	6	libexec/iiimf-segv-logger
		7	share/iiim/gdbcmd
		8	@dirrm etc/iiim
		9	@dirrm share/iiim
		10	@exec mkdir -p /var/log/iiim
		11	@unexec rm -f /var/log/iiim/*.log
		12	@unexec rmdir /var/log/iiim > /dev/null 2>&1 \|\| true
		13	@exec mkdir -p /var/run/iiim
		14	@unexec rm -f /var/run/iiim/.iiimp-unix/[0-9]* > /dev/null 2>&1 \|\| true
		15	@unexec rm -f /var/run/iiim/.iiimp-unix-/[0-9] > /dev/null 2>&1 \|\| true
		16	@unexec rmdir /var/run/iiim/.iiimp-unix > /dev/null 2>&1 \|\| true
		17	@unexec rmdir /var/run/iiim/.iiimp-unix-* > /dev/null 2>&1 \|\| true
		18	@unexec rmdir /var/run/iiim > /dev/null 2>&1 \|\| true




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

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

		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
RUN_DEPENDS=	${LOCALBASE}/lib/im/xiiimp.so:${PORTSDIR}/textproc/iiimf-x-lib

IIIMF_VER=	r12_1-svn2002
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_XLIB=	yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../../acfiles/im_common.m4
		${WRKSRC}/configure.ac \
		${WRKSRC}/lib/IMdkit/common/XIMPublic.cpp \
		${WRKSRC}/src/watchdog.c

pre-configure:
	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-x/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- acfiles/check_sys.m4.orig	Thu Aug 12 18:01:23 2004
+++ acfiles/check_sys.m4	Wed Sep  8 16:15:39 2004
@@ -74,6 +74,11 @@
 ## Checks for thread library.
 	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
 	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
+
+	case "${target}" in
+		*freebsd*) HAVE_LIBPTHREAD="yes";;
+	esac
+
 	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
 		HAVE_THREAD="pthread"
 	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
@@ -210,8 +215,6 @@
 		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
 		;;
 	    *freebsd*)
-		THREAD_LDFLAGS="-pthread"
-		PTHREAD_LIBS=""
 		;;
 	esac
 
@@ -249,9 +252,9 @@
 		THREAD_CXX_CFLAGS="-mt"
 		HAVE_THREAD="uithread"
 		;;
-	    *freebsd*@gcc:*)
-		THREAD_LDFLAGS="-pthread"
-		THREAD_LIBS=""
+	    *freebsd*)
+		THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
+		THREAD_LIBS="${PTHREAD_LIBS}"
 		HAVE_THREAD="freebsd-pthread"
 		;;
 	    *linux*)




--- iiimxcf/htt_xbe/autogen.sh	Wed Mar 24 04:54:26 2004
+++ iiimxcf/htt_xbe/autogen.sh	Wed Feb 16 16:34:40 2005
@@ -6,6 +6,14 @@
 
 DIE=0
 
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
 ACLOCAL_FLAGS="-I ../../acfiles $ACLOCAL_FLAGS"
 
 if [ -n "$GNOME2_DIR" ]; then
@@ -22,7 +30,7 @@
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."
   echo "Download the appropriate package for your distribution,"
@@ -31,7 +39,7 @@
 }
 
 (grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltool' installed."
     echo "You can get it from:"
@@ -41,7 +49,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -59,7 +67,7 @@
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -69,7 +77,7 @@
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -114,24 +122,24 @@
       fi
       if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
         echo "Running intltoolize..."
-	intltoolize --copy --force --automake
+	${INTLTOOLIZE} --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  ${LIBTOOLIZE} --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      ${ACLOCAL} $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	${AUTOHEADER}
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --copy --gnu $am_opt
+      ${AUTOMAKE} --add-missing --copy --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      ${AUTOCONF}
     )
   fi
 done




--- 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} -I/usr/X11R6/include"
 
 CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_COMMON_CXX_CFLAGS}"
+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/X11R6/include"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/X11R6/lib"
 
 dnl --------------------------------------------------------------------------------
 dnl                       Section 6: compilation test

Line 0 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 "/usr/local/lib/im/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) {




--- iiimxcf/htt_xbe/lib/IMdkit/Makefile.in.orig	Sat Dec  6 05:14:14 2003
+++ iiimxcf/htt_xbe/lib/IMdkit/Makefile.in	Sat Dec  6 05:52:09 2003
@@ -74,8 +74,8 @@
 LINKER = @LINKER@
 RANLIB = @RANLIB@
 
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@ @X_CFLAGS@
+CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 




--- iiimxcf/htt_xbe/src/watchdog.c	Tue Jul 13 08:25:40 2004
+++ iiimxcf/htt_xbe/src/watchdog.c	Wed Feb 16 19:12:34 2005
@@ -81,7 +81,7 @@
    * Setup the signal handlers to monitor htt_server, htt_props
    * abnormal termination
    */
+#if defined(__FreeBSD__)
+  setsid();
+#else
 #ifdef SETPGRP_VOID
   grpid = setpgrp();
 #else
   grpid = setpgrp(0, 0);
 #endif
 #define OPENWIN_MOTIF_PRELOAD_ENV "LD_PRELOAD=/usr/dt/lib/libXm.so.3"
 
-#define IMDIR "/usr/lib/im"
+#define IMDIR "/usr/local/lib/im"
@@ -708,11 +712,15 @@
      */
     sleep(1);
 
 static void     start_htt_server(int *, char *argv[]);
 static void     start_htt_props(int *, char *argv[]);
@@ -744,7 +744,11 @@
 #ifdef SETPGRP_VOID
     setpgrp();
 #else
     setpgrp(0, 0);
 #endif
+#endif
 
 #ifdef SunOS
     if (flag == OPENWIN_PATH) {
@@ -744,7 +752,11 @@
     perror("watchdog:fork\n");
     exit(errno);
   case 0:
+#ifdef __FreeBSD__
+    setsid();
+#else
     setpgrp();

Lines 1-2 Link Here

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




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

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

LIB_DEPENDS=	iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
		iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
RUN_DEPENDS=	${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv

IIIMF_VER=	r12_1-svn2002
USE_REINPLACE=  yes
USE_GMAKE=	yes
USE_GNOME=	intltool
USE_MOTIF=      yes
USE_OPENSSL=    yes
WANT_AUTOCONF_VER=253
WANT_AUTOHEADER_VER=253
WANT_AUTOMAKE_VER=15
WANT_LIBTOOL_VER=15

WRKSRC=         ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so
PATCH_WRKSRC=   ${WRKDIR}/${DISTNAME:S/src-//}

.include <bsd.port.pre.mk>

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

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

MAKE_ARGS+=	LIBTOOL="${LIBTOOL} --tag=CXX"
UPDATE_ARGS+=	ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}

post-patch:
	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		${WRKSRC}/../../acfiles/im_common.m4
		${WRKSRC}/configure.ac \
		${WRKSRC}/iiimp/iiimpAux.c \
		${WRKSRC}/iiimp/iiimpDL.c \
		${WRKSRC}/iiimp/iiimpIM.c \
		${WRKSRC}/iiimp/iiimpConv.c \
		${WRKSRC}/iiimp/csconv.h
.if ${OSVERSION} == 502010
	${REINPLACE_CMD} -e "s,-DARCH=[^ ]*,," \
		${WRKSRC}/../../acfiles/check_sys.m4
.endif

pre-configure:
	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)

do-configure:
	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)ports/textproc/iiimf-x-lib/distinfo (-2 / +2 lines)
1	MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe	1	MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
2	SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118	2	SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292




--- Makefile	Thu Apr  8 03:28:00 2004
+++ Makefile	Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
 AUTOMAKE = automake
 AUTOHEADER = autoheader
 AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
 
 CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
              $(AUTOHEADER) && \
@@ -21,7 +22,7 @@
 
 update-acfiles:
 	cd acfiles && \
-        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
+        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
         rm -f Makefile.in aclocal.m4
 
 config:




--- iiimxcf/xiiimp.so/autogen.sh	Wed Mar 24 10:15:03 2004
+++ iiimxcf/xiiimp.so/autogen.sh	Wed Feb 16 16:29:24 2005
@@ -12,7 +12,15 @@
 
 DIE=0
 
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+LIBTOOL=libtool15
+INTLTOOLIZE=intltoolize15
+LIBTOOLIZE=libtoolize15
+ACLOCAL=aclocal15
+AUTOHEADER=autoheader253
+AUTOMAKE=automake15
+AUTOCONF=autoconf253
+
+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
@@ -20,7 +28,7 @@
 	DIE=1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "libtool the appropriate package for your distribution,"
@@ -29,8 +37,8 @@
 }
 
 have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
+	automake_version=`${AUTOMAKE} --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
 	   1.2*|1.3*|1.4) 
 		;;
@@ -66,13 +74,13 @@
 # intentionally we don't call "libtoolize --force"
 # to avoid overriding ../acfiles/ltmain.h, which we don't want to happen!
 
-aclocal -I ../../acfiles $ACLOCAL_FLAGS
+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
 
 # optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+(${AUTOHEADER} --version)  < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
 
-automake -a $am_opt
-autoconf
+${AUTOMAKE} -a $am_opt
+${AUTOCONF}
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then




--- iiimxcf/xiiimp.so/configure.ac	Wed May  7 12:31:34 2003
+++ iiimxcf/xiiimp.so/configure.ac	Wed Feb 16 21:06:50 2005
@@ -71,15 +71,15 @@
 
 COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
 
 CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
-        ${THREAD_COMMON_CXX_CFLAGS}"
+        ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include"
 
 CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
-          ${THREAD_COMMON_CXX_CFLAGS}"
+          ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include"
 
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -lintl"
 
 dnl --------------------------------------------------------------------------------
 dnl                       Section 6: compilation test




--- iiimxcf/xiiimp.so/iiimp/Makefile.am	Tue Mar 23 07:37:51 2004
+++ iiimxcf/xiiimp.so/iiimp/Makefile.am	Thu Feb 17 21:32:52 2005
@@ -1,15 +1,14 @@
 moduledir = $(IMDIR)
 xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \
                    $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
-                   -I$(CSCONV_DIR)
+                   -I$(CSCONV_DIR) -I/usr/local/include -DUSE_CSCONV
 xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \
-                    -module -export-dynamic -no-undefined
+                    -module -export-dynamic -no-undefined -L/usr/local/include \
+		    -liiimcf -liiimp
 # On GNU/Linux system, libtool does not take care of -no-undefined so that
 # you have to add the following by yourself to check undefined symbols.
 #                   -Wl,-z -Wl,defs
 xiiimp_la_LIBADD = $(X_LIBS)  \
-		   $(IM_LIBDIR)/iiimcf/libiiimcf.la \
-		   $(IM_LIBDIR)/iiimp/libiiimp.la \
+ 		   -L$(LOCALBASE)/lib -liiimcf \
+		   -L$(LOCALBASE)/lib -liiimp \
                    $(DLOPEN_LIBS) $(THREAD_LIBS)
 xiiimp_la_SOURCES = \
 	genutil.c \

Line 0 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 "/usr/local/lib/im/csconv/"
	9	#endif /* !CSC_BASE_DIR_DEFAULT */
	10
	11	#define CSC_IS_PATH_ABS(path) (('/' == *(path)) \|\| \




--- iiimxcf/xiiimp.so/iiimp/iiimpAux.c	Sat Sep 11 01:41:45 2004
+++ iiimxcf/xiiimp.so/iiimp/iiimpAux.c	Wed Feb 16 20:40:57 2005
@@ -80,7 +80,7 @@
 #include "trace_message.h"
 service_set_conversion_mode(aux_t * aux, int conversion_mode)
 {
+  XVaNestedList preedit_attr;
   XIC xic = (XIC)aux->ic;
   XIMPreeditState preedit_state;
 
 
-#define AUX_BASE_DIR		"/usr/lib/im/"
+#define AUX_BASE_DIR		"/usr/local/lib/im/"
 
 #if defined(__sparcv9)
 #define SPARCV9_DIR		"sparcv9/"

Lines 1-11 Link Here

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

Line 0 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 "/usr/local/lib/im/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 "/usr/local/lib/im/locale"
 #endif
 
 #define	iscomment(ch)	((ch) == '\0' || (ch) == '#')
@@ -625,7 +625,7 @@
 	if (mod) {
 	    mod += strlen(MODIFIER);
 
-	    if (!strncmp(mod, "iiimp/", 6) || !strncmp(mod, "IIIMP/", 6)) {
+	    if (!strncasecmp(mod, "iiimp/", 6)) {
 		mod += 6;
 
 		if (index(mod, ':')) {




--- iiimp/iiimpSwitcher.c.orig	Thu Apr 29 23:04:48 2004
+++ iiimp/iiimpSwitcher.c	Wed Oct 13 21:25:32 2004
@@ -108,14 +108,16 @@
 char *
 my_stpcpy (char *dest, const char *src)
 {
+#ifndef HAVE_STPCPY
+  register char *d = dest;
+  register const char *s = src;
+#endif
+
   if (dest == NULL || src == NULL)
     return NULL;
 #ifdef HAVE_STPCPY
   return stpcpy (dest, src);
 #else
-  register char *d = dest;
-  register const char *s = src;
-
   do
     *d++ = *s;
   while (*s++ != '\0');

Lines 1-3 Link Here

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

Return to bug 77927

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/Makefile (+69 lines)
		1	# New ports collection makefile for: iiimf-le-canna
		2	# Date created: 18 Feb 2005
		3	# Whom: Masanori OZAWA <ozawa@ongs.co.jp>
		4	#
		5	# $FreeBSD$
		6	#
		7
		8	PORTNAME= le-canna
		9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
		10	CATEGORIES= japanese
		11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
		12	PKGNAMEPREFIX= iiimf-
		13	DISTNAME= im-sdk-src-${IIIMF_VER}
		14	EXTRACT_SUFX= .tar.bz2
		15
		16	MAINTAINER= daichi@freebsd.org
		17	COMMENT= Canna Module of IIIMF LEIF
		18
		19	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
		20	iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib\
		21	canna16.1:${PORTSDIR}/japanese/Canna
		22
		23	IIIMF_VER= r12_1-svn2002
		24	USE_ICONV= yes
		25	USE_REINPLACE= yes
		26	USE_GMAKE= yes
		27	USE_GNOME= intltool
		28	USE_XLIB= yes
		29	WANT_AUTOCONF_VER=253
		30	WANT_AUTOHEADER_VER=253
		31	WANT_AUTOMAKE_VER=15
		32	WANT_LIBTOOL_VER=15
		33
		34	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif
		35	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
		36
		37	.include <bsd.port.pre.mk>
		38
		39	.if ${OSVERSION} < 503000
		40	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
		46
		47	MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX"
		48	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		49	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		50	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
		51	AUTOGEN_ARGS+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		52	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		53	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
		54	--prefix=${PREFIX}
		55
		56	post-patch:
		57	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		58	${WRKSRC}/../acfiles/im_common.m4 \
		59	${WRKSRC}/../lib/CSConv/csconv.h
		60
		61	pre-configure:
		62	(cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
		63	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
		64	(cd ${WRKSRC}/ && ${TOUCH} ltconfig)
65
66	do-configure:
67	(cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS})
68
69	.include <bsd.port.post.mk>

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-Makefile (+19 lines)
	1	--- Makefile Thu Apr 8 03:28:00 2004
	2	+++ Makefile Wed Feb 16 14:09:34 2005
	3	@@ -2,6 +2,7 @@
	4	AUTOMAKE = automake
	5	AUTOHEADER = autoheader
	6	AUTOCONF = autoconf
	7	+LIBTOOLIZE = libtoolize
	8
	9	CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
	10	$(AUTOHEADER) && \
	11	@@ -21,7 +22,7 @@
	12
	13	update-acfiles:
	14	cd acfiles && \
	15	- $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
	16	+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
	17	rm -f Makefile.in aclocal.m4
	18
	19	config:

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-leif_autogen.sh (+93 lines)
		1	--- leif/autogen.sh Thu Dec 11 15:29:55 2003
		2	+++ leif/autogen.sh Wed Feb 16 16:53:53 2005
		3	@@ -6,6 +6,14 @@
		4
		5	DIE=0
		6
		7	+LIBTOOL=libtool15
		8	+INTLTOOLIZE=intltoolize
		9	+LIBTOOLIZE=libtoolize15
		10	+ACLOCAL=aclocal15
		11	+AUTOHEADER=autoheader253
		12	+AUTOMAKE=automake15
		13	+AUTOCONF=autoconf253
		14	+
		15	ACLOCAL_FLAGS="-I ../acfiles $ACLOCAL_FLAGS"
		16
		17	if [ -n "$GNOME2_DIR" ]; then
		18	@@ -22,7 +30,7 @@
		19	exit 1
		20	}
		21
		22	-(autoconf --version) < /dev/null > /dev/null 2>&1 \|\| {
		23	+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 \|\| {
		24	echo
		25	echo "Error: You must have \`autoconf' installed."
		26	echo "Download the appropriate package for your distribution,"
		27	@@ -31,7 +39,7 @@
		28	}
		29
		30	(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
		31	- (intltoolize --version) < /dev/null > /dev/null 2>&1 \|\| {
		32	+ (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 \|\| {
		33	echo
		34	echo "Error: You must have \`intltool' installed."
		35	echo "You can get it from:"
		36	@@ -41,7 +49,7 @@
		37	}
		38
		39	(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
		40	- (libtool --version) < /dev/null > /dev/null 2>&1 \|\| {
		41	+ (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 \|\| {
		42	echo
		43	echo "Error: You must have \`libtool' installed."
		44	echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
		45	@@ -59,7 +67,7 @@
		46	}
		47	}
		48
		49	-(automake --version) < /dev/null > /dev/null 2>&1 \|\| {
		50	+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 \|\| {
		51	echo
		52	echo "Error: You must have \`automake' installed."
		53	echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
		54	@@ -69,7 +77,7 @@
		55
		56
		57	# if no automake, don't bother testing for aclocal
		58	-test -n "$NO_AUTOMAKE" \|\| (aclocal --version) < /dev/null > /dev/null 2>&1 \|\| {
		59	+test -n "$NO_AUTOMAKE" \|\| (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 \|\| {
		60	echo
		61	echo "Error: Missing \`aclocal'. The version of \`automake'"
		62	echo "installed doesn't appear recent enough."
		63	@@ -114,24 +122,24 @@
		64	fi
65	if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
66	echo "Running intltoolize..."
67	- intltoolize --copy --force --automake
68	+ ${INTLTOOLIZE} --copy --force --automake
69	fi
70	if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
71	if test -z "$NO_LIBTOOLIZE" ; then
72	echo "Running libtoolize..."
73	- libtoolize --force --copy
74	+ ${LIBTOOLIZE} --force --copy
75	fi
76	fi
77	echo "Running aclocal $aclocalinclude ..."
78	- aclocal $aclocalinclude
79	+ ${ACLOCAL} $aclocalinclude
80	if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
81	echo "Running autoheader..."
82	- autoheader
83	+ ${AUTOHEADER}
84	fi
85	echo "Running automake --gnu $am_opt ..."
86	- automake --add-missing --copy --gnu $am_opt
87	+ ${AUTOMAKE} --add-missing --copy --gnu $am_opt
88	echo "Running autoconf ..."
89	- autoconf
90	+ ${AUTOCONF}
91	)
92	fi
93	done

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c (+28 lines)
	1	--- leif/canna/CannaLE.c Wed Oct 13 00:26:27 2004
	2	+++ leif/canna/CannaLE.c Thu Feb 17 01:55:18 2005
	3	@@ -86,7 +86,7 @@
	4
	5	#include <dlfcn.h>
	6	#include "csconv.h"
	7	-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
	8	+#define CSC_PATH "/usr/local/lib/im/csconv/csconv.so"
	9	#define CSC_OPEN_LOCALE "csconv_open_locale"
	10	#define CSC_OPEN "csconv_open"
	11	#define CSC_CONV "csconv"
	12	@@ -104,11 +104,11 @@
	13	char *, size_t );
	14	typedef int (* csc_close_t)(csconv_t);
	15
	16	-static void * csc_handle;
	17	-static csc_open_locale_t csc_open_locale;
	18	-static csc_open_t csc_open;
	19	-static csc_conv_t csc_conv;
	20	-static csc_close_t csc_close;
	21	+static void * csc_handle = NULL;
	22	+static csc_open_locale_t csc_open_locale = NULL;
	23	+static csc_open_t csc_open = NULL;
	24	+static csc_conv_t csc_conv = NULL;
	25	+static csc_close_t csc_close = NULL;
	26	static csconv_t csconv_cd = NULL;
	27
	28	Bool if_canna_OpenIF();

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-leif_configure.ac (+32 lines)
	1	--- leif/configure.ac Wed Oct 6 23:00:36 2004
	2	+++ leif/configure.ac Fri Feb 18 01:19:12 2005
	3	@@ -61,25 +61,18 @@
	4	IM_CONSTRUCT_FLAGS
	5	IM_CONSTRUCT_THREAD_FLAGS
	6
	7	CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
	8	${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
	9	- ${THREAD_COMMON_CXX_CFLAGS}"
	10	+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
	11
	12	CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
	13	${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
	14	- ${THREAD_COMMON_CXX_CFLAGS}"
	15	+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include"
	16
	17	-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
	18	+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib"
	19
	20	-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
	21	+LE_TARGETS="canna"
	22
	23	-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
	24	-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
	25	-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
	26	-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
	27	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
	28	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
	29	-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
	30
	31	dnl --------------------------------------------------------------------------------
	32	dnl Section 6: compilation test

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/files/patch-lib_EIMIL_autogen.sh (+72 lines)
		1	--- lib/EIMIL/autogen.sh Wed May 5 02:15:22 2004
		2	+++ lib/EIMIL/autogen.sh Wed Feb 16 14:57:02 2005
		3	@@ -12,7 +12,14 @@
		4
		5	DIE=0
		6
		7	-(libtool --version) < /dev/null > /dev/null 2>&1 \|\| {
		8	+LIBTOOL=libtool15
		9	+INTLTOOLIZE=intltoolize15
		10	+ACLOCAL=aclocal15
		11	+AUTOHEADER=autoheader253
		12	+AUTOMAKE=automake15
		13	+AUTOCONF=autoconf253
		14	+
		15	+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 \|\| {
		16	echo
		17	echo "You must have libtool installed to compile $PROJECT."
		18	echo "Install the appropriate package for your distribution,"
		19	@@ -30,7 +37,7 @@
		20	}
		21
		22	(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
		23	- (intltoolize --version) < /dev/null > /dev/null 2>&1 \|\| {
		24	+ (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 \|\| {
		25	echo
		26	echo "Error: You must have \`intltoolize' installed to compile $PKG_NAME."
		27	echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
		28	@@ -39,7 +46,7 @@
		29	}
		30	}
		31
		32	-(autoconf --version) < /dev/null > /dev/null 2>&1 \|\| {
		33	+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 \|\| {
		34	echo
		35	echo "You must have autoconf installed to compile $PROJECT."
		36	echo "libtool the appropriate package for your distribution,"
		37	@@ -48,8 +55,8 @@
		38	}
		39
		40	have_automake=false
		41	-if automake --version < /dev/null > /dev/null 2>&1 ; then
		42	- automake_version=`automake --version \| grep 'automake (GNU automake)' \| sed 's/^[^0-9]\(.\)/\1/'`
		43	+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
		44	+ automake_version=`${AUTOMAKE} --version \| grep 'automake (GNU automake)' \| sed 's/^[^0-9]\(.\)/\1/'`
		45	case $automake_version in
		46	1.2\|1.3\|1.4)
		47	;;
		48	@@ -96,19 +103,19 @@
		49	fi
		50	if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
		51	echo "Running intltoolize..."
		52	- intltoolize --copy --force --automake
		53	+ ${INTLTOOLIZE} --copy --force --automake
		54	fi
		55
		56	# intentionally we don't call "libtoolize --force"
		57	# to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
		58
		59	-aclocal -I ../../acfiles $ACLOCAL_FLAGS
		60	+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
		61
		62	# optionally feature autoheader
		63	-(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
		64	+(${AUTOHEADER} --version) < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
65
66	-automake -a $am_opt
67	-autoconf
68	+${AUTOMAKE} -a $am_opt
69	+${AUTOCONF}
70	cd $ORIGDIR
71
72	if test -z "$AUTOGEN_SUBDIR_MODE"; then

Line 0 Link Here

(-)ports/japanese/iiimf-le-canna/pkg-descr (+18 lines)
	1	IIIMF stands for Internet/Intranet Input Method Framework.
	2	IIIMF is designed to be the next generation of input method framework
	3	which provides the following capabilities;
	4
	5	* Multiplatform, platform independent.
	6	* Multlingual and Full UNICODE support, but satisfactory for native speakers.
	7	* Windowing System Independent.
	8	* Multiple language engines concurrently run.
	9	* Multiuser.
	10	* Distributed, lightweight clients and scalable server.
	11	* Extensible in multiple means.
	12	* Input method protocol efficient enough to be used over low-speed modem
	13	connection.
	14	* Easy input method engine development with plugin API.
	15	* Easy input method enabling with libiiimcf, even on console apps.
	16	* Small core part to start from.
	17
	18	WWW: http://www.openi18n.org/subgroups/im/IIIMF/

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/Makefile (+69 lines)
		1	# New ports collection makefile for: iiimf-le-freewnn
		2	# Date created: 18 Feb 2005
		3	# Whom: Masanori OZAWA <ozawa@ongs.co.jp>
		4	#
		5	# $FreeBSD$
		6	#
		7
		8	PORTNAME= le-freewnn
		9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
		10	CATEGORIES= japanese
		11	MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
		12	PKGNAMEPREFIX= iiimf-
		13	DISTNAME= im-sdk-src-${IIIMF_VER}
		14	EXTRACT_SUFX= .tar.bz2
		15
		16	MAINTAINER= daichi@freebsd.org
		17	COMMENT= FreeWnn Module of IIIMF LEIF
		18
		19	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
		20	iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib\
		21	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
		22
		23	IIIMF_VER= r12_1-svn2002
		24	USE_ICONV= yes
		25	USE_REINPLACE= yes
		26	USE_GMAKE= yes
		27	USE_GNOME= intltool
		28	USE_XLIB= yes
		29	WANT_AUTOCONF_VER=253
		30	WANT_AUTOHEADER_VER=253
		31	WANT_AUTOMAKE_VER=15
		32	WANT_LIBTOOL_VER=15
		33
		34	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif
		35	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
		36
		37	.include <bsd.port.pre.mk>
		38
		39	.if ${OSVERSION} < 503000
		40	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
		46
		47	MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX"
		48	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		49	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		50	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
		51	AUTOGEN_ARGS+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		52	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
		53	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
		54	--prefix=${PREFIX}
		55
		56	post-patch:
		57	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
		58	${WRKSRC}/../acfiles/im_common.m4 \
		59	${WRKSRC}/../lib/CSConv/csconv.h
		60
		61	pre-configure:
		62	(cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
		63	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
		64	(cd ${WRKSRC}/ && ${TOUCH} ltconfig)
65
66	do-configure:
67	(cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS})
68
69	.include <bsd.port.post.mk>

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am (+13 lines)
	1	--- leif/freewnn/Makefile.am.orig Sun Feb 20 14:47:50 2005
	2	+++ leif/freewnn/Makefile.am Sun Feb 20 14:48:49 2005
	3	@@ -3,8 +3,8 @@
	4	-DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
	5	-I$(IM_INCLUDEDIR)/iml \
	6	-I$(CSCONV_DIR) \
	7	- -I/usr/include/wnn
	8	-FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
	9	+ -I/usr/local/include/wnn
	10	+FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) -L/usr/local/lib
	11	FreeWnnLE_la_LIBADD = -lwnn $(THREAD_LIBS)
	12	FreeWnnLE_la_SOURCES = freewnn.c
	13	noinst_LTLIBRARIES = FreeWnnLE.la

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c (+32 lines)
	1	--- leif/freewnn/freewnn.c.orig Mon Oct 4 19:13:52 2004
	2	+++ leif/freewnn/freewnn.c Sun Feb 20 15:43:20 2005
	3	@@ -59,9 +59,9 @@
	4	#define BUFSIZE 1024
	5	#endif
	6
	7	-#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
	8	+#define WNNRCFILE "/usr/local/lib/wnn/ja_JP/wnnenvrc"
	9
	10	-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
	11	+#define CSC_PATH "/usr/local/lib/im/csconv/csconv.so"
	12	#define CSC_OPEN_LOCALE "csconv_open_locale"
	13	#define CSC_OPEN "csconv_open"
	14	#define CSC_CONV "csconv"
	15	@@ -163,7 +163,7 @@
	16	int count = 0;
	17
	18	if( str == NULL ) return NULL;
	19	- if( *str == '\0' ) return NULL;
	20	+ if( *str == '\0' ) return "";
	21
	22	for(i=0;i<strlen(str);i++) {
	23	count++;
	24	@@ -202,7 +202,7 @@
	25
	26	if( wstr == NULL ) return NULL;
	27
	28	- if( *wstr == 0 ) return NULL;
	29	+ if( *wstr == 0 ) return "";
	30
	31	for(i=0;wstr[i] != 0;i++)
	32	count++;

Line 0 Link Here

(-)ports/japanese/iiimf-le-freewnn/pkg-descr (+18 lines)
	1	IIIMF stands for Internet/Intranet Input Method Framework.
	2	IIIMF is designed to be the next generation of input method framework
	3	which provides the following capabilities;
	4
	5	* Multiplatform, platform independent.
	6	* Multlingual and Full UNICODE support, but satisfactory for native speakers.
	7	* Windowing System Independent.
	8	* Multiple language engines concurrently run.
	9	* Multiuser.
	10	* Distributed, lightweight clients and scalable server.
	11	* Extensible in multiple means.
	12	* Input method protocol efficient enough to be used over low-speed modem
	13	connection.
	14	* Easy input method engine development with plugin API.
	15	* Easy input method enabling with libiiimcf, even on console apps.
	16	* Small core part to start from.
	17
	18	WWW: http://www.openi18n.org/subgroups/im/IIIMF/

Lines 10-82 Link Here

(-)ports/textproc/iiimf-client-lib/Makefile (-54 / +41 lines)
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	13	DISTNAME= im-sdk-src-${IIIMF_VER}
14	DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz	14	EXTRACT_SUFX= .tar.bz2
15		15
16	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
17	COMMENT= Internet/Intranet Input Method Client Framework	17	COMMENT= Internet/Intranet Input Method Client Framework
18		18
19	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib	19	LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
20		20
21	IIIMF_VER= r12_0_1-svn1891	21	IIIMF_VER= r12_1-svn2002
22	WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}
23	INSTALL_WRKSRC= ${WRKSRC}/lib/iiimcf
24	USE_GMAKE= yes
25	INSTALLS_SHLIB= yes	22	INSTALLS_SHLIB= yes
		23	USE_REINPLACE= yes
		24	USE_GMAKE= yes
		25	USE_GNOME= intltool
26	USE_ICONV= yes	26	USE_ICONV= yes
27	USE_REINPLACE= yes	27	WANT_AUTOCONF_VER=253
28	USE_AUTOCONF_VER= 259	28	WANT_AUTOHEADER_VER=253
29	USE_AUTOHEADER_VER= 259	29	WANT_AUTOMAKE_VER=15
30	USE_AUTOMAKE_VER= 19	30	WANT_LIBTOOL_VER=15
31	USE_LIBTOOL_VER= 15	31
32	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	32	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf
33	CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \	33	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
34	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \	34
35	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"	35	.include <bsd.port.pre.mk>
36	CONFIGURE_ARGS= --includedir=${PREFIX}/include/iiimf	36
37	DIRS= lib/EIMIL lib/iiimcf	37	.if ${OSVERSION} < 503000
		38	IGNORE= "It is supported on FreeBSD 5.3 and later"
		39	.endif
		40
		41	.if ${ARCH} != "i386"
		42	IGNORE= "${ARCH} is not support."
		43	.endif
		44
		45	MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX"
		46	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		47	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		48	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
38		49
39	post-patch:	50	post-patch:
40	.for DIR in ${DIRS}
41	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
42	${WRKSRC}/${DIR}/configure.ac
43	.endfor
44	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	51	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
45	${WRKSRC}/acfiles/im_common.m4	52	${WRKSRC}/../../acfiles/im_common.m4
46		53
47	pre-configure:	54	pre-configure:
48	.for DIR in ${DIRS}	55	(cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
49	cd ${WRKSRC}/${DIR} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../../acfiles	56	(cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig)
50	${TOUCH} ${WRKSRC}/${DIR}/config.h.in
51	.endfor
52
53	# XXX following are dup what bsd.*.mk do. how to deal this neatly?
54	run-autotools:
55	.for DIR in ${DIRS}
56	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
57	${AUTOMAKE_ARGS})
58	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
59	${AUTOCONF_ARGS})
60	@(cd ${WRKSRC}/${DIR} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
61	${AUTOHEADER_ARGS})
62	.endfor
63
64	patch-autotools:
65	.for DIR in ${DIRS}
66	cd ${WRKSRC}/${DIR} && ${REINPLACE_CMD} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \
67	-e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \
68	-e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \
69	${LIBTOOLFILES}
70	.endfor
71		57
72	do-configure:	58	do-configure:
73	.for DIR in ${DIRS}	59	(cd ${WRKSRC}/../EIMIL && ./autogen.sh)
74	cd ${WRKSRC}/${DIR} && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}	60	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
75	.endfor	61
76		62	post-configure:
77	do-build:	63	${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \
78	.for DIR in ${DIRS}	64	${WRKSRC}/Makefile
79	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}	65
80	.endfor	66	pre-build:
		67	(cd ${WRKSRC}/../EIMIL && ${GMAKE} ${MAKE_ARGS})
81		68
82	.include <bsd.port.mk>	69	.include <bsd.port.post.mk>

Lines 1-36 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 (-36 lines)
1	--- acfiles/check_sys.m4.orig Thu Aug 12 18:01:23 2004
2	+++ acfiles/check_sys.m4 Wed Sep 8 16:15:39 2004
3	@@ -74,6 +74,11 @@
4	## Checks for thread library.
5	AC_CHECK_LIB(pthread, pthread_create, [ HAVE_LIBPTHREAD="yes" ])
6	AC_CHECK_LIB(thread, thr_create, [ HAVE_LIBUITHREAD="yes" ])
7	+
8	+ case "${target}" in
9	+ freebsd) HAVE_LIBPTHREAD="yes";;
10	+ esac
11	+
12	if test "X${HAVE_LIBPTHREAD}" = "Xyes" ; then
13	HAVE_THREAD="pthread"
14	elif test "X${HAVE_LIBUITHREAD}" = "Xyes" ; then
15	@@ -210,8 +215,6 @@
16	COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
17	;;
18	freebsd)
19	- THREAD_LDFLAGS="-pthread"
20	- PTHREAD_LIBS=""
21	;;
22	esac
23
24	@@ -249,9 +252,9 @@
25	THREAD_CXX_CFLAGS="-mt"
26	HAVE_THREAD="uithread"
27	;;
28	- freebsd@gcc:*)
29	- THREAD_LDFLAGS="-pthread"
30	- THREAD_LIBS=""
31	+ freebsd)
32	+ THREAD_CXX_CFLAGS="${PTHREAD_CFLAGS}"
33	+ THREAD_LIBS="${PTHREAD_LIBS}"
34	HAVE_THREAD="freebsd-pthread"
35	;;
36	linux)

Lines 1-20 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib-iiimcf-test-check-Makefile.am (-20 lines)
1	--- lib/iiimcf/test/check/Makefile.am.orig Wed Mar 26 02:24:03 2003
2	+++ lib/iiimcf/test/check/Makefile.am Wed Sep 8 17:16:00 2004
3	@@ -1,13 +1,13 @@
4	IIIMCF_DIR = ../..
5	TEST_LIBS = -L$(IIIMCF_DIR) -liiimcf \
6	- -L$(IIIMCF_DIR)/../iiimp -liiimp
7	+ -L$(LOCALBASE)/lib -liiimp
8	TEST_LIBPATH = $(IIIMCF_DIR)/.libs:$(IIIMCF_DIR)/../EIMIL/.libs:$(IIIMCF_DIR)/../iiimp/.libs
9	basic_SOURCES = basic.c common.c
10	-basic_LDADD = $(TEST_LIBS)
11	+basic_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
12	sendkey1_SOURCES = sendkey1.c common.c
13	-sendkey1_LDADD = $(TEST_LIBS)
14	+sendkey1_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
15	sendkey2_SOURCES = sendkey2.c common.c
16	-sendkey2_LDADD = $(TEST_LIBS)
17	+sendkey2_LDADD = $(TEST_LIBS) $(THREAD_LIBS)
18	noinst_PROGRAMS = basic sendkey1 sendkey2
19
20	TEST_SETLDPATH = env LD_LIBRARY_PATH=$(TEST_LIBPATH):$$LD_LIBRARY_PATH

Lines 1-23 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_EIMIL_test_Makefile.am (-23 lines)
1	--- lib/EIMIL/test/Makefile.am.orig Wed Sep 8 22:08:11 2004
2	+++ lib/EIMIL/test/Makefile.am Wed Sep 8 22:09:19 2004
3	@@ -1,14 +1,14 @@
4	TEST_CFLAGS = -ggdb -DDEBUG
5	EIMILLIB = -L.. -lEIMIL
6	-parsertest_CFLAGS = $(TEST_CFLAGS)
7	+parsertest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
8	parsertest_SOURCES = parsertest.c
9	-parsertest_LDADD = $(EIMILLIB)
10	-arithtest_CFLAGS = $(TEST_CFLAGS)
11	+parsertest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
12	+arithtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
13	arithtest_SOURCES = arithtest.c
14	-arithtest_LDADD = $(EIMILLIB)
15	-flowtest_CFLAGS = $(TEST_CFLAGS)
16	+arithtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
17	+flowtest_CFLAGS = $(TEST_CFLAGS) $(THREAD_CXX_CFLAGS)
18	flowtest_SOURCES = flowtest.c
19	-flowtest_LDADD = $(EIMILLIB)
20	+flowtest_LDADD = $(EIMILLIB) $(THREAD_LIBS)
21	bin_PROGRAMS = parsertest arithtest flowtest
22
23	test: parsertest arithtest flowtest

Line 0 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am (+12 lines)
	1	--- lib/iiimcf/Makefile.am Wed Oct 13 18:07:24 2004
	2	+++ lib/iiimcf/Makefile.am Wed Feb 16 15:14:51 2005
	3	@@ -1,6 +1,7 @@
	4	AUTOMAKE_OPTIONS = foreign
	5	SUBDIRS = . test
	6	#libdir = /usr/local/lib
	7	+LDFLAGS = -lpthread -liiimp -L/usr/local/lib
	8	libiiimcf_la_LDFLAGS = -version-info $(LIBIIIMCF_MAJOR_VERSION):$(LIBIIIMCF_MINOR_VERSION) \
	9	- -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la
	10	+ -export-dynamic -export-symbols libiiimcf.sym
	11	libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""
	12	diff -urN --exclude --Makefile --exclude config.* --exclude .m4 --exclude .cache --exclude *.Plo im-sdk-r12_1-svn2002.orig/lib/iiimcf/Makefile.in im-sdk-r12_1-svn2002/lib/iiimcf/Makefile.in

Line 0 Link Here

(-)ports/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh (+72 lines)
		1	--- lib/iiimcf/autogen.sh Fri Jan 9 03:56:37 2004
		2	+++ lib/iiimcf/autogen.sh Wed Feb 16 15:06:45 2005
		3	@@ -12,7 +12,14 @@
		4
		5	DIE=0
		6
		7	-(libtool --version) < /dev/null > /dev/null 2>&1 \|\| {
		8	+LIBTOOL=libtool15
		9	+INTLTOOLIZE=intltoolize15
		10	+ACLOCAL=aclocal15
		11	+AUTOHEADER=autoheader253
		12	+AUTOMAKE=automake15
		13	+AUTOCONF=autoconf253
		14	+
		15	+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 \|\| {
		16	echo
		17	echo "You must have libtool installed to compile $PROJECT."
		18	echo "Install the appropriate package for your distribution,"
		19	@@ -30,7 +37,7 @@
		20	}
		21
		22	(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
		23	- (intltoolize --version) < /dev/null > /dev/null 2>&1 \|\| {
		24	+ (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 \|\| {
		25	echo
		26	echo "Error: You must have \`intltoolize' installed to compile $PKG_NAME."
		27	echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
		28	@@ -39,7 +46,7 @@
		29	}
		30	}
		31
		32	-(autoconf --version) < /dev/null > /dev/null 2>&1 \|\| {
		33	+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 \|\| {
		34	echo
		35	echo "You must have autoconf installed to compile $PROJECT."
		36	echo "libtool the appropriate package for your distribution,"
		37	@@ -48,8 +55,8 @@
		38	}
		39
		40	have_automake=false
		41	-if automake --version < /dev/null > /dev/null 2>&1 ; then
		42	- automake_version=`automake --version \| grep 'automake (GNU automake)' \| sed 's/^[^0-9]\(.\)/\1/'`
		43	+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
		44	+ automake_version=`${AUTOMAKE} --version \| grep 'automake (GNU automake)' \| sed 's/^[^0-9]\(.\)/\1/'`
		45	case $automake_version in
		46	1.2\|1.3\|1.4)
		47	;;
		48	@@ -96,19 +103,19 @@
		49	fi
		50	if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
		51	echo "Running intltoolize..."
		52	- intltoolize --copy --force --automake
		53	+ ${INTLTOOLIZE} --copy --force --automake
		54	fi
		55
		56	# intentionally we don't call "libtoolize --force"
		57	# to avoid overriding ../../acfiles/ltmain.h, which we don't want to happen!
		58
		59	-aclocal -I ../../acfiles $ACLOCAL_FLAGS
		60	+${ACLOCAL} -I ../../acfiles $ACLOCAL_FLAGS
		61
		62	# optionally feature autoheader
		63	-(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
		64	+(${AUTOHEADER} --version) < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
65
66	-automake -a $am_opt
67	-autoconf
68	+${AUTOMAKE} -a $am_opt
69	+${AUTOCONF}
70	cd $ORIGDIR
71
72	if test -z "$AUTOGEN_SUBDIR_MODE"; then

Line 0 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 10-50 Link Here

(-)ports/textproc/iiimf-csconv/Makefile (-20 / +41 lines)
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	13	DISTNAME= im-sdk-src-${IIIMF_VER}
14	DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz	14	EXTRACT_SUFX= .tar.bz2
15		15
16	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
17	COMMENT= Internet/Intranet Input Method Framework encoding convert library	17	COMMENT= Internet/Intranet Input Method Framework encoding convert library
18		18
19	IIIMF_VER= r12_0_1-svn1891	19	IIIMF_VER= r12_1-svn2002
20	WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/lib/CSConv
21	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}
22	USE_ICONV= yes	20	USE_ICONV= yes
23	USE_GMAKE= yes	21	USE_GMAKE= yes
		22	USE_GNOME= intltool
24	USE_REINPLACE= yes	23	USE_REINPLACE= yes
25	USE_AUTOCONF_VER=259	24	WANT_AUTOCONF_VER=253
26	CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \	25	WANT_AUTOHEADER_VER=253
27	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \	26	WANT_AUTOMAKE_VER=15
28	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"	27	WANT_LIBTOOL_VER=15
		28
		29	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv
		30	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
		31
		32	.include <bsd.port.pre.mk>
		33
		34	.if ${OSVERSION} < 503000
		35	IGNORE= "It is supported on FreeBSD 5.3 and later"
		36	.endif
		37
		38	.if ${ARCH} != "i386"
		39	IGNORE= "${ARCH} is not support."
		40	.endif
		41
		42	GNU_CONFIGURE= yes
		43	CONFIGURE_ARGS+=CC=gcc CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
		44	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv"
		45	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		46	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		47	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
29		48
30	post-patch:	49	post-patch:
31	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	50	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
32	${WRKSRC}/../../acfiles/im_common.m4 \	51	${WRKSRC}/../../acfiles/im_common.m4 \
33	${WRKSRC}/configure.ac \	52	${WRKSRC}/configure.ac \
34	${WRKSRC}/aclocal.m4 \
35	${WRKSRC}/csconv.h \	53	${WRKSRC}/csconv.h \
		54	${WRKSRC}/converterPI/configure.in \
36	${WRKSRC}/converterPI/test/icutest4linux.c \	55	${WRKSRC}/converterPI/test/icutest4linux.c \
37	${WRKSRC}/converterPI/icuconv_relay.c \	56	${WRKSRC}/converterPI/icuconv_relay.c \
38	${WRKSRC}/converterPI/configure.in \
39	${WRKSRC}/converterPI/icuconv/common/config.h	57	${WRKSRC}/converterPI/icuconv/common/config.h
40	${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" -e "s,-ldl,," -e 's,-lc$$,,' \	58	${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
41	${WRKSRC}/converterPI/icuconv/common/Makefile.in \
42	${WRKSRC}/converterPI/icuconv/tools/toolutil/Makefile.in \
43	${WRKSRC}/converter/compoundtext/Makefile.in
44	${REINPLACE_CMD} -e "s,ELIBBAD,-2," \
45	${WRKSRC}/converterPI/icuconv/common/icuconv.c	59	${WRKSRC}/converterPI/icuconv/common/icuconv.c
46	${REINPLACE_CMD} -e "s,(LIBS),(LIBS) ${PTHREAD_LIBS},g" \
47	${WRKSRC}/converterPI/icuconv/tools/makeconv/Makefile.in \
48	${WRKSRC}/converterPI/icuconv/tools/gencnval/Makefile.in
49		60
50	.include <bsd.port.mk>	61	pre-configure:
		62	(cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
		63	(cd ${WRKSRC} && ${ACLOCAL} -I ../../acfiles && ${AUTOCONF})
		64	(cd ${WRKSRC}/converterPI/ && ${AUTOCONF})
		65
		66	post-configure:
		67	${REINPLACE_CMD} \
		68	-e "s,prefix = ${PREFIX},prefix = ${PREFIX}/lib/im," \
		69	`${FIND} ${WRKSRC} -type f -name Makefile`
		70
		71	.include <bsd.port.post.mk>

Lines 1-35 Link Here

(-)ports/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac (-28 / +16 lines)
1	--- lib/CSConv/configure.ac.orig Fri Jun 13 00:27:08 2003	1	--- lib/CSConv/configure.ac Fri Jun 13 01:27:08 2003
2	+++ lib/CSConv/configure.ac Sat Sep 4 05:39:51 2004	2	+++ lib/CSConv/configure.ac Wed Feb 16 14:41:13 2005
3	@@ -55,8 +55,6 @@	3	@@ -314,6 +314,7 @@
4	AC_PATH_PROG(RM, rm)
5	AC_PATH_PROG(SED, sed)
6
7	-AC_CHECK_LIB(c, main)
8	-AC_CHECK_LIB(dl, main)
9
10
11	dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li>
12	@@ -294,13 +292,8 @@
13	CDEBUGFLAGS=
14	ARFLAGS=ru
15
16	- if test x"${CC}" = x"gcc" ; then
17	- SHLIBCFLAGS='-fpic'
18	- SHLIBLDFLAGS='-shared'
19	- else
20	- SHLIBCFLAGS=
21	- SHLIBLDFLAGS=
22	- fi
23	+ SHLIBCFLAGS='-fpic'
24	+ SHLIBLDFLAGS='-shared'
25
26	csc_system_name="`uname -s`"
27	;;
28	@@ -314,6 +307,7 @@
29	case "${host}" in	4	case "${host}" in
30	solaris) platform=SOLARIS ;;	5	solaris) platform=SOLARIS ;;
31	linux) platform=LINUX ;;	6	linux) platform=LINUX ;;
32	+ freebsd) platform=FREEBSD ;;	7	+ freebsd) platform=FREEBSD ;;
33	esac	8	esac
34	AC_SUBST(platform)	9	AC_SUBST(platform)
		10
		11	@@ -337,6 +338,12 @@
		12	## Shared object suffix
		13	SO=so
		14	;;
		15	+ freebsd)
		16	+ ## Commands to generate dependency files
		17	+ GEN_DEPS="${CC} -E -MM ${DEFINES} ${INCLUDES}"
		18	+ ## Shared object suffix
		19	+ SO=so
		20	+ ;;
		21	esac
		22
35		23

Lines 1-240 Link Here

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

Lines 7-55 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/Makefile (-30 / +46 lines)
7		7
8	PORTNAME= gnome-im-switcher	8	PORTNAME= gnome-im-switcher
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
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	13	DISTNAME= im-sdk-src-${IIIMF_VER}
15	DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz	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	IIIMF_VER= r12_0_1-svn1891
21	WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/gnome-im-switcher
22	USE_GNOME= gconf2 libglade2 libgnomeui gnomepanel gnomehack
23	USE_REINPLACE= yes
24	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
		20
		21	IIIMF_VER= r12_1-svn2002
		22	USE_REINPLACE= yes
25	USE_GMAKE= yes	23	USE_GMAKE= yes
26	USE_AUTOCONF_VER= 259	24	USE_GNOME= intltool gconf2 libglade2 libgnomeui \
27	USE_AUTOHEADER_VER= 259	25	gnomepanel gnomeprefix gnomehack
28	USE_AUTOMAKE_VER= 19	26	WANT_AUTOCONF_VER=253
29	USE_LIBTOOL_VER= 15	27	WANT_AUTOHEADER_VER=253
30	AUTOMAKE_ARGS= --add-missing --copy --gnu	28	WANT_AUTOMAKE_VER=15
31	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	29	WANT_LIBTOOL_VER=15
		30
		31	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher
		32	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
		33
		34	.include <bsd.port.pre.mk>
		35
		36	.if ${OSVERSION} < 503000
		37	IGNORE= "It is supported on FreeBSD 5.3 and later"
		38	.endif
		39
		40	.if ${ARCH} != "i386"
		41	IGNORE= "${ARCH} is not support."
		42	.endif
		43
		44	GNU_CONFIGURE= yes
		45	MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX"
		46	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		47	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		48	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
32		49
33	post-patch:	50	post-patch:
34	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	51	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
35	${WRKSRC}/../acfiles/im_common.m4	52	${WRKSRC}/../acfiles/im_common.m4
36	${FIND} ${WRKSRC} -name "Makefile.am*" \| ${XARGS} ${REINPLACE_CMD} -e \
37	's\|[(]GNOME_datadir[)]/gnome/\|(datadir)/\|g ; \
38	s\|[(]GNOME_datadir[)]/locale\|(prefix)/share/locale\|g ; \
39	s\|[(]datadir[)]/locale\|(prefix)/share/locale\|g ; \
40	s\|[(]libdir[)]/locale\|(prefix)/share/locale\|g ; \
41	s\|[(]gnomedatadir[)]/gnome\|(gnomedatadir)\|g ; \
42	s\|[(]datadir[)]/aclocal\|(prefix)/share/aclocal\|g ; \
43	s\|[(]datadir[)]/gnome/\|(datadir)/\|g ; \
44	s\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g ; \
45	s\|[$$][(]localstatedir[)]/scrollkeeper\|${SCROLLKEEPER_DIR}\|g ; \
46	s\|[(]libdir[)]/bonobo/servers\|(prefix)/libdata/bonobo/servers\|g'
47		53
48	pre-configure:	54	pre-configure:
49	cd ${WRKSRC} && glib-gettextize --force --copy	55	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
50	cd ${WRKSRC} && intltoolize --copy --force --automake	56	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
51	cd ${WRKSRC} && ${LIBTOOLIZE} --force --copy	57	(cd ${WRKSRC} && ${TOUCH} ltconfig)
52	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles	58	(cd ${WRKSRC} && ${LOCALBASE}/bin/intltoolize --copy --force --automake)
53	${TOUCH} ${WRKSRC}/config.h.in	59	(cd ${WRKSRC} && ${LIBTOOLIZE} --force --copy)
		60	(cd ${WRKSRC} && ${ACLOCAL} -I ../acfiles -I /usr/local/share/aclocal)
		61	(cd ${WRKSRC} && ${AUTOHEADER})
		62	(cd ${WRKSRC} && ${AUTOMAKE} --add-missing --gnu)
		63	(cd ${WRKSRC} && ${AUTOCONF})
		64
		65	post-configure:
		66	${REINPLACE_CMD} -e "s,[(]libdir[)]/bonobo/server,{exec_prefix}/libdata/bonobo/server,g" \
		67	${WRKSRC}/src/Makefile
		68	${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \
		69	${WRKSRC}/help/C/Makefile
54		70
55	.include <bsd.port.mk>	71	.include <bsd.port.post.mk>

Line 0 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh (+71 lines)
		1	--- gnome-im-switcher/autogen.sh Fri Dec 5 12:25:06 2003
		2	+++ gnome-im-switcher/autogen.sh Wed Feb 16 16:50:27 2005
		3	@@ -13,15 +13,20 @@
		4
		5	DIE=0
		6
		7	-AUTOMAKE=automake-1.4
		8	-ACLOCAL=aclocal-1.4
		9	+LIBTOOL=libtool15
		10	+INTLTOOLIZE=intltoolize
		11	+LIBTOOLIZE=libtoolize15
		12	+ACLOCAL=aclocal15
		13	+AUTOHEADER=autoheader253
		14	+AUTOMAKE=automake15
		15	+AUTOCONF=autoconf253
		16
		17	($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 \|\| {
		18	AUTOMAKE=automake
		19	ACLOCAL=aclocal
		20	}
		21
		22	-(autoconf --version) < /dev/null > /dev/null 2>&1 \|\| {
		23	+($AUTOCONF --version) < /dev/null > /dev/null 2>&1 \|\| {
		24	echo
		25	echo "You must have autoconf installed to compile $PROJECT."
		26	echo "Download the appropriate package for your distribution,"
		27	@@ -38,7 +43,7 @@
		28	}
		29
		30	(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
		31	- (libtool --version) < /dev/null > /dev/null 2>&1 \|\| {
		32	+ ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 \|\| {
		33	echo
		34	echo "Error: You must have \`libtool' installed to compile $PROJECT."
		35	echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
		36	@@ -57,7 +62,7 @@
		37	}
		38
		39	(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
		40	- (intltoolize --version) < /dev/null > /dev/null 2>&1 \|\| {
		41	+ ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 \|\| {
		42	echo
		43	echo "Error: You must have \`intltoolize' installed to compile $PKG_NAME."
		44	echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
		45	@@ -115,22 +120,22 @@
		46	fi
		47	if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
		48	echo "Running intltoolize..."
		49	- intltoolize --copy --force --automake
		50	+ $INTLTOOLIZE --copy --force --automake
		51	fi
		52	if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
		53	echo "Running libtoolize..."
		54	- libtoolize --force --copy
		55	+ $LIBTOOLIZE --force --copy
		56	fi
		57	echo "Running $ACLOCAL $aclocalinclude ..."
		58	$ACLOCAL $aclocalinclude
		59	if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
		60	echo "Running autoheader..."
		61	- autoheader
		62	+ $AUTOHEADER
		63	fi
		64	echo "Running $AUTOMAKE --gnu $am_opt ..."
65	$AUTOMAKE --add-missing --gnu $am_opt
66	echo "Running autoconf ..."
67	- autoconf
68	+ $AUTOCONF
69	)
70	fi
71	done

Line 0 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-gnome_src_widgets.c (+14 lines)
	1	--- gnome-im-switcher/src/widgets.c Thu Oct 14 23:10:11 2004
	2	+++ gnome-im-switcher/src/widgets.c Wed Feb 16 16:51:26 2005
	3	@@ -29,7 +29,11 @@
	4	#include <gnome.h>
	5
	6	#include <signal.h>
	7	+#ifdef __FreeBSD__
	8	+#include <sys/wait.h>
	9	+#else
	10	#include <wait.h>
	11	+#endif
	12
	13	#include "gnome-im-switcher.h"
	14	#include "iiim-interface.h"

Lines 1-12 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-src_language.c (-12 lines)
1	--- src/language.c.orig Thu Apr 29 20:23:29 2004
2	+++ src/language.c Wed Oct 13 22:52:28 2004
3	@@ -946,8 +946,8 @@
4	gimlet_language_get_conversion_mode (char *iiim_lang_name)
5	{
6	GSList *tmp;
7	- tmp = active_languages;
8	GimletLanguage *lang;
9	+ tmp = active_languages;
10
11	while (tmp != NULL)
12	{

Lines 1-13 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/files/patch-src_quick-access-menu.c (-13 lines)
1	--- src/quick-access-menu.c.orig Fri Jul 16 00:32:39 2004
2	+++ src/quick-access-menu.c Wed Oct 13 23:01:48 2004
3	@@ -279,9 +279,9 @@
4	GtkWidget *le_submenu;
5	GtkWidget *le_submenu_item;
6	GSList *legroup = NULL;
7	+ int i, len;
8
9	le_submenu = gtk_menu_new ();
10	- int i, len;
11	len = g_list_length (lelist);
12	le_submenu_item = gtk_radio_menu_item_new_with_label (legroup, lelist->data);
13	legroup = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (le_submenu_item));

Lines 1-23 Link Here

(-)ports/textproc/iiimf-gnome-im-switcher/pkg-plist (-19 / +28 lines)
1	bin/gnome-im-properties	1	bin/gnome-im-properties
2	bin/gnome-im-settings-daemon	2	bin/gnome-im-settings-daemon
3	@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-properties.schemas >/dev/null \|\| /usr/bin/true
4	etc/gconf/schemas/gnome-im-properties.schemas
5	@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-properties.schemas >/dev/null \|\| /usr/bin/true
6	@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas >/dev/null \|\| /usr/bin/true
7	etc/gconf/schemas/gnome-im-switcher.schemas
8	@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-im-switcher.schemas >/dev/null \|\| /usr/bin/true
9	libdata/bonobo/servers/GNOME_IMSwitcherApplet.server	3	libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
10	libexec/gnome-im-switcher-applet	4	libexec/gnome-im-switcher-applet
11	share/control-center-2.0/capplets/gnome-im-properties.desktop	5	share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
12	share/control-center-2.0/interfaces/gnome-im-properties.glade2	6	share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
13	share/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml	7	share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
14	share/gnome-im-switcher/glade/gnome-im-switcher.glade2	8	share/gnome/pixmaps/gnome-settings-im.png
15	share/icons/hicolor/48x48/apps/gnome-settings-im.png	9	share/gnome/pixmaps/gimlet-off.png
16	share/pixmaps/gnome-settings-im.png	10	share/gnome/pixmaps/gimlet-on.png
17	@dirrm share/control-center-2.0/capplets	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
18	@dirrm share/control-center-2.0/interfaces	12	etc/gconf/schemas/gnome-im-switcher.schemas
19	@dirrm share/control-center-2.0	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
20	@dirrm share/gnome-2.0/ui	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
21	@dirrm share/gnome-2.0	15	etc/gconf/schemas/gnome-im-properties.schemas
22	@dirrm share/gnome-im-switcher/glade	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
23	@dirrm share/gnome-im-switcher	17	@exec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
		18	share/gnome/omf/gnome-im-switcher/imswitcher-C.omf
		19	@unexec %D/bin/scrollkeeper-update -p %D/var/scrollkeeper -o %D/share/gnome/omf/gnome-im-switcher
		20	@dirrm share/gnome/omf/gnome-im-switcher
		21	share/gnome/gnome-im-switcher/glade/gnome-im-switcher.glade2
		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

Lines 7-48 Link Here

(-)ports/textproc/iiimf-gtk/Makefile (-22 / +40 lines)
7		7
8	PORTNAME= gtk	8	PORTNAME= gtk
9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}	9	PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
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	13	DISTNAME= im-sdk-src-${IIIMF_VER}
15	DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz	14	EXTRACT_SUFX= .tar.bz2
16		15
17	MAINTAINER= kcwu@csie.org	16	MAINTAINER= kcwu@csie.org
18	COMMENT= Internet/Intranet Input Method Gtk Client 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.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
21	iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib	20	iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
22		21
23	USE_GNOME= gtk20
24	USE_X_PREFIX= yes	22	USE_X_PREFIX= yes
25		23
26	IIIMF_VER= r12_0_1-svn1891	24	IIIMF_VER= r12_1-svn2002
27	WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/iiimgcf	25	USE_REINPLACE= yes
28	USE_REINPLACE= yes	26	USE_GMAKE= yes
29	USE_AUTOCONF_VER= 259	27	USE_GNOME= intltool gtk20
30	USE_AUTOHEADER_VER= 259	28	WANT_AUTOCONF_VER=253
31	USE_AUTOMAKE_VER= 19	29	WANT_AUTOHEADER_VER=253
32	USE_LIBTOOL_VER= 15	30	WANT_AUTOMAKE_VER=15
33		31	WANT_LIBTOOL_VER=15
34	PLIST_FILES= lib/gtk-2.0/2.4.0/immodules/im-iiim.so	32
		33	WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf
		34	PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
		35
		36	.include <bsd.port.pre.mk>
		37
		38	.if ${OSVERSION} < 503000
		39	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
		45
		46	MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX"
		47	UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
		48	AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
		49	LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE}
35		50
36	post-patch:	51	post-patch:
37	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \	52	${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
38	${WRKSRC}/../acfiles/im_common.m4 \	53	${WRKSRC}/../acfiles/im_common.m4
39	${WRKSRC}/configure.ac \
40	${WRKSRC}/imaux.c
41		54
42	pre-configure:	55	pre-configure:
43	cd ${WRKSRC} && glib-gettextize --force --copy	56	(cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles)
44	cd ${WRKSRC} && ${MV} po ../acfiles && ${LN} -s ../acfiles/po && intltoolize --copy --force --automake	57	(cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig)
45	cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles	58
46	${TOUCH} ${WRKSRC}/config.h.in	59	do-configure:
		60	(cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX})
		61
		62	post-install:
		63	${X11BASE}/bin/gtk-query-immodules-2.0 > \
		64	${X11BASE}/etc/gtk-2.0/gtk.immodules
47		65
48	.include <bsd.port.mk>	66	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am (-5 / +13 lines)
1	--- Makefile.am.orig Tue Sep 7 22:44:25 2004	1	--- iiimgcf/Makefile.am Thu Jan 15 10:51:58 2004
2	+++ Makefile.am Tue Sep 7 22:45:11 2004	2	+++ iiimgcf/Makefile.am Thu Feb 17 22:05:59 2005
3	@@ -15,8 +15,7 @@	3	@@ -9,14 +9,13 @@
		4	moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
		5
		6	im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
		7	-im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
		8	+im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined \
		9	+ -liiimcf -liiimp
		10
		11	im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
4	gtkimcontextiiim.c gtkimcontextiiim.h \	12	gtkimcontextiiim.c gtkimcontextiiim.h \
5	imiiim.c imswitcher.c imaux.c	13	imiiim.c imswitcher.c imaux.c
6	im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \	14	-im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
7	- $(IM_LIBDIR)/iiimcf/libiiimcf.la \	15	- $(IM_LIBDIR)/iiimcf/libiiimcf.la \
8	- $(IM_LIBDIR)/iiimp/libiiimp.la	16	- $(IM_LIBDIR)/iiimp/libiiimp.la
9	+ -L$(prefix)/lib -liiimcf -liiimp	17	+im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS)
10		18
11	module_LTLIBRARIES = im-iiim.la	19	module_LTLIBRARIES = im-iiim.la
12		20

Line 0 Link Here

(-)ports/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh (+73 lines)
		1	--- iiimgcf/autogen.sh Thu Dec 11 17:29:28 2003
		2	+++ iiimgcf/autogen.sh Wed Feb 16 16:48:14 2005
		3	@@ -12,7 +12,15 @@
		4
		5	DIE=0
		6
		7	-(libtool --version) < /dev/null > /dev/null 2>&1 \|\| {
		8	+LIBTOOL=libtool15
		9	+INTLTOOLIZE=intltoolize
		10	+LIBTOOLIZE=libtoolize15
		11	+ACLOCAL=aclocal15
		12	+AUTOHEADER=autoheader253
		13	+AUTOMAKE=automake15
		14	+AUTOCONF=autoconf253
		15	+
		16	+(${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 \|\| {
		17	echo
		18	echo "You must have libtool installed to compile $PROJECT."
		19	echo "Install the appropriate package for your distribution,"
		20	@@ -30,7 +38,7 @@
		21	}
		22
		23	(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
		24	- (intltoolize --version) < /dev/null > /dev/null 2>&1 \|\| {
		25	+ (${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 \|\| {
		26	echo
		27	echo "Error: You must have \`intltoolize' installed to compile $PKG_NAME."
		28	echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
		29	@@ -39,7 +47,7 @@
		30	}
		31	}
		32
		33	-(autoconf --version) < /dev/null > /dev/null 2>&1 \|\| {
		34	+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 \|\| {
		35	echo
		36	echo "You must have autoconf installed to compile $PROJECT."
		37	echo "libtool the appropriate package for your distribution,"
		38	@@ -48,8 +56,8 @@
		39	}
		40
		41	have_automake=false
		42	-if automake --version < /dev/null > /dev/null 2>&1 ; then
		43	- automake_version=`automake --version \| grep 'automake (GNU automake)' \| sed 's/^[^0-9]\(.\)/\1/'`
		44	+if ${AUTOMAKE} --version < /dev/null > /dev/null 2>&1 ; then
		45	+ automake_version=`${AUTOMAKE} --version \| grep 'automake (GNU automake)' \| sed 's/^[^0-9]\(.\)/\1/'`
		46	case $automake_version in
		47	1.2\|1.3\|1.4)
		48	;;
		49	@@ -96,19 +104,19 @@
		50	fi
		51	if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
		52	echo "Running intltoolize..."
		53	- intltoolize --copy --force --automake
		54	+ ${INTLTOOLIZE} --copy --force --automake
		55	fi
		56
		57	# intentionally we don't call "libtoolize --force"
		58	# to avoid overriding ../acfiles/ltmain.h, which we don't want to happen!
		59
		60	-aclocal -I ../acfiles $ACLOCAL_FLAGS
		61	+${ACLOCAL} -I ../acfiles $ACLOCAL_FLAGS
		62
		63	# optionally feature autoheader
		64	-(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
65	+(${AUTOHEADER} --version) < /dev/null > /dev/null 2>&1 && ${AUTOHEADER}
66
67	-automake -a $am_opt
68	-autoconf
69	+${AUTOMAKE} -a $am_opt
70	+${AUTOCONF}
71	cd $ORIGDIR
72
73	if test -z "$AUTOGEN_SUBDIR_MODE"; then