aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2013-06-18 00:18:54 +0800
committerantoine <antoine@FreeBSD.org>2013-06-18 00:18:54 +0800
commit72fe46771cf0d99241301abb12d75c4417f82a0e (patch)
tree4f8b33d01c93e53d99fce1d74a38960934863f15 /textproc
parentc75f3526e9ba73b22ed75af73a1ed915aeb5a029 (diff)
downloadfreebsd-ports-gnome-72fe46771cf0d99241301abb12d75c4417f82a0e.tar.gz
freebsd-ports-gnome-72fe46771cf0d99241301abb12d75c4417f82a0e.tar.zst
freebsd-ports-gnome-72fe46771cf0d99241301abb12d75c4417f82a0e.zip
- Add gtk-query-immodules to _FORCE_POST_PATTERNS to run it post-deinstall
with pkg - Consistently use full path when running gtk-query-immodules as the path is embedded in output (we prefer reproducible output) This fixes leftovers reported by poudriere ====>> Files or directories modified: etc/gtk-2.0/gtk.immodules PR: ports/179230 Approved by: portmgr (bapt)
Diffstat (limited to 'textproc')
-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
6 files changed, 13 insertions, 13 deletions
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