Update to GNOME 2.2.

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

3 files changed, 71 insertions, 8 deletions

diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 66f514e93a23..00794e595390 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	2.0.1
+PORTVERSION=	2.2.0
 CATEGORIES=	devel
 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
@@ -22,6 +22,8 @@ USE_BISON=	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" \
@@ -29,9 +31,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
 
-pre-patch:
-	@find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
-
 .include <bsd.port.mk>
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 4336cdd2f3b2..ae18e5ce86fa 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-2.0.1.tar.bz2) = ef7b5d5621086b7ae9627960b52507fa
+MD5 (gnome2/libbonobo-2.2.0.tar.bz2) = 4a17e033d67fa9ed353108a95670794b
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 85ad3d4256ef..9beb372763d6 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -40,6 +40,63 @@ lib/orbit-2.0/Bonobo_module.so
 libdata/bonobo/servers/Bonobo_Moniker_std.server
 libdata/bonobo/servers/Bonobo_Sample_Echo.server
 libdata/pkgconfig/libbonobo-2.0.pc
+share/doc/libbonobo/debugging.html
+share/doc/libbonobo/factories.html
+share/doc/libbonobo/general.html
+share/doc/libbonobo/home.png
+share/doc/libbonobo/index.html
+share/doc/libbonobo/index.sgml
+share/doc/libbonobo/left.png
+share/doc/libbonobo/libbonobo-bonobo-arg.html
+share/doc/libbonobo/libbonobo-bonobo-config-database.html
+share/doc/libbonobo/libbonobo-bonobo-context.html
+share/doc/libbonobo/libbonobo-bonobo-event-source.html
+share/doc/libbonobo/libbonobo-bonobo-exception.html
+share/doc/libbonobo/libbonobo-bonobo-generic-factory.html
+share/doc/libbonobo/libbonobo-bonobo-i18n.html
+share/doc/libbonobo/libbonobo-bonobo-item-container.html
+share/doc/libbonobo/libbonobo-bonobo-item-handler.html
+share/doc/libbonobo/libbonobo-bonobo-listener.html
+share/doc/libbonobo/libbonobo-bonobo-macros.html
+share/doc/libbonobo/libbonobo-bonobo-main.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-context.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-util.html
+share/doc/libbonobo/libbonobo-bonobo-moniker.html
+share/doc/libbonobo/libbonobo-bonobo-object.html
+share/doc/libbonobo/libbonobo-bonobo-persist-client.html
+share/doc/libbonobo/libbonobo-bonobo-persist-file.html
+share/doc/libbonobo/libbonobo-bonobo-persist-stream.html
+share/doc/libbonobo/libbonobo-bonobo-persist.html
+share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html
+share/doc/libbonobo/libbonobo-bonobo-property-bag.html
+share/doc/libbonobo/libbonobo-bonobo-running-context.html
+share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html
+share/doc/libbonobo/libbonobo-bonobo-shutdown.html
+share/doc/libbonobo/libbonobo-bonobo-storage-memory.html
+share/doc/libbonobo/libbonobo-bonobo-storage.html
+share/doc/libbonobo/libbonobo-bonobo-stream-client.html
+share/doc/libbonobo/libbonobo-bonobo-stream-memory.html
+share/doc/libbonobo/libbonobo-bonobo-types.html
+share/doc/libbonobo/libbonobo-bonobo-xobject.html
+share/doc/libbonobo/libbonobo-faq.html
+share/doc/libbonobo/libbonobo.devhelp
+share/doc/libbonobo/misc.html
+share/doc/libbonobo/monikers.html
+share/doc/libbonobo/persist-file.png
+share/doc/libbonobo/persist-storage.png
+share/doc/libbonobo/persist-stream.png
+share/doc/libbonobo/persist.html
+share/doc/libbonobo/persist.png
+share/doc/libbonobo/properties.html
+share/doc/libbonobo/property-bags.html
+share/doc/libbonobo/refcounting.html
+share/doc/libbonobo/right.png
+share/doc/libbonobo/storage.png
+share/doc/libbonobo/stream.png
+share/doc/libbonobo/streams.html
+share/doc/libbonobo/up.png
 share/idl/bonobo-2.0/Bonobo.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
 share/idl/bonobo-2.0/Bonobo_Clipboard.idl
@@ -58,22 +115,30 @@ share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl
 share/idl/bonobo-2.0/Bonobo_Storage.idl
 share/idl/bonobo-2.0/Bonobo_UI.idl
 share/idl/bonobo-2.0/Bonobo_Zoomable.idl
+share/locale/am/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/de/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/el/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/es/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/he/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/no/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
@@ -82,6 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo