IIIMF-related ports:

- drop maintainership
    - update to r12.2
    - some bug fixes

PR:		81184
Submitted by:	Masanori OZAWA <ozawa@ongs.co.jp>
Approved by:	maintainer
This commit is contained in:
Daichi GOTO 2005-05-24 12:37:50 +00:00
parent cf0ac5bd5c
commit 40a684ff1e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136030
185 changed files with 2061 additions and 2879 deletions

View file

@ -6,42 +6,40 @@
#
PORTNAME= le-newpy
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= chinese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= IIIMF New PinYin input method engine
RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
ONLY_FOR_ARCHS= i386
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_AUTOMAKE_VER= 19
WANT_LIBTOOL_VER= 15
AUTOMAKE_ARGS+= --add-missing
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
LE_TARGETS= newpy
.if !defined(WITHOUT_XAUX)
LE_TARGETS+= newpy/xaux
USE_MOTIF= yes
CFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib
PLIST_SUB+= WANT_XAUX=""
RUN_DEPENDS+= ${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
.else
CONFIGURE_ARGS+=--without-x
PLIST_SUB+= WANT_XAUX="@comment "
.endif
@ -51,33 +49,26 @@ PLIST_SUB+= WANT_XAUX="@comment "
IGNORE= "It is supported on FreeBSD 5.3 and later"
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
.endif
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4 \
${WRKSRC}/../lib/CSConv/csconv.h
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
${BUILDDIR}/newpy/xaux/aux_win.c \
${BUILDDIR}/newpy/xaux/aux_so.c
pre-configure:
@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}
do-configure:
.if defined(WITHOUT_XAUX)
@cd ${WRKSRC} && \
${REINPLACE_CMD} -e '/^CONFIG_FLAGS =/s,$$, --without-x,' Makefile
.endif
@cd ${BUILDDIR} && ${REINPLACE_CMD} \
-e "/LE_TARGETS=/s,%%LE_TARGETS%%,${LE_TARGETS}," configure.ac
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = leif
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,8 @@
--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
+++ leif/Makefile.am Fri May 13 15:46:03 2005
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(LE_TARGETS)
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles

View file

@ -1,52 +1,28 @@
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 17:50:52 2005
@@ -44,15 +44,15 @@
--- leif/configure.ac.orig Wed May 11 13:01:08 2005
+++ leif/configure.ac Wed May 11 13:02:22 2005
@@ -75,16 +75,16 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
IM_CHECK_X
-IM_CHECK_GTK
+dnl IM_CHECK_GTK
IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,17 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+LE_TARGETS="newpy"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="%%LE_TARGETS%%"
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

@ -1,12 +0,0 @@
--- 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 \

View file

@ -1,11 +0,0 @@
--- leif/newpy/NewPY.c Fri Jul 16 17:38:30 2004
+++ leif/newpy/NewPY.c Wed Feb 16 20:42:06 2005
@@ -321,7 +321,7 @@
#ifdef WIN32
l->path = "d:\\newpy_obj.jar";
#else
- l->path = "/usr/lib/im/locale/zh_CN/newpy/newpy_obj.jar"; /* path */
+ l->path = (IMDIR "/locale/zh_CN/newpy/newpy_obj.jar"); /* path */
#endif
l->signature = "";

View file

@ -1,11 +0,0 @@
--- 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)

View file

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

View file

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

View file

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

View file

@ -6,58 +6,50 @@
#
PORTNAME= le-ude
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= chinese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= IIIMF User Defined language Engine for Simplified Chinese conversion
RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
ONLY_FOR_ARCHS= i386
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_AUTOMAKE_VER= 19
WANT_LIBTOOL_VER= 15
AUTOMAKE_ARGS+= --add-missing
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}/leif
BUILD_WRKSRC= ${WRKSRC}/ude
INSTALL_WRKSRC= ${WRKSRC}/ude
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
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} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
${BUILDDIR}/ude/UDEngine.c
pre-configure:
@cd ${WRKSRC}/../ && ${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}
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = leif
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,8 @@
--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
+++ leif/Makefile.am Fri May 13 15:46:03 2005
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(LE_TARGETS)
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles

View file

@ -1,54 +1,28 @@
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 17:44:36 2005
@@ -44,15 +44,15 @@
--- leif/configure.ac.orig Wed May 11 13:01:08 2005
+++ leif/configure.ac Wed May 11 13:02:22 2005
@@ -75,16 +75,16 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_X
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="ude"
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,15 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+LE_TARGETS="udt"
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

