svn commit: r350941 - head/x11/gdm

[Baptiste Daroussin]

Author: bapt
Date: Fri Apr 11 13:18:36 2014
New Revision: 350941
URL: http://svnweb.freebsd.org/changeset/ports/350941
QAT: https://qat.redports.org/buildarchive/r350941/

Log:
  Avoid code duplication between pkg-install and plist
  Fix leftovers

Modified:
  head/x11/gdm/Makefile
  head/x11/gdm/pkg-install
  head/x11/gdm/pkg-plist

Modified: head/x11/gdm/Makefile
==============================================================================
--- head/x11/gdm/Makefile	Fri Apr 11 12:58:55 2014	(r350940)
+++ head/x11/gdm/Makefile	Fri Apr 11 13:18:36 2014	(r350941)
@@ -100,5 +100,6 @@ post-install:
 		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 	${RM} -rf ${STAGEDIR}${ETCDIR}/home/.gconf*
 	${RM} -f ${STAGEDIR}${ETCDIR}/custom.conf
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions ${STAGEDIR}${PREFIX}/etc/dm/Sessions
 
 .include <bsd.port.mk>

Modified: head/x11/gdm/pkg-install
==============================================================================
--- head/x11/gdm/pkg-install	Fri Apr 11 12:58:55 2014	(r350940)
+++ head/x11/gdm/pkg-install	Fri Apr 11 13:18:36 2014	(r350941)
@@ -8,18 +8,6 @@ POST-INSTALL)
 	CHOWN=/usr/sbin/chown
 	MKDIR=/bin/mkdir
 
-	${MKDIR} -p /var/gdm
-	${MKDIR} -p /var/log/gdm
-	${CHMOD} 1770 /var/log/gdm
-	${CHOWN} ${USER}:${GROUP} /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
-	${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
@@ -32,8 +20,6 @@ POST-INSTALL)
 	${CHMOD} 1750 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory
 	${CHMOD} 1640 ${PKG_PREFIX}/etc/gdm/home/.gconf.mandatory/*.xml
 
-	${MKDIR} -p ${PKG_PREFIX}/etc/gdm/Sessions
-	${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
 	exit 0
 	;;
 esac

Modified: head/x11/gdm/pkg-plist
==============================================================================
--- head/x11/gdm/pkg-plist	Fri Apr 11 12:58:55 2014	(r350940)
+++ head/x11/gdm/pkg-plist	Fri Apr 11 13:18:36 2014	(r350941)
@@ -10,8 +10,12 @@ etc/gdm/Xsession
 etc/gdm/custom.conf.default
 @exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
 etc/gdm/gdm.schemas
+ at owner gdm
+ at group gdm
 etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop
 etc/gdm/home/.local/share/applications/mimeapps.list
+ at owner root
+ at group wheel
 etc/pam.d/gdm
 libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
 libexec/gdm-crash-logger
@@ -220,6 +224,10 @@ share/pixmaps/nohost.png
 @dirrm %%DATADIR%%/autostart/LoginWindow
 @dirrm %%DATADIR%%/autostart
 @dirrm %%DATADIR%%
+ at exec mkdir -p %D/etc/gdm/Sessions
+ at exec mkdir -p %D/etc/dm/Sessions
+ at dirrm etc/dm/Sessions
+ at dirrm etc/gdm/Sessions
 @dirrm etc/gdm/PreSession
 @dirrm etc/gdm/PostSession
 @dirrm etc/gdm/PostLogin
@@ -288,11 +296,22 @@ share/pixmaps/nohost.png
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
- at exec install -d -o root -g gdm /var/run/gdm /var/run/gdm/greeter /var/cache/gdm /var/log/gdm /var/gdm
+ at exec install -d -o gdm -g gdm -m 1770 /var/log/gdm
+ at exec install -d -o root -g gdm -m 1770 /var/gdm
+ at exec install -d -o root -g gdm -m 1777 /var/run/gdm
+ at exec install -d -o root -g gdm -m 1777 /var/run/gdm/greeter
+ at exec install -d -o root -g gdm -m 1755 /var/cache/gdm
 @group gdm
+ at mode 1777
 @dirrmtry /var/run/gdm/greeter
 @dirrmtry /var/run/gdm
+ at mode 1770
+ at owner gdm
 @dirrmtry /var/log/gdm
+ at owner root
+ at mode 1775
 @dirrmtry /var/cache/gdm
+ at mode 1770
 @dirrmtry /var/gdm
+ at mode
 @group wheel