Update to GNOME 2.2.

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

3 files changed, 33 insertions, 10 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 5effe90..de14aae 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 421c909..e454f7f 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 90a1699..68df08c 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