@ -0,0 +1,11 @@
--- leif/ude/IMHandler.c.orig Wed May 18 03:17:57 2005
+++ leif/ude/IMHandler.c Wed May 18 03:18:24 2005
@@ -71,7 +71,7 @@
if(ct_list == NULL) {
#ifndef WIN32
- strcat(ct_path, "/../locale/zh_CN/ude/data");
+ strcat(ct_path, "data");
#else
strcat(ct_path, "\\..\\locale\\zh_CN\\ude\\data");
#endif

View file

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

View file

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

View file

@ -1,7 +1,5 @@
lib/im/leif/udengine.so
lib/im/locale/zh_CN/ude/data/pinyin.mb
@dirrm lib/im/locale/zh_CN/ude/data
@dirrm lib/im/locale/zh_CN/ude
@unexec rmdir %D/lib/im/locale/zh_CN > /dev/null 2>&1 || true
@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
lib/iiim/le/ude/ude.so
lib/iiim/le/ude/data/pinyin.mb
@dirrm lib/iiim/le/ude/data
@dirrm lib/iiim/le/ude
@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true

View file

@ -6,84 +6,56 @@
#
PORTNAME= le-canna
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= japanese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= daichi@freebsd.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= Canna language engine for IIIMF
LIB_DEPENDS= canna16.1:${PORTSDIR}/japanese/Canna
RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server \
${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
ONLY_FOR_ARCHS= i386
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_ICONV= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
USE_GNOME= gtk20
USE_XLIB= yes
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_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
USE_GNOME= gtk20
CFLAGS+= -I${X11BASE}/include
LDFLAGS+= -L${X11BASE}/lib
PLIST_SUB+= WANT_XAUX=""
RUN_DEPENDS+= ${LOCALBASE}/lib/im/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
.else
CONFIGURE_ARGS+=--without-x
PLIST_SUB+= WANT_XAUX="@comment "
.endif
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
.endif
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4 \
${WRKSRC}/../lib/CSConv/csconv.h
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
${WRKSRC}/lib/CSConv/csconv.h
pre-configure:
@cd ${WRKSRC}/../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
.if defined(WITHOUT_XAUX)
@cd ${WRKSRC} && ${REINPLACE_CMD} -e "/GTK/s,^.*$$,,g" configure.ac
.endif
@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}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = leif
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,8 @@
--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
+++ leif/Makefile.am Fri May 13 15:46:03 2005
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(LE_TARGETS)
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles

View file

@ -1,28 +0,0 @@
--- leif/canna/CannaLE.c.orig Wed Oct 13 00:26:27 2004
+++ leif/canna/CannaLE.c Wed Mar 2 23:37:14 2005
@@ -86,7 +86,7 @@
#include <dlfcn.h>
#include "csconv.h"
-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
+#define CSC_PATH (IMDIR "/csconv/csconv.so")
#define CSC_OPEN_LOCALE "csconv_open_locale"
#define CSC_OPEN "csconv_open"
#define CSC_CONV "csconv"
@@ -104,11 +104,11 @@
char **, size_t *);
typedef int (* csc_close_t)(csconv_t);
-static void * csc_handle;
-static csc_open_locale_t csc_open_locale;
-static csc_open_t csc_open;
-static csc_conv_t csc_conv;
-static csc_close_t csc_close;
+static void * csc_handle = NULL;
+static csc_open_locale_t csc_open_locale = NULL;
+static csc_open_t csc_open = NULL;
+static csc_conv_t csc_conv = NULL;
+static csc_close_t csc_close = NULL;
static csconv_t csconv_cd = NULL;
Bool if_canna_OpenIF();

View file

@ -1,15 +0,0 @@
--- 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

View file

