update to 2.16.0

major release for gnome-2.16, besides that some fixes, mostly in the
gnomevfs area

5 files changed, 36 insertions, 31 deletions

diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index a928dd612c1..aedc6cae86c 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2006/09/16 12:20:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2006/10/12 14:00:06 drochner Exp $
 #
 
-DISTNAME=	gnome-python-2.12.4
+DISTNAME=	gnome-python-2.16.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	1
 CATEGORIES=	x11 python
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.16/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
diff --git a/x11/py-gnome2/PLIST b/x11/py-gnome2/PLIST
index ccf02c6d8ac..be8a5127a3c 100644
--- a/x11/py-gnome2/PLIST
+++ b/x11/py-gnome2/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2005/10/18 18:09:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/10/12 14:00:06 drochner Exp $
 include/gnome-python-2.0/pygnomevfs.h
+include/gnome-python-2.0/pygnomevfsbonobo.h
 lib/gnome-vfs-2.0/modules/libpythonmethod.la
 lib/pkgconfig/gnome-python-2.0.pc
 ${PYSITELIB}/gtk-2.0/bonobo/__init__.py
@@ -21,7 +22,11 @@ ${PYSITELIB}/gtk-2.0/gnome/vfs.pyc
 ${PYSITELIB}/gtk-2.0/gnome/vfs.pyo
 ${PYSITELIB}/gtk-2.0/gnome/ui.la
 ${PYSITELIB}/gtk-2.0/gnomecanvas.la
-${PYSITELIB}/gtk-2.0/gnomevfs.la
+${PYSITELIB}/gtk-2.0/gnomevfs/__init__.py
+${PYSITELIB}/gtk-2.0/gnomevfs/__init__.pyc
+${PYSITELIB}/gtk-2.0/gnomevfs/__init__.pyo
+${PYSITELIB}/gtk-2.0/gnomevfs/_gnomevfs.la
+${PYSITELIB}/gtk-2.0/gnomevfs/gnomevfsbonobo.la
 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
@@ -39,6 +44,7 @@ share/pygtk/2.0/defs/gnome.defs
 share/pygtk/2.0/defs/ui.defs
 @comment in py-gtk2: @dirrm share/pygtk/2.0/defs
 @dirrm share/pygtk/2.0/argtypes
+@dirrm ${PYSITELIB}/gtk-2.0/gnomevfs
 @dirrm ${PYSITELIB}/gtk-2.0/gnome
 @dirrm ${PYSITELIB}/gtk-2.0/bonobo
 @comment in py-gtk2: @dirrm ${PYSITELIB}/gtk-2.0
diff --git a/x11/py-gnome2/distinfo b/x11/py-gnome2/distinfo
index 58aa2ff16ac..1fe6a80b6ba 100644
--- a/x11/py-gnome2/distinfo
+++ b/x11/py-gnome2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/09/15 15:14:26 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2006/10/12 14:00:06 drochner Exp $
 
-SHA1 (gnome-python-2.12.4.tar.bz2) = 1a882ec8f314d458c4c115403e9e19521e135629
-RMD160 (gnome-python-2.12.4.tar.bz2) = cb2d2f27d82ecea6746169ab0976363131e110fe
-Size (gnome-python-2.12.4.tar.bz2) = 377341 bytes
-SHA1 (patch-aa) = efb2ca2b895f3023e5e60fb42cf6f460f6fce775
+SHA1 (gnome-python-2.16.0.tar.bz2) = 782f00968f7113763159996a1be9b4f528df2e90
+RMD160 (gnome-python-2.16.0.tar.bz2) = c802eca43b16196731789f66b68244b21293c6a3
+Size (gnome-python-2.16.0.tar.bz2) = 401399 bytes
+SHA1 (patch-aa) = 24f28467925445938dadd6c44c09af97765ac541
 SHA1 (patch-ab) = d547a4ac92364aed1f5d7f8041616760339aefd3
-SHA1 (patch-ac) = 1bbae51ab6eb363a986e55b1011445f40ca947d9
+SHA1 (patch-ac) = 6fc9caab51ee8ce40798f3f6ac9ded7d041f2fe3
diff --git a/x11/py-gnome2/patches/patch-aa b/x11/py-gnome2/patches/patch-aa
index d8ad872e71b..ea28b874bc3 100644
--- a/x11/py-gnome2/patches/patch-aa
+++ b/x11/py-gnome2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2006/06/22 00:14:39 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2006/10/12 14:00:06 drochner Exp $
 
---- configure.orig	2006-06-22 00:11:20.000000000 +0000
+--- configure.orig	2006-09-04 23:50:40.000000000 +0200
 +++ configure
-@@ -21329,7 +21329,7 @@ if $build_pyvfsmodule; then
- echo "$as_me:$LINENO: checking for libraries required to embed python" >&5
- echo $ECHO_N "checking for libraries required to embed python... $ECHO_C" >&6
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
-+PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+@@ -19036,7 +19036,7 @@ PYTHON_LIB_DEPS=`$PYTHON -c "from distut
  
  save_LIBS="$LIBS"
- LIBS="$LIBS $PYTHON_LIBS"
+ 
+-PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
++PYTHON_EMBED_LIBS="-L${py_prefix}/lib/ ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ 
+ LIBS="$LIBS $PYTHON_EMBED_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11/py-gnome2/patches/patch-ac b/x11/py-gnome2/patches/patch-ac
index 8fe500ac1f7..a061ffa604a 100644
--- a/x11/py-gnome2/patches/patch-ac
+++ b/x11/py-gnome2/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2006/09/15 15:14:26 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2006/10/12 14:00:06 drochner Exp $
 
---- gnomevfs/Makefile.in.orig	2006-03-12 22:30:10.000000000 +0100
+--- gnomevfs/Makefile.in.orig	2006-09-04 23:50:39.000000000 +0200
 +++ gnomevfs/Makefile.in
-@@ -269,9 +269,9 @@ common_ldflags = -module -avoid-version
+@@ -292,9 +292,9 @@ common_ldflags = -module -avoid-version
  
  # libgnomevfs binding
- pkgpyexec_LTLIBRARIES = gnomevfs.la
--gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS)
-+gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS) $(BONOBO_ACTIVATION_CFLAGS)
- gnomevfs_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgnomevfs
--gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS)
-+gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(BONOBO_ACTIVATION_LIBS)
- gnomevfs_la_SOURCES = vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c \
+ gnomevfs_LTLIBRARIES = _gnomevfs.la $(am__append_1)
+-_gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS)
++_gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS) $(BONOBO_ACTIVATION_CFLAGS)
+ _gnomevfs_la_LDFLAGS = $(common_ldflags) $(PYTHON_LDFLAGS) -export-symbols-regex init_gnomevfs
+-_gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(PYTHON_LIBS)
++_gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(PYTHON_LIBS) $(BONOBO_ACTIVATION_LIBS)
+ _gnomevfs_la_SOURCES = vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c \
   vfs-handle.c pygnomevfs.h pygnomevfs-private.h vfs-xfer-progress-info.c \
   vfs-context.c vfs-async-handle.c vfs-volume.c vfs-drive.c vfs-volume-monitor.c