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>

4 files changed, 35 insertions, 33 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f8ea40ea1fe4..33b5623741da 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	1.3.14
+PORTVERSION=	2.0.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,8 +20,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	atk.12:${PORTSDIR}/devel/atk \
-		pango.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS=	atk-1.0.0:${PORTSDIR}/devel/atk \
+		pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -33,7 +33,9 @@ USE_XPM=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
+			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 3cec335d7c87..49a25add2423 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-1.3.14.tar.bz2) = 2f1408386e6d79ea55d2a61494867312
+MD5 (gnome2/gtk+-2.0.0.tar.bz2) = 3afdfc83cf2099af1811e261a82c7ccb
diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae
index eeb3f3e7be19..0bb2e2fb8dfe 100644
--- a/x11-toolkits/gtk30/files/patch-ae
+++ b/x11-toolkits/gtk30/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jan 30 05:58:27 2002
-+++ configure	Tue Feb 12 11:19:52 2002
-@@ -9783,7 +9783,7 @@
+--- configure.orig	Fri Mar  8 19:22:14 2002
++++ configure	Mon Mar 11 12:03:39 2002
+@@ -9788,7 +9788,7 @@
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  CATOBJEXT=.mo
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 790e5444371b..e2696d2d1382 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -193,28 +193,28 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-am-et.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-cyrillic-translit.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-hangul.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-inuktitut.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ipa.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-thai-broken.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ti-er.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-ti-et.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-viqr.so
-lib/gtk-2.0/immodules/%%GTK_VERSION%%/im-xim.so
-lib/libgdk-x11-1.3.a
-lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.14
-lib/libgdk_pixbuf-1.3.a
-lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.14
-lib/libgdk_pixbuf_xlib-1.3.a
-lib/libgdk_pixbuf_xlib-1.3.so
-lib/libgdk_pixbuf_xlib-1.3.so.14
-lib/libgtk-x11-1.3.a
-lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.14
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-hangul.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/libgdk-x11-2.0.a
+lib/libgdk-x11-2.0.so
+lib/libgdk-x11-2.0.so.0
+lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.so
+lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.so
+lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgtk-x11-2.0.a
+lib/libgtk-x11-2.0.so
+lib/libgtk-x11-2.0.so.0
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -225,6 +225,7 @@ share/aclocal/gtk-2.0.m4
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/ca/LC_MESSAGES/gtk20.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
+share/locale/cy/LC_MESSAGES/gtk20.mo
 share/locale/da/LC_MESSAGES/gtk20.mo
 share/locale/de/LC_MESSAGES/gtk20.mo
 share/locale/el/LC_MESSAGES/gtk20.mo
@@ -274,9 +275,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm share/themes/Default/gtk-2.0-key
 @dirrm share/themes/Default/gtk-2.0
 @dirrm share/themes/Default
-@dirrm lib/gtk-2.0/immodules/%%GTK_VERSION%%
-@dirrm lib/gtk-2.0/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%
 @dirrm lib/gtk-2.0
 @dirrm include/gtk-2.0/gtk