summaryrefslogtreecommitdiff
path: root/japanese/iiimf-le-canna/files
diff options
context:
space:
mode:
authorDaichi GOTO <daichi@FreeBSD.org>2005-02-28 04:20:30 +0000
committerDaichi GOTO <daichi@FreeBSD.org>2005-02-28 04:20:30 +0000
commit64e4fa747fc409451ea2f56db6d5d673d99d9428 (patch)
tree3b933eb031bac5566ef9a91d82bd5edfb0e0cdcb /japanese/iiimf-le-canna/files
parentIIIMF-related ports: Update to r12_1-svn2002 and bug fixes (diff)
Add iiimf-le-canna , canna language engine for IIIMF.
PR: ports/77927 Submitted by: Masanori OZAWA <ozawa@ongs.co.jp>
Notes
Notes: svn path=/head/; revision=129968
Diffstat (limited to 'japanese/iiimf-le-canna/files')
-rw-r--r--japanese/iiimf-le-canna/files/patch-Makefile19
-rw-r--r--japanese/iiimf-le-canna/files/patch-leif_autogen.sh93
-rw-r--r--japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c28
-rw-r--r--japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am8
-rw-r--r--japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am11
-rw-r--r--japanese/iiimf-le-canna/files/patch-leif_configure.ac33
6 files changed, 192 insertions, 0 deletions
diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile
new file mode 100644
index 000000000000..85df0e345035
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-Makefile
@@ -0,0 +1,19 @@
+--- Makefile Thu Apr 8 03:28:00 2004
++++ Makefile Wed Feb 16 14:09:34 2005
+@@ -2,6 +2,7 @@
+ AUTOMAKE = automake
+ AUTOHEADER = autoheader
+ AUTOCONF = autoconf
++LIBTOOLIZE = libtoolize
+
+ CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ $(AUTOHEADER) && \
+@@ -21,7 +22,7 @@
+
+ update-acfiles:
+ cd acfiles && \
+- $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
++ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
+ rm -f Makefile.in aclocal.m4
+
+ config:
diff --git a/japanese/iiimf-le-canna/files/patch-leif_autogen.sh b/japanese/iiimf-le-canna/files/patch-leif_autogen.sh
new file mode 100644
index 000000000000..d38d31e628c7
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_autogen.sh
@@ -0,0 +1,93 @@
+--- 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
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c b/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
new file mode 100644
index 000000000000..e26d9ffb726c
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c
@@ -0,0 +1,28 @@
+--- 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();
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am
new file mode 100644
index 000000000000..e6ef41e17505
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/canna/Makefile.am.orig Mon Feb 28 03:00:36 2005
++++ leif/canna/Makefile.am Mon Feb 28 03:00:44 2005
+@@ -1,5 +1,3 @@
+-SUBDIRS = xaux
+-
+ LE_FILES = CannaLE.so
+ CannaLE_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
+ -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am
new file mode 100644
index 000000000000..97229748b59b
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am
@@ -0,0 +1,11 @@
+--- leif/canna/xaux/Makefile.am Mon Sep 6 17:41:11 2004
++++ leif/canna/xaux/Makefile.am Wed Feb 16 14:20:49 2005
+@@ -10,7 +10,7 @@
+ -g \
+ $(NULL)
+
+-AM_LDFLAGS = \
++LDFLAGS = \
+ $(THREAD_LDFLAGS) \
+ $(NULL)
+
diff --git a/japanese/iiimf-le-canna/files/patch-leif_configure.ac b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
new file mode 100644
index 000000000000..616253ca25b4
--- /dev/null
+++ b/japanese/iiimf-le-canna/files/patch-leif_configure.ac
@@ -0,0 +1,33 @@
+--- leif/configure.ac Wed Oct 6 23:00:36 2004
++++ leif/configure.ac Fri Feb 18 01:19:12 2005
+@@ -61,25 +61,19 @@
+ 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_X, canna/xaux)
+-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