- Autodetect the installed linux_base port and use LINUX_DEFAULT only as

  a last resort.
- Construct a list of DISTFILES for every architecture (amd64, i386).
  Select one list for regular make and all lists for make makesum so linux
  ports can have one combined distinfo file.
- Set DIST_SUBDIR?=centos so there's only one copy of common distfiles.
- Use MASTER_SITES and DISTFILES groups so make fetch is a bit smarter.
- Regenerate all distinfo files.
- For linux_base-c6 (just like linux_base-c7 already does) turn bin, lib,
  lib64 and sbin into symbolic links to the same directory under usr.
  This fixes the problem where some programs/libraries exist under / on
  FreeBSD and /usr on Linux or vice versa and then depending on the order
  of search paths Linux programs may run/load FreeBSD programs/libraries
  and fail.
- Turn usr/share/icons into a symbolic link to LOCALBASE/share/icons so
  Linux programs can find desktop theme icons.  This eliminates the need
  for x11-themes/linux*-hicolor-icon-theme.
- Rename pkg-plist.x86_64 to pkg-plist.amd64.
- Regenerate all pkg-plist files.
- Add @preexec to linux_base pkg-plist that moves existing files in bin,
  lib, lib64, sbin and icons to the new destination before the directories
  are turned into symbolic links.
- Remove several empty directories from linux_base ports.
- Sweep over all linux ports: use consistent style, remove old CONFLICTS,
  remove unused pkg-descr files, add NLS option,...
- Remove old linux arts, esound and openssl-compat ports.

4 files changed, 107 insertions, 107 deletions

diff --git a/x11/linux-c7-xorg-libs/Makefile b/x11/linux-c7-xorg-libs/Makefile
index 9e8683489a11..2e8675cbd4d4 100644
--- a/x11/linux-c7-xorg-libs/Makefile
+++ b/x11/linux-c7-xorg-libs/Makefile
@@ -3,42 +3,42 @@
 
 PORTNAME=	xorg-libs
 PORTVERSION=	7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 linux
-LIB_DISTFILES=	libICE-1.0.9-2.el7${EXTRACT_SUFX} \
-		libSM-1.2.2-2.el7${EXTRACT_SUFX} \
-		libX11-1.6.3-3.el7${EXTRACT_SUFX} \
-		libXScrnSaver-1.2.2-6.1.el7${EXTRACT_SUFX} \
-		libXau-1.0.8-2.1.el7${EXTRACT_SUFX} \
-		libXaw-1.0.12-5.el7${EXTRACT_SUFX} \
-		libXcomposite-0.4.4-4.1.el7${EXTRACT_SUFX} \
-		libXcursor-1.1.14-2.1.el7${EXTRACT_SUFX} \
-		libXdamage-1.1.4-4.1.el7${EXTRACT_SUFX} \
-		libXdmcp-1.1.1-6.1.el7${EXTRACT_SUFX} \
-		libXevie-1.0.3-7.1.el7${EXTRACT_SUFX} \
-		libXext-1.3.3-3.el7${EXTRACT_SUFX} \
-		libXfixes-5.0.1-2.1.el7${EXTRACT_SUFX} \
-		libXfont-1.5.1-2.el7${EXTRACT_SUFX} \
-		libXft-2.3.2-2.el7${EXTRACT_SUFX} \
-		libXi-1.7.4-2.el7${EXTRACT_SUFX} \
-		libXinerama-1.1.3-2.1.el7${EXTRACT_SUFX} \
-		libXmu-1.1.2-2.el7${EXTRACT_SUFX} \
-		libXp-1.0.2-2.1.el7${EXTRACT_SUFX} \
-		libXpm-3.5.11-3.el7${EXTRACT_SUFX} \
-		libXrandr-1.4.2-2.el7${EXTRACT_SUFX} \
-		libXrender-0.9.8-2.1.el7${EXTRACT_SUFX} \
-		libXres-1.0.7-2.1.el7${EXTRACT_SUFX} \
-		libXt-1.1.4-6.1.el7${EXTRACT_SUFX} \
-		libXtst-1.2.2-2.1.el7${EXTRACT_SUFX} \
-		libXv-1.0.10-2.el7${EXTRACT_SUFX} \
-		libXvMC-1.0.8-2.1.el7${EXTRACT_SUFX} \
-		libXxf86dga-1.1.4-2.1.el7${EXTRACT_SUFX} \
-		libXxf86misc-1.0.3-7.1.el7${EXTRACT_SUFX} \
-		libXxf86vm-1.1.3-2.1.el7${EXTRACT_SUFX} \
-		libfontenc-1.1.2-3.el7${EXTRACT_SUFX} \
-		libxcb-1.11-4.el7${EXTRACT_SUFX} \
-		libxkbfile-1.0.8-5.el7${EXTRACT_SUFX} \
-		libxshmfence-1.2-1.el7${EXTRACT_SUFX}
+LIB_DISTNAMES=	libICE-1.0.9-2.el7 \
+		libSM-1.2.2-2.el7 \
+		libX11-1.6.3-3.el7 \
+		libXScrnSaver-1.2.2-6.1.el7 \
+		libXau-1.0.8-2.1.el7 \
+		libXaw-1.0.12-5.el7 \
+		libXcomposite-0.4.4-4.1.el7 \
+		libXcursor-1.1.14-2.1.el7 \
+		libXdamage-1.1.4-4.1.el7 \
+		libXdmcp-1.1.1-6.1.el7 \
+		libXevie-1.0.3-7.1.el7 \
+		libXext-1.3.3-3.el7 \
+		libXfixes-5.0.1-2.1.el7 \
+		libXfont-1.5.1-2.el7 \
+		libXft-2.3.2-2.el7 \
+		libXi-1.7.4-2.el7 \
+		libXinerama-1.1.3-2.1.el7 \
+		libXmu-1.1.2-2.el7 \
+		libXp-1.0.2-2.1.el7 \
+		libXpm-3.5.11-3.el7 \
+		libXrandr-1.4.2-2.el7 \
+		libXrender-0.9.8-2.1.el7 \
+		libXres-1.0.7-2.1.el7 \
+		libXt-1.1.4-6.1.el7 \
+		libXtst-1.2.2-2.1.el7 \
+		libXv-1.0.10-2.el7 \
+		libXvMC-1.0.8-2.1.el7 \
+		libXxf86dga-1.1.4-2.1.el7 \
+		libXxf86misc-1.0.3-7.1.el7 \
+		libXxf86vm-1.1.3-2.1.el7 \
+		libfontenc-1.1.2-3.el7 \
+		libxcb-1.11-4.el7 \
+		libxkbfile-1.0.8-5.el7 \
+		libxshmfence-1.2-1.el7
 SRC_DISTFILES=	libICE-1.0.9-2.el7${SRC_SUFX}:SOURCE \
 		libSM-1.2.2-2.el7${SRC_SUFX}:SOURCE \
 		libX11-1.6.3-3.el7${SRC_SUFX}:SOURCE \
