Date: Sat, 7 Jul 2018 15:56:01 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474102 - in head: japanese/uim-anthy textproc/uim textproc/uim-el textproc/uim-gtk textproc/uim-gtk3 textproc/uim-kde4 textproc/uim-m17nlib textproc/uim-qt4 textproc/uim/files Message-ID: <201807071556.w67Fu1w4005455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Sat Jul 7 15:56:01 2018 New Revision: 474102 URL: https://svnweb.freebsd.org/changeset/ports/474102 Log: Update to 1.8.8. Deleted: head/textproc/uim/files/patch-po_Makefile.in.in Modified: head/japanese/uim-anthy/Makefile head/textproc/uim-el/Makefile head/textproc/uim-el/distinfo head/textproc/uim-gtk/Makefile head/textproc/uim-gtk3/Makefile head/textproc/uim-kde4/Makefile head/textproc/uim-m17nlib/Makefile head/textproc/uim-qt4/Makefile head/textproc/uim/Makefile head/textproc/uim/distinfo head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in head/textproc/uim/files/extra-patch-uim_Makefile.in head/textproc/uim/pkg-plist Modified: head/japanese/uim-anthy/Makefile ============================================================================== --- head/japanese/uim-anthy/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/japanese/uim-anthy/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -1,7 +1,6 @@ # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 2 CATEGORIES= japanese .if defined(WITHOUT_X11) PKGNAMESUFFIX= -anthy-nox11 @@ -12,11 +11,13 @@ PKGNAMESUFFIX= -anthy COMMENT= Uim plugin using Anthy input method .if !defined(WITHOUT_X11) -USE_GNOME= gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 .endif LIB_DEPENDS= libanthy.so:japanese/anthy \ - libuim.so:textproc/uim + libfreetype.so:print/freetype2 \ + libuim.so:textproc/uim \ + libfontconfig.so:x11-fonts/fontconfig MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} Modified: head/textproc/uim-el/Makefile ============================================================================== --- head/textproc/uim-el/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-el/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= uim-el -PORTVERSION= 1.8.6 -PORTREVISION= 7 +PORTVERSION= 1.8.8 CATEGORIES= textproc -MASTER_SITES= https://github.com/uim/uim/releases/download/uim-${PORTVERSION}/ +MASTER_SITES= https://github.com/uim/uim/releases/download/${PORTVERSION}/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} DISTNAME= uim-${PORTVERSION} Modified: head/textproc/uim-el/distinfo ============================================================================== --- head/textproc/uim-el/distinfo Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-el/distinfo Sat Jul 7 15:56:01 2018 (r474102) @@ -1,2 +1,3 @@ -SHA256 (uim-1.8.6.tar.bz2) = 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f -SIZE (uim-1.8.6.tar.bz2) = 6500739 +TIMESTAMP = 1530281548 +SHA256 (uim-1.8.8.tar.bz2) = 34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc +SIZE (uim-1.8.8.tar.bz2) = 6228743 Modified: head/textproc/uim-gtk/Makefile ============================================================================== --- head/textproc/uim-gtk/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-gtk/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -5,8 +5,10 @@ PKGNAMESUFFIX= -gtk COMMENT= GTK+ modules of uim input method -USE_GNOME= gtk20 -LIB_DEPENDS= libuim.so:textproc/uim +USE_GNOME= cairo gdkpixbuf2 gtk20 +LIB_DEPENDS= libuim.so:textproc/uim \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} Modified: head/textproc/uim-gtk3/Makefile ============================================================================== --- head/textproc/uim-gtk3/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-gtk3/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -gtk3 COMMENT= GTK+ 3.x modules of uim input method -USE_GNOME= gtk30 +USE_GNOME= cairo gdkpixbuf2 gtk30 LIB_DEPENDS= libuim.so:textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim Modified: head/textproc/uim-kde4/Makefile ============================================================================== --- head/textproc/uim-kde4/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-kde4/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -1,7 +1,6 @@ # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 6 PKGNAMESUFFIX= -kde4 COMMENT= KDE4 panel applet of uim input method @@ -12,7 +11,7 @@ RUN_DEPENDS= uim-pref-qt4:textproc/uim-qt4 USE_GCC= any USE_KDE= kdelibs automoc4 -USE_QT= qmake_build moc_build qt3support uic rcc +USE_QT= corelib dbus gui qmake_build moc_build qt3support svg uic rcc USES+= kde:4 qt:4 MASTERDIR= ${.CURDIR}/../../textproc/uim Modified: head/textproc/uim-m17nlib/Makefile ============================================================================== --- head/textproc/uim-m17nlib/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-m17nlib/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -1,7 +1,6 @@ # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 2 .if defined(WITHOUT_X11) PKGNAMESUFFIX= -m17nlib-nox11 .else Modified: head/textproc/uim-qt4/Makefile ============================================================================== --- head/textproc/uim-qt4/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim-qt4/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -7,7 +7,8 @@ COMMENT= Qt4 modules of uim input method LIB_DEPENDS= libuim.so:textproc/uim -USE_QT= qmake_build moc_build qt3support uic +USE_QT= gui corelib qmake_build moc_build network qt3support \ + sql uic xml USES= iconv libtool qt:4 MASTERDIR= ${.CURDIR}/../../textproc/uim Modified: head/textproc/uim/Makefile ============================================================================== --- head/textproc/uim/Makefile Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/Makefile Sat Jul 7 15:56:01 2018 (r474102) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= uim -PORTVERSION= 1.8.6 -PORTREVISION?= 3 +PORTVERSION= 1.8.8 CATEGORIES?= textproc -MASTER_SITES= https://github.com/uim/uim/releases/download/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES= https://github.com/uim/uim/releases/download/${PORTVERSION}/ .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif @@ -13,11 +12,15 @@ PKGNAMESUFFIX= -nox11 MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library +LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYING + BROKEN_aarch64= Fails to build: The collector has not been ported to this machine/OS combination +USES+= gettext gmake iconv libedit libtool pathfix pkgconfig perl5 sqlite tar:bzip2 USE_LDCONFIG= yes USE_GNOME+= glib20 intltool -USES+= gettext gmake iconv libedit libtool pathfix pkgconfig perl5 tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes @@ -27,13 +30,16 @@ OPTIONS_DEFAULT= X11 .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} +USE_XORG+= x11 xext LIB_DEPENDS+= libXft.so:x11-fonts/libXft CONFIGURE_ARGS+= --with-x --with-xft .endif .if !defined(UIM_SLAVE) .if ${PORT_OPTIONS:MX11} -USE_GNOME+= gtk20 +USE_GNOME+= cairo gdkpixbuf2 gtk20 +LIB_DEPENDS+= libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig CONFIGURE_ARGS+= --with-gtk2 .endif CONFIGURE_ARGS+= --enable-emacs --with-sj3 --with-canna --with-prime Modified: head/textproc/uim/distinfo ============================================================================== --- head/textproc/uim/distinfo Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/distinfo Sat Jul 7 15:56:01 2018 (r474102) @@ -1,2 +1,3 @@ -SHA256 (uim-1.8.6.tar.bz2) = 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f -SIZE (uim-1.8.6.tar.bz2) = 6500739 +TIMESTAMP = 1530280332 +SHA256 (uim-1.8.8.tar.bz2) = 34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc +SIZE (uim-1.8.8.tar.bz2) = 6228743 Modified: head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,6 +1,6 @@ ---- gtk2/immodule/Makefile.in.orig 2016-10-14 09:57:35 UTC -+++ gtk2/immodule/Makefile.in -@@ -105,8 +105,7 @@ am__uninstall_files_from_dir = { \ +--- gtk2/immodule/Makefile.in.orig 2018-06-30 00:34:14.035453000 +0900 ++++ gtk2/immodule/Makefile.in 2018-06-30 00:35:43.223656000 +0900 +@@ -156,8 +156,7 @@ } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) @@ -10,14 +10,14 @@ @GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \ @GTK2_TRUE@ $(am__append_1) am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \ -@@ -442,8 +441,8 @@ moduledir = $(uim_gtk_im_module_path)/@G +@@ -547,8 +546,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_LDFLAGS = -module -avoid-version -@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \ +@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \ +@GTK2_TRUE@ -luim \ @GTK2_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \ - @GTK2_TRUE@ $(am__append_1) + @GTK2_TRUE@ $(am__append_1) -lm @GTK2_LIBS@ @GTK2_TRUE@IM_UIM_SOURCES = \ Modified: head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,6 +1,6 @@ ---- gtk2/pad/Makefile.in.orig 2016-10-14 09:57:35 UTC -+++ gtk2/pad/Makefile.in -@@ -80,9 +80,7 @@ am__uim_input_pad_ja_SOURCES_DIST = ja.c +--- gtk2/pad/Makefile.in.orig 2018-06-29 23:22:27.240949000 +0900 ++++ gtk2/pad/Makefile.in 2018-06-29 23:26:29.433490000 +0900 +@@ -131,9 +131,7 @@ @GTK2_TRUE@am_uim_input_pad_ja_OBJECTS = \ @GTK2_TRUE@ uim_input_pad_ja-ja.$(OBJEXT) uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS) @@ -8,10 +8,10 @@ -@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la +@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = - uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -378,8 +376,8 @@ top_builddir = @top_builddir@ + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -484,8 +482,8 @@ top_srcdir = @top_srcdir@ uim_pixmapsdir = @uim_pixmapsdir@ @GTK2_TRUE@uim_input_pad_ja_SOURCES = ja.c Modified: head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,6 +1,6 @@ ---- gtk2/switcher/Makefile.in.orig 2016-10-14 09:57:35 UTC -+++ gtk2/switcher/Makefile.in -@@ -80,11 +80,7 @@ am__uim_im_switcher_gtk_SOURCES_DIST = g +--- gtk2/switcher/Makefile.in.orig 2018-06-29 23:31:04.197505000 +0900 ++++ gtk2/switcher/Makefile.in 2018-06-30 00:27:43.554671000 +0900 +@@ -131,11 +131,7 @@ @GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS = \ @GTK2_TRUE@ uim_im_switcher_gtk-gtk.$(OBJEXT) uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS) @@ -10,10 +10,10 @@ -@GTK2_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la +@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = - uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -381,10 +377,9 @@ top_builddir = @top_builddir@ + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -486,10 +482,9 @@ top_srcdir = @top_srcdir@ uim_pixmapsdir = @uim_pixmapsdir@ @GTK2_TRUE@uim_im_switcher_gtk_SOURCES = gtk.c Modified: head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,18 +1,18 @@ ---- gtk2/toolbar/Makefile.in.orig 2016-10-14 09:57:35 UTC -+++ gtk2/toolbar/Makefile.in -@@ -88,10 +88,7 @@ am__uim_toolbar_applet_SOURCES_DIST = ap - @APPLET_GNOME_TRUE@ uim_toolbar_applet-applet-gnome.$(OBJEXT) \ - @APPLET_GNOME_TRUE@ uim_toolbar_applet-common-gtk.$(OBJEXT) +--- gtk2/toolbar/Makefile.in.orig 2018-06-30 00:28:37.045910000 +0900 ++++ gtk2/toolbar/Makefile.in 2018-06-30 00:33:13.062351000 +0900 +@@ -139,10 +139,7 @@ + @GNOME_APPLET_TRUE@ uim_toolbar_applet-applet-gnome.$(OBJEXT) \ + @GNOME_APPLET_TRUE@ uim_toolbar_applet-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-custom.la -+@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES = - uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -99,9 +96,7 @@ uim_toolbar_applet_LINK = $(LIBTOOL) --t +-@GNOME_APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES = \ +-@GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-scm.la \ +-@GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim.la \ +-@GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-custom.la ++@GNOME_APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES = + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -154,9 +151,7 @@ am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \ uim_toolbar_gtk-common-gtk.$(OBJEXT) uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS) @@ -20,10 +20,10 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk_DEPENDENCIES = - uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -111,10 +106,7 @@ am_uim_toolbar_gtk_systray_OBJECTS = \ + uim_toolbar_gtk_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(uim_toolbar_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ +@@ -167,10 +162,7 @@ uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT) uim_toolbar_gtk_systray_OBJECTS = \ $(am_uim_toolbar_gtk_systray_OBJECTS) @@ -32,24 +32,24 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk_systray_DEPENDENCIES = - uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + uim_toolbar_gtk_systray_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -443,9 +435,9 @@ uim_pixmapsdir = @uim_pixmapsdir@ +@@ -549,9 +541,9 @@ EXTRA_DIST = GNOME_UimApplet.server.in.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-custom.la -+@APPLET_GNOME_TRUE@ -luim-scm \ -+@APPLET_GNOME_TRUE@ -luim \ -+@APPLET_GNOME_TRUE@ -luim-custom + @GNOME_APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \ +-@GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-scm.la \ +-@GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim.la \ +-@GNOME_APPLET_TRUE@ $(top_builddir)/uim/libuim-custom.la ++@GNOME_APPLET_TRUE@ -luim-scm \ ++@GNOME_APPLET_TRUE@ -luim \ ++@GNOME_APPLET_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@ -@@ -460,9 +452,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir - @APPLET_GNOME_TRUE@ GNOME_UimApplet.server.in.tmp + @GNOME_APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + @GNOME_APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@ +@@ -566,9 +558,9 @@ + @GNOME_APPLET_TRUE@ GNOME_UimApplet.server.in.tmp uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c -uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ @@ -61,7 +61,7 @@ uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -@@ -471,9 +463,9 @@ uim_toolbar_gtk_systray_SOURCES = systra +@@ -577,9 +569,9 @@ uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ @X11_LIBS@ \ Modified: head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,16 +1,17 @@ ---- gtk3/candwin/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900 -+++ gtk3/candwin/Makefile.in 2012-04-01 04:53:52.000000000 +0900 -@@ -68,9 +68,6 @@ +--- gtk3/candwin/Makefile.in.orig 2018-06-30 03:38:40.172272000 +0900 ++++ gtk3/candwin/Makefile.in 2018-06-30 03:41:06.825966000 +0900 +@@ -136,9 +136,7 @@ @GTK3_TRUE@ uim_candwin_gtk3-gtk.$(OBJEXT) \ @GTK3_TRUE@ uim_candwin_gtk3-caret-state-indicator.$(OBJEXT) uim_candwin_gtk3_OBJECTS = $(am_uim_candwin_gtk3_OBJECTS) -@GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES = \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la - uim_candwin_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_candwin_gtk3_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -82,9 +79,7 @@ ++@GTK3_TRUE@uim_candwin_gtk3_DEPENDENCIES = + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -155,9 +153,7 @@ @GTK3_TRUE@ uim_candwin_horizontal_gtk3-caret-state-indicator.$(OBJEXT) uim_candwin_horizontal_gtk3_OBJECTS = \ $(am_uim_candwin_horizontal_gtk3_OBJECTS) @@ -18,20 +19,21 @@ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la +@GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES = - uim_candwin_horizontal_gtk3_LINK = $(LIBTOOL) --tag=CC \ + uim_candwin_horizontal_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(uim_candwin_horizontal_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -96,9 +91,6 @@ +@@ -169,9 +165,7 @@ @GTK3_TRUE@ uim_candwin_tbl_gtk3-tbl-gtk.$(OBJEXT) \ @GTK3_TRUE@ uim_candwin_tbl_gtk3-caret-state-indicator.$(OBJEXT) uim_candwin_tbl_gtk3_OBJECTS = $(am_uim_candwin_tbl_gtk3_OBJECTS) -@GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES = \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la - uim_candwin_tbl_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++@GTK3_TRUE@uim_candwin_tbl_gtk3_DEPENDENCIES = + uim_candwin_tbl_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(uim_candwin_tbl_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -394,8 +386,8 @@ +@@ -525,8 +519,8 @@ @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \ @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h @@ -42,7 +44,7 @@ @GTK3_TRUE@uim_candwin_gtk3_CPPFLAGS = -I$(top_srcdir) @GTK3_TRUE@uim_candwin_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -403,8 +395,8 @@ +@@ -534,8 +528,8 @@ @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \ @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h @@ -53,7 +55,7 @@ @GTK3_TRUE@uim_candwin_tbl_gtk3_CPPFLAGS = -I$(top_srcdir) @GTK3_TRUE@uim_candwin_tbl_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -412,8 +404,8 @@ +@@ -543,8 +537,8 @@ @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.c \ @GTK3_TRUE@ ../../gtk2/immodule/caret-state-indicator.h Modified: head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,7 +1,7 @@ ---- gtk3/immodule/Makefile.in.orig 2011-08-06 18:04:11.000000000 +0900 -+++ gtk3/immodule/Makefile.in 2011-08-06 18:10:48.000000000 +0900 -@@ -82,9 +82,7 @@ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +--- gtk3/immodule/Makefile.in.orig 2018-06-30 03:42:36.499824000 +0900 ++++ gtk3/immodule/Makefile.in 2018-06-30 03:44:30.252814000 +0900 +@@ -154,9 +154,7 @@ + } am__installdirs = "$(DESTDIR)$(moduledir)" LTLIBRARIES = $(module_LTLIBRARIES) -@GTK3_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \ @@ -9,16 +9,16 @@ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \ +@GTK3_TRUE@im_uim_la_DEPENDENCIES = \ @GTK3_TRUE@ $(am__append_1) - am__im_uim_la_SOURCES_DIST = ../../gtk/gtk-im-uim.c \ - ../../gtk/gtk-im-uim.h ../../gtk/key-util-gtk.c \ -@@ -408,8 +406,8 @@ + am__im_uim_la_SOURCES_DIST = ../../gtk2/immodule/gtk-im-uim.c \ + ../../gtk2/immodule/gtk-im-uim.h \ +@@ -542,8 +540,8 @@ @GTK3_TRUE@module_LTLIBRARIES = $(im_uim_la) @GTK3_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES) - @GTK3_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK3_LIBS@ + @GTK3_TRUE@im_uim_la_LDFLAGS = -module -avoid-version -@GTK3_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \ +@GTK3_TRUE@im_uim_la_LIBADD = -luim-scm \ +@GTK3_TRUE@ -luim \ @GTK3_TRUE@ $(top_builddir)/uim/libuim-counted-init.la \ - @GTK3_TRUE@ $(am__append_1) + @GTK3_TRUE@ $(am__append_1) @GTK3_LIBS@ -lm @GTK3_TRUE@IM_UIM_SOURCES = \ Modified: head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,6 +1,6 @@ ---- gtk3/pad/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900 -+++ gtk3/pad/Makefile.in 2012-04-01 04:45:48.000000000 +0900 -@@ -63,9 +63,7 @@ +--- gtk3/pad/Makefile.in.orig 2018-06-30 03:46:16.677802000 +0900 ++++ gtk3/pad/Makefile.in 2018-06-30 03:49:07.172912000 +0900 +@@ -131,9 +131,7 @@ @GTK3_TRUE@am_uim_input_pad_ja_gtk3_OBJECTS = \ @GTK3_TRUE@ uim_input_pad_ja_gtk3-ja.$(OBJEXT) uim_input_pad_ja_gtk3_OBJECTS = $(am_uim_input_pad_ja_gtk3_OBJECTS) @@ -8,10 +8,10 @@ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la +@GTK3_TRUE@uim_input_pad_ja_gtk3_DEPENDENCIES = - uim_input_pad_ja_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(uim_input_pad_ja_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -354,8 +352,8 @@ + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -484,8 +482,8 @@ top_srcdir = @top_srcdir@ uim_pixmapsdir = @uim_pixmapsdir@ @GTK3_TRUE@uim_input_pad_ja_gtk3_SOURCES = ../../gtk2/pad/ja.c Modified: head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,20 +1,19 @@ ---- gtk3/switcher/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900 -+++ gtk3/switcher/Makefile.in 2012-04-01 04:48:26.000000000 +0900 -@@ -64,10 +64,9 @@ +--- gtk3/switcher/Makefile.in.orig 2018-06-30 03:52:43.790439000 +0900 ++++ gtk3/switcher/Makefile.in 2018-06-30 03:55:37.760210000 +0900 +@@ -131,11 +131,7 @@ + @GTK3_TRUE@am_uim_im_switcher_gtk3_OBJECTS = \ @GTK3_TRUE@ uim_im_switcher_gtk3-gtk.$(OBJEXT) uim_im_switcher_gtk3_OBJECTS = $(am_uim_im_switcher_gtk3_OBJECTS) - @GTK3_TRUE@uim_im_switcher_gtk3_DEPENDENCIES = \ +-@GTK3_TRUE@uim_im_switcher_gtk3_DEPENDENCIES = \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-custom.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la -+@GTK3_TRUE@ -luim-scm \ -+@GTK3_TRUE@ -luim-custom \ -+@GTK3_TRUE@ -luim - uim_im_switcher_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(uim_im_switcher_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -356,10 +355,10 @@ ++@GTK3_TRUE@uim_im_switcher_gtk3_DEPENDENCIES = + AM_V_lt = $(am__v_lt_@AM_V@) + am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent +@@ -486,10 +482,10 @@ top_srcdir = @top_srcdir@ uim_pixmapsdir = @uim_pixmapsdir@ @GTK3_TRUE@uim_im_switcher_gtk3_SOURCES = ../../gtk2/switcher/gtk.c Modified: head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,48 +1,33 @@ ---- gtk3/toolbar/Makefile.in.orig 2011-08-06 18:19:41.000000000 +0900 -+++ gtk3/toolbar/Makefile.in 2011-08-06 18:22:42.000000000 +0900 -@@ -86,9 +86,9 @@ - @GTK3_TRUE@ uim_toolbar_gtk3-toolbar-common-gtk.$(OBJEXT) +--- gtk3/toolbar/Makefile.in.orig 2018-06-30 03:56:56.334825000 +0900 ++++ gtk3/toolbar/Makefile.in 2018-06-30 03:59:45.771851000 +0900 +@@ -187,10 +187,7 @@ + @GTK3_TRUE@ uim_toolbar_gtk3-standalone-gtk.$(OBJEXT) \ + @GTK3_TRUE@ uim_toolbar_gtk3-common-gtk.$(OBJEXT) uim_toolbar_gtk3_OBJECTS = $(am_uim_toolbar_gtk3_OBJECTS) - @GTK3_TRUE@uim_toolbar_gtk3_DEPENDENCIES = \ +-@GTK3_TRUE@uim_toolbar_gtk3_DEPENDENCIES = \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-custom.la -+@GTK3_TRUE@ -luim-scm \ -+@GTK3_TRUE@ -luim \ -+@GTK3_TRUE@ -luim-custom - uim_toolbar_gtk3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk3_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -102,9 +102,9 @@ ++@GTK3_TRUE@uim_toolbar_gtk3_DEPENDENCIES = + uim_toolbar_gtk3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(uim_toolbar_gtk3_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ +@@ -206,10 +203,7 @@ + @GTK3_TRUE@ uim_toolbar_gtk3_systray-eggtrayicon.$(OBJEXT) uim_toolbar_gtk3_systray_OBJECTS = \ $(am_uim_toolbar_gtk3_systray_OBJECTS) - @GTK3_TRUE@uim_toolbar_gtk3_systray_DEPENDENCIES = \ +-@GTK3_TRUE@uim_toolbar_gtk3_systray_DEPENDENCIES = \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-custom.la -+@GTK3_TRUE@ -luim-scm \ -+@GTK3_TRUE@ -luim \ -+@GTK3_TRUE@ -luim-custom - uim_toolbar_gtk3_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ ++@GTK3_TRUE@uim_toolbar_gtk3_systray_DEPENDENCIES = + uim_toolbar_gtk3_systray_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(uim_toolbar_gtk3_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -420,9 +420,9 @@ +@@ -596,9 +590,9 @@ + @GTK3_TRUE@uim_toolbar_gtk3_SOURCES = ../../gtk2/toolbar/standalone-gtk.c \ + @GTK3_TRUE@ ../../gtk2/toolbar/common-gtk.c - @APPLET_GNOME3_TRUE@helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" - @APPLET_GNOME3_TRUE@uim_toolbar_applet_gnome3_LDADD = @GTK3_LIBS@ @APPLET_GNOME3_LIBS@ \ --@APPLET_GNOME3_TRUE@ $(top_builddir)/uim/libuim-scm.la \ --@APPLET_GNOME3_TRUE@ $(top_builddir)/uim/libuim.la \ --@APPLET_GNOME3_TRUE@ $(top_builddir)/uim/libuim-custom.la -+@APPLET_GNOME3_TRUE@ -luim-scm \ -+@APPLET_GNOME3_TRUE@ -luim \ -+@APPLET_GNOME3_TRUE@ -luim-custom - - @APPLET_GNOME3_TRUE@uim_toolbar_applet_gnome3_CPPFLAGS = \ - @APPLET_GNOME3_TRUE@ $(helper_defs) -I$(top_srcdir) -I$(top_builddir) -@@ -446,9 +446,9 @@ - @GTK3_TRUE@uim_toolbar_gtk3_SOURCES = ../../helper/toolbar-standalone-gtk.c \ - @GTK3_TRUE@ ../../helper/toolbar-common-gtk.c - -@GTK3_TRUE@uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim-custom.la @@ -52,7 +37,7 @@ @GTK3_TRUE@uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) @GTK3_TRUE@uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -458,9 +458,9 @@ +@@ -609,9 +603,9 @@ @GTK3_TRUE@uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ @GTK3_TRUE@ @X11_LIBS@ \ Modified: head/textproc/uim/files/extra-patch-uim_Makefile.in ============================================================================== --- head/textproc/uim/files/extra-patch-uim_Makefile.in Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/files/extra-patch-uim_Makefile.in Sat Jul 7 15:56:01 2018 (r474102) @@ -1,7 +1,7 @@ ---- uim/Makefile.in.orig 2012-04-01 06:38:21.000000000 +0900 -+++ uim/Makefile.in 2012-04-01 06:50:03.000000000 +0900 -@@ -117,8 +117,7 @@ - "$(DESTDIR)$(pkgincludedir)" +--- uim/Makefile.in.orig 2018-06-30 04:48:47.658121000 +0900 ++++ uim/Makefile.in 2018-06-30 04:52:15.362107000 +0900 +@@ -190,8 +190,7 @@ + "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \ $(uim_plugin_LTLIBRARIES) -@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES = libuim-scm.la \ @@ -10,7 +10,7 @@ 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) -@@ -128,8 +127,7 @@ +@@ -206,8 +205,7 @@ @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) @@ -20,16 +20,16 @@ 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) -@@ -222,7 +220,7 @@ - libuim_look_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libuim_look_la_LDFLAGS) $(LDFLAGS) -o $@ +@@ -309,7 +307,7 @@ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libuim_look_la_LDFLAGS) $(LDFLAGS) -o \ + $@ -@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim-scm.la libuim.la +@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c @M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS = \ @M17NLIB_TRUE@ libuim_m17nlib_la-m17nlib.lo -@@ -767,7 +765,7 @@ +@@ -925,7 +923,7 @@ libuim_process_la_CPPFLAGS = -I$(top_srcdir) libuim_custom_la_SOURCES = uim-custom.c @M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c @@ -37,8 +37,8 @@ +@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim-scm -luim @M17NLIB_TRUE@libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module @M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@ - @SCIM_TRUE@libuim_scim_la_SOURCES = scim.cpp -@@ -779,11 +777,11 @@ + @WNN_TRUE@libuim_wnn_la_SOURCES = wnnlib.h wnnlib.c +@@ -933,11 +931,11 @@ @WNN_TRUE@libuim_wnn_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module @WNN_TRUE@libuim_wnn_la_CPPFLAGS = -I$(top_srcdir) $(WNN_CPPFLAGS) @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_SOURCES = anthy.c Modified: head/textproc/uim/pkg-plist ============================================================================== --- head/textproc/uim/pkg-plist Sat Jul 7 15:35:36 2018 (r474101) +++ head/textproc/uim/pkg-plist Sat Jul 7 15:56:01 2018 (r474102) @@ -39,6 +39,8 @@ lib/uim/plugin/libuim-look.so lib/uim/plugin/libuim-process.so lib/uim/plugin/libuim-skk.so lib/uim/plugin/libuim-socket.so +lib/uim/plugin/libuim-sqlite3.so +lib/uim/plugin/libuim-xkb.so libdata/pkgconfig/gcroots.pc libdata/pkgconfig/uim.pc %%X11%%libexec/uim-candwin-gtk @@ -280,8 +282,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%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 @@ -336,7 +336,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/pyunihan.scm %%DATADIR%%/rk.scm %%DATADIR%%/romaja.scm -%%DATADIR%%/scim.scm %%DATADIR%%/sj3-custom.scm %%DATADIR%%/sj3-key-custom.scm %%DATADIR%%/sj3.scm @@ -346,9 +345,6 @@ share/locale/ko/LC_MESSAGES/uim.mo %%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 @@ -377,6 +373,7 @@ share/locale/ko/LC_MESSAGES/uim.mo %%DATADIR%%/wnn-custom.scm %%DATADIR%%/wnn-key-custom.scm %%DATADIR%%/wnn.scm +%%DATADIR%%/xkb.scm %%DATADIR%%/xmload.scm %%DATADIR%%/yahoo-jp-custom.scm %%DATADIR%%/yahoo-jp-key-custom.scm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807071556.w67Fu1w4005455>