mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00
Code Issues Releases Activity

- Add gtk-query-immodules to _FORCE_POST_PATTERNS to run it post-deinstall

Browse Source 
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)
This commit is contained in:
Antoine Brodin 2013-06-17 16:18:54 +00:00
parent f6a50930ca
commit 82b690f55a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=321140
15 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mk/bsd.pkgng.mk
View File

@ -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 \

4
chinese/fcitx/Makefile
View File

@ -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}

8
chinese/fcitx/pkg-plist
View File

@ -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

2
chinese/gcin/Makefile
View File

@ -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}\'

4
chinese/gcin/pkg-plist
View File

@ -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

2
chinese/oxim/Makefile
View File

@ -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}

4
chinese/oxim/pkg-plist
View File

@ -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

2
chinese/wenju/Makefile
View File

@ -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>

4
chinese/wenju/pkg-plist
View File

@ -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

4
textproc/ibus/Makefile
View File

@ -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}

8
textproc/ibus/pkg-plist
View File

@ -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

2
textproc/scim/Makefile
View File

@ -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}

4
textproc/scim/pkg-plist
View File

@ -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

4
textproc/uim-gtk/pkg-plist
View File

@ -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

4
textproc/uim-gtk3/pkg-plist
View File

@ -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