Update to 2.4.8.

Tested with:	acroread7

3 files changed, 58 insertions, 23 deletions

diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index b9eed8e465a0..86d7da7f9ea6 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	glib2
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.4.8
+PORTREVISION=	0
 CATEGORIES=	devel linux
-
-MASTER_SITES=	\
-		http://mirrors.kernel.org/fedora/core/1/i386/os/Fedora/RPMS/ \
-		http://distro.ibilio.org/pub/linux/distributions/fedora/linux/core/1/i386/os/Fedora/RPMS/
+MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
+MASTER_SITE_SUBDIR=	updates/3/i386
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
@@ -20,6 +18,8 @@ COMMENT=	Version 2.X Linux/i386 binary port of GLib
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${PKGDIR}/pkg-plist
 RESTRICTED=	"binary under GNU LGPL without accompanying source"
-RPM_SET=	glib2-${PORTVERSION}-1.1.i386.rpm
+RPM_SET=	glib2-${PORTVERSION}-1.fc3.i386.rpm
+
+PLIST_SUB+=	LIBVERSION="400.8" PORTVERSION="${PORTVERSION}"
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-glib2/distinfo.i386 b/devel/linux-glib2/distinfo.i386
index c8691c51568b..fdb8957032bf 100644
--- a/devel/linux-glib2/distinfo.i386
+++ b/devel/linux-glib2/distinfo.i386
@@ -1,3 +1,3 @@
-MD5 (rpm/glib2-2.2.3-1.1.i386.rpm) = 73c3ac72d88c2cd1231c947a6e9bcfec
-SHA256 (rpm/glib2-2.2.3-1.1.i386.rpm) = b664b6f9aa7e4f508d5d24a8a8d0aae1840d648da980beda30bed22359bbba6f
-SIZE (rpm/glib2-2.2.3-1.1.i386.rpm) = 417144
+MD5 (rpm/glib2-2.4.8-1.fc3.i386.rpm) = 989f41fb5bb1c2ef166916dc9d5e7a59
+SHA256 (rpm/glib2-2.4.8-1.fc3.i386.rpm) = 13d869469afa0b498750f7832b64c777198d4ad532aac03e6a0de9d6d46f7a24
+SIZE (rpm/glib2-2.4.8-1.fc3.i386.rpm) = 488888
diff --git a/devel/linux-glib2/pkg-plist b/devel/linux-glib2/pkg-plist
index 31797504cbc9..c0c9774b98ed 100644
--- a/devel/linux-glib2/pkg-plist
+++ b/devel/linux-glib2/pkg-plist
@@ -1,19 +1,20 @@
 etc/profile.d/glib2.csh
 etc/profile.d/glib2.sh
 usr/lib/libglib-2.0.so.0
-usr/lib/libglib-2.0.so.0.200.3
+usr/lib/libglib-2.0.so.0.%%LIBVERSION%%
 usr/lib/libgmodule-2.0.so.0
-usr/lib/libgmodule-2.0.so.0.200.3
+usr/lib/libgmodule-2.0.so.0.%%LIBVERSION%%
 usr/lib/libgobject-2.0.so.0
-usr/lib/libgobject-2.0.so.0.200.3
+usr/lib/libgobject-2.0.so.0.%%LIBVERSION%%
 usr/lib/libgthread-2.0.so.0
-usr/lib/libgthread-2.0.so.0.200.3
-usr/share/doc/glib2-2.2.3/AUTHORS
-usr/share/doc/glib2-2.2.3/COPYING
-usr/share/doc/glib2-2.2.3/ChangeLog
-usr/share/doc/glib2-2.2.3/NEWS
-usr/share/doc/glib2-2.2.3/README
+usr/lib/libgthread-2.0.so.0.%%LIBVERSION%%
+usr/share/doc/glib2-%%PORTVERSION%%/AUTHORS
+usr/share/doc/glib2-%%PORTVERSION%%/COPYING
+usr/share/doc/glib2-%%PORTVERSION%%/ChangeLog
+usr/share/doc/glib2-%%PORTVERSION%%/NEWS
+usr/share/doc/glib2-%%PORTVERSION%%/README
 usr/share/locale/am/LC_MESSAGES/glib20.mo
