5 files changed, 108 insertions, 14 deletions

diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index ec82972a2e14..d7b5e814e6bf 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -35,8 +35,7 @@ DISTFILES=		redhat-release-7.1-1.noarch.rpm \
 			slang-1.4.2-2.${MACHINE_ARCH}.rpm \
 			sh-utils-2.0-13.${MACHINE_ARCH}.rpm \
 			rpm-4.0.2-8.${MACHINE_ARCH}.rpm \
-			${RPM_FREETYPE} \
-			${RPM_XFREE86_LIBS}
+			${RPM_FREETYPE}
 
 PATCH_SITES=		${MASTER_SITE_REDHAT_LINUX}
 PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
@@ -68,7 +67,7 @@ UPD_SET1=		glibc-common-2.2.4-32.1.${MACHINE_ARCH}.rpm \
 UPD_SET1=		glibc-common-2.2.4-32.${MACHINE_ARCH}.rpm \
 			glibc-2.2.4-32.${MACHINE_ARCH}.rpm
 .endif
-UPD_SET2=		zlib-1.1.4-8.7x.${MACHINE_ARCH}.rpm
+UPD_SET2=		${RPM_XFREE86_LIBS} zlib-1.1.4-8.7x.${MACHINE_ARCH}.rpm
 UPDATES=		${UPD_SET1} ${UPD_SET2}
 
 .ifdef USE_LINUX
@@ -85,7 +84,7 @@ RPM_LIBSTDCXX=
 RPM_COMPAT_LIBSTDCXX=	compat-libstdc++-6.2-2.9.0.14.i386.rpm
 RPM_SETSERIAL=		setserial-2.17-2.i386.rpm
 RPM_SETUP=		setup-2.4.7-1.noarch.rpm
-RPM_XFREE86_LIBS=	XFree86-libs-4.0.3-5.i386.rpm
+RPM_XFREE86_LIBS=	XFree86-libs-4.1.0-49.i386.rpm
 UPD_SET2+=		libstdc++-2.96-112.7.1.i386.rpm
 .else
 RPM_BZIP2=		bzip2-1.0.1-4.alpha.rpm
@@ -95,7 +94,7 @@ RPM_LIBSTDCXX=		libstdc++-2.96-87.alpha.rpm
 RPM_COMPAT_LIBSTDCXX=
 RPM_SETSERIAL=		setserial-2.17-3.alpha.rpm
 RPM_SETUP=		setup-2.4.7-2.noarch.rpm
-RPM_XFREE86_LIBS=	XFree86-libs-4.0.3-21.alpha.rpm
+RPM_XFREE86_LIBS=	XFree86-libs-4.1.0-29.4hp.alpha.rpm
 UPD_SET2+=
 .endif
 
diff --git a/emulators/linux_base/distinfo.alpha b/emulators/linux_base/distinfo.alpha
index 369b84177914..04812d5543ab 100644
--- a/emulators/linux_base/distinfo.alpha
+++ b/emulators/linux_base/distinfo.alpha
@@ -23,7 +23,7 @@ MD5 (rpm/slang-1.4.2-2.alpha.rpm) = 5e6c0c4560a2585e0b9f2eb1e7cb6ddd
 MD5 (rpm/sh-utils-2.0-13.alpha.rpm) = d8206bfdeb0e723555a167ba363d4368
 MD5 (rpm/rpm-4.0.2-8.alpha.rpm) = de97b0fda240f422fa2a67dd0729d775
 MD5 (rpm/freetype-2.0.1-5.alpha.rpm) = 3dfb1fad9d16c1e9114f474ebb8fa849
-MD5 (rpm/XFree86-libs-4.0.3-21.alpha.rpm) = 7e0f11ac8258f550959df98f81146d9e
+MD5 (rpm/XFree86-libs-4.1.0-29.4hp.alpha.rpm) = 94552611148f5d239cd91dbafbcf5454
 MD5 (rpm/glibc-common-2.2.4-32.1.alpha.rpm) = b34b5972934285ca30a33af2d8aa3139
 MD5 (rpm/glibc-2.2.4-32.1.alpha.rpm) = 57321417e93abff2199418c57791db92
 MD5 (rpm/zlib-1.1.4-8.7x.alpha.rpm) = bddda12d2fe334c1c5330e9ab53a0a71
diff --git a/emulators/linux_base/distinfo.i386 b/emulators/linux_base/distinfo.i386
index d1397b4c23dd..a3d7a7b08bbe 100644
--- a/emulators/linux_base/distinfo.i386
+++ b/emulators/linux_base/distinfo.i386
@@ -23,7 +23,7 @@ MD5 (rpm/slang-1.4.2-2.i386.rpm) = 08f61ae541a0c802b5f0de2ec72e6b84
 MD5 (rpm/sh-utils-2.0-13.i386.rpm) = c0cb76287553e7f43234af45994d7d41
 MD5 (rpm/rpm-4.0.2-8.i386.rpm) = 7c19ebfcbb9079ce77b9aa2d33c26ff2
 MD5 (rpm/freetype-2.0.1-4.i386.rpm) = d0343a9d5f1d91ec254903ed164251cd
