summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11/gdm2/Makefile10
-rw-r--r--x11/gdm2/pkg-install4
2 files changed, 6 insertions, 8 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 0670a96fc..b4696023c 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -59,16 +59,10 @@ post-patch:
${WRKSRC}/po/Makefile.in.in
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 04f07cb65..e373a44e3 100644
--- a/x11/gdm2/pkg-install
+++ b/x11/gdm2/pkg-install
@@ -10,6 +10,8 @@ if [ "$2" = "POST-INSTALL" ]; then
UID=92
GID=${UID}
PW=/usr/sbin/pw
+ CHMOD=/bin/chmod
+ CHOWN=/usr/sbin/chown
if ${PW} group show "${GROUP}" 2>/dev/null; then
echo "You already have a group \"${GROUP}\", so I will use it."
@@ -34,6 +36,8 @@ if [ "$2" = "POST-INSTALL" ]; then
exit 1
fi
fi
+ ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm
+ ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm
exit 0
fi