Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD.  This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.

But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:

Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>

Enjoy!

Approved by:	portmgr (implicit, kris)

5 files changed, 27 insertions, 36 deletions

diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 5bce80c66c11..175b18e98f5a 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11-toolkits/py-gnome2/Makefile,v 1.2 2006/03/14 13:28:11 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gnome2/Makefile,v 1.36 2006/09/04 22:22:09 ahze Exp $
 #
 
 PORTNAME=	gnome
-PORTVERSION=	2.12.4
-PORTREVISION=	1
+PORTVERSION=	2.16.0
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/..$//}
+MASTER_SITE_SUBDIR=	sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	gnome-python-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -39,10 +38,6 @@ CONFLICTS=	py*-gnome-1*
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
-		${WRKSRC}/gnomevfs/Makefile.in
-
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${EG_DST_DIR}
diff --git a/x11-toolkits/py-gnome2/distinfo b/x11-toolkits/py-gnome2/distinfo
index ca2f9bdae19b..2449a56ac706 100644
--- a/x11-toolkits/py-gnome2/distinfo
+++ b/x11-toolkits/py-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-python-2.12.4.tar.bz2) = 94347f1bff86ffcce76111fa8dac1efc
-SHA256 (gnome2/gnome-python-2.12.4.tar.bz2) = 721268f92c0dc0a2a2480779e16545d05846090c469976c0913560beb7d8645e
-SIZE (gnome2/gnome-python-2.12.4.tar.bz2) = 377341
+MD5 (gnome2/gnome-python-2.16.0.tar.bz2) = 65c71b08cdae600bf8cc31597682d595
+SHA256 (gnome2/gnome-python-2.16.0.tar.bz2) = 3a7dde776d7c0699f5a485b98dcadddde4bc8d4d39b23f8434616eb1bdcfdc7d
+SIZE (gnome2/gnome-python-2.16.0.tar.bz2) = 401399
diff --git a/x11-toolkits/py-gnome2/files/patch-configure b/x11-toolkits/py-gnome2/files/patch-configure
index af6b9c5e0154..94ede93f47f4 100644
--- a/x11-toolkits/py-gnome2/files/patch-configure
+++ b/x11-toolkits/py-gnome2/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue Mar 14 08:23:11 2006
-+++ configure	Tue Mar 14 08:24:01 2006
-@@ -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_LIBS}"
+--- configure.orig	Tue Aug 22 00:47:05 2006
++++ configure	Tue Aug 22 00:47:29 2006
+@@ -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_LIBS}"
+ 
+ LIBS="$LIBS $PYTHON_EMBED_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
diff --git a/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in b/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in
deleted file mode 100644
index 40844f935796..000000000000
--- a/x11-toolkits/py-gnome2/files/patch-gnomevfs_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnomevfs/Makefile.in.orig	Sat Sep  3 15:51:39 2005
-+++ gnomevfs/Makefile.in	Sat Sep  3 15:52:19 2005
-@@ -276,7 +276,7 @@
- 
- gpincdir = $(includedir)/gnome-python-2.0
- gpinc_HEADERS = pygnomevfs.h
--vfsmethoddir = $(libdir)/gnome-vfs-2.0/modules
-+vfsmethoddir = %%X11BASE%%/lib/gnome-vfs-2.0/modules
- @BUILD_PYVFSMODULE_FALSE@vfsmethod_LTLIBRARIES = 
- @BUILD_PYVFSMODULE_TRUE@vfsmethod_LTLIBRARIES = libpythonmethod.la
- libpythonmethod_la_CFLAGS = $(GNOME_VFS_MODULE_CFLAGS) -DGNOME_VFS_PYTHON_DIR="\"$(vfsmethoddir)\""
diff --git a/x11-toolkits/py-gnome2/pkg-plist b/x11-toolkits/py-gnome2/pkg-plist
index 957118502fcb..69b886286d63 100644
--- a/x11-toolkits/py-gnome2/pkg-plist
+++ b/x11-toolkits/py-gnome2/pkg-plist
@@ -1,4 +1,7 @@
 include/gnome-python-2.0/pygnomevfs.h
+include/gnome-python-2.0/pygnomevfsbonobo.h
+lib/gnome-vfs-2.0/modules/libpythonmethod.la
+lib/gnome-vfs-2.0/modules/libpythonmethod.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo/__init__.pyo
@@ -25,8 +28,13 @@ include/gnome-python-2.0/pygnomevfs.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome/vfs.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomecanvas.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/_gnomevfs.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/_gnomevfs.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/gnomevfsbonobo.la
+%%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs/gnomevfsbonobo.so
 libdata/pkgconfig/gnome-python-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/bonobo/bonobo-application.py
 %%PORTDOCS%%share/examples/py-gnome/bonobo/bonoboui/Bonobo_Sample_Hello.xml
@@ -34,6 +42,7 @@ libdata/pkgconfig/gnome-python-2.0.pc
 %%PORTDOCS%%share/examples/py-gnome/bonobo/echo/README
 %%PORTDOCS%%share/examples/py-gnome/bonobo/echo/echo-client.py
 %%PORTDOCS%%share/examples/py-gnome/bonobo/unknown.py
+%%PORTDOCS%%share/examples/py-gnome/bug-buddy-integration.py
 %%PORTDOCS%%share/examples/py-gnome/canvas/canvas-curve.py
 %%PORTDOCS%%share/examples/py-gnome/canvas/canvas-example.py
 %%PORTDOCS%%share/examples/py-gnome/gconf/basic-gconf-app.py
@@ -73,9 +82,7 @@ share/pygtk/2.0/defs/ui.defs
 %%PORTDOCS%%@dirrm share/examples/py-gnome/bonobo/bonoboui
 %%PORTDOCS%%@dirrm share/examples/py-gnome/bonobo
 %%PORTDOCS%%@dirrm share/examples/py-gnome
+@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnomevfs
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gnome
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/bonobo
 @dirrm include/gnome-python-2.0
-@cwd %%X11BASE%%
-lib/gnome-vfs-2.0/modules/libpythonmethod.la
-lib/gnome-vfs-2.0/modules/libpythonmethod.so