diff options
author | Antoine Brodin <antoine@FreeBSD.org> | 2013-06-17 16:18:54 +0000 |
---|---|---|
committer | Antoine Brodin <antoine@FreeBSD.org> | 2013-06-17 16:18:54 +0000 |
commit | 82b690f55a59a36c3a112b926b13925023654223 (patch) | |
tree | 4f8b33d01c93e53d99fce1d74a38960934863f15 /chinese | |
parent | f6a50930ca340dbd0ec810d8961f09a35bdd58b5 (diff) | |
download | ports-82b690f55a59a36c3a112b926b13925023654223.tar.gz ports-82b690f55a59a36c3a112b926b13925023654223.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)
Notes
Notes:
svn path=/head/; revision=321140
Diffstat (limited to 'chinese')
-rw-r--r-- | chinese/fcitx/Makefile | 4 | ||||
-rw-r--r-- | chinese/fcitx/pkg-plist | 8 | ||||
-rw-r--r-- | chinese/gcin/Makefile | 2 | ||||
-rw-r--r-- | chinese/gcin/pkg-plist | 4 | ||||
-rw-r--r-- | chinese/oxim/Makefile | 2 | ||||
-rw-r--r-- | chinese/oxim/pkg-plist | 4 | ||||
-rw-r--r-- | chinese/wenju/Makefile | 2 | ||||
-rw-r--r-- | chinese/wenju/pkg-plist | 4 |
8 files changed, 15 insertions, 15 deletions
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 |