Update to 2.30.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13903 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 13 insertions, 23 deletions

diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 3ce52e58d..6e5f25198 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.60 2010/02/13 19:24:28 marcus Exp $
+#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.61 2010/03/02 07:46:28 avl Exp $
 #
 
 PORTNAME=	gnome-power-manager
-PORTVERSION=	2.29.91
+PORTVERSION=	2.30.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index d5acb35c0..3b568ed8f 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.29.91.tar.bz2) = a3207923149da865d90650f33181c8fe
-SHA256 (gnome2/gnome-power-manager-2.29.91.tar.bz2) = 11a34c5beba1f12577ff222f448382eafa3220f78548dd52a2dba36764f128c6
-SIZE (gnome2/gnome-power-manager-2.29.91.tar.bz2) = 3850607
+MD5 (gnome2/gnome-power-manager-2.30.0.tar.bz2) = 2f47606d16d54915dc49a06364d208da
+SHA256 (gnome2/gnome-power-manager-2.30.0.tar.bz2) = 8fc2c772f1c0d89b200e405d02656e69a71362771175fbcb6b6db426410db647
+SIZE (gnome2/gnome-power-manager-2.30.0.tar.bz2) = 3850260
diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
index d715644c7..a161ee0fa 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-01-01 21:02:44.000000000 +0800
-+++ src/Makefile.in	2010-01-01 21:03:47.000000000 +0800
-@@ -514,6 +514,7 @@
+--- 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 @@
  	$(GNOME_LIBS)					\
  	$(UNIQUE_LIBS)					\
  	$(DBUS_LIBS)					\
@@ -8,7 +8,7 @@
  	-lm
  
  gnome_power_statistics_CFLAGS = \
-@@ -528,7 +529,7 @@
+@@ -511,7 +512,7 @@
  
  gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \
  	$(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \
@@ -17,19 +17,19 @@
  gnome_power_preferences_CFLAGS = \
  	$(WARNINGFLAGS)					\
  	$(NULL)
-@@ -548,7 +549,7 @@
+@@ -531,7 +532,7 @@
  gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \
- 	$(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(XRANDR_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)
  gnome_power_manager_CFLAGS = \
  	$(WARNINGFLAGS)					\
  	$(NULL)
-@@ -607,7 +608,7 @@
+@@ -590,7 +591,7 @@
  
  gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \
- 	$(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_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)
diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c b/sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c
deleted file mode 100644
index eb0578931..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_gpm-brightness-hal.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gpm-brightness-hal.c.orig	2010-03-02 15:05:33.000000000 +0800
-+++ src/gpm-brightness-hal.c	2010-03-02 15:06:07.000000000 +0800
-@@ -441,6 +441,7 @@
- 	HalDevice *device;
- 	gboolean res;
- 	DBusGConnection *connection;
-+	GError *error = NULL;
- 
- 	brightness->priv = GPM_BRIGHTNESS_HAL_GET_PRIVATE (brightness);
- 	brightness->priv->proxy = NULL;