- WWWDIR is now defined in bsd.ports.mk

PR:		ports/105529
Submitted by:	laszlof

2 files changed, 7 insertions, 13 deletions

diff --git a/dns/poweradmin/Makefile b/dns/poweradmin/Makefile
index 593cdc72d577..9ed9ac811d77 100644
--- a/dns/poweradmin/Makefile
+++ b/dns/poweradmin/Makefile
@@ -20,18 +20,12 @@ USE_PHP=	mysql
 WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
-SUB_LIST=	INSTALLDIR=${INSTALLDIR}
-
-WEBOWN?=	www
-WEBGRP?=	www
-WWWDIR=		${PREFIX}/www
-INSTALLDIR=	${WWWDIR}/poweradmin
 
 do-install:
-	${MKDIR} ${INSTALLDIR}
+	${MKDIR} ${WWWDIR}
 	cd ${WRKSRC}; ${FIND} . \
-		| ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR}
-		${MV} ${INSTALLDIR}/inc/config-block.inc.php  ${INSTALLDIR}/inc/config.inc.php.sample
+		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${MV} ${WWWDIR}/inc/config-block.inc.php  ${WWWDIR}/inc/config.inc.php.sample
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/dns/poweradmin/files/pkg-message.in b/dns/poweradmin/files/pkg-message.in
index 1a37ef65aa18..6136b8b3d63e 100644
--- a/dns/poweradmin/files/pkg-message.in
+++ b/dns/poweradmin/files/pkg-message.in
@@ -1,9 +1,9 @@
 *******************************************************************************
-A sample config file is located in %%INSTALLDIR%%/inc/config.inc.php.sample
+A sample config file is located in %%WWWDIR%%/inc/config.inc.php.sample
 You now need to add an alias to apache's httpd.conf pointing to
-${INSTALLDIR} in order to access PowerAdmin from your web brower,
+%%WWWDIR%% in order to access PowerAdmin from your web brower,
 or create a VirtualHost with DocumentRoot set to that directory.
-	Alias /poweradmin/	%%INSTALLDIR%%/
+	Alias /poweradmin/	%%WWWDIR%%/
 		or
-	DocumentRoot		%%INSTALLDIR%%/
+	DocumentRoot		%%WWWDIR%%/
 *******************************************************************************