Update to GNOME 2.2.

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

5 files changed, 38 insertions, 38 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b476e968af4a..0c008a6dba21 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.9
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -21,8 +21,8 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	atk-1.0.0:${PORTSDIR}/devel/atk \
-		pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \
+LIB_DEPENDS=	atk-1.0.200:${PORTSDIR}/devel/atk \
+		pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
@@ -33,23 +33,28 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-static \
-		--with-xinput=xfree
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
+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="2.0.0"
+PLIST_SUB=	GTK_VERSION="2.2.0"
 
 MAN1=		gdk-pixbuf-csource.1
 
-post-extract:
+post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \
 		xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
+	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|Xft\.h|Xft2.h|g'
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 pre-build:
 	${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index e289dc9500c9..72dd41ecd3b7 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2
+MD5 (gnome2/gtk+-2.2.1.tar.bz2) = dfd5755fddb26a46c96bfaa813280ac4
diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae
index 591824a7d638..f195f07b43c6 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Thu May 23 17:20:40 2002
-+++ configure	Sat Jun  1 14:26:00 2002
-@@ -7192,6 +7192,7 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,3 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10107,7 +10108,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
--	         DATADIRNAME=lib
-+	         DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	      INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index b3df848c80aa..b0be157797ed 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- gtk/Makefile.in.orig	Sat Jun  1 14:27:02 2002
-+++ gtk/Makefile.in	Sat Jun  1 14:29:10 2002
-@@ -182,7 +182,7 @@
+--- gtk/Makefile.in.orig	Thu Dec 12 12:07:53 2002
++++ gtk/Makefile.in	Thu Dec 12 12:08:43 2002
+@@ -183,7 +183,7 @@
  	-DG_LOG_DOMAIN=\"Gtk\"				\
  	-DGTK_LIBDIR=\"$(libdir)\"			\
  	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
 -	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
 +	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"		\
- 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
  	-DGTK_VERSION=\"@GTK_VERSION@\"			\
  	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\
+ 	-DGTK_HOST=\"@host@\"	                        \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 143e7096e46e..b9b4f883a8e2 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,10 +1,14 @@
 bin/gdk-pixbuf-csource
 bin/gtk-query-immodules-2.0
+bin/gdk-pixbuf-query-loaders
+etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
+include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
@@ -12,6 +16,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
 include/gtk-2.0/gdk/gdkcursor.h
+include/gtk-2.0/gdk/gdkdisplay.h
+include/gtk-2.0/gdk/gdkdisplaymanager.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
 include/gtk-2.0/gdk/gdkenumtypes.h
@@ -30,6 +36,7 @@ include/gtk-2.0/gdk/gdkprivate.h
 include/gtk-2.0/gdk/gdkproperty.h
 include/gtk-2.0/gdk/gdkregion.h
 include/gtk-2.0/gdk/gdkrgb.h
+include/gtk-2.0/gdk/gdkscreen.h
 include/gtk-2.0/gdk/gdkselection.h
 include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
@@ -181,6 +188,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
@@ -205,16 +213,16 @@ 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-x11-2.0.so.200
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.0
+lib/libgdk_pixbuf-2.0.so.200
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.0
+lib/libgdk_pixbuf_xlib-2.0.so.200
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.0
+lib/libgtk-x11-2.0.so.200
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -223,7 +231,6 @@ libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
 share/aclocal/gtk-2.0.m4
 share/locale/am/LC_MESSAGES/gtk20.mo
-share/locale/ar/LC_MESSAGES/gtk20.mo
 share/locale/az/LC_MESSAGES/gtk20.mo
 share/locale/be/LC_MESSAGES/gtk20.mo
 share/locale/bg/LC_MESSAGES/gtk20.mo
@@ -253,6 +260,8 @@ share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20.mo
 share/locale/lv/LC_MESSAGES/gtk20.mo
+share/locale/mk/LC_MESSAGES/gtk20.mo
+share/locale/mn/LC_MESSAGES/gtk20.mo
 share/locale/ms/LC_MESSAGES/gtk20.mo
 share/locale/nl/LC_MESSAGES/gtk20.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
@@ -267,6 +276,7 @@ share/locale/sl/LC_MESSAGES/gtk20.mo
 share/locale/sp/LC_MESSAGES/gtk20.mo
 share/locale/sr/LC_MESSAGES/gtk20.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
+share/locale/ta/LC_MESSAGES/gtk20.mo
 share/locale/tr/LC_MESSAGES/gtk20.mo
 share/locale/uk/LC_MESSAGES/gtk20.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo