ports/155393: [PATCH] www/speedtest-mini: update to 2.1.8

[Artem Naluzhnyy]

>Number:         155393
>Category:       ports
>Synopsis:       [PATCH] www/speedtest-mini: update to 2.1.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 09 03:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Artem Naluzhnyy
>Release:        
>Organization:
>Environment:
>Description:
* 2.1.8 update
* installed files cleanup
>How-To-Repeat:

>Fix:
diff -ruN speedtest-mini.bak/Makefile speedtest-mini/Makefile
--- speedtest-mini.bak/Makefile	2011-02-26 00:29:58.000000000 +0200
+++ speedtest-mini/Makefile	2011-03-09 05:10:56.000000000 +0200
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	speedtest-mini
-PORTVERSION=	2.1.5
-PORTREVISION=	2
+PORTVERSION=	2.1.8
 CATEGORIES=	www
-MASTER_SITES=	http://files.speedtest.ookla.com/releases/
+MASTER_SITES=	http://c.speedtest.net/mini/
 DISTNAME=	mini
 
 MAINTAINER=	gx at bsdplanet.ru
@@ -18,19 +17,23 @@
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_ZIP=	yes
-WRKSRC=		${WRKDIR}
 
 pre-install:
-	@cd ${WRKSRC}/ && \
-		${MV} pkg-message .pkg-message && \
-		[ -f index-php.html ] && ${CP} index-php.html index.html \
+	@${CP} ${WRKSRC}/index-php.html ${WRKSRC}/index.html
 
 do-install:
-	${MKDIR} -m 755 ${WWWDIR}/
-	${CP} -pR ${WRKSRC}/* ${WWWDIR}/
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/
+	@${MKDIR} -m 755 ${WWWDIR}/speedtest
+
+	@${INSTALL_DATA} ${WRKSRC}/index.html ${WWWDIR}
+	@${INSTALL_DATA} ${WRKSRC}/speedtest.swf ${WWWDIR}
+	@${INSTALL_DATA} ${WRKSRC}/speedtest/expressInstall.swf ${WWWDIR}/speedtest
+	@${INSTALL_DATA} ${WRKSRC}/speedtest/random* ${WWWDIR}/speedtest
+	@${INSTALL_DATA} ${WRKSRC}/speedtest/swfobject.js ${WWWDIR}/speedtest
+	@${INSTALL_DATA} ${WRKSRC}/speedtest/upload.php ${WWWDIR}/speedtest
+
+	@${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
 post-install:
-	@${CAT} ${WRKSRC}/.pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -ruN speedtest-mini.bak/distinfo speedtest-mini/distinfo
--- speedtest-mini.bak/distinfo	2011-02-26 00:13:05.000000000 +0200
+++ speedtest-mini/distinfo	2011-03-09 04:05:53.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (mini.zip) = 1f13b07f6df95bbaab68a1ec54149a5808d84efcad578fd845daa72a577010c3
-SIZE (mini.zip) = 98998550
+SHA256 (mini.zip) = 8043e9cd3464cceb0a0a885f1074fae11e5680ef67abf65aad2aa10634dd87bf
+SIZE (mini.zip) = 98990320
diff -ruN speedtest-mini.bak/files/pkg-message.in speedtest-mini/files/pkg-message.in
--- speedtest-mini.bak/files/pkg-message.in	2011-02-17 03:59:24.000000000 +0200
+++ speedtest-mini/files/pkg-message.in	2011-03-09 05:02:47.000000000 +0200
@@ -1,16 +1,16 @@
 
 Speedtest Mini has been installed into:
 
-     %%PREFIX%%/%%WWWDIR%%
+     %%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/ "%%PREFIX%%/%%WWWDIR%%/"
+    Alias /speedtest/ "%%WWWDIR%%/"
 
-    <Directory "%%PREFIX%%/%%WWWDIR%%/">
+    <Directory "%%WWWDIR%%/">
 	Options none
 	DirectoryIndex index.html
 	AllowOverride All
diff -ruN speedtest-mini.bak/pkg-plist speedtest-mini/pkg-plist
--- speedtest-mini.bak/pkg-plist	2011-02-26 00:29:58.000000000 +0200
+++ speedtest-mini/pkg-plist	2011-03-09 05:08:34.000000000 +0200
@@ -1,11 +1,6 @@
-%%WWWDIR%%/crossdomain.xml
-%%WWWDIR%%/index-asp.html
-%%WWWDIR%%/index-aspx.html
-%%WWWDIR%%/index-jsp.html
-%%WWWDIR%%/index-php.html
 %%WWWDIR%%/index.html
 %%WWWDIR%%/speedtest.swf
-%%WWWDIR%%/speedtest/latency.txt
+%%WWWDIR%%/speedtest/expressInstall.swf
 %%WWWDIR%%/speedtest/random1000x1000.jpg
 %%WWWDIR%%/speedtest/random1500x1500.jpg
 %%WWWDIR%%/speedtest/random2000x2000.jpg
@@ -17,10 +12,6 @@
 %%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%%


>Release-Note:
>Audit-Trail:
>Unformatted: