4 files changed, 117 insertions, 15 deletions

diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 0a6f1c55a573..b7c2855cac04 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.29 2009/01/04 22:11:03 marcus Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.35 2009/09/23 21:44:30 kwm Exp $
 #
 
 PORTNAME=	gobject
-PORTVERSION=	2.16.1
+PORTVERSION=	2.20.0
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,6 +18,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GObject
 
+LIB_DEPENDS=	girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
@@ -27,5 +29,10 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-docs
 
 CONFLICTS=	py*-gtk-0*
+PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
+
+post-install:
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		${PREFIX}/share/pygobject/2.0/codegen
 
 .include <bsd.port.mk>
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index abf2aa2dd37c..1e5e2e37b052 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.16.1.tar.bz2) = 8e26f2572e6b72dbd2591677055f8d30
-SHA256 (gnome2/pygobject-2.16.1.tar.bz2) = ee229c642759470a242c7f6ce3bd969a7484496f95570a8783859b03d6d79cc5
-SIZE (gnome2/pygobject-2.16.1.tar.bz2) = 522347
+MD5 (gnome2/pygobject-2.20.0.tar.bz2) = 10e1fb79be3d698476a28b1e1b0c5640
+SHA256 (gnome2/pygobject-2.20.0.tar.bz2) = 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
+SIZE (gnome2/pygobject-2.20.0.tar.bz2) = 666287
diff --git a/devel/py-gobject/files/patch-pygobject-2.0.pc.in b/devel/py-gobject/files/patch-pygobject-2.0.pc.in
new file mode 100644
index 000000000000..76ee71ccdca0
--- /dev/null
+++ b/devel/py-gobject/files/patch-pygobject-2.0.pc.in
@@ -0,0 +1,11 @@
+--- pygobject-2.0.pc.in.orig	2008-09-03 15:31:23.000000000 +0000
++++ pygobject-2.0.pc.in	2008-09-03 15:31:43.000000000 +0000
+@@ -10,7 +10,7 @@
+ # install additional headers.
+ pygtkincludedir=${includedir}/pygtk-2.0
+ fixxref=${datadir}/pygobject/xsl/fixxref.py
+-pygdocs=${datadir}/gtk-doc/html/pygobject
++pygdocs=${datadir}/doc/pygobject
+ defsdir=${datadir}/pygobject/2.0/defs
+ codegendir=${datadir}/pygobject/2.0/codegen
+ 
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 63a4cceb85d4..c6b65ccf14e2 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -1,9 +1,10 @@
 bin/pygobject-codegen-2.0
+include/pygobject/bank.h
 include/pygtk-2.0/pyglib.h
 include/pygtk-2.0/pygobject.h
-lib/libpyglib-2.0.la
-lib/libpyglib-2.0.so
-lib/libpyglib-2.0.so.0
+lib/libpyglib-2.0-python%%PYTHON_VER%%.la
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
@@ -14,6 +15,32 @@ lib/libpyglib-2.0.so.0
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo
@@ -38,12 +65,53 @@ lib/libpyglib-2.0.so.0
 %%PYTHON_SITELIBDIR%%/pygtk.pyc
 %%PYTHON_SITELIBDIR%%/pygtk.pyo
 libdata/pkgconfig/pygobject-2.0.pc
+share/doc/pygobject/class-gioappinfo.html
+share/doc/pygobject/class-gioapplaunchcontext.html
+share/doc/pygobject/class-gioasyncresult.html
+share/doc/pygobject/class-giobufferedinputstream.html
+share/doc/pygobject/class-giobufferedoutputstream.html
+share/doc/pygobject/class-giocancellable.html
+share/doc/pygobject/class-giodatainputstream.html
+share/doc/pygobject/class-giodataoutputstream.html
+share/doc/pygobject/class-giodrive.html
+share/doc/pygobject/class-gioemblem.html
+share/doc/pygobject/class-gioemblemedicon.html
+share/doc/pygobject/class-giofile.html
+share/doc/pygobject/class-giofileattributeinfo.html
+share/doc/pygobject/class-giofileenumerator.html
+share/doc/pygobject/class-giofileicon.html
+share/doc/pygobject/class-giofileinfo.html
+share/doc/pygobject/class-giofileinputstream.html
+share/doc/pygobject/class-giofilemonitor.html
+share/doc/pygobject/class-giofileoutputstream.html
+share/doc/pygobject/class-giofilterinputstream.html
+share/doc/pygobject/class-giofilteroutputstream.html
+share/doc/pygobject/class-gioicon.html
+share/doc/pygobject/class-gioinputstream.html
+share/doc/pygobject/class-gioloadableicon.html
+share/doc/pygobject/class-giomemoryinputstream.html
+share/doc/pygobject/class-giomemoryoutputstream.html
+share/doc/pygobject/class-giomount.html
+share/doc/pygobject/class-giomountoperation.html
+share/doc/pygobject/class-giooutputstream.html
+share/doc/pygobject/class-gioseekable.html
+share/doc/pygobject/class-giosimpleasyncresult.html
+share/doc/pygobject/class-giothemedicon.html
+share/doc/pygobject/class-giounixinputstream.html
+share/doc/pygobject/class-giounixoutputstream.html
+share/doc/pygobject/class-giovolume.html
+share/doc/pygobject/class-giovolumemonitor.html
 share/doc/pygobject/class-glibmaincontext.html
 share/doc/pygobject/class-glibmainloop.html
 share/doc/pygobject/class-gobject.html
 share/doc/pygobject/class-gobjectgboxed.html
 share/doc/pygobject/class-gobjectginterface.html
 share/doc/pygobject/class-gobjectgpointer.html
