diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 7c4f0838e183..7a570bcd4def 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -1,409 +1,409 @@ PORTNAME= mozc PORTVERSION= 2.23.2815.102.01 DISTVERSIONPREFIX= v -PORTREVISION?= 29 +PORTREVISION?= 30 CATEGORIES= japanese MAINTAINER= hrs@FreeBSD.org COMMENT?= Mozc Japanese Input Method, Server WWW= https://github.com/google/mozc BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gyp>=20200512:devel/py-gyp@${PY_FLAVOR} EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR} LIB_DEPENDS= libprotobuf.so:devel/protobuf \ libzinnia.so:japanese/zinnia RUN_DEPENDS= xdg-open:devel/xdg-utils BROKEN_FreeBSD_13_powerpc64= fails to build: ERROR: ninja -v -C out_linux/Release mozc_server: Error code 1 BROKEN_powerpc= fails to compile: segfault USE_GITHUB= yes GH_ACCOUNT= hrs-allbsd GH_TUPLE= hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic USES= compiler:c++17-lang gmake ninja:build pkgconfig \ python:build shebangfix tar:bzip2 SHEBANG_FILES= src/build_mozc.py BUILD_WRKSRC= ${WRKSRC}/src LDFLAGS+= -labsl_spinlock_wait USE_CXXSTD= c++17 BUILD_MOZC_LIST?= mozc_server .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" PKGNAMEPREFIX= ja- PKGNAMESUFFIX= -server LICENSE= BSD3CLAUSE NAISTL LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE LICENSE_DISTFILES_BSD3CLAUSE= ${DISTNAME}${EXTRACT_SUFX} LICENSE_NAME_NAISTL= Nara Institute of Science and Technology License LICENSE_PERMS_NAISTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE_NAISTL= ${WRKSRC}/src/data/dictionary_oss/README.txt LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX} .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" USES+= qt:5 gnome USE_GNOME= glib20 gtk20 USE_QT= buildtools core gui widgets .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" USES+= gettext-runtime gnome xorg USE_XORG= xcb USE_GNOME= cairo gdkpixbuf glib20 gtk20 LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 .elif ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" USES+= emacs .elif ${BUILD_MOZC_LIST:Mfcitx_mozc} USES+= gettext-tools .endif # Use GCC only when the stock clang does not have libc++.so. .if exists(/usr/bin/clang) && exists(/usr/lib/libc++.so) _CCTYPE= clang .else USE_GCC= yes _CCTYPE= gcc .endif .include GYP_DEFINES= use_libprotobuf=1 \ channel_dev=0 \ enable_unittest=0 \ compiler_host='${_CCTYPE}' \ compiler_target='${_CCTYPE}' \ use_libzinnia=1 \ zinnia_model_file='${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model' \ ibus_mozc_icon_path='${LOCALBASE}/share/ibus-mozc/icons/product_icon.png' \ ibus_mozc_path='${PREFIX}/libexec/ibus-engine-mozc' BUILD_MODE= Release BUILD_CMD= ${SETENV} ${MAKE_ENV} PATH=/bin:/usr/bin:${PATH} ${MAKE_CMD} BUILD_MOZC_CMD= cd ${BUILD_WRKSRC} && \ ${SETENV} BUILD_COMMAND="${BUILD_WRKSRC}/mozcmake" \ PATH="${PATH}" \ GYP_DEFINES="${GYP_DEFINES}" \ PYTHONPATH=${PYTHON_SITELIBDIR}/gyp \ CC_host="${CC}" \ CC_target="${CC}" \ CXX_host="${CXX}" \ CXX_target="${CXX}" \ LD_host="${CXX}" \ AR_host="${AR}" \ ${MAKE_ENV} \ ${PYTHON_CMD} build_mozc.py BUILD_MOZC_CMD_BUILD= ${BUILD_MOZC_CMD} build -c ${BUILD_MODE} ${_MAKE_JOBS} BUILD_GYP_CMD= ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/gyp post-extract: # XXX: do not activate fcitx5 ${RM} -r ${WRKSRC}/src/unix/fcitx5 post-patch: ${FIND} ${BUILD_WRKSRC} \( -name '*.gyp' -o -name '*.gypi' \) -exec \ ${REINPLACE_CMD} "s,'python','${PYTHON_CMD}',g" {} \; .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" ${REINPLACE_CMD} 's,/po/mo},%po}mo,g' \ ${BUILD_WRKSRC}/unix/fcitx/gen_fcitx_mozc_i18n.sh ${REINPLACE_CMD} \ "s,IconName=.*,IconName=${LOCALBASE:Q}/share/fcitx/mozc/icon/mozc.png," \ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf .endif .if !${BUILD_MOZC_LIST:Mmozc_el} ${BUILD_WRKSRC}/mozcmake: ${PRINTF} "%s\n\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} "$$@"' \ > ${BUILD_WRKSRC}/mozcmake ${CHMOD} +x ${BUILD_WRKSRC}/mozcmake post-configure: ${BUILD_WRKSRC}/mozcmake ${BUILD_MOZC_CMD} gyp \ --gypdir=${LOCALBASE}/bin \ --server_dir="${PREFIX}/bin" \ --tool_dir="${PREFIX}/libexec" \ --renderer_dir="${PREFIX}/libexec" \ --localbase="${LOCALBASE}" \ --ldflags="${LDFLAGS} -fstack-protector -L${LOCALBASE}/lib" \ --cflags="${CFLAGS:Q}" \ --cflags_cc="${CXXFLAGS:Q}" \ --include_dirs="${LOCALBASE}/include" \ ${GYP_OPTIONS} .endif # mozc_server .if ${BUILD_MOZC_LIST:Mmozc_server} == "mozc_server" || make(makesum) GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 MASTER_SITES+= LOCAL/hrs:zipcode DISTFILES+= \ ken_all-20221228.zip:zipcode \ jigyosyo-20221228.zip:zipcode PLIST_FILES+= bin/mozc \ bin/mozc_server \ libexec/mozc_emacs_helper SUB_FILES+= mozc post-patch-mozc_server: @for F in ${DISTFILES:M*\:zipcode:C/\:zipcode//}; do \ ${UNZIP_NATIVE_CMD} -L -d ${BUILD_WRKSRC}/data/dictionary_oss \ ${DISTDIR}/$$F; \ done cd ${BUILD_WRKSRC}/data/dictionary_oss && \ ${SETENV} PYTHONPATH=${BUILD_WRKSRC} \ ${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \ --zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \ >> dictionary09.txt ${MV} ${WRKSRC_udic}/usage_dict.txt \ ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary post-patch: post-patch-mozc_server do-build-mozc_server: ${BUILD_MOZC_CMD_BUILD} server/server.gyp:mozc_server ${BUILD_MOZC_CMD_BUILD} unix/emacs/emacs.gyp:mozc_emacs_helper do-install-mozc_server: ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_server \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_emacs_helper \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} \ ${WRKDIR}/mozc ${STAGEDIR}/${PREFIX}/bin .endif # mozc_tool .if ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=1 RUN_DEPENDS+= ${LOCALBASE}/share/tegaki/models/zinnia/handwriting-ja.model:japanese/tegaki-zinnia-japanese PLIST_FILES+= libexec/mozc_tool \ bin/mozc_tool \ %%DATADIR%%/icons/product_logo.png \ %%DATADIR%%/icons/update_uptodate.png SUB_FILES+= mozc_tool do-build-mozc_tool: ${BUILD_MOZC_CMD_BUILD} gui/gui.gyp:mozc_tool do-install-mozc_tool: ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_tool \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_SCRIPT} ${WRKDIR}/mozc_tool ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/icons ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/product_logo.png ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/update_uptodate.png .endif # ibus_mozc .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=1 \ enable_gtk_renderer=1 LIB_DEPENDS+= libibus-1.0.so:textproc/ibus RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool PLIST_FILES+= libexec/mozc_renderer \ libexec/ibus-engine-mozc \ %%DATADIR%%/icons/alpha_full.png \ %%DATADIR%%/icons/alpha_half.png \ %%DATADIR%%/icons/dictionary.png \ %%DATADIR%%/icons/direct.png \ %%DATADIR%%/icons/hiragana.png \ %%DATADIR%%/icons/katakana_full.png \ %%DATADIR%%/icons/katakana_half.png \ %%DATADIR%%/icons/product_icon.png \ %%DATADIR%%/icons/properties.png \ %%DATADIR%%/icons/tool.png \ share/ibus/component/mozc.xml PLIST_DIRS+= %%DATADIR%%/icons ${DATADIR_REL} do-build-ibus_mozc: ${BUILD_MOZC_CMD_BUILD} \ unix/ibus/ibus.gyp:ibus_mozc \ renderer/renderer.gyp:mozc_renderer do-install-ibus_mozc: ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/mozc_renderer \ ${STAGEDIR}${PREFIX}/libexec/mozc_renderer ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/ibus_mozc \ ${STAGEDIR}${PREFIX}/libexec/ibus-engine-mozc ${MKDIR} ${STAGEDIR}${PREFIX}/share/ibus/component ${INSTALL_DATA} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/ibus/mozc.xml \ ${STAGEDIR}${PREFIX}/share/ibus/component/mozc.xml @${MKDIR} ${STAGEDIR}${DATADIR}/icons .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/${F}.png \ ${STAGEDIR}${DATADIR}/icons/${F:S/^ui-//}.png .endfor ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/ime_product_icon_opensource-32.png \ ${STAGEDIR}${DATADIR}/icons/product_icon.png .endif # uim_mozc .if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum) GH_TUPLE+= e-kato:macuim:v0.6.16.2.1:MU LIB_DEPENDS+= libuim.so:textproc/uim RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-unix-uim-mozc.cc \ ${PATCHDIR}/extra-patch-src-unix-uim-uim.gyp \ ${PATCHDIR}/extra-patch-src-unix-uim-key_translator.h \ ${PATCHDIR}/extra-patch-src-unix-uim-key_translator.cc PLIST_FILES+= lib/uim/plugin/libuim-mozc.so \ %%DATADIR%%/mozc.scm \ %%DATADIR%%/mozc-custom.scm \ %%DATADIR%%/mozc-key-custom.scm \ %%DATADIR%%/pixmaps/mozc.png \ "@postexec ${SETENV} MOZC_NOLOG=true ${LOCALBASE}/bin/uim-module-manager --register mozc" \ "@preunexec ${LOCALBASE}/bin/uim-module-manager --unregister mozc" GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 post-extract-uim_mozc: ${MV} ${WRKSRC_MU}/Mozc/uim ${BUILD_WRKSRC}/unix ${REINPLACE_CMD} -e "s,/usr/lib/mozc,${LOCALBASE}/libexec," \ ${WRKSRC_MU}/Mozc/scm/mozc-custom.scm post-extract: post-extract-uim_mozc do-build-uim_mozc: ${BUILD_MOZC_CMD_BUILD} \ unix/uim/uim.gyp:uim-mozc do-install-uim_mozc: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/uim/plugin ${INSTALL_PROGRAM} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \ ${STAGEDIR}${PREFIX}/lib/uim/plugin ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC_MU}/Mozc/scm && \ ${INSTALL_DATA} mozc.scm mozc-custom.scm mozc-key-custom.scm \ ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \ ${STAGEDIR}${DATADIR}/pixmaps/mozc.png .endif # fcitx_mozc .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=0 \ enable_gtk_renderer=0 \ use_fcitx="YES" LIB_DEPENDS+= libfcitx-core.so:chinese/fcitx RUN_DEPENDS+= mozc_server:japanese/mozc-server \ mozc_tool:japanese/mozc-tool PLIST_FILES+= lib/fcitx/fcitx-mozc.so \ share/fcitx/addon/fcitx-mozc.conf \ share/fcitx/inputmethod/mozc.conf \ %%DATADIR%%/icon/mozc.png \ %%DATADIR%%/icon/mozc-alpha_full.png \ %%DATADIR%%/icon/mozc-alpha_half.png \ %%DATADIR%%/icon/mozc-direct.png \ %%DATADIR%%/icon/mozc-hiragana.png \ %%DATADIR%%/icon/mozc-katakana_full.png \ %%DATADIR%%/icon/mozc-katakana_half.png \ %%DATADIR%%/icon/mozc-dictionary.png \ %%DATADIR%%/icon/mozc-properties.png \ %%DATADIR%%/icon/mozc-tool.png \ share/locale/ja/LC_MESSAGES/fcitx-mozc.mo \ share/locale/zh_CN/LC_MESSAGES/fcitx-mozc.mo \ share/locale/zh_TW/LC_MESSAGES/fcitx-mozc.mo PLIST_DIRS+= %%DATADIR%%/icon ${DATADIR_REL} do-build-fcitx_mozc: ${BUILD_MOZC_CMD_BUILD} unix/fcitx/fcitx.gyp:fcitx-mozc do-install-fcitx_mozc: @${MKDIR} \ ${STAGEDIR}${PREFIX}/lib/fcitx \ ${STAGEDIR}${PREFIX}/share/fcitx/addon \ ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod ${INSTALL_LIB} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/fcitx-mozc.so \ ${STAGEDIR}${PREFIX}/lib/fcitx/fcitx-mozc.so ${INSTALL_DATA} \ ${BUILD_WRKSRC}/unix/fcitx/fcitx-mozc.conf \ ${STAGEDIR}${PREFIX}/share/fcitx/addon/fcitx-mozc.conf ${INSTALL_DATA} \ ${BUILD_WRKSRC}/unix/fcitx/mozc.conf \ ${STAGEDIR}${PREFIX}/share/fcitx/inputmethod/mozc.conf @${MKDIR} ${STAGEDIR}${DATADIR}/icon .for F in ui-alpha_full ui-alpha_half ui-dictionary ui-direct \ ui-hiragana ui-katakana_full ui-katakana_half ui-properties ui-tool ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/unix/${F}.png \ ${STAGEDIR}${DATADIR}/icon/${F:S,^ui-,mozc-,}.png .endfor ${INSTALL_DATA} \ ${BUILD_WRKSRC}/data/images/product_icon_32bpp-128.png \ ${STAGEDIR}${DATADIR}/icon/mozc.png .for L in ja zh_CN zh_TW ${INSTALL_DATA} \ ${BUILD_WRKSRC}/out_linux/${BUILD_MODE}/gen/unix/fcitx/po/${L}.mo \ ${STAGEDIR}${PREFIX}/share/locale/${L}/LC_MESSAGES/fcitx-mozc.mo .endfor .endif # mozc_el .if ${BUILD_MOZC_LIST:Mmozc_el} == "mozc_el" CATEGORIES+= elisp RUN_DEPENDS+= mozc_server:japanese/mozc-server NO_ARCH= yes PLIST_FILES+= ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.elc \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/mozc.el.gz \ ${EMACS_VERSION_SITE_LISPDIR}/mozc/leim-list.el PLIST_DIRS+= ${EMACS_VERSION_SITE_LISPDIR}/mozc post-patch-mozc_el: ${REINPLACE_CMD} "s,%%PREFIX%%,${PREFIX}," \ ${BUILD_WRKSRC}/unix/emacs/mozc.el post-patch: post-patch-mozc_el do-build-mozc_el: cd ${BUILD_WRKSRC}/unix/emacs && \ ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile mozc.el && \ ${GZIP_CMD} mozc.el do-install-mozc_el: @${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc ${INSTALL_DATA} \ ${BUILD_WRKSRC}/unix/emacs/mozc.el.gz \ ${BUILD_WRKSRC}/unix/emacs/mozc.elc \ ${FILESDIR}/leim-list.el \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mozc/ .endif do-build: ${BUILD_MOZC_LIST:S/^/do-build-/} do-install: ${BUILD_MOZC_LIST:S/^/do-install-/} .include diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile index 6a9f974c39e7..5e8ccb38339c 100644 --- a/japanese/scim-uim/Makefile +++ b/japanese/scim-uim/Makefile @@ -1,22 +1,22 @@ PORTNAME= scim-uim PORTVERSION= 0.2.0 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= japanese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} \ http://freedesktop.org/~suzhe/sources/ MAINTAINER= s_yanagita@ybb.ne.jp COMMENT= SCIM IMEngine module using UIM input method library WWW= https://sourceforge.net/projects/scim/files/scim-uim/ BUILD_DEPENDS= scim:textproc/scim LIB_DEPENDS= libuim.so:textproc/uim RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gmake iconv libtool:keepla pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include diff --git a/japanese/uim-mozc/Makefile b/japanese/uim-mozc/Makefile index 8813a8bc0213..e7d2e477909f 100644 --- a/japanese/uim-mozc/Makefile +++ b/japanese/uim-mozc/Makefile @@ -1,13 +1,13 @@ -PORTREVISION= 10 +PORTREVISION= 11 PKGNAMEPREFIX= ja-uim- COMMENT= Mozc engine for uim MASTERDIR= ${.CURDIR}/../../japanese/mozc-server FILESDIR= ${.CURDIR}/files DATADIR= ${PREFIX}/share/uim SUB_FILES= pkg-message BUILD_MOZC_LIST=uim_mozc .include "${MASTERDIR}/Makefile" diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile index b84514ab44ce..34bddcff2d7e 100644 --- a/japanese/uim-tomoe-gtk/Makefile +++ b/japanese/uim-tomoe-gtk/Makefile @@ -1,24 +1,24 @@ PORTNAME= uim-tomoe-gtk PORTVERSION= 0.6.0 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= japanese MASTER_SITES= SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ume@FreeBSD.org COMMENT= UIM helper program for Tomoe WWW= https://sourceforge.jp/projects/tomoe/ LIB_DEPENDS= libtomoe.so:japanese/tomoe \ libtomoe-gtk.so:japanese/libtomoe-gtk \ libuim.so:textproc/uim USES= gettext gmake gnome libtool pkgconfig USE_GNOME= gtk20 intltool GNU_CONFIGURE= yes PLIST_FILES= bin/uim-tomoe-gtk \ share/locale/ja/LC_MESSAGES/uim-tomoe-gtk.mo CONFIGURE_ENV+= GMSGFMT="${LOCALBASE}/bin/msgfmt" .include diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index f82792bc976f..fcd45f416f37 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -1,50 +1,50 @@ PORTNAME= uim-el -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.6 CATEGORIES= textproc PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Emacs lisp for uim input method library WWW= https://github.com/uim/uim LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= uim-el-agent:textproc/uim USES= autoreconf:build,2.69 emacs gettext gmake gnome iconv libtool \ pathfix perl5 pkgconfig USE_GNOME= intltool USE_PERL5= build USE_GITHUB= yes GH_ACCOUNT= uim GH_PROJECT= uim GNU_CONFIGURE= yes BUILD_WRKSRC= ${WRKSRC}/emacs INSTALL_WRKSRC= ${WRKSRC}/emacs CONFIGURE_ARGS?=--enable-maintainer-mode --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 pre-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh 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 diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index c44b7f345200..63365d31d133 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746443050 -SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35 -SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603 +TIMESTAMP = 1747554528 +SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 +SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 diff --git a/textproc/uim-el/files/patch-emacs_Makefile.am b/textproc/uim-el/files/patch-emacs_Makefile.am index 9edaeaaa6f40..10eacfe8895e 100644 --- a/textproc/uim-el/files/patch-emacs_Makefile.am +++ b/textproc/uim-el/files/patch-emacs_Makefile.am @@ -1,21 +1,23 @@ ---- emacs/Makefile.am.orig 2021-04-29 12:52:58 UTC +--- emacs/Makefile.am.orig 2025-05-18 07:48:51 UTC +++ emacs/Makefile.am -@@ -1,13 +1,11 @@ +@@ -1,6 +1,5 @@ EXTRA_DIST = README.ja uim-version.el.in EXTRA_DIST = README.ja uim-version.el.in -if UIM_EL - - uimel_lispdir = $(UIMEL_LISP_DIR) - dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \ + AM_CPPFLAGS = \ + -I$(top_builddir)/uim \ + -I$(top_srcdir)/replace \ +@@ -11,8 +10,6 @@ dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.e uim-key.el uim-util.el \ uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el -bin_PROGRAMS = uim-el-agent uim-el-helper-agent - +- uim_el_agent_SOURCES = uim-el-agent.c debug.c output.c context.c preedit.c \ key.c candidate.c encoding.c im.c callback.c commit.c \ -@@ -27,4 +25,3 @@ uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir) + helper.c prop.c helper-message.c callback.h candidate.h commit.h context.h \ +@@ -31,4 +28,3 @@ uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \ $(top_builddir)/uim/libuim.la -endif diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 9fa042279485..50051c7a8ed4 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -1,139 +1,139 @@ PORTNAME= uim -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.6 CATEGORIES?= textproc .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Input method library WWW= https://github.com/uim/uim LICENSE= BSD3CLAUSE GPLv2+ GPLv3+ LGPL21+ PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_riscv64= fails to configure: ./include/private/gcconfig.h:492:5: The collector has not been ported to this machine/OS combination USES+= autoreconf:build,2.69 gettext gmake gnome iconv libedit \ libtool pathfix pkgconfig sqlite USE_LDCONFIG= yes USE_GNOME+= glib20 intltool USE_GITHUB= yes GH_TUPLE= uim:sigscheme:ccf1f92:sigscheme \ uim:libgcroots:f019129:libgcroots GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS+= --enable-maintainer-mode OPTIONS_DEFINE= DOCS X11 OPTIONS_DEFAULT= X11 .include .if ${PORT_OPTIONS:MX11} USES+= xorg USE_XORG+= x11 xext LIB_DEPENDS+= libXft.so:x11-fonts/libXft CONFIGURE_ARGS+= --with-x --with-xft .endif .if !defined(UIM_SLAVE) USES+= perl5 ruby:build USE_GNOME+= librsvg2:build USE_PERL5= build RUN_DEPENDS= ${LOCALBASE}/share/skk/SKK-JISYO.L:japanese/skk-jisyo .if ${PORT_OPTIONS:MX11} USE_GNOME+= cairo gdkpixbuf gtk30 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libharfbuzz.so:print/harfbuzz CONFIGURE_ARGS+= --with-gtk3 --enable-default-toolkit=gtk3 .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" CONFIGURE_ARGS+= --enable-storage=fatty .endif .for _x in x xft gtk2 gtk3 qt5 qt6 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-extract: ${CP} -R ${WRKSRC_sigscheme}/* ${WRKSRC}/sigscheme ${MKDIR} ${WRKSRC}/sigscheme/libgcroots ${CP} -R ${WRKSRC_libgcroots}/* ${WRKSRC}/sigscheme/libgcroots post-patch: .for f in predict-custom.scm predict-look-skk.scm ${REINPLACE_CMD} -e 's|%PREFIX%|${PREFIX}|g' ${WRKSRC}/scm/${f} .endfor pre-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh 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}/gtk3/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 fep emacs pixmaps tables cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip .endfor cd ${WRKSRC}/po && ${MAKE_CMD} DESTDIR=${STAGEDIR} install .if ${PORT_OPTIONS:MX11} cd ${WRKSRC}/gtk3/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip .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 diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index 50fcefff1b04..427cf96e7581 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1746442886 -SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35 -SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603 +TIMESTAMP = 1747549318 +SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 +SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 SHA256 (uim-sigscheme-ccf1f92_GH0.tar.gz) = 320e0e9af6c64fb9fa2b58643792b9ed5b66b9add3ed233a391b6a2518a6313f SIZE (uim-sigscheme-ccf1f92_GH0.tar.gz) = 570780 SHA256 (uim-libgcroots-f019129_GH0.tar.gz) = b88a61336ddf230b083f7185eb94aa0f1d3168204a84d35578eccaf0a61c1800 SIZE (uim-libgcroots-f019129_GH0.tar.gz) = 88746 diff --git a/textproc/uim/files/patch-emacs_Makefile.am b/textproc/uim/files/patch-emacs_Makefile.am index 5f49dcd48461..07841fa725c4 100644 --- a/textproc/uim/files/patch-emacs_Makefile.am +++ b/textproc/uim/files/patch-emacs_Makefile.am @@ -1,12 +1,12 @@ ---- emacs/Makefile.am.orig 2021-04-29 07:41:09 UTC +--- emacs/Makefile.am.orig 2025-05-18 06:22:16 UTC +++ emacs/Makefile.am -@@ -3,9 +3,6 @@ EXTRA_DIST = README.ja uim-version.el.in - if UIM_EL +@@ -7,9 +7,6 @@ uimel_lispdir = $(UIMEL_LISP_DIR) + -I$(top_srcdir) uimel_lispdir = $(UIMEL_LISP_DIR) -dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \ - uim-key.el uim-util.el \ - uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el bin_PROGRAMS = uim-el-agent uim-el-helper-agent diff --git a/textproc/uim/files/patch-gtk2_candwin_Makefile.am b/textproc/uim/files/patch-gtk2_candwin_Makefile.am index ad5f2e9a3ee3..d1c8ba27c952 100644 --- a/textproc/uim/files/patch-gtk2_candwin_Makefile.am +++ b/textproc/uim/files/patch-gtk2_candwin_Makefile.am @@ -1,30 +1,30 @@ ---- gtk2/candwin/Makefile.am.orig 2021-04-30 14:25:14 UTC +--- gtk2/candwin/Makefile.am.orig 2025-05-18 07:54:29 UTC +++ gtk2/candwin/Makefile.am -@@ -4,24 +4,21 @@ libexec_PROGRAMS = uim-candwin-gtk uim-candwin-tbl-gtk +@@ -9,24 +9,21 @@ uim_candwin_gtk_SOURCES = gtk.c \ uim_candwin_gtk_SOURCES = gtk.c \ ../immodule/caret-state-indicator.c \ ../immodule/caret-state-indicator.h -uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_candwin_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir) + uim_candwin_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ uim_candwin_tbl_gtk_SOURCES = tbl-gtk.c \ ../immodule/caret-state-indicator.c \ ../immodule/caret-state-indicator.h -uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_candwin_tbl_gtk_CPPFLAGS = -I$(top_srcdir) + uim_candwin_tbl_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_tbl_gtk_CFLAGS = @GTK2_CFLAGS@ uim_candwin_horizontal_gtk_SOURCES = horizontal-gtk.c \ ../immodule/caret-state-indicator.c \ ../immodule/caret-state-indicator.h -uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la -lm +uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim -lm - uim_candwin_horizontal_gtk_CPPFLAGS = -I$(top_srcdir) + uim_candwin_horizontal_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_horizontal_gtk_CFLAGS = @GTK2_CFLAGS@ endif diff --git a/textproc/uim/files/patch-gtk2_immodule_Makefile.am b/textproc/uim/files/patch-gtk2_immodule_Makefile.am index ef57c8f1640d..19eb55d8de91 100644 --- a/textproc/uim/files/patch-gtk2_immodule_Makefile.am +++ b/textproc/uim/files/patch-gtk2_immodule_Makefile.am @@ -1,13 +1,13 @@ ---- gtk2/immodule/Makefile.am.orig 2021-04-29 16:18:54 UTC +--- gtk2/immodule/Makefile.am.orig 2025-05-18 06:24:43 UTC +++ gtk2/immodule/Makefile.am -@@ -12,9 +12,7 @@ module_LTLIBRARIES = $(im_uim_la) +@@ -17,9 +17,7 @@ im_uim_la_LDFLAGS = -module -avoid-version im_uim_la_SOURCES = $(IM_UIM_SOURCES) im_uim_la_LDFLAGS = -module -avoid-version -im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-counted-init.la +im_uim_la_LIBADD = -luim-scm -luim $(top_builddir)/uim/libuim-counted-init.la if LIBUIM_X_UTIL im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la endif diff --git a/textproc/uim/files/patch-gtk2_pad_Makefile.am b/textproc/uim/files/patch-gtk2_pad_Makefile.am index bc1e8cd65c93..8d4626e45826 100644 --- a/textproc/uim/files/patch-gtk2_pad_Makefile.am +++ b/textproc/uim/files/patch-gtk2_pad_Makefile.am @@ -1,12 +1,12 @@ ---- gtk2/pad/Makefile.am.orig 2021-04-29 15:53:36 UTC +--- gtk2/pad/Makefile.am.orig 2025-05-18 06:24:43 UTC +++ gtk2/pad/Makefile.am -@@ -2,8 +2,7 @@ if GTK2 +@@ -7,8 +7,7 @@ uim_input_pad_ja_SOURCES = ja.c bin_PROGRAMS = uim-input-pad-ja uim_input_pad_ja_SOURCES = ja.c -uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_input_pad_ja_CPPFLAGS = $(AM_CPPFLAGS) uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ endif diff --git a/textproc/uim/files/patch-gtk2_pref_Makefile.am b/textproc/uim/files/patch-gtk2_pref_Makefile.am index 30164eaf459b..33219942f9d6 100644 --- a/textproc/uim/files/patch-gtk2_pref_Makefile.am +++ b/textproc/uim/files/patch-gtk2_pref_Makefile.am @@ -1,13 +1,25 @@ ---- gtk2/pref/Makefile.am.orig 2021-04-29 15:56:45 UTC +--- gtk2/pref/Makefile.am.orig 2025-05-18 08:33:21 UTC +++ gtk2/pref/Makefile.am -@@ -9,9 +9,7 @@ uim_pref_gtk_SOURCES = gtk.c \ +@@ -1,7 +1,5 @@ helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" + helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" + +-if PREF +-if GTK2_4 + AM_CPPFLAGS = \ + -I$(top_builddir)/uim \ + -I$(top_srcdir)/replace \ +@@ -14,13 +12,9 @@ uim_pref_gtk_SOURCES = gtk.c \ gtk-keytab.h \ ../immodule/key-util-gtk.c \ ../immodule/key-util-gtk.h -uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_pref_gtk_LDADD = @GTK2_LIBS@ -luim-custom -luim-scm -luim if LIBUIM_X_UTIL uim_pref_gtk_LDADD += $(top_builddir)/uim/libuim-x-util.la endif + uim_pref_gtk_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) + uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ +-endif +-endif diff --git a/textproc/uim/files/patch-gtk2_switcher_Makefile.am b/textproc/uim/files/patch-gtk2_switcher_Makefile.am index f4915bbaa3b5..0e3a8557347e 100644 --- a/textproc/uim/files/patch-gtk2_switcher_Makefile.am +++ b/textproc/uim/files/patch-gtk2_switcher_Makefile.am @@ -1,14 +1,14 @@ ---- gtk2/switcher/Makefile.am.orig 2021-04-29 15:59:54 UTC +--- gtk2/switcher/Makefile.am.orig 2025-05-18 07:34:02 UTC +++ gtk2/switcher/Makefile.am -@@ -2,10 +2,7 @@ if GTK2 +@@ -7,10 +7,7 @@ uim_im_switcher_gtk_SOURCES = gtk.c bin_PROGRAMS = uim-im-switcher-gtk uim_im_switcher_gtk_SOURCES = gtk.c -uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim-custom -luim - uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_im_switcher_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ endif diff --git a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am index 639b1596ee6e..412e7352e752 100644 --- a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am @@ -1,34 +1,34 @@ ---- gtk2/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +--- gtk2/toolbar/Makefile.am.orig 2025-05-18 07:36:36 UTC +++ gtk2/toolbar/Makefile.am -@@ -6,9 +6,7 @@ if GNOME_APPLET +@@ -11,9 +11,7 @@ uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_L libexec_PROGRAMS = uim-toolbar-applet uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_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_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_applet_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@ if GCC -@@ -45,9 +43,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray +@@ -50,9 +48,7 @@ uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk endif 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_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -@@ -55,8 +51,6 @@ uim_toolbar_gtk_systray_SOURCES = systray-gtk.c commo +@@ -60,8 +56,6 @@ uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ eggtrayicon.c eggtrayicon.h 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_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_dict_Makefile.am b/textproc/uim/files/patch-gtk3_dict_Makefile.am index 2069d023d223..2f75340e9cba 100644 --- a/textproc/uim/files/patch-gtk3_dict_Makefile.am +++ b/textproc/uim/files/patch-gtk3_dict_Makefile.am @@ -1,12 +1,12 @@ ---- gtk3/dict/Makefile.am.orig 2021-04-29 13:55:45 UTC +--- gtk3/dict/Makefile.am.orig 2025-05-18 07:39:28 UTC +++ gtk3/dict/Makefile.am -@@ -19,8 +19,7 @@ uim_dict_gtk3_SOURCES = ../../gtk2/dict/main-gtk.c \ - ../../gtk2/dict/cclass-dialog.c \ - ../../gtk2/dict/cclass-dialog.h - +@@ -26,8 +26,7 @@ uim_dict_gtk3_SOURCES = main-gtk.c \ + cclass-dialog.c \ + cclass-dialog.h + -uim_dict_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_dict_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim - uim_dict_gtk3_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + uim_dict_gtk3_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) uim_dict_gtk3_CFLAGS = @GTK3_CFLAGS@ uim_dict_uidir = $(datadir)/uim/helperdata diff --git a/textproc/uim/files/patch-gtk3_immodule_Makefile.am b/textproc/uim/files/patch-gtk3_immodule_Makefile.am index e9db25d1594f..af7ee1a98c27 100644 --- a/textproc/uim/files/patch-gtk3_immodule_Makefile.am +++ b/textproc/uim/files/patch-gtk3_immodule_Makefile.am @@ -1,13 +1,13 @@ ---- gtk3/immodule/Makefile.am.orig 2021-04-30 14:45:56 UTC +--- gtk3/immodule/Makefile.am.orig 2025-05-18 07:40:15 UTC +++ gtk3/immodule/Makefile.am -@@ -11,9 +11,7 @@ module_LTLIBRARIES = $(im_uim_la) +@@ -16,9 +16,7 @@ im_uim_la_LDFLAGS = -module -avoid-version im_uim_la_SOURCES = $(IM_UIM_SOURCES) im_uim_la_LDFLAGS = -module -avoid-version -im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-counted-init.la +im_uim_la_LIBADD = -luim-scm -luim $(top_builddir)/uim/libuim-counted-init.la if LIBUIM_X_UTIL im_uim_la_LIBADD += $(top_builddir)/uim/libuim-x-util.la endif diff --git a/textproc/uim/files/patch-gtk3_pad_Makefile.am b/textproc/uim/files/patch-gtk3_pad_Makefile.am index eb73f0a1e568..30dda5d8bd34 100644 --- a/textproc/uim/files/patch-gtk3_pad_Makefile.am +++ b/textproc/uim/files/patch-gtk3_pad_Makefile.am @@ -1,12 +1,12 @@ ---- gtk3/pad/Makefile.am.orig 2021-04-30 14:51:47 UTC +--- gtk3/pad/Makefile.am.orig 2025-05-18 07:40:15 UTC +++ gtk3/pad/Makefile.am -@@ -1,8 +1,7 @@ - if GTK3 +@@ -6,8 +6,7 @@ uim_input_pad_ja_gtk3_SOURCES = ja.c + bin_PROGRAMS = uim-input-pad-ja-gtk3 - uim_input_pad_ja_gtk3_SOURCES = ../../gtk2/pad/ja.c + uim_input_pad_ja_gtk3_SOURCES = ja.c -uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim - uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_input_pad_ja_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_input_pad_ja_gtk3_CFLAGS = @GTK3_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_pref_Makefile.am b/textproc/uim/files/patch-gtk3_pref_Makefile.am index 9203590f85ab..38293b84fbcc 100644 --- a/textproc/uim/files/patch-gtk3_pref_Makefile.am +++ b/textproc/uim/files/patch-gtk3_pref_Makefile.am @@ -1,13 +1,13 @@ ---- gtk3/pref/Makefile.am.orig 2021-04-30 14:54:42 UTC +--- gtk3/pref/Makefile.am.orig 2025-05-18 07:41:20 UTC +++ gtk3/pref/Makefile.am -@@ -10,9 +10,7 @@ uim_pref_gtk3_SOURCES = ../../gtk2/pref/gtk.c \ - ../../gtk2/pref/gtk-keytab.h \ - ../../gtk2/immodule/key-util-gtk.c \ - ../../gtk2/immodule/key-util-gtk.h +@@ -14,9 +14,7 @@ uim_pref_gtk3_SOURCES = gtk.c \ + gtk-keytab.h \ + ../immodule/key-util-gtk.c \ + ../immodule/key-util-gtk.h -uim_pref_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_pref_gtk3_LDADD = @GTK3_LIBS@ -luim-custom -luim-scm -luim if LIBUIM_X_UTIL uim_pref_gtk3_LDADD += $(top_builddir)/uim/libuim-x-util.la endif diff --git a/textproc/uim/files/patch-gtk3_switcher_Makefile.am b/textproc/uim/files/patch-gtk3_switcher_Makefile.am index fcab2c96bd00..da5000fcaf1b 100644 --- a/textproc/uim/files/patch-gtk3_switcher_Makefile.am +++ b/textproc/uim/files/patch-gtk3_switcher_Makefile.am @@ -1,14 +1,14 @@ ---- gtk3/switcher/Makefile.am.orig 2021-04-30 14:58:08 UTC +--- gtk3/switcher/Makefile.am.orig 2025-05-18 07:42:28 UTC +++ gtk3/switcher/Makefile.am -@@ -1,10 +1,7 @@ - if GTK3 +@@ -6,10 +6,7 @@ uim_im_switcher_gtk3_SOURCES = gtk.c + bin_PROGRAMS = uim-im-switcher-gtk3 - uim_im_switcher_gtk3_SOURCES = ../../gtk2/switcher/gtk.c + uim_im_switcher_gtk3_SOURCES = gtk.c -uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim-custom -luim-scm -luim - uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_im_switcher_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_im_switcher_gtk3_CFLAGS = @GTK3_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am index a946771304b2..ccb71767c39d 100644 --- a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am @@ -1,35 +1,35 @@ ---- gtk3/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +--- gtk3/toolbar/Makefile.am.orig 2025-05-18 07:43:25 UTC +++ gtk3/toolbar/Makefile.am -@@ -11,9 +11,7 @@ xmluidir = $(pkgdatadir)/ui +@@ -16,9 +16,7 @@ libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @ xmlui_DATA = uim-applet-menu.xml libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @GNOME3_APPLET_LIBS@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom libuim_toolbar_applet_gnome3_la_CPPFLAGS = \ -DUIM_UIDATADIR="\"${xmluidir}\"" \ - $(helper_defs) -I$(top_srcdir) -I$(top_builddir) -@@ -52,9 +50,7 @@ if GTK3 + $(helper_defs) $(AM_CPPFLAGS) +@@ -55,9 +53,7 @@ uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gt + if GTK3 bin_PROGRAMS = uim-toolbar-gtk3 uim-toolbar-gtk3-systray - uim_toolbar_gtk3_SOURCES = ../../gtk2/toolbar/standalone-gtk.c \ - ../../gtk2/toolbar/common-gtk.c + uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gtk.c -uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim -luim-custom - uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -64,9 +60,7 @@ uim_toolbar_gtk3_systray_SOURCES = ../../gtk2/toolbar - ../../gtk2/toolbar/eggtrayicon.h +@@ -67,9 +63,7 @@ uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ + eggtrayicon.h uim_toolbar_gtk3_systray_LDADD = @GTK3_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_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk3_systray_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_systray_CFLAGS = @GTK3_CFLAGS@ endif diff --git a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt index 03283e10d33e..fedfa33d5735 100644 --- a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt +++ b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt @@ -1,13 +1,13 @@ ---- qt5/applet/qtquick-plugin/CMakeLists.txt.orig 2021-04-30 17:45:18 UTC +--- qt5/applet/qtquick-plugin/CMakeLists.txt.orig 2025-05-16 13:44:13 UTC +++ qt5/applet/qtquick-plugin/CMakeLists.txt -@@ -40,8 +40,8 @@ target_compile_options( +@@ -47,8 +47,8 @@ target_link_libraries( target_link_libraries( uim-qtquick-plugin PRIVATE - ${CMAKE_BINARY_DIR}/../../uim/.libs/libuim.so - ${CMAKE_BINARY_DIR}/../../uim/.libs/libuim-scm.so + -luim + -luim-scm Qt5::Core Qt5::Quick Qt5::Qml diff --git a/textproc/uim/files/patch-scm_predict-custom.scm b/textproc/uim/files/patch-scm_predict-custom.scm index c7dd90b79d55..273b1d66a939 100644 --- a/textproc/uim/files/patch-scm_predict-custom.scm +++ b/textproc/uim/files/patch-scm_predict-custom.scm @@ -1,11 +1,11 @@ ---- scm/predict-custom.scm.orig 2025-02-23 08:00:09 UTC +--- scm/predict-custom.scm.orig 2025-05-16 13:44:13 UTC +++ scm/predict-custom.scm @@ -110,7 +110,7 @@ (N_ "Look-SKK prediction") (N_ "long description will be here.")) -(define-custom 'predict-custom-look-skk-jisyo "/usr/share/skk/SKK-JISYO.L" -+(define-custom 'predict-custom-look-skk-jisyo "%PREFIX%/share/skk/SKK-JISYO.L" ++(define-custom 'predict-custom-look-skk-jisyo "/usr/local/share/skk/SKK-JISYO.L" '(predict predict-look-skk) '(pathname regular-file) (N_ "Sorted SKK-JISYO dictionary file") diff --git a/textproc/uim/files/patch-scm_predict-look-skk.scm b/textproc/uim/files/patch-scm_predict-look-skk.scm index 6a7726d76a4b..3c31b9d9774c 100644 --- a/textproc/uim/files/patch-scm_predict-look-skk.scm +++ b/textproc/uim/files/patch-scm_predict-look-skk.scm @@ -1,11 +1,11 @@ ---- scm/predict-look-skk.scm.orig 2025-02-23 08:00:09 UTC +--- scm/predict-look-skk.scm.orig 2025-05-16 13:44:13 UTC +++ scm/predict-look-skk.scm @@ -37,7 +37,7 @@ (define-class predict-look-skk predict '((limit 10) - (jisyo "/usr/share/skk/SKK-JISYO.L")) ;; SKK-JISYO -+ (jisyo "%PREFIX%/share/skk/SKK-JISYO.L")) ;; SKK-JISYO ++ (jisyo "/usr/local/share/skk/SKK-JISYO.L")) ;; SKK-JISYO '(search)) (class-set-method! predict-look-skk search diff --git a/textproc/uim/files/patch-uim_Makefile.am b/textproc/uim/files/patch-uim_Makefile.am index 16bbd52e6da2..2d9fb25b4f06 100644 --- a/textproc/uim/files/patch-uim_Makefile.am +++ b/textproc/uim/files/patch-uim_Makefile.am @@ -1,29 +1,29 @@ ---- uim/Makefile.am.orig 2021-04-29 13:46:21 UTC +--- uim/Makefile.am.orig 2025-05-18 07:54:29 UTC +++ uim/Makefile.am -@@ -81,7 +81,7 @@ libuim_custom_la_SOURCES = uim-custom.c +@@ -86,7 +86,7 @@ if M17NLIB if M17NLIB uim_plugin_LTLIBRARIES += libuim-m17nlib.la libuim_m17nlib_la_SOURCES = m17nlib.c - libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la + libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim-scm -luim libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module - libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@ + libuim_m17nlib_la_CPPFLAGS = $(AM_CPPFLAGS) @M17NLIB_CFLAGS@ endif -@@ -100,7 +100,7 @@ if ENABLE_ANTHY_STATIC +@@ -105,7 +105,7 @@ else else uim_plugin_LTLIBRARIES += libuim-anthy.la libuim_anthy_la_SOURCES = anthy.c - libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la + libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim-scm -luim libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module - libuim_anthy_la_CPPFLAGS = -I$(top_srcdir) + libuim_anthy_la_CPPFLAGS = $(AM_CPPFLAGS) endif -@@ -112,7 +112,7 @@ if ENABLE_ANTHY_UTF8_STATIC +@@ -117,7 +117,7 @@ else else uim_plugin_LTLIBRARIES += libuim-anthy-utf8.la libuim_anthy_utf8_la_SOURCES = anthy-utf8.c - libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la + libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ -luim-scm -luim libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module - libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@ + libuim_anthy_utf8_la_CPPFLAGS = $(AM_CPPFLAGS) @ANTHY_UTF8_CFLAGS@ endif