2 files changed, 27 insertions, 22 deletions

diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index 51946eba2009..73a42493e5ba 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		f8
 PORTVERSION=		8
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES=		emulators linux
 MASTER_SITES=		${MASTER_SITE_FEDORA_LINUX}
 MASTER_SITE_SUBDIR=	../releases/${PORTVERSION}/Everything/${LINUX_RPM_ARCH}/os/Packages \
@@ -27,20 +27,20 @@ BIN_DISTFILES=	basesystem-8.1-1.noarch.rpm \
 		compat-libstdc++-296-2.96-139.${LINUX_RPM_ARCH}.rpm \
 		compat-libstdc++-33-3.2.3-62.${LINUX_RPM_ARCH}.rpm \
 		coreutils-6.9-18.fc8.${LINUX_RPM_ARCH}.rpm \
-		db4-4.6.21-1.fc8.${LINUX_RPM_ARCH}.rpm \
+		db4-4.6.21-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		e2fsprogs-1.40.4-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		e2fsprogs-libs-1.40.4-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		elfutils-0.135-1.fc8.${LINUX_RPM_ARCH}.rpm \
 		fedora-release-8-5.noarch.rpm \
 		filesystem-2.4.11-1.fc8.${LINUX_RPM_ARCH}.rpm \
-		freetype-2.3.5-3.fc8.${LINUX_RPM_ARCH}.rpm \
+		freetype-2.3.5-4.fc8.${LINUX_RPM_ARCH}.rpm \
 		gdbm-1.8.0-27.fc7.${LINUX_RPM_ARCH}.rpm \
 		glib-1.2.10-28.fc8.${LINUX_RPM_ARCH}.rpm \
 		glib2-2.14.6-2.fc8.${LINUX_RPM_ARCH}.rpm \
 		glibc-2.7-2.${LINUX_RPM_ARCH}.rpm \
 		glibc-common-2.7-2.${LINUX_RPM_ARCH}.rpm \
 		grep-2.5.1-57.fc7.${LINUX_RPM_ARCH}.rpm \
-		info-4.11-1.fc8.${LINUX_RPM_ARCH}.rpm \
+		info-4.11-5.fc8.${LINUX_RPM_ARCH}.rpm \
 		keyutils-libs-1.2-2.fc6.${LINUX_RPM_ARCH}.rpm \
 		krb5-libs-1.6.2-14.fc8.${LINUX_RPM_ARCH}.rpm \
 		libacl-2.2.39-14.fc8.${LINUX_RPM_ARCH}.rpm \
@@ -72,12 +72,12 @@ SRC_DISTFILES+=	acl-2.2.39-14.fc8.src.rpm \
 		bzip2-1.0.4-12.fc8.src.rpm \
 		compat-db-4.5.20-3.fc8.src.rpm \
 		coreutils-6.9-18.fc8.src.rpm \
-		db4-4.6.21-1.fc8.src.rpm \
+		db4-4.6.21-2.fc8.src.rpm \
 		e2fsprogs-1.40.4-2.fc8.src.rpm \
 		elfutils-0.135-1.fc8.src.rpm \
 		fedora-release-8-5.src.rpm \
 		filesystem-2.4.11-1.fc8.src.rpm \
-		freetype-2.3.5-3.fc8.src.rpm \
+		freetype-2.3.5-4.fc8.src.rpm \
 		gcc-4.1.2-33.src.rpm \
 		gdbm-1.8.0-27.fc7.src.rpm \
 		glib-1.2.10-28.fc8.src.rpm \
@@ -96,12 +96,14 @@ SRC_DISTFILES+=	acl-2.2.39-14.fc8.src.rpm \
 		setup-2.6.10-1.fc8.src.rpm \
 		slang-2.1.2-2.fc8.src.rpm \
 		termcap-5.5-1.20060701.1.src.rpm \
+		texinfo-4.11-5.fc8.src.rpm \
 		zlib-1.2.3-14.fc8.src.rpm
 
 ALWAYS_KEEP_DISTFILES=	yes
 .endif
 
