Update to 0.9.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13809 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 16 insertions, 132 deletions

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 01e276883..6b245bcd3 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/upower/Makefile,v 1.8 2010/02/13 19:21:35 marcus Exp $
+#   $MCom: ports/sysutils/upower/Makefile,v 1.9 2010/02/22 01:26:54 marcus Exp $
 #
 
 PORTNAME=	UPower
-DISTVERSION=	0.9.0
-PORTREVISION=	1
+DISTVERSION=	0.9.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index b16f91d77..c3961d045 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-MD5 (UPower-0.9.0.tar.bz2) = af958dedeb115033ff4a9f52a5cdb1f2
-SHA256 (UPower-0.9.0.tar.bz2) = 84a11e4830e16ce96ac02ca39ef6092c81a0ff5eff53f31427b855c8cb7b4ddf
-SIZE (UPower-0.9.0.tar.bz2) = 468478
+MD5 (UPower-0.9.1.tar.bz2) = 822d7d495781c6bbed36981a7a78dd30
+SHA256 (UPower-0.9.1.tar.bz2) = 5ad14e85fdda536ec0ac7f2848065f46a1056f5cf80d583ef7dceaf05dae29d5
+SIZE (UPower-0.9.1.tar.bz2) = 452523
diff --git a/sysutils/upower/files/patch-0003-add-backend-support-for-obtaining-kernel-info b/sysutils/upower/files/patch-0003-add-backend-support-for-obtaining-kernel-info
index ed96b4046..b09f01b7c 100644
--- a/sysutils/upower/files/patch-0003-add-backend-support-for-obtaining-kernel-info
+++ b/sysutils/upower/files/patch-0003-add-backend-support-for-obtaining-kernel-info
@@ -124,98 +124,6 @@ index 47d84d5..4085fb3 100644
  	}
  out:
  	g_free (command);
