diff options
| -rw-r--r-- | sysutils/upower/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/upower/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/upower/files/patch-src_freebsd_up-backend.c | 19 | ||||
| -rw-r--r-- | sysutils/upower/files/patch-src_up-daemon.c | 12 | ||||
| -rw-r--r-- | sysutils/upower/pkg-plist | 8 |
5 files changed, 35 insertions, 15 deletions
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index 35af259b0..a9eb828b4 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.13 2010/04/09 06:52:55 marcus Exp $ +# $MCom: ports/sysutils/upower/Makefile,v 1.14 2010/04/11 23:54:19 marcus Exp $ # PORTNAME= upower -DISTVERSION= 0.9.2 -PORTREVISION= 2 +DISTVERSION= 0.9.3 CATEGORIES= sysutils MASTER_SITES= http://upower.freedesktop.org/releases/ diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo index 1eb445c4a..066e883b1 100644 --- a/sysutils/upower/distinfo +++ b/sysutils/upower/distinfo @@ -1,3 +1,3 @@ -MD5 (upower-0.9.2.tar.bz2) = 2175c37a393425ee26bdb728768bd21c -SHA256 (upower-0.9.2.tar.bz2) = 4a0532fbda7afee29984f7b96b3b3114c68b0525278beb10c98ef287ca5a8377 -SIZE (upower-0.9.2.tar.bz2) = 467544 +MD5 (upower-0.9.3.tar.bz2) = 18cd3809d3869b889b094d1b9dbe88e9 +SHA256 (upower-0.9.3.tar.bz2) = 05eb4bd73493c779a6972893d7439f92ca8cc30cd81cf00663cfb4dca10896a1 +SIZE (upower-0.9.3.tar.bz2) = 468427 diff --git a/sysutils/upower/files/patch-src_freebsd_up-backend.c b/sysutils/upower/files/patch-src_freebsd_up-backend.c new file mode 100644 index 000000000..f6ad11815 --- /dev/null +++ b/sysutils/upower/files/patch-src_freebsd_up-backend.c @@ -0,0 +1,19 @@ +--- 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 index 7ddaae8c4..eea72a87b 100644 --- a/sysutils/upower/files/patch-src_up-daemon.c +++ b/sysutils/upower/files/patch-src_up-daemon.c @@ -1,18 +1,18 @@ ---- src/up-daemon.c.orig 2010-04-11 19:51:10.000000000 -0400 -+++ src/up-daemon.c 2010-04-11 19:51:33.000000000 -0400 -@@ -480,6 +480,8 @@ up_daemon_suspend_allowed (UpDaemon *dae +--- 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 (daemon->priv->polkit, subject, "org.freedesktop.upower.suspend", context); + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context); + if (!ret) + goto out; dbus_g_method_return (context, ret); out: -@@ -564,6 +566,8 @@ up_daemon_hibernate_allowed (UpDaemon *d +@@ -575,6 +577,8 @@ up_daemon_hibernate_allowed (UpDaemon *d goto out; - ret = up_polkit_is_allowed (daemon->priv->polkit, subject, "org.freedesktop.upower.hibernate", context); + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context); + if (!ret) + goto out; dbus_g_method_return (context, ret); diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist index 6c8862487..8f96cd1fc 100644 --- a/sysutils/upower/pkg-plist +++ b/sysutils/upower/pkg-plist @@ -1,5 +1,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 @@ -40,14 +41,15 @@ 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/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 @unexec rmdir /var/lib 2>/dev/null || true |