-CONFLICTS=		linux_base-gentoo* linux_base-fc4 linux_base-fc6 linux_base-f7
+CONFLICTS=		linux_base-gentoo* linux_base-fc4 linux_base-fc6 \
+			linux_base-f7 linux-glib2
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
 USE_LINUX_PREFIX=	yes
diff --git a/emulators/linux_base-f8/distinfo.i386 b/emulators/linux_base-f8/distinfo.i386
index 909c831c5f9d..a445b4198808 100644
--- a/emulators/linux_base-f8/distinfo.i386
+++ b/emulators/linux_base-f8/distinfo.i386
@@ -22,9 +22,9 @@ SIZE (rpm/i386/fedora/8.newkey/compat-libstdc++-33-3.2.3-62.i386.rpm) = 235768
 MD5 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.i386.rpm) = 99ff5a7b3da08f290cb5b6d79f321fa8
 SHA256 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.i386.rpm) = e7eede346d911c57487591f268308756ab57a41242257fcbd6df6944e4ba8b29
 SIZE (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.i386.rpm) = 3489403
-MD5 (rpm/i386/fedora/8.newkey/db4-4.6.21-1.fc8.i386.rpm) = c9634fe48826869db2745ccf5bc06c69
-SHA256 (rpm/i386/fedora/8.newkey/db4-4.6.21-1.fc8.i386.rpm) = f3472ef692fc44fe08596e7753b7ddca19a641991c271da1a909fb99f94bea31
-SIZE (rpm/i386/fedora/8.newkey/db4-4.6.21-1.fc8.i386.rpm) = 600082
+MD5 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.i386.rpm) = 668c3732accf196f5c19f0e247572451
+SHA256 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.i386.rpm) = 6a0b232d6dec37c0177865f608d76e33b96334ff245d4fa5a905e0ccec7b93e4
+SIZE (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.i386.rpm) = 600400
 MD5 (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.i386.rpm) = 2ae5f9ddc5e52a3d9f37778e978552d1
 SHA256 (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.i386.rpm) = f926be9b834b220912faed68d5f94121611749d8d841b3a9353c38abd2a0da34
 SIZE (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.i386.rpm) = 624121
@@ -40,9 +40,9 @@ SIZE (rpm/i386/fedora/8.newkey/fedora-release-8-5.noarch.rpm) = 27713
 MD5 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.i386.rpm) = e37e038cbf7895f6b269eb8350fc0243
 SHA256 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.i386.rpm) = f74bf41bfc757d08f0169b53c24e8fc575b4df006f66fd23d5e6b9e49d51b738
 SIZE (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.i386.rpm) = 121014
-MD5 (rpm/i386/fedora/8.newkey/freetype-2.3.5-3.fc8.i386.rpm) = 37ffb53b7ac613af6efe3849414e0584
-SHA256 (rpm/i386/fedora/8.newkey/freetype-2.3.5-3.fc8.i386.rpm) = 6305ed13a71ccb466347dbcab1d984c6f925dc2f01b51d6242a95bd8f54b0cab
-SIZE (rpm/i386/fedora/8.newkey/freetype-2.3.5-3.fc8.i386.rpm) = 338240
+MD5 (rpm/i386/fedora/8.newkey/freetype-2.3.5-4.fc8.i386.rpm) = cc7770959504cb8533519040cd298e6c
+SHA256 (rpm/i386/fedora/8.newkey/freetype-2.3.5-4.fc8.i386.rpm) = 3ce195d453c05b6fa55b51ee1d8ab3faffdce00bd15657a9555783f9433e5f65
+SIZE (rpm/i386/fedora/8.newkey/freetype-2.3.5-4.fc8.i386.rpm) = 338293
 MD5 (rpm/i386/fedora/8.newkey/gdbm-1.8.0-27.fc7.i386.rpm) = 87f8cf7101302a5a6dcf4d01a092554d
 SHA256 (rpm/i386/fedora/8.newkey/gdbm-1.8.0-27.fc7.i386.rpm) = 64a71534b516c4bee137f16674f430c2aa0c9496267527038cbd0cd4f11e95d9
 SIZE (rpm/i386/fedora/8.newkey/gdbm-1.8.0-27.fc7.i386.rpm) = 28008
