summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2013-09-16 06:52:32 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2013-09-16 06:52:32 +0800
commit5436f2b9bb1ed14a1e25c855c5972633c87ed724 (patch)
treebc79f71a1fbf3e89c980f6a716ae904a09668c1d
parent40f1adf7a141e0be334b065863e87d4c1ca5d33b (diff)
downloadmarcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.tar
marcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.tar.gz
marcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.tar.bz2
marcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.tar.lz
marcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.tar.xz
marcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.tar.zst
marcuscom-ports-5436f2b9bb1ed14a1e25c855c5972633c87ed724.zip
Sync with FreeBSD ports to fix loop when devd is restarted.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18681 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--sysutils/upower/Makefile3
-rw-r--r--sysutils/upower/files/patch-src_freebsd_up-devd.c11
2 files changed, 13 insertions, 1 deletions
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 56ba38691..2d4a0a922 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,9 +1,10 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/sysutils/upower/Makefile 18610 2013-06-30 16:33:05Z marcus $
+# $MCom$
PORTNAME= upower
PORTVERSION= 0.9.18
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
diff --git a/sysutils/upower/files/patch-src_freebsd_up-devd.c b/sysutils/upower/files/patch-src_freebsd_up-devd.c
new file mode 100644
index 000000000..873b6ea92
--- /dev/null
+++ b/sysutils/upower/files/patch-src_freebsd_up-devd.c
@@ -0,0 +1,11 @@
+--- src/freebsd/up-devd.c.orig 2013-09-15 13:08:35.000000000 -0400
++++ src/freebsd/up-devd.c 2013-09-15 13:10:13.000000000 -0400
+@@ -195,7 +195,7 @@ up_devd_event_cb (GIOChannel *source, GI
+ event[terminator] = 0;
+ up_devd_process_event(event, user_data);
+ g_free(event);
+- } else if (status == G_IO_STATUS_AGAIN) {
++ } else {
+ up_devd_init (UP_BACKEND(user_data));
+ if (up_devd_inited) {
+ int fd;