From owner-svn-ports-all@FreeBSD.ORG Fri Apr 11 13:18:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 35A15B45; Fri, 11 Apr 2014 13:18:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 224811844; Fri, 11 Apr 2014 13:18:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3BDIaQg045473; Fri, 11 Apr 2014 13:18:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3BDIa5A045470; Fri, 11 Apr 2014 13:18:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404111318.s3BDIa5A045470@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 11 Apr 2014 13:18:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350941 - head/x11/gdm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Apr 2014 13:18:37 -0000 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 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 +@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