Update to GNOME 2.2.

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

9 files changed, 66 insertions, 25 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 15742e824f4e..f2ba7999cbf5 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	eog2
-PORTVERSION=	1.0.4
+PORTVERSION=	2.2.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
 DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprint-2.0:${PORTSDIR}/print/libgnomeprint \
-		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
+		rsvg-2.4:${PORTSDIR}/graphics/librsvg2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index b0ea35e2c45b..fee173ee1497 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eog-1.0.4.tar.bz2) = f60d5ad2cb208cc18ee8b97868ed925e
+MD5 (gnome2/eog-2.2.0.tar.bz2) = e02256bc6837d1366a3aa5df66396dfa
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index c2a4beb4c2d6..f899a0d2620c 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -11,6 +11,7 @@ etc/gconf/schemas/eog.schemas
 libdata/bonobo/servers/GNOME_EOG.server
 libexec/eog-image-viewer
 share/gnome/applications/eog.desktop
+share/gnome/eog/glade/eog.glade
 share/gnome/gnome-2.0/ui/eog-image-view-ctrl-ui.xml
 share/gnome/gnome-2.0/ui/eog-image-view-ui.xml
 share/gnome/gnome-2.0/ui/eog-shell-ui.xml
@@ -19,11 +20,13 @@ share/gnome/help/eog/C/figures/eog_start_window.png
 share/gnome/help/eog/C/legal.xml
 share/gnome/idl/Eog.idl
 share/gnome/omf/eog/eog-C.omf
+@exec scrollkeeper-install %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/eog/down-right.png
 share/gnome/pixmaps/eog/orient-horizontal.png
 share/gnome/pixmaps/eog/orient-vertical.png
 share/gnome/pixmaps/eog/right-down.png
 share/gnome/pixmaps/gnome-eog.png
+share/locale/am/LC_MESSAGES/eog.mo
 share/locale/ar/LC_MESSAGES/eog.mo
 share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
@@ -39,11 +42,15 @@ share/locale/fi/LC_MESSAGES/eog.mo
 share/locale/fr/LC_MESSAGES/eog.mo
 share/locale/ga/LC_MESSAGES/eog.mo
 share/locale/gl/LC_MESSAGES/eog.mo
+share/locale/he/LC_MESSAGES/eog.mo
 share/locale/hu/LC_MESSAGES/eog.mo
 share/locale/it/LC_MESSAGES/eog.mo
 share/locale/ja/LC_MESSAGES/eog.mo
 share/locale/ko/LC_MESSAGES/eog.mo
 share/locale/lt/LC_MESSAGES/eog.mo
+share/locale/lv/LC_MESSAGES/eog.mo
+share/locale/mk/LC_MESSAGES/eog.mo
+share/locale/mn/LC_MESSAGES/eog.mo
 share/locale/ms/LC_MESSAGES/eog.mo
 share/locale/nl/LC_MESSAGES/eog.mo
 share/locale/nn/LC_MESSAGES/eog.mo
@@ -66,3 +73,6 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 @dirrm share/gnome/omf/eog
 @dirrm share/gnome/help/eog/C/figures
+@dirrm share/gnome/eog/glade
+@dirrm share/gnome/eog
+@unexec scrollkeeper-uninstall %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 6ba66e88a5d2..c04ea1863c9b 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	2.0.5
+PORTVERSION=	2.2.0.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,14 +23,12 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-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/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index 852f87a9b5b9..02e97a2a9516 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-2.0.5.tar.bz2) = dde3e7ad514acc33d02d7b4144d489c0
+MD5 (gnome2/libgnomecanvas-2.2.0.1.tar.bz2) = c7164feb78aee8c2c9c706fee1289963
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index b3183ba6427d..45b5c96519c3 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -15,15 +15,19 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
 lib/libglade/2.0/libcanvas.so
 lib/libgnomecanvas-2.a
 lib/libgnomecanvas-2.so
-lib/libgnomecanvas-2.so.0
+lib/libgnomecanvas-2.so.200
 libdata/pkgconfig/libgnomecanvas-2.0.pc
 share/doc/libgnomecanvas/c4.html
 share/doc/libgnomecanvas/index.html
 share/doc/libgnomecanvas/index.sgml
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-i18n.html
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-marshal.html
+share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
 share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html
+share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasellipse.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html
@@ -36,24 +40,29 @@ share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html
 share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html
+share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html
+share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -61,6 +70,7 @@ share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ro/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 5effe902d47b..de14aae480b3 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.0.1
+PORTVERSION=	2.2.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
 DIST_SUBDIR=	gnome2
 DISTNAME=	librsvg-${PORTVERSION}
 
@@ -19,8 +19,9 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gdk_pixbuf-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
+		gdk_pixbuf-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt
+RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -28,16 +29,17 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+PLIST_SUB=	GTK_VERSION="2.2.0"
 
-pre-patch:
+MAN1=		rsvg.1
+
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
-		 s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 421c90994e8b..e454f7fb1be4 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/librsvg-2.0.1.tar.bz2) = b4cdeb24049af67a82bb6cd329422364
+MD5 (gnome2/librsvg-2.2.3.tar.bz2) = cdd58f6ce2ce4b5e629501b864f513c2
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 90a16992c884..68df08ccb89a 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -1,8 +1,29 @@
+bin/rsvg
 include/librsvg-2/librsvg/librsvg-features.h
 include/librsvg-2/librsvg/rsvg.h
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
 lib/librsvg-2.a
 lib/librsvg-2.so
-lib/librsvg-2.so.2
+lib/librsvg-2.so.4
 libdata/pkgconfig/librsvg-2.0.pc
+share/doc/librsvg/html/home.png
+share/doc/librsvg/html/i909.html
+share/doc/librsvg/html/index.html
+share/doc/librsvg/html/index.sgml
+share/doc/librsvg/html/left.png
+share/doc/librsvg/html/r22.html
+share/doc/librsvg/html/r320.html
+share/doc/librsvg/html/r354.html
+share/doc/librsvg/html/right.png
+share/doc/librsvg/html/rsvg-convenience-functions.html
+share/doc/librsvg/html/rsvg-core-api.html
+share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html
+share/doc/librsvg/html/rsvg.html
+share/doc/librsvg/html/up.png
+@dirrm share/doc/librsvg/html
+@dirrm share/doc/librsvg
 @dirrm include/librsvg-2/librsvg
 @dirrm include/librsvg-2
+@exec gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true
+@unexec gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true