@@ -84,4 +84,7 @@ USE_LDCONFIG=	yes
 USE_LINUX=	fontconfig
 USE_LINUX_RPM=	yes
 
+post-patch:
+	@${RM} -r ${WRKSRC}/usr/share/icons
+
 .include <bsd.port.mk>
diff --git a/x11/linux-c7-xorg-libs/distinfo.x86_64 b/x11/linux-c7-xorg-libs/distinfo
index 8ced77c8aa8c..b4964acc271e 100644
--- a/x11/linux-c7-xorg-libs/distinfo.x86_64
+++ b/x11/linux-c7-xorg-libs/distinfo
@@ -1,138 +1,138 @@
-TIMESTAMP = 1482085029
+TIMESTAMP = 1485698050
 SHA256 (centos/libICE-1.0.9-2.el7.i686.rpm) = d3c638b7c3052d300835f65f0d63487c14aa1ef6c3892a4efe3fc6f60fdfdf82
 SIZE (centos/libICE-1.0.9-2.el7.i686.rpm) = 65400
-SHA256 (centos/libSM-1.2.2-2.el7.i686.rpm) = bbd4714d8719220c18f162575aad05a648635e0b213851213940575cbfd4fa8a
-SIZE (centos/libSM-1.2.2-2.el7.i686.rpm) = 39436
-SHA256 (centos/libX11-1.6.3-3.el7.i686.rpm) = efc8e0e43f919dff5c55edd899955bb388154619f17dd6e5fd011d5e92da40ec
-SIZE (centos/libX11-1.6.3-3.el7.i686.rpm) = 624596
-SHA256 (centos/libXScrnSaver-1.2.2-6.1.el7.i686.rpm) = 773a6a2c04a68027524553fd39f24d2b4d45edbca4ad67f6862a31fc8ce71335
-SIZE (centos/libXScrnSaver-1.2.2-6.1.el7.i686.rpm) = 24168
-SHA256 (centos/libXau-1.0.8-2.1.el7.i686.rpm) = 1d618fc13761ba78da13fc6bd43933c37bcea6b0b268e214e2a0f7287aafb4bf
-SIZE (centos/libXau-1.0.8-2.1.el7.i686.rpm) = 29824
-SHA256 (centos/libXaw-1.0.12-5.el7.i686.rpm) = 51758a3f72766d0957c2903cca9012200c538036a8ac113a4e004daafec7aeac
-SIZE (centos/libXaw-1.0.12-5.el7.i686.rpm) = 191136
-SHA256 (centos/libXcomposite-0.4.4-4.1.el7.i686.rpm) = 5b9816bcfe046d26521eac662dc01587afa91a327583d2de73ea1cae5ceae756
-SIZE (centos/libXcomposite-0.4.4-4.1.el7.i686.rpm) = 22804
-SHA256 (centos/libXcursor-1.1.14-2.1.el7.i686.rpm) = 3079abf3f9f179c7a69f391e58f0d489e87f5b0c2a7c2c351d84f9aecdd8a9df
-SIZE (centos/libXcursor-1.1.14-2.1.el7.i686.rpm) = 30504
-SHA256 (centos/libXdamage-1.1.4-4.1.el7.i686.rpm) = 498697f8e0d087052b82b4332152568792a5ce109678285f1f1926a73c507a94
-SIZE (centos/libXdamage-1.1.4-4.1.el7.i686.rpm) = 20832
-SHA256 (centos/libXdmcp-1.1.1-6.1.el7.i686.rpm) = ca6ec7955018846b7cbe78c68e8e99fa218fd5b8cc9782526acbfb5eea3f8a57
-SIZE (centos/libXdmcp-1.1.1-6.1.el7.i686.rpm) = 32792
-SHA256 (centos/libXevie-1.0.3-7.1.el7.i686.rpm) = 1600aa148f2c988d63f0122fb133d374c6dc748b1ade3f8ff28edfacd6ccaf8a
-SIZE (centos/libXevie-1.0.3-7.1.el7.i686.rpm) = 18184
-SHA256 (centos/libXext-1.3.3-3.el7.i686.rpm) = bda66ea9cb11ff9834298a503534b6b48e9b5cfefc5596ad379b1a530abad676
-SIZE (centos/libXext-1.3.3-3.el7.i686.rpm) = 39804
-SHA256 (centos/libXfixes-5.0.1-2.1.el7.i686.rpm) = 14c085fd732488a2cf545138c4e2e315bb7ad6d20c4cc9aa022e0b9270e72a0c
-SIZE (centos/libXfixes-5.0.1-2.1.el7.i686.rpm) = 18292
-SHA256 (centos/libXfont-1.5.1-2.el7.i686.rpm) = b234328df3ff01e77243c5c58ec0f52884d1f2f8d1948006f7eebb030aebf11d
-SIZE (centos/libXfont-1.5.1-2.el7.i686.rpm) = 154392
-SHA256 (centos/libXft-2.3.2-2.el7.i686.rpm) = e80bbb502a050b2e204557a0a604743a6a82d82b4da32bded9f800b55e249654
-SIZE (centos/libXft-2.3.2-2.el7.i686.rpm) = 59184
-SHA256 (centos/libXi-1.7.4-2.el7.i686.rpm) = 84e6168d3f180e3ceaf893f456b27f8e9290081312d2893221f0f323df8e0593
-SIZE (centos/libXi-1.7.4-2.el7.i686.rpm) = 40628
-SHA256 (centos/libXinerama-1.1.3-2.1.el7.i686.rpm) = 4f096f8d8db4beb426a3ded9614597f7448291c394f67e12294bfb860b1aac9b
-SIZE (centos/libXinerama-1.1.3-2.1.el7.i686.rpm) = 14168
-SHA256 (centos/libXmu-1.1.2-2.el7.i686.rpm) = 893eb9819adaecb8bab320a816fe1c4b1a6fd73ff16518c18609370afd9dc6bd
-SIZE (centos/libXmu-1.1.2-2.el7.i686.rpm) = 72276
-SHA256 (centos/libXp-1.0.2-2.1.el7.i686.rpm) = dd13d39ef9a1f57eca66c515c777f3c4db88dc9329fbf53a9083c92c9387a523
-SIZE (centos/libXp-1.0.2-2.1.el7.i686.rpm) = 31152
-SHA256 (centos/libXpm-3.5.11-3.el7.i686.rpm) = bfd1c3024b06c5a9483cf81931e70738f8ba150ab273b34f9d7fc75f0aab1359
-SIZE (centos/libXpm-3.5.11-3.el7.i686.rpm) = 54784
-SHA256 (centos/libXrandr-1.4.2-2.el7.i686.rpm) = 5c58c3bd7217549bc30bb1d9e8c8609448bf3a2c7099fba64522bf5150781cac
-SIZE (centos/libXrandr-1.4.2-2.el7.i686.rpm) = 25828
-SHA256 (centos/libXrender-0.9.8-2.1.el7.i686.rpm) = 759fdbb34a226d04432443de27bf51ec5d235637f3de29be565dc898bfd403cd
-SIZE (centos/libXrender-0.9.8-2.1.el7.i686.rpm) = 25452
-SHA256 (centos/libXres-1.0.7-2.1.el7.i686.rpm) = 5bde92d5d2671811da7727794f1cc41ad164b6042c3764b5d2f4e4d759ab2dd8
-SIZE (centos/libXres-1.0.7-2.1.el7.i686.rpm) = 13548
-SHA256 (centos/libXt-1.1.4-6.1.el7.i686.rpm) = 2831fa21259c51251959011e9de5eddaa5ab045cae6541f3cbaa574e7ceda354
-SIZE (centos/libXt-1.1.4-6.1.el7.i686.rpm) = 170568
-SHA256 (centos/libXtst-1.2.2-2.1.el7.i686.rpm) = 5af557e51b557a6c384b36361be7f5f558ed71c4dff2a9807ace2fe1ff4b4ca4
-SIZE (centos/libXtst-1.2.2-2.1.el7.i686.rpm) = 20368
-SHA256 (centos/libXv-1.0.10-2.el7.i686.rpm) = 7b6d78df6bf17cdc0ac4e9af5aedbe872a12c2fd7edb2841fe564dedce298e34
-SIZE (centos/libXv-1.0.10-2.el7.i686.rpm) = 18460
-SHA256 (centos/libXvMC-1.0.8-2.1.el7.i686.rpm) = ed1cd0187865bea024dbd92ed61239d8062d7225242f5e99fd0c7e167333552e
-SIZE (centos/libXvMC-1.0.8-2.1.el7.i686.rpm) = 22932
-SHA256 (centos/libXxf86dga-1.1.4-2.1.el7.i686.rpm) = 9bb4504c40693bd12d790955055c177861ad3856b1870ee5112b243d9d4ed396
-SIZE (centos/libXxf86dga-1.1.4-2.1.el7.i686.rpm) = 19604
-SHA256 (centos/libXxf86misc-1.0.3-7.1.el7.i686.rpm) = 6e2ea866e760822740db2784b4aa18681901cfafc348a83e462ba6a77cbb9172
-SIZE (centos/libXxf86misc-1.0.3-7.1.el7.i686.rpm) = 19788
-SHA256 (centos/libXxf86vm-1.1.3-2.1.el7.i686.rpm) = 83893fdc58776554199819c6ce71c3e783d914f197b9b1c00d45e84280b3d2b1
-SIZE (centos/libXxf86vm-1.1.3-2.1.el7.i686.rpm) = 17968
-SHA256 (centos/libfontenc-1.1.2-3.el7.i686.rpm) = 3fdefa311195f486f07b39fdd6e0d520b2d15dfb8568473e8bf0544411e14776
-SIZE (centos/libfontenc-1.1.2-3.el7.i686.rpm) = 30816
-SHA256 (centos/libxcb-1.11-4.el7.i686.rpm) = 169a250fb6d0d356a05de513ded4c86a3df8587b463fc79c59ae1d6d83c21fd2
-SIZE (centos/libxcb-1.11-4.el7.i686.rpm) = 206692
-SHA256 (centos/libxkbfile-1.0.8-5.el7.i686.rpm) = 539d6658b0fc80e79800e3eed166c5511048b8b36f0f2c490980c3173bb12c4b
-SIZE (centos/libxkbfile-1.0.8-5.el7.i686.rpm) = 81588
-SHA256 (centos/libxshmfence-1.2-1.el7.i686.rpm) = 7ad6f8b37ea0e0e82467eb0bb9b5b8cba04969610f7fed0f1cde11cc7b7ebc56
-SIZE (centos/libxshmfence-1.2-1.el7.i686.rpm) = 7416
 SHA256 (centos/libICE-1.0.9-2.el7.x86_64.rpm) = 5f9db2bade1847e65ea3da9546e6e7a9c95afd5fe2fed8361e97b648d8cf4c59
 SIZE (centos/libICE-1.0.9-2.el7.x86_64.rpm) = 66412
