Various fixes for gdm:

	- Fix the rc.d script to completely stop gdm
	- Disable pulseaudio [1] for gdm. It is useless
	  there and the process stays there when gdm dies
	- Fix the pkg-plist to remove all dirs created
	- Remove an extra dconf update call

[1] http://www.openbsd.org/cgi-bin/cvsweb/ports/x11/gnome/gdm/files/client.conf?rev=1.1


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

5 files changed, 24 insertions, 17 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 959857b4e..935f1ca01 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -75,7 +75,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES+=	gdm-launch-environment \
 		gdm-password \
-		gdm-autologin
+		gdm-autologin \
+		client.conf
 
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -137,10 +138,17 @@ post-install:
 	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
 	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/dm/Sessions
 
+	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/home
+	${CHOWN} ${USER}:${GROUP} ${STAGEDIR}${PREFIX}/etc/gdm/home
+	${CHMOD} 1770 ${STAGEDIR}${PREFIX}/etc/gdm/home
+	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+
 	${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
 	${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
 	${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
 
+	${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 
diff --git a/x11/gdm/files/client.conf.in b/x11/gdm/files/client.conf.in
new file mode 100644
index 000000000..ef886bff7
--- /dev/null
+++ b/x11/gdm/files/client.conf.in
@@ -0,0 +1,2 @@
+autospawn = no
+daemon-binary = /usr/bin/true
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 2a47c5501..002470dc0 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/trunk/x11/gdm3/files/gdm.in 18610 2013-06-30 16:33:05Z marcus $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -25,6 +25,7 @@ command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/sbin/gdm-binary"
 start_cmd="gdm_start"
+stop_postcmd="gdm_poststop"
 
 gdm_start()
 {
@@ -58,5 +59,10 @@ gdm_start()
     LANG=${gdm_lang} ${command} ${gdm_flags} ) &
 }
 
+gdm_poststop()
+{
+	pkill gdm-session-worker
+}
+
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index d93dddb0a..37267b2e2 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -14,26 +14,20 @@ POST-INSTALL)
 	${CHOWN} ${USER}:${GROUP} /var/log/gdm
 	${CHOWN} -R root:${GROUP} /var/gdm
 	${CHMOD} 1770 /var/gdm
-	${MKDIR} -p /var/run/gdm
+	${MKDIR} -p /var/run/gdm/greeter
 	${CHOWN} root:${GROUP} /var/run/gdm
-	${CHMOD} 1777 /var/run/gdm
+	${CHMOD} -R 1777 /var/run/gdm
 	${MKDIR} -p /var/cache/gdm
 	${CHMOD} 1755 /var/cache/gdm
 	${CHOWN} root:${GROUP} /var/cache/gdm
 	${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
 	${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
-	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
-	${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
-	${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
-	${MKDIR} ${PKG_PREFIX}/etc/gdm/home/.config
+	#${MKDIR} ${PKG_PREFIX}/etc/gdm/home/.config
 	${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.config
-	install  -o root -g wheel -m 444 ${PKG_PREFIX}/share/gdm/gconf.path ${PKG_PREFIX}/etc/gdm/home/.gconf.path
 	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --recursive-unset /
-	gconftool-2 --direct --config-source=xml:merged:${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory --load ${PKG_PREFIX}/share/gdm/session-setup.entries
 	${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
 	${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
 	${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
-	dconf update
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 5e631756f..a9509d76a 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -5,7 +5,6 @@ etc/dconf/db/gdm.d/00-upstream-settings
 etc/dconf/db/gdm.d/locks/00-upstream-settings-locks
 etc/dconf/profile/gdm
 @unexec /bin/rm -f %D/etc/dconf/db/gdm
-@unexec /bin/rm -f %D/etc/dconf/db/gdm.d
 etc/gdm/Init/Default
 etc/gdm/PostLogin/Default.sample
 etc/gdm/PostSession/Default
@@ -14,6 +13,7 @@ etc/gdm/Xsession
 @unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
+etc/gdm/home/.pulse/client.conf
 etc/pam.d/gdm-autologin
 etc/pam.d/gdm-launch-environment
 etc/pam.d/gdm-password
@@ -221,12 +221,9 @@ share/pixmaps/nobody.png
 share/pixmaps/nohost.png
 @exec mkdir -p %D/share/xsessions
 @exec dconf update
-@unexec /bin/rm -f %D/etc/dconf/profile/gdm
 @unexec dconf update
-@cwd /
-@dirrmtry var/run/gdm
-@dirrmtry var/log/gdm
-@cwd
+@unexec /bin/rm -f /var/run/gdm/
+@unexec /bin/rm -f /var/log/gdm/
 @dirrm /var/gdm
 @dirrm /var/cache/gdm
 @dirrmtry share/xsessions