diff options
139 files changed, 1207 insertions, 1570 deletions
diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index 5193ab6de30c..5e8fd6e4502f 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -7,6 +7,7 @@ PORTNAME= le-newpy PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -22,17 +23,21 @@ IIIMF_VER= r12_1-svn2002 USE_BZIP2= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} .if !defined(WITHOUT_XAUX) USE_MOTIF= yes +CFLAGS+= -I${X11BASE}/include +LDFLAGS+= -L${X11BASE}/lib PLIST_SUB+= WANT_XAUX="" RUN_DEPENDS+= ${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv .else @@ -50,14 +55,13 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" 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} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ @@ -65,11 +69,15 @@ post-patch: ${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}) + @cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.post.mk> diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/chinese/iiimf-le-newpy/files/patch-Makefile +++ b/chinese/iiimf-le-newpy/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/chinese/iiimf-le-newpy/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh b/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh deleted file mode 100644 index d38d31e628c7..000000000000 --- a/chinese/iiimf-le-newpy/files/patch-leif_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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 902678e911b0..36a755b64b14 100644 --- a/chinese/iiimf-le-newpy/files/patch-leif_configure.ac +++ b/chinese/iiimf-le-newpy/files/patch-leif_configure.ac @@ -7,15 +7,15 @@ 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" +LE_TARGETS="newpy" diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am new file mode 100644 index 000000000000..11207f269a2f --- /dev/null +++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_Makefile.am @@ -0,0 +1,12 @@ +--- leif/newpy/Makefile.am.orig Wed Mar 2 23:57:32 2005 ++++ leif/newpy/Makefile.am Wed Mar 2 23:57:57 2005 +@@ -3,7 +3,8 @@ + datadir = $(IM_LOCALEDIR)/zh_CN/newpy/data + newpy_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \ + -DCompByNewPinyin -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \ +- -I$(IM_INCLUDEDIR)/iml ++ -I$(IM_INCLUDEDIR)/iml \ ++ -DIMDIR="\"${IMDIR}\"" + newpy_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) + newpy_la_LIBADD = $(THREAD_LIBS) + newpy_la_SOURCES = NewPY.c NewPYLE.c KeysymType.c OnKeySym.c CikuOper.c \ diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c index 400adf9dcd01..abb3adb1bddf 100644 --- a/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c +++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_NewPY.c @@ -5,7 +5,7 @@ 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 */ ++ l->path = (IMDIR "/locale/zh_CN/newpy/newpy_obj.jar"); /* path */ #endif l->signature = ""; diff --git a/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am new file mode 100644 index 000000000000..14ed8d141bbc --- /dev/null +++ b/chinese/iiimf-le-newpy/files/patch-leif_newpy_xaux_Makefile.am @@ -0,0 +1,11 @@ +--- leif/newpy/xaux/Makefile.am.orig Thu Mar 3 00:00:36 2005 ++++ leif/newpy/xaux/Makefile.am Thu Mar 3 00:01:03 2005 +@@ -3,7 +3,7 @@ + datadir = $(IM_LOCALEDIR)/zh_CN/newpy + COMMONCFLAGS = $(X_CFLAGS) $(THREAD_CXX_CFLAGS) \ + -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO -DUSE_CSCONV \ +- -I$(CSCONV_DIR) ++ -I$(CSCONV_DIR) -DIMDIR="\"${IMDIR}\"" + COMMONLDFLAGS = -module $(THREAD_LDFLAGS) + aux_la_CFLAGS = $(COMMONCFLAGS) + aux_win_CFLAGS = $(COMMONCFLAGS) 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 index 1b9a1af61503..e9d2299d8bcb 100644 --- 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 @@ -5,7 +5,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" ++#define AUX_EXT (IMDIR "/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 index 838f54411388..de604ccf0d31 100644 --- 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 @@ -5,7 +5,7 @@ #include "getarg.h" -#define IMAGE_PATH "/usr/lib/im/locale/zh_CN/newpy/" -+#define IMAGE_PATH "/usr/local/lib/im/locale/zh_CN/newpy/" ++#define IMAGE_PATH (IMDIR "/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 056f02b2c6bd..db9bbf0e08c6 100644 --- a/chinese/iiimf-le-ude/Makefile +++ b/chinese/iiimf-le-ude/Makefile @@ -7,6 +7,7 @@ PORTNAME= le-ude PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -22,36 +23,41 @@ IIIMF_VER= r12_1-svn2002 USE_BZIP2= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif BUILD_WRKSRC= ${WRKSRC}/ude INSTALL_WRKSRC= ${WRKSRC}/ude PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" 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} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ ${WRKSRC}/../acfiles/im_common.m4 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}) + @cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.mk> diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/chinese/iiimf-le-ude/files/patch-Makefile +++ b/chinese/iiimf-le-ude/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/chinese/iiimf-le-ude/files/patch-leif_autogen.sh b/chinese/iiimf-le-ude/files/patch-leif_autogen.sh deleted file mode 100644 index d38d31e628c7..000000000000 --- a/chinese/iiimf-le-ude/files/patch-leif_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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 8391f93be414..43849b6bf537 100644 --- a/chinese/iiimf-le-ude/files/patch-leif_configure.ac +++ b/chinese/iiimf-le-ude/files/patch-leif_configure.ac @@ -7,15 +7,15 @@ CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" +LE_TARGETS="udt" diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am b/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am new file mode 100644 index 000000000000..6d80b3552733 --- /dev/null +++ b/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am @@ -0,0 +1,11 @@ +--- leif/ude/Makefile.am.orig Thu Mar 3 00:07:57 2005 ++++ leif/ude/Makefile.am Thu Mar 3 00:08:15 2005 +@@ -2,7 +2,7 @@ + datadir = $(IM_LOCALEDIR)/zh_CN/ude/data + udengine_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \ + -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \ +- -I$(IM_INCLUDEDIR)/iml ++ -I$(IM_INCLUDEDIR)/iml -DIMDIR="\"${IMDIR}\"" + udengine_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) + udengine_la_LIBADD = $(THREAD_LIBS) + udengine_la_SOURCES = UDEngine.c Converter.c IMHandler.c \ diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c index bec75c081379..c70fc4bea433 100644 --- a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c +++ b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c @@ -5,7 +5,7 @@ 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->path = (IMDIR "/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/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index 0f9caca8a7ef..eded6f7a6218 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -7,6 +7,7 @@ PORTNAME= le-canna PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= japanese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -24,17 +25,21 @@ USE_BZIP2= yes USE_ICONV= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} .if !defined(WITHOUT_XAUX) USE_XLIB= yes +CFLAGS+= -I${X11BASE}/include +LDFLAGS+= -L${X11BASE}/lib PLIST_SUB+= WANT_XAUX="" RUN_DEPENDS+= ${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv .else @@ -52,14 +57,13 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} -AUTOGEN_ARGS+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - --prefix=${PREFIX} ${CONFIGURE_ARGS} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ @@ -67,11 +71,15 @@ post-patch: ${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}) + @cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.post.mk> diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/japanese/iiimf-le-canna/files/patch-Makefile +++ b/japanese/iiimf-le-canna/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4 b/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/japanese/iiimf-le-canna/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/japanese/iiimf-le-canna/files/patch-leif_autogen.sh b/japanese/iiimf-le-canna/files/patch-leif_autogen.sh deleted file mode 100644 index d38d31e628c7..000000000000 --- a/japanese/iiimf-le-canna/files/patch-leif_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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 index e26d9ffb726c..4c96bb2874fe 100644 --- a/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c +++ b/japanese/iiimf-le-canna/files/patch-leif_canna_CannaLE.c @@ -1,11 +1,11 @@ ---- leif/canna/CannaLE.c Wed Oct 13 00:26:27 2004 -+++ leif/canna/CannaLE.c Thu Feb 17 01:55:18 2005 +--- leif/canna/CannaLE.c.orig Wed Oct 13 00:26:27 2004 ++++ leif/canna/CannaLE.c Wed Mar 2 23:37:14 2005 @@ -86,7 +86,7 @@ #include <dlfcn.h> #include "csconv.h" -#define CSC_PATH "/usr/lib/im/csconv/csconv.so" -+#define CSC_PATH "/usr/local/lib/im/csconv/csconv.so" ++#define CSC_PATH (IMDIR "/csconv/csconv.so") #define CSC_OPEN_LOCALE "csconv_open_locale" #define CSC_OPEN "csconv_open" #define CSC_CONV "csconv" diff --git a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am b/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am index e6ef41e17505..5283440c90a9 100644 --- a/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am +++ b/japanese/iiimf-le-canna/files/patch-leif_canna_Makefile.am @@ -1,8 +1,15 @@ ---- 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 @@ +--- leif/canna/Makefile.am.orig Mon Sep 6 17:40:47 2004 ++++ leif/canna/Makefile.am Wed Mar 2 23:37:26 2005 +@@ -1,10 +1,9 @@ -SUBDIRS = xaux - LE_FILES = CannaLE.so CannaLE_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \ -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \ + -I$(IM_INCLUDEDIR)/iml \ +- -I$(CSCONV_DIR) -g ++ -I$(CSCONV_DIR) \ ++ -DIMDIR="\"$(IMDIR)\"" + CannaLE_la_LDFLAGS = -avoid-version -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) + CannaLE_la_LIBADD = -lcanna $(THREAD_LIBS) + CannaLE_la_SOURCES = CannaLE.c 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 deleted file mode 100644 index 97229748b59b..000000000000 --- a/japanese/iiimf-le-canna/files/patch-leif_canna_xaux_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 index 616253ca25b4..d7409e9b7ec9 100644 --- a/japanese/iiimf-le-canna/files/patch-leif_configure.ac +++ b/japanese/iiimf-le-canna/files/patch-leif_configure.ac @@ -7,15 +7,15 @@ 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" +LE_TARGETS="canna" diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile index 968036fa860e..42072e94a51f 100644 --- a/japanese/iiimf-le-freewnn/Makefile +++ b/japanese/iiimf-le-freewnn/Makefile @@ -7,6 +7,7 @@ PORTNAME= le-freewnn PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= japanese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -25,11 +26,13 @@ USE_BZIP2= yes USE_ICONV= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -44,14 +47,14 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/wnn \ + ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} -AUTOGEN_ARGS+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \ - --prefix=${PREFIX} --without-x + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ @@ -59,11 +62,15 @@ post-patch: ${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}) + @cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.post.mk> diff --git a/japanese/iiimf-le-freewnn/files/patch-Makefile b/japanese/iiimf-le-freewnn/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/japanese/iiimf-le-freewnn/files/patch-Makefile +++ b/japanese/iiimf-le-freewnn/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4 b/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/japanese/iiimf-le-freewnn/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh b/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh deleted file mode 100644 index d38d31e628c7..000000000000 --- a/japanese/iiimf-le-freewnn/files/patch-leif_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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-freewnn/files/patch-leif_configure.ac b/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac index b99e2e345198..5ffdb17a57bc 100644 --- a/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac +++ b/japanese/iiimf-le-freewnn/files/patch-leif_configure.ac @@ -7,15 +7,15 @@ 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" +LE_TARGETS="freewnn" diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am index 8f6397344fe4..88801a97abe2 100644 --- a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am +++ b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_Makefile.am @@ -1,13 +1,12 @@ ---- 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 @@ +--- leif/freewnn/Makefile.am.orig Wed Mar 2 23:48:30 2005 ++++ leif/freewnn/Makefile.am Wed Mar 2 23:49:21 2005 +@@ -3,7 +3,8 @@ -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \ -I$(IM_INCLUDEDIR)/iml \ -I$(CSCONV_DIR) \ - -I/usr/include/wnn --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 ++ -DLOCALBASE="\"${LOCALBASE}\"" \ ++ -DIMDIR="\"${IMDIR}\"" + FreeWnnLE_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS) FreeWnnLE_la_LIBADD = -lwnn $(THREAD_LIBS) FreeWnnLE_la_SOURCES = freewnn.c - noinst_LTLIBRARIES = FreeWnnLE.la diff --git a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c index 84532ed858d6..255f856ea558 100644 --- a/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c +++ b/japanese/iiimf-le-freewnn/files/patch-leif_freewnn_freewnn.c @@ -5,10 +5,10 @@ #endif -#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc" -+#define WNNRCFILE "/usr/local/lib/wnn/ja_JP/wnnenvrc" ++#define WNNRCFILE (LOCALBASE "/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_PATH (IMDIR "/csconv/csconv.so") #define CSC_OPEN_LOCALE "csconv_open_locale" #define CSC_OPEN "csconv_open" #define CSC_CONV "csconv" diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index ed494d89d5bd..67408b25a711 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -7,6 +7,7 @@ PORTNAME= client-lib PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -23,12 +24,12 @@ INSTALLS_SHLIB= yes USE_BZIP2= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimcf PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -43,28 +44,48 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ ${WRKSRC}/../../acfiles/im_common.m4 pre-configure: - (cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles) - (cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig) - -do-configure: - (cd ${WRKSRC}/../EIMIL && ./autogen.sh) - (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) + @cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC}/../EIMIL && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} + @cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} + @cd ${WRKSRC}/../EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} + @cd ${WRKSRC}/../EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \ + ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} post-configure: ${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \ ${WRKSRC}/Makefile pre-build: - (cd ${WRKSRC}/../EIMIL && ${GMAKE} ${MAKE_ARGS}) + @cd ${WRKSRC}/../EIMIL && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} .include <bsd.port.post.mk> diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-client-lib/files/patch-Makefile +++ b/textproc/iiimf-client-lib/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-client-lib/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh b/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh deleted file mode 100644 index cee0709c90ed..000000000000 --- a/textproc/iiimf-client-lib/files/patch-lib_EIMIL_autogen.sh +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am index d30c6cffd03a..a5499285555e 100644 --- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am +++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_Makefile.am @@ -1,12 +1,11 @@ ---- 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 +--- lib/iiimcf/Makefile.am.orig Wed Mar 2 05:50:46 2005 ++++ lib/iiimcf/Makefile.am Wed Mar 2 05:51:11 2005 +@@ -2,7 +2,7 @@ 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 +- -export-dynamic -export-symbols libiiimcf.sym ../iiimp/libiiimp.la ++ -export-dynamic -export-symbols libiiimcf.sym -liiimp 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 + libiiimcf_la_SOURCES = iiimcf.c input-method.c attr.c commit.c context.c event.c \ + lookup_choice.c message.c preedit.c status.c trigger.c \ diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh deleted file mode 100644 index 2b25d5acb3fe..000000000000 --- a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_autogen.sh +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac new file mode 100644 index 000000000000..1f9239eeefb3 --- /dev/null +++ b/textproc/iiimf-client-lib/files/patch-lib_iiimcf_configure.ac @@ -0,0 +1,19 @@ +--- lib/iiimcf/configure.ac.orig Wed Mar 2 06:27:04 2005 ++++ lib/iiimcf/configure.ac Wed Mar 2 06:27:29 2005 +@@ -82,13 +82,13 @@ + COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp' + CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ + ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ +- ${THREAD_COMMON_CXX_CFLAGS}" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" + + CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ + ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ +- ${THREAD_COMMON_CXX_CFLAGS}" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" + +-LDFLAGS="${COMMON_LDFLAGS}" ++LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}" + + dnl -------------------------------------------------------------------------------- + dnl Section 6: compilation test diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 43c16910b154..8313328bbdd9 100644 --- a/textproc/iiimf-csconv/Makefile +++ b/textproc/iiimf-csconv/Makefile @@ -7,6 +7,7 @@ PORTNAME= csconv PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -22,10 +23,12 @@ 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 +USE_AUTOCONF_VER= 259 +#USE_AUTOHEADER_VER= 259 +WANT_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/CSConv PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -40,12 +43,13 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=CC=gcc CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ @@ -58,11 +62,19 @@ post-patch: ${WRKSRC}/converterPI/icuconv/common/config.h ${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \ ${WRKSRC}/converterPI/icuconv/common/icuconv.c + for MKFLIN in `find ${WRKSRC} -name "Makefile.in"`; do \ + ${REINPLACE_CMD} -e "/(CC)/s,-lc,,g" $${MKFLIN}; \ + ${REINPLACE_CMD} -e "/(CC)/s,-ldl,,g" $${MKFLIN}; \ + ${REINPLACE_CMD} -e '/(CC)/s,(LIBS),(LDFLAGS),g' $${MKFLIN}; \ + ${REINPLACE_CMD} -e '/(CC)/s,{LIBS},{LDFLAGS},g' $${MKFLIN}; \ + ${REINPLACE_CMD} -e "s,LIBS = @LIBS@,LDFLAGS = @LDFLAGS@,g" $${MKFLIN}; \ + done pre-configure: - (cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles) - (cd ${WRKSRC} && ${ACLOCAL} -I ../../acfiles && ${AUTOCONF}) - (cd ${WRKSRC}/converterPI/ && ${AUTOCONF}) + @cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC}/converterPI/ && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} post-configure: ${REINPLACE_CMD} \ diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-csconv/files/patch-Makefile +++ b/textproc/iiimf-csconv/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-csconv/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in b/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in deleted file mode 100644 index 7fbe7d1d7ab4..000000000000 --- a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_common_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/CSConv/converterPI/icuconv/common/Makefile.in Fri Jun 13 01:27:08 2003 -+++ lib/CSConv/converterPI/icuconv/common/Makefile.in Wed Feb 16 14:46:02 2005 -@@ -168,7 +168,7 @@ - - $(TARGET) : $(OBJECTS) - @$(RM) $@ -- $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -ldl -lpthread -lm -lc -+ $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(REQUIREDLIBS) -lpthread -lm -lc - @$(AR) $(ARFLAGS) $(CSC_ARCHIVE) $@ - - # $(SHLIB.cc) -o $@ $^ $(LIBS) diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in b/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in deleted file mode 100644 index 0b1c98616e55..000000000000 --- a/textproc/iiimf-csconv/files/patch-lib_CSConv_PI_icu_tools_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in Fri Jun 13 01:27:08 2003 -+++ lib/CSConv/converterPI/icuconv/tools/toolutil/Makefile.in Wed Feb 16 14:45:29 2005 -@@ -138,7 +138,7 @@ - - - $(TARGET) : $(OBJECTS) -- $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -ldl -lpthread -lm -lc -+ $(CC) -o $@ $(CDEBUGFLAGS) $(SHLIBLDFLAGS) $^ $(LIBICUCONV) -lpthread -lm -lc - - - diff --git a/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac b/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac index 95a9a5a0d247..01fe3194d24a 100644 --- a/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac +++ b/textproc/iiimf-csconv/files/patch-lib_CSConv_configure.ac @@ -1,6 +1,25 @@ ---- 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 @@ +--- lib/CSConv/configure.ac.orig Fri Jun 13 01:27:08 2003 ++++ lib/CSConv/configure.ac Wed Mar 2 08:43:13 2005 +@@ -28,7 +28,7 @@ + AC_INIT(csconv.h) + + AC_CONFIG_AUX_DIR(../../acfiles) +-AC_PREFIX_DEFAULT(/usr/lib/im) ++AC_PREFIX_DEFAULT(${LOCALBASE}/lib/im) + IM_INIT(../..) + + AC_CONFIG_HEADER(config.h) +@@ -297,6 +297,9 @@ + if test x"${CC}" = x"gcc" ; then + SHLIBCFLAGS='-fpic' + SHLIBLDFLAGS='-shared' ++ elif test x"${CC}" = x"cc" ; then ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' + else + SHLIBCFLAGS= + SHLIBLDFLAGS= +@@ -314,6 +317,7 @@ case "${host}" in *solaris*) platform=SOLARIS ;; *linux*) platform=LINUX ;; @@ -8,7 +27,7 @@ esac AC_SUBST(platform) -@@ -337,6 +338,12 @@ +@@ -337,6 +341,12 @@ ## Shared object suffix SO=so ;; @@ -21,3 +40,11 @@ esac +@@ -400,6 +410,7 @@ + AC_SUBST(ARFLAGS) + AC_SUBST(SHLIBCFLAGS) + AC_SUBST(SHLIBLDFLAGS) ++AC_SUBST(LDFLAGS) + AC_SUBST(SUBDIR) + AC_SUBST(ICONV_INCLUDES) + AC_SUBST(OBJS_ICONV) diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile index 1e677cd51644..be9f099d23ea 100644 --- a/textproc/iiimf-gnome-im-switcher/Makefile +++ b/textproc/iiimf-gnome-im-switcher/Makefile @@ -7,6 +7,7 @@ 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- @@ -21,13 +22,17 @@ USE_X_PREFIX= yes IIIMF_VER= r12_1-svn2002 USE_BZIP2= yes USE_REINPLACE= yes +USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= intltool gconf2 libglade2 libgnomeui \ gnomepanel gnomeprefix gnomehack -WANT_AUTOCONF_VER=253 -WANT_AUTOHEADER_VER=253 -WANT_AUTOMAKE_VER=15 -WANT_LIBTOOL_VER=15 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/gnome-im-switcher PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -42,33 +47,45 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -GNU_CONFIGURE= yes -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" +TLZ_ARGS= --copy --force +BNB_PATH= bonobo/server post-patch: - ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ + ${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \ ${WRKSRC}/../acfiles/im_common.m4 ${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \ ${WRKSRC}/configure.in 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}) + @cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS} + @cd ${WRKSRC} && intltoolize ${TLZ_ARGS} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} post-configure: - ${REINPLACE_CMD} -e "s,[(]libdir[)]/bonobo/server,{exec_prefix}/libdata/bonobo/server,g" \ - ${WRKSRC}/src/Makefile + ${REINPLACE_CMD} \ + -e "s,[(]libdir[)]/${BNB_PATH},{exec_prefix}/libdata/${BNB_PATH},g" \ + -e "/-D.*LOCALEDIR=/s,[(]datadir[)]/,&../,g" \ + ${WRKSRC}/src/Makefile ${REINPLACE_CMD} -e "s,[(]datadir[)]/gnome/,(datadir)/,g" \ - ${WRKSRC}/help/C/Makefile + ${WRKSRC}/help/C/Makefile + ${REINPLACE_CMD} \ + -e "/^datadir/s,${PREFIX}/share/gnome,${PREFIX}/share,g" \ + ${WRKSRC}/po/Makefile .include <bsd.port.post.mk> diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile +++ b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-gnome-im-switcher/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh deleted file mode 100644 index 217dda90ef81..000000000000 --- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_autogen.sh +++ /dev/null @@ -1,71 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in new file mode 100644 index 000000000000..873ae1283978 --- /dev/null +++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_configure.in @@ -0,0 +1,9 @@ +--- gnome-im-switcher/configure.in.orig Thu Oct 14 23:10:11 2004 ++++ gnome-im-switcher/configure.in Wed Mar 2 22:17:35 2005 +@@ -40,6 +40,7 @@ + GIMLET_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $GIMLET_LIBS" + GIMLET_CFLAGS="$X_CFLAGS $GIMLET_CFLAGS" + CFLAGS="$GIMLET_CFLAGS $CFLAGS" ++LDFLAGS="${LDFLAGS}" + + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist index 3aa22e0c0ccb..b8c4fa91c1a7 100644 --- a/textproc/iiimf-gnome-im-switcher/pkg-plist +++ b/textproc/iiimf-gnome-im-switcher/pkg-plist @@ -30,3 +30,63 @@ share/gnome/icons/hicolor/48x48/apps/gnome-settings-im.png @unexec rmdir %D/share/gnome/icons/hicolor/48x48 > /dev/null 2>&1 || true @unexec rmdir %D/share/gnome/icons/hicolor > /dev/null 2>&1 || true @unexec rmdir %D/share/gnome/icons > /dev/null 2>&1 || true +share/locale/ja/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 || true +share/locale/ko/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 || true +share/locale/zh_CN/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 || true +share/locale/zh_TW/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 || true +share/locale/zh_HK/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true +share/locale/de/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/de/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/de > /dev/null 2>&1 || true +share/locale/fr/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/fr/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/fr > /dev/null 2>&1 || true +share/locale/pl/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/pl/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/pl > /dev/null 2>&1 || true +share/locale/ru/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/ru/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/ru > /dev/null 2>&1 || true +share/locale/es/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/es/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/es > /dev/null 2>&1 || true +share/locale/it/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/it/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/it > /dev/null 2>&1 || true +share/locale/pt_BR/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/pt_BR > /dev/null 2>&1 || true +share/locale/sv/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/sv/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/sv > /dev/null 2>&1 || true +share/locale/cs/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/cs/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/cs > /dev/null 2>&1 || true +share/locale/hu/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/hu/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/hu > /dev/null 2>&1 || true +share/locale/bn/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/bn/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/bn > /dev/null 2>&1 || true +share/locale/gu/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/gu/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/gu > /dev/null 2>&1 || true +share/locale/hi/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/hi/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/hi > /dev/null 2>&1 || true +share/locale/pa/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/pa/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/pa > /dev/null 2>&1 || true +share/locale/ta/LC_MESSAGES/gnome-im-switcher.mo +@unexec rmdir %D/share/locale/ta/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/ta > /dev/null 2>&1 || true diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile index ece92b38bb2d..2be419361f9f 100644 --- a/textproc/iiimf-gtk/Makefile +++ b/textproc/iiimf-gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtk PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -24,12 +25,16 @@ USE_X_PREFIX= yes IIIMF_VER= r12_1-svn2002 USE_BZIP2= yes USE_REINPLACE= yes +USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= intltool gtk20 -WANT_AUTOCONF_VER=253 -WANT_AUTOHEADER_VER=253 -WANT_AUTOMAKE_VER=15 -WANT_LIBTOOL_VER=15 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimgcf PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -44,21 +49,32 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" +TLZ_ARGS= --copy --force post-patch: - ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ + ${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \ ${WRKSRC}/../acfiles/im_common.m4 pre-configure: - (cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles) - (cd ${WRKSRC}/../acfiles/ && ${TOUCH} ltconfig) - -do-configure: - (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) + @cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && glib-gettextize ${TLZ_ARGS} + @cd ${WRKSRC} && intltoolize ${TLZ_ARGS} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} ${TLZ_ARGS} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} post-install: ${X11BASE}/bin/gtk-query-immodules-2.0 > \ diff --git a/textproc/iiimf-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-gtk/files/patch-Makefile +++ b/textproc/iiimf-gtk/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-gtk/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am index 73e32f812d61..7588f7b783df 100644 --- a/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am +++ b/textproc/iiimf-gtk/files/patch-iiimgcf_Makefile.am @@ -3,7 +3,8 @@ @@ -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_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) ++im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -DIMDIR="\"${IMDIR}\"" -im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined +im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined \ + -liiimcf -liiimp diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh b/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh deleted file mode 100644 index db71f9c186bd..000000000000 --- a/textproc/iiimf-gtk/files/patch-iiimgcf_autogen.sh +++ /dev/null @@ -1,73 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac b/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac index c96ee88f74af..375a272d8a40 100644 --- a/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac +++ b/textproc/iiimf-gtk/files/patch-iiimgcf_configure.ac @@ -1,19 +1,27 @@ ---- iiimgcf/configure.ac Tue Nov 18 12:17:57 2003 -+++ iiimgcf/configure.ac Thu Feb 17 15:26:50 2005 -@@ -63,13 +63,13 @@ +--- iiimgcf/configure.ac.orig Tue Nov 18 12:17:57 2003 ++++ iiimgcf/configure.ac Wed Mar 2 22:59:24 2005 +@@ -5,7 +5,6 @@ + AC_PREREG(2.50) + AC_INIT(im-iiim.so, 0.5, im@OpenI18N.org) + dnl common initialization +-AC_CONFIG_AUX_DIR(../acfiles) + IM_INIT(..) + + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +@@ -63,13 +62,13 @@ COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp' CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include -I/usr/X11R6/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}" dnl -------------------------------------------------------------------------------- dnl Section 6: compilation test diff --git a/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c b/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c index ffc17a98f5df..dda9b5a7c069 100644 --- a/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c +++ b/textproc/iiimf-gtk/files/patch-iiimgcf_imaux.c @@ -5,7 +5,7 @@ static void iiim_aux_download (IIIMCF_downloaded_object obj); -#define AUX_BASE_DIR "/usr/lib/im/" -+#define AUX_BASE_DIR "/usr/local/lib/im/" ++#define AUX_BASE_DIR IMDIR #define IS_SPACE(len, ptr) ((0 < (len)) && \ (('\t' == *(p)) || (' ' == *(p)))) diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist index 20ba7596cbc3..4aa087166452 100644 --- a/textproc/iiimf-gtk/pkg-plist +++ b/textproc/iiimf-gtk/pkg-plist @@ -1,3 +1,18 @@ lib/gtk-2.0/2.4.0/immodules/im-iiim.so @exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules @unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules +share/locale/ja/LC_MESSAGES/iiimgcf.mo +@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 || true +share/locale/ko/LC_MESSAGES/iiimgcf.mo +@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 || true +share/locale/zh_CN/LC_MESSAGES/iiimgcf.mo +@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 || true +share/locale/zh_TW/LC_MESSAGES/iiimgcf.mo +@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 || true +share/locale/zh_HK/LC_MESSAGES/iiimgcf.mo +@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true +@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index 1be2521c681a..85b805b9251f 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -7,6 +7,7 @@ PORTNAME= le-unit PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -16,7 +17,6 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kcwu@csie.org COMMENT= IIIMF UNIcode Table based generic composition engine -BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server IIIMF_VER= r12_1-svn2002 @@ -24,12 +24,14 @@ USE_BZIP2= yes 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +AUTOMAKE_ARGS+= --add-missing +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -44,10 +46,14 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" SED=gsed +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} \ + -DIMDIR="\\\"\$${IMDIR}\\\"" +LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ @@ -55,15 +61,32 @@ post-patch: ${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}/../lib/EIMIL && ./autogen.sh) - (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) + @cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC}/../lib/EIMIL && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} + @cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} + @cd ${WRKSRC}/../lib/EIMIL && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} + @cd ${WRKSRC}/../lib/EIMIL && ${SETENV} CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${CONFIGURE_ENV} \ + ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --force --copy + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} pre-build: - (cd ${WRKSRC}/../lib/EIMIL && ${GMAKE} ${MAKE_ARGS}) + @cd ${WRKSRC}/../lib/EIMIL && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} .include <bsd.port.post.mk> diff --git a/textproc/iiimf-le-unit/files/patch-Makefile b/textproc/iiimf-le-unit/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-le-unit/files/patch-Makefile +++ b/textproc/iiimf-le-unit/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-le-unit/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-le-unit/files/patch-leif_autogen.sh b/textproc/iiimf-le-unit/files/patch-leif_autogen.sh deleted file mode 100644 index d38d31e628c7..000000000000 --- a/textproc/iiimf-le-unit/files/patch-leif_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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/textproc/iiimf-le-unit/files/patch-leif_configure.ac b/textproc/iiimf-le-unit/files/patch-leif_configure.ac index 8e401d47deef..068b07dde541 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_configure.ac +++ b/textproc/iiimf-le-unit/files/patch-leif_configure.ac @@ -7,15 +7,15 @@ 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -L/usr/X11R6/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" -LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing" +LE_TARGETS="default template sampleja sampleja2 sampleja3 testEIMIL unit" diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c index e0e203a88c8c..9d0ba2089572 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_sampleja3.c @@ -5,7 +5,7 @@ objects[obj_id].domain = "com.sun"; objects[obj_id].scope = "sampleja3"; - objects[obj_id].path = "/usr/lib/im/locale/ja/sampleja3/aux.jar"; -+ objects[obj_id].path = "/usr/local/lib/im/locale/ja/sampleja3/aux.jar"; ++ objects[obj_id].path = IMDIR "/locale/ja/sampleja3/aux.jar"; objects[obj_id].signature = ""; objects[obj_id].class_names = class_names; objects[obj_id].count_names = 1; diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h index 24d32c1913c5..88a908b383c9 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_csconv.h @@ -5,7 +5,7 @@ #endif /* !CSC_BASE_DIR_SYSTEM */ #if !defined(CSC_BASE_DIR_DEFAULT) -# define CSC_BASE_DIR_DEFAULT "/usr/lib/im/csconv/" -+# define CSC_BASE_DIR_DEFAULT "/usr/local/lib/im/csconv/" ++# define CSC_BASE_DIR_DEFAULT (IMDIR "/csconv/") #endif /* !CSC_BASE_DIR_DEFAULT */ #define CSC_IS_PATH_ABS(path) (('/' == *(path)) || \ diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h index 227cf0807c96..2adf385af32c 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_common_xaux_ext_common.h @@ -5,7 +5,7 @@ #endif -#define DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja3/help/" -+#define DEFAULT_HELP_PATH "file:/usr/local/lib/im/locale/ja/sampleja3/help/" ++#define DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja3/help/") #endif /* !XAUX_EXT_COMMON_H */ diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c index 7a243140c742..d172f71175fc 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja3_xaux_motif_sampleja3_xaux_so.c @@ -5,7 +5,7 @@ }; -#define XAUX_EXT_DIR "/usr/lib/im/locale/ja/sampleja3/xaux/motif/" -+#define XAUX_EXT_DIR "/usr/local/lib/im/locale/ja/sampleja3/xaux/motif/" ++#define XAUX_EXT_DIR (IMDIR "/locale/ja/sampleja3/xaux/motif/") xaux_class_t xaux_classes[AUX_CLASS_MAX + 1] = { { diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c index 41f47001a213..73dee74c23c1 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_conv.c @@ -5,7 +5,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_PATH (IMDIR "/csconv/csconv.so") #define CSC_OPEN_LOCALE "csconv_open_locale" #define CSC_OPEN "csconv_open" #define CSC_CONV "csconv" diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h index 9680d0b5ec0f..fe92be9b45da 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_ext_help.h @@ -5,6 +5,6 @@ #endif /* USE_CDE_HELP */ -#define DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja4/help/" -+#define DEFAULT_HELP_PATH "file:/usr/local/lib/im/locale/ja/sampleja4/help/" ++#define DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja4/help/") #endif /* !XAUX_EXT_HELP_H */ diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c index 1c952cd93ff0..b71286ef0c4c 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja4_xaux_xaux_so_sampleja4.c @@ -5,4 +5,4 @@ * primary path for external executables */ -const char *xaux_so_extexec_path = "/usr/lib/im/locale/ja/sampleja4/xaux"; -+const char *xaux_so_extexec_path = "/usr/local/lib/im/locale/ja/sampleja4/xaux"; ++const char *xaux_so_extexec_path = IMDIR "/locale/ja/sampleja4/xaux"; diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c index 5e3752c68d00..36c2ab4a4775 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja_sampleja.c @@ -5,7 +5,7 @@ l->path = "d:\\sampleja_obj.jar"; /* path */ #else - l->path = "/usr/lib/im/locale/ja/sampleja/sampleja_obj.jar"; /* path */ -+ l->path = "/usr/local/lib/im/locale/ja/sampleja/sampleja_obj.jar"; /* path */ ++ l->path = IMDIR "/locale/ja/sampleja/sampleja_obj.jar"; /* path */ #endif l->signature = ""; l->class_names = class_names; diff --git a/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c index 0fa480eff443..b93bd2182665 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sampleja_xaux_aux_so.c @@ -5,7 +5,7 @@ #define HTT_AUX_PROP1_NAME "htt_aux_sample_prop1" -#define AUX_EXT "/usr/lib/im/locale/ja/sampleja/aux_ext" -+#define AUX_EXT "/usr/local/lib/im/locale/ja/sampleja/aux_ext" ++#define AUX_EXT (IMDIR "/locale/ja/sampleja/aux_ext") typedef struct _aux_icid { aux_t * aux; diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c index d0f499a61e8c..d05cba8a0ca8 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_KeyboardConfig.c @@ -14,7 +14,7 @@ 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); ++ sprintf(path_name, IMDIR "/locale/%s", lang_name); DEBUG_printf("path_name:%s\n", path_name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c index 3c9e9fa63826..6a928a74cf4e 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_LookupImpl.c @@ -5,7 +5,7 @@ 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); ++ sprintf(path_name, IMDIR "/locale/%s", lang_name); ret = read_keyboard_config_file(path_name, DEFAULT_SYMBOLS_CONFIG_FILE); } diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c index 22805cfea104..6943cf08d998 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_OptionMessage.c @@ -5,7 +5,7 @@ nLocaleID = get_encodeid_from_locale(locale_name); lang_name = get_langname_from_locale(locale_name); - sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME); gCatd = catopen(file_name, 0); if (gCatd == (nl_catd)-1) printf("WARNING: Could not open message catalog: %s\n", name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c index 1b4518abf5b7..0757a751d2b6 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_SelectMessage.c @@ -5,7 +5,7 @@ nLocaleID = get_encodeid_from_locale(locale_name); lang_name = get_langname_from_locale(locale_name); - sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME); gCatd = catopen(file_name, 0); if (gCatd == (nl_catd)-1) printf("WARNING: Could not open message catalog: %s\n", name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c index 6a8702a37fb2..ee83935a6dc7 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_auxwin_UtilityConfig.c @@ -5,7 +5,7 @@ DEBUG_printf("lang_name:%s\n", lang_name); - sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME); ++ sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME); DEBUG_printf("file_name:%s\n", file_name); read_utility_config_file(file_name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h b/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h index 0ea0099c530f..2edbc6c99ebe 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_include_hzinput.h @@ -5,7 +5,7 @@ #define ENGINE_INITIATED 3 -#define DEFAULT_ENGINE_PATH "/usr/lib/im/locale" -+#define DEFAULT_ENGINE_PATH "/usr/local/lib/im/locale" ++#define DEFAULT_ENGINE_PATH (IMDIR "/locale") #define DEFAULT_DICT_PATH "data" #define COMMON_ENGINE_PATH "common" #define CODETABLE_ENGINE_NAME "ctim" diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c b/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c index 449c4352b8a7..94ec2b9e4f11 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_common_leif_qjbj_punct.c @@ -5,7 +5,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); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME); DEBUG_printf("file_name:%s\n", file_name); fd = fopen(file_name, "r"); @@ -14,7 +14,7 @@ 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); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME); DEBUG_printf("file_name:%s\n", file_name); fd = fopen(file_name, "r"); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c index 2084f4a76ba2..3e4228b44977 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxobj_xaux_so.c @@ -5,7 +5,7 @@ #define XAUX_CLASS_MAX 7 -#define XAUX_EXT_DIR "/usr/lib/im/locale/ko_KR/" -+#define XAUX_EXT_DIR "/usr/local/lib/im/locale/ko_KR/" ++#define XAUX_EXT_DIR (IMDIR "/locale/ko_KR/") CARD16 aux_utfname_palette[] = { 'c','o','m','.','s','u','n','.', diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c index 06aba51136f1..f590d7d2c29e 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_auxwin_gtk_keyboard_config.c @@ -5,7 +5,7 @@ lang_name = (char *) strdup ("ko_KR"); - sprintf(path_name, "/usr/lib/im/locale/%s", lang_name); -+ sprintf(path_name, "/usr/local/lib/im/locale/%s", lang_name); ++ sprintf(path_name, IMDIR "/locale/%s", lang_name); free (lang_name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h index 319e418ef8af..a36049c8c07c 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_hanja_dic.h @@ -5,10 +5,10 @@ #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" ++#define SYSPATH (IMDIR "/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" ++#define SYSPATH (IMDIR "/locale/ko_KR/common/data") #endif #define SYSNAME "syshjd" #define NULNAME "nulhjd" diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h index 0a799e5ec9bb..d74d5276e73c 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_koinput.h @@ -5,7 +5,7 @@ #define ENGINE_INITIATED 3 -#define DEFAULT_ENGINE_PATH "/usr/lib/im/locale" -+#define DEFAULT_ENGINE_PATH "/usr/local/lib/im/locale" ++#define DEFAULT_ENGINE_PATH (IMDIR "/locale") #define DEFAULT_DICT_PATH "data" #define COMMON_ENGINE_PATH "common" #define LANGNAME "ko_KR" diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h index c828a80203ca..99d8f185d771 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_include_le-options.h @@ -5,7 +5,7 @@ #endif -#define DEFAULT_KOLE_OPTION_FILE "/usr/lib/im/locale/ko_KR/kole.conf" -+#define DEFAULT_KOLE_OPTION_FILE "/usr/local/lib/im/locale/ko_KR/kole.conf" ++#define DEFAULT_KOLE_OPTION_FILE (IMDIR "/locale/ko_KR/kole.conf") /* NAME of Options */ #define STR_OPTION_CHARSET "charset" #define STR_OPTION_DELETION "delete by jaso" diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c index 7a7d2137ec28..43866369af87 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_leif_qjbj_punct.c @@ -5,7 +5,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); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, QJBJ_FILE_NAME); logf("file_name:%s\n", file_name); fd = fopen(file_name, "r"); @@ -14,7 +14,7 @@ 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); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, PUNCT_FILE_NAME); logf("file_name:%s\n", file_name); fd = fopen(file_name, "r"); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c index 8b369307cc42..e2ce32bd7fa7 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_korea_lookupbuf.c @@ -5,7 +5,7 @@ fp = fopen (argv[1], "w"); - construct_binary_tree_from_file ("/usr/lib/im/locale/ko_KR/common/data/hhdict", -+ construct_binary_tree_from_file ("/usr/local/lib/im/locale/ko_KR/common/data/hhdict", ++ construct_binary_tree_from_file (IMDIR "/locale/ko_KR/common/data/hhdict", &trees, &n_trees); mthd_return = dictionary_search_hanja_candidates_in_utf16 (ga, &n_candidates, &cand ); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c index 9d15475f37a5..61aaeeae6dd8 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxobj_xaux_so.c @@ -5,7 +5,7 @@ #define XAUX_CLASS_MAX 4 -#define XAUX_EXT_DIR "/usr/lib/im/locale/th_TH/" -+#define XAUX_EXT_DIR "/usr/local/lib/im/locale/th_TH/" ++#define XAUX_EXT_DIR (IMDIR "/locale/th_TH/") CARD16 aux_utfname_palette[] = { 'c','o','m','.','s','u','n','.', diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c index 6a02587f5c8c..008cb30d2e53 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_OptionMessage.c @@ -5,7 +5,7 @@ nLocaleID = get_encodeid_from_locale(locale_name); lang_name = get_langname_from_locale(locale_name); - sprintf(file_name, "/usr/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/common/%s", lang_name, MSG_FILE_NAME); ++ sprintf(file_name, IMDIR "/locale/%s/common/%s", lang_name, MSG_FILE_NAME); gCatd = catopen(file_name, 0); if (gCatd == (nl_catd)-1) printf("WARNING: Could not open message catalog: %s\n", name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c index 1b236c5e0b4f..fbe0c5aa4bf2 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_auxwin_UtilityConfig.c @@ -5,7 +5,7 @@ DEBUG_printf("lang_name:%s\n", lang_name); - sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME); ++ sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME); DEBUG_printf("file_name:%s\n", file_name); read_utility_config_file(file_name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c b/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c index d1f1d636f027..d6722bfb459b 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_th_leif_thai_le.c @@ -5,7 +5,7 @@ Bool if_le_OpenIF(iml_if_t * If) { - char *keymap_config_file = "/usr/lib/im/locale/th_TH/thai_keymap.cfg"; -+ char *keymap_config_file = "/usr/local/lib/im/locale/th_TH/thai_keymap.cfg"; ++ char *keymap_config_file = IMDIR "/locale/th_TH/thai_keymap.cfg"; TThaiKeymapList *pThaiKeymapList = &gThaiKeymapList; DEBUG_printf("if_le_OpenIF ====\n"); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c index 300812b876f7..5cdb2980ca60 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxobj_xaux_so.c @@ -5,7 +5,7 @@ #endif -#define XAUX_EXT_DIR "/usr/lib/im/locale/zh_CN/" -+#define XAUX_EXT_DIR "/usr/local/lib/im/locale/zh_CN/" ++#define XAUX_EXT_DIR (IMDIR "/locale/zh_CN/") CARD16 aux_utfname_palette[] = { 'c','o','m','.','s','u','n','.', diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c index a2b1a7ff5b7f..2cbf82f6ebfa 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_auxwin_gtk_UtilityConfig.c @@ -5,7 +5,7 @@ DEBUG_printf("lang_name:%s\n", lang_name); - sprintf(file_name, "/usr/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/%s", lang_name, UTILITY_FILE_NAME); ++ sprintf(file_name, IMDIR "/locale/%s/%s", lang_name, UTILITY_FILE_NAME); DEBUG_printf("file_name:%s\n", file_name); read_utility_config_file(file_name); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c index 946a1e129f9a..89f0a0a06427 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_CN_newpy_NewPY.c @@ -5,7 +5,7 @@ #define PUNCT_ENGLISH 1 -#define CIKU_DATA_PATH "/usr/lib/im/locale/zh_CN/common/data" -+#define CIKU_DATA_PATH "/usr/local/lib/im/locale/zh_CN/common/data" ++#define CIKU_DATA_PATH (IMDIR "/locale/zh_CN/common/data") JINT nGlobalSpMode; /* ZRM, CStar, ABC */ diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c index bd0b13cff264..c49a92bca109 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_auxobj_xaux_so.c @@ -5,7 +5,7 @@ #endif -#define XAUX_EXT_DIR "/usr/lib/im/locale/zh_HK/" -+#define XAUX_EXT_DIR "/usr/local/lib/im/locale/zh_HK/" ++#define XAUX_EXT_DIR (IMDIR "/locale/zh_HK/") CARD16 aux_utfname_palette[] = { 'c','o','m','.','s','u','n','.', diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h index 731a57ee5e88..a62d350b5916 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_HK_input_methods_newzy_CikuOper.h @@ -5,7 +5,7 @@ #define SINGLEHZ_DSP_FULL 2 -#define CIKU_DATA_PATH "/usr/lib/im/locale/zh_HK/common/data" -+#define CIKU_DATA_PATH "/usr/local/lib/im/locale/zh_HK/common/data" ++#define CIKU_DATA_PATH (IMDIR "/locale/zh_HK/common/data") typedef struct _CizuItem { UCHAR szLine[CIZU_ITEM_LEN]; /* Org Line read from file */ diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c index 11aafb385f52..6d53fc6b8eb3 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_auxobj_xaux_so.c @@ -5,7 +5,7 @@ #endif -#define XAUX_EXT_DIR "/usr/lib/im/locale/zh_TW/" -+#define XAUX_EXT_DIR "/usr/local/lib/im/locale/zh_TW/" ++#define XAUX_EXT_DIR (IMDIR "/locale/zh_TW/") CARD16 aux_utfname_palette[] = { 'c','o','m','.','s','u','n','.', diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c deleted file mode 100644 index fd656f3815d5..000000000000 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_config.c +++ /dev/null @@ -1,11 +0,0 @@ ---- leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_config.c Fri Mar 26 18:13:39 2004 -+++ leif/sun_le_asia/zh_TW/input_methods/dayi/dayi_config.c Wed Feb 16 20:46:10 2005 -@@ -63,7 +63,7 @@ - The format of Dayi configure file as follow: - - [ base_dir ] --path=/usr/lib/im/locale/zh_TW -+path=/usr/lcoal/lib/im/locale/zh_TW - - [ data_file ] - file=data/dayi.data diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c index 91ed4aa466a3..356a2e3d730f 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_dayi_dayi_im.c @@ -5,7 +5,7 @@ return(-1); - sprintf(file_name, "/usr/lib/im/locale/%s/common/dayi.cfg", core->envinfo.lang_name); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/common/dayi.cfg", core->envinfo.lang_name); ++ sprintf(file_name, IMDIR "/locale/%s/common/dayi.cfg", core->envinfo.lang_name); ret = DayiData_Init(file_name, pDayiData); if (ret == DAYI_ERROR) { DayiData_Free(pDayiData); diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h index b0cb267418d6..baf98426a5df 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_newzy_CikuOper.h @@ -5,7 +5,7 @@ #define SINGLEHZ_DSP_FULL 2 -#define CIKU_DATA_PATH "/usr/lib/im/locale/zh_TW/common/data" -+#define CIKU_DATA_PATH "/usr/local/lib/im/locale/zh_TW/common/data" ++#define CIKU_DATA_PATH (IMDIR "/locale/zh_TW/common/data") typedef struct _CizuItem { UCHAR szLine[CIZU_ITEM_LEN]; /* Org Line read from file */ diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c deleted file mode 100644 index 92c124ff99bf..000000000000 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_config.c +++ /dev/null @@ -1,11 +0,0 @@ ---- leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_config.c Fri Mar 26 18:13:39 2004 -+++ leif/sun_le_asia/zh_TW/input_methods/zhuyin/zhuyin_config.c Wed Feb 16 20:46:28 2005 -@@ -64,7 +64,7 @@ - The format of Zhuyin configure file as follow: - - [base_dir] --path=/usr/lib/im/locale/zh_TW -+path=/usr/local/lib/im/locale/zh_TW - - [data_file] - file=data/zhuyin.data diff --git a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c index ebf1bdaeec5e..64c4f0713dd1 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c +++ b/textproc/iiimf-le-unit/files/patch-leif_sun_zh_TW_im_zhuyin_zhuyin_im.c @@ -5,7 +5,7 @@ return(-1); - sprintf(file_name, "/usr/lib/im/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name); -+ sprintf(file_name, "/usr/local/lib/im/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name); ++ sprintf(file_name, IMDIR "/locale/%s/common/zhuyin.cfg", core->envinfo.lang_name); ret = ZhuyinData_Init(file_name, pZhuyinData); if (ret == ZHUYIN_ERROR) { ZhuyinData_Free(pZhuyinData); diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h b/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h index a6f957e6a1e2..10545897d714 100644 --- a/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h +++ b/textproc/iiimf-le-unit/files/patch-leif_unit_include_unit_input.h @@ -5,7 +5,7 @@ #define ENGINE_INITIATED 3 -#define DEFAULT_ENGINE_PATH "/usr/lib/im/locale" -+#define DEFAULT_ENGINE_PATH "/usr/local/lib/im/locale" ++#define DEFAULT_ENGINE_PATH (IMDIR "/locale") #define DEFAULT_DICT_PATH "data" #define COMMON_ENGINE_PATH "common" #define GENERIC_IM_TABLE_NAME "GENERIC_IM_TABLE" diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am deleted file mode 100644 index 48e1554bfb15..000000000000 --- a/textproc/iiimf-le-unit/files/patch-leif_unit_phonetic_im_mapfile_Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 - rm -f $*.tc - - noinst_LTLIBRARIES = libphonetic_temp.la diff --git a/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am b/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am deleted file mode 100644 index 07ce24b9d565..000000000000 --- a/textproc/iiimf-le-unit/files/patch-leif_unit_xaux_common_Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ ---- leif/unit/xaux_common/Makefile.am Thu Jun 12 20:41:27 2003 -+++ leif/unit/xaux_common/Makefile.am Wed Feb 16 17:01:09 2005 -@@ -1,4 +1,5 @@ - libxaux_common_la_CFLAGS = -I../include -+libxaux_common_la_LDFLAGS = -lintl - libxaux_common_la_SOURCES = logf.c encode.c - noinst_LTLIBRARIES = libxaux_common.la - diff --git a/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh b/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh deleted file mode 100644 index cee0709c90ed..000000000000 --- a/textproc/iiimf-le-unit/files/patch-lib_EIMIL_autogen.sh +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index 16ffcec2a600..a56549379441 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -7,6 +7,7 @@ PORTNAME= protocol-lib PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -21,11 +22,12 @@ INSTALLS_SHLIB= yes USE_BZIP2= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/lib/iiimp PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -40,20 +42,25 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ ${WRKSRC}/../../acfiles/im_common.m4 pre-configure: - (cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles) - (cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig) - -do-configure: - (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) + @cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.post.mk> diff --git a/textproc/iiimf-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-protocol-lib/files/patch-Makefile +++ b/textproc/iiimf-protocol-lib/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh deleted file mode 100644 index fdb9cf2669cd..000000000000 --- a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_autogen.sh +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac new file mode 100644 index 000000000000..810ffa4fd184 --- /dev/null +++ b/textproc/iiimf-protocol-lib/files/patch-lib_iiimp_configure.ac @@ -0,0 +1,28 @@ +--- lib/iiimp/configure.ac.orig Tue Jul 13 09:38:42 2004 ++++ lib/iiimp/configure.ac Wed Mar 2 06:32:37 2005 +@@ -26,7 +26,7 @@ + + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + AM_CONFIG_HEADER(config.h) +-AM_PROG_LIBTOOL ++AC_PROG_LIBTOOL + + dnl -------------------------------------------------------------------------------- + dnl Section 2: Autoheader +@@ -78,13 +78,13 @@ + + CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ + ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ +- ${THREAD_COMMON_CXX_CFLAGS}" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" + + CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ + ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ +- ${THREAD_COMMON_CXX_CFLAGS}" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" + +-LDFLAGS="${COMMON_LDFLAGS}" ++LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}" + + dnl -------------------------------------------------------------------------------- + dnl Section 6: compilation test diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index 122b2e35ebc6..4c372a952c09 100644 --- a/textproc/iiimf-server/Makefile +++ b/textproc/iiimf-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= server PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -23,12 +24,14 @@ USE_RC_SUBR= htt.sh USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= intltool pkgconfig libxml2 +USE_GNOME= pkgconfig libxml2 USE_OPENSSL= yes -WANT_AUTOCONF_VER=253 -WANT_AUTOHEADER_VER=253 -WANT_AUTOMAKE_VER=15 -WANT_LIBTOOL_VER=15 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimsf PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -43,10 +46,17 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +.if defined(WITH_DEBUG) +CFLAGS+= -g -ggdb -DDEBUG +.endif + +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ @@ -56,11 +66,15 @@ post-patch: ${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}) + @cd ${WRKSRC}/.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} post-configure: ${REINPLACE_CMD} -e "s,\$${prefix}/var,/var,g" \ diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-server/files/patch-Makefile +++ b/textproc/iiimf-server/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-server/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-server/files/patch-iiimsf_autogen.sh b/textproc/iiimf-server/files/patch-iiimsf_autogen.sh deleted file mode 100644 index fe4fb7cc2707..000000000000 --- a/textproc/iiimf-server/files/patch-iiimsf_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-server/files/patch-iiimsf_configure.ac b/textproc/iiimf-server/files/patch-iiimsf_configure.ac new file mode 100644 index 000000000000..2993c93bca78 --- /dev/null +++ b/textproc/iiimf-server/files/patch-iiimsf_configure.ac @@ -0,0 +1,19 @@ +--- iiimsf/configure.ac.orig Wed Mar 2 21:00:09 2005 ++++ iiimsf/configure.ac Wed Mar 2 21:00:37 2005 +@@ -236,13 +236,13 @@ + + CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ + ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ +- ${THREAD_CXX_CFLAGS}" ++ ${THREAD_CXX_CFLAGS} ${CFLAGS}" + + CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ + ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ +- ${THREAD_CXX_CFLAGS}" ++ ${THREAD_CXX_CFLAGS} ${CXXFLAGS}" + +-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" + + if test $HAVE_LIBCRYPT = "yes"; then + LIBCRYPT_FLAGS="-lcrypt" diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp index c7b0457f8673..6e598be003d4 100644 --- a/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp +++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMSvrCfg.cpp @@ -5,7 +5,7 @@ IMSvrCfg::initialize() { - initstr(IMDIR, "IM main directory.", "/usr/lib/im"); -+ initstr(IMDIR, "IM main directory.", "/usr/local/lib/im"); ++ initstr(IMDIR, "IM main directory.", IM_DIRECTORY); initstr(BASICLOCALE, "Locale used by default", "C"); #ifdef WIN32 initstr(IFPATHNAME, "Language Engine module directory", @@ -13,16 +13,7 @@ #else initstr(IFPATHNAME, "Language Engine module directory", - "/usr/lib/im/leif"); -+ "/usr/local/lib/im/leif"); ++ (IM_DIRECTORY "/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"); diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp b/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp index 3df7e74e17a2..cf28bc34cfd1 100644 --- a/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp +++ b/textproc/iiimf-server/files/patch-iiimsf_src_IMXMLUtil.cpp @@ -5,7 +5,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 mod(IM_DIRECTORY "/leif/freewnnle.so"); string lang("ja"); string out("foo.conf"); @@ -14,7 +14,7 @@ */ printf("\n\n*** remove\n"); - mod = "/usr/lib/im/leif/CannaLE.so"; -+ mod = "/usr/local/lib/im/leif/CannaLE.so"; ++ mod = IM_DIRECTORY "/leif/CannaLE.so"; xml.removemodule(mod, lang); /* for (IMModuleInfoVec::iterator i = lev->begin (); i != lev->end (); i++) { diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am index eab0bfc200bc..b64512cc3310 100644 --- a/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am +++ b/textproc/iiimf-server/files/patch-iiimsf_src_Makefile.am @@ -1,6 +1,15 @@ --- 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 @@ ++++ iiimsf/src/Makefile.am Wed Mar 2 21:18:10 2005 +@@ -4,7 +4,7 @@ + -DXMLCONFDIR="\"$(XMLCONFDIR)\"" \ + -DSOCKETDIR="\"$(SOCKETDIR)\"" \ + -DSEGVLOGGER="\"$(libexecdir)/iiimf-segv-logger\"" \ +- -g \ ++ -DIM_DIRECTORY="\"${IMDIR}\"" \ + $(NULL) + + libiiimsf_la_SOURCES = \ +@@ -22,6 +21,7 @@ libiiimsf_la_LIBADD = \ $(TLS_LIBS) \ $(XML_LIBS) \ @@ -8,7 +17,7 @@ $(NULL) sbindir = $(IMBINDIR) -@@ -56,7 +57,6 @@ +@@ -56,7 +56,6 @@ htt_server_LDADD = \ $(LIB_DIR)/iml/libiml.la \ @@ -16,7 +25,7 @@ $(SOCKET_LIBS) \ $(LIBCRYPT_FLAGS) \ $(LIBPAM_FLAGS) \ -@@ -72,7 +72,6 @@ +@@ -72,7 +71,6 @@ $(NULL) iiimf_le_tools_LDADD = \ $(XML_LIBS) \ @@ -24,11 +33,12 @@ libiiimsf.la \ $(NULL) -@@ -82,6 +81,7 @@ +@@ -82,7 +80,7 @@ iiimf_segv_logger_CFLAGS = \ -DLOGDIR="\"$(localstatedir)/log/iiim\"" \ -DDATADIR="\"$(gdbcmddir)\"" \ +- -g \ + -DIMBINDIR="\"$(IMBINDIR)\"" \ - -g \ $(NULL) gdbcmddir = $(datadir)/iiim + gdbcmd_DATA = \ diff --git a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c index 9ba4519fd547..9124497e6753 100644 --- a/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c +++ b/textproc/iiimf-server/files/patch-iiimsf_src_watchdog.c @@ -5,7 +5,7 @@ char **argv; { - const char *httpath="/usr/lib/im/htt_server" ; /* SUNWiiimf Only */ -+ const char *httpath="/usr/local/lib/im/htt_server" ; /* SUNWiiimf Only */ ++ const char *httpath=IM_DIRECTORY "/htt_server" ; /* SUNWiiimf Only */ pid_t pgrp; void (*disp)(int); char **new_argv, **pp; diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index 047003f3ef0c..2363398e7ba8 100644 --- a/textproc/iiimf-x-lib/Makefile +++ b/textproc/iiimf-x-lib/Makefile @@ -7,6 +7,7 @@ PORTNAME= x-lib PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -23,14 +24,16 @@ RUN_DEPENDS= ${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csc IIIMF_VER= r12_1-svn2002 USE_BZIP2= yes USE_REINPLACE= yes +USE_GETTEXT= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/xiiimp.so PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -45,20 +48,27 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ ${WRKSRC}/../../acfiles/im_common.m4 pre-configure: - (cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles) - (cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig) - -do-configure: - (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) + @cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.post.mk> diff --git a/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-x-lib/files/patch-Makefile +++ b/textproc/iiimf-x-lib/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh deleted file mode 100644 index b0e62e6664b6..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_autogen.sh +++ /dev/null @@ -1,57 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac index 457376dd7d64..33d427a3c4d0 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac @@ -7,15 +7,15 @@ 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/local/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/local/lib -lintl" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" dnl -------------------------------------------------------------------------------- dnl Section 6: compilation test diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am index cbedc9d9dfef..e9f06efa8ade 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am @@ -1,14 +1,14 @@ ---- 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 +--- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig Tue Mar 23 07:37:51 2004 ++++ iiimxcf/xiiimp.so/iiimp/Makefile.am Thu Mar 3 00:37:54 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 ++ -I$(CSCONV_DIR) -DUSE_CSCONV -DIMDIR="\"${IMDIR}\"" xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \ - -module -export-dynamic -no-undefined -+ -module -export-dynamic -no-undefined -L/usr/local/include \ ++ -module -export-dynamic -no-undefined \ + -liiimcf -liiimp # On GNU/Linux system, libtool does not take care of -no-undefined so that # you have to add the following by yourself to check undefined symbols. diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h index dbac66f5ec97..660c30c0fc1a 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h @@ -5,7 +5,7 @@ #endif /* !CSC_BASE_DIR_SYSTEM */ #if !defined(CSC_BASE_DIR_DEFAULT) -# define CSC_BASE_DIR_DEFAULT "/usr/lib/im/csconv/" -+# define CSC_BASE_DIR_DEFAULT "/usr/local/lib/im/csconv/" ++# define CSC_BASE_DIR_DEFAULT (IMDIR "/csconv/") #endif /* !CSC_BASE_DIR_DEFAULT */ #define CSC_IS_PATH_ABS(path) (('/' == *(path)) || \ diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c index cad0f0123107..3b08439ac146 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c @@ -5,7 +5,7 @@ -#define AUX_BASE_DIR "/usr/lib/im/" -+#define AUX_BASE_DIR "/usr/local/lib/im/" ++#define AUX_BASE_DIR IMDIR #if defined(__sparcv9) #define SPARCV9_DIR "sparcv9/" diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c index 29d74ccbad92..bfeb601a75d0 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c @@ -5,7 +5,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_PATH (IMDIR "/csconv/csconv.so") #define CSC_OPEN_LOCALE "csconv_open_locale" #define CSC_OPEN "csconv_open" #define CSC_CONV "csconv" diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c index aaf2ea2f6f0a..dbbb091828df 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c @@ -5,7 +5,7 @@ #ifndef XLOCALEDIR -#define XLOCALEDIR "/usr/lib/im/modules" -+#define XLOCALEDIR "/usr/local/lib/im/modules" ++#define XLOCALEDIR (IMDIR "/modules") #endif static const char* diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c index 7390a9f3fd88..2ba2ba2442de 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c @@ -5,7 +5,7 @@ #ifndef IMLOCALEDIR -#define IMLOCALEDIR "/usr/lib/im/locale" -+#define IMLOCALEDIR "/usr/local/lib/im/locale" ++#define IMLOCALEDIR (IMDIR "/locale") #endif #define iscomment(ch) ((ch) == '\0' || (ch) == '#') diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index 94a59584e382..7a82a8f54d8f 100644 --- a/textproc/iiimf-x/Makefile +++ b/textproc/iiimf-x/Makefile @@ -7,6 +7,7 @@ PORTNAME= x PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//} +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -24,12 +25,13 @@ IIIMF_VER= r12_1-svn2002 USE_BZIP2= 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 +USE_AUTOCONF_VER= 259 +USE_AUTOHEADER_VER= 259 +USE_AUTOMAKE_VER= 19 +WANT_LIBTOOL_VER= 15 + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/iiimxcf/htt_xbe PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} @@ -44,20 +46,27 @@ IGNORE= "It is supported on FreeBSD 5.3 and later" IGNORE= "${ARCH} is not support." .endif -MAKE_ARGS+= LIBTOOL="${LIBTOOL} --tag=CXX" +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \ AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \ - LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} + LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ + ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}" post-patch: ${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \ ${WRKSRC}/../../acfiles/im_common.m4 pre-configure: - (cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles) - (cd ${WRKSRC}/../../acfiles/ && ${TOUCH} ltconfig) - -do-configure: - (cd ${WRKSRC} && ./autogen.sh --prefix=${PREFIX}) + @cd ${WRKSRC}/../.. && ${GMAKE} ${UPDATE_ARGS} update-acfiles + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \ + -I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR} + @cd ${WRKSRC} && ${REINPLACE_CMD} \ + -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${LIBTOOLFILES} + @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} .include <bsd.port.post.mk> diff --git a/textproc/iiimf-x/files/patch-Makefile b/textproc/iiimf-x/files/patch-Makefile index 85df0e345035..bcc2cb24a1c8 100644 --- a/textproc/iiimf-x/files/patch-Makefile +++ b/textproc/iiimf-x/files/patch-Makefile @@ -13,7 +13,7 @@ update-acfiles: cd acfiles && \ - $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \ -+ $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ ++ $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \ rm -f Makefile.in aclocal.m4 config: diff --git a/textproc/iiimf-x/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-x/files/patch-acfiles_check_sys.m4 new file mode 100644 index 000000000000..8626eeae1fd1 --- /dev/null +++ b/textproc/iiimf-x/files/patch-acfiles_check_sys.m4 @@ -0,0 +1,38 @@ +--- acfiles/check_sys.m4.orig Tue Sep 14 13:31:27 2004 ++++ acfiles/check_sys.m4 Wed Mar 2 08:39:25 2005 +@@ -203,6 +203,11 @@ + CXX=${CC} + fi + ;; ++ cc*:*) ++ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall" ++ SHLIBCFLAGS='-fpic' ++ SHLIBLDFLAGS='-shared' ++ ;; + *) + DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g" + ;; +@@ -249,8 +254,8 @@ + COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux" + ;; + *freebsd*) +- THREAD_LDFLAGS="-pthread" +- PTHREAD_LIBS="" ++ THREAD_LDFLAGS="" ++ PTHREAD_LIBS="${PTHREAD_LIBS}" + ;; + esac + +@@ -288,9 +293,9 @@ + THREAD_CXX_CFLAGS="-mt" + HAVE_THREAD="uithread" + ;; +- *freebsd*@gcc:*) +- THREAD_LDFLAGS="-pthread" +- THREAD_LIBS="" ++ *freebsd*@cc:*|*freebsd*@gcc:*) ++ THREAD_LDFLAGS="" ++ THREAD_LIBS="${PTHREAD_LIBS}" + HAVE_THREAD="freebsd-pthread" + ;; + *linux*) diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh deleted file mode 100644 index f0f4457d5676..000000000000 --- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_autogen.sh +++ /dev/null @@ -1,93 +0,0 @@ ---- 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 diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac index 4a523a953002..61e6d3e830bc 100644 --- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac +++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_configure.ac @@ -7,15 +7,15 @@ 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" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \ ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \ - ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} -I/usr/X11R6/include" ++ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" -LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}" -+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} -L/usr/X11R6/lib" ++LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}" dnl -------------------------------------------------------------------------------- dnl Section 6: compilation test diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_Makefile.in b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_Makefile.in new file mode 100644 index 000000000000..a3a3771ab9d4 --- /dev/null +++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_Makefile.in @@ -0,0 +1,21 @@ +--- iiimxcf/htt_xbe/lib/IMdkit/Makefile.in.orig Wed May 7 12:25:24 2003 ++++ iiimxcf/htt_xbe/lib/IMdkit/Makefile.in Thu Mar 3 16:25:30 2005 +@@ -57,6 +57,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + ++IMDIR = @IMDIR@ + IM_TOPDIR = @IM_TOPDIR@ + IM_INCLUDEDIR = @IM_INCLUDEDIR@ + CSCONV_DIR = @CSCONV_DIR@ +@@ -74,8 +75,8 @@ + LINKER = @LINKER@ + RANLIB = @RANLIB@ + +-CFLAGS = @CFLAGS@ +-CXXFLAGS = @CXXFLAGS@ ++CFLAGS = -DIMDIR="\"${IMDIR}\"" @CFLAGS@ ++CXXFLAGS = -DIMDIR="\"${IMDIR}\"" @CXXFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp index 293e329921d1..3e6552ed63fc 100644 --- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp +++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_lib_IM_common_XIMPublic.cpp @@ -5,7 +5,7 @@ #define XIIIMP_PATH "/usr/openwin/lib/locale/common/xiiimp.so.2" #else /* Linux */ -#define XIIIMP_PATH "/usr/lib/im/xiiimp.so.2" -+#define XIIIMP_PATH "/usr/local/lib/im/xiiimp.so.2" ++#define XIIIMP_PATH (IMDIR "/xiiimp.so.2") #endif /* Linux */ #include <stdio.h> diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am new file mode 100644 index 000000000000..9d24150b59be --- /dev/null +++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_Makefile.am @@ -0,0 +1,11 @@ +--- iiimxcf/htt_xbe/src/Makefile.am.orig Thu Mar 3 00:29:58 2005 ++++ iiimxcf/htt_xbe/src/Makefile.am Thu Mar 3 00:30:30 2005 +@@ -4,7 +4,7 @@ + htt_xbe_LDADD = -L../lib/IMdkit -lIMd_ximp -lIMd_r6im $(X_LIBS) -lXt $(THREAD_LIBS) + htt_xbe_SOURCES = ResourceDB.cpp main.cpp + +-httx_CFLAGS = $(X_CFLAGS) ++httx_CFLAGS = $(X_CFLAGS) -DIMDIR="\"${IMDIR}\"" + httx_LDADD = $(X_LIBS) -lXt + httx_SOURCES = watchdog.c + diff --git a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c index 2fe21fde1504..1136ab8d847e 100644 --- a/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c +++ b/textproc/iiimf-x/files/patch-iiimxcf_htt_xbe_src_watchdog.c @@ -1,15 +1,14 @@ --- 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 @@ +@@ -81,7 +81,6 @@ #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" static void start_htt_server(int *, char *argv[]); static void start_htt_props(int *, char *argv[]); -@@ -744,7 +744,11 @@ +@@ -744,7 +743,11 @@ perror("watchdog:fork\n"); exit(errno); case 0: |