CentOS ports: for c6_64, install 32bit libraries alongside

PR:		206943
Submitted by:	xmj

3 files changed, 187 insertions, 1 deletions

diff --git a/x11/linux-c6-xorg-libs/Makefile b/x11/linux-c6-xorg-libs/Makefile
index 20abbb7e04bd..ba6070c8a9eb 100644
--- a/x11/linux-c6-xorg-libs/Makefile
+++ b/x11/linux-c6-xorg-libs/Makefile
@@ -6,7 +6,8 @@ PORTVERSION=	7.4
 PORTREVISION=	4
 CATEGORIES=	x11 linux
 MASTER_SITES=	CENTOS_LINUX CENTOS_LINUX_UPDATES
-DISTFILES=	libICE-1.0.6-1.el6.${LINUX_RPM_ARCH}.rpm \
+DISTFILES:=	#hack
+LIB_DISTFILES=	libICE-1.0.6-1.el6.${LINUX_RPM_ARCH}.rpm \
 		libSM-1.2.1-2.el6.${LINUX_RPM_ARCH}.rpm \
 		libX11-1.6.0-6.el6.${LINUX_RPM_ARCH}.rpm \
 		libXScrnSaver-1.2.2-2.el6.${LINUX_RPM_ARCH}.rpm \
diff --git a/x11/linux-c6-xorg-libs/distinfo.x86_64 b/x11/linux-c6-xorg-libs/distinfo.x86_64
index 031ff7f9a61b..d0ee12f38055 100644
--- a/x11/linux-c6-xorg-libs/distinfo.x86_64
+++ b/x11/linux-c6-xorg-libs/distinfo.x86_64
@@ -66,6 +66,74 @@ SHA256 (rpm/x86_64/centos/6.7/libxkbfile-1.0.6-1.1.el6.x86_64.rpm) = 0c8c125d6b4
 SIZE (rpm/x86_64/centos/6.7/libxkbfile-1.0.6-1.1.el6.x86_64.rpm) = 75960
 SHA256 (rpm/x86_64/centos/6.7/mesa-libGLw-6.5.1-10.el6.x86_64.rpm) = 4a217ad5e52a834bb0ec2f74a20393e3ddf66f1a14b2ab99de4631589103cac9
 SIZE (rpm/x86_64/centos/6.7/mesa-libGLw-6.5.1-10.el6.x86_64.rpm) = 14356
