aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.pkgng.mk1
-rw-r--r--chinese/fcitx/Makefile4
-rw-r--r--chinese/fcitx/pkg-plist8
-rw-r--r--chinese/gcin/Makefile2
-rw-r--r--chinese/gcin/pkg-plist4
-rw-r--r--chinese/oxim/Makefile2
-rw-r--r--chinese/oxim/pkg-plist4
-rw-r--r--chinese/wenju/Makefile2
-rw-r--r--chinese/wenju/pkg-plist4
-rw-r--r--textproc/ibus/Makefile4
-rw-r--r--textproc/ibus/pkg-plist8
-rw-r--r--textproc/scim/Makefile2
-rw-r--r--textproc/scim/pkg-plist4
-rw-r--r--textproc/uim-gtk/pkg-plist4
-rw-r--r--textproc/uim-gtk3/pkg-plist4
15 files changed, 29 insertions, 28 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk
index f309bbf5a74a..51001c8138e1 100644
--- a/Mk/bsd.pkgng.mk
+++ b/Mk/bsd.pkgng.mk
@@ -20,6 +20,7 @@ PKGUPGRADE?= ${PKGDIR}/pkg-upgrade
_FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \
fonts.dir fonts.scale gtk-update-icon-cache \
gio-querymodules \
+ gtk-query-immodules \
ldconfig \
load-octave-pkg \
update-desktop-database update-mime-database \
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 3f3e9b2c526a..6e98433f8fba 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -113,10 +113,10 @@ EXTRA_PATCHES+= ${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \
post-install:
.if ${PORT_OPTIONS:MGTK2}
- -gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
+ -${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
.endif
.if ${PORT_OPTIONS:MGTK3}
- -gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
+ -${LOCALBASE}/bin/gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
.endif
@${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 8b32a2a06523..19dc2a4f8f11 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -86,11 +86,11 @@ lib/libfcitx-utils.so.0.1
lib/girepository-1.0/Fcitx-1.0.typelib
share/gir-1.0/Fcitx-1.0.gir
%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
-%%GTK2%%@exec gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules
-%%GTK2%%@unexec gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %%LOCALBASE%%/etc/gtk-2.0/gtk.immodules
%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
-%%GTK3%%@exec gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
-%%GTK3%%@unexec gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
%%QT4%%lib/qt4/plugins/inputmethods/libqtim-fcitx.so
%%QT4%%@dirrmtry lib/qt4/plugins/inputmethods
%%QT4%%@dirrmtry lib/qt4/plugins
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 30e8167df241..3b6ec438a1a2 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -115,7 +115,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif
- @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+ @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
@${CAT} ${PKGMESSAGE}
@${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\'
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 4ac3d87f9bcf..f1145dff5605 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -154,5 +154,5 @@ share/icons/gcin.png
@dirrmtry lib/gtk-2.0/immodules
@dirrmtry lib/gtk-2.0
@dirrm lib/gcin
-@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index 4db7827ca5ed..9f1e644a6f7b 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -84,7 +84,7 @@ post-patch:
post-install:
.if ${PORT_OPTIONS:MGTK2}
- @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+ @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
.endif
@${CAT} ${PKGMESSAGE}
@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
diff --git a/chinese/oxim/pkg-plist b/chinese/oxim/pkg-plist
index f8f5eb5a035d..62ddadf877ca 100644
--- a/chinese/oxim/pkg-plist
+++ b/chinese/oxim/pkg-plist
@@ -35,5 +35,5 @@ share/locale/zh_TW/LC_MESSAGES/oxim.mo
@dirrmtry share/locale/zh_HK
%%GTK2%%@dirrmtry lib/gtk-2.0/immodules
%%GTK2%%@dirrmtry lib/gtk-2.0
-%%GTK2%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-%%GTK2%%@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile
index c08491e53b61..d802c0e1dc11 100644
--- a/chinese/wenju/Makefile
+++ b/chinese/wenju/Makefile
@@ -31,6 +31,6 @@ PLIST_SUB+= NLS="@comment "
.endif
post-install:
- gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+ ${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
.include <bsd.port.mk>
diff --git a/chinese/wenju/pkg-plist b/chinese/wenju/pkg-plist
index c2f511414d65..0ab4ab888c3a 100644
--- a/chinese/wenju/pkg-plist
+++ b/chinese/wenju/pkg-plist
@@ -18,5 +18,5 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.so
%%DATADIR%%/wubi.tim
%%DATADIR%%/wubihua-n.tim
@dirrm %%DATADIR%%
-@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index fa261cfdaf60..3b03e4c851bc 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -97,9 +97,9 @@ post-install:
@${MKDIR} ${PREFIX}/etc/xdg/autostart
@${INSTALL_DATA} ${WRKSRC}/bus/ibus.desktop ${PREFIX}/etc/xdg/autostart
. if ${PORT_OPTIONS:MGTK3}
- @gtk-query-immodules-3.0 --update-cache
+ @${LOCALBASE}/bin/gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
. endif
- @gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
+ @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
@${CAT} ${PKGMESSAGE}
@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index 5dbefb2617ff..1c1b0a7cdaab 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -328,7 +328,7 @@ share/icons/hicolor/scalable/apps/ibus.svg
@dirrm include/ibus-1.0
@dirrmtry etc/xdg/autostart
@dirrmtry etc/xdg
-%%GTK3%%@exec gtk-query-immodules-3.0 --update-cache
-@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-%%GTK3%%@unexec gtk-query-immodules-3.0 --update-cache
-@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index f97b7f39b46a..8b4ab364a99f 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -36,7 +36,7 @@ post-patch:
${WRKSRC}/src/Makefile.in
post-install:
- @gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
+ @${LOCALBASE}/bin/gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
@${CAT} ${PKGMESSAGE}
@${ECHO} To display this message again, type ${PKG_INFO} -D ${PKGNAME}
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index 645cf62b7cf7..11804c6336a6 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -167,5 +167,5 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
@dirrmtry lib/scim-1.0/1.4.0
@dirrmtry lib/scim-1.0
@dirrmtry share/applications
-@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist
index 93c6650cdb02..dd0f28ed801d 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk/pkg-plist
@@ -6,5 +6,5 @@ bin/uim-toolbar-gtk-systray
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.a
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.la
lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so
-@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
diff --git a/textproc/uim-gtk3/pkg-plist b/textproc/uim-gtk3/pkg-plist
index d7c939742315..f1e5b16e5b0e 100644
--- a/textproc/uim-gtk3/pkg-plist
+++ b/textproc/uim-gtk3/pkg-plist
@@ -9,5 +9,5 @@ lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-uim.so
libexec/uim-candwin-gtk3
libexec/uim-candwin-horizontal-gtk3
libexec/uim-candwin-tbl-gtk3
-@exec gtk-query-immodules-3.0 > %D/etc/gtk-3.0/gtk.immodules
-@unexec gtk-query-immodules-3.0 > %D/etc/gtk-3.0/gtk.immodules
+@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
+@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
generated by cgit (git 2.34.1) at 2024-11-05 16:24:16 +0800