-MD5 (rpm/XFree86-libs-4.0.3-5.i386.rpm) = 227caaee9e10162b6500e6e9544726b3
+MD5 (rpm/XFree86-libs-4.1.0-49.i386.rpm) = f77a9ccd1b80e73bc281d3a23698d646
 MD5 (rpm/glibc-common-2.2.4-32.i386.rpm) = 5f8e424f8f8bea96b8148569fe76f676
 MD5 (rpm/glibc-2.2.4-32.i386.rpm) = 8acd0559a855451e799844642aba68a1
 MD5 (rpm/zlib-1.1.4-8.7x.i386.rpm) = c364711c074bbb9c6fb9c81d5c183c04
diff --git a/emulators/linux_base/pkg-plist.alpha b/emulators/linux_base/pkg-plist.alpha
index 573efa974221..b6a1a45fc784 100644
--- a/emulators/linux_base/pkg-plist.alpha
+++ b/emulators/linux_base/pkg-plist.alpha
@@ -185,8 +185,7 @@ usr/X11R6/lib/X11/locale/mulelao-1/Compose
 usr/X11R6/lib/X11/locale/mulelao-1/XLC_LOCALE
 usr/X11R6/lib/X11/locale/nokhchi-1/XLC_LOCALE
 usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
-usr/X11R6/lib/X11/locale/th_TH.TACTIS/Compose
-usr/X11R6/lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
+usr/X11R6/lib/X11/locale/th_TH/XLC_LOCALE
 usr/X11R6/lib/X11/locale/tscii-0/XLC_LOCALE
 usr/X11R6/lib/X11/locale/vi_VN.tcvn/Compose
 usr/X11R6/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
@@ -222,6 +221,8 @@ usr/X11R6/lib/libXi.so.6
 usr/X11R6/lib/libXi.so.6.0
 usr/X11R6/lib/libXmu.so.6
 usr/X11R6/lib/libXmu.so.6.2
+usr/X11R6/lib/libXmuu.so.1
+usr/X11R6/lib/libXmuu.so.1.0
 usr/X11R6/lib/libXp.so.6
 usr/X11R6/lib/libXp.so.6.2
 usr/X11R6/lib/libXpm.so.4
@@ -9658,14 +9659,25 @@ var/log/lastlog
 @dirrm usr/etc
 @dirrm usr/dict
 @dirrm usr/bin
+@dirrm usr/X11R6/man/man8
+@dirrm usr/X11R6/man/man7
+@dirrm usr/X11R6/man/man6
+@dirrm usr/X11R6/man/man5
+@dirrm usr/X11R6/man/man4
+@dirrm usr/X11R6/man/man3
+@dirrm usr/X11R6/man/man2
+@dirrm usr/X11R6/man/man1
 @dirrm usr/X11R6/man
 @dirrm usr/X11R6/lib/X11/locale/zh_TW.big5
 @dirrm usr/X11R6/lib/X11/locale/zh_TW
+@dirrm usr/X11R6/lib/X11/locale/zh_HK.big5hkscs
+@dirrm usr/X11R6/lib/X11/locale/zh_CN.gbk
+@dirrm usr/X11R6/lib/X11/locale/zh_CN.gb18030
 @dirrm usr/X11R6/lib/X11/locale/zh
 @dirrm usr/X11R6/lib/X11/locale/vi_VN.viscii
 @dirrm usr/X11R6/lib/X11/locale/vi_VN.tcvn
 @dirrm usr/X11R6/lib/X11/locale/tscii-0
-@dirrm usr/X11R6/lib/X11/locale/th_TH.TACTIS
+@dirrm usr/X11R6/lib/X11/locale/th_TH
 @dirrm usr/X11R6/lib/X11/locale/tatar-cyr
 @dirrm usr/X11R6/lib/X11/locale/nokhchi-1
 @dirrm usr/X11R6/lib/X11/locale/mulelao-1
diff --git a/emulators/linux_base/pkg-plist.i386 b/emulators/linux_base/pkg-plist.i386
index 66060aba3839..a5f952fb0f46 100644
--- a/emulators/linux_base/pkg-plist.i386
+++ b/emulators/linux_base/pkg-plist.i386
@@ -120,6 +120,91 @@ lib/libutil.so.1
 sbin/install-info
 sbin/ldconfig
 sbin/sln