+share/doc/pygobject/gio-class-reference.html
+share/doc/pygobject/gio-constants.html
+share/doc/pygobject/gio-functions.html
+share/doc/pygobject/giounix-class-reference.html
+share/doc/pygobject/glib-class-reference.html
 share/doc/pygobject/glib-constants.html
 share/doc/pygobject/glib-functions.html
 share/doc/pygobject/gobject-class-reference.html
@@ -60,53 +128,66 @@ share/pygobject/2.0/codegen/__init__.pyo
 share/pygobject/2.0/codegen/argtypes.py
 share/pygobject/2.0/codegen/argtypes.pyc
 share/pygobject/2.0/codegen/argtypes.pyo
+share/pygobject/2.0/codegen/code-coverage.py
+share/pygobject/2.0/codegen/code-coverage.pyc
 share/pygobject/2.0/codegen/codegen.py
 share/pygobject/2.0/codegen/codegen.pyc
-share/pygobject/2.0/codegen/codegen.pyo
 share/pygobject/2.0/codegen/createdefs.py
 share/pygobject/2.0/codegen/createdefs.pyc
-share/pygobject/2.0/codegen/createdefs.pyo
 share/pygobject/2.0/codegen/definitions.py
 share/pygobject/2.0/codegen/definitions.pyc
 share/pygobject/2.0/codegen/definitions.pyo
+share/pygobject/2.0/codegen/defsconvert.py
+share/pygobject/2.0/codegen/defsconvert.pyc
+share/pygobject/2.0/codegen/defsgen.py
+share/pygobject/2.0/codegen/defsgen.pyc
 share/pygobject/2.0/codegen/defsparser.py
 share/pygobject/2.0/codegen/defsparser.pyc
 share/pygobject/2.0/codegen/defsparser.pyo
 share/pygobject/2.0/codegen/docextract.py
 share/pygobject/2.0/codegen/docextract.pyc
 share/pygobject/2.0/codegen/docextract.pyo
+share/pygobject/2.0/codegen/docextract_to_xml.py
+share/pygobject/2.0/codegen/docextract_to_xml.pyc
 share/pygobject/2.0/codegen/docgen.py
 share/pygobject/2.0/codegen/docgen.pyc
-share/pygobject/2.0/codegen/docgen.pyo
 share/pygobject/2.0/codegen/h2def.py
 share/pygobject/2.0/codegen/h2def.pyc
-share/pygobject/2.0/codegen/h2def.pyo
 share/pygobject/2.0/codegen/mergedefs.py
 share/pygobject/2.0/codegen/mergedefs.pyc
-share/pygobject/2.0/codegen/mergedefs.pyo
+share/pygobject/2.0/codegen/missingdefs.py
+share/pygobject/2.0/codegen/missingdefs.pyc
 share/pygobject/2.0/codegen/mkskel.py
 share/pygobject/2.0/codegen/mkskel.pyc
-share/pygobject/2.0/codegen/mkskel.pyo
 share/pygobject/2.0/codegen/override.py
 share/pygobject/2.0/codegen/override.pyc
 share/pygobject/2.0/codegen/override.pyo
 share/pygobject/2.0/codegen/reversewrapper.py
 share/pygobject/2.0/codegen/reversewrapper.pyc
 share/pygobject/2.0/codegen/reversewrapper.pyo
+share/pygobject/2.0/codegen/scanvirtuals.py
+share/pygobject/2.0/codegen/scanvirtuals.pyc
 share/pygobject/2.0/codegen/scmexpr.py
 share/pygobject/2.0/codegen/scmexpr.pyc
-share/pygobject/2.0/codegen/scmexpr.pyo
 share/pygobject/2.0/defs/gappinfo.override
 share/pygobject/2.0/defs/gapplaunchcontext.override
+share/pygobject/2.0/defs/gbufferedinputstream.override
+share/pygobject/2.0/defs/gdatainputstream.override
+share/pygobject/2.0/defs/gdrive.override
 share/pygobject/2.0/defs/gfile.override
 share/pygobject/2.0/defs/gfileattribute.override
 share/pygobject/2.0/defs/gfileenumerator.override
 share/pygobject/2.0/defs/gfileinfo.override
+share/pygobject/2.0/defs/gfileinputstream.override
+share/pygobject/2.0/defs/gfileoutputstream.override
 share/pygobject/2.0/defs/gicon.override
 share/pygobject/2.0/defs/ginputstream.override
 share/pygobject/2.0/defs/gio-types.defs
 share/pygobject/2.0/defs/gio.defs
 share/pygobject/2.0/defs/gio.override
+share/pygobject/2.0/defs/gmemoryinputstream.override
+share/pygobject/2.0/defs/gmemoryoutputstream.override
+share/pygobject/2.0/defs/gmount.override
 share/pygobject/2.0/defs/goutputstream.override
 share/pygobject/2.0/defs/gvolume.override
 share/pygobject/2.0/defs/gvolumemonitor.override
@@ -128,6 +209,9 @@ share/pygobject/xsl/ref-html-style.xsl
 @dirrm share/doc/pygobject
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio
 @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
 @dirrmtry include/pygtk-2.0
+@dirrm include/pygobject