diff options
author | Daichi GOTO <daichi@FreeBSD.org> | 2005-02-28 04:17:02 +0000 |
---|---|---|
committer | Daichi GOTO <daichi@FreeBSD.org> | 2005-02-28 04:17:02 +0000 |
commit | 806320585f11517fb0170fe185bbab72146f4afb (patch) | |
tree | 27b00b83610d0ff124cac329890239f6ba0a95f2 /chinese | |
parent | BROKEN on 5.x: Install fails (diff) |
IIIMF-related ports: Update to r12_1-svn2002 and bug fixes
PR: ports/77927
Submitted by: Masanori OZAWA <ozawa@ongs.co.jp>
Approved by: maintainer
Pointed out by: ume, nork, hrs
Notes
Notes:
svn path=/head/; revision=129967
Diffstat (limited to 'chinese')
-rw-r--r-- | chinese/iiimf-le-newpy/Makefile | 67 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/distinfo | 4 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/files/patch-Makefile | 19 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/files/patch-leif_autogen.sh | 93 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/files/patch-leif_configure.ac | 42 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c | 11 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c | 11 | ||||
-rw-r--r-- | chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c | 11 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/Makefile | 46 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/distinfo | 4 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/files/patch-Makefile | 19 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/files/patch-leif_autogen.sh | 93 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/files/patch-leif_configure.ac | 42 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c | 11 | ||||
-rw-r--r-- | chinese/iiimf-le-ude/pkg-plist | 6 |
15 files changed, 407 insertions, 72 deletions
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index bda6d0243dd2..c2c718ea388a 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -10,54 +10,65 @@ PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- -DISTNAME= im-sdk -DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz +DISTNAME= im-sdk-src-${IIIMF_VER} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= kcwu@csie.org COMMENT= IIIMF New PinYin input method engine RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server -IIIMF_VER= r12_0_1-svn1891 -WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif -BUILD_WRKSRC= ${WRKSRC}/newpy -INSTALL_WRKSRC= ${WRKSRC}/newpy +IIIMF_VER= r12_1-svn2002 USE_REINPLACE= yes -USE_AUTOCONF_VER= 259 -USE_AUTOHEADER_VER= 259 -USE_AUTOMAKE_VER= 19 -USE_LIBTOOL_VER= 15 -AUTOMAKE_ARGS+= --add-missing --copy --gnu -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +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-//}/leif +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} .if !defined(WITHOUT_XAUX) USE_MOTIF= yes PLIST_SUB+= WANT_XAUX="" -RUN_DEPENDS+= ${LOCALBASE}/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv +RUN_DEPENDS+= ${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv .else CONFIGURE_ARGS+=--without-x PLIST_SUB+= WANT_XAUX="@comment " .endif +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 503000 +IGNORE= "It is supported on FreeBSD 5.3 and later" +.endif + +.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} ${CONFIGURE_ARGS} + post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ ${WRKSRC}/../acfiles/im_common.m4 \ - ${WRKSRC}/configure.ac \ - ${WRKSRC}/newpy/NewPY.c \ - ${WRKSRC}/newpy/xaux/aux_so.c \ - ${WRKSRC}/newpy/xaux/aux_win.c + ${WRKSRC}/../lib/CSConv/csconv.h pre-configure: - cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles - ${TOUCH} ${WRKSRC}/config.h.in - cd ${WRKSRC} && ${LIBTOOLIZE} --copy --force --automake + (cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles) + (cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig) + (cd ${WRKSRC}/ && ${TOUCH} ltconfig) -.if !defined(WITHOUT_XAUX) -post-build: - cd ${BUILD_WRKSRC}/xaux && ${MAKE} all - -post-install: - cd ${INSTALL_WRKSRC}/xaux && ${MAKE} install -.endif +do-configure: + (cd ${WRKSRC}/ && ./autogen.sh ${AUTOGEN_ARGS}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/chinese/iiimf-le-newpy/distinfo b/chinese/iiimf-le-newpy/distinfo index 29d049a782bc..440e49d16220 100644 --- a/chinese/iiimf-le-newpy/distinfo +++ b/chinese/iiimf-le-newpy/distinfo @@ -1,2 +1,2 @@ -MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe -SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118 +MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a +SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292 diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile new file mode 100644 index 000000000000..85df0e345035 --- /dev/null +++ b/chinese/iiimf-le-newpy/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/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh b/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh new file mode 100644 index 000000000000..d38d31e628c7 --- /dev/null +++ b/chinese/iiimf-le-newpy/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/chinese/iiimf-le-newpy/files/patch-leif_configure.ac b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac index a28012caf7aa..902678e911b0 100644 --- a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac +++ b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac @@ -1,10 +1,32 @@ ---- configure.ac.orig Wed Sep 8 00:00:58 2004 -+++ configure.ac Wed Sep 8 00:02:34 2004 -@@ -10,6 +10,7 @@ - dnl common initialization - dnl AC_CONFIG_AUX_DIR(../acfiles) - IM_INIT(..) -+m4_pattern_allow([AM_ET]) - - AM_INIT_AUTOMAKE(im-sdk, 11.0) - AM_CONFIG_HEADER(config.h) +--- leif/configure.ac Wed Oct 6 23:00:36 2004 ++++ leif/configure.ac Thu Feb 17 23:32:54 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="newpy" + +-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 diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c new file mode 100644 index 000000000000..400adf9dcd01 --- /dev/null +++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c @@ -0,0 +1,11 @@ +--- leif/newpy/NewPY.c Fri Jul 16 17:38:30 2004 ++++ leif/newpy/NewPY.c Wed Feb 16 20:42:06 2005 +@@ -321,7 +321,7 @@ + #ifdef WIN32 + l->path = "d:\\newpy_obj.jar"; + #else +- l->path = "/usr/lib/im/locale/zh_CN/newpy/newpy_obj.jar"; /* path */ ++ l->path = "/usr/local/lib/im/locale/zh_CN/newpy/newpy_obj.jar"; /* path */ + #endif + + l->signature = ""; diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c new file mode 100644 index 000000000000..1b9a1af61503 --- /dev/null +++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_so.c @@ -0,0 +1,11 @@ +--- leif/newpy/xaux/aux_so.c Mon Sep 1 17:42:44 2003 ++++ leif/newpy/xaux/aux_so.c Wed Feb 16 20:42:14 2005 +@@ -56,7 +56,7 @@ + + #define HASH_SIZE 137 + #define ME "aux_so" +-#define AUX_EXT "/usr/lib/im/locale/zh_CN/newpy/aux_win" ++#define AUX_EXT "/usr/local/lib/im/locale/zh_CN/newpy/aux_win" + + typedef struct _aux_icid { + aux_t * aux; diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c new file mode 100644 index 000000000000..838f54411388 --- /dev/null +++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_aux_win.c @@ -0,0 +1,11 @@ +--- leif/newpy/xaux/aux_win.c Fri Mar 16 00:52:22 2001 ++++ leif/newpy/xaux/aux_win.c Wed Feb 16 20:42:20 2005 +@@ -61,7 +61,7 @@ + #include "gif_lib.h" + #include "getarg.h" + +-#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/" ++#define IMAGE_PATH "/usr/local/lib/im/locale/zh_CN/newpy/" + + Pixmap LoadGIFFile(char * filename); + static void AllocateColors1(void); diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile index 17b6e19d6b55..6e5a7f7c0885 100644 --- a/chinese/iiimf-le-ude/Makefile +++ b/chinese/iiimf-le-ude/Makefile @@ -10,35 +10,47 @@ PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- -DISTNAME= im-sdk -DISTFILES= ${DISTNAME}-src-${IIIMF_VER}.tgz +DISTNAME= im-sdk-src-${IIIMF_VER} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= kcwu@csie.org COMMENT= IIIMF User Defined language Engine for Simplified Chinese conversion RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server -IIIMF_VER= r12_0_1-svn1891 -WRKSRC= ${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif +IIIMF_VER= r12_1-svn2002 +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-//}/leif BUILD_WRKSRC= ${WRKSRC}/ude INSTALL_WRKSRC= ${WRKSRC}/ude -USE_REINPLACE= yes -USE_AUTOCONF_VER= 259 -USE_AUTOHEADER_VER= 259 -USE_AUTOMAKE_VER= 19 -USE_LIBTOOL_VER= 15 -AUTOMAKE_ARGS+= --add-missing --copy --gnu -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} + +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}/configure.ac \ - ${WRKSRC}/ude/UDEngine.c + ${WRKSRC}/../acfiles/im_common.m4 pre-configure: - cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal -I ../acfiles - ${TOUCH} ${WRKSRC}/config.h.in - cd ${WRKSRC} && ${LIBTOOLIZE} --copy --force --automake + (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.mk> diff --git a/chinese/iiimf-le-ude/distinfo b/chinese/iiimf-le-ude/distinfo index 29d049a782bc..440e49d16220 100644 --- a/chinese/iiimf-le-ude/distinfo +++ b/chinese/iiimf-le-ude/distinfo @@ -1,2 +1,2 @@ -MD5 (im-sdk-src-r12_0_1-svn1891.tgz) = 4e51e4fd07391bd957622db0e89aeefe -SIZE (im-sdk-src-r12_0_1-svn1891.tgz) = 18206118 +MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a +SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292 diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile new file mode 100644 index 000000000000..85df0e345035 --- /dev/null +++ b/chinese/iiimf-le-ude/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/chinese/iiimf-le-ude/files/patch-leif_autogen.sh b/chinese/iiimf-le-ude/files/patch-leif_autogen.sh new file mode 100644 index 000000000000..d38d31e628c7 --- /dev/null +++ b/chinese/iiimf-le-ude/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/chinese/iiimf-le-ude/files/patch-leif_configure.ac b/chinese/iiimf-le-ude/files/patch-leif_configure.ac index a28012caf7aa..8391f93be414 100644 --- a/chinese/iiimf-le-ude/files/patch-leif_configure.ac +++ b/chinese/iiimf-le-ude/files/patch-leif_configure.ac @@ -1,10 +1,32 @@ ---- configure.ac.orig Wed Sep 8 00:00:58 2004 -+++ configure.ac Wed Sep 8 00:02:34 2004 -@@ -10,6 +10,7 @@ - dnl common initialization - dnl AC_CONFIG_AUX_DIR(../acfiles) - IM_INIT(..) -+m4_pattern_allow([AM_ET]) - - AM_INIT_AUTOMAKE(im-sdk, 11.0) - AM_CONFIG_HEADER(config.h) +--- leif/configure.ac Wed Oct 6 23:00:36 2004 ++++ leif/configure.ac Thu Feb 17 23:32:54 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" + + CXXFLAGS="${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" + +-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" ++LE_TARGETS="udt" + +-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 diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c new file mode 100644 index 000000000000..bec75c081379 --- /dev/null +++ b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c @@ -0,0 +1,11 @@ +--- leif/ude/UDEngine.c Fri Mar 16 00:52:22 2001 ++++ leif/ude/UDEngine.c Wed Feb 16 20:47:14 2005 +@@ -302,7 +302,7 @@ + l->name_length = UTFCHARLen(aux_name_panel); + l->domain = "com.sun.udengine"; + l->scope = "udengine"; +- l->path = "/usr/lib/im/locale/zh_CN/udengine/udengine_obj.jar"; /* path */ ++ l->path = "/usr/local/lib/im/locale/zh_CN/udengine/udengine_obj.jar"; /* path */ + l->signature = ""; + l->basepath = NULL; /* only for CCDEF */ + l->encoding = NULL; /* only for CCDEF */ diff --git a/chinese/iiimf-le-ude/pkg-plist b/chinese/iiimf-le-ude/pkg-plist index 6b771800f5b2..7c4969855f28 100644 --- a/chinese/iiimf-le-ude/pkg-plist +++ b/chinese/iiimf-le-ude/pkg-plist @@ -2,6 +2,6 @@ lib/im/leif/udengine.so lib/im/locale/zh_CN/ude/data/pinyin.mb @dirrm lib/im/locale/zh_CN/ude/data @dirrm lib/im/locale/zh_CN/ude -@unexec rmdir %D/lib/im/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/lib/im/locale 2>/dev/null || true -@unexec rmdir %D/lib/im/leif 2>/dev/null || true +@unexec rmdir %D/lib/im/locale/zh_CN > /dev/null 2>&1 || true +@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true +@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true |