- Update distinfo

- Use DISTNAME
- Use WWWDIR instead of SPEEDTEST
- Provide correct pkg-message for users of non-default PREFIX or WWWDIR
- Use WWWDIR in pkg-plist (original pkg-plist is not WWWDIR-safe)

PR:		ports/154662 [1]
Submitted by:	Artem Naluzhnyy <Artem.Naluzhnyy@gmail.com> [1]
                sunpoet (myself)
Approved by:	Gritsuk Anton <gx@bsdplanet.ru> (maintainer)

4 files changed, 42 insertions, 48 deletions

diff --git a/www/speedtest-mini/Makefile b/www/speedtest-mini/Makefile
index 63db2ae40566..f47e1bb08be1 100644
--- a/www/speedtest-mini/Makefile
+++ b/www/speedtest-mini/Makefile
@@ -7,30 +7,30 @@
 
 PORTNAME=	speedtest-mini
 PORTVERSION=	2.1.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://files.speedtest.ookla.com/releases/
-DISTFILES=	mini${EXTRACT_SUFX}
+DISTNAME=	mini
 
 MAINTAINER=	gx@bsdplanet.ru
 COMMENT=	Mini bandwidth speed test on your own server
 
-USE_ZIP=	YES
-NO_BUILD=	YES
+NO_BUILD=	yes
+SUB_FILES=	pkg-message
+USE_ZIP=	yes
 WRKSRC=		${WRKDIR}
-SPEEDTEST?=	www/speedtest-mini
 
 pre-install:
-
-	if [ ! -f ${WRKSRC}/index-php.html ]; then ${CP} \
-		${WRKSRC}/index-php.html ${WRKSRC}/index.html; fi
+	@cd ${WRKSRC}/ && \
+		${MV} pkg-message .pkg-message && \
+		[ -f index-php.html ] && ${CP} index-php.html index.html \
 
 do-install:
-	@${MKDIR} ${PREFIX}/${SPEEDTEST}
-	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${SPEEDTEST}
-	@${CHMOD} 755 ${PREFIX}/${SPEEDTEST}
-	${CP} -R ${WRKSRC}/ ${PREFIX}/${SPEEDTEST}
+	${MKDIR} -m 755 ${WWWDIR}/
+	${CP} -pR ${WRKSRC}/* ${WWWDIR}/
+	${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${CAT} ${WRKSRC}/.pkg-message
 
 .include <bsd.port.mk>
diff --git a/www/speedtest-mini/distinfo b/www/speedtest-mini/distinfo
index 93ef668251d8..63409d21f326 100644
--- a/www/speedtest-mini/distinfo
+++ b/www/speedtest-mini/distinfo
@@ -1,3 +1,2 @@
-MD5 (mini.zip) = 1d4055b1917723e992d85d676368eeb3
-SHA256 (mini.zip) = df2e7fd634bffcbcbd3be3bd40b4a26a21344b2991ee8edba1fe660293433dc9
-SIZE (mini.zip) = 99038890
+SHA256 (mini.zip) = 1f13b07f6df95bbaab68a1ec54149a5808d84efcad578fd845daa72a577010c3
+SIZE (mini.zip) = 98998550
diff --git a/www/speedtest-mini/pkg-message b/www/speedtest-mini/files/pkg-message.in
index 40ea7fdd7036..58586eb3b869 100644
--- a/www/speedtest-mini/pkg-message
+++ b/www/speedtest-mini/files/pkg-message.in
@@ -1,16 +1,16 @@
 
 Speedtest Mini has been installed into:
 
-     ${PREFIX}/www/speedtest-mini
+     %%PREFIX%%/%%WWWDIR%%
 
 Please edit php.ini to suit your needs.
 
 To make speedtest available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
-    Alias /speedtest/ "/usr/local/www/speedtest-mini/"
+    Alias /speedtest/ "%%PREFIX%%/%%WWWDIR%%/"
 
-    <Directory "/usr/local/www/speedtest-mini/">
+    <Directory "%%PREFIX%%/%%WWWDIR%%/">
 	Options none
 	DirectoryIndex index.html
 	AllowOverride All
diff --git a/www/speedtest-mini/pkg-plist b/www/speedtest-mini/pkg-plist
index 7cf476117b9e..41b0babe58d0 100644
--- a/www/speedtest-mini/pkg-plist
+++ b/www/speedtest-mini/pkg-plist
@@ -1,30 +1,25 @@
-www/speedtest-mini/.PLIST.mktmp
-www/speedtest-mini/.build_done.speedtest-mini._usr_local
-www/speedtest-mini/.configure_done.speedtest-mini._usr_local
-www/speedtest-mini/.extract_done.speedtest-mini._usr_local
-www/speedtest-mini/.patch_done.speedtest-mini._usr_local
-www/speedtest-mini/crossdomain.xml
-www/speedtest-mini/index-asp.html
-www/speedtest-mini/index-aspx.html
-www/speedtest-mini/index-jsp.html
-www/speedtest-mini/index-php.html
-www/speedtest-mini/speedtest.swf
-www/speedtest-mini/speedtest/latency.txt
-www/speedtest-mini/speedtest/random1000x1000.jpg
-www/speedtest-mini/speedtest/random1500x1500.jpg
-www/speedtest-mini/speedtest/random2000x2000.jpg
-www/speedtest-mini/speedtest/random2500x2500.jpg
-www/speedtest-mini/speedtest/random3000x3000.jpg
-www/speedtest-mini/speedtest/random3500x3500.jpg
-www/speedtest-mini/speedtest/random350x350.jpg
-www/speedtest-mini/speedtest/random4000x4000.jpg
-www/speedtest-mini/speedtest/random500x500.jpg
-www/speedtest-mini/speedtest/random750x750.jpg
-www/speedtest-mini/speedtest/swfobject.js
-www/speedtest-mini/speedtest/upload.asp
-www/speedtest-mini/speedtest/upload.aspx
-www/speedtest-mini/speedtest/upload.jsp
-www/speedtest-mini/speedtest/upload.php
-www/speedtest-mini/troubleshooting.txt
-@dirrm www/speedtest-mini/speedtest
-@dirrm www/speedtest-mini
+%%WWWDIR%%/crossdomain.xml
+%%WWWDIR%%/index-asp.html
+%%WWWDIR%%/index-aspx.html
+%%WWWDIR%%/index-jsp.html
+%%WWWDIR%%/index-php.html
+%%WWWDIR%%/speedtest.swf
+%%WWWDIR%%/speedtest/latency.txt
+%%WWWDIR%%/speedtest/random1000x1000.jpg
+%%WWWDIR%%/speedtest/random1500x1500.jpg
+%%WWWDIR%%/speedtest/random2000x2000.jpg
+%%WWWDIR%%/speedtest/random2500x2500.jpg
+%%WWWDIR%%/speedtest/random3000x3000.jpg
+%%WWWDIR%%/speedtest/random3500x3500.jpg
+%%WWWDIR%%/speedtest/random350x350.jpg
+%%WWWDIR%%/speedtest/random4000x4000.jpg
+%%WWWDIR%%/speedtest/random500x500.jpg
+%%WWWDIR%%/speedtest/random750x750.jpg
+%%WWWDIR%%/speedtest/swfobject.js
+%%WWWDIR%%/speedtest/upload.asp
+%%WWWDIR%%/speedtest/upload.aspx
+%%WWWDIR%%/speedtest/upload.jsp
+%%WWWDIR%%/speedtest/upload.php
+%%WWWDIR%%/troubleshooting.txt
+@dirrm %%WWWDIR%%/speedtest
+@dirrm %%WWWDIR%%