* Update to 2.4.0.7.

* Apply patch so gdm finds chown when installing a new theme.
* Do not overwrite config files.
* Mention that gdm2 cannot be started from /etc/ttys, and include an RC script
  to do the job instead.

Submitted by:	Franz Klammer <klammer@webonaut.com> (chown patch)

9 files changed, 181 insertions, 24 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 210077fc68ed..0c5c376e309a 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.0.5
+PORTVERSION=	2.4.0.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		2.0.0/sources/${PORTNAME:S/2$//}
@@ -40,6 +40,10 @@ pre-fetch:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .endif
 
+post-extract:
+	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" \
+		${FILESDIR}/gdm.sh.sample > ${WRKSRC}/gdm.sh.sample
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -48,11 +52,11 @@ post-install:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/config/gnomerc ${PREFIX}/etc/gdm
+	@${INSTALL_SCRIPT} ${WRKSRC}/gdm.sh.sample ${PREFIX}/etc/rc.d
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${CHOWN} -R gdm:gdm ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm
 .else
-	@${CHOWN} -R 91:91 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm
+	@${CHOWN} -R 92:92 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm
 .endif
 	@${CHMOD} 0750 ${PREFIX}/share/gnome/gdm
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 1d9658892f7e..c2c42a9380e3 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.0.5.tar.bz2) = 7a1d3b39137acf4bbedc327cd158d861
+MD5 (gnome2/gdm-2.4.0.7.tar.bz2) = 892eaea253560233c582636678f5ec2a
diff --git a/x11/gdm2/files/gdm.sh.sample b/x11/gdm2/files/gdm.sh.sample
new file mode 100644
index 000000000000..6390bea233ee
--- /dev/null
+++ b/x11/gdm2/files/gdm.sh.sample
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+PREFIX=%%PREFIX%%
+
+case "$1" in
+start)
+	${PREFIX}/bin/gdm
+	;;
+stop)
+	/usr/bin/killall gdm 2>/dev/null
+	;;
+*)
+	echo "Usage: `basename $0` start | stop"
+	exit 64
+	;;
+
+esac
+
+exit 0
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index e98b9c539a34..bf064d59ae71 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,12 +1,12 @@
---- config/gdm.conf.in.orig	Sat Jun  1 12:10:13 2002
-+++ config/gdm.conf.in	Tue Jun 11 16:45:25 2002
+--- config/gdm.conf.in.orig	Wed Aug  7 23:50:26 2002
++++ config/gdm.conf.in	Fri Aug  9 17:13:47 2002
 @@ -17,7 +17,7 @@
  # want gdm to kill/restart the server, turn this on
  AlwaysRestartServer=false
  Configurator=@EXPANDED_GDMCONFIGDIR@/gdmsetup --disable-sound --disable-crash-dialog
 -GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
 +GnomeDefaultSession=@EXPANDED_DATADIR@/default.session
- Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
+ Chooser=@EXPANDED_BINDIR@/gdmchooser
  DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
  DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
 @@ -26,7 +26,7 @@
@@ -44,7 +44,7 @@
  
  [gui]
 -GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
-+GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk/gtkrc
++GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
  MaxIconWidth=128
  MaxIconHeight=128
  
@@ -57,10 +57,21 @@
  # These are things excluded from the face browser, not from logging in
  Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
  GlobalFaceDir=@EXPANDED_DATADIR@/faces/
-@@ -151,5 +151,5 @@
+@@ -159,7 +159,7 @@
  
  [server-Standard]
  name=Standard server
 -command=/usr/X11R6/bin/X
 +command=@EXPANDED_BINDIR@/X
  flexible=true
+ 
+ # To use this server type you should add -query host or -indirect host
+@@ -167,7 +167,7 @@
+ [server-Terminal]
+ name=Terminal server
+ # Add -terminate to make things behave more nicely
+-command=/usr/X11R6/bin/X -terminate
++command=@EXPANDED_BINDIR@/X -terminate
+ # Make this not appear in the flexible servers (we need extra params
+ # anyway, and terminate would be bad for xdmcp)
+ flexible=false
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in
new file mode 100644
index 000000000000..9eeef7f7cf7c
--- /dev/null
+++ b/x11/gdm2/files/patch-config_Makefile.in
@@ -0,0 +1,101 @@
+--- config/Makefile.in.orig	Fri Aug  9 17:14:27 2002
++++ config/Makefile.in	Fri Aug  9 17:34:18 2002
+@@ -282,71 +282,73 @@
+ 	fi
+ 	$(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf
+ 
+-	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
++	if test '!' -f $(DESTDIR)$(confdir)/XKeepsCrashing; then \
++	    	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing; \
++	fi
++	$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/factory-XKeepsCrashing
+ 
+-	-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+-		cp $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
++	if test '!' -f $(DESTDIR)$(localedir)/locale.alias; then \
++		$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias; \
+ 	fi
+-	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
++	$(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/factory-locale.alias
+ 
+ 	if test '!' -d $(DESTDIR)$(sessdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(sessdir); \
+ 		chmod 755 $(DESTDIR)$(sessdir); \
+ 	fi
+ 
+-	-if test -f $(DESTDIR)$(sessdir)/Xsession; then \
+-		cp $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \
++	if test '!' -f $(DESTDIR)$(sessdir)/Xsession; then \
++		$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession; \
+ 	fi
+-	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/Xsession
++	$(INSTALL_SCRIPT) Xsession $(DESTDIR)$(sessdir)/factory-Xsession
+ 
+-	-if test -f $(DESTDIR)$(sessdir)/Gnome; then \
+-		cp $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \
++	if test '!' -f $(DESTDIR)$(sessdir)/Gnome; then \
++		$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome; \
+ 	fi
+-	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome
++	$(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/factory-Gnome
+ 
+ 	-if test -f /usr/bin/switchdesk; then \
+-		if test -f $(DESTDIR)$(sessdir)/Default; then \
+-			cp $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \
++		if test '!' -f $(DESTDIR)$(sessdir)/Default; then \
++			$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
+ 		fi; \
+-		$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
+ 	fi
+ 
+ 	if test '!' -d $(DESTDIR)$(initdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(initdir); \
+ 		chmod 755 $(DESTDIR)$(initdir); \
+ 	fi
+-	-if test -f $(DESTDIR)$(initdir)/Default; then \
+-		cp $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(initdir)/Default; then \
++		$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/factory-Default
+ 
+ 	if test '!' -d $(DESTDIR)$(predir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(predir); \
+ 		chmod 755 $(DESTDIR)$(predir); \
+ 	fi
+-	-if test -f $(DESTDIR)$(predir)/Default; then \
+-		cp $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(predir)/Default; then \
++		$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/factory-Default
+ 
+ 	if test '!' -d $(DESTDIR)$(postdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(postdir); \
+ 		chmod 755 $(DESTDIR)$(postdir); \
+ 	fi
+-	-if test -f $(DESTDIR)$(postdir)/Default; then \
+-		cp $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
++	if test '!' -f $(DESTDIR)$(postdir)/Default; then \
++		$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default; \
+ 	fi
+-	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default
++	$(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/factory-Default
+ 
+ 	if test '!' -d $(DESTDIR)$(gnomercdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(gnomercdir); \
+ 		chmod 755 $(DESTDIR)$(gnomercdir); \
+ 	fi
+ 
+-	-if test -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
+-		cp $(DESTDIR)$(gnomercdir)/gnomerc $(DESTDIR)$(gnomercdir)/gnomerc.orig; \
++	if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
++		$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \
+ 	fi
+-	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc
++	$(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/factory-gnomerc
+ 
+ 	if test '!' -d $(DESTDIR)$(authdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(authdir); \
diff --git a/x11/gdm2/files/patch-gui::gdmsetup.c b/x11/gdm2/files/patch-gui::gdmsetup.c
new file mode 100644
index 000000000000..33924be670f7
--- /dev/null
+++ b/x11/gdm2/files/patch-gui::gdmsetup.c
@@ -0,0 +1,11 @@
+--- gui/gdmsetup.c.orig	Sun Aug  4 16:08:52 2002
++++ gui/gdmsetup.c	Sun Aug  4 16:09:09 2002
+@@ -1512,7 +1512,7 @@
+ 			success = TRUE;
+ 
+ 			/* HACK! */
+-			cmd = g_strdup_printf ("/bin/chown -R root.root %s", dir);
++			cmd = g_strdup_printf ("/usr/sbin/chown -R gdm:gdm %s", dir);
+ 			system (cmd);
+ 			g_free (cmd);
+ 
diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install
index 7634ecafb000..04f07cb65ce4 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm2/pkg-install
@@ -7,7 +7,7 @@ fi
 if [ "$2" = "POST-INSTALL" ]; then
 	USER=gdm
 	GROUP=${USER}
-	UID=91
+	UID=92
 	GID=${UID}
 	PW=/usr/sbin/pw
 
diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message
index 3f44dbe90135..91ce3698bdce 100644
--- a/x11/gdm2/pkg-message
+++ b/x11/gdm2/pkg-message
@@ -11,10 +11,10 @@ gdm     auth            requisite       pam_unix.so     try_first_pass
 gdm     account         requisite       pam_unix.so     try_first_pass
 gdm     session         required        pam_permit.so
 
-- To enable GDM after booting, edit your /etc/ttys(5), and change the line
-  for ttyv8 to
-
-ttyv8   "/usr/X11R6/bin/gdm --nodaemon"  xterm   on
+- Do _NOT_ use /etc/ttys to start gdm at boot time.  This will result in gdm 
+  hanging or restarting constantly.  Instead, copy the included gdm.sh.sample 
+  script to gdm.sh, and restart.  This script is found, by default, in
+  /usr/X11R6/etc/rc.d.
 
 These notes were written by:  Yukihiro Nakai <nakai@FreeBSD.org>
-and updated by: Joe Marcus Clarke <marcus@marcuscom.com>
+and updated by: Joe Marcus Clarke <marcus@FreeBSD.org>
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 0efd5c1013b9..2986c89f608e 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -9,16 +9,25 @@ bin/gdmlogin
 bin/gdmmktemp
 bin/gdmphotosetup
 bin/gdmsetup
-etc/gdm/Init/Default
-etc/gdm/PostSession/Default
-etc/gdm/PreSession/Default
-etc/gdm/Sessions/Gnome
-etc/gdm/Sessions/Xsession
-etc/gdm/XKeepsCrashing
+@unexec if cmp -s %D/etc/gdm/Init/Default %D/etc/gdm/Init/factory-Default; then rm -f %D/etc/gdm/Init/Default; fi
+etc/gdm/Init/factory-Default
+@unexec if cmp -s %D/etc/gdm/PostSession/Default %D/etc/gdm/PostSession/factory-Default; then rm -f %D/etc/gdm/PostSession/Default; fi
+etc/gdm/PostSession/factory-Default
+@unexec if cmp -s %D/etc/gdm/PreSession/Default %D/etc/gdm/PreSession/factory-Default; then rm -f %D/etc/gdm/PreSession/Default; fi
+etc/gdm/PreSession/factory-Default
+@unexec if cmp -s %D/etc/gdm/Sessions/Gnome %D/etc/gdm/Sessions/factory-Gnome; then rm -f %D/etc/gdm/Sessions/Gnome; fi
+etc/gdm/Sessions/factory-Gnome
+@unexec if cmp -s %D/etc/gdm/Sessions/Xsession %D/etc/gdm/Sessions/factory-Xsession; then rm -f %D/etc/gdm/Sessions/Xsession; fi
+etc/gdm/Sessions/factory-Xsession
+@unexec if cmp -s %D/etc/gdm/XKeepsCrashing %D/etc/gdm/factory-XKeepsCrashing; then rm -f %D/etc/gdm/XKeepsCrashing; fi
+etc/gdm/factory-XKeepsCrashing
+@unexec if cmp -s %D/etc/gdm/gnomerc %D/etc/gdm/factory-gnomerc; then rm -f %D/etc/gdm/gnomerc; fi
+etc/gdm/factory-gnomerc
+@unexec if cmp -s %D/etc/gdm/gdm.conf %D/etc/gdm/factory-gdm.conf; then rm -f %D/etc/gdm/gdm.conf; fi
 etc/gdm/factory-gdm.conf
-etc/gdm/gdm.conf
-etc/gdm/gnomerc
-etc/gdm/locale.alias
+@unexec if cmp -s %D/etc/gdm/locale.alias %D/etc/gdm/factory-locale.alias; then rm -f %D/etc/gdm/locale.alias; fi
+etc/gdm/factory-locale.alias
+etc/rc.d/gdm.sh.sample
 sbin/gdm-restart
 sbin/gdm-safe-restart
 sbin/gdmaskpass