+SHA256 (rpm/x86_64/centos/6.7/libICE-1.0.6-1.el6.i686.rpm) = b0b4e98058cfa3d75429b5bb1f209b475c8bcecf14f8ce8382f8ec5e24ac4c32
+SIZE (rpm/x86_64/centos/6.7/libICE-1.0.6-1.el6.i686.rpm) = 53292
+SHA256 (rpm/x86_64/centos/6.7/libSM-1.2.1-2.el6.i686.rpm) = 9128eb65884a7557e4bf68aee14e0bed3629df062b45ad389828f11d45abeff5
+SIZE (rpm/x86_64/centos/6.7/libSM-1.2.1-2.el6.i686.rpm) = 37312
+SHA256 (rpm/x86_64/centos/6.7/libX11-1.6.0-6.el6.i686.rpm) = 590d5c1bb8eed3eba47d791fc1c329eef529503efbda7000281bb295363ee58d
+SIZE (rpm/x86_64/centos/6.7/libX11-1.6.0-6.el6.i686.rpm) = 607328
+SHA256 (rpm/x86_64/centos/6.7/libXScrnSaver-1.2.2-2.el6.i686.rpm) = 2173a076e7cefc99c982601a701eaec864a418d7c544d80ef72fc7ac0a42218f
+SIZE (rpm/x86_64/centos/6.7/libXScrnSaver-1.2.2-2.el6.i686.rpm) = 22580
+SHA256 (rpm/x86_64/centos/6.7/libXau-1.0.6-4.el6.i686.rpm) = 0d979b1519ea4bef76efb5dd21e53cf9f12ab910eff0f67462e1d905b1e6109b
+SIZE (rpm/x86_64/centos/6.7/libXau-1.0.6-4.el6.i686.rpm) = 24864
+SHA256 (rpm/x86_64/centos/6.7/libXaw-1.0.11-2.el6.i686.rpm) = d7ea3074f005f89b225b42357c7a3f4984ebdaaafcd085fb2294c8e8a55e8fc7
+SIZE (rpm/x86_64/centos/6.7/libXaw-1.0.11-2.el6.i686.rpm) = 194780
+SHA256 (rpm/x86_64/centos/6.7/libXcomposite-0.4.3-4.el6.i686.rpm) = a49030789b4701f3b6607b19b5c902a7df774f16a24dc72552df3563c4db2638
+SIZE (rpm/x86_64/centos/6.7/libXcomposite-0.4.3-4.el6.i686.rpm) = 20856
+SHA256 (rpm/x86_64/centos/6.7/libXcursor-1.1.14-2.1.el6.i686.rpm) = b5becd242ad1f1f166da01c3027c252ca6886fe3be6cfb8d70c0d20bf5eb3bd0
+SIZE (rpm/x86_64/centos/6.7/libXcursor-1.1.14-2.1.el6.i686.rpm) = 29080
+SHA256 (rpm/x86_64/centos/6.7/libXdamage-1.1.3-4.el6.i686.rpm) = 6f933535f383db7f06a3d64cf7f109c955bd72a0cc1d1092fb4c53867c85a022
+SIZE (rpm/x86_64/centos/6.7/libXdamage-1.1.3-4.el6.i686.rpm) = 18508
+SHA256 (rpm/x86_64/centos/6.7/libXdmcp-1.1.1-3.el6.i686.rpm) = dd9a0c6ab98e7bf8be6d0f888040cef2d5b8f4538b2ee9ee5a05c2d9ec2a29dd
+SIZE (rpm/x86_64/centos/6.7/libXdmcp-1.1.1-3.el6.i686.rpm) = 31344
+SHA256 (rpm/x86_64/centos/6.7/libXevie-1.0.3-4.el6.i686.rpm) = 5fda28a7fb799a081dc197af364a29321d9899be31661e822937d6c3df1d3a4e
+SIZE (rpm/x86_64/centos/6.7/libXevie-1.0.3-4.el6.i686.rpm) = 16648
+SHA256 (rpm/x86_64/centos/6.7/libXext-1.3.2-2.1.el6.i686.rpm) = b7c0ce14338da22397e0c042b738624a63b580b8c74542df24a3ad062a65170d
+SIZE (rpm/x86_64/centos/6.7/libXext-1.3.2-2.1.el6.i686.rpm) = 35424
+SHA256 (rpm/x86_64/centos/6.7/libXfixes-5.0.1-2.1.el6.i686.rpm) = 0dd842ae7e276295d516a1f82b8eaefa8c00ed3ac2f066776fa2627546a0ec41
+SIZE (rpm/x86_64/centos/6.7/libXfixes-5.0.1-2.1.el6.i686.rpm) = 16840
+SHA256 (rpm/x86_64/centos/6.7/libXfont-1.4.5-5.el6_7.i686.rpm) = 9856558ad51e2b739b307e54519434fd091a7eef0a3380d8e08f6bda984dbc09
+SIZE (rpm/x86_64/centos/6.7/libXfont-1.4.5-5.el6_7.i686.rpm) = 148560
+SHA256 (rpm/x86_64/centos/6.7/libXft-2.3.1-2.el6.i686.rpm) = 0918bc59264c32fbe0cd3f9e0761e156b7f14623eb73ae5e46a5539d10ed743c
+SIZE (rpm/x86_64/centos/6.7/libXft-2.3.1-2.el6.i686.rpm) = 55040
+SHA256 (rpm/x86_64/centos/6.7/libXi-1.7.2-2.2.el6.i686.rpm) = 7c1d137c99145cc17ce08605e3afd6ba9cb0b04d075429f251164894b7984e03
+SIZE (rpm/x86_64/centos/6.7/libXi-1.7.2-2.2.el6.i686.rpm) = 37576
+SHA256 (rpm/x86_64/centos/6.7/libXinerama-1.1.3-2.1.el6.i686.rpm) = 25ad6087df841322b5c716fa83cd1f820d1ae21cd7a03f40d0a9aa2c65444da7
+SIZE (rpm/x86_64/centos/6.7/libXinerama-1.1.3-2.1.el6.i686.rpm) = 13000
+SHA256 (rpm/x86_64/centos/6.7/libXmu-1.1.1-2.el6.i686.rpm) = 353e63f5da64f3ab88c08f9a97f18db14926aeeda48749edc0e22be40b279fda
+SIZE (rpm/x86_64/centos/6.7/libXmu-1.1.1-2.el6.i686.rpm) = 67596
+SHA256 (rpm/x86_64/centos/6.7/libXp-1.0.2-2.1.el6.i686.rpm) = c5c8033e94657027fbebaabd5dd19a45f1576b21c4fbc445a33942975dd4e966
+SIZE (rpm/x86_64/centos/6.7/libXp-1.0.2-2.1.el6.i686.rpm) = 29032
+SHA256 (rpm/x86_64/centos/6.7/libXpm-3.5.10-2.el6.i686.rpm) = 2256f36015d4fd1d69a87f42d5279c5565c5a627320e3604eace595df47d084e
+SIZE (rpm/x86_64/centos/6.7/libXpm-3.5.10-2.el6.i686.rpm) = 51496
+SHA256 (rpm/x86_64/centos/6.7/libXrandr-1.4.1-2.1.el6.i686.rpm) = 821a2b46a3880c3e563e32c95390e4d76d153f2b1ca349f2a3519f3c302c46b4
+SIZE (rpm/x86_64/centos/6.7/libXrandr-1.4.1-2.1.el6.i686.rpm) = 23220
+SHA256 (rpm/x86_64/centos/6.7/libXrender-0.9.8-2.1.el6.i686.rpm) = 81cc0d3798642208b4a7c508c7d8f1bd151eb16adc3990647b10a26c3a4a203e
+SIZE (rpm/x86_64/centos/6.7/libXrender-0.9.8-2.1.el6.i686.rpm) = 23648
+SHA256 (rpm/x86_64/centos/6.7/libXres-1.0.7-2.1.el6.i686.rpm) = a572ab6470b94e9d1769d30967687224aa2f5b1a6487bd02dfc7abf337a9cd67
+SIZE (rpm/x86_64/centos/6.7/libXres-1.0.7-2.1.el6.i686.rpm) = 12380
+SHA256 (rpm/x86_64/centos/6.7/libXt-1.1.4-6.1.el6.i686.rpm) = 35c4d59eb703f93ee0ca1ee0019e38dba549228856fe5ead1c12e299f5a7171e
+SIZE (rpm/x86_64/centos/6.7/libXt-1.1.4-6.1.el6.i686.rpm) = 162908
+SHA256 (rpm/x86_64/centos/6.7/libXtst-1.2.2-2.1.el6.i686.rpm) = d3797b5ea6b1ac41173b76ce1e5393e6473c90065ed80ad280bc7f252e0c03ba
+SIZE (rpm/x86_64/centos/6.7/libXtst-1.2.2-2.1.el6.i686.rpm) = 19048
+SHA256 (rpm/x86_64/centos/6.7/libXv-1.0.9-2.1.el6.i686.rpm) = c0de1cb3d77968096373149b95e2814d1fcf9359ac168b2314c9a6754582de08
+SIZE (rpm/x86_64/centos/6.7/libXv-1.0.9-2.1.el6.i686.rpm) = 16712
+SHA256 (rpm/x86_64/centos/6.7/libXvMC-1.0.8-2.1.el6.i686.rpm) = 25c94f6f4f2e16c94f6de112115625af7884463dfddc70e18c2acaa0bef7249b
+SIZE (rpm/x86_64/centos/6.7/libXvMC-1.0.8-2.1.el6.i686.rpm) = 20368
+SHA256 (rpm/x86_64/centos/6.7/libXxf86dga-1.1.4-2.1.el6.i686.rpm) = 7fec567b870c0170125cfb544d4e485353d83a48d3cde1a20bc065457ce5c7ae
+SIZE (rpm/x86_64/centos/6.7/libXxf86dga-1.1.4-2.1.el6.i686.rpm) = 17652
+SHA256 (rpm/x86_64/centos/6.7/libXxf86misc-1.0.3-4.el6.i686.rpm) = b1ff94ead0c50b70d72fe9ac64de8b92721b817b2704127ebad4b59e220a132d
+SIZE (rpm/x86_64/centos/6.7/libXxf86misc-1.0.3-4.el6.i686.rpm) = 18092
+SHA256 (rpm/x86_64/centos/6.7/libXxf86vm-1.1.3-2.1.el6.i686.rpm) = e56206ded6222b0bbac4c031ba8ec1deafe0adab027aa1c501f23fcc550b4585
+SIZE (rpm/x86_64/centos/6.7/libXxf86vm-1.1.3-2.1.el6.i686.rpm) = 16440
+SHA256 (rpm/x86_64/centos/6.7/libfontenc-1.0.5-2.el6.i686.rpm) = 7193d101772811e8610d025e58c3631f08552f0151a48c205f6bf32a6edf4d50
+SIZE (rpm/x86_64/centos/6.7/libfontenc-1.0.5-2.el6.i686.rpm) = 24872
+SHA256 (rpm/x86_64/centos/6.7/libxcb-1.9.1-3.el6.i686.rpm) = b1f3a5a35e6a941812b36b9218c5fea8b29cb7a81e710d3ddba44dd1866e0911
+SIZE (rpm/x86_64/centos/6.7/libxcb-1.9.1-3.el6.i686.rpm) = 117828
+SHA256 (rpm/x86_64/centos/6.7/libxkbfile-1.0.6-1.1.el6.i686.rpm) = 0528b825b81ac13a910acdfbe02df666f4854fb1decf0bace49635d50785f83b
+SIZE (rpm/x86_64/centos/6.7/libxkbfile-1.0.6-1.1.el6.i686.rpm) = 76364
+SHA256 (rpm/x86_64/centos/6.7/mesa-libGLw-6.5.1-10.el6.i686.rpm) = d2536b25e5998727f3c327c04269f58624d0a1050a45a9ea8f6f47dd8c16894e
+SIZE (rpm/x86_64/centos/6.7/mesa-libGLw-6.5.1-10.el6.i686.rpm) = 13756
 SHA256 (rpm/x86_64/centos/6.7/libICE-1.0.6-1.el6.src.rpm) = 6f9a2ffd65f021bd434ba821a27d1c8c1af4fe0d6fca1fbc4839d4b28a656695
 SIZE (rpm/x86_64/centos/6.7/libICE-1.0.6-1.el6.src.rpm) = 288561
 SHA256 (rpm/x86_64/centos/6.7/libSM-1.2.1-2.el6.src.rpm) = a1ccbb68cb9067697819bc462426d4bb7ac90a5d43b3b2937789085a23126129