+SHA256 (centos/libSM-1.2.2-2.el7.i686.rpm) = bbd4714d8719220c18f162575aad05a648635e0b213851213940575cbfd4fa8a
+SIZE (centos/libSM-1.2.2-2.el7.i686.rpm) = 39436
 SHA256 (centos/libSM-1.2.2-2.el7.x86_64.rpm) = 3a1f996031e2a1ce991547720319eb92463d9ac667d697bb7b496bdd0722bc62
 SIZE (centos/libSM-1.2.2-2.el7.x86_64.rpm) = 40160
+SHA256 (centos/libX11-1.6.3-3.el7.i686.rpm) = efc8e0e43f919dff5c55edd899955bb388154619f17dd6e5fd011d5e92da40ec
+SIZE (centos/libX11-1.6.3-3.el7.i686.rpm) = 624596
 SHA256 (centos/libX11-1.6.3-3.el7.x86_64.rpm) = 6cb32762aec40fc5cbe481d146c8f1c6588540f767a4634f9e873c290abec4e7
 SIZE (centos/libX11-1.6.3-3.el7.x86_64.rpm) = 620248
+SHA256 (centos/libXScrnSaver-1.2.2-6.1.el7.i686.rpm) = 773a6a2c04a68027524553fd39f24d2b4d45edbca4ad67f6862a31fc8ce71335
+SIZE (centos/libXScrnSaver-1.2.2-6.1.el7.i686.rpm) = 24168
 SHA256 (centos/libXScrnSaver-1.2.2-6.1.el7.x86_64.rpm) = ea8e5b4a6c0c7b4d8d4c59c8839f90a81e21a7d2b80db7621777d55164c13d93
 SIZE (centos/libXScrnSaver-1.2.2-6.1.el7.x86_64.rpm) = 24120
