Update to 0.9.6.

Temporarly disable gir generation until patches can be made.


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

6 files changed, 6 insertions, 84 deletions

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 4b30b0a4e..11b0ed889 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.15 2010/05/09 17:43:53 marcus Exp $
+#   $MCom: ports/sysutils/upower/Makefile,v 1.17 2010/06/29 21:14:03 kwm Exp $
 #
 
 PORTNAME=	upower
-PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTVERSION=	0.9.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 
@@ -28,6 +27,7 @@ USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
+		--enable-introspection=no \
 		--with-backend=freebsd \
 		--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 98dcd0b81..3871fbb02 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,3 +1,3 @@
-MD5 (upower-0.9.4.tar.bz2) = da93329b0938a64ad55a26aa8ee9c807
-SHA256 (upower-0.9.4.tar.bz2) = 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
-SIZE (upower-0.9.4.tar.bz2) = 468727
+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-src_freebsd_up-backend.c b/sysutils/upower/files/patch-src_freebsd_up-backend.c
deleted file mode 100644
index f6ad11815..000000000
--- a/sysutils/upower/files/patch-src_freebsd_up-backend.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/freebsd/up-backend.c.orig	2010-05-09 13:40:33.000000000 -0400
-+++ src/freebsd/up-backend.c	2010-05-09 13:42:27.000000000 -0400
-@@ -298,16 +298,6 @@ up_backend_coldplug (UpBackend *backend,
- }
- 
- /**
-- * up_backend_get_powersave_command:
-- **/
--const gchar *
--up_backend_get_powersave_command (UpBackend *backend, gboolean powersave)
--{
--	/* XXX: Do we want to use powerd here? */
--	return NULL;
--}
--
--/**
-  * up_backend_get_suspend_command:
-  **/
- const gchar *
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 eea72a87b..000000000
--- 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 88a074e99..000000000
--- 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 8f96cd1fc..bc6b10df7 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
@@ -22,16 +12,10 @@ 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
-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
@@ -40,15 +24,12 @@ 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/UPowerGlib-1.0.gir
 share/locale/it/LC_MESSAGES/upower.mo
 share/locale/pl/LC_MESSAGES/upower.mo
 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