Index: head/japanese/uim-anthy/Makefile =================================================================== --- head/japanese/uim-anthy/Makefile (revision 474101) +++ head/japanese/uim-anthy/Makefile (revision 474102) @@ -1,49 +1,50 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ -PORTREVISION= 2 CATEGORIES= japanese .if defined(WITHOUT_X11) PKGNAMESUFFIX= -anthy-nox11 .else PKGNAMESUFFIX= -anthy .endif 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} CONFIGURE_ARGS= --with-anthy --with-anthy-utf8 .if !defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-gtk2 --enable-dict .endif UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_dict_Makefile.in do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy.la) (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-anthy-utf8.la) .if !defined(WITHOUT_X11) (cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} uim-dict-gtk) .endif do-install: (cd ${WRKSRC}/uim && \ ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES && \ ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-anthy-utf8.la install-uim_pluginLTLIBRARIES) .if !defined(WITHOUT_X11) (cd ${WRKSRC}/gtk2/dict && ${MAKE_CMD} DESTDIR=${STAGEDIR} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) .endif .include "${MASTERDIR}/Makefile" Index: head/textproc/uim/Makefile =================================================================== --- head/textproc/uim/Makefile (revision 474101) +++ head/textproc/uim/Makefile (revision 474102) @@ -1,112 +1,118 @@ # Created by: MANTANI Nobutaka # $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 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 OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= X11 .include .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 .endif CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include .if !defined(UIM_SLAVE) DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim DOCSDIR_SIGSCHEME= ${PREFIX}/share/doc/uim/sigscheme PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \ DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}" .endif .if empty(PORT_OPTIONS:MX11) PLIST_SUB+= X11="@comment " .else PLIST_SUB+= X11="" .endif .include .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" CONFIGURE_ARGS+= --enable-storage=fatty .endif .for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict .if ${CONFIGURE_ARGS:M--with-${_x}} == "" CONFIGURE_ARGS+=--without-${_x} .endif .endfor .for _x in gnome-applet kde-applet emacs pref .if ${CONFIGURE_ARGS:M--enable-${_x}} == "" CONFIGURE_ARGS+=--disable-${_x} .endif .endfor post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm do-build: .if !defined(UIM_SLAVE) .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${MAKE_CMD} .endfor .if ${PORT_OPTIONS:MX11} cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} .endif .endif do-install: .if !defined(UIM_SLAVE) cd ${WRKSRC} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-data-am .for d in sigscheme uim scm xim po fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .endfor .if ${PORT_OPTIONS:MX11} cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .endif .endif .if !defined(UIM_SLAVE) post-install: ${MKDIR} ${STAGEDIR}${DATADIR}/helperdata ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.fep ${INSTALL_DATA} ${WRKSRC}/fep/README ${STAGEDIR}${DOCSDIR}/README.key ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep ${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim .endif .include Index: head/textproc/uim/distinfo =================================================================== --- head/textproc/uim/distinfo (revision 474101) +++ head/textproc/uim/distinfo (revision 474102) @@ -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 Index: head/textproc/uim/files/patch-po_Makefile.in.in =================================================================== --- head/textproc/uim/files/patch-po_Makefile.in.in (revision 474101) +++ head/textproc/uim/files/patch-po_Makefile.in.in (nonexistent) @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig 2013-06-30 04:27:11 UTC -+++ po/Makefile.in.in -@@ -33,7 +33,7 @@ exec_prefix = @exec_prefix@ - datadir = @datadir@ - datarootdir = @datarootdir@ - libdir = @libdir@ --DATADIRNAME = @DATADIRNAME@ -+DATADIRNAME = share - itlocaledir = $(prefix)/$(DATADIRNAME)/locale - subdir = po - install_sh = @install_sh@ Property changes on: head/textproc/uim/files/patch-po_Makefile.in.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk2_immodule_Makefile.in (revision 474102) @@ -1,23 +1,23 @@ ---- 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) -@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \ +@GTK2_TRUE@im_uim_la_DEPENDENCIES = \ @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 = \ Index: head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk2_pad_Makefile.in (revision 474102) @@ -1,24 +1,24 @@ ---- 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) -@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = \ -@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 -@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la +@GTK2_TRUE@uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm \ +@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@ Index: head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk2_switcher_Makefile.in (revision 474102) @@ -1,29 +1,29 @@ ---- 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) -@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 +@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 -@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(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 +@GTK2_TRUE@uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm \ +@GTK2_TRUE@ -luim-custom \ +@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@ Index: head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in (revision 474102) @@ -1,76 +1,76 @@ ---- 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) -uim_toolbar_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \ - $(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) -uim_toolbar_gtk_systray_DEPENDENCIES = \ - $(top_builddir)/uim/libuim-scm.la \ - $(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 \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm \ + -luim \ + -luim-custom 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@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm \ + -luim \ + -luim-custom uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ Index: head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk3_candwin_Makefile.in (revision 474102) @@ -1,66 +1,68 @@ ---- 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) -@GTK3_TRUE@uim_candwin_horizontal_gtk3_DEPENDENCIES = \ -@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 -@GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la +@GTK3_TRUE@uim_candwin_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \ +@GTK3_TRUE@ -luim @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 -@GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la +@GTK3_TRUE@uim_candwin_tbl_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \ +@GTK3_TRUE@ -luim @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 -@GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la +@GTK3_TRUE@uim_candwin_horizontal_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \ +@GTK3_TRUE@ -luim @GTK3_TRUE@uim_candwin_horizontal_gtk3_CPPFLAGS = -I$(top_srcdir) @GTK3_TRUE@uim_candwin_horizontal_gtk3_CFLAGS = @GTK3_CFLAGS@ Index: head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk3_immodule_Makefile.in (revision 474102) @@ -1,24 +1,24 @@ ---- 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 \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la \ -@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 = \ Index: head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk3_pad_Makefile.in (revision 474102) @@ -1,24 +1,24 @@ ---- 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) -@GTK3_TRUE@uim_input_pad_ja_gtk3_DEPENDENCIES = \ -@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 -@GTK3_TRUE@uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ -@GTK3_TRUE@ $(top_builddir)/uim/libuim.la +@GTK3_TRUE@uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \ +@GTK3_TRUE@ -luim @GTK3_TRUE@uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) @GTK3_TRUE@uim_input_pad_ja_gtk3_CFLAGS = @GTK3_CFLAGS@ Index: head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk3_switcher_Makefile.in (revision 474102) @@ -1,31 +1,30 @@ ---- 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 -@GTK3_TRUE@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ $(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@uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ \ +@GTK3_TRUE@ -luim-custom \ +@GTK3_TRUE@ -luim-scm \ +@GTK3_TRUE@ -luim @GTK3_TRUE@uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) @GTK3_TRUE@uim_im_switcher_gtk3_CFLAGS = @GTK3_CFLAGS@ Index: head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-gtk3_toolbar_Makefile.in (revision 474102) @@ -1,67 +1,52 @@ ---- 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 +@GTK3_TRUE@uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ -luim-scm \ +@GTK3_TRUE@ -luim \ +@GTK3_TRUE@ -luim-custom @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@ \ -@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 @GTK3_TRUE@uim_toolbar_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) @GTK3_TRUE@uim_toolbar_gtk3_systray_CFLAGS = @GTK3_CFLAGS@ Index: head/textproc/uim/files/extra-patch-uim_Makefile.in =================================================================== --- head/textproc/uim/files/extra-patch-uim_Makefile.in (revision 474101) +++ head/textproc/uim/files/extra-patch-uim_Makefile.in (revision 474102) @@ -1,54 +1,54 @@ ---- 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 \ -@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@ libuim.la +@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_DEPENDENCIES = 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) -@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES = \ -@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@ libuim-scm.la libuim.la +@ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_DEPENDENCIES = 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 -@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la +@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 -@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 @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) @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_SOURCES = anthy-utf8.c -@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la +@ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ -luim-scm -luim @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module @ANTHY_UTF8_TRUE@@ENABLE_ANTHY_UTF8_STATIC_FALSE@libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@ @MANA_TRUE@libuim_mana_la_SOURCES = mana.c Index: head/textproc/uim/pkg-plist =================================================================== --- head/textproc/uim/pkg-plist (revision 474101) +++ head/textproc/uim/pkg-plist (revision 474102) @@ -1,385 +1,382 @@ 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/dynlib.h include/uim/uim-custom.h include/uim/uim-helper.h include/uim/uim-im-switcher.h include/uim/uim-notify.h include/uim/uim-posix.h include/uim/uim-scm.h include/uim/uim-scm-abbrev.h include/uim/uim-util.h include/uim/uim.h include/uim/version.h lib/libgcroots.a lib/libgcroots.so lib/libgcroots.so.0 lib/libgcroots.so.0.1.0 lib/libuim-custom.so lib/libuim-custom.so.2 lib/libuim-custom.so.2.1.0 lib/libuim-scm.so lib/libuim-scm.so.0 lib/libuim-scm.so.0.1.0 lib/libuim.so lib/libuim.so.8 lib/libuim.so.8.0.0 lib/uim/plugin/libuim-custom-enabler.so lib/uim/plugin/libuim-editline.so lib/uim/plugin/libuim-fileio.so lib/uim/plugin/libuim-lolevel.so 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 %%X11%%libexec/uim-candwin-horizontal-gtk %%X11%%libexec/uim-candwin-tbl-gtk libexec/uim-helper-server %%X11%%man/man1/uim-xim.1.gz share/applications/uim.desktop share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo share/locale/ko/LC_MESSAGES/uim.mo %%PORTDOCS%%%%DOCSDIR_JA%%/README.fep %%PORTDOCS%%%%DOCSDIR%%/KEY %%PORTDOCS%%%%DOCSDIR%%/README.fep %%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-custom.scm %%DATADIR%%/annotation-dict.scm %%DATADIR%%/annotation-eb.scm %%DATADIR%%/annotation-filter.scm %%DATADIR%%/annotation-osx-dcs.scm %%DATADIR%%/annotation.scm %%DATADIR%%/anthy-custom.scm %%DATADIR%%/anthy-key-custom.scm %%DATADIR%%/anthy-utf8-custom.scm %%DATADIR%%/anthy-utf8.scm %%DATADIR%%/anthy.scm %%DATADIR%%/baidu-olime-jp-custom.scm %%DATADIR%%/baidu-olime-jp-key-custom.scm %%DATADIR%%/baidu-olime-jp.scm %%DATADIR%%/byeoru-custom.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 %%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%%/google-cgiapi-jp-custom.scm %%DATADIR%%/google-cgiapi-jp-key-custom.scm %%DATADIR%%/google-cgiapi-jp.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%%/json-parser-expanded.scm %%DATADIR%%/json.scm %%DATADIR%%/key.scm %%DATADIR%%/latin.scm %%DATADIR%%/lazy-load.scm %%DATADIR%%/lib/sigscheme-init.scm %%DATADIR%%/lib/srfi-0.scm %%DATADIR%%/lib/srfi-1.scm %%DATADIR%%/lib/srfi-43.scm %%DATADIR%%/lib/srfi-55.scm %%DATADIR%%/lib/srfi-69.scm %%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%%/m17nlib-custom.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%%/packrat.scm %%DATADIR%%/pinyin-big5.scm %%DATADIR%%/pixmaps/ajax-ime.png %%DATADIR%%/pixmaps/ajax-ime.svg %%DATADIR%%/pixmaps/anthy.png %%DATADIR%%/pixmaps/baidu-olime-jp.png %%DATADIR%%/pixmaps/baidu-olime-jp.svg %%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/google-cgiapi-jp.png %%DATADIR%%/pixmaps/google-cgiapi-jp.svg %%DATADIR%%/pixmaps/hangul2.png %%DATADIR%%/pixmaps/hangul2.svg %%DATADIR%%/pixmaps/hangul3.png %%DATADIR%%/pixmaps/hangul3.svg %%DATADIR%%/pixmaps/im_subst.svg %%DATADIR%%/pixmaps/im_switcher.png %%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 %%DATADIR%%/pixmaps/look.svg %%DATADIR%%/pixmaps/mana.png %%DATADIR%%/pixmaps/mana.svg %%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 %%DATADIR%%/pixmaps/pyunihan.svg %%DATADIR%%/pixmaps/romaja.png %%DATADIR%%/pixmaps/romaja.svg %%DATADIR%%/pixmaps/scim.png %%DATADIR%%/pixmaps/scim.svg %%DATADIR%%/pixmaps/sj3.png %%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 %%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/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%%/tables/wb86.table %%DATADIR%%/tables/zm.table %%DATADIR%%/plugin.scm %%DATADIR%%/predict-custom.scm %%DATADIR%%/predict-google-suggest.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 %%DATADIR%%/rk.scm %%DATADIR%%/romaja.scm -%%DATADIR%%/scim.scm %%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-bushu.scm %%DATADIR%%/tutcode-bushudic.scm %%DATADIR%%/tutcode-custom.scm %%DATADIR%%/tutcode-dialog.scm %%DATADIR%%/tutcode-editor.scm %%DATADIR%%/tutcode-key-custom.scm %%DATADIR%%/tutcode-kigou-rule.scm %%DATADIR%%/tutcode-kigoudic.scm %%DATADIR%%/tutcode-rule.scm %%DATADIR%%/tutcode-rule-custom.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%%/xkb.scm %%DATADIR%%/xmload.scm %%DATADIR%%/yahoo-jp-custom.scm %%DATADIR%%/yahoo-jp-key-custom.scm %%DATADIR%%/yahoo-jp.scm %%DATADIR%%/zaurus.scm @dir %%DATADIR%%/helperdata Index: head/textproc/uim-el/Makefile =================================================================== --- head/textproc/uim-el/Makefile (revision 474101) +++ head/textproc/uim-el/Makefile (revision 474102) @@ -1,42 +1,41 @@ # Created by: MANTANI Nobutaka # $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} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Emacs lisp for uim input method library RUN_DEPENDS= uim-el-agent:textproc/uim USES= emacs gettext-tools gmake iconv perl5 tar:bzip2 USE_GNOME= intltool USE_PERL5= build GNU_CONFIGURE= yes BUILD_WRKSRC= ${WRKSRC}/emacs INSTALL_WRKSRC= ${WRKSRC}/emacs CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR} CONFIGURE_ENV= EMACS="${EMACS_CMD}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib DOCSDIR_JA= ${PREFIX}/share/doc/ja/uim-el PLIST_SUB+= DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" OPTIONS_DEFINE= DOCS post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR_JA} ${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja .include Index: head/textproc/uim-el/distinfo =================================================================== --- head/textproc/uim-el/distinfo (revision 474101) +++ head/textproc/uim-el/distinfo (revision 474102) @@ -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 Index: head/textproc/uim-gtk/Makefile =================================================================== --- head/textproc/uim-gtk/Makefile (revision 474101) +++ head/textproc/uim-gtk/Makefile (revision 474102) @@ -1,42 +1,44 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ 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} CONFIGURE_ARGS= --with-gtk2 --enable-pref UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk2_immodule_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_pad_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_pref_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_switcher_Makefile.in \ ${PATCHDIR}/extra-patch-gtk2_toolbar_Makefile.in .if defined(WITHOUT_X11) IGNORE= requires X11 .endif do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD}) (cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD}) (cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD}) (cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD}) (cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD}) do-install: (cd ${WRKSRC}/gtk2/immodule && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) (cd ${WRKSRC}/gtk2/pad && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) (cd ${WRKSRC}/gtk2/pref && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) (cd ${WRKSRC}/gtk2/switcher && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) (cd ${WRKSRC}/gtk2/toolbar && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-gtk3/Makefile =================================================================== --- head/textproc/uim-gtk3/Makefile (revision 474101) +++ head/textproc/uim-gtk3/Makefile (revision 474102) @@ -1,36 +1,36 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ 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 PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-gtk3 --enable-pref --enable-default-toolkit=gtk3 UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gtk3_candwin_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_dict_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_immodule_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_pad_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_pref_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_switcher_Makefile.in \ ${PATCHDIR}/extra-patch-gtk3_toolbar_Makefile.in .if defined(WITHOUT_X11) IGNORE= requires X11 .endif do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/gtk3 && ${MAKE_CMD}) do-install: (cd ${WRKSRC}/gtk3 && ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-kde4/Makefile =================================================================== --- head/textproc/uim-kde4/Makefile (revision 474101) +++ head/textproc/uim-kde4/Makefile (revision 474102) @@ -1,40 +1,39 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ -PORTREVISION= 6 PKGNAMESUFFIX= -kde4 COMMENT= KDE4 panel applet of uim input method BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libuim.so:textproc/uim 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 PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-qt4 --enable-pref --enable-default-toolkit=qt4 \ --enable-kde4-applet CONFIGURE_ENV= KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include 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} ${MAKE_CMD}) do-install: (cd ${WRKSRC}/qt4/toolbar/build && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-m17nlib/Makefile =================================================================== --- head/textproc/uim-m17nlib/Makefile (revision 474101) +++ head/textproc/uim-m17nlib/Makefile (revision 474102) @@ -1,42 +1,41 @@ # Created by: MANTANI Nobutaka # $FreeBSD$ -PORTREVISION= 2 .if defined(WITHOUT_X11) PKGNAMESUFFIX= -m17nlib-nox11 .else PKGNAMESUFFIX= -m17nlib .endif COMMENT= Uim plugin using m17n library input method BUILD_DEPENDS= m17n-db:devel/m17n-db LIB_DEPENDS= libm17n.so:devel/m17n-lib \ libuim.so:textproc/uim RUN_DEPENDS= m17n-db:devel/m17n-db .if !defined(WITHOUT_M17NCONTRIB) RUN_DEPENDS+= ${LOCALBASE}/share/m17n/icons/as-phonetic.png:devel/m17n-db .endif MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-m17nlib UIM_SLAVE= yes EXTRA_PATCHES= ${PATCHDIR}/extra-patch-uim_Makefile.in do-build: (cd ${WRKSRC}/uim && ${MAKE_CMD} libuim-m17nlib.la) do-install: (cd ${WRKSRC}/uim && \ ${MAKE_CMD} DESTDIR=${STAGEDIR} uim_plugin_LTLIBRARIES=libuim-m17nlib.la install-uim_pluginLTLIBRARIES && \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/uim/pixmaps && \ DESTDIR="${STAGEDIR}" ${SH} ../pixmaps/uim-m17nlib-relink-icons) post-install: @${FIND} ${LOCALBASE}/share/m17n/icons/ -name '*.png' -execdir ${ECHO} share/uim/pixmaps/m17n-{} \; >>${TMPPLIST} .include "${MASTERDIR}/Makefile" Index: head/textproc/uim-qt4/Makefile =================================================================== --- head/textproc/uim-qt4/Makefile (revision 474101) +++ head/textproc/uim-qt4/Makefile (revision 474102) @@ -1,35 +1,36 @@ # Created by: Yamashiro Jun # $FreeBSD$ PKGNAMESUFFIX= -qt4 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 PKGDIR= ${.CURDIR} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule CONFIGURE_ENV= DATADIRNAME="share" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -I${LOCALBASE}/include UIM_SLAVE= yes .if defined(WITHOUT_X11) IGNORE= cannot be built without X11. Please, unset WITHOUT_X11 .endif do-build: (cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la) (cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) do-install: (cd ${WRKSRC}/qt4 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install) .include "${MASTERDIR}/Makefile"