@@ -61,9 +61,9 @@ SIZE (rpm/i386/fedora/8.newkey/glibc-common-2.7-2.i386.rpm) = 21935621
 MD5 (rpm/i386/fedora/8.newkey/grep-2.5.1-57.fc7.i386.rpm) = 7c793d4dedbb523e969eae5778ad5484
 SHA256 (rpm/i386/fedora/8.newkey/grep-2.5.1-57.fc7.i386.rpm) = 661b4644725ace95b356ac26f5ffefad3314148ef94776cc627cd83de7ca1c09
 SIZE (rpm/i386/fedora/8.newkey/grep-2.5.1-57.fc7.i386.rpm) = 179063
-MD5 (rpm/i386/fedora/8.newkey/info-4.11-1.fc8.i386.rpm) = b3a3481c55313d2b3a73f44920d36956
-SHA256 (rpm/i386/fedora/8.newkey/info-4.11-1.fc8.i386.rpm) = 186b1eef76d5c4a9feeeae4074fb1a81a041e522e8a159a8b5b77f196d392607
-SIZE (rpm/i386/fedora/8.newkey/info-4.11-1.fc8.i386.rpm) = 169837
+MD5 (rpm/i386/fedora/8.newkey/info-4.11-5.fc8.i386.rpm) = 003d66f42baf913195ca68bf8775aa9d
+SHA256 (rpm/i386/fedora/8.newkey/info-4.11-5.fc8.i386.rpm) = ffaaa2f27cd0b6b4bbca097acbdf03ecdceef6a441d008389f0d76f16085fed2
+SIZE (rpm/i386/fedora/8.newkey/info-4.11-5.fc8.i386.rpm) = 170439
 MD5 (rpm/i386/fedora/8.newkey/keyutils-libs-1.2-2.fc6.i386.rpm) = 41f4e1b26b1b61b3fe80c71a7200b5af
 SHA256 (rpm/i386/fedora/8.newkey/keyutils-libs-1.2-2.fc6.i386.rpm) = 77d338bcd593b754e3e0a558ad010667283e05cf5e48963ec6c7de40b21da86e
 SIZE (rpm/i386/fedora/8.newkey/keyutils-libs-1.2-2.fc6.i386.rpm) = 18006
@@ -139,9 +139,9 @@ SIZE (rpm/i386/fedora/8.newkey/compat-db-4.5.20-3.fc8.src.rpm) = 19442774
 MD5 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.src.rpm) = 12986d32dc59d07e9b1b0f66acc7509e
 SHA256 (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.src.rpm) = 588eece56d02901f7e3fee0ea60cfa5614456282eb19532d65d87edfed1bf6b4
 SIZE (rpm/i386/fedora/8.newkey/coreutils-6.9-18.fc8.src.rpm) = 5495705
-MD5 (rpm/i386/fedora/8.newkey/db4-4.6.21-1.fc8.src.rpm) = 2b138e83cd272d727c865455182d6cb0
-SHA256 (rpm/i386/fedora/8.newkey/db4-4.6.21-1.fc8.src.rpm) = 53bf301298147ccd83306c34f842ac0b915dc7547021e465e74b06f33f13c597
-SIZE (rpm/i386/fedora/8.newkey/db4-4.6.21-1.fc8.src.rpm) = 12166003
+MD5 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.src.rpm) = 5044230fa36968f097d807e2a3d83ba9
+SHA256 (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.src.rpm) = e8c0951e8e8bf8ae39b5422e52f0cb5d193bc0dd2fe677e304634d41eecc3839
+SIZE (rpm/i386/fedora/8.newkey/db4-4.6.21-2.fc8.src.rpm) = 12167754
 MD5 (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.src.rpm) = 106db6ab4c36aed61d01ee4159ec8e58
 SHA256 (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.src.rpm) = f5268a0d99e8315cef220459d354a739161edd8b1eb8e3a88637d6170064bedc
 SIZE (rpm/i386/fedora/8.newkey/e2fsprogs-1.40.4-2.fc8.src.rpm) = 4075714
