diff options
| author | bapt <bapt@FreeBSD.org> | 2014-04-11 21:18:36 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-04-11 21:18:36 +0800 |
| commit | 42e87de71fa068033f5b32ec6e5742346720a7c0 (patch) | |
| tree | 9087347f37e1d4350c6f6cd8661823f209b61c18 /x11/gdm | |
| parent | fb12003beb184fb1a6f6868df316d22b6747a15f (diff) | |
| download | freebsd-ports-gnome-42e87de71fa068033f5b32ec6e5742346720a7c0.tar.gz freebsd-ports-gnome-42e87de71fa068033f5b32ec6e5742346720a7c0.tar.zst freebsd-ports-gnome-42e87de71fa068033f5b32ec6e5742346720a7c0.zip | |
Avoid code duplication between pkg-install and plist
Fix leftovers
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 1 | ||||
| -rw-r--r-- | x11/gdm/pkg-install | 14 | ||||
| -rw-r--r-- | x11/gdm/pkg-plist | 21 |
3 files changed, 21 insertions, 15 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 76ffde9f1b2d..f457279962cf 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -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> diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index 37802feab918..fb834c40fbc2 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -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 diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index e15938f7060a..476026455066 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -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 +@owner gdm +@group gdm etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop etc/gdm/home/.local/share/applications/mimeapps.list +@owner root +@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%% +@exec mkdir -p %D/etc/gdm/Sessions +@exec mkdir -p %D/etc/dm/Sessions +@dirrm etc/dm/Sessions +@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 -@exec install -d -o root -g gdm /var/run/gdm /var/run/gdm/greeter /var/cache/gdm /var/log/gdm /var/gdm +@exec install -d -o gdm -g gdm -m 1770 /var/log/gdm +@exec install -d -o root -g gdm -m 1770 /var/gdm +@exec install -d -o root -g gdm -m 1777 /var/run/gdm +@exec install -d -o root -g gdm -m 1777 /var/run/gdm/greeter +@exec install -d -o root -g gdm -m 1755 /var/cache/gdm @group gdm +@mode 1777 @dirrmtry /var/run/gdm/greeter @dirrmtry /var/run/gdm +@mode 1770 +@owner gdm @dirrmtry /var/log/gdm +@owner root +@mode 1775 @dirrmtry /var/cache/gdm +@mode 1770 @dirrmtry /var/gdm +@mode @group wheel |