diff options
| author | marcus <marcus@FreeBSD.org> | 2003-01-22 00:16:02 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-01-22 00:16:02 +0800 |
| commit | c08523b30ca8d66b933a8cf621603ec6dabd1cdf (patch) | |
| tree | 7a000943cc6c7e8b15f474ebcfcf4b46c9a7cee5 | |
| parent | 24871727c0d49b989028af7c5aeebc47715474f0 (diff) | |
| download | freebsd-ports-gnome-c08523b30ca8d66b933a8cf621603ec6dabd1cdf.tar.gz freebsd-ports-gnome-c08523b30ca8d66b933a8cf621603ec6dabd1cdf.tar.zst freebsd-ports-gnome-c08523b30ca8d66b933a8cf621603ec6dabd1cdf.zip | |
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.
| -rw-r--r-- | x11/gdm/Makefile | 10 | ||||
| -rw-r--r-- | x11/gdm/pkg-install | 6 | ||||
| -rw-r--r-- | x11/gdm2/Makefile | 10 | ||||
| -rw-r--r-- | x11/gdm2/pkg-install | 6 |
4 files changed, 8 insertions, 24 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 9f18d67aa8fc..d2a282f2c0e5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -49,15 +49,9 @@ post-patch: s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure post-install: -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.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 +.if !defined(PACKAGE_BUILDING) + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${CHMOD} 0750 ${PREFIX}/share/gnome/gdm @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index df128647f968..237a1ceaa0ca 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/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 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 |