+usr/X11R6/lib/X11/XErrorDB
+usr/X11R6/lib/X11/XKeysymDB
+usr/X11R6/lib/X11/locale/C/XLC_LOCALE
+usr/X11R6/lib/X11/locale/armscii-8/Compose
+usr/X11R6/lib/X11/locale/armscii-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/compose.dir
+usr/X11R6/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/georgian-academy/Compose
+usr/X11R6/lib/X11/locale/georgian-academy/XLC_LOCALE
+usr/X11R6/lib/X11/locale/georgian-ps/Compose
+usr/X11R6/lib/X11/locale/georgian-ps/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ibm-cp1133/Compose
+usr/X11R6/lib/X11/locale/ibm-cp1133/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iscii-dev/XLC_LOCALE
+usr/X11R6/lib/X11/locale/isiri-3342/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-1/Compose
+usr/X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-10/Compose
+usr/X11R6/lib/X11/locale/iso8859-10/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-13/Compose
+usr/X11R6/lib/X11/locale/iso8859-13/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-14/Compose
+usr/X11R6/lib/X11/locale/iso8859-14/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-15/Compose
+usr/X11R6/lib/X11/locale/iso8859-15/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-2/Compose
+usr/X11R6/lib/X11/locale/iso8859-2/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-3/Compose
+usr/X11R6/lib/X11/locale/iso8859-3/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-4/Compose
+usr/X11R6/lib/X11/locale/iso8859-4/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-5/Compose
+usr/X11R6/lib/X11/locale/iso8859-5/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-6/Compose
+usr/X11R6/lib/X11/locale/iso8859-6/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-7/Compose
+usr/X11R6/lib/X11/locale/iso8859-7/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-8/Compose
+usr/X11R6/lib/X11/locale/iso8859-8/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-9/Compose
+usr/X11R6/lib/X11/locale/iso8859-9/XLC_LOCALE
+usr/X11R6/lib/X11/locale/iso8859-9e/Compose
+usr/X11R6/lib/X11/locale/iso8859-9e/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja.JIS/Compose
+usr/X11R6/lib/X11/locale/ja.JIS/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja.SJIS/Compose
+usr/X11R6/lib/X11/locale/ja.SJIS/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ja/Compose
+usr/X11R6/lib/X11/locale/ja/XLC_LOCALE
+usr/X11R6/lib/X11/locale/ko/Compose
+usr/X11R6/lib/X11/locale/ko/XLC_LOCALE
+usr/X11R6/lib/X11/locale/koi8-c/Compose
+usr/X11R6/lib/X11/locale/koi8-c/XLC_LOCALE
+usr/X11R6/lib/X11/locale/koi8-r/Compose
+usr/X11R6/lib/X11/locale/koi8-r/XLC_LOCALE
+usr/X11R6/lib/X11/locale/koi8-u/Compose
+usr/X11R6/lib/X11/locale/koi8-u/XLC_LOCALE
+usr/X11R6/lib/X11/locale/locale.alias
+usr/X11R6/lib/X11/locale/locale.dir
+usr/X11R6/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
+usr/X11R6/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
+usr/X11R6/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
+usr/X11R6/lib/X11/locale/mk_MK.UTF-8/Compose
+usr/X11R6/lib/X11/locale/mulelao-1/Compose
+usr/X11R6/lib/X11/locale/mulelao-1/XLC_LOCALE
+usr/X11R6/lib/X11/locale/nokhchi-1/XLC_LOCALE
+usr/X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE
+usr/X11R6/lib/X11/locale/th_TH/XLC_LOCALE
+usr/X11R6/lib/X11/locale/tscii-0/XLC_LOCALE
+usr/X11R6/lib/X11/locale/vi_VN.tcvn/Compose
+usr/X11R6/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
+usr/X11R6/lib/X11/locale/vi_VN.viscii/Compose
+usr/X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh/Compose
+usr/X11R6/lib/X11/locale/zh/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.gb18030/Compose
+usr/X11R6/lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
+usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_TW.big5/Compose
+usr/X11R6/lib/X11/locale/zh_TW.big5/XLC_LOCALE
+usr/X11R6/lib/X11/locale/zh_TW/Compose
+usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE
+usr/X11R6/lib/X11/rgb.txt
 usr/X11R6/lib/libICE.so.6
 usr/X11R6/lib/libICE.so.6.3
 usr/X11R6/lib/libPEX5.so.6
@@ -144,6 +229,8 @@ usr/X11R6/lib/libXi.so.6
 usr/X11R6/lib/libXi.so.6.0
 usr/X11R6/lib/libXmu.so.6
 usr/X11R6/lib/libXmu.so.6.2
+usr/X11R6/lib/libXmuu.so.1
+usr/X11R6/lib/libXmuu.so.1.0
 usr/X11R6/lib/libXp.so.6
 usr/X11R6/lib/libXp.so.6.2
 usr/X11R6/lib/libXpm.so.4
@@ -154,10 +241,6 @@ usr/X11R6/lib/libXt.so.6
 usr/X11R6/lib/libXt.so.6.0
 usr/X11R6/lib/libXtst.so.6
 usr/X11R6/lib/libXtst.so.6.1
-usr/X11R6/lib/libXv.so.1
-usr/X11R6/lib/libXv.so.1.0
-usr/X11R6/lib/libXxf86dga.so.1
-usr/X11R6/lib/libXxf86dga.so.1.0
 usr/X11R6/lib/libdps.so.1
 usr/X11R6/lib/libdps.so.1.0
 usr/X11R6/lib/libdpstk.so.1