4 files changed, 26 insertions, 10 deletions

diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 068d1f92f43d..5bcc4067636d 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/py-gnome2/Makefile,v 1.4 2007/11/30 18:56:55 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.49 2008/03/09 21:47:30 mezz Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index 8734b64c2526..89fe66a34a5f 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.20.1.tar.bz2) = f05d67b0f288728e703faa8f74995358
-SHA256 (gnome2/gnome-python-2.20.1.tar.bz2) = ab790703c899168ed609b558e011795efdbe4112f8a04f2d605abbfb2190fd2f
-SIZE (gnome2/gnome-python-2.20.1.tar.bz2) = 416845
+MD5 (gnome2/gnome-python-2.22.0.tar.bz2) = ff84c54314adec195149c59365e35a13
+SHA256 (gnome2/gnome-python-2.22.0.tar.bz2) = 13dd15da0b330e32d9798788c0d1a67feaa1ed877698bc9e5bb6acd135cfdf94
+SIZE (gnome2/gnome-python-2.22.0.tar.bz2) = 539423
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
index 21db26c6c54e..0f477bfeff7f 100644
--- a/x11-toolkits/py-gnome2/files/patch-configure
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Mon Nov  6 02:40:04 2006
-+++ configure	Mon Nov  6 02:40:26 2006
-@@ -19038,7 +19038,7 @@
- 
+--- configure.orig	2007-12-26 11:53:20.000000000 +0100
++++ configure	2007-12-26 11:56:25.000000000 +0100
+@@ -19694,7 +19694,7 @@
+ save_CC="$CC"
  save_LIBS="$LIBS"
  
 -PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
 +PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LIBS}"
  
+ CC="$PYTHON_CC"
  LIBS="$LIBS $PYTHON_EMBED_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 913242687d92..54bab3102807 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -57,6 +57,19 @@ libdata/pkgconfig/gnome-python-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/vfs/pygvfsmethod/pyfs.py
 %%PORTDOCS%%share/examples/py-gnome/vfs/shell.py
 %%PORTDOCS%%share/examples/py-gnome/vfs/sync-xfer.py
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-context.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-directoryhandle.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-drive.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-fileinfo.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-handle.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-uri.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-volume.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-class-reference.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-constants.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-functions.html
+share/gtk-doc/html/pygnomevfs/index.html
+share/gtk-doc/html/pygnomevfs/index.sgml
+share/gtk-doc/html/pygnomevfs/pygnomevfs.devhelp
 share/pygtk/2.0/argtypes/bonobo-arg-types.py
 share/pygtk/2.0/argtypes/bonobo-arg-types.pyc
 share/pygtk/2.0/argtypes/bonobo-arg-types.pyo
@@ -73,6 +86,9 @@ share/pygtk/2.0/defs/gnome-types.defs
 share/pygtk/2.0/defs/gnome.defs
 share/pygtk/2.0/defs/ui.defs
 @dirrmtry share/pygtk/2.0/argtypes
+@dirrm share/gtk-doc/html/pygnomevfs
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
 %%PORTDOCS%%@dirrm share/examples/py-gnome/vfs/pygvfsmethod
 %%PORTDOCS%%@dirrm share/examples/py-gnome/vfs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/popt