@ -1,45 +1,28 @@
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 18:29:16 2005
@@ -45,11 +45,11 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_FREEWNN
--- leif/configure.ac.orig Wed May 11 13:01:08 2005
+++ leif/configure.ac Wed May 11 13:02:22 2005
@@ -75,16 +75,16 @@
IM_CHECK_X
IM_CHECK_GTK
-IM_CHECK_MOTIF
+dnl IM_CHECK_MOTIF
PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
@@ -63,23 +63,17 @@
LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="canna"
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+IM_ADD_TARGET(LE_TARGETS, HAVE_X, canna/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

@ -1,7 +1,7 @@
lib/im/leif/CannaLE.so
%%WANT_XAUX%%lib/im/locale/ja/CannaLE/aux.so
%%WANT_XAUX%%lib/im/locale/ja/CannaLE/auxmenu
%%WANT_XAUX%%@dirrm lib/im/locale/ja/CannaLE
%%WANT_XAUX%%@dirrm lib/im/locale/ja
@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
lib/iiim/le/CannaLE/CannaLE.so
lib/iiim/le/CannaLE/aux.so
lib/iiim/le/CannaLE/aux.la
lib/iiim/le/CannaLE/aux.a
lib/iiim/le/CannaLE/auxmenu
@dirrm lib/iiim/le/CannaLE
@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true

View file

@ -6,71 +6,57 @@
#
PORTNAME= le-freewnn
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= japanese textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= daichi@freebsd.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= FreeWnn language engine for IIIMF
LIB_DEPENDS= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server \
RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server \
${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv \
${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/FreeWnn-server
IIIMF_VER= r12_1-svn2002
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_ICONV= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_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-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
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} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4 \
${WRKSRC}/../lib/CSConv/csconv.h
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
${BUILDDIR}/freewnn/freewnn.c
${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
${WRKSRC}/lib/CSConv/csconv.h
pre-configure:
@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}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = leif
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,8 @@
--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
+++ leif/Makefile.am Fri May 13 15:46:03 2005
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(LE_TARGETS)
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles

View file

@ -1,53 +1,28 @@
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 18:13:32 2005
@@ -44,15 +44,15 @@
--- leif/configure.ac.orig Wed May 11 13:01:08 2005
+++ leif/configure.ac Wed May 11 13:02:22 2005
@@ -75,16 +75,16 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
+dnl IM_CHECK_CANNA
IM_CHECK_FREEWNN
LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_X
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,16 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="freewnn"
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

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

View file

@ -1,18 +1,15 @@
--- leif/freewnn/freewnn.c.orig Mon Oct 4 19:13:52 2004
+++ leif/freewnn/freewnn.c Sun Feb 20 15:43:20 2005
@@ -59,9 +59,9 @@
--- leif/freewnn/freewnn.c.orig Sun Mar 20 11:41:29 2005
+++ leif/freewnn/freewnn.c Wed May 18 01:20:56 2005
@@ -59,7 +59,7 @@
#define BUFSIZE 1024
#endif
-#define WNNRCFILE "/etc/FreeWnn/ja/wnnenvrc"
+#define WNNRCFILE (LOCALBASE "/lib/wnn/ja_JP/wnnenvrc")
+#define WNNRCFILE "%%LOCALBASE%%" "/lib/wnn/ja_JP/wnnenvrc"
-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
+#define CSC_PATH (IMDIR "/csconv/csconv.so")
#define CSC_OPEN_LOCALE "csconv_open_locale"
#define CSC_OPEN "csconv_open"
#define CSC_CONV "csconv"
@@ -163,7 +163,7 @@
@@ -162,7 +162,7 @@
int count = 0;
if( str == NULL ) return NULL;
@ -21,7 +18,7 @@
for(i=0;i<strlen(str);i++) {
count++;
@@ -202,7 +202,7 @@
@@ -201,7 +201,7 @@
if( wstr == NULL ) return NULL;
@ -30,3 +27,114 @@
for(i=0;wstr[i] != 0;i++)
count++;
@@ -388,14 +388,14 @@
UTFCHAR*
UTF8_to_UTFCHAR(unsigned char* str) {
- UTFCHAR *p, *ustr = NULL;
+ UTFCHAR *ustr = NULL;
int len, ulen;
const char *csc_arg_str_ccp; /* For compiler optimization */
char *csc_arg_str_cp; /* For compiler optimization */
if( str == NULL ) return NULL;
- if( *str == '\0' ) return NULL;
+ if( *str == '\0' ) return "";
if( csconv_utf8_cd == NULL ) {
csconv_utf8_cd = csc_open("UTF-16", "UTF-8");
@@ -408,30 +408,34 @@
len = strlen(str);
ulen = sizeof(UTFCHAR)*(len+1);
- p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
+ ustr = (UTFCHAR*)malloc(ulen);
+ if (!ustr) return NULL;
+ memset(ustr, 0, ulen);
+ ulen--;
/* Below 2 lines are to prevent gcc's warning and for the sake
of compiler optimization */
csc_arg_str_ccp = (const char*)str;
csc_arg_str_cp = (char*)ustr;
- csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
-
- *ustr = 0;
+ if ((size_t)-1 == csc_conv(csconv_utf8_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
+ free(ustr);
+ return NULL;
+ }
- return p;
+ return ustr;
}
UTFCHAR*
euc2UTFCHAR(unsigned char* str) {
- UTFCHAR *p, *ustr = NULL;
+ UTFCHAR *ustr = NULL;
int len, ulen;
const char *csc_arg_str_ccp; /* For compiler optimization */
char *csc_arg_str_cp; /* For compiler optimization */
if( str == NULL ) return NULL;
- if( *str == '\0' ) return NULL;
+ if( *str == '\0' ) return "";
if( csconv_cd == NULL ) {
csconv_cd = csc_open_locale("ja_JP.eucJP", "UTF-16", "MultiByte");
@@ -444,18 +448,22 @@
len = strlen(str);
ulen = sizeof(UTFCHAR)*(len+1);
- p = ustr = (UTFCHAR*)calloc(len+1, sizeof(UTFCHAR));
+ ustr = (UTFCHAR*)malloc(ulen);
+ if (!ustr) return NULL;
+ memset(ustr, 0, ulen);
+ ulen--;
/* Below 2 lines are to prevent gcc's warning and for the sake
of compiler optimization */
csc_arg_str_ccp = (const char*)str;
csc_arg_str_cp = (char*)ustr;
- csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen);
-
- *ustr = 0;
+ if ((size_t)-1 == csc_conv(csconv_cd, &csc_arg_str_ccp, &len, &csc_arg_str_cp, &ulen)) {
+ free(ustr);
+ return NULL;
+ }
- return p;
+ return ustr;
}
IMText*
@@ -466,7 +474,10 @@
ustr = UTF8_to_UTFCHAR(str);
p = create_IMText(s, ustrlen(ustr));
- memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+ if (p && ustr) {
+ memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+ }
+ if (ustr) free(ustr);
return p;
}
@@ -479,7 +490,10 @@
ustr = euc2UTFCHAR(str);
p = create_IMText(s, ustrlen(ustr));
- memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+ if (p && ustr) {
+ memcpy(p->text.utf_chars, ustr, (ustrlen(ustr)+1)*sizeof(UTFCHAR));
+ }
+ if (ustr) free(ustr);
return p;
}

View file

@ -1,2 +1,3 @@
lib/im/leif/FreeWnnLE.so
@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
lib/iiim/le/FreeWnnLE/FreeWnnLE.so
@dirrm lib/iiim/le/FreeWnnLE
@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true

View file

@ -6,67 +6,50 @@
#
PORTNAME= le-hangul
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTVERSION= 12.2
CATEGORIES= korean textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= daichi@FreeBSD.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= IIIMF Hangul input method engine
RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
ONLY_FOR_ARCHS= i386
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_XLIB= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_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-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4 \
${WRKSRC}/../lib/CSConv/csconv.h
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
pre-configure:
@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}
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = leif
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -0,0 +1,8 @@
--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
+++ leif/Makefile.am Fri May 13 15:46:03 2005
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(LE_TARGETS)
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles

View file

@ -1,53 +1,28 @@
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 18:06:01 2005
@@ -44,15 +44,15 @@
--- leif/configure.ac.orig Wed May 11 13:01:08 2005
+++ leif/configure.ac Wed May 11 13:02:22 2005
@@ -75,16 +75,16 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="hangul"
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,15 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
-
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+LE_TARGETS="hangul"
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

@ -1,7 +1,6 @@
lib/im/leif/hangul.so
lib/im/locale/ko_KR/hangul.conf
lib/im/locale/ko_KR/tables/candidate.txt
@dirrm lib/im/locale/ko_KR/tables
@dirrm lib/im/locale/ko_KR
@unexec rmdir %D/lib/im/leif > /dev/null 2>&1 || true
@unexec rmdir %D/lib/im/locale > /dev/null 2>&1 || true
lib/iiim/le/hangul/hangul.so
lib/iiim/le/hangul/hangul.conf
lib/iiim/le/hangul/tables/candidate.txt
@dirrm lib/iiim/le/hangul/tables
@dirrm lib/iiim/le/hangul
@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true

View file

@ -6,86 +6,58 @@
#
PORTNAME= client-lib
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTVERSION= 12.2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= Internet/Intranet Input Method Client Framework
LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib
LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib
RUN_DEPENDS= ${LOCALBASE}/lib/iiim/csconv/csconv.so:${PORTSDIR}/textproc/iiimf-csconv
ONLY_FOR_ARCHS= i386
IIIMF_VER= r12_1-svn2002
INSTALLS_SHLIB= yes
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_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/iiimcf
PATCH_WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/lib/iiimcf
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
IGNORE= It is supported on FreeBSD 5.3 and later.
.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} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../../acfiles/im_common.m4
${REINPLACE_CMD} \
-e '/^pkgconfigdir/s,$$(libdir),%%PREFIX%%/libdata,g' \
${BUILDDIR}/Makefile.am
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile \
${BUILDDIR}/Makefile.am \
${BUILDDIR}/../EIMIL/Makefile.am
${REINPLACE_CMD} -e "s,/usr/lib/iiim,${LOCALBASE}/lib/iiim,g" \
${WRKSRC}/lib/CSConv/csconv.h
pre-configure:
@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 && \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = lib/EIMIL lib/iiimcf
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

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

View file

@ -0,0 +1,9 @@
--- lib/EIMIL/Makefile.am.orig Fri May 13 18:03:49 2005
+++ lib/EIMIL/Makefile.am Fri May 13 18:04:12 2005
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
SUBDIRS = . test
#libdir = /usr/local/lib
#libEIMIL_la_LDFLAGS = -module -version-info $(LIBEIMIL_MAJOR_VERSION):$(LIBEIMIL_MINOR_VERSION) \

View file

@ -1,11 +1,14 @@
--- 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 @@
--- lib/iiimcf/Makefile.am.orig Mon May 9 16:47:15 2005
+++ lib/iiimcf/Makefile.am Mon May 9 16:48:31 2005
@@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
SUBDIRS = . test
#libdir = /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 ../iiimp/libiiimp.la -ldl
+ -export-dynamic -export-symbols libiiimcf.sym -liiimp
libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\""
libiiimcf_la_CFLAGS = -DDEBUG -DSOCKETDIR="\"$(SOCKETDIR)\"" -I../CSConv
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 \

View file

@ -1,19 +0,0 @@
--- 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

View file

@ -1,19 +0,0 @@
--- lib/iiimcf/iiimcf.c Tue Sep 14 13:19:47 2004
+++ lib/iiimcf/iiimcf.c Wed Feb 16 22:59:51 2005
@@ -440,7 +440,7 @@
)
{
IIIMF_status st;
- IIIMP_message *pmes;
+ IIIMP_message *pmes = NULL;
if (!ph->data_s) ph->data_s = iiimp_data_s_new();
if (!ph->data_s) return IIIMF_STATUS_MALLOC;
@@ -501,6 +501,7 @@
iiimp_message_delete(ph->data_s, pmes);
if (st != IIIMF_STATUS_SUCCESS) goto reconnect;
+ pmes = NULL;
st = iiimcf_wait_message(ph, NULL, IM_CONNECT_REPLY, &pmes);
if (st != IIIMF_STATUS_SUCCESS) {
if (pmes) iiimp_message_delete(ph->data_s, pmes);

View file

@ -1,4 +1,7 @@
lib/libiiimcf.a
include/iiim/iiimcf.h
lib/libiiimcf.so.3
lib/libiiimcf.so
lib/libiiimcf.so.2
include/iiimcf.h
lib/libiiimcf.la
lib/libiiimcf.a
libdata/pkgconfig/iiimf-lib-client.pc
@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true

View file

@ -6,79 +6,50 @@
#
PORTNAME= csconv
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 1
PORTVERSION= 12.2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= Internet/Intranet Input Method Framework encoding convert library
IIIMF_VER= r12_1-svn2002
ONLY_FOR_ARCHS= i386
USE_BZIP2= yes
USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME= intltool
USE_REINPLACE= yes
USE_AUTOCONF_VER= 259
#USE_AUTOHEADER_VER= 259
WANT_AUTOCONF_VER= 259
WANT_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-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/lib/CSConv
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../../acfiles/im_common.m4 \
${WRKSRC}/configure.ac \
${WRKSRC}/csconv.h \
${WRKSRC}/converterPI/configure.in \
${WRKSRC}/converterPI/test/icutest4linux.c \
${WRKSRC}/converterPI/icuconv_relay.c \
${WRKSRC}/converterPI/icuconv/common/config.h
${REINPLACE_CMD} -e "s,ELIBBAD,ENOEXEC," \
${WRKSRC}/converterPI/icuconv/common/icuconv.c
for MKFLIN in `find ${WRKSRC} -name "Makefile.in"`; do \
${REINPLACE_CMD} -e "/(CC)/s,-lc,,g" $${MKFLIN}; \
${REINPLACE_CMD} -e "/(CC)/s,-ldl,,g" $${MKFLIN}; \
${REINPLACE_CMD} -e '/(CC)/s,(LIBS),(LDFLAGS),g' $${MKFLIN}; \
${REINPLACE_CMD} -e '/(CC)/s,{LIBS},{LDFLAGS},g' $${MKFLIN}; \
${REINPLACE_CMD} -e "s,LIBS = @LIBS@,LDFLAGS = @LDFLAGS@,g" $${MKFLIN}; \
done
pre-configure:
@cd ${WRKSRC}/../../ && ${GMAKE} ${UPDATE_ARGS} update-acfiles
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
-I ../../acfiles -I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}
@cd ${WRKSRC}/converterPI/ && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF}
post-configure:
${REINPLACE_CMD} \
-e "s,prefix = ${PREFIX},prefix = ${PREFIX}/lib/im," \
`${FIND} ${WRKSRC} -type f -name Makefile`
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
${REINPLACE_CMD} -e "s,/usr/lib/iiim,${PREFIX}/lib/iiim,g" \
${BUILDDIR}/csconv.h
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = lib/CSConv
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,11 @@
--- lib/CSConv/Makefile.am.orig Fri May 13 17:52:28 2005
+++ lib/CSConv/Makefile.am Fri May 13 17:52:42 2005
@@ -2,7 +2,7 @@
EXTRA_DIST= encoding.norm
SUBDIRS=test
AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles
csconv_la_CFLAGS = -DCSCONV_DIR="\"${csconvdir}\""
csconv_la_LDFLAGS = -avoid-version -module
csconv_la_LIBADD = @LTLIBICONV@

View file

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

View file

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

View file

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

View file

@ -6,88 +6,68 @@
#
PORTNAME= gnome-im-switcher
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= IIIMF gnome input method switcher
BROKEN= Incorrect pkg-plist
ONLY_FOR_ARCHS= i386
USE_X_PREFIX= yes
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_REINPLACE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= intltool gconf2 libglade2 libgnomeui \
gnomepanel gnomeprefix gnomehack
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_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-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/gnome-im-switcher
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl ${PTHREAD_LIBS}
CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
UPDATE_ARGS+= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} \
AUTOHEADER=${AUTOHEADER} AUTOCONF=${AUTOCONF} \
LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
TLZ_ARGS= --copy --force
BNB_PATH= bonobo/server
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4
${REINPLACE_CMD} \
-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
-e '/^uidir/s,$$[(]datadir[)]/,&gnome/,g' \
${BUILDDIR}/src/Makefile.am
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
${BUILDDIR}/src/Makefile.am
${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
${WRKSRC}/configure.in
${BUILDDIR}/configure.ac
${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
${BUILDDIR}/configure.ac
${REINPLACE_CMD} -e "/^omf_dest_dir/s,[(]datadir[)]/,&gnome/,g" \
${BUILDDIR}/help/omf.make
pre-configure:
@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}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
post-configure:
${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
${REINPLACE_CMD} \
-e "/^datadir/s,${PREFIX}/share/gnome,${PREFIX}/share,g" \
${WRKSRC}/po/Makefile
${REINPLACE_CMD} -e '/^pkgdatadir/s,[(]datadir[)]/,&gnome/,g' \
-e '/^iconsdir/s,[(]datadir[)]/,&gnome/,g' \
${BUILDDIR}/src/Makefile
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%PREFIX%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+INTLDIRS = gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = gnome-im-switcher
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,10 @@
--- gnome-im-switcher/Makefile.am.orig Fri May 13 17:44:10 2005
+++ gnome-im-switcher/Makefile.am Fri May 13 17:44:57 2005
@@ -1,5 +1,7 @@
SUBDIRS = src po capplet help
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I %%PREFIX%%/share/aclocal -I ../acfiles
+
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \

View file

@ -1,9 +0,0 @@
--- 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)

View file

@ -1,5 +1,5 @@
--- gnome-im-switcher/src/widgets.c Thu Oct 14 23:10:11 2004
+++ gnome-im-switcher/src/widgets.c Wed Feb 16 16:51:26 2005
--- gnome-im-switcher/src/widgets.c.orig Tue May 10 16:29:36 2005
+++ gnome-im-switcher/src/widgets.c Tue May 10 16:30:04 2005
@@ -29,7 +29,11 @@
#include <gnome.h>

View file

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

View file

@ -6,75 +6,60 @@
#
PORTNAME= gtk
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= Internet/Intranet Input Method Server Framework
LIB_DEPENDS= iiimp.0:${PORTSDIR}/textproc/iiimf-protocol-lib \
iiimcf.2:${PORTSDIR}/textproc/iiimf-client-lib
LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
ONLY_FOR_ARCHS= i386
USE_X_PREFIX= yes
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_ICONV= yes
USE_REINPLACE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= intltool gtk20
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_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-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/iiimgcf
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
.if defined(WITH_DEBUG)
CFLAGS+= -DDEBUG
.endif
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} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
TLZ_ARGS= --copy --force
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv -lintl ${PTHREAD_LIBS}
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${LOCALBASE}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am
pre-configure:
@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}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
post-install:
${X11BASE}/bin/gtk-query-immodules-2.0 > \

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+INTLDIRS = iiimgcf
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = iiimgcf
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -1,21 +1,26 @@
--- iiimgcf/Makefile.am Thu Jan 15 10:51:58 2004
+++ iiimgcf/Makefile.am Thu Feb 17 22:05:59 2005
@@ -9,14 +9,13 @@
--- iiimgcf/Makefile.am.orig Thu Apr 14 05:29:08 2005
+++ iiimgcf/Makefile.am Tue May 17 22:33:56 2005
@@ -5,11 +5,11 @@
@INTLTOOL_DESKTOP_RULE@
AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I /usr/local/share/aclocal -I /usr/X11R6/share/aclocal -I ../acfiles
moduledir = $(GTK2_LIBDIR)/gtk-2.0/$(GTK2_BINARY_VERSION)/immodules
-im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS)
+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -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
+im_iiim_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) $(GTK_CFLAGS) -I $(CSCONV_DIR)
im_iiim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module -no-undefined
im_iiim_la_SOURCES = IIIMGdkEventKey.c IIIMGdkEventKey.h \
gtkimcontextiiim.c gtkimcontextiiim.h \
imiiim.c imswitcher.c imaux.c
-im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
@@ -18,8 +18,7 @@
imswitcher.c imswitcher.h
im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS) \
- $(IM_LIBDIR)/iiimcf/libiiimcf.la \
- $(IM_LIBDIR)/iiimp/libiiimp.la
+im_iiim_la_LIBADD = $(X_LIBS) $(GTK_LIBS)
+ -liiimp -liiimcf
module_LTLIBRARIES = im-iiim.la

View file

@ -1,27 +0,0 @@
--- iiimgcf/configure.ac.orig Tue Nov 18 12:17:57 2003
+++ iiimgcf/configure.ac Wed Mar 2 22:59:24 2005
@@ -5,7 +5,6 @@
AC_PREREG(2.50)
AC_INIT(im-iiim.so, 0.5, im@OpenI18N.org)
dnl common initialization
-AC_CONFIG_AUX_DIR(../acfiles)
IM_INIT(..)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
@@ -63,13 +62,13 @@
COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp'
CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${LDFLAGS}"
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

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

View file

@ -1,11 +0,0 @@
--- iiimgcf/imaux.c Thu Jul 29 20:44:21 2004
+++ iiimgcf/imaux.c Wed Feb 16 20:40:51 2005
@@ -36,7 +36,7 @@
static void iiim_aux_download (IIIMCF_downloaded_object obj);
-#define AUX_BASE_DIR "/usr/lib/im/"
+#define AUX_BASE_DIR IMDIR
#define IS_SPACE(len, ptr) ((0 < (len)) && \
(('\t' == *(p)) || (' ' == *(p))))

View file

@ -6,27 +6,26 @@
#
PORTNAME= headers
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTVERSION= 12.2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= Header files for Internet/Intranet Input Method Framework
IIIMF_VER= r12_1-svn2002
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
USE_BZIP2= yes
NO_BUILD= yes
do-install:
${MKDIR} ${PREFIX}/include/iiimf
${MKDIR} ${PREFIX}/include/iiim
.for file in IMArg.h IMCharSubsets.h IMProtocolStruct.h syscfg.h threaddef.h
${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiimf
${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/iiim
.endfor
${MKDIR} ${PREFIX}/include/iiimf/iml
${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiimf/iml
${MKDIR} ${PREFIX}/include/iiim/iml
${INSTALL_DATA} ${WRKSRC}/include/iml/*.h ${PREFIX}/include/iiim/iml
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

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

View file

@ -6,87 +6,54 @@
#
PORTNAME= le-unit
PORTVERSION= ${IIIMF_VER:S/_/./g:C/-.*//}
PORTREVISION= 2
PORTVERSION= 12.2
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
DISTNAME= im-sdk-src-${IIIMF_VER}
DISTNAME= iiimf-src-${PORTVERSION}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= kcwu@csie.org
MAINTAINER= ozawa@ongs.co.jp
COMMENT= IIIMF UNIcode Table based generic composition engine
RUN_DEPENDS= ${LOCALBASE}/lib/im/htt:${PORTSDIR}/textproc/iiimf-server
LIB_DEPENDS= iiimp.1:${PORTSDIR}/textproc/iiimf-protocol-lib \
iiimcf.3:${PORTSDIR}/textproc/iiimf-client-lib
RUN_DEPENDS= iiimd:${PORTSDIR}/textproc/iiimf-server
ONLY_FOR_ARCHS= i386
IIIMF_VER= r12_1-svn2002
USE_BZIP2= yes
USE_ICONV= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_XLIB= yes
USE_AUTOCONF_VER= 259
USE_AUTOHEADER_VER= 259
USE_AUTOMAKE_VER= 19
WANT_AUTOCONF_VER= 259
WANT_AUTOHEADER_VER= 259
WANT_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-//}
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
BUILDDIR= ${WRKSRC}/leif
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 503000
IGNORE= "It is supported on FreeBSD 5.3 and later"
IGNORE= It is supported on FreeBSD 5.3 and later.
.endif
.if ${ARCH} != "i386"
IGNORE= "${ARCH} is not support."
.endif
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} \
-DIMDIR="\\\"\$${IMDIR}\\\""
CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
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} \
ACLOCAL_DIR="-I ${LOCALBASE}/share/aclocal -I ${ACLOCAL_DIR}"
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} -e "s,/usr/lib/im,${PREFIX}/lib/im,g" \
${WRKSRC}/../acfiles/im_common.m4 \
${WRKSRC}/../lib/CSConv/csconv.h
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
${BUILDDIR}/../lib/EIMIL/Makefile.am
pre-configure:
@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 && \
${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} reconfig
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (im-sdk-src-r12_1-svn2002.tar.bz2) = 51f3f10b11f8d4a206e2b190ec36a32a
SIZE (im-sdk-src-r12_1-svn2002.tar.bz2) = 18141292
MD5 (iiimf-src-12.2.tar.bz2) = 70dbf257fe64ddf8611dfa6449da537c
SIZE (iiimf-src-12.2.tar.bz2) = 11452670

