Update to GNOME 2.2.

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

5 files changed, 81 insertions, 21 deletions

diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 5b20ed3bce09..6ca7fa395a88 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
 #MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 #		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 #		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -20,19 +20,19 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-static
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
+CONFIGURE_ARGS=	--enable-static \
+		--disable-gtk-doc \
+		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
-
 .include <bsd.port.mk>
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index e6cf774217f5..50cdc842bcf9 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-1.0.3.tar.bz2) = 9041396017f8207b8aa2bece27eb5ebb
+MD5 (gnome2/atk-1.2.2.tar.bz2) = 2c42e4322d1a199cdd7479fb1d09879c
diff --git a/devel/atk/files/patch-Makefile.in b/devel/atk/files/patch-Makefile.in
index be30e08fdddc..90d6da723065 100644
--- a/devel/atk/files/patch-Makefile.in
+++ b/devel/atk/files/patch-Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Wed Aug  1 20:32:06 2001
-+++ Makefile.in	Wed Aug  1 20:33:45 2001
-@@ -96,7 +96,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
+--- Makefile.in.orig	Fri Nov  8 17:09:46 2002
++++ Makefile.in	Fri Nov  8 17:10:22 2002
+@@ -116,7 +116,7 @@
+ atktargetlib = @atktargetlib@
+ ms_librarian = @ms_librarian@
  
--SUBDIRS = atk tests docs
-+SUBDIRS = atk
+-SUBDIRS = atk tests docs po
++SUBDIRS = atk docs po
  
- EXTRA_DIST =  	atk-uninstalled.pc.in		atk.pc.in
+ EXTRA_DIST =  	atk-uninstalled.pc.in		atk.pc.in			atk.spec.in			atk.spec			atk-zip.sh
  
diff --git a/devel/atk/files/patch-docs_Makefile.in b/devel/atk/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..b40046ee22c3
--- /dev/null
+++ b/devel/atk/files/patch-docs_Makefile.in
@@ -0,0 +1,10 @@
+--- docs/Makefile.in.orig	Fri Jan 24 16:45:09 2003
++++ docs/Makefile.in	Fri Jan 24 16:45:09 2003
+@@ -274,6 +274,7 @@
+ dist-hook-local: all-local
+ 
+ @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
++@ENABLE_GTK_DOC_FALSE@all-local:
+ 
+ #### scan ####
+ 
diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist
index a657b8a6397a..43664cddbf4e 100644
--- a/devel/atk/pkg-plist
+++ b/devel/atk/pkg-plist
@@ -15,6 +15,7 @@ include/atk-1.0/atk/atkobjectfactory.h
 include/atk-1.0/atk/atkregistry.h
 include/atk-1.0/atk/atkrelation.h
 include/atk-1.0/atk/atkrelationset.h
+include/atk-1.0/atk/atkrelationtype.h
 include/atk-1.0/atk/atkselection.h
 include/atk-1.0/atk/atkstate.h
 include/atk-1.0/atk/atkstateset.h
@@ -25,7 +26,59 @@ include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk-1.0.a
 lib/libatk-1.0.so
-lib/libatk-1.0.so.0
+lib/libatk-1.0.so.200
 libdata/pkgconfig/atk.pc
+share/doc/atk/atk-atkstate.html
+share/doc/atk/atk.html
+share/doc/atk/atkaction.html
+share/doc/atk/atkcomponent.html
+share/doc/atk/atkdocument.html
+share/doc/atk/atkeditabletext.html
+share/doc/atk/atkhypertext.html
+share/doc/atk/atkimage.html
+share/doc/atk/atkgobjectaccessible.html
+share/doc/atk/atkhyperlink.html
+share/doc/atk/atknoopobject.html
+share/doc/atk/atknoopobjectfactory.html
+share/doc/atk/atkobject.html
+share/doc/atk/atkobjectfactory.html
+share/doc/atk/atkregistry.html
+share/doc/atk/atkrelation.html
+share/doc/atk/atkrelationset.html
+share/doc/atk/atkselection.html
+share/doc/atk/atkstateset.html
+share/doc/atk/atkstreamablecontent.html
+share/doc/atk/atktable.html
+share/doc/atk/atktext.html
+share/doc/atk/atkutil.html
+share/doc/atk/atkvalue.html
+share/doc/atk/book1.html
+share/doc/atk/index.sgml
+share/locale/bg/LC_MESSAGES/atk10.mo
+share/locale/ca/LC_MESSAGES/atk10.mo
+share/locale/cs/LC_MESSAGES/atk10.mo
+share/locale/da/LC_MESSAGES/atk10.mo
+share/locale/de/LC_MESSAGES/atk10.mo
+share/locale/el/LC_MESSAGES/atk10.mo
+share/locale/en_GB/LC_MESSAGES/atk10.mo
+share/locale/es/LC_MESSAGES/atk10.mo
+share/locale/fi/LC_MESSAGES/atk10.mo
+share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/he/LC_MESSAGES/atk10.mo
+share/locale/hu/LC_MESSAGES/atk10.mo
+share/locale/it/LC_MESSAGES/atk10.mo
+share/locale/ko/LC_MESSAGES/atk10.mo
+share/locale/lv/LC_MESSAGES/atk10.mo
+share/locale/ms/LC_MESSAGES/atk10.mo
+share/locale/nl/LC_MESSAGES/atk10.mo
+share/locale/no/LC_MESSAGES/atk10.mo
+share/locale/pl/LC_MESSAGES/atk10.mo
+share/locale/ru/LC_MESSAGES/atk10.mo
+share/locale/sq/LC_MESSAGES/atk10.mo
+share/locale/sv/LC_MESSAGES/atk10.mo
+share/locale/uk/LC_MESSAGES/atk10.mo
+share/locale/vi/LC_MESSAGES/atk10.mo
+share/locale/zh_CN/LC_MESSAGES/atk10.mo
+@dirrm share/doc/atk
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0