Update to upower-0.9.18.

ok landry@ (maintainer)

sysutils/upower/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2012/06/27 06:39:50 landry Exp $
+# $OpenBSD: Makefile,v 1.19 2012/08/21 17:27:13 ajacoutot Exp $
 
 ONLY_FOR_ARCHS =${APM_ARCHS}
 
 COMMENT =	userland power management interface
 
-DISTNAME =	upower-0.9.17
+DISTNAME =	upower-0.9.18
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	sysutils
 SHARED_LIBS +=  upower-glib               0.0 # 1.1
@@ -23,6 +23,7 @@ PERMIT_DISTFILES_FTP=	Yes
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--disable-gtk-doc \
+			--disable-systemd \
 			--enable-introspection \
 			--enable-man-pages \
 			--with-historydir=/var/db/upower \

sysutils/upower/distinfo

@@ -1,5 +1,2 @@
-MD5 (upower-0.9.17.tar.xz) = nvf8jsQ4VC8BTzo0VSgiqg==
-RMD160 (upower-0.9.17.tar.xz) = LZnjpKBcqg5e9G61aMxgWz0z5ik=
-SHA1 (upower-0.9.17.tar.xz) = sAFJMKiAVN9EWajKw/GtTjldjUA=
-SHA256 (upower-0.9.17.tar.xz) = z59o0o/snKz7RAVMKZaod6nvSkSc/ieTlNRkQt4VMig=
-SIZE (upower-0.9.17.tar.xz) = 402336
+SHA256 (upower-0.9.18.tar.xz) = oaFQXS+V6TmKm+2QkXx4pu4MPXlWrvHOARcX0gRnBo8=
+SIZE (upower-0.9.18.tar.xz) = 403844

sysutils/upower/patches/patch-configure

@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.9 2012/06/27 06:39:50 landry Exp $
+$OpenBSD: patch-configure,v 1.10 2012/08/21 17:27:13 ajacoutot Exp $
 
 Disable --as-needed to prevent undefined symbol on pthread_*
 
 Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
 
---- configure.orig	Wed May 16 23:31:39 2012
-+++ configure	Tue Jun 26 09:28:56 2012
-@@ -13494,10 +13494,6 @@ else
+--- configure.orig	Wed Aug  8 13:59:34 2012
++++ configure	Tue Aug 21 16:56:37 2012
+@@ -13642,10 +13642,6 @@ else
  fi
  
  
@@ -17,7 +17,7 @@ Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
  # i18n support
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-@@ -14043,6 +14039,9 @@ else
+@@ -14191,6 +14187,9 @@ else
    DATADIRNAME=lib
  fi
  

sysutils/upower/patches/patch-src_openbsd_up-backend_c

@@ -1,36 +0,0 @@
-$OpenBSD: patch-src_openbsd_up-backend_c,v 1.5 2012/06/27 06:39:50 landry Exp $
-
-Properly initialize update-time when creating devices
-
---- src/openbsd/up-backend.c.orig	Fri Jan  6 14:41:03 2012
-+++ src/openbsd/up-backend.c	Tue Jun 26 09:28:56 2012
-@@ -529,6 +529,7 @@ static void
- up_backend_init (UpBackend *backend)
- {
- 	GError *err = NULL;
-+	GTimeVal timeval;
- 	UpDeviceClass *device_class;
- 
- 	backend->priv = UP_BACKEND_GET_PRIVATE (backend);
-@@ -558,6 +559,7 @@ up_backend_init (UpBackend *backend)
- 		}
- 
- 		/* setup dummy */
-+		g_get_current_time (&timeval);
- 		g_object_set (backend->priv->battery,
- 			      "type", UP_DEVICE_KIND_BATTERY,
- 			      "power-supply", TRUE,
-@@ -567,11 +569,13 @@ up_backend_init (UpBackend *backend)
- 			      "state", UP_DEVICE_STATE_UNKNOWN,
- 			      "percentage", 0.0f,
- 			      "time-to-empty", (gint64) 0,
-+			      "update-time", (guint64) timeval.tv_sec,
- 			      (void*) NULL);
- 		g_object_set (backend->priv->ac,
- 			      "type", UP_DEVICE_KIND_LINE_POWER,
- 			      "online", TRUE,
- 			      "power-supply", TRUE,
-+			      "update-time", (guint64) timeval.tv_sec,
- 			      (void*) NULL);
- 	} else {
- 		backend->priv->ac = NULL;

sysutils/upower/patches/patch-tools_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.5 2012/06/27 06:39:50 landry Exp $
---- tools/Makefile.in.orig	Wed May 16 23:31:39 2012
-+++ tools/Makefile.in	Tue Jun 26 09:28:56 2012
-@@ -301,6 +301,7 @@ upower_LDFLAGS = -pthread
+$OpenBSD: patch-tools_Makefile_in,v 1.6 2012/08/21 17:27:13 ajacoutot Exp $
+--- tools/Makefile.in.orig	Wed Aug  8 13:59:34 2012
++++ tools/Makefile.in	Tue Aug 21 16:56:37 2012
+@@ -304,6 +304,7 @@ upower_LDFLAGS = -pthread
  upower_LDADD = \
  	$(DBUS_GLIB_LIBS)				\
  	$(UPOWER_LIBS)					\