+SHA256 (centos/libXau-1.0.8-2.1.el7.i686.rpm) = 1d618fc13761ba78da13fc6bd43933c37bcea6b0b268e214e2a0f7287aafb4bf
+SIZE (centos/libXau-1.0.8-2.1.el7.i686.rpm) = 29824
 SHA256 (centos/libXau-1.0.8-2.1.el7.x86_64.rpm) = c6441b423c19c5ca543d72fe6ed3679f039538ad345cb4284a36781869f8609c
 SIZE (centos/libXau-1.0.8-2.1.el7.x86_64.rpm) = 29784
+SHA256 (centos/libXaw-1.0.12-5.el7.i686.rpm) = 51758a3f72766d0957c2903cca9012200c538036a8ac113a4e004daafec7aeac
+SIZE (centos/libXaw-1.0.12-5.el7.i686.rpm) = 191136
 SHA256 (centos/libXaw-1.0.12-5.el7.x86_64.rpm) = 753dcce674f07f134a98801c45cdfda205b5354385d11dfef992ac50356bde0b
 SIZE (centos/libXaw-1.0.12-5.el7.x86_64.rpm) = 194816
+SHA256 (centos/libXcomposite-0.4.4-4.1.el7.i686.rpm) = 5b9816bcfe046d26521eac662dc01587afa91a327583d2de73ea1cae5ceae756
+SIZE (centos/libXcomposite-0.4.4-4.1.el7.i686.rpm) = 22804
 SHA256 (centos/libXcomposite-0.4.4-4.1.el7.x86_64.rpm) = 81357f494edca6c828f541cf9d229d97ac5e496fbb23a28a86535b5b9cd49a41
 SIZE (centos/libXcomposite-0.4.4-4.1.el7.x86_64.rpm) = 22792
