From 1a7e50f4978d024ddac4287b160b7fdabe58c163 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 8 Sep 2011 17:57:40 +0000
Subject: [PATCH] Bugfix update to upower-0.9.13.

ok landry@ (maintainer)
---
 sysutils/upower/Makefile                      | 19 +++++++++----------
 sysutils/upower/distinfo                      | 10 +++++-----
 sysutils/upower/patches/patch-configure       | 14 --------------
 sysutils/upower/patches/patch-src_Makefile_in |  8 ++++----
 .../upower/patches/patch-tools_Makefile_in    |  8 ++++----
 5 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100644 sysutils/upower/patches/patch-configure

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index dceec5740bf..45c63752234 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2011/07/08 08:16:09 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/08 17:57:40 ajacoutot Exp $
 
 ONLY_FOR_ARCHS =${APM_ARCHS}
 
 COMMENT =	userland power management interface
 
-DISTNAME =	upower-0.9.12
-REVISION =	0
+DISTNAME =	upower-0.9.13
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	sysutils
 SHARED_LIBS +=  upower-glib               0.0 # 1.1
@@ -31,22 +30,22 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-FAKE_FLAGS =	sysconfdir=${PREFIX}/share/examples/upower
+FAKE_FLAGS =	sysconfdir=${PREFIX}/share/examples/upower \
+		itlocaledir="${PREFIX}/share/locale/"
 
 USE_GMAKE =	Yes
 USE_LIBTOOL =	Yes
 
-MODULES =	devel/gettext \
-		textproc/intltool
+MODULES =	textproc/intltool
 
 LIB_DEPENDS =	sysutils/polkit>=0.101 \
 		x11/dbus-glib
 BUILD_DEPENDS =	devel/gobject-introspection \
 		textproc/libxslt,-main \
-		textproc/docbook-xsl
+		textproc/docbook-xsl \
+		devel/gettext
 
-WANTLIB =	c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 m \
-		polkit-gobject-1 pthread gthread-2.0 gio-2.0 \
-		gmodule-2.0 pcre z
+WANTLIB += c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m polkit-gobject-1 pthread
 
 .include <bsd.port.mk>
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index ffb40c334a6..ca31693a698 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,5 +1,5 @@
-MD5 (upower-0.9.12.tar.xz) = 1SoTwA8GqIzHxlQWEAdkag==
-RMD160 (upower-0.9.12.tar.xz) = Lz3hwTrZ+u7wFKZ/o3iIiRDGgFU=
-SHA1 (upower-0.9.12.tar.xz) = 2JgwQjR7T4+E4nAA1k0UGFk6e2U=
-SHA256 (upower-0.9.12.tar.xz) = Bue7MjyTqON3o8xQALjer90iyS89Lz738aH3TY4TS7A=
-SIZE (upower-0.9.12.tar.xz) = 389372
+MD5 (upower-0.9.13.tar.xz) = JtLcU/xjLB9iI0zCFxXD4Q==
+RMD160 (upower-0.9.13.tar.xz) = 3hiz9L+FGZgkz4+uzIM9Z0pH7rE=
+SHA1 (upower-0.9.13.tar.xz) = SO+0oVuv74dtcImS7IFo1EOBedc=
+SHA256 (upower-0.9.13.tar.xz) = LH3Swm0R2mKNaBEdUO7VEkSoM3wdCDCt3s0TcqfUSiI=
+SIZE (upower-0.9.13.tar.xz) = 403428
diff --git a/sysutils/upower/patches/patch-configure b/sysutils/upower/patches/patch-configure
deleted file mode 100644
index 93fcc27490d..00000000000
--- a/sysutils/upower/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2011/07/07 19:02:43 dcoppa Exp $
---- configure.orig	Mon Jul  4 17:45:17 2011
-+++ configure	Tue Jul  5 08:58:37 2011
-@@ -14244,10 +14244,6 @@ else
- fi
- 
- 
--if test "x$GCC" = "xyes"; then
--  LDFLAGS="-Wl,--as-needed $LDFLAGS"
--fi
--
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
- $as_echo_n "checking whether NLS is requested... " >&6; }
diff --git a/sysutils/upower/patches/patch-src_Makefile_in b/sysutils/upower/patches/patch-src_Makefile_in
index f391c6c3be5..63fadc87d0b 100644
--- a/sysutils/upower/patches/patch-src_Makefile_in
+++ b/sysutils/upower/patches/patch-src_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2011/05/30 07:48:53 landry Exp $
+$OpenBSD: patch-src_Makefile_in,v 1.3 2011/09/08 17:57:40 ajacoutot Exp $
 no need for var/lib/upower
---- src/Makefile.in.orig	Wed May  4 18:49:59 2011
-+++ src/Makefile.in	Mon May 30 09:43:16 2011
-@@ -1543,9 +1543,6 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile
+--- src/Makefile.in.orig	Mon Sep  5 12:14:49 2011
++++ src/Makefile.in	Thu Sep  8 16:02:56 2011
+@@ -1553,9 +1553,6 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile
  	cp $< $@
  
  install-data-hook:
diff --git a/sysutils/upower/patches/patch-tools_Makefile_in b/sysutils/upower/patches/patch-tools_Makefile_in
index f4571f39422..a6b0353d0ba 100644
--- a/sysutils/upower/patches/patch-tools_Makefile_in
+++ b/sysutils/upower/patches/patch-tools_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.1.1.1 2011/05/23 19:04:57 landry Exp $
---- tools/Makefile.in.orig	Mon Mar 21 19:42:07 2011
-+++ tools/Makefile.in	Sat May 21 13:07:51 2011
-@@ -292,6 +292,7 @@ upower_LDFLAGS = -pthread
+$OpenBSD: patch-tools_Makefile_in,v 1.2 2011/09/08 17:57:40 ajacoutot Exp $
+--- tools/Makefile.in.orig	Mon Sep  5 12:14:50 2011
++++ tools/Makefile.in	Thu Sep  8 16:02:56 2011
+@@ -297,6 +297,7 @@ upower_LDFLAGS = -pthread
  upower_LDADD = \
  	$(DBUS_GLIB_LIBS)				\
  	$(UPOWER_LIBS)					\