- Use daemon picture in greeter window like the "kdebase" package.

- Store process id in "/var/run/xdm.pid" so that our "rc.shutdown"
  will terminate "gdm".

5 files changed, 27 insertions, 10 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 842ef408935..f94ac01ef07 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.4 1999/11/11 11:54:10 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/11/15 00:07:02 tron Exp $
 
 DISTNAME=	gdm-2.0beta4
 PKGNAME=	gdm-2.0b4
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0.53/sources/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0.53/sources/} \
+		${MASTER_SITE_LOCAL}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 
 DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
 GNU_CONFIGURE=	yes
 USE_X11BASE=	yes
 
@@ -87,6 +91,7 @@ post-install:
 	  ${INSTALL_DATA} $$SOURCE $$TARGET; \
 	fi
 .endfor
+	${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps
 	${LN} -fs Gnome ${GDMCFGDIR}/Sessions/Default
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdm/files/md5 b/x11/gdm/files/md5
index fafb4c2dfbd..bd671e1637b 100644
--- a/x11/gdm/files/md5
+++ b/x11/gdm/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 1999/11/10 23:15:27 tron Exp $
+$NetBSD: md5,v 1.2 1999/11/15 00:07:02 tron Exp $
 
 MD5 (gdm-2.0beta4.tar.gz) = 651fd0762fb1a2e70ab2d0379a7d3374
+MD5 (Daemon.png) = b5240009171ebb04560e00b24adf52f9
diff --git a/x11/gdm/files/patch-sum b/x11/gdm/files/patch-sum
index 376f9ef1ca5..d9907db4747 100644
--- a/x11/gdm/files/patch-sum
+++ b/x11/gdm/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.4 1999/11/11 11:57:20 tron Exp $
+$NetBSD: patch-sum,v 1.5 1999/11/15 00:07:02 tron Exp $
 
 MD5 (patch-aa) = 2467d33da85bef94f9af52c61e0dcd3a
-MD5 (patch-ab) = 74545f81c15f33c95d30736d2c7ada06
+MD5 (patch-ab) = 468b5a82736d65301a639577886df279
 MD5 (patch-ac) = e79133c3fccf8671ee1be210a0e9b111
 MD5 (patch-ad) = 40cad34a11fd0c81b9016fa170a70b9e
 MD5 (patch-ae) = 68d772ee3a07c03eb122332bc5bf8822
diff --git a/x11/gdm/patches/patch-ab b/x11/gdm/patches/patch-ab
index 44dac780e72..de11b12044a 100644
--- a/x11/gdm/patches/patch-ab
+++ b/x11/gdm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+$NetBSD: patch-ab,v 1.2 1999/11/15 00:07:02 tron Exp $
 
 --- config/gdm.conf.in.orig	Tue Sep  7 06:37:16 1999
-+++ config/gdm.conf.in	Tue Nov  9 23:30:28 1999
-@@ -1,9 +1,9 @@
++++ config/gdm.conf.in	Mon Nov 15 00:57:03 1999
+@@ -1,20 +1,20 @@
  [daemon]
  Chooser=@bindir@/gdmchooser --disable-sound --disable-crash-dialog
 -DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@bindir@
@@ -14,7 +14,8 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
  HaltCommand=/sbin/shutdown -h now
  KillInitClients=1
  LogDir=@authdir@
-@@ -11,10 +11,10 @@
+-PidFile=/var/run/gdm.pid
++PidFile=/var/run/xdm.pid
  PostSessionScriptDir=@sysconfdir@/gdm/PostSession/
  PreSessionScriptDir=@sysconfdir@/gdm/PreSession/
  RebootCommand=/sbin/shutdown -r now
@@ -27,6 +28,15 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
  UserAuthDir=
  UserAuthFBDir=/tmp
  UserAuthFile=.Xauthority
+@@ -50,7 +50,7 @@
+ GlobalFaceDir=@datadir@/faces/
+ Icon=@pixmapdir@/gdm.xpm
+ LocaleFile=@localedir@/locale.alias
+-Logo=@pixmapdir@/gnome-logo-large.png
++Logo=@pixmapdir@/Daemon.png
+ Quiver=1
+ SystemMenu=0
+ Welcome=Welcome to %n
 @@ -64,7 +64,7 @@
  Enable=0
  
diff --git a/x11/gdm/pkg/PLIST b/x11/gdm/pkg/PLIST
index be61db569ef..92797781581 100644
--- a/x11/gdm/pkg/PLIST
+++ b/x11/gdm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/10 23:15:28 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/11/15 00:07:02 tron Exp $
 bin/gdm
 bin/gdmchooser
 bin/gdmlogin
@@ -33,6 +33,7 @@ share/locale/no/LC_MESSAGES/gdm.mo
 share/locale/sv/LC_MESSAGES/gdm.mo
 share/locale/pl/LC_MESSAGES/gdm.mo
 share/locale/pt_BR/LC_MESSAGES/gdm.mo
+share/pixmaps/Daemon.png
 share/pixmaps/gdm.xpm
 share/pixmaps/nobody.png
 share/pixmaps/nohost.png