4 files changed, 32 insertions, 34 deletions

diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 5c4b8623ae54..3245f23db47d 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.63 2010/04/26 17:38:05 kwm Exp $
+#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.69 2010/09/27 18:49:22 kwm Exp $
 #
 
 PORTNAME=	gnome-power-manager
-PORTVERSION=	2.30.1
-PORTREVISION=	1
+PORTVERSION=	2.32.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,12 +15,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Power management system for the GNOME Desktop
 
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
-		devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \
+LIB_DEPENDS=	upower-glib.1:${PORTSDIR}/sysutils/upower \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 		notify.1:${PORTSDIR}/devel/libnotify \
 		execinfo:${PORTSDIR}/devel/libexecinfo \
 		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
@@ -29,7 +28,7 @@ USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool:22
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libwnck \
+USE_GNOME=	gnomeprefix gnomehack intlhack libwnck \
 		gnomedocutils gnomepanel
 CONFIGURE_ARGS=	--with-doc-dir=${PREFIX}/share/doc \
 		--disable-docbook-docs \
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 644f6020406d..5ba031ccfdf1 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = b85178b8db77db5d22e185430549a295
-SHA256 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 47af6221ae83d329088abd8f5176f503fe5f81417a7c6766c95279b0af05021c
-SIZE (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 3854167
+MD5 (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 9a08e85dce3ffb90775f15e3bda4adda
+SHA256 (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
+SIZE (gnome2/gnome-power-manager-2.32.0.tar.bz2) = 3892164
diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
index a161ee0fabad..0f4da29db278 100644
--- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in
+++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2010-03-30 18:08:05.000000000 +0800
-+++ src/Makefile.in	2010-03-30 18:09:04.000000000 +0800
-@@ -497,6 +497,7 @@
+--- src/Makefile.in.orig	2010-06-06 12:19:04.000000000 +0200
++++ src/Makefile.in	2010-06-06 12:21:46.000000000 +0200
+@@ -499,6 +499,7 @@
  	$(GNOME_LIBS)					\
  	$(UNIQUE_LIBS)					\
  	$(DBUS_LIBS)					\
@@ -8,30 +8,27 @@
  	-lm
  
  gnome_power_statistics_CFLAGS = \
-@@ -511,7 +512,7 @@
+@@ -520,6 +521,7 @@
+ 	$(UNIQUE_LIBS)					\
+ 	$(GPM_EXTRA_LIBS)				\
+ 	$(UPOWER_LIBS)					\
++	-lexecinfo					\
+ 	-lm
  
- gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \
- 	$(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \
--	$(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lm $(am__append_1)
-+	$(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_1)
  gnome_power_preferences_CFLAGS = \
- 	$(WARNINGFLAGS)					\
- 	$(NULL)
-@@ -531,7 +532,7 @@
- gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \
- 	$(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \
- 	$(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \
--	$(DEVKIT_LIBS) -lm $(am__append_3)
-+	$(DEVKIT_LIBS) -lexecinfo -lm $(am__append_3)
+@@ -573,6 +575,7 @@
+ 	$(LIBNOTIFY_LIBS)				\
+ 	$(GPM_EXTRA_LIBS)				\
+ 	$(UPOWER_LIBS)					\
++	-lexecinfo					\
+ 	-lm
+ 
  gnome_power_manager_CFLAGS = \
- 	$(WARNINGFLAGS)					\
- 	$(NULL)
-@@ -590,7 +591,7 @@
+@@ -639,6 +642,7 @@
+ 	$(X11_LIBS)						\
+ 	$(LIBNOTIFY_LIBS)				\
+ 	$(GPM_EXTRA_LIBS)				\
++	-lexecinfo					\
+ 	-lm
  
- gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \
- 	$(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_LIBS) $(X11_LIBS) \
--	$(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lm $(am__append_4)
-+	$(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lexecinfo -lm $(am__append_4)
  gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
- BUILT_SOURCES = \
- 	org.gnome.PowerManager.h			\
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 47e2c200a9c6..4bd92ff7ec09 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -7,6 +7,7 @@ libdata/bonobo/servers/GNOME_BrightnessApplet.server
 libdata/bonobo/servers/GNOME_InhibitApplet.server
 libexec/gnome-brightness-applet
 libexec/gnome-inhibit-applet
+sbin/gnome-power-backlight-helper
 share/applications/gnome-power-preferences.desktop
 share/applications/gnome-power-statistics.desktop
 share/dbus-1/services/gnome-power-manager.service
@@ -690,6 +691,7 @@ share/omf/gnome-power-manager/gnome-power-manager-pa.omf
 share/omf/gnome-power-manager/gnome-power-manager-ru.omf
 share/omf/gnome-power-manager/gnome-power-manager-sv.omf
 share/omf/gnome-power-manager/gnome-power-manager-zh_CN.omf
+share/polkit-1/actions/org.gnome.power.policy
 @dirrm share/omf/gnome-power-manager
 @dirrm share/gnome/help/gnome-power-manager/zh_CN/figures
 @dirrm share/gnome/help/gnome-power-manager/zh_CN