Add standard immodules and generate immodules.cache on package installation.

5 files changed, 50 insertions, 26 deletions

diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index 9895dd5b2dc1..3c657f8bf03d 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	2.24.23
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
 DISTFILES=	#
 LIB_DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
+		${PORTNAME}-immodules-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
 		${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm
 
 MAINTAINER=	emulation@FreeBSD.org
diff --git a/x11-toolkits/linux-c6-gtk2/distinfo.i386 b/x11-toolkits/linux-c6-gtk2/distinfo.i386
index acdc70f650a4..83fb47ba5ecd 100644
--- a/x11-toolkits/linux-c6-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-c6-gtk2/distinfo.i386
@@ -1,15 +1,9 @@
-TIMESTAMP = 1466250284
+TIMESTAMP = 1470339510
 SHA256 (rpm/i686/centos/6.8/gtk2-2.24.23-8.el6.i686.rpm) = e0781bc8fa9e1e7f10f8cd5fa2a0bd3a1dfc78297ae1ea4de2fdda77c1c64eba
 SIZE (rpm/i686/centos/6.8/gtk2-2.24.23-8.el6.i686.rpm) = 3336132
+SHA256 (rpm/i686/centos/6.8/gtk2-immodules-2.24.23-8.el6.i686.rpm) = 7396cc72b70b3f4efe989639cff506e0c6aa014287d79f29c468df4492a1b121
+SIZE (rpm/i686/centos/6.8/gtk2-immodules-2.24.23-8.el6.i686.rpm) = 71444
 SHA256 (rpm/i686/centos/6.8/gtk2-engines-2.18.4-5.el6.centos.i686.rpm) = 33ecb6ade9ff52e2c924c13db849f4b955f9bddd21225717bf2874a4a86575d8
 SIZE (rpm/i686/centos/6.8/gtk2-engines-2.18.4-5.el6.centos.i686.rpm) = 281788
-SHA256 (rpm/i686/centos/6.8/pixman-0.32.8-1.el6.i686.rpm) = da1b43c3836f98229b704eda5aaf3f2b9b4e93ab0e23a905ac449e62c4d604f7
-SIZE (rpm/i686/centos/6.8/pixman-0.32.8-1.el6.i686.rpm) = 239560
-SHA256 (rpm/i686/centos/6.8/jasper-libs-1.900.1-16.el6_6.3.i686.rpm) = 867485f066f16b8d4067771a01f6f8c60dda135f27c5a6441b2089d8e9255533
-SIZE (rpm/i686/centos/6.8/jasper-libs-1.900.1-16.el6_6.3.i686.rpm) = 140456
 SHA256 (rpm/i686/centos/6.8/gtk2-2.24.23-8.el6.src.rpm) = 25525b49a85420db94e627b08eb134281e48c97a5847f8d1d8c6463c769295cb
 SIZE (rpm/i686/centos/6.8/gtk2-2.24.23-8.el6.src.rpm) = 13728324
-SHA256 (rpm/i686/centos/6.8/pixman-0.32.8-1.el6.src.rpm) = d129fb1fd8a2bfe7d7337daf46b76a48b1c68ee97e362e1224839c871e70f66f
-SIZE (rpm/i686/centos/6.8/pixman-0.32.8-1.el6.src.rpm) = 710121
-SHA256 (rpm/i686/centos/6.8/jasper-1.900.1-16.el6_6.3.src.rpm) = 28ef9fb9cc889fc9f43cd360125de42994829a92c5ede0b3d82dc9e0159f4605
-SIZE (rpm/i686/centos/6.8/jasper-1.900.1-16.el6_6.3.src.rpm) = 1404135
diff --git a/x11-toolkits/linux-c6-gtk2/distinfo.x86_64 b/x11-toolkits/linux-c6-gtk2/distinfo.x86_64
index e49b6207dc08..7f389243b4db 100644
--- a/x11-toolkits/linux-c6-gtk2/distinfo.x86_64
+++ b/x11-toolkits/linux-c6-gtk2/distinfo.x86_64
@@ -1,23 +1,15 @@
-TIMESTAMP = 1466256979
+TIMESTAMP = 1470339499
 SHA256 (rpm/x86_64/centos/6.8/gtk2-2.24.23-8.el6.i686.rpm) = e0781bc8fa9e1e7f10f8cd5fa2a0bd3a1dfc78297ae1ea4de2fdda77c1c64eba
 SIZE (rpm/x86_64/centos/6.8/gtk2-2.24.23-8.el6.i686.rpm) = 3336132
+SHA256 (rpm/x86_64/centos/6.8/gtk2-immodules-2.24.23-8.el6.i686.rpm) = 7396cc72b70b3f4efe989639cff506e0c6aa014287d79f29c468df4492a1b121
+SIZE (rpm/x86_64/centos/6.8/gtk2-immodules-2.24.23-8.el6.i686.rpm) = 71444
 SHA256 (rpm/x86_64/centos/6.8/gtk2-engines-2.18.4-5.el6.centos.i686.rpm) = 33ecb6ade9ff52e2c924c13db849f4b955f9bddd21225717bf2874a4a86575d8
 SIZE (rpm/x86_64/centos/6.8/gtk2-engines-2.18.4-5.el6.centos.i686.rpm) = 281788
-SHA256 (rpm/x86_64/centos/6.8/pixman-0.32.8-1.el6.i686.rpm) = da1b43c3836f98229b704eda5aaf3f2b9b4e93ab0e23a905ac449e62c4d604f7
-SIZE (rpm/x86_64/centos/6.8/pixman-0.32.8-1.el6.i686.rpm) = 239560
-SHA256 (rpm/x86_64/centos/6.8/jasper-libs-1.900.1-16.el6_6.3.i686.rpm) = 867485f066f16b8d4067771a01f6f8c60dda135f27c5a6441b2089d8e9255533
-SIZE (rpm/x86_64/centos/6.8/jasper-libs-1.900.1-16.el6_6.3.i686.rpm) = 140456
 SHA256 (rpm/x86_64/centos/6.8/gtk2-2.24.23-8.el6.x86_64.rpm) = 7ef7c521b7b7fccffe4ea67efb6bd679477cbac492297580048baa3bdeb9931d
 SIZE (rpm/x86_64/centos/6.8/gtk2-2.24.23-8.el6.x86_64.rpm) = 3345116
+SHA256 (rpm/x86_64/centos/6.8/gtk2-immodules-2.24.23-8.el6.x86_64.rpm) = b4005ff5a94b6f69e5d9a037814849a84f4bf7315ef41528d00cddc2bf5aa1dc
+SIZE (rpm/x86_64/centos/6.8/gtk2-immodules-2.24.23-8.el6.x86_64.rpm) = 71288
 SHA256 (rpm/x86_64/centos/6.8/gtk2-engines-2.18.4-5.el6.centos.x86_64.rpm) = 3bfafe6099319b5339a5118f0225a72dbed61908971ecd931f3356151aaddbef
 SIZE (rpm/x86_64/centos/6.8/gtk2-engines-2.18.4-5.el6.centos.x86_64.rpm) = 288276
-SHA256 (rpm/x86_64/centos/6.8/pixman-0.32.8-1.el6.x86_64.rpm) = d5e9a2ac49bae1bff6fd806367aa0f9125eef6dee1b515a6af6576b883032e91
-SIZE (rpm/x86_64/centos/6.8/pixman-0.32.8-1.el6.x86_64.rpm) = 248564
-SHA256 (rpm/x86_64/centos/6.8/jasper-libs-1.900.1-16.el6_6.3.x86_64.rpm) = f97f6af75d7ac6140e4f126e4e34b8e5b2eba7a0c6ed65694cecaaf88100d806
-SIZE (rpm/x86_64/centos/6.8/jasper-libs-1.900.1-16.el6_6.3.x86_64.rpm) = 140540
 SHA256 (rpm/x86_64/centos/6.8/gtk2-2.24.23-8.el6.src.rpm) = 25525b49a85420db94e627b08eb134281e48c97a5847f8d1d8c6463c769295cb
 SIZE (rpm/x86_64/centos/6.8/gtk2-2.24.23-8.el6.src.rpm) = 13728324
-SHA256 (rpm/x86_64/centos/6.8/pixman-0.32.8-1.el6.src.rpm) = d129fb1fd8a2bfe7d7337daf46b76a48b1c68ee97e362e1224839c871e70f66f
-SIZE (rpm/x86_64/centos/6.8/pixman-0.32.8-1.el6.src.rpm) = 710121
-SHA256 (rpm/x86_64/centos/6.8/jasper-1.900.1-16.el6_6.3.src.rpm) = 28ef9fb9cc889fc9f43cd360125de42994829a92c5ede0b3d82dc9e0159f4605
-SIZE (rpm/x86_64/centos/6.8/jasper-1.900.1-16.el6_6.3.src.rpm) = 1404135
diff --git a/x11-toolkits/linux-c6-gtk2/pkg-plist.i386 b/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
index 8ea07426ecf6..e401635c673c 100644
--- a/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
@@ -1,3 +1,5 @@
+etc/X11/xinit/xinput.d/im-cedilla.conf
+etc/gtk-2.0/im-multipress.conf
 usr/bin/gtk-query-immodules-2.0-32
 usr/bin/gtk-update-icon-cache
 usr/bin/update-gtk-immodules
@@ -10,6 +12,17 @@ usr/lib/gtk-2.0/2.10.0/engines/libmist.so
 usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
 usr/lib/gtk-2.0/2.10.0/engines/libredmond95.so
 usr/lib/gtk-2.0/2.10.0/engines/libthinice.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so
+@rmtry usr/lib/gtk-2.0/2.10.0/immodules.cache
 usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
 usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
 usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
@@ -216,6 +229,6 @@ usr/share/themes/Mist/gtk-2.0/gtkrc
 usr/share/themes/Raleigh/gtk-2.0/gtkrc
 usr/share/themes/ThinIce/gtk-2.0/gtkrc
 @dir usr/lib/gtk-2.0/2.10.0/filesystems
-@dir usr/lib/gtk-2.0/2.10.0/immodules
 @dir usr/lib/gtk-2.0/immodules
 @dir usr/share/gtk-2.0
+@postexec %D/usr/bin/gtk-query-immodules-2.0-32 --update-cache
diff --git a/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64 b/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
index 774b173abd4a..d8fb63c64f66 100644
--- a/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
@@ -1,3 +1,5 @@
+etc/X11/xinit/xinput.d/im-cedilla.conf
+etc/gtk-2.0/im-multipress.conf
 usr/bin/gtk-query-immodules-2.0-32
 usr/bin/gtk-query-immodules-2.0-64
 usr/bin/gtk-update-icon-cache
@@ -11,6 +13,17 @@ usr/lib/gtk-2.0/2.10.0/engines/libmist.so
 usr/lib/gtk-2.0/2.10.0/engines/libpixmap.so
 usr/lib/gtk-2.0/2.10.0/engines/libredmond95.so
 usr/lib/gtk-2.0/2.10.0/engines/libthinice.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-am-et.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-ipa.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-multipress.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-thai.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so
+usr/lib/gtk-2.0/2.10.0/immodules/im-viqr.so
+@rmtry usr/lib/gtk-2.0/2.10.0/immodules.cache
 usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
 usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
 usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
@@ -31,6 +44,17 @@ usr/lib64/gtk-2.0/2.10.0/engines/libmist.so
 usr/lib64/gtk-2.0/2.10.0/engines/libpixmap.so
 usr/lib64/gtk-2.0/2.10.0/engines/libredmond95.so
 usr/lib64/gtk-2.0/2.10.0/engines/libthinice.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-am-et.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-cedilla.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-inuktitut.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-ipa.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-multipress.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-thai.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-ti-er.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-ti-et.so
+usr/lib64/gtk-2.0/2.10.0/immodules/im-viqr.so
+@rmtry usr/lib64/gtk-2.0/2.10.0/immodules.cache
 usr/lib64/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so
 usr/lib64/gtk-2.0/2.10.0/printbackends/libprintbackend-file.so
 usr/lib64/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.so
@@ -238,9 +262,9 @@ usr/share/themes/Mist/gtk-2.0/gtkrc
 usr/share/themes/Raleigh/gtk-2.0/gtkrc
 usr/share/themes/ThinIce/gtk-2.0/gtkrc
 @dir usr/lib/gtk-2.0/2.10.0/filesystems
-@dir usr/lib/gtk-2.0/2.10.0/immodules
 @dir usr/lib/gtk-2.0/immodules
 @dir usr/lib64/gtk-2.0/2.10.0/filesystems
-@dir usr/lib64/gtk-2.0/2.10.0/immodules
 @dir usr/lib64/gtk-2.0/immodules
 @dir usr/share/gtk-2.0
+@postexec %D/usr/bin/gtk-query-immodules-2.0-32 --update-cache
+@postexec %D/usr/bin/gtk-query-immodules-2.0-64 --update-cache