4 files changed, 21 insertions, 39 deletions

diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 0281c9705125..b50aa50e818f 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -1,10 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/sysutils/upower/Makefile,v 1.19 2010/10/05 08:30:15 kwm Exp $
+#   $MCom: ports/trunk/sysutils/upower/Makefile 19882 2014-09-16 12:34:00Z kwm $
 
 PORTNAME=	upower
-PORTVERSION=	0.9.7
-PORTREVISION=	5
+PORTVERSION=	0.99.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://upower.freedesktop.org/releases/
 
@@ -17,26 +17,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-OPTIONS_DEFINE=	MANPAGES
-OPTIONS_DEFAULT=MANPAGES
-OPTIONS_SUB=	yes
-MANPAGES_CONFIGURE_ENABLE=	man-pages
-MANPAGES_BUILD_DEPENDS= \
-	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
-    	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml \
-    	xsltproc:${PORTSDIR}/textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-
-USES=		gettext gmake libtool:keepla pathfix pkgconfig python tar:bzip2
-USE_GNOME=	intlhack glib20 introspection:build,run
+USES=		gettext gmake libtool pathfix pkgconfig \
+		python tar:xz
+USE_GNOME=	intlhack glib20 introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-backend=freebsd \
 		--localstatedir=/var
-CONFIGURE_ENV=	GTKDOC="false"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
+CONFIGURE_ENV=	GTKDOC="false"
+
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=MANPAGES
+OPTIONS_SUB=	yes
+MANPAGES_CONFIGURE_ENABLE=	man-pages
+MANPAGES_BUILD_DEPENDS= \
+	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_USE=	GNOME=libxslt:build
 
 .include <bsd.port.mk>
diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo
index 6ee0a44d9ff4..c0700c5e8b6d 100644
--- a/sysutils/upower/distinfo
+++ b/sysutils/upower/distinfo
@@ -1,2 +1,2 @@
-SHA256 (upower-0.9.7.tar.bz2) = 7db45ff675e6836e89adc84d6937e9e5cd468ded89e8bd19edcbfb1a28f42933
-SIZE (upower-0.9.7.tar.bz2) = 459717
+SHA256 (upower-0.99.0.tar.xz) = 5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1
+SIZE (upower-0.99.0.tar.xz) = 429076
diff --git a/sysutils/upower/files/patch-src__freebsd__up-backend.c b/sysutils/upower/files/patch-src__freebsd__up-backend.c
deleted file mode 100644
index 0ad8bc5510a8..000000000000
--- a/sysutils/upower/files/patch-src__freebsd__up-backend.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/freebsd/up-backend.c.orig	2010-11-01 12:28:43.000000000 +0100
-+++ ./src/freebsd/up-backend.c	2013-01-23 02:42:21.293236052 +0100
-@@ -227,7 +227,7 @@
- 	gchar *lid_state;
- 
- 	lid_state = up_get_string_sysctl (NULL, "hw.acpi.lid_switch_state");
--	if (lid_state && strcmp (lid_state, "NONE")) {
-+	if (lid_state) {
- 		up_daemon_set_lid_is_present (backend->priv->daemon, TRUE);
- 	}
- 	g_free (lid_state);
diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist
index 7bbfa77d7c32..f08572fb9e9f 100644
--- a/sysutils/upower/pkg-plist
+++ b/sysutils/upower/pkg-plist
@@ -1,11 +1,9 @@
-bin/devkit-power
 bin/upower
 etc/UPower/UPower.conf
 etc/dbus-1/system.d/org.freedesktop.UPower.conf
 include/libupower-glib/up-client.h
 include/libupower-glib/up-device.h
 include/libupower-glib/up-history-item.h
-include/libupower-glib/up-qos-item.h
 include/libupower-glib/up-stats-item.h
 include/libupower-glib/up-types.h
 include/libupower-glib/up-version.h
@@ -14,19 +12,16 @@ include/libupower-glib/up-wakeups.h
 include/libupower-glib/upower.h
 lib/girepository-1.0/UPowerGlib-1.0.typelib
 lib/libupower-glib.a
-lib/libupower-glib.la
 lib/libupower-glib.so
-lib/libupower-glib.so.1
-lib/libupower-glib.so.1.0.1
+lib/libupower-glib.so.2
+lib/libupower-glib.so.2.0.0
 libdata/pkgconfig/upower-glib.pc
-libexec/devkit-power-daemon
 libexec/upowerd
 %%MANPAGES%%man/man1/upower.1.gz
 %%MANPAGES%%man/man7/UPower.7.gz
 %%MANPAGES%%man/man8/upowerd.8.gz
 share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
 share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
-share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml
 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
@@ -35,7 +30,5 @@ share/locale/fr/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
 @dir /var/lib/upower
 @dir /var/lib/