+SHA256 (centos/libXcursor-1.1.14-2.1.el7.i686.rpm) = 3079abf3f9f179c7a69f391e58f0d489e87f5b0c2a7c2c351d84f9aecdd8a9df
+SIZE (centos/libXcursor-1.1.14-2.1.el7.i686.rpm) = 30504
 SHA256 (centos/libXcursor-1.1.14-2.1.el7.x86_64.rpm) = 1a5aac24faea60f86860501518df8e394849c5d30133d20655bda2c9076c2313
 SIZE (centos/libXcursor-1.1.14-2.1.el7.x86_64.rpm) = 30248
+SHA256 (centos/libXdamage-1.1.4-4.1.el7.i686.rpm) = 498697f8e0d087052b82b4332152568792a5ce109678285f1f1926a73c507a94
+SIZE (centos/libXdamage-1.1.4-4.1.el7.i686.rpm) = 20832
 SHA256 (centos/libXdamage-1.1.4-4.1.el7.x86_64.rpm) = 790df35e712320c967e7934e417687e17457b7cf989e54045115dd8f4c560949
 SIZE (centos/libXdamage-1.1.4-4.1.el7.x86_64.rpm) = 20916
+SHA256 (centos/libXdmcp-1.1.1-6.1.el7.i686.rpm) = ca6ec7955018846b7cbe78c68e8e99fa218fd5b8cc9782526acbfb5eea3f8a57
+SIZE (centos/libXdmcp-1.1.1-6.1.el7.i686.rpm) = 32792
 SHA256 (centos/libXdmcp-1.1.1-6.1.el7.x86_64.rpm) = dccd2b4873598e0cd87959021405c9abba1884ed8b0eb815bec95eace6301b70
 SIZE (centos/libXdmcp-1.1.1-6.1.el7.x86_64.rpm) = 32628
+SHA256 (centos/libXevie-1.0.3-7.1.el7.i686.rpm) = 1600aa148f2c988d63f0122fb133d374c6dc748b1ade3f8ff28edfacd6ccaf8a
+SIZE (centos/libXevie-1.0.3-7.1.el7.i686.rpm) = 18184
 SHA256 (centos/libXevie-1.0.3-7.1.el7.x86_64.rpm) = ffcffe6018f1af3a51bc39b29a447658e9dce02529f6f6d25886fd89e981f013
 SIZE (centos/libXevie-1.0.3-7.1.el7.x86_64.rpm) = 18188
+SHA256 (centos/libXext-1.3.3-3.el7.i686.rpm) = bda66ea9cb11ff9834298a503534b6b48e9b5cfefc5596ad379b1a530abad676
+SIZE (centos/libXext-1.3.3-3.el7.i686.rpm) = 39804
 SHA256 (centos/libXext-1.3.3-3.el7.x86_64.rpm) = 58284e32f1f3343c56722653e7870e8062c1570cd965802bc284da6480d9d366
 SIZE (centos/libXext-1.3.3-3.el7.x86_64.rpm) = 39572
