aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2010-11-27 01:38:22 +0800
committernobutaka <nobutaka@FreeBSD.org>2010-11-27 01:38:22 +0800
commitf0e7020378256f485f421bc0cfbe77777f390ace (patch)
tree992cda0793e1d55f3b2c5a045dacc69128a49a9a /textproc
parentdbf0884f490bd6da081c712061344d5472e64706 (diff)
downloadfreebsd-ports-graphics-f0e7020378256f485f421bc0cfbe77777f390ace.tar.gz
freebsd-ports-graphics-f0e7020378256f485f421bc0cfbe77777f390ace.tar.zst
freebsd-ports-graphics-f0e7020378256f485f421bc0cfbe77777f390ace.zip
- Update to 1.6.0.
- Add textproc/uim-kde4, KDE4 panel applet of uim input method. It is a slave port of textproc/uim. - Remove japanese/uim-canna and japanese/uim-prime. Now the canna and prime modules are implemented as scheme scripts and they can be installed from textproc/uim. - Enable helper tools installation of textproc/uim-qt4. - Enable sj3 support of textproc/uim.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/uim-el/Makefile3
-rw-r--r--textproc/uim-el/distinfo5
-rw-r--r--textproc/uim-gnome/Makefile5
-rw-r--r--textproc/uim-gtk/Makefile4
-rw-r--r--textproc/uim-kde/Makefile12
-rw-r--r--textproc/uim-kde4/Makefile40
-rw-r--r--textproc/uim-kde4/pkg-descr3
-rw-r--r--textproc/uim-kde4/pkg-plist2
-rw-r--r--textproc/uim-m17nlib/Makefile2
-rw-r--r--textproc/uim-qt/Makefile12
-rw-r--r--textproc/uim-qt4/Makefile19
-rw-r--r--textproc/uim-qt4/pkg-plist10
-rw-r--r--textproc/uim/Makefile14
-rw-r--r--textproc/uim/distinfo5
-rw-r--r--textproc/uim/files/extra-patch-gtk_Makefile.in31
-rw-r--r--textproc/uim/files/extra-patch-helper_Makefile.in100
-rw-r--r--textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt11
-rw-r--r--textproc/uim/files/extra-patch-qt_Makefile.in46
-rw-r--r--textproc/uim/files/extra-patch-uim_Makefile.in102
-rw-r--r--textproc/uim/files/patch-configure11
-rw-r--r--textproc/uim/files/patch-emacs_Makefile.in17
-rw-r--r--textproc/uim/files/patch-gtk:Makefile.in34
-rw-r--r--textproc/uim/files/patch-scm_sj3-custom.scm11
-rw-r--r--textproc/uim/pkg-plist142
25 files changed, 440 insertions, 202 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index 2e7fbbdc0be..b0bf78d4ef6 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1258,6 +1258,7 @@
SUBDIR += uim-gnome
SUBDIR += uim-gtk
SUBDIR += uim-kde
+ SUBDIR += uim-kde4
SUBDIR += uim-m17nlib
SUBDIR += uim-qt
SUBDIR += uim-qt4
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 6846736c5d3..0dcc6b0fda0 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= uim-el
-PORTVERSION= 1.5.6
-PORTREVISION= 3
+PORTVERSION= 1.6.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index ad40687d62f..dbb45d86c45 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,2 @@
-MD5 (uim-1.5.6.tar.bz2) = 2bd5a9095d6354a2a23c908b0d6e7861
-SHA256 (uim-1.5.6.tar.bz2) = ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
-SIZE (uim-1.5.6.tar.bz2) = 3343584
+SHA256 (uim-1.6.0.tar.bz2) = 2a34dca2091eb6d61f05dabd8512c6658d8cefa8db14b7a684fbb10caea4a3aa
+SIZE (uim-1.6.0.tar.bz2) = 6154925
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index 979537056d3..b3dc2337334 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -6,12 +6,11 @@
#
PKGNAMESUFFIX= -gnome
-PORTREVISION= 4
COMMENT= GNOME applets of uim input method
USE_GNOME= gtk20 gnomepanel libgnomeui
-LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim
+LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
RUN_DEPENDS= uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
MASTERDIR= ${.CURDIR}/../../textproc/uim
@@ -22,7 +21,7 @@ CONFIGURE_ARGS= --with-gtk2 --enable-gnome-applet
UIM_SLAVE= yes
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-helper_Makefile.in
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-helper_Makefile.in
.if defined(WITHOUT_X11)
IGNORE= requires X11
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 9cd6bafed3e..660c3b449d7 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= -gtk
COMMENT= GTK+ modules of uim input method
USE_GNOME= gtk20
-LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim
+LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
@@ -19,7 +19,7 @@ CONFIGURE_ARGS= --with-gtk2 --enable-pref
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk_Makefile.in \
- ${PATCHDIR}/extra-patch-helper_Makefile.in
+ ${PATCHDIR}/extra-patch-helper_Makefile.in
.if defined(WITHOUT_X11)
IGNORE= requires X11
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 95195eb570b..6ec408dd41e 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX= -kde
COMMENT= KDE panel applet of uim input method
-LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim
+LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
RUN_DEPENDS= uim-pref-qt:${PORTSDIR}/textproc/uim-qt
USE_GCC= 4.2+
@@ -21,12 +21,12 @@ MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
CONFIGURE_ARGS= --with-qt --enable-pref --enable-default-toolkit=qt \
--enable-kde-applet
-CONFIGURE_ENV= QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
- CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+CONFIGURE_ENV= QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
+ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
- LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+ LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
+ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
new file mode 100644
index 00000000000..14a009b50d4
--- /dev/null
+++ b/textproc/uim-kde4/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for: uim-kde4
+# Date created: 26 November 2010
+# Whom: MANTANI Nobutaka <nobutaka@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PKGNAMESUFFIX= -kde4
+
+COMMENT= KDE4 panel applet of uim input method
+
+BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake
+LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
+RUN_DEPENDS= uim-pref-qt4:${PORTSDIR}/textproc/uim-qt
+
+USE_GCC= 4.2+
+USE_KDE4= kdelibs automoc4
+USE_QT_VER= 4
+QT_COMPONENTS= qmake_build moc_build qt3support uic rcc
+USE_AUTOTOOLS= libtool:22
+
+MASTERDIR= ${.CURDIR}/../../textproc/uim
+PKGDIR= ${.CURDIR}
+CONFIGURE_ARGS= --with-qt4 --enable-pref --enable-default-toolkit=qt4 \
+ --enable-kde4-applet
+UIM_SLAVE= yes
+
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt4_toolbar_CMakeLists.txt
+
+.if defined(WITHOUT_X11)
+IGNORE= requires X11
+.endif
+
+do-build:
+ (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE})
+
+do-install:
+ (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-kde4/pkg-descr b/textproc/uim-kde4/pkg-descr
new file mode 100644
index 00000000000..4a39d31b373
--- /dev/null
+++ b/textproc/uim-kde4/pkg-descr
@@ -0,0 +1,3 @@
+KDE4 panel applet of uim input method.
+
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim-kde4/pkg-plist b/textproc/uim-kde4/pkg-plist
new file mode 100644
index 00000000000..52a8f47a337
--- /dev/null
+++ b/textproc/uim-kde4/pkg-plist
@@ -0,0 +1,2 @@
+kde4/lib/kde4/plasma_applet_uim.so
+kde4/share/kde4/services/plasma-applet-uim.desktop
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 519f4e81f9c..03bd1eca3cb 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -15,7 +15,7 @@ COMMENT= Uim plugin using m17n library input method
BUILD_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db
LIB_DEPENDS= m17n.4:${PORTSDIR}/devel/m17n-lib \
- uim.6:${PORTSDIR}/textproc/uim
+ uim.7:${PORTSDIR}/textproc/uim
RUN_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db
MASTERDIR= ${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 15a7a4d0146..134c3e99b5f 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -12,17 +12,17 @@ COMMENT= QT modules of uim input method
USE_QT_VER= 3
USE_AUTOTOOLS= libtool:22
-LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim
+LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
CONFIGURE_ARGS= --with-qt --enable-pref --enable-default-toolkit=qt \
--disable-kde-applet
-CONFIGURE_ENV= QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
- CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
- LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" \
- LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV= QTDIR=${LOCALBASE}/lib QTINCDIR=${LOCALBASE}/include \
+ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+ LIBS="${LIBS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
+ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
UIM_SLAVE= yes
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in \
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index a18dbb7a5d5..024bc76cfd8 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -5,39 +5,34 @@
# $FreeBSD$
#
-PORTREVISION= 0
PKGNAMESUFFIX= -qt4
-COMMENT= Qt4 IM modules of uim input method
+COMMENT= Qt4 modules of uim input method
-LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim
+LIB_DEPENDS= uim.7:${PORTSDIR}/textproc/uim
USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build qt3support
+QT_COMPONENTS= qmake_build moc_build qt3support uic
USE_AUTOTOOLS= libtool:22
USE_ICONV= yes
MASTERDIR= ${.CURDIR}/../../textproc/uim
PKGDIR= ${.CURDIR}
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-qt4-immodule
+CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib -I${LOCALBASE}/include "
UIM_SLAVE= yes
-PLIST_FILES= ${QT_PLUGINDIR_REL}/inputmethods/libuiminputcontextplugin.so
-PLIST_DIRS= ${QT_PLUGINDIR_REL}/inputmethods \
- ${QT_PLUGINDIR_REL}
-
.if defined(WITHOUT_X11)
IGNORE= cannot be built without X11. Please, unset WITHOUT_X11
.endif
do-build:
- (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-x-util.la)
+ (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${GMAKE} libuim-x-util.la libuim-counted-init.la)
(cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${GMAKE})
- (cd ${WRKSRC}/qt4/immodule && ${SETENV} ${MAKE_ENV} ${GMAKE})
+ (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE})
do-install:
- (cd ${WRKSRC}/qt4/immodule && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
+ (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
.include "${MASTERDIR}/Makefile"
diff --git a/textproc/uim-qt4/pkg-plist b/textproc/uim-qt4/pkg-plist
new file mode 100644
index 00000000000..3a39c4b5a87
--- /dev/null
+++ b/textproc/uim-qt4/pkg-plist
@@ -0,0 +1,10 @@
+bin/uim-chardict-qt4
+bin/uim-im-switcher-qt4
+bin/uim-pref-qt4
+bin/uim-toolbar-qt4
+lib/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
+lib/qt4/plugins/inputmethods/libuiminputcontextplugin.so
+libexec/uim-candwin-qt4
+%%DATADIR%%/helperdata/bushu.t
+@dirrmtry lib/qt4/plugins/inputmethods
+@dirrmtry lib/qt4/plugins
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 60a7e5dee10..91aa4e25aad 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= uim
-PORTVERSION= 1.5.6
-PORTREVISION?= 3
+PORTVERSION= 1.6.0
CATEGORIES?= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
.if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
@@ -38,11 +37,12 @@ CONFIGURE_ARGS+= --with-x --with-xft
USE_GNOME+= gtk20
CONFIGURE_ARGS+= --with-gtk2
.endif
-CONFIGURE_ARGS+= --enable-emacs
+CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime
.endif
-CONFIGURE_ENV?= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV?= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
.if !defined(UIM_SLAVE)
.if !defined(WITHOUT_X11)
@@ -101,9 +101,10 @@ do-install:
cd ${WRKSRC}/helper && ${GMAKE} install-libexecPROGRAMS
.endif
-.if !defined(UIM_SLAVE) && !defined(NOPORTDOCS)
+.if !defined(UIM_SLAVE)
post-install:
${MKDIR} ${DATADIR}/helperdata
+.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${MKDIR} ${DOCSDIR_JA}
${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY
@@ -112,5 +113,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DOCSDIR_JA}/README.fep
${INSTALL_DATA} ${WRKSRC}/xim/README ${DOCSDIR}/README.xim
.endif
+.endif
.include <bsd.port.post.mk>
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index ad40687d62f..dbb45d86c45 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,2 @@
-MD5 (uim-1.5.6.tar.bz2) = 2bd5a9095d6354a2a23c908b0d6e7861
-SHA256 (uim-1.5.6.tar.bz2) = ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
-SIZE (uim-1.5.6.tar.bz2) = 3343584
+SHA256 (uim-1.6.0.tar.bz2) = 2a34dca2091eb6d61f05dabd8512c6658d8cefa8db14b7a684fbb10caea4a3aa
+SIZE (uim-1.6.0.tar.bz2) = 6154925
diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in
index 4ef68fa4b24..84d2f6f6d21 100644
--- a/textproc/uim/files/extra-patch-gtk_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk_Makefile.in
@@ -1,23 +1,22 @@
---- gtk/Makefile.in.orig 2008-05-06 14:23:14.000000000 +0900
-+++ gtk/Makefile.in 2008-05-06 20:11:03.000000000 +0900
-@@ -65,8 +65,6 @@
+--- gtk/Makefile.in.orig 2010-08-11 16:30:55.000000000 +0900
++++ gtk/Makefile.in 2010-10-16 21:33:40.000000000 +0900
+@@ -85,8 +85,6 @@
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(moduledir)"
- moduleLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(module_LTLIBRARIES)
-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la $(am__append_1)
am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
- caret-state-indicator.c caret-state-indicator.h compose.c \
-@@ -378,9 +376,8 @@
- @GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@ \
- @GTK2_TRUE@ @EBCONF_PTHREAD_LDFLAGS@
-
+ uim-cand-win-tbl-gtk.c uim-cand-win-tbl-gtk.h \
+@@ -452,8 +450,8 @@
+ @GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
+ @GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
+ @GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
-@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim.la @EBCONF_EBLIBS@ \
--@GTK2_TRUE@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ $(am__append_1)
-+@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm -luim @EBCONF_EBLIBS@ \
-+@GTK2_TRUE@ @EBCONF_ZLIBLIBS@ @EBCONF_INTLLIBS@ $(am__append_1)
- @GTK2_TRUE@IM_UIM_SOURCES = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
- @GTK2_TRUE@ key-util-gtk.h uim-cand-win-gtk.c \
- @GTK2_TRUE@ uim-cand-win-gtk.h caret-state-indicator.c \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la $(am__append_1)
++@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
++@GTK2_TRUE@ -luim $(am__append_1)
+ @GTK2_TRUE@IM_UIM_SOURCES = \
+ @GTK2_TRUE@ gtk-im-uim.c gtk-im-uim.h key-util-gtk.c key-util-gtk.h \
+ @GTK2_TRUE@ uim-cand-win-gtk.c uim-cand-win-gtk.h \
diff --git a/textproc/uim/files/extra-patch-helper_Makefile.in b/textproc/uim/files/extra-patch-helper_Makefile.in
index 3d72eac18d2..564857cf3df 100644
--- a/textproc/uim/files/extra-patch-helper_Makefile.in
+++ b/textproc/uim/files/extra-patch-helper_Makefile.in
@@ -1,6 +1,6 @@
---- helper/Makefile.in.orig 2008-05-06 14:23:15.000000000 +0900
-+++ helper/Makefile.in 2008-05-06 20:49:16.000000000 +0900
-@@ -94,9 +94,6 @@
+--- helper/Makefile.in.orig 2010-08-11 16:30:56.000000000 +0900
++++ helper/Makefile.in 2010-10-16 21:46:33.000000000 +0900
+@@ -101,9 +101,6 @@
@GTK2_TRUE@ uim_candwin_gtk-candwin-gtk.$(OBJEXT) \
@GTK2_TRUE@ uim_candwin_gtk-caret-state-indicator.$(OBJEXT)
uim_candwin_gtk_OBJECTS = $(am_uim_candwin_gtk_OBJECTS)
@@ -10,7 +10,17 @@
uim_candwin_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_candwin_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -124,12 +121,6 @@
+@@ -113,9 +110,6 @@
+ @GTK2_TRUE@ uim_candwin_tbl_gtk-candwin-tbl-gtk.$(OBJEXT) \
+ @GTK2_TRUE@ uim_candwin_tbl_gtk-caret-state-indicator.$(OBJEXT)
+ uim_candwin_tbl_gtk_OBJECTS = $(am_uim_candwin_tbl_gtk_OBJECTS)
+-@GTK2_TRUE@uim_candwin_tbl_gtk_DEPENDENCIES = \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+ uim_candwin_tbl_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(uim_candwin_tbl_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -144,12 +138,6 @@
@DICT_TRUE@@GTK2_TRUE@ $(am__objects_3)
uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS)
am__DEPENDENCIES_1 =
@@ -23,17 +33,19 @@
uim_dict_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_dict_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -137,9 +128,6 @@
+@@ -157,11 +145,6 @@
@GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS = \
@GTK2_TRUE@ uim_im_switcher_gtk-im-switcher-gtk.$(OBJEXT)
uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS)
-@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -148,9 +136,6 @@
+@@ -170,9 +153,6 @@
@GTK2_TRUE@am_uim_input_pad_ja_OBJECTS = \
@GTK2_TRUE@ uim_input_pad_ja-input-pad-ja.$(OBJEXT)
uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS)
@@ -43,7 +55,7 @@
uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -161,10 +146,6 @@
+@@ -183,10 +163,6 @@
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ uim_pref_gtk-pref-gtk-custom-widgets.$(OBJEXT) \
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ uim_pref_gtk-key-util-gtk.$(OBJEXT)
uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
@@ -54,48 +66,53 @@
uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -173,9 +154,6 @@
+@@ -195,10 +171,6 @@
@APPLET_GNOME_TRUE@am_uim_toolbar_applet_OBJECTS = uim_toolbar_applet-toolbar-applet-gnome.$(OBJEXT) \
@APPLET_GNOME_TRUE@ uim_toolbar_applet-toolbar-common-gtk.$(OBJEXT)
uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS)
-@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES = \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-scm.la \
--@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la
+-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la \
+-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-custom.la
uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -186,9 +164,6 @@
+@@ -209,10 +181,6 @@
@GTK2_TRUE@ uim_toolbar_gtk-toolbar-standalone-gtk.$(OBJEXT) \
@GTK2_TRUE@ uim_toolbar_gtk-toolbar-common-gtk.$(OBJEXT)
uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS)
-@GTK2_TRUE@uim_toolbar_gtk_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -199,9 +174,6 @@
+@@ -223,10 +191,6 @@
@GTK2_TRUE@ uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
uim_toolbar_gtk_systray_OBJECTS = \
$(am_uim_toolbar_gtk_systray_OBJECTS)
-@GTK2_TRUE@uim_toolbar_gtk_systray_DEPENDENCIES = \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-@@ -484,8 +456,8 @@
+@@ -556,9 +520,9 @@
EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml.in
helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \
-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-scm.la \
--@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la
+-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la \
+-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@APPLET_GNOME_TRUE@ -luim-scm \
-+@APPLET_GNOME_TRUE@ -luim
++@APPLET_GNOME_TRUE@ -luim \
++@APPLET_GNOME_TRUE@ -luim-custom
@APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
@APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@
-@@ -503,14 +475,14 @@
+@@ -576,8 +540,8 @@
@GTK2_TRUE@ ../gtk/caret-state-indicator.c \
@GTK2_TRUE@ ../gtk/caret-state-indicator.h
@@ -105,34 +122,53 @@
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
- @GTK2_TRUE@uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
+ @GTK2_TRUE@uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@
+@@ -585,15 +549,15 @@
+ @GTK2_TRUE@ ../gtk/caret-state-indicator.c \
+ @GTK2_TRUE@ ../gtk/caret-state-indicator.h
+
+-@GTK2_TRUE@uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
++@GTK2_TRUE@uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
++@GTK2_TRUE@ -luim
+
+ @GTK2_TRUE@uim_candwin_tbl_gtk_CPPFLAGS = -I$(top_srcdir)
+ @GTK2_TRUE@uim_candwin_tbl_gtk_CFLAGS = @GTK2_CFLAGS@
@GTK2_TRUE@uim_toolbar_gtk_SOURCES = toolbar-standalone-gtk.c toolbar-common-gtk.c
-@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
-+@GTK2_TRUE@ -luim
++@GTK2_TRUE@ -luim \
++@GTK2_TRUE@ -luim-custom
@GTK2_TRUE@uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK2_TRUE@uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
-@@ -518,20 +490,20 @@
- @GTK2_TRUE@ eggtrayicon.c eggtrayicon.h
+ @GTK2_TRUE@uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
+@@ -602,23 +566,23 @@
@GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \
+ @GTK2_TRUE@ @X11_LIBS@ \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@GTK2_TRUE@ -luim-scm \
-+@GTK2_TRUE@ -luim
++@GTK2_TRUE@ -luim \
++@GTK2_TRUE@ -luim-custom
@GTK2_TRUE@uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK2_TRUE@uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ -Wall
+ @GTK2_TRUE@uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@
@GTK2_TRUE@uim_im_switcher_gtk_SOURCES = im-switcher-gtk.c
-@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-custom.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \
+-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
+@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm \
++@GTK2_TRUE@ -luim-custom \
++@GTK2_TRUE@ -luim-scm \
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK2_TRUE@uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
+ @GTK2_TRUE@uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@
@GTK2_TRUE@uim_input_pad_ja_SOURCES = input-pad-ja.c
-@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \
-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la
@@ -140,8 +176,8 @@
+@GTK2_TRUE@ -luim
@GTK2_TRUE@uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
- @GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall
-@@ -541,9 +513,9 @@
+ @GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@
+@@ -628,9 +592,9 @@
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ ../gtk/key-util-gtk.c ../gtk/key-util-gtk.h
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ \
@@ -153,8 +189,8 @@
+@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ -luim \
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(am__append_5)
@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
- @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
-@@ -559,8 +531,8 @@
+ @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@
+@@ -646,8 +610,8 @@
@DICT_TRUE@@GTK2_TRUE@ dict-cclass-dialog.h $(am__append_6) \
@DICT_TRUE@@GTK2_TRUE@ $(am__append_9) $(am__append_12)
@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ \
diff --git a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
new file mode 100644
index 00000000000..233edf9148d
--- /dev/null
+++ b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- qt4/toolbar/CMakeLists.txt.orig 2010-10-17 02:55:35.000000000 +0900
++++ qt4/toolbar/CMakeLists.txt 2010-10-17 02:56:00.000000000 +0900
+@@ -15,8 +15,6 @@
+
+ kde4_add_plugin(plasma_applet_uim ${uim_SRCS})
+ target_link_libraries(plasma_applet_uim ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
+- ${CMAKE_SOURCE_DIR}/../../uim/.libs/libuim.so
+- ${CMAKE_SOURCE_DIR}/../../uim/.libs/libuim-scm.so
+ -luim -luim-scm)
+
+ install(TARGETS plasma_applet_uim DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/textproc/uim/files/extra-patch-qt_Makefile.in b/textproc/uim/files/extra-patch-qt_Makefile.in
index f398759005b..2cd77b19d96 100644
--- a/textproc/uim/files/extra-patch-qt_Makefile.in
+++ b/textproc/uim/files/extra-patch-qt_Makefile.in
@@ -1,7 +1,7 @@
---- qt/Makefile.in.orig 2008-05-17 12:42:12.000000000 +0900
-+++ qt/Makefile.in 2008-05-18 23:56:08.000000000 +0900
-@@ -107,10 +107,6 @@
- extraLTLIBRARIES_INSTALL = $(INSTALL)
+--- qt/Makefile.in.orig 2010-08-11 16:30:56.000000000 +0900
++++ qt/Makefile.in 2010-10-16 23:05:41.000000000 +0900
+@@ -127,10 +127,6 @@
+ "$(DESTDIR)$(lnkdir)"
LTLIBRARIES = $(applet_LTLIBRARIES) $(extra_LTLIBRARIES) \
$(noinst_LTLIBRARIES)
-@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = $(top_builddir)/uim/libuim-counted-init.la \
@@ -11,7 +11,7 @@
am__libquiminputcontextplugin_la_SOURCES_DIST = \
immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \
immodule-plugin.cpp immodule-plugin.h \
-@@ -141,9 +137,6 @@
+@@ -161,9 +157,6 @@
$(libquiminputcontextplugin_la_LDFLAGS) $(LDFLAGS) -o $@
@QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath = \
@QT_IMMODULE_TRUE@@QT_TRUE@ -rpath $(extradir)
@@ -21,7 +21,7 @@
am__libtoolbarcommon_la_SOURCES_DIST = \
toolbar-common-quimhelpertoolbar.cpp \
toolbar-common-uimstateindicator.cpp qtgettext.h \
-@@ -158,8 +151,6 @@
+@@ -178,8 +171,6 @@
$(libtoolbarcommon_la_LDFLAGS) $(LDFLAGS) -o $@
@QT_TRUE@am_libtoolbarcommon_la_rpath =
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = \
@@ -30,7 +30,7 @@
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la
am__uim_panelapplet_la_SOURCES_DIST = toolbar-applet-kde.cpp \
toolbar-applet-kde.h qtgettext.h \
-@@ -183,8 +174,8 @@
+@@ -201,8 +192,8 @@
@QT_TRUE@ uim_candwin_qt-candwin-qt.$(OBJEXT)
uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
@QT_TRUE@uim_candwin_qt_DEPENDENCIES = \
@@ -41,18 +41,20 @@
uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -195,8 +186,8 @@
+@@ -213,9 +204,9 @@
@QT_TRUE@ uim_im_switcher_qt-switcher-qt.$(OBJEXT)
uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS)
@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = \
-@QT_TRUE@ $(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@ $(top_builddir)/uim/libuim.la
+-@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+-@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@QT_TRUE@ -luim-scm \
-+@QT_TRUE@ -luim
++@QT_TRUE@ -luim \
++@QT_TRUE@ -luim-custom
uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -212,10 +203,6 @@
+@@ -231,10 +222,6 @@
@PREF_TRUE@@QT_TRUE@ uim_pref_qt-pref-keyeditformbase.$(OBJEXT)
uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
$(nodist_uim_pref_qt_OBJECTS)
@@ -63,7 +65,7 @@
uim_pref_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(uim_pref_qt_CXXFLAGS) \
$(CXXFLAGS) $(uim_pref_qt_LDFLAGS) $(LDFLAGS) -o $@
-@@ -226,9 +213,6 @@
+@@ -245,9 +232,6 @@
@QT_TRUE@am_uim_toolbar_qt_OBJECTS = \
@QT_TRUE@ uim_toolbar_qt-toolbar-standalone-qt.$(OBJEXT)
uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS)
@@ -73,7 +75,7 @@
uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \
-@@ -579,8 +563,8 @@
+@@ -655,8 +639,8 @@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @X_CFLAGS@
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim-counted-init.la \
@@ -84,7 +86,7 @@
@QT_IMMODULE_TRUE@@QT_TRUE@ $(am__append_10)
# Toolbar Common
-@@ -590,8 +574,8 @@
+@@ -666,8 +650,8 @@
@QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@@ -95,7 +97,7 @@
# Toolbar Standalone
-@@ -600,8 +584,8 @@
+@@ -676,8 +660,8 @@
@QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
@@ -106,7 +108,7 @@
# Toolbar applet
-@@ -610,8 +594,8 @@
+@@ -686,8 +670,8 @@
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS)
@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS)
@@ -117,14 +119,14 @@
@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore
-@@ -619,16 +603,16 @@
+@@ -695,17 +679,17 @@
@QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h
@QT_TRUE@uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_candwin_qt_LDFLAGS = $(QT_LDFLAGS)
-@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
-@QT_TRUE@ $(top_builddir)/uim/libuim.la
+@QT_TRUE@uim_candwin_qt_LDADD = -luim-scm \
-+@QT_TRUE@ -luim
++@QT_TRUE@ -luim
# Switcher
@@ -132,13 +134,15 @@
@QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS)
@QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS)
-@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim-scm.la \
--@QT_TRUE@ $(top_builddir)/uim/libuim.la
+-@QT_TRUE@ $(top_builddir)/uim/libuim.la \
+-@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la
+@QT_TRUE@uim_im_switcher_qt_LDADD = -luim-scm \
-+@QT_TRUE@ -luim
++@QT_TRUE@ -luim \
++@QT_TRUE@ -luim-custom
# Pref
-@@ -646,9 +630,9 @@
+@@ -723,9 +707,9 @@
@PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS)
@PREF_TRUE@@QT_TRUE@uim_pref_qt_LDADD = $(top_builddir)/uim/libuim-counted-init.la \
diff --git a/textproc/uim/files/extra-patch-uim_Makefile.in b/textproc/uim/files/extra-patch-uim_Makefile.in
index adcbc26f4e7..99e747e8cfc 100644
--- a/textproc/uim/files/extra-patch-uim_Makefile.in
+++ b/textproc/uim/files/extra-patch-uim_Makefile.in
@@ -1,15 +1,15 @@
---- uim/Makefile.in.orig 2008-05-06 14:23:17.000000000 +0900
-+++ uim/Makefile.in 2008-05-06 22:51:59.000000000 +0900
-@@ -95,8 +95,6 @@
- uim_pluginLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
- $(uim_plugin_LTLIBRARIES)
+--- uim/Makefile.in.orig 2010-08-11 16:30:58.000000000 +0900
++++ uim/Makefile.in 2010-10-17 13:04:46.000000000 +0900
+@@ -125,8 +125,6 @@
+ @EB_TRUE@am_lib_eb_static_la_OBJECTS = lib_eb_static_la-uim-eb.lo
+ lib_eb_static_la_OBJECTS = $(am_lib_eb_static_la_OBJECTS)
+ @EB_TRUE@am_lib_eb_static_la_rpath =
-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES = libuim-scm.la \
-@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ libuim.la
am__libuim_anthy_utf8_la_SOURCES_DIST = anthy-utf8.c
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@am_libuim_anthy_utf8_la_OBJECTS = libuim_anthy_utf8_la-anthy-utf8.lo
libuim_anthy_utf8_la_OBJECTS = $(am_libuim_anthy_utf8_la_OBJECTS)
-@@ -106,8 +104,6 @@
+@@ -136,8 +134,6 @@
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@am_libuim_anthy_utf8_la_rpath = \
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ -rpath \
@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ $(uim_plugindir)
@@ -18,15 +18,7 @@
am__libuim_anthy_la_SOURCES_DIST = anthy.c
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_OBJECTS = libuim_anthy_la-anthy.lo
libuim_anthy_la_OBJECTS = $(am_libuim_anthy_la_OBJECTS)
-@@ -119,7 +115,6 @@
- libuim_bsdlook_la_DEPENDENCIES =
- am_libuim_bsdlook_la_OBJECTS = libuim_bsdlook_la-bsdlook.lo
- libuim_bsdlook_la_OBJECTS = $(am_libuim_bsdlook_la_OBJECTS)
--@CANNA_TRUE@libuim_canna_la_DEPENDENCIES = libuim-scm.la libuim.la
- am__libuim_canna_la_SOURCES_DIST = canna.c
- @CANNA_TRUE@am_libuim_canna_la_OBJECTS = libuim_canna_la-canna.lo
- libuim_canna_la_OBJECTS = $(am_libuim_canna_la_OBJECTS)
-@@ -159,7 +154,6 @@
+@@ -230,7 +226,6 @@
libuim_look_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libuim_look_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -34,7 +26,7 @@
am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c
@M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS = \
@M17NLIB_TRUE@ libuim_m17nlib_la-m17nlib.lo
-@@ -168,7 +162,6 @@
+@@ -239,7 +234,6 @@
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libuim_m17nlib_la_LDFLAGS) $(LDFLAGS) -o $@
@M17NLIB_TRUE@am_libuim_m17nlib_la_rpath = -rpath $(uim_plugindir)
@@ -42,40 +34,16 @@
am__libuim_mana_la_SOURCES_DIST = mana.c
@MANA_TRUE@am_libuim_mana_la_OBJECTS = libuim_mana_la-mana.lo
libuim_mana_la_OBJECTS = $(am_libuim_mana_la_OBJECTS)
-@@ -176,7 +169,6 @@
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libuim_mana_la_LDFLAGS) $(LDFLAGS) -o $@
- @MANA_TRUE@am_libuim_mana_la_rpath = -rpath $(uim_plugindir)
--@PRIME_TRUE@libuim_prime_la_DEPENDENCIES = libuim-scm.la libuim.la
- am__libuim_prime_la_SOURCES_DIST = prime.c
- @PRIME_TRUE@am_libuim_prime_la_OBJECTS = libuim_prime_la-prime.lo
- libuim_prime_la_OBJECTS = $(am_libuim_prime_la_OBJECTS)
-@@ -184,7 +176,6 @@
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libuim_prime_la_LDFLAGS) $(LDFLAGS) -o $@
- @PRIME_TRUE@am_libuim_prime_la_rpath = -rpath $(uim_plugindir)
--@SCIM_TRUE@libuim_scim_la_DEPENDENCIES = libuim-scm.la libuim.la
- am__libuim_scim_la_SOURCES_DIST = scim.cpp
- @SCIM_TRUE@am_libuim_scim_la_OBJECTS = libuim_scim_la-scim.lo
- libuim_scim_la_OBJECTS = $(am_libuim_scim_la_OBJECTS)
-@@ -199,7 +190,6 @@
- libuim_scm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libuim_scm_la_LDFLAGS) $(LDFLAGS) -o $@
--@SJ3_TRUE@libuim_sj3_la_DEPENDENCIES = libuim.la
- am__libuim_sj3_la_SOURCES_DIST = sj3.c
- @SJ3_TRUE@am_libuim_sj3_la_OBJECTS = libuim_sj3_la-sj3.lo
- libuim_sj3_la_OBJECTS = $(am_libuim_sj3_la_OBJECTS)
-@@ -214,7 +204,6 @@
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libuim_skk_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -299,7 +293,6 @@
+ $(libuim_sqlite3_la_LDFLAGS) $(LDFLAGS) -o $@
+ @SQLITE3_TRUE@am_libuim_sqlite3_la_rpath = -rpath $(uim_plugindir)
am__DEPENDENCIES_1 =
-@WNN_TRUE@libuim_wnn_la_DEPENDENCIES = libuim.la $(am__DEPENDENCIES_1)
am__libuim_wnn_la_SOURCES_DIST = wnnlib.h wnnlib.c
@WNN_TRUE@am_libuim_wnn_la_OBJECTS = libuim_wnn_la-wnnlib.lo
libuim_wnn_la_OBJECTS = $(am_libuim_wnn_la_OBJECTS)
-@@ -618,39 +607,39 @@
- $(am__append_2) $(am__append_8) $(am__append_10)
+@@ -763,47 +756,47 @@
+ libuim_process_la_CPPFLAGS = -I$(top_srcdir)
libuim_custom_la_SOURCES = uim-custom.c
@M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c
-@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la
@@ -87,21 +55,11 @@
+@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ -luim-scm -luim
@SCIM_TRUE@libuim_scim_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@SCIM_TRUE@libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
- @CANNA_TRUE@libuim_canna_la_SOURCES = canna.c
--@CANNA_TRUE@libuim_canna_la_LIBADD = libuim-scm.la libuim.la -lcanna
-+@CANNA_TRUE@libuim_canna_la_LIBADD = -luim-scm -luim -lcanna
- @CANNA_TRUE@libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
- @CANNA_TRUE@libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
@WNN_TRUE@libuim_wnn_la_SOURCES = wnnlib.h wnnlib.c
-@WNN_TRUE@libuim_wnn_la_LIBADD = libuim.la $(WNN_LIBS) -lwnn @WNN_LIBADD@
+@WNN_TRUE@libuim_wnn_la_LIBADD = -luim $(WNN_LIBS) -lwnn @WNN_LIBADD@
@WNN_TRUE@libuim_wnn_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@WNN_TRUE@libuim_wnn_la_CPPFLAGS = -I$(top_srcdir) $(WNN_CPPFLAGS)
- @SJ3_TRUE@libuim_sj3_la_SOURCES = sj3.c
--@SJ3_TRUE@libuim_sj3_la_LIBADD = @SJ3_LIBS@ libuim.la
-+@SJ3_TRUE@libuim_sj3_la_LIBADD = @SJ3_LIBS@ -luim
- @SJ3_TRUE@libuim_sj3_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
- @SJ3_TRUE@libuim_sj3_la_CPPFLAGS = -I$(top_srcdir) @SJ3_CFLAGS@
@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_SOURCES = anthy.c
-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la
+@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim-scm -luim
@@ -117,9 +75,29 @@
+@MANA_TRUE@libuim_mana_la_LIBADD = -luim-scm -luim
@MANA_TRUE@libuim_mana_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
@MANA_TRUE@libuim_mana_la_CPPFLAGS = -I$(top_srcdir)
- @PRIME_TRUE@libuim_prime_la_SOURCES = prime.c
--@PRIME_TRUE@libuim_prime_la_LIBADD = libuim-scm.la libuim.la
-+@PRIME_TRUE@libuim_prime_la_LIBADD = -luim-scm -luim
- @PRIME_TRUE@libuim_prime_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
- @PRIME_TRUE@libuim_prime_la_CPPFLAGS = -I$(top_srcdir)
- libuim_skk_la_SOURCES = skk.c bsdlook.h
+ @CURL_TRUE@libuim_curl_la_SOURCES = curl.c
+-@CURL_TRUE@libuim_curl_la_LIBADD = @CURL_LIBS@ libuim.la
++@CURL_TRUE@libuim_curl_la_LIBADD = @CURL_LIBS@ -luim
+ @CURL_TRUE@libuim_curl_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @CURL_TRUE@libuim_curl_la_CPPFLAGS = -I$(top_srcdir) @CURL_CFLAGS@
+ @EXPAT_TRUE@libuim_expat_la_SOURCES = expat.c
+-@EXPAT_TRUE@libuim_expat_la_LIBADD = @EXPAT_LIBS@ libuim.la
++@EXPAT_TRUE@libuim_expat_la_LIBADD = @EXPAT_LIBS@ -luim
+ @EXPAT_TRUE@libuim_expat_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @EXPAT_TRUE@libuim_expat_la_CPPFLAGS = -I$(top_srcdir) @EXPAT_CFLAGS@
+ @OPENSSL_TRUE@libuim_openssl_la_SOURCES = openssl.c
+-@OPENSSL_TRUE@libuim_openssl_la_LIBADD = @OPENSSL_LIBS@ libuim.la
++@OPENSSL_TRUE@libuim_openssl_la_LIBADD = @OPENSSL_LIBS@ -luim
+ @OPENSSL_TRUE@libuim_openssl_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @OPENSSL_TRUE@libuim_openssl_la_CPPFLAGS = -I$(top_srcdir) @OPENSSL_CPPFLAGS@
+ @SQLITE3_TRUE@libuim_sqlite3_la_SOURCES = sqlite3.c
+-@SQLITE3_TRUE@libuim_sqlite3_la_LIBADD = @SQLITE3_LIBS@ libuim.la
++@SQLITE3_TRUE@libuim_sqlite3_la_LIBADD = @SQLITE3_LIBS@ -luim
+ @SQLITE3_TRUE@libuim_sqlite3_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @SQLITE3_TRUE@libuim_sqlite3_la_CPPFLAGS = -I$(top_srcdir) @SQLITE3_CFLAGS@
+ @FFI_TRUE@libuim_ffi_la_SOURCES = ffi.c
+-@FFI_TRUE@libuim_ffi_la_LIBADD = @FFI_LIBS@ libuim.la
++@FFI_TRUE@libuim_ffi_la_LIBADD = @FFI_LIBS@ -luim
+ @FFI_TRUE@libuim_ffi_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
+ @FFI_TRUE@libuim_ffi_la_CPPFLAGS = -I$(top_srcdir) @FFI_CFLAGS@
+ @EB_TRUE@lib_eb_static_la_SOURCES = uim-eb.c uim-eb.h
diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure
new file mode 100644
index 00000000000..1191a4928ab
--- /dev/null
+++ b/textproc/uim/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-11-18 05:01:48.000000000 +0900
++++ configure 2010-11-18 05:02:16.000000000 +0900
+@@ -24012,7 +24012,7 @@
+
+ # Check whether --with-xft was given.
+ if test "${with_xft+set}" = set; then
+- withval=$with_xft; if test "x$enableval" = "xyes"; then
++ withval=$with_xft; if test "x$withval" = "xyes"; then
+ TRY_XFT=yes
+ else
+ TRY_XFT=no
diff --git a/textproc/uim/files/patch-emacs_Makefile.in b/textproc/uim/files/patch-emacs_Makefile.in
index c9d1c433de0..d4a25fb371a 100644
--- a/textproc/uim/files/patch-emacs_Makefile.in
+++ b/textproc/uim/files/patch-emacs_Makefile.in
@@ -1,17 +1,20 @@
---- emacs/Makefile.in.orig Wed Jan 3 21:31:12 2007
-+++ emacs/Makefile.in Wed Jan 3 21:32:26 2007
-@@ -735,15 +735,6 @@
+--- emacs/Makefile.in.orig 2010-08-11 16:30:55.000000000 +0900
++++ emacs/Makefile.in 2010-10-16 19:53:21.000000000 +0900
+@@ -846,18 +846,6 @@
clean-libtool:
-rm -rf .libs _libs
-install-dist_uimel_lispDATA: $(dist_uimel_lisp_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(uimel_lispdir)" || $(MKDIR_P) "$(DESTDIR)$(uimel_lispdir)"
-- @list='$(dist_uimel_lisp_DATA)'; for p in $$list; do \
+- @list='$(dist_uimel_lisp_DATA)'; test -n "$(uimel_lispdir)" || list=; \
+- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(dist_uimel_lispDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uimel_lispdir)/$$f'"; \
-- $(dist_uimel_lispDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uimel_lispdir)/$$f"; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uimel_lispdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(uimel_lispdir)" || exit $$?; \
- done
uninstall-dist_uimel_lispDATA:
diff --git a/textproc/uim/files/patch-gtk:Makefile.in b/textproc/uim/files/patch-gtk:Makefile.in
index 60ee6d7c4a2..7290647c007 100644
--- a/textproc/uim/files/patch-gtk:Makefile.in
+++ b/textproc/uim/files/patch-gtk:Makefile.in
@@ -1,27 +1,33 @@
---- gtk/Makefile.in.orig 2008-05-17 12:42:10.000000000 +0900
-+++ gtk/Makefile.in 2008-05-18 22:12:18.000000000 +0900
-@@ -427,15 +427,15 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+--- gtk/Makefile.in.orig 2010-08-11 16:30:55.000000000 +0900
++++ gtk/Makefile.in 2010-10-16 19:56:10.000000000 +0900
+@@ -501,18 +501,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
-- @list='$(module_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
+- list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
+- list2="$$list2 $$p"; \
- else :; fi; \
-- done
+- done; \
+- test -z "$$list2" || { \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
+- }
+@GTK2_TRUE@ @$(NORMAL_INSTALL)
+@GTK2_TRUE@ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)"
-+@GTK2_TRUE@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \
++@GTK2_TRUE@ @list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
++@GTK2_TRUE@ list2=; for p in $$list; do \
+@GTK2_TRUE@ if test -f $$p; then \
-+@GTK2_TRUE@ f=$(am__strip_dir) \
-+@GTK2_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
-+@GTK2_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
++@GTK2_TRUE@ list2="$$list2 $$p"; \
+@GTK2_TRUE@ else :; fi; \
-+@GTK2_TRUE@ done
++@GTK2_TRUE@ done; \
++@GTK2_TRUE@ test -z "$$list2" || { \
++@GTK2_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
++@GTK2_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
++@GTK2_TRUE@ }
uninstall-moduleLTLIBRARIES:
@$(NORMAL_UNINSTALL)
diff --git a/textproc/uim/files/patch-scm_sj3-custom.scm b/textproc/uim/files/patch-scm_sj3-custom.scm
new file mode 100644
index 00000000000..7886bcda53c
--- /dev/null
+++ b/textproc/uim/files/patch-scm_sj3-custom.scm
@@ -0,0 +1,11 @@
+--- scm/sj3-custom.scm.orig 2010-10-17 14:09:36.000000000 +0900
++++ scm/sj3-custom.scm 2010-10-17 14:10:09.000000000 +0900
+@@ -339,7 +339,7 @@
+ (N_ "SJ3 user name")
+ (N_ "long description will be here."))
+
+-(define-custom 'sj3-unix-domain-socket-path "/var/sj3/run/sj3serv.socket"
++(define-custom 'sj3-unix-domain-socket-path "/var/run/sj3/socket"
+ '(sj3-advanced sj3server)
+ '(string ".*")
+ (N_ "SJ3 server socket path")
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index f6c2ced35f3..ee3d1cc0776 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -2,11 +2,12 @@ bin/uim-el-agent
bin/uim-el-helper-agent
bin/uim-fep
bin/uim-fep-tick
+bin/uim-help
bin/uim-module-manager
bin/uim-sh
%%X11%%bin/uim-xim
include/gcroots.h
-include/uim/plugin.h
+include/uim/dynlib.h
include/uim/uim-custom.h
include/uim/uim-helper.h
include/uim/uim-im-switcher.h
@@ -23,30 +24,43 @@ lib/libgcroots.so.1
lib/libuim-custom.a
lib/libuim-custom.la
lib/libuim-custom.so
-lib/libuim-custom.so.2
+lib/libuim-custom.so.3
lib/libuim-scm.a
lib/libuim-scm.la
lib/libuim-scm.so
-lib/libuim-scm.so.0
+lib/libuim-scm.so.1
lib/libuim.a
lib/libuim.la
lib/libuim.so
-lib/libuim.so.6
+lib/libuim.so.7
lib/uim/plugin/libuim-custom-enabler.a
lib/uim/plugin/libuim-custom-enabler.la
lib/uim/plugin/libuim-custom-enabler.so
lib/uim/plugin/libuim-editline.a
lib/uim/plugin/libuim-editline.la
lib/uim/plugin/libuim-editline.so
+lib/uim/plugin/libuim-fileio.a
+lib/uim/plugin/libuim-fileio.la
+lib/uim/plugin/libuim-fileio.so
+lib/uim/plugin/libuim-lolevel.a
+lib/uim/plugin/libuim-lolevel.la
+lib/uim/plugin/libuim-lolevel.so
lib/uim/plugin/libuim-look.a
lib/uim/plugin/libuim-look.la
lib/uim/plugin/libuim-look.so
+lib/uim/plugin/libuim-process.a
+lib/uim/plugin/libuim-process.la
+lib/uim/plugin/libuim-process.so
lib/uim/plugin/libuim-skk.a
lib/uim/plugin/libuim-skk.la
lib/uim/plugin/libuim-skk.so
+lib/uim/plugin/libuim-socket.a
+lib/uim/plugin/libuim-socket.la
+lib/uim/plugin/libuim-socket.so
libdata/pkgconfig/gcroots.pc
libdata/pkgconfig/uim.pc
%%X11%%libexec/uim-candwin-gtk
+%%X11%%libexec/uim-candwin-tbl-gtk
libexec/uim-helper-server
share/applications/uim.desktop
share/locale/fr/LC_MESSAGES/uim.mo
@@ -58,6 +72,13 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%PORTDOCS%%%%DOCSDIR%%/README.key
%%PORTDOCS%%%%DOCSDIR%%/README.xim
%%DATADIR%%/action.scm
+%%DATADIR%%/ajax-ime-custom.scm
+%%DATADIR%%/ajax-ime-key-custom.scm
+%%DATADIR%%/ajax-ime.scm
+%%DATADIR%%/annotation-dict.scm
+%%DATADIR%%/annotation-eb.scm
+%%DATADIR%%/annotation-filter.scm
+%%DATADIR%%/annotation.scm
%%DATADIR%%/anthy-custom.scm
%%DATADIR%%/anthy-key-custom.scm
%%DATADIR%%/anthy-utf8-custom.scm
@@ -71,32 +92,46 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/canna-custom.scm
%%DATADIR%%/canna-key-custom.scm
%%DATADIR%%/canna.scm
+%%DATADIR%%/cannav3-socket.scm
+%%DATADIR%%/composer.scm
+%%DATADIR%%/ct.scm
%%DATADIR%%/custom-rt.scm
%%DATADIR%%/custom.scm
%%DATADIR%%/default.scm
%%DATADIR%%/deprecated-util.scm
+%%DATADIR%%/dict-socket.scm
%%DATADIR%%/direct.scm
+%%DATADIR%%/dynlib.scm
%%DATADIR%%/editline.scm
%%DATADIR%%/elatin-custom.scm
%%DATADIR%%/elatin-rules.scm
%%DATADIR%%/elatin.scm
+%%DATADIR%%/event.scm
+%%DATADIR%%/fileio.scm
%%DATADIR%%/generic-custom.scm
%%DATADIR%%/generic-key-custom.scm
+%%DATADIR%%/generic-predict.scm
%%DATADIR%%/generic.scm
%%DATADIR%%/hangul.scm
%%DATADIR%%/hangul2.scm
%%DATADIR%%/hangul3.scm
+%%DATADIR%%/http-client.scm
+%%DATADIR%%/http-server.scm
%%DATADIR%%/i18n.scm
%%DATADIR%%/ichar.scm
%%DATADIR%%/im-custom.scm
%%DATADIR%%/im-switcher.scm
%%DATADIR%%/im.scm
%%DATADIR%%/init.scm
+%%DATADIR%%/input-parse.scm
%%DATADIR%%/installed-modules.scm
%%DATADIR%%/ipa-x-sampa.scm
%%DATADIR%%/iso-639-1.scm
+%%DATADIR%%/japanese-act.scm
%%DATADIR%%/japanese-azik.scm
+%%DATADIR%%/japanese-custom.scm
%%DATADIR%%/japanese-kana.scm
+%%DATADIR%%/japanese-kzik.scm
%%DATADIR%%/japanese.scm
%%DATADIR%%/key.scm
%%DATADIR%%/latin.scm
@@ -110,23 +145,35 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/lib/srfi-9.scm
%%DATADIR%%/lib/srfi-95.scm
%%DATADIR%%/lib/unittest.scm
+%%DATADIR%%/light-record.scm
%%DATADIR%%/load-action.scm
%%DATADIR%%/loader.scm
+%%DATADIR%%/lolevel.scm
%%DATADIR%%/look-custom.scm
%%DATADIR%%/look.scm
%%DATADIR%%/m17nlib.scm
%%DATADIR%%/mana-custom.scm
%%DATADIR%%/mana-key-custom.scm
%%DATADIR%%/mana.scm
+%%DATADIR%%/match.scm
+%%DATADIR%%/ng-action.scm
+%%DATADIR%%/ng-key.scm
+%%DATADIR%%/openssl.scm
%%DATADIR%%/pinyin-big5.scm
+%%DATADIR%%/pixmaps/ajax-ime.png
+%%DATADIR%%/pixmaps/ajax-ime.svg
%%DATADIR%%/pixmaps/anthy.png
%%DATADIR%%/pixmaps/byeoru.png
%%DATADIR%%/pixmaps/byeoru.svg
%%DATADIR%%/pixmaps/canna.png
%%DATADIR%%/pixmaps/direct.png
%%DATADIR%%/pixmaps/direct.svg
+%%DATADIR%%/pixmaps/direct_dark_background.png
+%%DATADIR%%/pixmaps/direct_dark_background.svg
%%DATADIR%%/pixmaps/direct_input.png
%%DATADIR%%/pixmaps/direct_input.svg
+%%DATADIR%%/pixmaps/direct_input_dark_background.png
+%%DATADIR%%/pixmaps/direct_input_dark_background.svg
%%DATADIR%%/pixmaps/elatin.png
%%DATADIR%%/pixmaps/elatin.svg
%%DATADIR%%/pixmaps/hangul2.png
@@ -138,34 +185,66 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/im_switcher.svg
%%DATADIR%%/pixmaps/ipa-x-sampa.png
%%DATADIR%%/pixmaps/ipa-x-sampa.svg
+%%DATADIR%%/pixmaps/ja_act.png
+%%DATADIR%%/pixmaps/ja_act.svg
+%%DATADIR%%/pixmaps/ja_act_dark_background.png
+%%DATADIR%%/pixmaps/ja_act_dark_background.svg
%%DATADIR%%/pixmaps/ja_azik.png
%%DATADIR%%/pixmaps/ja_azik.svg
+%%DATADIR%%/pixmaps/ja_azik_dark_background.png
+%%DATADIR%%/pixmaps/ja_azik_dark_background.svg
%%DATADIR%%/pixmaps/ja_direct.png
%%DATADIR%%/pixmaps/ja_direct.svg
+%%DATADIR%%/pixmaps/ja_direct_dark_background.png
+%%DATADIR%%/pixmaps/ja_direct_dark_background.svg
%%DATADIR%%/pixmaps/ja_fullwidth_alnum.png
%%DATADIR%%/pixmaps/ja_fullwidth_alnum.svg
+%%DATADIR%%/pixmaps/ja_fullwidth_alnum_dark_background.png
+%%DATADIR%%/pixmaps/ja_fullwidth_alnum_dark_background.svg
%%DATADIR%%/pixmaps/ja_halfkana.png
%%DATADIR%%/pixmaps/ja_halfkana.svg
+%%DATADIR%%/pixmaps/ja_halfkana_dark_background.png
+%%DATADIR%%/pixmaps/ja_halfkana_dark_background.svg
%%DATADIR%%/pixmaps/ja_halfwidth_alnum.png
%%DATADIR%%/pixmaps/ja_halfwidth_alnum.svg
+%%DATADIR%%/pixmaps/ja_halfwidth_alnum_dark_background.png
+%%DATADIR%%/pixmaps/ja_halfwidth_alnum_dark_background.svg
%%DATADIR%%/pixmaps/ja_hiragana.png
%%DATADIR%%/pixmaps/ja_hiragana.svg
+%%DATADIR%%/pixmaps/ja_hiragana_dark_background.png
+%%DATADIR%%/pixmaps/ja_hiragana_dark_background.svg
%%DATADIR%%/pixmaps/ja_kana.png
%%DATADIR%%/pixmaps/ja_kana.svg
+%%DATADIR%%/pixmaps/ja_kana_dark_background.png
+%%DATADIR%%/pixmaps/ja_kana_dark_background.svg
%%DATADIR%%/pixmaps/ja_katakana.png
%%DATADIR%%/pixmaps/ja_katakana.svg
+%%DATADIR%%/pixmaps/ja_katakana_dark_background.png
+%%DATADIR%%/pixmaps/ja_katakana_dark_background.svg
+%%DATADIR%%/pixmaps/ja_kzik.png
+%%DATADIR%%/pixmaps/ja_kzik.svg
+%%DATADIR%%/pixmaps/ja_kzik_dark_background.png
+%%DATADIR%%/pixmaps/ja_kzik_dark_background.svg
%%DATADIR%%/pixmaps/ja_nicola.png
%%DATADIR%%/pixmaps/ja_nicola.svg
%%DATADIR%%/pixmaps/ja_pocketbell.png
%%DATADIR%%/pixmaps/ja_pocketbell.svg
%%DATADIR%%/pixmaps/ja_romaji.png
%%DATADIR%%/pixmaps/ja_romaji.svg
+%%DATADIR%%/pixmaps/ja_romaji_dark_background.png
+%%DATADIR%%/pixmaps/ja_romaji_dark_background.svg
%%DATADIR%%/pixmaps/ko_direct.png
%%DATADIR%%/pixmaps/ko_direct.svg
+%%DATADIR%%/pixmaps/ko_direct_dark_background.png
+%%DATADIR%%/pixmaps/ko_direct_dark_background.svg
%%DATADIR%%/pixmaps/ko_hangulchar.png
%%DATADIR%%/pixmaps/ko_hangulchar.svg
+%%DATADIR%%/pixmaps/ko_hangulchar_dark_background.png
+%%DATADIR%%/pixmaps/ko_hangulchar_dark_background.svg
%%DATADIR%%/pixmaps/ko_hangulword.png
%%DATADIR%%/pixmaps/ko_hangulword.svg
+%%DATADIR%%/pixmaps/ko_hangulword_dark_background.png
+%%DATADIR%%/pixmaps/ko_hangulword_dark_background.svg
%%DATADIR%%/pixmaps/latin.png
%%DATADIR%%/pixmaps/latin.svg
%%DATADIR%%/pixmaps/look.png
@@ -175,13 +254,19 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/null.png
%%DATADIR%%/pixmaps/off.png
%%DATADIR%%/pixmaps/off.svg
+%%DATADIR%%/pixmaps/off_dark_background.png
+%%DATADIR%%/pixmaps/off_dark_background.svg
%%DATADIR%%/pixmaps/on.png
%%DATADIR%%/pixmaps/on.svg
+%%DATADIR%%/pixmaps/on_dark_background.png
+%%DATADIR%%/pixmaps/on_dark_background.svg
%%DATADIR%%/pixmaps/pinyin-big5.png
%%DATADIR%%/pixmaps/pinyin-big5.svg
%%DATADIR%%/pixmaps/prime.png
%%DATADIR%%/pixmaps/prime_mode_application.png
%%DATADIR%%/pixmaps/prime_mode_application.svg
+%%DATADIR%%/pixmaps/prime_mode_application_dark_background.png
+%%DATADIR%%/pixmaps/prime_mode_application_dark_background.svg
%%DATADIR%%/pixmaps/py.png
%%DATADIR%%/pixmaps/py.svg
%%DATADIR%%/pixmaps/pyunihan.png
@@ -194,12 +279,22 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/sj3.svg
%%DATADIR%%/pixmaps/skk.png
%%DATADIR%%/pixmaps/skk.svg
+%%DATADIR%%/pixmaps/skk_dark_background.png
+%%DATADIR%%/pixmaps/skk_dark_background.svg
+%%DATADIR%%/pixmaps/social-ime.png
+%%DATADIR%%/pixmaps/social-ime.svg
%%DATADIR%%/pixmaps/tcode.png
%%DATADIR%%/pixmaps/tcode.svg
+%%DATADIR%%/pixmaps/tcode_dark_background.png
+%%DATADIR%%/pixmaps/tcode_dark_background.svg
%%DATADIR%%/pixmaps/trycode.png
%%DATADIR%%/pixmaps/trycode.svg
+%%DATADIR%%/pixmaps/trycode_dark_background.png
+%%DATADIR%%/pixmaps/trycode_dark_background.svg
%%DATADIR%%/pixmaps/tutcode.png
%%DATADIR%%/pixmaps/tutcode.svg
+%%DATADIR%%/pixmaps/tutcode_dark_background.png
+%%DATADIR%%/pixmaps/tutcode_dark_background.svg
%%DATADIR%%/pixmaps/uim-dict.png
%%DATADIR%%/pixmaps/uim-dict.svg
%%DATADIR%%/pixmaps/uim-gray.png
@@ -208,14 +303,32 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/pixmaps/uim-icon64.png
%%DATADIR%%/pixmaps/unknown.png
%%DATADIR%%/pixmaps/unknown.svg
+%%DATADIR%%/pixmaps/unknown_dark_background.png
+%%DATADIR%%/pixmaps/unknown_dark_background.svg
%%DATADIR%%/pixmaps/viqr.png
%%DATADIR%%/pixmaps/viqr.svg
+%%DATADIR%%/pixmaps/wb86.png
+%%DATADIR%%/pixmaps/wb86.svg
+%%DATADIR%%/pixmaps/wb86_dark_background.png
+%%DATADIR%%/pixmaps/wb86_dark_background.svg
%%DATADIR%%/pixmaps/wnn.png
%%DATADIR%%/pixmaps/wnn.svg
+%%DATADIR%%/pixmaps/yahoo-jp.png
+%%DATADIR%%/pixmaps/yahoo-jp.svg
+%%DATADIR%%/pixmaps/zm.png
+%%DATADIR%%/pixmaps/zm.svg
+%%DATADIR%%/pixmaps/zm_dark_background.png
+%%DATADIR%%/pixmaps/zm_dark_background.svg
%%DATADIR%%/plugin.scm
+%%DATADIR%%/predict-custom.scm
+%%DATADIR%%/predict-look-skk.scm
+%%DATADIR%%/predict-look.scm
+%%DATADIR%%/predict-sqlite3.scm
+%%DATADIR%%/pregexp.scm
%%DATADIR%%/prime-custom.scm
%%DATADIR%%/prime-key-custom.scm
%%DATADIR%%/prime.scm
+%%DATADIR%%/process.scm
%%DATADIR%%/py.scm
%%DATADIR%%/pyload.scm
%%DATADIR%%/pyunihan.scm
@@ -225,27 +338,44 @@ share/locale/ko/LC_MESSAGES/uim.mo
%%DATADIR%%/sj3-custom.scm
%%DATADIR%%/sj3-key-custom.scm
%%DATADIR%%/sj3.scm
+%%DATADIR%%/sj3v2-socket.scm
%%DATADIR%%/skk-custom.scm
%%DATADIR%%/skk-dialog.scm
%%DATADIR%%/skk-editor.scm
%%DATADIR%%/skk-key-custom.scm
%%DATADIR%%/skk.scm
+%%DATADIR%%/social-ime-custom.scm
+%%DATADIR%%/social-ime-key-custom.scm
+%%DATADIR%%/social-ime.scm
+%%DATADIR%%/socket.scm
+%%DATADIR%%/sqlite3.scm
+%%DATADIR%%/sxml-tools.scm
+%%DATADIR%%/sxpathlib.scm
%%DATADIR%%/tcode.scm
+%%DATADIR%%/trec.scm
%%DATADIR%%/trycode.scm
%%DATADIR%%/tutcode-bushudic.scm
%%DATADIR%%/tutcode-custom.scm
+%%DATADIR%%/tutcode-dialog.scm
+%%DATADIR%%/tutcode-editor.scm
%%DATADIR%%/tutcode-key-custom.scm
%%DATADIR%%/tutcode-kigoudic.scm
%%DATADIR%%/tutcode-rule.scm
%%DATADIR%%/tutcode.scm
+%%DATADIR%%/uim-help.scm
%%DATADIR%%/uim-module-manager.scm
%%DATADIR%%/uim-sh.scm
%%DATADIR%%/ustr.scm
%%DATADIR%%/util.scm
%%DATADIR%%/viqr.scm
+%%DATADIR%%/wlos.scm
%%DATADIR%%/wnn-custom.scm
%%DATADIR%%/wnn-key-custom.scm
%%DATADIR%%/wnn.scm
+%%DATADIR%%/xmload.scm
+%%DATADIR%%/yahoo-jp-custom.scm
+%%DATADIR%%/yahoo-jp-key-custom.scm
+%%DATADIR%%/yahoo-jp.scm
%%DATADIR%%/zaurus.scm
@dirrm include/libgcroots
@dirrm include/sigscheme
@@ -255,8 +385,8 @@ share/locale/ko/LC_MESSAGES/uim.mo
@dirrmtry share/applications
%%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
@dirrm %%DOCSDIR_SIGSCHEME%%
-@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%DATADIR%%/helperdata
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/helperdata
@dirrm %%DATADIR%%/lib
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%
generated by cgit (git 2.34.1) at 2024-12-17 18:24:07 +0800