@@ -154,9 +154,9 @@ SIZE (rpm/i386/fedora/8.newkey/fedora-release-8-5.src.rpm) = 30645
 MD5 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.src.rpm) = 880ea74c64035c8fc6eda6451bc371ca
 SHA256 (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.src.rpm) = fde05b4a1b8306f6e723f203163f258d94308c903e055bb2a69be052e4d5f16a
 SIZE (rpm/i386/fedora/8.newkey/filesystem-2.4.11-1.fc8.src.rpm) = 13891
-MD5 (rpm/i386/fedora/8.newkey/freetype-2.3.5-3.fc8.src.rpm) = a05a83b98e2247fbd09cef80377e4129
-SHA256 (rpm/i386/fedora/8.newkey/freetype-2.3.5-3.fc8.src.rpm) = 3cf29ce1a5532a7d01bbfbf888f88f36c2bbd1f27e415c5d031db2dc1ab9daa6
-SIZE (rpm/i386/fedora/8.newkey/freetype-2.3.5-3.fc8.src.rpm) = 1563133
+MD5 (rpm/i386/fedora/8.newkey/freetype-2.3.5-4.fc8.src.rpm) = a551558a3e3ccc6fe12c45d3a9490228
+SHA256 (rpm/i386/fedora/8.newkey/freetype-2.3.5-4.fc8.src.rpm) = eda6ca4dfa7125df1c76a3b83c3af0f5e23d4e7e05019749121550ff1687a2ae
+SIZE (rpm/i386/fedora/8.newkey/freetype-2.3.5-4.fc8.src.rpm) = 1565360
 MD5 (rpm/i386/fedora/8.newkey/gcc-4.1.2-33.src.rpm) = 8fc1024b557a5bffc563092bc749f7d9
 SHA256 (rpm/i386/fedora/8.newkey/gcc-4.1.2-33.src.rpm) = 9fe9876654f9aa7ce6dda9104cce60418119372599e20ee6e91ae6d349fe33da
 SIZE (rpm/i386/fedora/8.newkey/gcc-4.1.2-33.src.rpm) = 39325553
@@ -211,6 +211,9 @@ SIZE (rpm/i386/fedora/8.newkey/slang-2.1.2-2.fc8.src.rpm) = 1196480
 MD5 (rpm/i386/fedora/8.newkey/termcap-5.5-1.20060701.1.src.rpm) = f6fa7bb0f87fca07e846da9101f9a673
 SHA256 (rpm/i386/fedora/8.newkey/termcap-5.5-1.20060701.1.src.rpm) = 469e321fb319c1319d8c090f0adb7a24cbfac5d7b3742267efd358c42efc3ab0
 SIZE (rpm/i386/fedora/8.newkey/termcap-5.5-1.20060701.1.src.rpm) = 2685931
+MD5 (rpm/i386/fedora/8.newkey/texinfo-4.11-5.fc8.src.rpm) = 0c90f64710ca1312c4d6576d4a603746
+SHA256 (rpm/i386/fedora/8.newkey/texinfo-4.11-5.fc8.src.rpm) = 17652dddfb67ec15e32594eb91da01f5aa164dad7188b762ed22b4272a654c7f
+SIZE (rpm/i386/fedora/8.newkey/texinfo-4.11-5.fc8.src.rpm) = 1681780
 MD5 (rpm/i386/fedora/8.newkey/zlib-1.2.3-14.fc8.src.rpm) = 43128c77e14b4aceedf929985a8c659a
 SHA256 (rpm/i386/fedora/8.newkey/zlib-1.2.3-14.fc8.src.rpm) = 60c6cdac5934e8cf4e598331bf4149b53a9de6c7dc05f53465b151085b4257f6
 SIZE (rpm/i386/fedora/8.newkey/zlib-1.2.3-14.fc8.src.rpm) = 511416