Install gdm.conf into share/examples, instead of PKG_SYSCONFDIR, and

add it to PLIST.  Bump PKGREVISION.

4 files changed, 19 insertions, 9 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index deaa15926e0..809f6fe8967 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2005/10/16 21:39:11 minskim Exp $
+# $NetBSD: Makefile,v 1.91 2005/10/22 22:07:32 minskim Exp $
 #
 
 DISTNAME=	gdm-2.8.0.5
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 934e75d1c8a..399981a9939 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/10/14 21:47:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.23 2005/10/22 22:07:32 minskim Exp $
 ${DMX}bin/gdm-dmx-reconnect-proxy
 bin/gdmXnest
 bin/gdmXnestchooser
@@ -31,6 +31,7 @@ share/examples/gdm/PostSession/Default
 share/examples/gdm/PreSession/Default
 share/examples/gdm/XKeepsCrashing
 share/examples/gdm/Xsession
+share/examples/gdm/gdm.conf
 share/examples/gdm/locale.alias
 share/examples/gdm/modules/AccessDwellMouseEvents
 share/examples/gdm/modules/AccessKeyMouseEvents
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index e6b83de2103..29d58ce217f 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2005/10/16 21:39:11 minskim Exp $
+$NetBSD: distinfo,v 1.30 2005/10/22 22:07:32 minskim Exp $
 
 SHA1 (gdm-2.8.0.5.tar.bz2) = e3a392d69a7715a1243ff06d5c42b38ac862da08
 RMD160 (gdm-2.8.0.5.tar.bz2) = 3ca5d2dcf00edb0bc7fc6c5a053e788beb2c7392
@@ -13,7 +13,7 @@ SHA1 (patch-aa) = 649f62f21f55822afb17753cacda9a4bc8873595
 SHA1 (patch-ab) = 2d1a1c07ae830630d02c0d666c0ea6ed2d006655
 SHA1 (patch-ac) = bcb4656d9467737d62b69a1dd3f3750d5607fef3
 SHA1 (patch-ad) = 4f4c4395ba6de7235069fe7ff9877381e9bc997a
-SHA1 (patch-ae) = 55b66f0f32701f6911db88c0b7da29758a7b2b95
+SHA1 (patch-ae) = 01288c3cff79f957fb616feeb81234e7fb7210ba
 SHA1 (patch-af) = 467afc3ee4d555fac4d5d26e49c3ff8b098e7369
 SHA1 (patch-ag) = 467552a6da5c83fcc3a37e59d1f4cd63241dee0d
 SHA1 (patch-ak) = b35c36326ce70c4840716bda948843c883876124
diff --git a/x11/gdm/patches/patch-ae b/x11/gdm/patches/patch-ae
index 5be6e0195a8..cf211885ec9 100644
--- a/x11/gdm/patches/patch-ae
+++ b/x11/gdm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2005/06/26 16:52:14 jmmv Exp $
+$NetBSD: patch-ae,v 1.9 2005/10/22 22:07:32 minskim Exp $
 
---- config/Makefile.in.orig	2005-06-10 20:54:02.000000000 +0200
+--- config/Makefile.in.orig	2005-10-03 20:31:14.000000000 -0700
 +++ config/Makefile.in
-@@ -254,7 +254,7 @@ prefix = @prefix@
+@@ -277,13 +277,13 @@ prefix = @prefix@
  program_transform_name = @program_transform_name@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -11,7 +11,15 @@ $NetBSD: patch-ae,v 1.8 2005/06/26 16:52:14 jmmv Exp $
  target_alias = @target_alias@
  pixmapdir = $(datadir)/pixmaps
  confdir = $(sysconfdir)/gdm
-@@ -510,10 +510,7 @@ install-data-hook: gdm.conf Xsession gno
+-gdmconfdir = $(GDM_CONFIGDIR)
++gdmconfdir = $(confdir)
+ crossconfdir = $(sysconfdir)/dm
+-localedir = $(sysconfdir)/gdm
++localedir = /usr/pkg/share/locale
+ bisessdir = $(datadir)/gdm/BuiltInSessions
+ instsessdir = $(datadir)/xsessions
+ initdir = $(sysconfdir)/gdm/Init
+@@ -539,10 +539,7 @@ install-data-hook: gdm.conf Xsession gno
  	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
  	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
  
@@ -23,7 +31,7 @@ $NetBSD: patch-ae,v 1.8 2005/06/26 16:52:14 jmmv Exp $
  
  	if test '!' -d $(DESTDIR)$(bisessdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(bisessdir); \
-@@ -589,18 +586,6 @@ install-data-hook: gdm.conf Xsession gno
+@@ -618,18 +615,6 @@ install-data-hook: gdm.conf Xsession gno
  		chmod 755 $(DESTDIR)$(gnomercdir); \
  	fi