From af213defe9f28121a0cc916d84bf10e9291172ca Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 4 Sep 2012 09:06:12 +0000
Subject: [PATCH] Remove --as-needed and -pthread patches.

ok landry@ (maintainer)
---
 sysutils/upower/Makefile                      |  8 +++---
 sysutils/upower/patches/patch-configure       | 25 +++++--------------
 .../upower/patches/patch-tools_Makefile_in    | 11 --------
 3 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 sysutils/upower/patches/patch-tools_Makefile_in

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 2b868d1cbc2..b30d8d934c3 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2012/08/21 17:27:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2012/09/04 09:06:12 ajacoutot Exp $
 
 ONLY_FOR_ARCHS =${APM_ARCHS}
 
@@ -8,6 +8,7 @@ DISTNAME =	upower-0.9.18
 EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	sysutils
 SHARED_LIBS +=  upower-glib               0.0 # 1.1
+REVISION =	0
 
 HOMEPAGE =	http://upower.freedesktop.org/
 MASTER_SITES =	${HOMEPAGE}/releases/
@@ -37,8 +38,7 @@ FAKE_FLAGS =	sysconfdir=${PREFIX}/share/examples/upower
 USE_GMAKE =	Yes
 USE_LIBTOOL =	Yes
 
-MODULES =	devel/gettext \
-		textproc/intltool
+MODULES =	textproc/intltool
 
 LIB_DEPENDS =	sysutils/polkit>=0.101 \
 		x11/dbus-glib
@@ -47,6 +47,6 @@ BUILD_DEPENDS =	devel/gobject-introspection \
 		textproc/docbook-xsl
 
 WANTLIB += c dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 gthread-2.0
-WANTLIB += m polkit-gobject-1 pthread ffi gio-2.0 gmodule-2.0 pcre z
+WANTLIB += m polkit-gobject-1 pthread
 
 .include <bsd.port.mk>
diff --git a/sysutils/upower/patches/patch-configure b/sysutils/upower/patches/patch-configure
index 5956ff026a3..a943d6812e4 100644
--- a/sysutils/upower/patches/patch-configure
+++ b/sysutils/upower/patches/patch-configure
@@ -1,29 +1,16 @@
-$OpenBSD: patch-configure,v 1.10 2012/08/21 17:27:13 ajacoutot Exp $
-
-Disable --as-needed to prevent undefined symbol on pthread_*
+$OpenBSD: patch-configure,v 1.11 2012/09/04 09:06:12 ajacoutot Exp $
 
 Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
 
 --- configure.orig	Wed Aug  8 13:59:34 2012
-+++ configure	Tue Aug 21 16:56:37 2012
-@@ -13642,10 +13642,6 @@ else
++++ configure	Tue Sep  4 08:45:24 2012
+@@ -14192,6 +14192,9 @@ else
  fi
  
- 
--if test "x$GCC" = "xyes"; then
--  LDFLAGS="-Wl,--as-needed $LDFLAGS"
--fi
--
- # i18n support
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-@@ -14191,6 +14187,9 @@ else
-   DATADIRNAME=lib
- fi
- 
-+    ;;
+     ;;
 +    *-*-openbsd*)
 +    DATADIRNAME=share
-     ;;
++    ;;
      *)
      DATADIRNAME=lib
+     ;;
diff --git a/sysutils/upower/patches/patch-tools_Makefile_in b/sysutils/upower/patches/patch-tools_Makefile_in
deleted file mode 100644
index b7a4f4a438e..00000000000
--- a/sysutils/upower/patches/patch-tools_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
-$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)					\
-+	-pthread \
- 	$(POLKIT_DBUS_LIBS)
- 
- CLEANFILES = $(BUILT_SOURCES)