Teach gdm where to find its home directory. This should fix some issues

with missing GConf settings.

Reported by:	Pawel Worach <pawel.worach@gmail.com>


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

4 files changed, 32 insertions, 9 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 3a7d4272a..b3f2a5610 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.138 2008/11/19 19:30:42 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.139 2008/11/24 04:06:42 marcus Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.24.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -34,6 +34,7 @@ USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 		gnomeprefix gnomepanel
 GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-working-dir=${PREFIX}/share/gdm/home
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
@@ -73,11 +74,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
 		${WRKSRC}/data/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    	${WRKSRC}/daemon/gdm-session-worker.c
+	    	${WRKSRC}/daemon/gdm-session-worker.c \
+		${WRKSRC}/data/gconf.path
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
+	    	${PREFIX}/share/gdm/gconf.path
+	${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \
+	    	${PREFIX}/share/gdm/session-setup.entries
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
diff --git a/x11/gdm/files/patch-data_gconf.path b/x11/gdm/files/patch-data_gconf.path
new file mode 100644
index 000000000..2efdb3cc9
--- /dev/null
+++ b/x11/gdm/files/patch-data_gconf.path
@@ -0,0 +1,9 @@
+--- data/gconf.path.orig	2008-12-26 17:04:03.000000000 -0500
++++ data/gconf.path	2008-12-26 17:04:13.000000000 -0500
+@@ -1,5 +1,5 @@
+ # treat system-wide settings as mandatory
+-xml:readonly:/etc/gconf/gconf.xml.system
++xml:readonly:%%LOCALBASE%%/etc/gconf/gconf.xml.system
+ 
+ # override some settings
+ # we treat settings in this location as
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index 29d467924..788a1a610 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -44,14 +44,20 @@ POST-INSTALL)
 	${CHOWN} root:wheel /var/log/gdm
 	${CHOWN} -R root:${GROUP} /var/gdm
 	${CHMOD} 1770 /var/gdm
+	${MKDIR} -p /var/run/gdm
+	${CHOWN} root:${GROUP} /var/run/gdm
+	${CHMOD} 1777 /var/run/gdm
 	${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
 	${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
-	${MKDIR} -p /var/lib/gdm
-	${CHMOD} 1770 /var/lib/gdm
-	${CHOWN} root:${GROUP} /var/lib/gdm
 	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/home
-	${CHOWN} ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
-	${CHMOD} 0755 ${PKG_PREFIX}/etc/gdm/home
+	${CHOWN} root:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+	${CHMOD} 1770 ${PKG_PREFIX}/etc/gdm/home
+	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 root:gdm ${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
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
 	exit 0
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 665b28dbc..d56a2a207 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -35,8 +35,10 @@ sbin/gdm-stop
 %%DATADIR%%/autostart/LoginWindow/gok.desktop
 %%DATADIR%%/autostart/LoginWindow/metacity.desktop
 %%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
+%%DATADIR%%/gconf.path
 %%DATADIR%%/gdb-cmd
 %%DATADIR%%/gdm-greeter-login-window.glade
+%%DATADIR%%/session-setup.entries
 share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 share/gnome/help/gdm/C/gdm.xml
 share/gnome/help/gdm/C/legal.xml
@@ -200,7 +202,7 @@ share/pixmaps/nohost.png
 @dirrmtry share/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
 @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -rf /var/lib/gdm 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES