From 93930d907dbdaac303efae96c46eb46849b12d84 Mon Sep 17 00:00:00 2001
From: mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 18 Jan 2008 21:15:55 +0000
Subject: Update to 2.21.5 and add g-s-d in runtime dependency. It has been
 tested in the runtime and works fine.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10150 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/gdm/Makefile  |  8 ++++----
 x11/gdm/distinfo  |  6 +++---
 x11/gdm/pkg-plist | 14 +++-----------
 3 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'x11')

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2be2769d5..7887286b1 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.96 2008/01/16 21:00:02 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.97 2008/01/16 22:28:22 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.21.4
-PORTREVISION=	6
+PORTVERSION=	2.21.5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +19,8 @@ COMMENT=	GNOME 2 version of xdm display manager
 BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
 		${LOCALBASE}/libdata/pkgconfig/check.pc:${PORTSDIR}/devel/check
 LIB_DEPENDS=	ck-connector.0:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 0b78bb82b..f7db57b46 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.21.4.tar.bz2) = 2fe013e31f44bd383c1f6f31a3977034
-SHA256 (gnome2/gdm-2.21.4.tar.bz2) = a50e1dbc6b3f5ab07b503a8b3550cd33ee6e114d66103e365b77bdf73ec02675
-SIZE (gnome2/gdm-2.21.4.tar.bz2) = 2276677
+MD5 (gnome2/gdm-2.21.5.tar.bz2) = 9690daebc879f76ea5953fed128605bd
+SHA256 (gnome2/gdm-2.21.5.tar.bz2) = 2d7e8c4e3f6c30cfded216213bcfee1a6acd84454f1308226bc7175218e3b76a
+SIZE (gnome2/gdm-2.21.5.tar.bz2) = 2208038
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 00f171bef..ac8b8f921 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -8,14 +8,9 @@ etc/gdm/Xsession
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
 etc/gdm/gdm.schemas
-lib/gdm/settings/plugins/libxsettings.a
-lib/gdm/settings/plugins/libxsettings.la
-lib/gdm/settings/plugins/libxsettings.so
-lib/gdm/settings/plugins/xsettings.gdm-settings-plugin
 libexec/gdm-factory-slave
 libexec/gdm-product-slave
 libexec/gdm-session-worker
-libexec/gdm-settings-daemon
 libexec/gdm-simple-chooser
 libexec/gdm-simple-greeter
 libexec/gdm-simple-slave
@@ -29,9 +24,6 @@ sbin/gdm-stop
 share/icons/hicolor/16x16/apps/gdm-xnest.png
 share/icons/hicolor/32x32/apps/gdm-setup.png
 share/icons/hicolor/32x32/apps/gdm-xnest.png
-share/pixmaps/gdm-setup.png
-share/pixmaps/gdm-xnest.png
-share/pixmaps/gdm.png
 share/locale/af/LC_MESSAGES/gdm.mo
 share/locale/am/LC_MESSAGES/gdm.mo
 share/locale/ar/LC_MESSAGES/gdm.mo
@@ -138,6 +130,9 @@ share/pixmaps/faces/sunset.jpg
 share/pixmaps/faces/tennis-ball.png
 share/pixmaps/faces/yellow-rose.jpg
 share/pixmaps/gdm-foot-logo.png
+share/pixmaps/gdm-setup.png
+share/pixmaps/gdm-xnest.png
+share/pixmaps/gdm.png
 share/pixmaps/nobody.png
 share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
@@ -153,9 +148,6 @@ share/pixmaps/nohost.png
 @dirrmtry etc/gdm
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
-@dirrm lib/gdm/settings/plugins
-@dirrm lib/gdm/settings
-@dirrm lib/gdm
 @dirrmtry sbin
 @dirrmtry share/log/gdm
 @dirrmtry share/log
-- 
cgit v1.2.3