[Midnightbsd-cvs] mports [20397] trunk/x11/gdm: tweak plist for gdm

[laffer1 at midnightbsd.org]

Revision: 20397
          http://svnweb.midnightbsd.org/mports/?rev=20397
Author:   laffer1
Date:     2015-10-03 00:27:10 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
tweak plist for gdm

Modified Paths:
--------------
    trunk/x11/gdm/Makefile
    trunk/x11/gdm/pkg-install
    trunk/x11/gdm/pkg-plist

Modified: trunk/x11/gdm/Makefile
===================================================================
--- trunk/x11/gdm/Makefile	2015-10-03 04:25:14 UTC (rev 20396)
+++ trunk/x11/gdm/Makefile	2015-10-03 04:27:10 UTC (rev 20397)
@@ -124,13 +124,19 @@
 		${WRKSRC}/data/PostSession.in \
 		${WRKSRC}/data/PreSession.in \
 		${WRKSRC}/data/Xsession.in
-	@${RM}	${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
+	-${RM}	${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
 		${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
 		${WRKSRC}/data/applications/gnome-shell.desktop \
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
-		${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
+		${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.sample
+	@${RM} ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf
+	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default \
+		${STAGEDIR}${PREFIX}/etc/gdm/PostSession/Default.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default \
+		${STAGEDIR}${PREFIX}/etc/gdm/PreSession/Default.sample
+
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/dm/Sessions

Modified: trunk/x11/gdm/pkg-install
===================================================================
--- trunk/x11/gdm/pkg-install	2015-10-03 04:25:14 UTC (rev 20396)
+++ trunk/x11/gdm/pkg-install	2015-10-03 04:27:10 UTC (rev 20397)
@@ -14,20 +14,15 @@
 	${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
-	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
@@ -34,6 +29,9 @@
 
 	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
 	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
+
+	${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/gdm/home
+
 	exit 0
 	;;
 esac

Modified: trunk/x11/gdm/pkg-plist
===================================================================
--- trunk/x11/gdm/pkg-plist	2015-10-03 04:25:14 UTC (rev 20396)
+++ trunk/x11/gdm/pkg-plist	2015-10-03 04:27:10 UTC (rev 20397)
@@ -1,15 +1,14 @@
 bin/gdm-screenshot
 bin/gdmflexiserver
 etc/dbus-1/system.d/gdm.conf
-etc/gdm/Xsession
-etc/gdm/custom.conf
-etc/gdm/custom.conf.default
-etc/gdm/locale.conf
-etc/gdm/Init/Default
-etc/gdm/PostLogin/Default.sample
-etc/gdm/PostSession/Default
-etc/gdm/PreSession/Default
-etc/gdm/home/.pulse/client.conf
+%%ETCDIR%%/Init/Default
+ at sample %%ETCDIR%%/PostLogin/Default.sample
+ at sample %%ETCDIR%%/PostSession/Default.sample
+ at sample %%ETCDIR%%/PreSession/Default.sample
+%%ETCDIR%%/Xsession
+ at sample %%ETCDIR%%/custom.conf.sample
+%%ETCDIR%%/home/.pulse/client.conf
+%%ETCDIR%%/locale.conf
 etc/pam.d/gdm-autologin
 etc/pam.d/gdm-launch-environment
 etc/pam.d/gdm-password