View file

@ -1,19 +1,47 @@
--- Makefile Thu Apr 8 03:28:00 2004
+++ Makefile Wed Feb 16 14:09:34 2005
@@ -2,6 +2,7 @@
AUTOMAKE = automake
AUTOHEADER = autoheader
AUTOCONF = autoconf
+LIBTOOLIZE = libtoolize
--- Makefile.orig Mon May 9 15:32:45 2005
+++ Makefile Mon May 9 15:35:03 2005
@@ -1,29 +1,31 @@
## deprecated in favour of AUTORECONF
-#ACLOCAL = aclocal
-#AUTOMAKE = automake --add-missing --copy
-#LIBTOOLIZE = libtoolize --force --copy
-#AUTOHEADER = autoheader
-#AUTOCONF = autoconf
+ACLOCAL = aclocal19
+AUTOMAKE = automake19 --add-missing --copy
+LIBTOOLIZE = libtoolize15 --force --copy
+AUTOHEADER = autoheader259
+AUTOCONF = autoconf259
#CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
# $(LIBTOOLIZE) && \
# $(AUTOHEADER) && \
# $(AUTOMAKE) && \
# $(AUTOCONF)
CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
$(AUTOHEADER) && \
@@ -21,7 +22,7 @@
-AUTORECONF = autoreconf
+AUTORECONF = autoreconf259
BOOTSTRAP = $(AUTORECONF) --install --force
INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
update-acfiles:
cd acfiles && \
- $(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_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
-INTLDIRS = iiimgcf gnome-im-switcher
+#INTLDIRS = iiimgcf gnome-im-switcher
-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
- iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
- iiimxcf/xiiimp.so iiimxcf/htt_xbe \
- iiimgcf gnome-im-switcher doc
+BUILDDIRS = lib/EIMIL leif
+#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+# iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+# iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+# iiimgcf gnome-im-switcher doc
-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+CONFIGDIRS = $(BUILDDIRS)
+#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
all: compile
config:

View file

@ -1,10 +1,12 @@
--- 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 @@
--- acfiles/check_sys.m4.orig Mon May 9 15:28:20 2005
+++ acfiles/check_sys.m4 Mon May 9 15:32:07 2005
@@ -203,6 +203,13 @@
CXX=${CC}
fi
;;
+ cc*:*)
+ DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
+ DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
+ COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
+ SHLIBCFLAGS='-fpic'
+ SHLIBLDFLAGS='-shared'
@ -12,7 +14,7 @@
*)
DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
;;
@@ -249,8 +254,8 @@
@@ -249,8 +256,8 @@
COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
;;
*freebsd*)
@ -23,7 +25,7 @@
;;
esac
@@ -288,9 +293,9 @@
@@ -288,9 +295,9 @@
THREAD_CXX_CFLAGS="-mt"
HAVE_THREAD="uithread"
;;