+SHA256 (centos/libXfixes-5.0.1-2.1.el7.i686.rpm) = 14c085fd732488a2cf545138c4e2e315bb7ad6d20c4cc9aa022e0b9270e72a0c
+SIZE (centos/libXfixes-5.0.1-2.1.el7.i686.rpm) = 18292
 SHA256 (centos/libXfixes-5.0.1-2.1.el7.x86_64.rpm) = 3fa1b07c6159bb0f0d811c70330a94987dc51932991b4679d02f48689bf2e710
 SIZE (centos/libXfixes-5.0.1-2.1.el7.x86_64.rpm) = 18568
+SHA256 (centos/libXfont-1.5.1-2.el7.i686.rpm) = b234328df3ff01e77243c5c58ec0f52884d1f2f8d1948006f7eebb030aebf11d
+SIZE (centos/libXfont-1.5.1-2.el7.i686.rpm) = 154392
 SHA256 (centos/libXfont-1.5.1-2.el7.x86_64.rpm) = bf37ac5a64a4d6b516f151be0c1b6f75ed59c6c450f2cab0153221b2e1ddd40e
 SIZE (centos/libXfont-1.5.1-2.el7.x86_64.rpm) = 153884
+SHA256 (centos/libXft-2.3.2-2.el7.i686.rpm) = e80bbb502a050b2e204557a0a604743a6a82d82b4da32bded9f800b55e249654
+SIZE (centos/libXft-2.3.2-2.el7.i686.rpm) = 59184
 SHA256 (centos/libXft-2.3.2-2.el7.x86_64.rpm) = aca6be8d337c969a5d84b3af1180f06462cef3bb592b08eeb2eba9f384e796a1
 SIZE (centos/libXft-2.3.2-2.el7.x86_64.rpm) = 59548
+SHA256 (centos/libXi-1.7.4-2.el7.i686.rpm) = 84e6168d3f180e3ceaf893f456b27f8e9290081312d2893221f0f323df8e0593
+SIZE (centos/libXi-1.7.4-2.el7.i686.rpm) = 40628
 SHA256 (centos/libXi-1.7.4-2.el7.x86_64.rpm) = 21bbba5eef9cd12ccf87639685c21d2586b380d3620efbc1c6fd91f7917c6878
 SIZE (centos/libXi-1.7.4-2.el7.x86_64.rpm) = 40604
+SHA256 (centos/libXinerama-1.1.3-2.1.el7.i686.rpm) = 4f096f8d8db4beb426a3ded9614597f7448291c394f67e12294bfb860b1aac9b
+SIZE (centos/libXinerama-1.1.3-2.1.el7.i686.rpm) = 14168
 SHA256 (centos/libXinerama-1.1.3-2.1.el7.x86_64.rpm) = 9ef99967dc5834d32b4c643cc5c5771a2156057f1095316e070cc0d15eaaa62f
 SIZE (centos/libXinerama-1.1.3-2.1.el7.x86_64.rpm) = 14128
+SHA256 (centos/libXmu-1.1.2-2.el7.i686.rpm) = 893eb9819adaecb8bab320a816fe1c4b1a6fd73ff16518c18609370afd9dc6bd
+SIZE (centos/libXmu-1.1.2-2.el7.i686.rpm) = 72276
 SHA256 (centos/libXmu-1.1.2-2.el7.x86_64.rpm) = 25a601ca1906ee3eb3bacd18b3cbe0848846e2ce6cfc6ed6be7d7d1dbb1eb87f
 SIZE (centos/libXmu-1.1.2-2.el7.x86_64.rpm) = 72680
+SHA256 (centos/libXp-1.0.2-2.1.el7.i686.rpm) = dd13d39ef9a1f57eca66c515c777f3c4db88dc9329fbf53a9083c92c9387a523
+SIZE (centos/libXp-1.0.2-2.1.el7.i686.rpm) = 31152
 SHA256 (centos/libXp-1.0.2-2.1.el7.x86_64.rpm) = 9e379456530d25cf3de33452d6d531dd4a21ca21099c5fcdbffaf3fd686422e0
 SIZE (centos/libXp-1.0.2-2.1.el7.x86_64.rpm) = 31044
+SHA256 (centos/libXpm-3.5.11-3.el7.i686.rpm) = bfd1c3024b06c5a9483cf81931e70738f8ba150ab273b34f9d7fc75f0aab1359
+SIZE (centos/libXpm-3.5.11-3.el7.i686.rpm) = 54784
 SHA256 (centos/libXpm-3.5.11-3.el7.x86_64.rpm) = f0035f436f677689b3363ad8d84660ecc94893dd9b3d74cccf324a9dd85a8c63
 SIZE (centos/libXpm-3.5.11-3.el7.x86_64.rpm) = 55468