-@@ -501,6 +514,7 @@ up_daemon_suspend (UpDaemon *daemon, DBusGMethodInvocation *context)
- 	GError *error;
- 	GError *error_local = NULL;
- 	PolkitSubject *subject = NULL;
-+	gchar *command = NULL;
- 	gchar *stdout = NULL;
- 	gchar *stderr = NULL;
- 
-@@ -521,19 +535,29 @@ up_daemon_suspend (UpDaemon *daemon, DBusGMethodInvocation *context)
- 	if (!up_polkit_check_auth (daemon->priv->polkit, subject, "org.freedesktop.devicekit.power.suspend", context))
- 		goto out;
- 
--	ret = g_spawn_command_line_sync ("/usr/sbin/pm-suspend", &stdout, &stderr, NULL, &error_local);
--	if (!ret) {
--		error = g_error_new (UP_DAEMON_ERROR,
--				     UP_DAEMON_ERROR_GENERAL,
--				     "Failed to spawn: %s, stdout:%s, stderr:%s", error_local->message, stdout, stderr);
--		g_error_free (error_local);
--		dbus_g_method_return_error (context, error);
--		goto out;
-+#ifndef __FreeBSD__
-+	command = g_strdup ("/usr/sbin/pm-suspend");
-+#else
-+	command = up_backend_get_suspend_command (daemon->priv->backend);
-+#endif
-+	if (command != NULL) {
-+		ret = g_spawn_command_line_sync (command, &stdout, &stderr, NULL, &error_local);
-+		if (!ret) {
-+			error = g_error_new (UP_DAEMON_ERROR,
-+				     	UP_DAEMON_ERROR_GENERAL,
-+				     	"Failed to spawn: %s, stdout:%s, stderr:%s", error_local->message, stdout, stderr);
-+			g_error_free (error_local);
-+			dbus_g_method_return_error (context, error);
-+			goto out;
-+		}
-+	} else {
-+		ret = TRUE;
- 	}
- 	dbus_g_method_return (context, NULL);
- out:
- 	g_free (stdout);
- 	g_free (stderr);
-+	g_free (command);
- 	if (subject != NULL)
- 		g_object_unref (subject);
- 	return TRUE;
-@@ -549,6 +573,7 @@ up_daemon_hibernate (UpDaemon *daemon, DBusGMethodInvocation *context)
- 	GError *error;
- 	GError *error_local = NULL;
- 	PolkitSubject *subject = NULL;
-+	gchar *command = NULL;
- 	gchar *stdout = NULL;
- 	gchar *stderr = NULL;
- 
-@@ -589,19 +614,29 @@ up_daemon_hibernate (UpDaemon *daemon, DBusGMethodInvocation *context)
- 	if (!up_polkit_check_auth (daemon->priv->polkit, subject, "org.freedesktop.devicekit.power.hibernate", context))
- 		goto out;
- 
--	ret = g_spawn_command_line_sync ("/usr/sbin/pm-hibernate", &stdout, &stderr, NULL, &error_local);
--	if (!ret) {
--		error = g_error_new (UP_DAEMON_ERROR,
--				     UP_DAEMON_ERROR_GENERAL,
--				     "Failed to spawn: %s, stdout:%s, stderr:%s", error_local->message, stdout, stderr);
--		g_error_free (error_local);
--		dbus_g_method_return_error (context, error);
--		goto out;
-+#ifndef __FreeBSD__
-+	command = g_strdup ("/usr/sbin/pm-hibernate");
-+#else
-+	command = up_backend_get_hibernate_command (daemon->priv->backend);
-+#endif
-+	if (command != NULL) {
-+		ret = g_spawn_command_line_sync (command, &stdout, &stderr, NULL, &error_local);
-+		if (!ret) {
-+			error = g_error_new (UP_DAEMON_ERROR,
-+				     	UP_DAEMON_ERROR_GENERAL,
-+				     	"Failed to spawn: %s, stdout:%s, stderr:%s", error_local->message, stdout, stderr);
-+			g_error_free (error_local);
-+			dbus_g_method_return_error (context, error);
-+			goto out;
-+		}
-+	} else {
-+		ret = TRUE;
- 	}
- 	dbus_g_method_return (context, NULL);
- out:
- 	g_free (stdout);
- 	g_free (stderr);
-+	g_free (command);
- 	if (subject != NULL)
- 		g_object_unref (subject);
- 	return TRUE;
 -- 
 1.6.5.7
 
diff --git a/sysutils/upower/files/patch-devkit-power-gobject_Makefile.in b/sysutils/upower/files/patch-devkit-power-gobject_Makefile.in
deleted file mode 100644
index e208040fb..000000000
--- a/sysutils/upower/files/patch-devkit-power-gobject_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- devkit-power-gobject/Makefile.in.orig	2010-02-21 20:24:59.000000000 -0500
-+++ devkit-power-gobject/Makefile.in	2010-02-21 20:25:03.000000000 -0500
-@@ -387,7 +387,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__appe
- @HAVE_INTROSPECTION_TRUE@DeviceKitPowerGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
- @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
- @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
--@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepositry-1.0
-+@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
- @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- all: all-am
- 
diff --git a/sysutils/upower/files/patch-libupower-glib_Makefile.in b/sysutils/upower/files/patch-libupower-glib_Makefile.in
deleted file mode 100644
index 9e3877fb4..000000000
--- a/sysutils/upower/files/patch-libupower-glib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libupower-glib/Makefile.in.orig	2010-02-21 20:24:00.000000000 -0500
-+++ libupower-glib/Makefile.in	2010-02-21 20:24:10.000000000 -0500
-@@ -364,7 +364,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__appe
- @HAVE_INTROSPECTION_TRUE@UPowerGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
- @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
- @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS)
--@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepositry-1.0
-+@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
- @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- all: all-am
- 
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index 2d955fe17..6c8862487 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -11,16 +11,16 @@ 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/upower-glib/up-client.h
-include/upower-glib/up-device.h
-include/upower-glib/up-history-item.h
-include/upower-glib/up-qos-item.h
-include/upower-glib/up-stats-item.h
-include/upower-glib/up-types.h
-include/upower-glib/up-version.h
-include/upower-glib/up-wakeup-item.h
-include/upower-glib/upower.h
-lib/girepository-1.0/DeviceKitPowerGlib-1.0.typelib
+include/libupower-glib/up-client.h
+include/libupower-glib/up-device.h
+include/libupower-glib/up-history-item.h
+include/libupower-glib/up-qos-item.h
+include/libupower-glib/up-stats-item.h
+include/libupower-glib/up-types.h
+include/libupower-glib/up-version.h
+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
@@ -39,7 +39,6 @@ share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.xml
 share/dbus-1/system-services/org.freedesktop.UPower.service
-share/gir-1.0/DeviceKitPowerGlib-1.0.gir
 share/gir-1.0/UPowerGlib-1.0.gir
 share/locale/it/LC_MESSAGES/UPower.mo
 share/locale/pl/LC_MESSAGES/UPower.mo
@@ -49,6 +48,6 @@ 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/upower-glib
+@dirrm include/libupower-glib
 @unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true
 @unexec rmdir /var/lib 2>/dev/null || true