Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.32/

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

This release features commits by avl, marcus, mezz and myself.

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore

And pav@ for 2 exp-runs

PR:		ports/152255
		ports/143260
		ports/141033
		ports/149629
		ports/150350
		ports/151523
With hat:	gnome@

6 files changed, 24 insertions, 62 deletions

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 7a5ad5df8f3e..6549d2ce17a6 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/sysutils/upower/Makefile,v 1.1 2010/07/12 14:10:07 kwm Exp $
+#   $MCom: ports/sysutils/upower/Makefile,v 1.19 2010/10/05 08:30:15 kwm Exp $
 #
 
 PORTNAME=	upower
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 453b025431ce..3871fbb02191 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-MD5 (upower-0.9.5.tar.bz2) = 1c0e5f45345c17fc945dfb365847b587
-SHA256 (upower-0.9.5.tar.bz2) = b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
-SIZE (upower-0.9.5.tar.bz2) = 473750
+MD5 (upower-0.9.6.tar.bz2) = 9c41e4973fdd6e9b491d1b829a9a35db
+SHA256 (upower-0.9.6.tar.bz2) = aeff4a0c98a12b8beb56ca92314e1e8a6711f13929a294ae3c0a725125a1db4f
+SIZE (upower-0.9.6.tar.bz2) = 453993
diff --git a/sysutils/upower/files/patch-libupower-glib_Makefile.in b/sysutils/upower/files/patch-libupower-glib_Makefile.in
new file mode 100644
index 000000000000..7ecd30cfc5c6
--- /dev/null
+++ b/sysutils/upower/files/patch-libupower-glib_Makefile.in
@@ -0,0 +1,18 @@
+--- libupower-glib/Makefile.in.orig	2010-10-04 14:53:46.000000000 +0100
++++ libupower-glib/Makefile.in	2010-10-05 07:42:17.000000000 +0100
+@@ -364,12 +364,13 @@
+ 	up-version.h.in
+ 
+ CLEANFILES = $(BUILT_SOURCES) $(am__append_2)
+-@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libupower_glib_la_SOURCES)
++@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SOURCES)
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
+-@HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --warn-all --add-include-path=$(srcdir)
++@HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_LIBS = libupower-glib.la
+ @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_FILES = $(introspection_sources)
++@HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_NAMESPACE = UPowerGlib
+ @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+ @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
+ @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
diff --git a/sysutils/upower/files/patch-src_up-daemon.c b/sysutils/upower/files/patch-src_up-daemon.c
deleted file mode 100644
index eea72a87b7c1..000000000000
--- a/sysutils/upower/files/patch-src_up-daemon.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/up-daemon.c.orig	2010-04-19 11:58:18.000000000 -0400
-+++ src/up-daemon.c	2010-05-09 13:38:28.000000000 -0400
-@@ -488,6 +488,8 @@ up_daemon_suspend_allowed (UpDaemon *dae
- 		goto out;
- 
- 	ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context);
-+	if (!ret)
-+		goto out;
- 	dbus_g_method_return (context, ret);
- 
- out:
-@@ -575,6 +577,8 @@ up_daemon_hibernate_allowed (UpDaemon *d
- 		goto out;
- 
- 	ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context);
-+	if (!ret)
-+		goto out;
- 	dbus_g_method_return (context, ret);
- 
- out:
diff --git a/sysutils/upower/files/patch-src_up-polkit.c b/sysutils/upower/files/patch-src_up-polkit.c
deleted file mode 100644
index 88a074e9908c..000000000000
--- a/sysutils/upower/files/patch-src_up-polkit.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/up-polkit.c.orig	2010-04-08 21:38:56.000000000 -0400
-+++ src/up-polkit.c	2010-04-09 02:48:12.000000000 -0400
-@@ -69,7 +69,7 @@ up_polkit_check_auth (UpPolkit *polkit, 
- {
- 	gboolean ret = FALSE;
- 	GError *error;
--	GError *error_local;
-+	GError *error_local = NULL;
- 	PolkitAuthorizationResult *result;
- 
- 	/* check auth */
-@@ -104,7 +104,7 @@ up_polkit_is_allowed (UpPolkit *polkit, 
- {
- 	gboolean ret = FALSE;
- 	GError *error;
--	GError *error_local;
-+	GError *error_local = NULL;
- 	PolkitAuthorizationResult *result;
- 
- 	/* check auth */
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index 8f96cd1fc98c..ba51b6f99593 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -2,16 +2,6 @@ bin/devkit-power
 bin/upower
 etc/UPower/UPower.conf
 etc/dbus-1/system.d/org.freedesktop.UPower.conf
-include/DeviceKit-power/devkit-power-gobject/devicekit-power.h
-include/DeviceKit-power/devkit-power-gobject/dkp-client.h
-include/DeviceKit-power/devkit-power-gobject/dkp-device.h
-include/DeviceKit-power/devkit-power-gobject/dkp-enum.h
-include/DeviceKit-power/devkit-power-gobject/dkp-history-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-qos-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-stats-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-version.h
-include/DeviceKit-power/devkit-power-gobject/dkp-wakeups-obj.h
-include/DeviceKit-power/devkit-power-gobject/dkp-wakeups.h
 include/libupower-glib/up-client.h
 include/libupower-glib/up-device.h
 include/libupower-glib/up-history-item.h
@@ -23,15 +13,10 @@ include/libupower-glib/up-wakeup-item.h
 include/libupower-glib/up-wakeups.h
 include/libupower-glib/upower.h
 lib/girepository-1.0/UPowerGlib-1.0.typelib
-lib/libdevkit-power-gobject.a
-lib/libdevkit-power-gobject.la
-lib/libdevkit-power-gobject.so
-lib/libdevkit-power-gobject.so.1
 lib/libupower-glib.a
 lib/libupower-glib.la
 lib/libupower-glib.so
 lib/libupower-glib.so.1
-libdata/pkgconfig/devkit-power-gobject.pc
 libdata/pkgconfig/upower-glib.pc
 libexec/devkit-power-daemon
 libexec/upowerd
@@ -47,8 +32,6 @@ share/locale/sv/LC_MESSAGES/upower.mo
 share/polkit-1/actions/org.freedesktop.upower.policy
 share/polkit-1/actions/org.freedesktop.upower.qos.policy
 @exec mkdir -p /var/lib/DeviceKit-power
-@dirrm include/DeviceKit-power/devkit-power-gobject
-@dirrm include/DeviceKit-power
 @dirrm include/libupower-glib
 @dirrm etc/UPower
 @unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true