1. Upgrade linux infrostructure ports from FC3 to FC4.

2. Introduce gtk2-engines into x11-toolkits/linux-gtk2.     [1]

Requested by:	netchild [1]
Approved by:	netchild (mentor, implicit)

3 files changed, 15 insertions, 81 deletions

diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index dcc852d3f8e0..2b3a44d9d737 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	glib2
-PORTVERSION=	2.4.8
-PORTREVISION=	2
+PORTVERSION=	2.6.6
 CATEGORIES=	devel linux
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc3
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
 
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	3
+LINUX_DIST_VER=	4
 INSTALLS_SHLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
-PLIST_SUB+=	LIBVERSION="400.8" PORTVERSION="${PORTVERSION}"
+PLIST_SUB+=	LIBVERSION="600.6" PORTVERSION="${PORTVERSION}"
 
 .include <bsd.port.mk>
diff --git a/devel/linux-glib2/distinfo.i386 b/devel/linux-glib2/distinfo.i386
index b5799d4f2b0e..fc7ca7f02606 100644
--- a/devel/linux-glib2/distinfo.i386
+++ b/devel/linux-glib2/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.i386.rpm) = 989f41fb5bb1c2ef166916dc9d5e7a59
-SHA256 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.i386.rpm) = 13d869469afa0b498750f7832b64c777198d4ad532aac03e6a0de9d6d46f7a24
-SIZE (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.i386.rpm) = 488888
-MD5 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.src.rpm) = 4e5e474cf8feb35307d645eb9f8dbfa4
-SHA256 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.src.rpm) = c45711fa46ffd149ac0c56fb8337eb56404844d594e033d0958fe2b3b542bf39
-SIZE (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.src.rpm) = 2159065
+MD5 (rpm/i386/fedora/4/glib2-2.6.6-1.i386.rpm) = eec61332ae2e1c7c4dcb48fe087b1091
+SHA256 (rpm/i386/fedora/4/glib2-2.6.6-1.i386.rpm) = 05ed8873c533b2399fe610dec01f410b7fce5f26c46c71875d2a88c2e5e8c613
+SIZE (rpm/i386/fedora/4/glib2-2.6.6-1.i386.rpm) = 582011
+MD5 (rpm/i386/fedora/4/glib2-2.6.6-1.src.rpm) = 35ce90411c0907a8bfebf22ede7c217f
+SHA256 (rpm/i386/fedora/4/glib2-2.6.6-1.src.rpm) = 2a2e8f06eb22895c4123e0dd697bd52d31078a1744d1ad1a29ca664dd27496af
+SIZE (rpm/i386/fedora/4/glib2-2.6.6-1.src.rpm) = 2393186
diff --git a/devel/linux-glib2/pkg-plist b/devel/linux-glib2/pkg-plist
index cea8ba446817..23460878b65e 100644
--- a/devel/linux-glib2/pkg-plist
+++ b/devel/linux-glib2/pkg-plist
@@ -41,6 +41,7 @@ usr/share/locale/gu/LC_MESSAGES/glib20.mo
 usr/share/locale/he/LC_MESSAGES/glib20.mo
 usr/share/locale/hi/LC_MESSAGES/glib20.mo
 usr/share/locale/hr/LC_MESSAGES/glib20.mo
+usr/share/locale/hu/LC_MESSAGES/glib20.mo
 usr/share/locale/id/LC_MESSAGES/glib20.mo
 usr/share/locale/is/LC_MESSAGES/glib20.mo
 usr/share/locale/it/LC_MESSAGES/glib20.mo
@@ -63,6 +64,7 @@ usr/share/locale/pt/LC_MESSAGES/glib20.mo
 usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
 usr/share/locale/ro/LC_MESSAGES/glib20.mo
 usr/share/locale/ru/LC_MESSAGES/glib20.mo
+usr/share/locale/rw/LC_MESSAGES/glib20.mo
 usr/share/locale/sk/LC_MESSAGES/glib20.mo
 usr/share/locale/sl/LC_MESSAGES/glib20.mo
 usr/share/locale/sq/LC_MESSAGES/glib20.mo