+SHA256 (centos/libXrandr-1.4.2-2.el7.i686.rpm) = 5c58c3bd7217549bc30bb1d9e8c8609448bf3a2c7099fba64522bf5150781cac
+SIZE (centos/libXrandr-1.4.2-2.el7.i686.rpm) = 25828
 SHA256 (centos/libXrandr-1.4.2-2.el7.x86_64.rpm) = fdb01f3666219e9c4772d3c3b5c87c514c851d791179bde40db5ada9f3fee917
 SIZE (centos/libXrandr-1.4.2-2.el7.x86_64.rpm) = 26120
+SHA256 (centos/libXrender-0.9.8-2.1.el7.i686.rpm) = 759fdbb34a226d04432443de27bf51ec5d235637f3de29be565dc898bfd403cd
+SIZE (centos/libXrender-0.9.8-2.1.el7.i686.rpm) = 25452
 SHA256 (centos/libXrender-0.9.8-2.1.el7.x86_64.rpm) = 3760818cb20d9327a539b0cf5e8fb90d2026dff3f27e8fe082dafc6c1c962061
 SIZE (centos/libXrender-0.9.8-2.1.el7.x86_64.rpm) = 26076
+SHA256 (centos/libXres-1.0.7-2.1.el7.i686.rpm) = 5bde92d5d2671811da7727794f1cc41ad164b6042c3764b5d2f4e4d759ab2dd8
+SIZE (centos/libXres-1.0.7-2.1.el7.i686.rpm) = 13548
 SHA256 (centos/libXres-1.0.7-2.1.el7.x86_64.rpm) = 0d9431ea6ee52436f5bb2336b70673b42044a5ce48962ac3302958dbcbed06d4
 SIZE (centos/libXres-1.0.7-2.1.el7.x86_64.rpm) = 13556
+SHA256 (centos/libXt-1.1.4-6.1.el7.i686.rpm) = 2831fa21259c51251959011e9de5eddaa5ab045cae6541f3cbaa574e7ceda354
+SIZE (centos/libXt-1.1.4-6.1.el7.i686.rpm) = 170568
 SHA256 (centos/libXt-1.1.4-6.1.el7.x86_64.rpm) = dc3bebaa8b9e91c5ae88d6ec6c8569a6a04f3e2a2cbf84c501c725fd64fc892d
 SIZE (centos/libXt-1.1.4-6.1.el7.x86_64.rpm) = 176960
+SHA256 (centos/libXtst-1.2.2-2.1.el7.i686.rpm) = 5af557e51b557a6c384b36361be7f5f558ed71c4dff2a9807ace2fe1ff4b4ca4
+SIZE (centos/libXtst-1.2.2-2.1.el7.i686.rpm) = 20368
 SHA256 (centos/libXtst-1.2.2-2.1.el7.x86_64.rpm) = 8244eb7ab6a65eed916c555d4b2bff41b6f944c310d29d354fac3bd1424e85d1
 SIZE (centos/libXtst-1.2.2-2.1.el7.x86_64.rpm) = 20556
+SHA256 (centos/libXv-1.0.10-2.el7.i686.rpm) = 7b6d78df6bf17cdc0ac4e9af5aedbe872a12c2fd7edb2841fe564dedce298e34
+SIZE (centos/libXv-1.0.10-2.el7.i686.rpm) = 18460
 SHA256 (centos/libXv-1.0.10-2.el7.x86_64.rpm) = 75bd8b5ec01c2379b224dcd0149559f33143890237c61f04d3b4c5a75ad1ff71
 SIZE (centos/libXv-1.0.10-2.el7.x86_64.rpm) = 18424
+SHA256 (centos/libXvMC-1.0.8-2.1.el7.i686.rpm) = ed1cd0187865bea024dbd92ed61239d8062d7225242f5e99fd0c7e167333552e
+SIZE (centos/libXvMC-1.0.8-2.1.el7.i686.rpm) = 22932
 SHA256 (centos/libXvMC-1.0.8-2.1.el7.x86_64.rpm) = f0bd8658dd26c1e57a5e0d6a19202c404248d971824954fe4918fb1527cb4e8e
 SIZE (centos/libXvMC-1.0.8-2.1.el7.x86_64.rpm) = 22660
+SHA256 (centos/libXxf86dga-1.1.4-2.1.el7.i686.rpm) = 9bb4504c40693bd12d790955055c177861ad3856b1870ee5112b243d9d4ed396
+SIZE (centos/libXxf86dga-1.1.4-2.1.el7.i686.rpm) = 19604
 SHA256 (centos/libXxf86dga-1.1.4-2.1.el7.x86_64.rpm) = 77dd7b1a7582bd3c824172f08be2acf4b9b2792bd29045232526d6425d90a948
 SIZE (centos/libXxf86dga-1.1.4-2.1.el7.x86_64.rpm) = 19784