View file

@ -0,0 +1,8 @@
--- leif/Makefile.am.orig Fri May 13 15:45:41 2005
+++ leif/Makefile.am Fri May 13 15:46:03 2005
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = $(LE_TARGETS)
-ACLOCAL_AMFLAGS = -I ../acfiles
+ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles

View file

@ -1,53 +1,28 @@
--- leif/configure.ac.orig Wed Oct 6 23:00:36 2004
+++ leif/configure.ac Thu Mar 24 17:47:49 2005
@@ -44,15 +44,15 @@
--- leif/configure.ac.orig Wed May 11 13:01:08 2005
+++ leif/configure.ac Wed May 11 13:02:22 2005
@@ -75,16 +75,16 @@
IM_CHECK_SYSTEM
IM_CHECK_DLOPEN
-IM_CHECK_CANNA
-IM_CHECK_FREEWNN
+dnl IM_CHECK_CANNA
+dnl IM_CHECK_FREEWNN
LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
IM_CHECK_X
-IM_CHECK_GTK
-IM_CHECK_MOTIF
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
+dnl IM_CHECK_GTK
+dnl IM_CHECK_MOTIF
+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
+dnl AC_SUBST(GTK2_CFLAGS)
+dnl AC_SUBST(GTK2_LIBS)
dnl --------------------------------------------------------------------------------
dnl Section 5: compilation options
@@ -63,23 +63,16 @@
CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
- ${THREAD_COMMON_CXX_CFLAGS}"
+ ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
-LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
+LE_TARGETS="default template sampleja sampleja2 sampleja3 testEIMIL unit"
-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
+LE_TARGETS="default template testEIMIL unit fop_test"
-IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
-IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
-IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
-IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
-IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
+#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
dnl --------------------------------------------------------------------------------
dnl Section 6: compilation test

