3 files changed, 17 insertions, 9 deletions

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