From 89abb4bc3d764f8612073e05cb0e5d16433e3786 Mon Sep 17 00:00:00 2001 From: MANTANI Nobutaka Date: Mon, 12 Jun 2006 17:45:54 +0000 Subject: [PATCH] - Update to 1.1.0. - Mark textproc/uim-m17nlib IGNORE since it requires m17n-lib-1.3.1 or later. --- japanese/uim-anthy/Makefile | 18 ++- japanese/uim-anthy/pkg-plist | 1 + japanese/uim-canna/Makefile | 11 +- japanese/uim-prime/Makefile | 11 +- textproc/uim-el/Makefile | 3 +- textproc/uim-el/distinfo | 6 +- textproc/uim-el/files/patch-emacs_Makefile.in | 45 ++----- textproc/uim-el/pkg-plist | 1 + textproc/uim-gnome/Makefile | 9 +- textproc/uim-gnome/pkg-plist | 1 - textproc/uim-gtk/Makefile | 9 +- textproc/uim-gtk/pkg-plist | 2 - textproc/uim-m17nlib/Makefile | 9 +- textproc/uim-qt/Makefile | 6 +- textproc/uim-qt/pkg-plist | 1 - textproc/uim/Makefile | 8 +- textproc/uim/distinfo | 6 +- .../uim/files/extra-patch-gtk_Makefile.in | 20 +++ .../uim/files/extra-patch-helper_Makefile.in | 120 ++++++++++++++++++ textproc/uim/files/extra-patch-qt_Makefile.in | 104 +++++++++++++++ .../uim/files/extra-patch-uim_Makefile.in | 73 +++++++++++ textproc/uim/pkg-plist | 98 ++++++++++++-- 22 files changed, 489 insertions(+), 73 deletions(-) create mode 100644 textproc/uim/files/extra-patch-gtk_Makefile.in create mode 100644 textproc/uim/files/extra-patch-helper_Makefile.in create mode 100644 textproc/uim/files/extra-patch-qt_Makefile.in create mode 100644 textproc/uim/files/extra-patch-uim_Makefile.in diff --git a/japanese/uim-anthy/Makefile b/japanese/uim-anthy/Makefile index 2153c2a7c7e5..e0354edc3e7b 100644 --- a/japanese/uim-anthy/Makefile +++ b/japanese/uim-anthy/Makefile @@ -10,20 +10,30 @@ PKGNAMESUFFIX= -anthy COMMENT= Uim plugin using Anthy input method +USE_GNOME= gtk20 + RUN_DEPENDS= uim-module-manager:${PORTSDIR}/textproc/uim LIB_DEPENDS= anthy.1:${PORTSDIR}/japanese/anthy MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} -CONFIGURE_ARGS= --with-anthy +CONFIGURE_ARGS= --with-anthy --with-gtk2 --enable-dict UIM_SLAVE= yes +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \ + ${PATCHDIR}/extra-patch-helper_Makefile.in + +do-build: + (cd ${WRKSRC}/uim && ${GMAKE} libuim-anthy.la) + (cd ${WRKSRC}/helper && ${GMAKE} LIBS="-luim" uim-dict-gtk) + do-install: - cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES + (cd ${WRKSRC}/uim && \ + ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES) + (cd ${WRKSRC}/helper && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS) post-install: - uim-module-manager --register anthy + ${X11BASE}/bin/uim-module-manager --register anthy .include "${MASTERDIR}/Makefile" diff --git a/japanese/uim-anthy/pkg-plist b/japanese/uim-anthy/pkg-plist index 142c7dc68c43..c84f90800556 100644 --- a/japanese/uim-anthy/pkg-plist +++ b/japanese/uim-anthy/pkg-plist @@ -1,3 +1,4 @@ +bin/uim-dict-gtk lib/uim/plugin/libuim-anthy.a lib/uim/plugin/libuim-anthy.la lib/uim/plugin/libuim-anthy.so diff --git a/japanese/uim-canna/Makefile b/japanese/uim-canna/Makefile index d9bb39c21dc7..b7de9c54755c 100644 --- a/japanese/uim-canna/Makefile +++ b/japanese/uim-canna/Makefile @@ -19,11 +19,16 @@ CONFIGURE_ARGS= --with-canna UIM_SLAVE= yes +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in + +do-build: + (cd ${WRKSRC}/uim && ${GMAKE} libuim-canna.la) + do-install: - cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-canna.la install-uim_pluginLTLIBRARIES + (cd ${WRKSRC}/uim && \ + ${GMAKE} uim_plugin_LTLIBRARIES=libuim-canna.la install-uim_pluginLTLIBRARIES) post-install: - uim-module-manager --register canna + ${X11BASE}/bin/uim-module-manager --register canna .include "${MASTERDIR}/Makefile" diff --git a/japanese/uim-prime/Makefile b/japanese/uim-prime/Makefile index a103a0af28d0..06923b2e14cf 100644 --- a/japanese/uim-prime/Makefile +++ b/japanese/uim-prime/Makefile @@ -20,11 +20,16 @@ CONFIGURE_ARGS= --with-prime UIM_SLAVE= yes +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in + +do-build: + (cd ${WRKSRC}/uim && ${GMAKE} libuim-prime.la) + do-install: - cd ${WRKSRC}/uim && \ - ${GMAKE} uim_plugin_LTLIBRARIES=libuim-prime.la install-uim_pluginLTLIBRARIES + (cd ${WRKSRC}/uim && \ + ${GMAKE} uim_plugin_LTLIBRARIES=libuim-prime.la install-uim_pluginLTLIBRARIES) post-install: - uim-module-manager --register prime + ${X11BASE}/bin/uim-module-manager --register prime .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index 008684fd60ca..c69efb834939 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -6,8 +6,7 @@ # PORTNAME= uim-el -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= textproc MASTER_SITES= http://uim.freedesktop.org/releases/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index d80d16d60ecb..504107f76c0b 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -MD5 (uim-1.0.1.tar.gz) = 1de96cb9ca0c570c0d04678a95f9c75a -SHA256 (uim-1.0.1.tar.gz) = cfd3a906763d0474576fd07b0ffcfbc829075a750fc4fe28dcb4e37999e4d57f -SIZE (uim-1.0.1.tar.gz) = 1924484 +MD5 (uim-1.1.0.tar.gz) = 40a886894ea31be876380e64b3387442 +SHA256 (uim-1.1.0.tar.gz) = 57d5799fd76bde17df859ebaffb7883c468f4bf8bb42f2bb9569c4e4b52e4ee0 +SIZE (uim-1.1.0.tar.gz) = 2092779 diff --git a/textproc/uim-el/files/patch-emacs_Makefile.in b/textproc/uim-el/files/patch-emacs_Makefile.in index 97dbd1f0ff29..46d3677a6d6f 100644 --- a/textproc/uim-el/files/patch-emacs_Makefile.in +++ b/textproc/uim-el/files/patch-emacs_Makefile.in @@ -1,36 +1,15 @@ ---- emacs/Makefile.in.orig Fri Dec 16 17:10:53 2005 -+++ emacs/Makefile.in Sat Dec 24 07:54:33 2005 -@@ -391,19 +391,6 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - $(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-binPROGRAMS: $(bin_PROGRAMS) -- @$(NORMAL_INSTALL) -- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" -- @list='$(bin_PROGRAMS)'; for p in $$list; do \ -- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -- if test -f $$p \ -- || test -f $$p1 \ -- ; then \ -- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -- else :; fi; \ -- done - - uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) -@@ -419,9 +406,6 @@ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done --uim-el-agent$(EXEEXT): $(uim_el_agent_OBJECTS) $(uim_el_agent_DEPENDENCIES) -- @rm -f uim-el-agent$(EXEEXT) -- $(LINK) $(uim_el_agent_LDFLAGS) $(uim_el_agent_OBJECTS) $(uim_el_agent_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -765,7 +749,7 @@ +--- emacs/Makefile.in.orig Fri Jun 9 10:47:01 2006 ++++ emacs/Makefile.in Mon Jun 12 01:12:29 2006 +@@ -37,8 +37,6 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@UIM_EL_TRUE@bin_PROGRAMS = uim-el-agent$(EXEEXT) \ +-@UIM_EL_TRUE@ uim-el-helper-agent$(EXEEXT) + subdir = emacs + DIST_COMMON = README $(am__dist_uimel_lisp_DATA_DIST) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING INSTALL +@@ -874,7 +872,7 @@ done check-am: all-am check: check-am diff --git a/textproc/uim-el/pkg-plist b/textproc/uim-el/pkg-plist index 44d6c1b471d4..3a4e87d16c97 100644 --- a/textproc/uim-el/pkg-plist +++ b/textproc/uim-el/pkg-plist @@ -1,5 +1,6 @@ %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-candidate.el %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-debug.el +%%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-helper.el %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-key.el %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-keymap.el %%EMACS_VERSION_SITE_LISPDIR%%/uim-el/uim-leim.el diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile index f1b5b4eb2e03..1b4f1d2bcc8d 100644 --- a/textproc/uim-gnome/Makefile +++ b/textproc/uim-gnome/Makefile @@ -18,8 +18,13 @@ CONFIGURE_ARGS= --with-gtk2 --with-gnome2 --enable-applet UIM_SLAVE= yes +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-helper_Makefile.in + +do-build: + (cd ${WRKSRC}/helper && ${GMAKE} LIBS="-luim -luim-custom") + do-install: - cd ${WRKSRC}/helper && \ - ${GMAKE} am__EXEEXT_3= install-serverDATA install-libexecPROGRAMS install-exec-hook-applet + (cd ${WRKSRC}/helper && \ + ${GMAKE} am__EXEEXT_3="" install-serverDATA install-libexecPROGRAMS) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-gnome/pkg-plist b/textproc/uim-gnome/pkg-plist index 24cb4d26414a..2cb036d37770 100644 --- a/textproc/uim-gnome/pkg-plist +++ b/textproc/uim-gnome/pkg-plist @@ -1,3 +1,2 @@ libdata/bonobo/servers/GNOME_UimApplet.server -libexec/uim-helper-applet libexec/uim-toolbar-applet diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile index 07a147bb7692..7f56ed71a86d 100644 --- a/textproc/uim-gtk/Makefile +++ b/textproc/uim-gtk/Makefile @@ -18,8 +18,15 @@ CONFIGURE_ARGS= --with-gtk2 UIM_SLAVE= yes +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk_Makefile.in \ + ${PATCHDIR}/extra-patch-helper_Makefile.in + +do-build: + (cd ${WRKSRC}/gtk && ${GMAKE} LIBS="-luim") + (cd ${WRKSRC}/helper && ${GMAKE} LIBS="-luim -luim-custom") + do-install: (cd ${WRKSRC}/gtk && ${GMAKE} install) - (cd ${WRKSRC}/helper && ${GMAKE} install-binPROGRAMS install-exec-hook-gtk2) + (cd ${WRKSRC}/helper && ${GMAKE} install-binPROGRAMS) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist index 3eabceb9dcb9..0dde94188390 100644 --- a/textproc/uim-gtk/pkg-plist +++ b/textproc/uim-gtk/pkg-plist @@ -1,5 +1,3 @@ -bin/uim-helper-toolbar-gtk -bin/uim-helper-toolbar-gtk-systray bin/uim-im-switcher-gtk bin/uim-input-pad-ja bin/uim-pref-gtk diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile index 3af87a37ce8d..18a64834c2fb 100644 --- a/textproc/uim-m17nlib/Makefile +++ b/textproc/uim-m17nlib/Makefile @@ -18,11 +18,18 @@ CONFIGURE_ARGS= --with-m17nlib UIM_SLAVE= yes +IGNORE= requires m17n-lib-1.3.1 or later + +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in + +do-build: + (cd ${WRKSRC}/uim && ${GMAKE} libuim-m17nlib.la) + do-install: (cd ${WRKSRC}/uim && \ ${GMAKE} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES) post-install: - uim-module-manager --register m17nlib + ${X11BASE}/bin/uim-module-manager --register m17nlib .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile index 0666f024eb2e..d73050a02576 100644 --- a/textproc/uim-qt/Makefile +++ b/textproc/uim-qt/Makefile @@ -28,8 +28,12 @@ MAKE_ENV+= TMPDIR="${TMPDIR}" CONFIGURE_ENV+= TMPDIR="${TMPDIR}" .endif +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in + +do-build: + (cd ${WRKSRC}/qt && ${GMAKE} LIBS="-luim -luim-custom") + do-install: (cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install) - (cd ${WRKSRC}/helper && ${SETENV} ${MAKE_ENV} ${GMAKE} install) .include "${MASTERDIR}/Makefile" diff --git a/textproc/uim-qt/pkg-plist b/textproc/uim-qt/pkg-plist index 552a1ed03a76..67aa3f7bf1cd 100644 --- a/textproc/uim-qt/pkg-plist +++ b/textproc/uim-qt/pkg-plist @@ -1,6 +1,5 @@ bin/uim-chardict-qt bin/uim-im-switcher-qt -bin/uim-pref-qt bin/uim-toolbar-qt libexec/uim-candwin-qt %%DATADIR%%/helperdata/bushu.t diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 79a10d0b60ef..90a1f9c919df 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -6,8 +6,7 @@ # PORTNAME= uim -PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTVERSION= 1.1.0 CATEGORIES?= textproc MASTER_SITES= http://uim.freedesktop.org/releases/ @@ -19,6 +18,7 @@ INSTALLS_SHLIB= yes WANT_GNOME= yes USE_GNOME+= gnometarget glib20 USE_GMAKE= yes +USE_AUTOTOOLS= libtool:15 USE_ICONV= yes GNU_CONFIGURE= yes .if !defined(UIM_SLAVE) @@ -42,7 +42,7 @@ PLIST_SUB= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" .include .if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_editline.c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-uim_editline.c .endif .if ${PERL_LEVEL} >= 500600 @@ -52,7 +52,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:${PORTSDIR}/lang/perl5 CONFIGURE_ENV+= INTLTOOL_PERL="${LOCALBASE}/bin/perl" .endif -.for _x in gtk2 qt gnome2 anthy canna m17nlib prime scim +.for _x in gtk2 qt gnome2 anthy canna m17nlib prime scim dict .if ${CONFIGURE_ARGS:M--with-${_x}} == "" CONFIGURE_ARGS+=--without-${_x} .endif diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index d80d16d60ecb..504107f76c0b 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,3 +1,3 @@ -MD5 (uim-1.0.1.tar.gz) = 1de96cb9ca0c570c0d04678a95f9c75a -SHA256 (uim-1.0.1.tar.gz) = cfd3a906763d0474576fd07b0ffcfbc829075a750fc4fe28dcb4e37999e4d57f -SIZE (uim-1.0.1.tar.gz) = 1924484 +MD5 (uim-1.1.0.tar.gz) = 40a886894ea31be876380e64b3387442 +SHA256 (uim-1.1.0.tar.gz) = 57d5799fd76bde17df859ebaffb7883c468f4bf8bb42f2bb9569c4e4b52e4ee0 +SIZE (uim-1.1.0.tar.gz) = 2092779 diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in new file mode 100644 index 000000000000..4f95ce363b72 --- /dev/null +++ b/textproc/uim/files/extra-patch-gtk_Makefile.in @@ -0,0 +1,20 @@ +--- gtk/Makefile.in.orig Fri Jun 9 10:47:02 2006 ++++ gtk/Makefile.in Tue Jun 13 00:19:08 2006 +@@ -64,8 +64,6 @@ + moduleLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(module_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim.la \ +-@GTK2_TRUE@ $(am__DEPENDENCIES_1) + am__im_uim_la_SOURCES_DIST = gtk-im-uim.c 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 uim-eb.c \ +@@ -356,7 +354,7 @@ + @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.la $(EBLIB_LIBS) ++@GTK2_TRUE@im_uim_la_LIBADD = $(EBLIB_LIBS) + @GTK2_TRUE@IM_UIM_SOURCES = gtk-im-uim.c key-util-gtk.c key-util-gtk.h \ + @GTK2_TRUE@ uim-cand-win-gtk.c uim-cand-win-gtk.h \ + @GTK2_TRUE@ caret-state-indicator.c caret-state-indicator.h \ diff --git a/textproc/uim/files/extra-patch-helper_Makefile.in b/textproc/uim/files/extra-patch-helper_Makefile.in new file mode 100644 index 000000000000..fd76fdaa6482 --- /dev/null +++ b/textproc/uim/files/extra-patch-helper_Makefile.in @@ -0,0 +1,120 @@ +--- helper/Makefile.in.orig Fri Jun 9 10:47:03 2006 ++++ helper/Makefile.in Tue Jun 13 00:37:25 2006 +@@ -80,8 +80,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) +-@GTK2_TRUE@uim_candwin_gtk_DEPENDENCIES = \ +-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la + am__uim_dict_gtk_SOURCES_DIST = dict-main-gtk.c dict-anthy.c \ + dict-anthy.h dict-canna.c dict-canna.h dict-word-win-gtk.c \ + dict-word-win-gtk.h dict-word-list-win-gtk.c \ +@@ -100,19 +98,14 @@ + @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@ uim_dict_gtk-dict-dict.$(OBJEXT) \ + @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@ uim_dict_gtk-dict-cclass-dialog.$(OBJEXT) + uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS) +-@ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim.la + am__uim_im_switcher_gtk_SOURCES_DIST = im-switcher-gtk.c + @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.la + am__uim_input_pad_ja_SOURCES_DIST = input-pad-ja.c + @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) +-@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = \ +-@GTK2_TRUE@ $(top_builddir)/uim/libuim.la + am__uim_pref_gtk_SOURCES_DIST = pref-gtk.c pref-gtk-custom-widgets.c \ + pref-gtk-custom-widgets.h ../gtk/key-util-gtk.c \ + ../gtk/key-util-gtk.h +@@ -120,23 +113,17 @@ + @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) +-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-custom.la \ +-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la + am__uim_toolbar_applet_SOURCES_DIST = toolbar-applet-gnome.c \ + toolbar-common-gtk.c + @APPLET_TRUE@am_uim_toolbar_applet_OBJECTS = uim_toolbar_applet-toolbar-applet-gnome.$(OBJEXT) \ + @APPLET_TRUE@ uim_toolbar_applet-toolbar-common-gtk.$(OBJEXT) + uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS) +-@APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES = \ +-@APPLET_TRUE@ $(top_builddir)/uim/libuim.la + am__uim_toolbar_gtk_SOURCES_DIST = toolbar-standalone-gtk.c \ + toolbar-common-gtk.c + @GTK2_TRUE@am_uim_toolbar_gtk_OBJECTS = \ + @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.la + am__uim_toolbar_gtk_systray_SOURCES_DIST = toolbar-systray-gtk.c \ + toolbar-common-gtk.c eggtrayicon.c eggtrayicon.h + @GTK2_TRUE@am_uim_toolbar_gtk_systray_OBJECTS = uim_toolbar_gtk_systray-toolbar-systray-gtk.$(OBJEXT) \ +@@ -144,8 +131,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.la + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -429,8 +414,7 @@ + uim_pixmapsdir = @uim_pixmapsdir@ + EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml + helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" +-@APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_LIBS@ \ +-@APPLET_TRUE@ $(top_builddir)/uim/libuim.la ++@APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_LIBS@ + + @APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + @APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_CFLAGS@ +@@ -446,38 +430,37 @@ + @GTK2_TRUE@ ../gtk/caret-state-indicator.c \ + @GTK2_TRUE@ ../gtk/caret-state-indicator.h + +-@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la ++@GTK2_TRUE@uim_candwin_gtk_LDADD = @GTK2_LIBS@ + @GTK2_TRUE@uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir) + @GTK2_TRUE@uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall + @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.la ++@GTK2_TRUE@uim_toolbar_gtk_LDADD = @GTK2_LIBS@ + @GTK2_TRUE@uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + @GTK2_TRUE@uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall + @GTK2_TRUE@uim_toolbar_gtk_systray_SOURCES = toolbar-systray-gtk.c toolbar-common-gtk.c \ + @GTK2_TRUE@ eggtrayicon.c eggtrayicon.h + +-@GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la ++@GTK2_TRUE@uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ + @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_im_switcher_gtk_SOURCES = im-switcher-gtk.c +-@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la ++@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ + @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_input_pad_ja_SOURCES = input-pad-ja.c +-@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la ++@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ + @GTK2_TRUE@uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + @GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall + @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_SOURCES = pref-gtk.c \ + @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ pref-gtk-custom-widgets.c pref-gtk-custom-widgets.h \ + @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@ $(top_builddir)/uim/libuim-custom.la \ +-@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la ++@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ + + @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 + @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_SOURCES = dict-main-gtk.c dict-anthy.c dict-anthy.h dict-canna.c dict-canna.h dict-word-win-gtk.c dict-word-win-gtk.h dict-word-list-win-gtk.c dict-word-list-win-gtk.h dict-util.c dict-util.h dict-word-list-view-gtk.c dict-word-list-view-gtk.h dict-word.c dict-word.h dict-dict.c dict-dict.h dict-cclass-dialog.c dict-cclass-dialog.h +-@ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la @ANTHY_LIBS@ ++@ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ @ANTHY_LIBS@ + @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CFLAGS = @GTK2_CFLAGS@ + @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_uidir = $(datadir)/uim/helperdata diff --git a/textproc/uim/files/extra-patch-qt_Makefile.in b/textproc/uim/files/extra-patch-qt_Makefile.in new file mode 100644 index 000000000000..75eca66fe42c --- /dev/null +++ b/textproc/uim/files/extra-patch-qt_Makefile.in @@ -0,0 +1,104 @@ +--- qt/Makefile.in.orig Tue Jun 13 00:43:06 2006 ++++ qt/Makefile.in Tue Jun 13 00:47:10 2006 +@@ -96,8 +96,6 @@ + "$(DESTDIR)$(libexecdir)" + extraLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(extra_LTLIBRARIES) $(noinst_LTLIBRARIES) +-@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = \ +-@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la + am__libquiminputcontextplugin_la_SOURCES_DIST = \ + immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \ + immodule-plugin.cpp immodule-candidatewindow.h \ +@@ -116,8 +114,6 @@ + $(am_libquiminputcontextplugin_la_OBJECTS) + @QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath = \ + @QT_IMMODULE_TRUE@@QT_TRUE@ -rpath $(extradir) +-@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES = \ +-@QT_TRUE@ $(top_builddir)/uim/libuim.la + am__libtoolbarcommon_la_SOURCES_DIST = \ + toolbar-common-quimhelpertoolbar.cpp \ + toolbar-common-uimstateindicator.cpp qtgettext.h \ +@@ -136,7 +132,6 @@ + @QT_TRUE@am_uim_candwin_qt_OBJECTS = \ + @QT_TRUE@ uim_candwin_qt-candwin-qt.$(OBJEXT) + uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS) +-@QT_TRUE@uim_candwin_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la + am__uim_im_switcher_qt_SOURCES_DIST = switcher-qt.cpp switcher-qt.h \ + qtgettext.h $(top_srcdir)/replace/os_dep.h + am__objects_1 = +@@ -145,8 +140,6 @@ + @QT_TRUE@ $(am__objects_1) + uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS) + @NEED_SETENV_C_TRUE@@QT_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/replace/libreplace.la +-@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = \ +-@QT_TRUE@ $(top_builddir)/uim/libuim.la $(am__DEPENDENCIES_1) + am__uim_pref_qt_SOURCES_DIST = pref-qt.cpp pref-customwidgets.cpp \ + pref-kseparator.cpp qtgettext.h pref-qt.h pref-customwidgets.h \ + pref-kseparator.h +@@ -158,9 +151,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) +-@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = \ +-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \ +-@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la + am__uim_toolbar_qt_SOURCES_DIST = toolbar-standalone-qt.cpp \ + toolbar-standalone-qt.h qtgettext.h \ + toolbar-common-quimhelpertoolbar.h \ +@@ -168,8 +158,7 @@ + @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) +-@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la \ +-@QT_TRUE@ ./libtoolbarcommon.la ++@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = ./libtoolbarcommon.la + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -496,7 +485,6 @@ + + @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) + @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version +-@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LIBADD = $(top_builddir)/uim/libuim.la + + # Toolbar Common + @QT_TRUE@noinst_LTLIBRARIES = libtoolbarcommon.la +@@ -505,7 +493,6 @@ + + @QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS) + @QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version +-@QT_TRUE@libtoolbarcommon_la_LIBADD = $(top_builddir)/uim/libuim.la + + # Toolbar Standalone + @QT_TRUE@uim_toolbar_qt_SOURCES = toolbar-standalone-qt.cpp toolbar-standalone-qt.h qtgettext.h \ +@@ -513,21 +500,18 @@ + + @QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS) + @QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS) +-@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la ++@QT_TRUE@uim_toolbar_qt_LDADD = ./libtoolbarcommon.la + + # Candidate Window + @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.la + + # Switcher + @QT_TRUE@uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h \ + @QT_TRUE@ qtgettext.h $(am__append_8) + @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.la \ +-@QT_TRUE@ $(am__append_9) + + # Pref + @PREF_TRUE@@QT_TRUE@nodist_uim_pref_qt_SOURCES = \ +@@ -543,7 +527,6 @@ + + @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-custom.la $(top_builddir)/uim/libuim.la + @QT_TRUE@CLEANFILES = \ + @QT_TRUE@ $(MOC_FILES) \ + @QT_TRUE@ $(UI_TMP_FILES) diff --git a/textproc/uim/files/extra-patch-uim_Makefile.in b/textproc/uim/files/extra-patch-uim_Makefile.in new file mode 100644 index 000000000000..5611a43b3386 --- /dev/null +++ b/textproc/uim/files/extra-patch-uim_Makefile.in @@ -0,0 +1,73 @@ +--- uim/Makefile.in.orig Tue Jun 13 01:03:14 2006 ++++ uim/Makefile.in Tue Jun 13 01:03:25 2006 +@@ -89,14 +89,11 @@ + libLTLIBRARIES_INSTALL = $(INSTALL) + uim_pluginLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) $(uim_plugin_LTLIBRARIES) +-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES = \ +-@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@ libuim.la + 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) + @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_rpath = \ + @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@ -rpath $(uim_plugindir) +-@CANNA_TRUE@libuim_canna_la_DEPENDENCIES = 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) +@@ -109,23 +106,19 @@ + libuim_custom_la_DEPENDENCIES = libuim.la + am_libuim_custom_la_OBJECTS = libuim_custom_la-uim-custom.lo + libuim_custom_la_OBJECTS = $(am_libuim_custom_la_OBJECTS) +-@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim.la + am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c + @M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS = \ + @M17NLIB_TRUE@ libuim_m17nlib_la-m17nlib.lo + libuim_m17nlib_la_OBJECTS = $(am_libuim_m17nlib_la_OBJECTS) + @M17NLIB_TRUE@am_libuim_m17nlib_la_rpath = -rpath $(uim_plugindir) +-@MANA_TRUE@libuim_mana_la_DEPENDENCIES = libuim.la + 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) + @MANA_TRUE@am_libuim_mana_la_rpath = -rpath $(uim_plugindir) +-@PRIME_TRUE@libuim_prime_la_DEPENDENCIES = 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) + @PRIME_TRUE@am_libuim_prime_la_rpath = -rpath $(uim_plugindir) +-@SCIM_TRUE@libuim_scim_la_DEPENDENCIES = 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) +@@ -491,27 +484,25 @@ + $(am__append_5) + libuim_custom_la_SOURCES = uim-custom.c + @M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c +-@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim.la ++@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ + @M17NLIB_TRUE@libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module + @M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) + @SCIM_TRUE@libuim_scim_la_SOURCES = scim.cpp +-@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim.la ++@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ + @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.la -lcanna ++@CANNA_TRUE@libuim_canna_la_LIBADD = -lcanna + @CANNA_TRUE@libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module + @CANNA_TRUE@libuim_canna_la_CPPFLAGS = -I$(top_srcdir) + @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.la ++@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LIBADD = @ANTHY_LIBS@ + @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module + @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_CPPFLAGS = -I$(top_srcdir) + @MANA_TRUE@libuim_mana_la_SOURCES = mana.c +-@MANA_TRUE@libuim_mana_la_LIBADD = libuim.la + @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.la + @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 diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist index f2950bd9120c..75a1ef6e7cfc 100644 --- a/textproc/uim/pkg-plist +++ b/textproc/uim/pkg-plist @@ -1,4 +1,5 @@ bin/uim-el-agent +bin/uim-el-helper-agent bin/uim-fep bin/uim-fep-tick bin/uim-module-manager @@ -15,11 +16,11 @@ include/uim/uim.h lib/libuim-custom.a lib/libuim-custom.la lib/libuim-custom.so -lib/libuim-custom.so.1 +lib/libuim-custom.so.2 lib/libuim.a lib/libuim.la lib/libuim.so -lib/libuim.so.1 +lib/libuim.so.2 lib/uim/plugin/libuim-custom-enabler.a lib/uim/plugin/libuim-custom-enabler.la lib/uim/plugin/libuim-custom-enabler.so @@ -41,6 +42,11 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/anthy-custom.scm %%DATADIR%%/anthy-key-custom.scm %%DATADIR%%/anthy.scm +%%DATADIR%%/byeoru-custom.scm +%%DATADIR%%/byeoru-dic.scm +%%DATADIR%%/byeoru-key-custom.scm +%%DATADIR%%/byeoru-symbols.scm +%%DATADIR%%/byeoru.scm %%DATADIR%%/canna-custom.scm %%DATADIR%%/canna-key-custom.scm %%DATADIR%%/canna.scm @@ -51,16 +57,12 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/generic-custom.scm %%DATADIR%%/generic-key-custom.scm %%DATADIR%%/generic.scm -%%DATADIR%%/byeoru.scm -%%DATADIR%%/byeoru-custom.scm -%%DATADIR%%/byeoru-key-custom.scm -%%DATADIR%%/byeoru-symbols.scm -%%DATADIR%%/byeoru-dic.scm %%DATADIR%%/hangul.scm %%DATADIR%%/hangul2.scm %%DATADIR%%/hangul3.scm %%DATADIR%%/i18n.scm %%DATADIR%%/im-custom.scm +%%DATADIR%%/im-switcher.scm %%DATADIR%%/im.scm %%DATADIR%%/init.scm %%DATADIR%%/installed-modules.scm @@ -77,11 +79,89 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/mana-custom.scm %%DATADIR%%/mana-key-custom.scm %%DATADIR%%/mana.scm -%%DATADIR%%/manage-modules.scm %%DATADIR%%/pinyin-big5.scm -%%DATADIR%%/pixmaps/configure-qt.png +%%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_input.png +%%DATADIR%%/pixmaps/direct_input.svg +%%DATADIR%%/pixmaps/hangul2.png +%%DATADIR%%/pixmaps/hangul2.svg +%%DATADIR%%/pixmaps/hangul3.png +%%DATADIR%%/pixmaps/hangul3.svg +%%DATADIR%%/pixmaps/im_subst.svg +%%DATADIR%%/pixmaps/ipa-x-sampa.png +%%DATADIR%%/pixmaps/ipa-x-sampa.svg +%%DATADIR%%/pixmaps/ja_azik.png +%%DATADIR%%/pixmaps/ja_azik.svg +%%DATADIR%%/pixmaps/ja_direct.png +%%DATADIR%%/pixmaps/ja_direct.svg +%%DATADIR%%/pixmaps/ja_fullwidth_alnum.png +%%DATADIR%%/pixmaps/ja_fullwidth_alnum.svg +%%DATADIR%%/pixmaps/ja_halfwidth_alnum.png +%%DATADIR%%/pixmaps/ja_halfwidth_alnum.svg +%%DATADIR%%/pixmaps/ja_halfwidth_katakana.png +%%DATADIR%%/pixmaps/ja_halfwidth_katakana.svg +%%DATADIR%%/pixmaps/ja_hiragana.png +%%DATADIR%%/pixmaps/ja_hiragana.svg +%%DATADIR%%/pixmaps/ja_kana.png +%%DATADIR%%/pixmaps/ja_kana.svg +%%DATADIR%%/pixmaps/ja_katakana.png +%%DATADIR%%/pixmaps/ja_katakana.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/ko_direct.png +%%DATADIR%%/pixmaps/ko_direct.svg +%%DATADIR%%/pixmaps/ko_hangulchar.png +%%DATADIR%%/pixmaps/ko_hangulchar.svg +%%DATADIR%%/pixmaps/ko_hangulword.png +%%DATADIR%%/pixmaps/ko_hangulword.svg +%%DATADIR%%/pixmaps/latin.png +%%DATADIR%%/pixmaps/latin.svg +%%DATADIR%%/pixmaps/mana.png +%%DATADIR%%/pixmaps/mana.svg +%%DATADIR%%/pixmaps/null.png +%%DATADIR%%/pixmaps/off.png +%%DATADIR%%/pixmaps/off.svg +%%DATADIR%%/pixmaps/on.png +%%DATADIR%%/pixmaps/on.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/py.png +%%DATADIR%%/pixmaps/py.svg +%%DATADIR%%/pixmaps/pyunihan.png +%%DATADIR%%/pixmaps/pyunihan.svg +%%DATADIR%%/pixmaps/romaja.png +%%DATADIR%%/pixmaps/romaja.svg +%%DATADIR%%/pixmaps/scim.png +%%DATADIR%%/pixmaps/scim.svg +%%DATADIR%%/pixmaps/skk.png +%%DATADIR%%/pixmaps/skk.svg %%DATADIR%%/pixmaps/switcher-icon.png +%%DATADIR%%/pixmaps/tcode.png +%%DATADIR%%/pixmaps/tcode.svg +%%DATADIR%%/pixmaps/tutcode.png +%%DATADIR%%/pixmaps/tutcode.svg +%%DATADIR%%/pixmaps/uim-dict.png +%%DATADIR%%/pixmaps/uim-dict.svg +%%DATADIR%%/pixmaps/uim-gray.png %%DATADIR%%/pixmaps/uim-icon.png +%%DATADIR%%/pixmaps/uim-icon48.png +%%DATADIR%%/pixmaps/uim-icon64.png +%%DATADIR%%/pixmaps/unknown.png +%%DATADIR%%/pixmaps/unknown.svg +%%DATADIR%%/pixmaps/viqr.png +%%DATADIR%%/pixmaps/viqr.svg %%DATADIR%%/plugin.scm %%DATADIR%%/prime-custom.scm %%DATADIR%%/prime-key-custom.scm