+usr/share/locale/ar/LC_MESSAGES/glib20.mo
 usr/share/locale/az/LC_MESSAGES/glib20.mo
 usr/share/locale/be/LC_MESSAGES/glib20.mo
 usr/share/locale/bg/LC_MESSAGES/glib20.mo
@@ -24,6 +25,8 @@ usr/share/locale/cy/LC_MESSAGES/glib20.mo
 usr/share/locale/da/LC_MESSAGES/glib20.mo
 usr/share/locale/de/LC_MESSAGES/glib20.mo
 usr/share/locale/el/LC_MESSAGES/glib20.mo
+usr/share/locale/en_CA/LC_MESSAGES/glib20.mo
+usr/share/locale/en_GB/LC_MESSAGES/glib20.mo
 usr/share/locale/eo/LC_MESSAGES/glib20.mo
 usr/share/locale/es/LC_MESSAGES/glib20.mo
 usr/share/locale/et/LC_MESSAGES/glib20.mo
@@ -31,23 +34,29 @@ usr/share/locale/eu/LC_MESSAGES/glib20.mo
 usr/share/locale/fa/LC_MESSAGES/glib20.mo
 usr/share/locale/fi/LC_MESSAGES/glib20.mo
 usr/share/locale/fr/LC_MESSAGES/glib20.mo
+usr/share/locale/ga/LC_MESSAGES/glib20.mo
 usr/share/locale/gl/LC_MESSAGES/glib20.mo
+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/id/LC_MESSAGES/glib20.mo
 usr/share/locale/is/LC_MESSAGES/glib20.mo
 usr/share/locale/it/LC_MESSAGES/glib20.mo
 usr/share/locale/ja/LC_MESSAGES/glib20.mo
 usr/share/locale/ko/LC_MESSAGES/glib20.mo
-usr/share/locale/li/LC_MESSAGES/glib20.mo
+usr/share/locale/lt/LC_MESSAGES/glib20.mo
 usr/share/locale/lv/LC_MESSAGES/glib20.mo
 usr/share/locale/mk/LC_MESSAGES/glib20.mo
-usr/share/locale/ml/LC_MESSAGES/glib20.mo
 usr/share/locale/mn/LC_MESSAGES/glib20.mo
 usr/share/locale/ms/LC_MESSAGES/glib20.mo
+usr/share/locale/nb/LC_MESSAGES/glib20.mo
+usr/share/locale/ne/LC_MESSAGES/glib20.mo
 usr/share/locale/nl/LC_MESSAGES/glib20.mo
 usr/share/locale/nn/LC_MESSAGES/glib20.mo
 usr/share/locale/no/LC_MESSAGES/glib20.mo
+usr/share/locale/or/LC_MESSAGES/glib20.mo
+usr/share/locale/pa/LC_MESSAGES/glib20.mo
 usr/share/locale/pl/LC_MESSAGES/glib20.mo
 usr/share/locale/pt/LC_MESSAGES/glib20.mo
 usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
@@ -58,17 +67,21 @@ usr/share/locale/sl/LC_MESSAGES/glib20.mo
 usr/share/locale/sq/LC_MESSAGES/glib20.mo
 usr/share/locale/sr/LC_MESSAGES/glib20.mo
 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/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/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-2.2.3
 @unexec rmdir %D/usr/share/locale/am/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/am >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/ar/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/ar >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/az/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/az >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES >/dev/null 2>&1 || true
@@ -77,16 +90,28 @@ usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @unexec rmdir %D/usr/share/locale/bn >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/cy >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/en/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/en >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/en_CA/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/en_CA >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/en_GB/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/en_GB >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/eu >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/fa >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/ga >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/gu/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/gu >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/he/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/he >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/hi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/hr >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/lt >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/lv >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES >/dev/null 2>&1 || true
@@ -97,8 +122,16 @@ usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @unexec rmdir %D/usr/share/locale/mn >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/ms >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/nb/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/nb >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/ne/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/ne >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/nn >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/or/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/or >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/pa/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/pa >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/sq >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/sr@Latn/LC_MESSAGES >/dev/null 2>&1 || true
@@ -107,5 +140,7 @@ usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @unexec rmdir %D/usr/share/locale/ta >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/vi >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES >/dev/null 2>&1 || true
+@unexec rmdir %D/usr/share/locale/wa >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/yi/LC_MESSAGES >/dev/null 2>&1 || true
 @unexec rmdir %D/usr/share/locale/yi >/dev/null 2>&1 || true