Update gtk/glib to the version 2.0 and other related ports to the latest

versions.

PR:		35541, 35744, 35757
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

8 files changed, 21 insertions, 18 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 6439308..93b30b7 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -176,6 +176,7 @@
     SUBDIR += glg
     SUBDIR += glib12
     SUBDIR += glib13
+    SUBDIR += glib20
     SUBDIR += global
     SUBDIR += glui
     SUBDIR += gmake
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 4611d35..e78617d 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	0.12
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
 #MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 #		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 #		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,11 +19,12 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	glib-1.3.14:${PORTSDIR}/devel/glib13
+LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
 
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index 7fce910..7cba674 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-0.12.tar.bz2) = 09509179928e4558d2a71c954cf002ba
+MD5 (gnome2/atk-1.0.0.tar.bz2) = 885f39a89bbc96b587da893f61943a21
diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist
index cbd91d8..a657b8a 100644
--- a/devel/atk/pkg-plist
+++ b/devel/atk/pkg-plist
@@ -23,8 +23,9 @@ include/atk-1.0/atk/atktable.h
 include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
-lib/libatk.so
-lib/libatk.so.12
+lib/libatk-1.0.a
+lib/libatk-1.0.so
+lib/libatk-1.0.so.0
 libdata/pkgconfig/atk.pc
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index d6f9615..13b7c5a 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	pkgconfig
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.marcuscom.com/downloads/ \
-		http://www.freedesktop.org/software/pkgconfig/releases/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	glib-1.2.8/configure
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 22c628d..36afa87 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1 +1 @@
-MD5 (pkgconfig-0.10.0.tar.gz) = 8cf9270cee9a8d85ef977f9ac6fec927
+MD5 (gnome2/pkgconfig-0.11.0.tar.bz2) = 8ff14b6109c3062195e3539de84487e0
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index d6f9615..13b7c5a 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	pkgconfig
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.marcuscom.com/downloads/ \
-		http://www.freedesktop.org/software/pkgconfig/releases/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	glib-1.2.8/configure
diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo
index 22c628d..36afa87 100644
--- a/devel/pkgconfig/distinfo
+++ b/devel/pkgconfig/distinfo
@@ -1 +1 @@
-MD5 (pkgconfig-0.10.0.tar.gz) = 8cf9270cee9a8d85ef977f9ac6fec927
+MD5 (gnome2/pkgconfig-0.11.0.tar.bz2) = 8ff14b6109c3062195e3539de84487e0