Date: Sat, 26 Sep 2015 00:08:27 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397909 - in head: Mk chinese/fcitx chinese/gcin chinese/oxim chinese/wenju graphics/gdk-pixbuf2 graphics/librsvg2 japanese/im-ja korean/imhangul textproc/ibus textproc/linux-f10-scim-g... Message-ID: <201509260008.t8Q08Rib024578@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Sep 26 00:08:26 2015 New Revision: 397909 URL: https://svnweb.freebsd.org/changeset/ports/397909 Log: Specify correctly @post* for gtk-query-immodules Modified: head/Mk/bsd.port.mk head/chinese/fcitx/pkg-plist head/chinese/gcin/pkg-plist head/chinese/oxim/pkg-plist head/chinese/wenju/pkg-plist head/graphics/gdk-pixbuf2/pkg-plist head/graphics/librsvg2/pkg-plist head/japanese/im-ja/pkg-plist head/korean/imhangul/pkg-plist head/textproc/ibus/pkg-plist head/textproc/linux-f10-scim-gtk/pkg-plist head/textproc/linux-f10-scim-libs/pkg-plist head/textproc/scim/pkg-plist head/textproc/uim-gtk/pkg-plist head/textproc/uim-gtk3/pkg-plist head/x11-toolkits/gtk20/pkg-plist head/x11-toolkits/gtk30/pkg-plist head/x11-toolkits/linux-f10-gtk2/pkg-plist Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Fri Sep 25 23:52:09 2015 (r397908) +++ head/Mk/bsd.port.mk Sat Sep 26 00:08:26 2015 (r397909) @@ -1815,12 +1815,9 @@ PKGUPGRADE?= ${PKGDIR}/pkg-upgrade _FORCE_POST_PATTERNS= rmdir fc-cache \ fonts.dir fonts.scale gtk-update-icon-cache \ - gtk-query-immodules \ load-octave-pkg \ ocamlfind \ update-desktop-database update-mime-database \ - gdk-pixbuf-query-loaders catalog.ports \ - glib-compile-schemas \ ccache-update-links .if defined(USE_LOCAL_MK) Modified: head/chinese/fcitx/pkg-plist ============================================================================== --- head/chinese/fcitx/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/chinese/fcitx/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -117,11 +117,11 @@ lib/fcitx/libexec/fcitx-scanner %%QT4%%lib/fcitx/qt/libfcitx-quickphrase-editor.so lib/girepository-1.0/Fcitx-1.0.typelib %%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so -%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +%%GTK2%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +%%GTK2%%@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache %%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so -%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache -%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache +%%GTK3%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache +%%GTK3%%@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache %%QT4%%lib/qt4/plugins/inputmethods/qtim-fcitx.so lib/libfcitx-config.so lib/libfcitx-config.so.4 Modified: head/chinese/gcin/pkg-plist ============================================================================== --- head/chinese/gcin/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/chinese/gcin/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -169,5 +169,5 @@ share/icons/gcin/vocabulary.png share/icons/gcin/wm2.png share/icons/gcin/wubi.png share/icons/hicolor/64x64/apps/gcin.png -@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache Modified: head/chinese/oxim/pkg-plist ============================================================================== --- head/chinese/oxim/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/chinese/oxim/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -22,5 +22,5 @@ man/man1/oxim.1.gz share/locale/zh_CN/LC_MESSAGES/oxim.mo share/locale/zh_HK/LC_MESSAGES/oxim.mo share/locale/zh_TW/LC_MESSAGES/oxim.mo -%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +%%GTK2%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +%%GTK2%%@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache Modified: head/chinese/wenju/pkg-plist ============================================================================== --- head/chinese/wenju/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/chinese/wenju/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -16,5 +16,5 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/i %%DATADIR%%/shengdiao.tim %%DATADIR%%/wubi.tim %%DATADIR%%/wubihua-n.tim -@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache Modified: head/graphics/gdk-pixbuf2/pkg-plist ============================================================================== --- head/graphics/gdk-pixbuf2/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/graphics/gdk-pixbuf2/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -149,5 +149,5 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo -@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@unexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true +@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true +@postunexec rm %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>&1 >/dev/null || true Modified: head/graphics/librsvg2/pkg-plist ============================================================================== --- head/graphics/librsvg2/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/graphics/librsvg2/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -42,5 +42,5 @@ share/doc/rsvg-2.0/style.css share/doc/rsvg-2.0/up-insensitive.png share/doc/rsvg-2.0/up.png share/gir-1.0/Rsvg-2.0.gir -@exec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true -@unexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true +@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true +@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true Modified: head/japanese/im-ja/pkg-plist ============================================================================== --- head/japanese/im-ja/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/japanese/im-ja/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -40,5 +40,5 @@ share/locale/de/LC_MESSAGES/im-ja.mo share/locale/es/LC_MESSAGES/im-ja.mo share/locale/hu/LC_MESSAGES/im-ja.mo share/locale/ja/LC_MESSAGES/im-ja.mo -@exec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 --update-cache; fi -@unexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 --update-cache; fi +@postexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 --update-cache; fi +@postunexec if [ -f %D/bin/gtk-query-immodules-2.0 ]; then %D/bin/gtk-query-immodules-2.0 --update-cache; fi Modified: head/korean/imhangul/pkg-plist ============================================================================== --- head/korean/imhangul/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/korean/imhangul/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -1,5 +1,5 @@ lib/gtk-%%GTKVER%%/immodules/im-hangul.so %%NO_GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo %%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-%%GTKVER%%.mo -@exec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache -@unexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache +@postexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache +@postunexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache Modified: head/textproc/ibus/pkg-plist ============================================================================== --- head/textproc/ibus/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/textproc/ibus/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -3,8 +3,8 @@ bin/ibus-setup bin/ibus etc/xdg/autostart/ibus.desktop %%DCONF%%etc/dconf/db/ibus.d/00-upstream-settings -%%DCONF%%@unexec rm -f %D/etc/dconf/db/ibus -%%DCONF%%@exec dconf update +%%DCONF%%@postunexec rm -f %D/etc/dconf/db/ibus +%%DCONF%%@postexec dconf update %%DCONF%%etc/dconf/profile/ibus include/ibus-1.0/ibus.h include/ibus-1.0/ibusattribute.h @@ -323,7 +323,7 @@ share/bash-completion/completions/ibus.b %%PYTHON_LIB%%@dir %%PYTHON_SITELIBDIR%%/ibus @dir include/ibus-1.0 %%DCONF%%@dir etc/dconf/db/ibus.d -%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache -%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache -%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +%%GTK3%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache +%%GTK2%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +%%GTK3%%@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache +%%GTK2%%@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache Modified: head/textproc/linux-f10-scim-gtk/pkg-plist ============================================================================== --- head/textproc/linux-f10-scim-gtk/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/textproc/linux-f10-scim-gtk/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -1,4 +1,3 @@ -@comment file listing usr/lib/gtk-2.0/immodules/im-scim.so -@exec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules -@unexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules +@postexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules +@postunexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules Modified: head/textproc/linux-f10-scim-libs/pkg-plist ============================================================================== --- head/textproc/linux-f10-scim-libs/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/textproc/linux-f10-scim-libs/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -8,5 +8,5 @@ usr/lib/libscim-x11utils-1.0.so.8.2.3 usr/lib/scim-1.0/1.4.0/Config/simple.so usr/lib/scim-1.0/1.4.0/Config/socket.so usr/lib/scim-1.0/1.4.0/IMEngine/socket.so -@exec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules -@unexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules +@postexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules +@postunexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules Modified: head/textproc/scim/pkg-plist ============================================================================== --- head/textproc/scim/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/textproc/scim/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -154,5 +154,5 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo @dirrmtry lib/scim-1.0/1.4.0/SetupUI @dirrmtry lib/scim-1.0/1.4.0 @dirrmtry lib/scim-1.0 -@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache Modified: head/textproc/uim-gtk/pkg-plist ============================================================================== --- head/textproc/uim-gtk/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/textproc/uim-gtk/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -4,5 +4,5 @@ bin/uim-pref-gtk bin/uim-toolbar-gtk bin/uim-toolbar-gtk-systray lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-uim.so -@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache -@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache +@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache Modified: head/textproc/uim-gtk3/pkg-plist ============================================================================== --- head/textproc/uim-gtk3/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/textproc/uim-gtk3/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -7,5 +7,5 @@ lib/gtk-3.0/%%GTK3_VERSION%%/immodules/i libexec/uim-candwin-gtk3 libexec/uim-candwin-horizontal-gtk3 libexec/uim-candwin-tbl-gtk3 -@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 +@postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache +@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache Modified: head/x11-toolkits/gtk20/pkg-plist ============================================================================== --- head/x11-toolkits/gtk20/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/x11-toolkits/gtk20/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -566,10 +566,10 @@ share/locale/zh_TW/LC_MESSAGES/gtk20.mo share/themes/Default/gtk-2.0-key/gtkrc share/themes/Emacs/gtk-2.0-key/gtkrc share/themes/Raleigh/gtk-2.0/gtkrc -@exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true +@postexec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @unexec /bin/rm -f %D/lib/gtk-2.0/%%GTK2_VERSION%%/immodules.cache -@exec %D/bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 || /usr/bin/true +@postexec %D/bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 || /usr/bin/true @dir lib/gtk-2.0/modules @dir lib/gtk-2.0/%%GTK2_VERSION%%/printbackends @dir lib/gtk-2.0/%%GTK2_VERSION%%/modules Modified: head/x11-toolkits/gtk30/pkg-plist ============================================================================== --- head/x11-toolkits/gtk30/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/x11-toolkits/gtk30/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -682,7 +682,7 @@ share/locale/zh_TW/LC_MESSAGES/gtk30-pro share/locale/zh_TW/LC_MESSAGES/gtk30.mo share/themes/Default/gtk-3.0/gtk-keys.css share/themes/Emacs/gtk-3.0/gtk-keys.css -@exec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true +@postexec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true @rmtry lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache @exec /bin/mkdir -p %D/lib/gtk-3.0/modules @exec /bin/mkdir -p %D/lib/gtk-3.0/%%GTK3_VERSION%%/engines Modified: head/x11-toolkits/linux-f10-gtk2/pkg-plist ============================================================================== --- head/x11-toolkits/linux-f10-gtk2/pkg-plist Fri Sep 25 23:52:09 2015 (r397908) +++ head/x11-toolkits/linux-f10-gtk2/pkg-plist Sat Sep 26 00:08:26 2015 (r397909) @@ -1,4 +1,3 @@ -@comment file listing etc/gtk-2.0/im-multipress.conf @unexec rm %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules @unexec rm %D/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders @@ -308,5 +307,5 @@ usr/share/themes/Xfce/gtk-2.0/gtkrc @dir etc/gtk-2.0/i386-redhat-linux-gnu @dir usr/lib/gtk-2.0/2.10.0/filesystems @dir usr/lib/gtk-2.0/modules -@exec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules -@exec chroot %D /usr/bin/gdk-pixbuf-query-loaders-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders +@postexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules +@postexec chroot %D /usr/bin/gdk-pixbuf-query-loaders-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509260008.t8Q08Rib024578>