Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

4 files changed, 20 insertions, 35 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index a07cd062dae9..4118b66d802d 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.0.7
+PORTVERSION=	2.2.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.0,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -35,7 +35,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index cd80c6bbff02..4ec1b98ee324 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-2.0.7.tar.bz2) = 5882b1e729f57cb18af653a2f504197b
+MD5 (gnome2/glib-2.2.1.tar.bz2) = 42406a17819080326e105f8333963b97
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index fc794d3256de..659943e02833 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Mar 29 01:26:14 2002
-+++ configure	Fri Apr 26 09:01:50 2002
-@@ -10597,6 +10597,7 @@
+--- configure.orig	Mon Dec  2 16:34:49 2002
++++ configure	Tue Dec  3 18:21:22 2002
+@@ -11259,6 +11259,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,23 +8,3 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -17619,8 +17620,8 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		fi
- 		;;
--	*-freebsd2.2*)
--		G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
-+	*-freebsd*)
-+		G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
- 
- 		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
- 		# -mthreads flag.
-@@ -17702,7 +17703,7 @@
- 	     *-*-openbsd* | *-*-freebsd*)
- 	        # FreeBSD and OpenBSD want us to use the -pthread flag
-                 # instead of linking to -lc_r and libtool enforces that.
--		G_THREAD_LIBS="-pthread"
-+		G_THREAD_LIBS="$PTHREAD_LIBS"
- 		;;
-              *)
- 		for thread_lib in "" pthread pthread32 pthreads thread dce; do
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 8ec95ad45521..52d8bb07ad1c 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -28,6 +28,7 @@ include/glib-2.0/glib/gmessages.h
 include/glib-2.0/glib/gnode.h
 include/glib-2.0/glib/gpattern.h
 include/glib-2.0/glib/gprimes.h
+include/glib-2.0/glib/gprintf.h
 include/glib-2.0/glib/gqsort.h
 include/glib-2.0/glib/gquark.h
 include/glib-2.0/glib/gqueue.h
@@ -68,16 +69,16 @@ include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libglib-2.0.a
 lib/libglib-2.0.so
-lib/libglib-2.0.so.0
+lib/libglib-2.0.so.200
 lib/libgmodule-2.0.a
 lib/libgmodule-2.0.so
-lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so.200
 lib/libgobject-2.0.a
 lib/libgobject-2.0.so
-lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so.200
 lib/libgthread-2.0.a
 lib/libgthread-2.0.so
-lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so.200
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -85,20 +86,26 @@ libdata/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/po/Makefile.in.in
-share/locale/ar/LC_MESSAGES/glib20.mo
+share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/bg/LC_MESSAGES/glib20.mo
+share/locale/bn/LC_MESSAGES/glib20.mo
 share/locale/ca/LC_MESSAGES/glib20.mo
 share/locale/cs/LC_MESSAGES/glib20.mo
+share/locale/da/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
 share/locale/el/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
+share/locale/et/LC_MESSAGES/glib20.mo
 share/locale/eu/LC_MESSAGES/glib20.mo
+share/locale/fi/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo
 share/locale/gl/LC_MESSAGES/glib20.mo
+share/locale/hi/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
+share/locale/mn/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
@@ -110,6 +117,7 @@ share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
 share/locale/sl/LC_MESSAGES/glib20.mo
+share/locale/sq/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/LC_MESSAGES/glib20.mo
 share/locale/tr/LC_MESSAGES/glib20.mo