+SHA256 (centos/libXxf86misc-1.0.3-7.1.el7.i686.rpm) = 6e2ea866e760822740db2784b4aa18681901cfafc348a83e462ba6a77cbb9172
+SIZE (centos/libXxf86misc-1.0.3-7.1.el7.i686.rpm) = 19788
 SHA256 (centos/libXxf86misc-1.0.3-7.1.el7.x86_64.rpm) = c0b55d7048821ca28ee08c63340f55f1bd4a3bc245b1ea09113bfec8a0e0001e
 SIZE (centos/libXxf86misc-1.0.3-7.1.el7.x86_64.rpm) = 19768
+SHA256 (centos/libXxf86vm-1.1.3-2.1.el7.i686.rpm) = 83893fdc58776554199819c6ce71c3e783d914f197b9b1c00d45e84280b3d2b1
+SIZE (centos/libXxf86vm-1.1.3-2.1.el7.i686.rpm) = 17968
 SHA256 (centos/libXxf86vm-1.1.3-2.1.el7.x86_64.rpm) = 44385af7613d8be4a47014881c2ca793f9d6c89f030af78699bbf04b866f39e9
 SIZE (centos/libXxf86vm-1.1.3-2.1.el7.x86_64.rpm) = 17868
+SHA256 (centos/libfontenc-1.1.2-3.el7.i686.rpm) = 3fdefa311195f486f07b39fdd6e0d520b2d15dfb8568473e8bf0544411e14776
+SIZE (centos/libfontenc-1.1.2-3.el7.i686.rpm) = 30816
 SHA256 (centos/libfontenc-1.1.2-3.el7.x86_64.rpm) = 91174e1f84a78c914b80a30c9763d4268ce062d8fabf73a80d207eee4df3df58
 SIZE (centos/libfontenc-1.1.2-3.el7.x86_64.rpm) = 30908
+SHA256 (centos/libxcb-1.11-4.el7.i686.rpm) = 169a250fb6d0d356a05de513ded4c86a3df8587b463fc79c59ae1d6d83c21fd2
+SIZE (centos/libxcb-1.11-4.el7.i686.rpm) = 206692
 SHA256 (centos/libxcb-1.11-4.el7.x86_64.rpm) = b163298c8c7125dd723312d5d4b5755adb3f1adff2e9d4e50a60b86a678e4733
 SIZE (centos/libxcb-1.11-4.el7.x86_64.rpm) = 193704
+SHA256 (centos/libxkbfile-1.0.8-5.el7.i686.rpm) = 539d6658b0fc80e79800e3eed166c5511048b8b36f0f2c490980c3173bb12c4b
+SIZE (centos/libxkbfile-1.0.8-5.el7.i686.rpm) = 81588
 SHA256 (centos/libxkbfile-1.0.8-5.el7.x86_64.rpm) = e3fa2546ce0e1350b5cbb9167b785d0be2f6b8ad6f83a12f269681907eae316d
 SIZE (centos/libxkbfile-1.0.8-5.el7.x86_64.rpm) = 82460
+SHA256 (centos/libxshmfence-1.2-1.el7.i686.rpm) = 7ad6f8b37ea0e0e82467eb0bb9b5b8cba04969610f7fed0f1cde11cc7b7ebc56
+SIZE (centos/libxshmfence-1.2-1.el7.i686.rpm) = 7416
 SHA256 (centos/libxshmfence-1.2-1.el7.x86_64.rpm) = 08d9e87212fedd61b7f59618b086e501222cd7f79768e493475d3fcd1f439ecb
 SIZE (centos/libxshmfence-1.2-1.el7.x86_64.rpm) = 7340
 SHA256 (centos/libICE-1.0.9-2.el7.src.rpm) = 1d5e05716c60f80e46cfafc4469af0805116f385ee29776c1189707e59393bc8
diff --git a/x11/linux-c7-xorg-libs/pkg-descr b/x11/linux-c7-xorg-libs/pkg-descr
index be5e6a7ad769..7b625c9d90e1 100644
--- a/x11/linux-c7-xorg-libs/pkg-descr
+++ b/x11/linux-c7-xorg-libs/pkg-descr
@@ -1,5 +1,3 @@
-This is a Linux binary port of the libraries from X.Org:
-"The X.Org Foundation provides an open source implementation
-of the X Window System."
+This package contains X.Org shared libraries.
 
-WWW: http://x.org
+WWW: https://x.org
diff --git a/x11/linux-c7-xorg-libs/pkg-plist.x86_64 b/x11/linux-c7-xorg-libs/pkg-plist.amd64
index 60c243cbe713..9cdf526ae56f 100644
--- a/x11/linux-c7-xorg-libs/pkg-plist.x86_64
+++ b/x11/linux-c7-xorg-libs/pkg-plist.amd64
@@ -330,5 +330,4 @@ usr/lib64/libxshmfence.so.1.0.0
 %%PORTDOCS%%usr/share/doc/libfontenc-1.1.2/README
 %%PORTDOCS%%usr/share/doc/libxkbfile-1.0.8/COPYING
 %%PORTDOCS%%usr/share/doc/libxkbfile-1.0.8/ChangeLog
-usr/share/icons/default/index.theme
 @dir usr/share/X11/app-defaults