View file

@ -1,11 +0,0 @@
--- leif/sampleja3/sampleja3.c Mon Apr 26 21:16:13 2004
+++ leif/sampleja3/sampleja3.c Wed Feb 16 20:42:52 2005
@@ -171,7 +171,7 @@
objects[obj_id].name_length = 9;
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 = IMDIR "/locale/ja/sampleja3/aux.jar";
objects[obj_id].signature = "";
objects[obj_id].class_names = class_names;
objects[obj_id].count_names = 1;

View file

@ -1,11 +0,0 @@
--- leif/sampleja3/xaux_common/csconv.h Fri Mar 16 00:52:22 2001
+++ leif/sampleja3/xaux_common/csconv.h Wed Feb 16 20:48:24 2005
@@ -63,7 +63,7 @@
# define CSC_BASE_DIR_SYSTEM "/etc/lib/im/csconv/"
#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 (IMDIR "/csconv/")
#endif /* !CSC_BASE_DIR_DEFAULT */
#define CSC_IS_PATH_ABS(path) (('/' == *(path)) || \

View file

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

View file

@ -1,11 +0,0 @@
--- leif/sampleja3/xaux_common/xaux_ext_common.h Fri Mar 16 00:52:22 2001
+++ leif/sampleja3/xaux_common/xaux_ext_common.h Wed Feb 16 20:48:29 2005
@@ -97,7 +97,7 @@
extern void HelpInvoke(char *);
#endif
-#define DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja3/help/"
+#define DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja3/help/")
#endif /* !XAUX_EXT_COMMON_H */

View file

@ -1,11 +0,0 @@
--- leif/sampleja3/xaux_motif/sampleja3_xaux_so.c Fri Mar 16 00:52:22 2001
+++ leif/sampleja3/xaux_motif/sampleja3_xaux_so.c Wed Feb 16 20:43:20 2005
@@ -63,7 +63,7 @@
'L','o','o','k','u','p','A','u','x',
};
-#define XAUX_EXT_DIR "/usr/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] = {
{

View file

@ -1,11 +0,0 @@
--- leif/sampleja4/xaux/xaux_ext_conv.c Fri Jun 27 11:41:21 2003
+++ leif/sampleja4/xaux/xaux_ext_conv.c Wed Feb 16 20:43:31 2005
@@ -79,7 +79,7 @@
#ifdef USE_CSCONV
#include <dlfcn.h>
#include "csconv.h"
-#define CSC_PATH "/usr/lib/im/csconv/csconv.so"
+#define CSC_PATH (IMDIR "/csconv/csconv.so")
#define CSC_OPEN_LOCALE "csconv_open_locale"
#define CSC_OPEN "csconv_open"
#define CSC_CONV "csconv"

View file

@ -1,11 +0,0 @@
--- leif/sampleja4/xaux/xaux_ext_help.c Fri Jun 27 11:41:21 2003
+++ leif/sampleja4/xaux/xaux_ext_help.c Wed Feb 16 20:43:43 2005
@@ -66,7 +66,7 @@
#else /* defined(USE_DTACTIONINVOKE) */
-#define DTACTION_CMD "/usr/dt/bin/dtaction"
+#define DTACTION_CMD "/usr/local/bin/dtaction"
static int help_available = 0;
static char tmp_file[256];

View file

@ -1,10 +0,0 @@
--- leif/sampleja4/xaux/xaux_ext_help.h Fri Jun 27 11:41:21 2003
+++ leif/sampleja4/xaux/xaux_ext_help.h Wed Feb 16 20:48:34 2005
@@ -52,6 +52,6 @@
extern void HelpInvoke(char *);
#endif /* USE_CDE_HELP */
-#define DEFAULT_HELP_PATH "file:/usr/lib/im/locale/ja/sampleja4/help/"
+#define DEFAULT_HELP_PATH ("file:" IMDIR "/locale/ja/sampleja4/help/")
#endif /* !XAUX_EXT_HELP_H */

View file

@ -1,8 +0,0 @@
--- leif/sampleja4/xaux/xaux_so_sampleja4.c Fri Jun 27 11:41:21 2003
+++ leif/sampleja4/xaux/xaux_so_sampleja4.c Wed Feb 16 20:43:49 2005
@@ -334,4 +334,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 = IMDIR "/locale/ja/sampleja4/xaux";

View file

@ -1,11 +0,0 @@
--- leif/sampleja/sampleja.c Fri Mar 16 00:52:22 2001
+++ leif/sampleja/sampleja.c Wed Feb 16 20:42:34 2005
@@ -331,7 +331,7 @@
#ifdef WIN32
l->path = "d:\\sampleja_obj.jar"; /* path */
#else
- l->path = "/usr/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;

View file

@ -1,11 +0,0 @@
--- leif/sampleja/xaux/aux_so.c Fri Mar 16 00:52:22 2001
+++ leif/sampleja/xaux/aux_so.c Wed Feb 16 20:42:40 2005
@@ -72,7 +72,7 @@
#define HTT_AUX_PROP_NAME "htt_aux_sample_prop"
#define HTT_AUX_PROP1_NAME "htt_aux_sample_prop1"
-#define AUX_EXT "/usr/lib/im/locale/ja/sampleja/aux_ext"
+#define AUX_EXT (IMDIR "/locale/ja/sampleja/aux_ext")
typedef struct _aux_icid {
aux_t * aux;

Some files were not shown because too many files have changed in this diff Show more