@@ -71,81 +73,14 @@ usr/share/locale/sr@Latn/LC_MESSAGES/glib20.mo
 usr/share/locale/sr@ije/LC_MESSAGES/glib20.mo
 usr/share/locale/sv/LC_MESSAGES/glib20.mo
 usr/share/locale/ta/LC_MESSAGES/glib20.mo
+usr/share/locale/te/LC_MESSAGES/glib20.mo
+usr/share/locale/tl/LC_MESSAGES/glib20.mo
 usr/share/locale/tr/LC_MESSAGES/glib20.mo
 usr/share/locale/uk/LC_MESSAGES/glib20.mo
 usr/share/locale/vi/LC_MESSAGES/glib20.mo
 usr/share/locale/wa/LC_MESSAGES/glib20.mo
+usr/share/locale/xh/LC_MESSAGES/glib20.mo
 usr/share/locale/yi/LC_MESSAGES/glib20.mo
 usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
 usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm usr/share/doc/glib2-%%PORTVERSION%%
-@dirrmtry usr/share/locale/am/LC_MESSAGES
-@dirrmtry usr/share/locale/am
-@dirrmtry usr/share/locale/ar/LC_MESSAGES
-@dirrmtry usr/share/locale/ar
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-@dirrmtry usr/share/locale/bg/LC_MESSAGES
-@dirrmtry usr/share/locale/bg
-@dirrmtry usr/share/locale/bn/LC_MESSAGES
-@dirrmtry usr/share/locale/bn
-@dirrmtry usr/share/locale/bs/LC_MESSAGES
-@dirrmtry usr/share/locale/bs
-@dirrmtry usr/share/locale/cy/LC_MESSAGES
-@dirrmtry usr/share/locale/cy
-@dirrmtry usr/share/locale/en/LC_MESSAGES
-@dirrmtry usr/share/locale/en
-@dirrmtry usr/share/locale/en_CA/LC_MESSAGES
-@dirrmtry usr/share/locale/en_CA
-@dirrmtry usr/share/locale/en_GB/LC_MESSAGES
-@dirrmtry usr/share/locale/en_GB
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/fa/LC_MESSAGES
-@dirrmtry usr/share/locale/fa
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/gu/LC_MESSAGES
-@dirrmtry usr/share/locale/gu
-@dirrmtry usr/share/locale/he/LC_MESSAGES
-@dirrmtry usr/share/locale/he
-@dirrmtry usr/share/locale/hi/LC_MESSAGES
-@dirrmtry usr/share/locale/hi
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/lv/LC_MESSAGES
-@dirrmtry usr/share/locale/lv
-@dirrmtry usr/share/locale/mk/LC_MESSAGES
-@dirrmtry usr/share/locale/mk
-@dirrmtry usr/share/locale/ml/LC_MESSAGES
-@dirrmtry usr/share/locale/ml
-@dirrmtry usr/share/locale/mn/LC_MESSAGES
-@dirrmtry usr/share/locale/mn
-@dirrmtry usr/share/locale/ms/LC_MESSAGES
-@dirrmtry usr/share/locale/ms
-@dirrmtry usr/share/locale/nb/LC_MESSAGES
-@dirrmtry usr/share/locale/nb
-@dirrmtry usr/share/locale/ne/LC_MESSAGES
-@dirrmtry usr/share/locale/ne
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/or/LC_MESSAGES
-@dirrmtry usr/share/locale/or
-@dirrmtry usr/share/locale/pa/LC_MESSAGES
-@dirrmtry usr/share/locale/pa
-@dirrmtry usr/share/locale/sq/LC_MESSAGES
-@dirrmtry usr/share/locale/sq
-@dirrmtry usr/share/locale/sr@Latn/LC_MESSAGES
-@dirrmtry usr/share/locale/sr@Latn
-@dirrmtry usr/share/locale/sr@ije/LC_MESSAGES
-@dirrmtry usr/share/locale/sr@ije
-@dirrmtry usr/share/locale/ta/LC_MESSAGES
-@dirrmtry usr/share/locale/ta
-@dirrmtry usr/share/locale/vi/LC_MESSAGES
-@dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/yi/LC_MESSAGES
-@dirrmtry usr/share/locale/yi