diff --git a/x11/linux-c6-xorg-libs/pkg-plist.x86_64 b/x11/linux-c6-xorg-libs/pkg-plist.x86_64
index 608363f7ac0e..f03a6add7fcc 100644
--- a/x11/linux-c6-xorg-libs/pkg-plist.x86_64
+++ b/x11/linux-c6-xorg-libs/pkg-plist.x86_64
@@ -1,3 +1,120 @@
+usr/lib/libGLw.so.1
+usr/lib/libGLw.so.1.0.0
+usr/lib/libICE.so.6
+usr/lib/libICE.so.6.3.0
+usr/lib/libSM.so.6
+usr/lib/libSM.so.6.0.1
+usr/lib/libX11-xcb.so.1
+usr/lib/libX11-xcb.so.1.0.0
+usr/lib/libX11.so.6
+usr/lib/libX11.so.6.3.0
+usr/lib/libXRes.so.1
+usr/lib/libXRes.so.1.0.0
+usr/lib/libXau.so.6
+usr/lib/libXau.so.6.0.0
+usr/lib/libXaw.so.7
+usr/lib/libXaw7.so.7
+usr/lib/libXaw7.so.7.0.0
+usr/lib/libXcomposite.so.1
+usr/lib/libXcomposite.so.1.0.0
+usr/lib/libXcursor.so.1
+usr/lib/libXcursor.so.1.0.2
+usr/lib/libXdamage.so.1
+usr/lib/libXdamage.so.1.1.0
+usr/lib/libXdmcp.so.6
+usr/lib/libXdmcp.so.6.0.0
+usr/lib/libXevie.so.1
+usr/lib/libXevie.so.1.0.0
+usr/lib/libXext.so.6
+usr/lib/libXext.so.6.4.0
+usr/lib/libXfixes.so.3
+usr/lib/libXfixes.so.3.1.0
+usr/lib/libXfont.so.1
+usr/lib/libXfont.so.1.4.1
+usr/lib/libXft.so.2
+usr/lib/libXft.so.2.3.1
+usr/lib/libXi.so.6
+usr/lib/libXi.so.6.1.0
+usr/lib/libXinerama.so.1
+usr/lib/libXinerama.so.1.0.0
+usr/lib/libXmu.so.6
+usr/lib/libXmu.so.6.2.0
+usr/lib/libXmuu.so.1
+usr/lib/libXmuu.so.1.0.0
+usr/lib/libXp.so.6
+usr/lib/libXp.so.6.2.0
+usr/lib/libXpm.so.4
+usr/lib/libXpm.so.4.11.0
+usr/lib/libXrandr.so.2
+usr/lib/libXrandr.so.2.2.0
+usr/lib/libXrender.so.1
+usr/lib/libXrender.so.1.3.0
+usr/lib/libXss.so.1
+usr/lib/libXss.so.1.0.0
+usr/lib/libXt.so.6
+usr/lib/libXt.so.6.0.0
+usr/lib/libXtst.so.6
+usr/lib/libXtst.so.6.1.0
+usr/lib/libXv.so.1
+usr/lib/libXv.so.1.0.0
+usr/lib/libXvMC.so.1
+usr/lib/libXvMC.so.1.0.0
+usr/lib/libXvMCW.so.1
+usr/lib/libXvMCW.so.1.0.0
+usr/lib/libXxf86dga.so.1
+usr/lib/libXxf86dga.so.1.0.0
+usr/lib/libXxf86misc.so.1
+usr/lib/libXxf86misc.so.1.1.0
+usr/lib/libXxf86vm.so.1
+usr/lib/libXxf86vm.so.1.0.0
+usr/lib/libfontenc.so.1
+usr/lib/libfontenc.so.1.0.0
+usr/lib/libxcb-composite.so.0
+usr/lib/libxcb-composite.so.0.0.0
+usr/lib/libxcb-damage.so.0
+usr/lib/libxcb-damage.so.0.0.0
+usr/lib/libxcb-dpms.so.0
+usr/lib/libxcb-dpms.so.0.0.0
+usr/lib/libxcb-dri2.so.0
+usr/lib/libxcb-dri2.so.0.0.0
+usr/lib/libxcb-glx.so.0
+usr/lib/libxcb-glx.so.0.0.0
+usr/lib/libxcb-randr.so.0
+usr/lib/libxcb-randr.so.0.1.0
+usr/lib/libxcb-record.so.0
+usr/lib/libxcb-record.so.0.0.0
+usr/lib/libxcb-render.so.0
+usr/lib/libxcb-render.so.0.0.0
+usr/lib/libxcb-res.so.0
+usr/lib/libxcb-res.so.0.0.0
+usr/lib/libxcb-screensaver.so.0
+usr/lib/libxcb-screensaver.so.0.0.0
+usr/lib/libxcb-shape.so.0
+usr/lib/libxcb-shape.so.0.0.0
+usr/lib/libxcb-shm.so.0
+usr/lib/libxcb-shm.so.0.0.0
+usr/lib/libxcb-sync.so.0
+usr/lib/libxcb-sync.so.0.0.0
+usr/lib/libxcb-xevie.so.0
+usr/lib/libxcb-xevie.so.0.0.0
+usr/lib/libxcb-xf86dri.so.0
+usr/lib/libxcb-xf86dri.so.0.0.0
+usr/lib/libxcb-xfixes.so.0
+usr/lib/libxcb-xfixes.so.0.0.0
+usr/lib/libxcb-xinerama.so.0
+usr/lib/libxcb-xinerama.so.0.0.0
+usr/lib/libxcb-xselinux.so.0
+usr/lib/libxcb-xselinux.so.0.0.0
+usr/lib/libxcb-xtest.so.0
+usr/lib/libxcb-xtest.so.0.0.0
+usr/lib/libxcb-xv.so.0
+usr/lib/libxcb-xv.so.0.0.0
+usr/lib/libxcb-xvmc.so.0
+usr/lib/libxcb-xvmc.so.0.0.0
+usr/lib/libxcb.so.1
+usr/lib/libxcb.so.1.1.0
+usr/lib/libxkbfile.so.1
+usr/lib/libxkbfile.so.1.0.2
 usr/lib64/libGLw.so.1
 usr/lib64/libGLw.so.1.0.0
 usr/lib64/libICE.so.6