- Rename USER and GROUP variables to PHPUA_USER and PHPUA_GROUP to avoid

  collision with environment variables
- Use WWWOWN and WWWGRP as default values for PHPUA_USER and PHPUA_GROUP

Approved by:	portmgr (clement)

2 files changed, 5 insertions, 5 deletions

diff --git a/games/phpua-ut/Makefile b/games/phpua-ut/Makefile
index bfb399e472b0..703097dc0f81 100644
--- a/games/phpua-ut/Makefile
+++ b/games/phpua-ut/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/${PHPUA}/index.php:${PORTSDIR}/games/phpua-engine
 
 # Some variables you can change
 PHPUA?=		www/data/phpua
-USER?=		www
-GROUP?=		www
+PHPUA_USER?=	${WWWOWN}
+PHPUA_GROUP?=	${WWWGRP}
 
 # Static Variables
 PKGOPTS=	${FILESDIR}/pkg-opts
@@ -44,7 +44,7 @@ do-install:
 	@ ${CP} -R ${WRKDIR}/images ${PREFIX}/${PHPUA}/
 	@ ${CP} -R ${WRKDIR}/plugins ${PREFIX}/${PHPUA}/
 	@ ${CP} -R ${WRKDIR}/templates ${PREFIX}/${PHPUA}/
-	@ ${CHOWN} -R ${USER}:${GROUP} ${PREFIX}/${PHPUA}
+	@ ${CHOWN} -R ${PHPUA_USER}:${PHPUA_GROUP} ${PREFIX}/${PHPUA}
 	@ ${ECHO_MSG} ""
 	@ ${ECHO_MSG} "* Files have been installed in"
 	@ ${ECHO_MSG} "* ${PREFIX}/${PHPUA}"
diff --git a/games/phpua-ut/files/pkg-opts b/games/phpua-ut/files/pkg-opts
index 60e0b3999572..5c101844d9b6 100644
--- a/games/phpua-ut/files/pkg-opts
+++ b/games/phpua-ut/files/pkg-opts
@@ -2,9 +2,9 @@
 > PHPUA		[www/data/phpua]
   The DocumentRoot for your webserver under ${PREFIX}
 
-> USER		[www]
+> PHPUA_USER	[www]
   The user ID under which your webserver runs
 
-> GROUP		[www]
+> PHPUA_GROUP	[www]
   The group ID under which your webserver runs