18 files changed, 39 insertions, 44 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 6d6fc75ad64c..7cf33eee2c3e 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -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)
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index a0dbb46ce7b3..e2d44224d18f 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -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
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 471a228e9992..1df6bb303327 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -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
diff --git a/chinese/oxim/pkg-plist b/chinese/oxim/pkg-plist
index 4539ab32ec83..55b05d480c40 100644
--- a/chinese/oxim/pkg-plist
+++ b/chinese/oxim/pkg-plist
@@ -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
diff --git a/chinese/wenju/pkg-plist b/chinese/wenju/pkg-plist
index abb5347b77b5..c3155ed010c1 100644
--- a/chinese/wenju/pkg-plist
+++ b/chinese/wenju/pkg-plist
@@ -16,5 +16,5 @@ lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-tim.so
 %%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
diff --git a/graphics/gdk-pixbuf2/pkg-plist b/graphics/gdk-pixbuf2/pkg-plist
index 58495853211d..b4f34b1568e0 100644
--- a/graphics/gdk-pixbuf2/pkg-plist
+++ b/graphics/gdk-pixbuf2/pkg-plist
@@ -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
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index bd2c287f1c31..7db7a24db701 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -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
diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist
index cff71d431886..9b314fa2d1c2 100644
--- a/japanese/im-ja/pkg-plist
+++ b/japanese/im-ja/pkg-plist
@@ -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
diff --git a/korean/imhangul/pkg-plist b/korean/imhangul/pkg-plist
index 360911f5a8c6..f69e08a6d528 100644
--- a/korean/imhangul/pkg-plist
+++ b/korean/imhangul/pkg-plist
@@ -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
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index c88e662415b7..826418bff13f 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -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.bash
 %%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
diff --git a/textproc/linux-f10-scim-gtk/pkg-plist b/textproc/linux-f10-scim-gtk/pkg-plist
index 8ca7ceb08933..8f84724370d0 100644
--- a/textproc/linux-f10-scim-gtk/pkg-plist
+++ b/textproc/linux-f10-scim-gtk/pkg-plist
@@ -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
diff --git a/textproc/linux-f10-scim-libs/pkg-plist b/textproc/linux-f10-scim-libs/pkg-plist
index 8ac4ca18f30a..108fc96f8c7d 100644
--- a/textproc/linux-f10-scim-libs/pkg-plist
+++ b/textproc/linux-f10-scim-libs/pkg-plist
@@ -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
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index b7cb49d8d302..05ffe99dc8da 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -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
diff --git a/textproc/uim-gtk/pkg-plist b/textproc/uim-gtk/pkg-plist
index 773c01400da6..8336f64cefac 100644
--- a/textproc/uim-gtk/pkg-plist
+++ b/textproc/uim-gtk/pkg-plist
@@ -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
diff --git a/textproc/uim-gtk3/pkg-plist b/textproc/uim-gtk3/pkg-plist
index 7b6f25c91b3b..e0dd6b760136 100644
--- a/textproc/uim-gtk3/pkg-plist
+++ b/textproc/uim-gtk3/pkg-plist
@@ -7,5 +7,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 %%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
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index a7fa876778b5..a8b2a2d91e7d 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -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
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 8125c8454c6b..e4f59d3beec8 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -682,7 +682,7 @@ share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo
 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
diff --git a/x11-toolkits/linux-f10-gtk2/pkg-plist b/x11-toolkits/linux-f10-gtk2/pkg-plist
index 8a29d61fbb5c..d6b6b5f69041 100644
--- a/x11-toolkits/linux-f10-gtk2/pkg-plist
+++ b/x11-toolkits/linux-f10-gtk2/pkg-plist
@@ -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