diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-21 16:16:02 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-21 16:16:02 +0000 |
| commit | dd54fd4e90a2772cb4ed83a2417e00a1379840a6 (patch) | |
| tree | 5ba124faeb73c69371ca792ee1681a859e688574 /x11/gdm2 | |
| parent | add RUN_DEPENDS on husky-base (diff) | |
One more pass at the gdm's. This time, allow the gdm user and group to
be created even if BATCH is defined. Also, set PKG_PREFIX from the port
Makefile so we can take care of directory permissions within the
pkg-install script for both the port and package.
Notes
Notes:
svn path=/head/; revision=73723
Diffstat (limited to 'x11/gdm2')
| -rw-r--r-- | x11/gdm2/Makefile | 10 | ||||
| -rw-r--r-- | x11/gdm2/pkg-install | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index b6ee39f88381..54491b9daae3 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -58,16 +58,10 @@ post-patch: s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure post-install: -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if !defined(PACKAGE_BUILDING) + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${INSTALL_SCRIPT} ${WRKSRC}/gdm.sh.sample ${PREFIX}/etc/rc.d -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) - @${CHOWN} -R gdm:gdm ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm -.else - @${CHOWN} -R 92:92 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm -.endif - @${CHMOD} 0750 ${PREFIX}/share/gnome/gdm @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index df128647f968..237a1ceaa0ca 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -36,10 +36,8 @@ if [ "$2" = "POST-INSTALL" ]; then exit 1 fi fi - if [ -n "${PKG_PREFIX}" ]; then - ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm - ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm - fi + ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm + ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm exit 0 fi |