Update to 2.29.92.

Remove the configure patch. It added hal deps to the keyboard bits in gdm.
Which was needed for the hal-keyboard patch. So we are now free of hal here.
(hopefully without breaking anything ;)


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

3 files changed, 5 insertions, 73 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 15c5f0183..9c799ba6c 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.169 2010/01/17 12:31:16 kwm Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.170 2010/02/13 19:24:28 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.29.5
-PORTREVISION=	1
+PORTVERSION=	2.29.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +21,6 @@ LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit \
 		polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome \
     		execinfo:${PORTSDIR}/devel/libexecinfo \
 		devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \
-		hal.1:${PORTSDIR}/sysutils/hal \
 		xklavier.12:${PORTSDIR}/x11/libxklavier \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index daa1bbb5a..ea972d942 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.29.5.tar.bz2) = da1ae7b7193c895dad617d2f99a90dc1
-SHA256 (gnome2/gdm-2.29.5.tar.bz2) = 7be227816e2a66fa6ee7f13cdbf7a5ad411632f56f5808c71b897798c4e990c3
-SIZE (gnome2/gdm-2.29.5.tar.bz2) = 2361557
+MD5 (gnome2/gdm-2.29.92.tar.bz2) = a82bbab661b66767870a65e53cb52630
+SHA256 (gnome2/gdm-2.29.92.tar.bz2) = 604e30596f9bf52b42822707ba2ce16a0c6b5c79fd5c9448463eee1803f431e8
+SIZE (gnome2/gdm-2.29.92.tar.bz2) = 2324565
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index 99afab0b9..000000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,66 +0,0 @@
---- configure.orig	2010-01-02 21:47:47.000000000 +0100
-+++ configure	2010-01-02 21:47:47.000000000 +0100
-@@ -16972,10 +16972,12 @@ if test -n "$DAEMON_CFLAGS"; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-         gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	hal
- \""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -16983,6 +16985,7 @@ if test -n "$DAEMON_CFLAGS"; then
-   pkg_cv_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -16997,10 +17000,12 @@ if test -n "$DAEMON_LIBS"; then
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= \$GLIB_REQUIRED_VERSION
-         gio-2.0 >= \$GLIB_REQUIRED_VERSION
-+	hal
- \""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -17008,6 +17013,7 @@ if test -n "$DAEMON_LIBS"; then
-   pkg_cv_DAEMON_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>/dev/null`
- else
-   pkg_failed=yes
-@@ -17029,11 +17035,13 @@ fi
- 	        DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>&1`
-         else
- 	        DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- " 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
-@@ -17042,6 +17050,7 @@ fi
- 	as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gobject-2.0 >= $GLIB_REQUIRED_VERSION
-         gio-2.0 >= $GLIB_REQUIRED_VERSION
-+	hal
- ) were not met:
- 
- $DAEMON_PKG_ERRORS