More downloads.xml improvements and port nearly all of the profils to

using this new downloading mechansim.

49 files changed, 235 insertions, 172 deletions

diff --git a/pts/benchmark-profiles/build-imagemagick.xml b/pts/benchmark-profiles/build-imagemagick.xml
index 16b5ae2..f8a4021 100644
--- a/pts/benchmark-profiles/build-imagemagick.xml
+++ b/pts/benchmark-profiles/build-imagemagick.xml
@@ -1,6 +1,6 @@
 <PTSBenchmark>
 	<PhoronixTestSuite>
-		<Version>0.3</Version>
+		<Version>0.4</Version>
 		<BenchmarkType>Processor</BenchmarkType>
 		<ApplicationType>Utility</ApplicationType>
 		<License>FREE</License>
diff --git a/pts/benchmark-resources/build-linux-kernel/downloads.xml b/pts/benchmark-resources/build-linux-kernel/downloads.xml
new file mode 100644
index 0000000..9953237
--- /dev/null
+++ b/pts/benchmark-resources/build-linux-kernel/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2</URL>
+			<MD5>db95a49a656a3247d4995a797d333153</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/build-linux-kernel/install.sh b/pts/benchmark-resources/build-linux-kernel/install.sh
index 876a051..5b5f7fe 100644
--- a/pts/benchmark-resources/build-linux-kernel/install.sh
+++ b/pts/benchmark-resources/build-linux-kernel/install.sh
@@ -5,11 +5,6 @@ cp -f linux-2625-config-x86_64 $1
 
 cd $1
 
-if [ ! -f linux-2.6.25.tar.bz2 ]
-  then
-     wget http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 -O linux-2.6.25.tar.bz2
-fi
-
 echo "#!/bin/sh
 
 if [ ! -f linux-2.6.25.tar.bz2 ]
diff --git a/pts/benchmark-resources/build-mplayer/downloads.xml b/pts/benchmark-resources/build-mplayer/downloads.xml
new file mode 100644
index 0000000..6a03ac8
--- /dev/null
+++ b/pts/benchmark-resources/build-mplayer/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www3.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2</URL>
+			<MD5>7e27e535c2d267637df34898f1b91707</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/build-mplayer/install.sh b/pts/benchmark-resources/build-mplayer/install.sh
index 7f110f2..0773532 100644
--- a/pts/benchmark-resources/build-mplayer/install.sh
+++ b/pts/benchmark-resources/build-mplayer/install.sh
@@ -2,21 +2,16 @@
 
 cd $1
 
-if [ ! -f mplayer.tar.bz2 ]
-  then
-     wget http://www3.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 -O mplayer.tar.bz2
-fi
-
 echo "#!/bin/sh
 
-if [ ! -f mplayer.tar.bz2 ]
+if [ ! -f MPlayer-1.0rc2.tar.bz2 ]
   then
 	echo \"MPlayer Not Installed... Build Failed.\"
 	exit
 fi
 
 rm -rf MPlayer-1.0rc2/
-tar -xjf mplayer.tar.bz2
+tar -xjf MPlayer-1.0rc2.tar.bz2
 cd MPlayer-1.0rc2/
 ./configure > /dev/null
 sleep 3
diff --git a/pts/benchmark-resources/build-php/downloads.xml b/pts/benchmark-resources/build-php/downloads.xml
new file mode 100644
index 0000000..ca20444
--- /dev/null
+++ b/pts/benchmark-resources/build-php/downloads.xml
@@ -0,0 +1,13 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>ftp://xmlsoft.org/libxml2/libxml2-2.6.31.tar.gz</URL>
+			<MD5>714b0683b1ec4bdc63bc356d729f9b18</MD5>
+		</Package>
+		<Package>
+			<URL>http://us3.php.net/get/php-5.2.5.tar.bz2/from/us2.php.net/mirror</URL>
+			<MD5>1fe14ca892460b09f06729941a1bb605</MD5>
+			<FileName>php-5.2.5.tar.bz2</FileName>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/build-php/install.sh b/pts/benchmark-resources/build-php/install.sh
index 95aa8e4..8b95468 100644
--- a/pts/benchmark-resources/build-php/install.sh
+++ b/pts/benchmark-resources/build-php/install.sh
@@ -2,20 +2,10 @@
 
 cd $1
 
-if [ ! -f libxml2.tar.gz ]
-  then
-     wget ftp://xmlsoft.org/libxml2/libxml2-2.6.31.tar.gz -O libxml2.tar.gz
-fi
-
-if [ ! -f php5.tar.bz2 ]
-  then
-     wget http://us3.php.net/get/php-5.2.5.tar.bz2/from/us2.php.net/mirror -O php5.tar.bz2
-fi
-
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/libxml2
 
-tar -xvf libxml2.tar.gz
+tar -xvf libxml2-2.6.31.tar.gz
 
 cd libxml2-2.6.31/
 ./configure --prefix=$THIS_DIR/libxml2
@@ -26,14 +16,14 @@ rm -rf libxml2-2.6.31/
 
 echo "#!/bin/sh
 
-if [ ! -f php5.tar.bz2 ]
+if [ ! -f php-5.2.5.tar.bz2 ]
   then
 	echo \"PHP5 Not Downloaded... Build Fails.\"
 	exit
 fi
 
 rm -rf php-5.2.5/
-tar -xjf php5.tar.bz2
+tar -xjf php-5.2.5.tar.bz2
 cd php-5.2.5/
 ./configure --with-libxml-dir=$THIS_DIR/libxml2 > /dev/null
 sleep 3
diff --git a/pts/benchmark-resources/doom3/downloads.xml b/pts/benchmark-resources/doom3/downloads.xml
new file mode 100644
index 0000000..d35e8a0
--- /dev/null
+++ b/pts/benchmark-resources/doom3/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>ftp://ftp.idsoftware.com/idstuff/doom3/linux/doom3-linux-1.3.1.1304.x86.run</URL>
+			<MD5>6325f0936f59420d33668754032141cb</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/doom3/install.sh b/pts/benchmark-resources/doom3/install.sh
index 07435a8..61e4629 100755
--- a/pts/benchmark-resources/doom3/install.sh
+++ b/pts/benchmark-resources/doom3/install.sh
@@ -3,14 +3,9 @@
 cp -f doom3-pts.cfg $1
 cd $1
 
-if [ ! -f doom3-linux.run ]
-  then
-     wget ftp://ftp.idsoftware.com/idstuff/doom3/linux/doom3-linux-1.3.1.1304.x86.run -O doom3-linux.run
-fi
+chmod +x doom3-linux-1.3.1.1304.x86.run
 
-chmod +x doom3-linux.run
-
-./doom3-linux.run --noexec --target .
+./doom3-linux-1.3.1.1304.x86.run --noexec --target .
 ln bin/Linux/x86/doom.x86 doom3-real
 mv -f doom3-pts.cfg base/doom3-pts.cfg
 
diff --git a/pts/benchmark-resources/encode-flac/downloads.xml b/pts/benchmark-resources/encode-flac/downloads.xml
new file mode 100644
index 0000000..64af5a0
--- /dev/null
+++ b/pts/benchmark-resources/encode-flac/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://internap.dl.sourceforge.net/sourceforge/flac/flac-1.2.1.tar.gz</URL>
+			<MD5>153c8b15a54da428d1f0fadc756c22c7</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/encode-flac/install.sh b/pts/benchmark-resources/encode-flac/install.sh
index f043229..1ea8fd1 100644
--- a/pts/benchmark-resources/encode-flac/install.sh
+++ b/pts/benchmark-resources/encode-flac/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f flac.tar.gz ]
-  then
-     wget http://internap.dl.sourceforge.net/sourceforge/flac/flac-1.2.1.tar.gz -O flac.tar.gz
-fi
-
 if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
   then
      wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
@@ -17,7 +12,7 @@ fi
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/flac_
 
-tar -xvf flac.tar.gz
+tar -xvf flac-1.2.1.tar.gz
 cd flac-1.2.1/
 ./configure --prefix=$THIS_DIR/flac_
 make -j $NUM_CPU_JOBS
diff --git a/pts/benchmark-resources/encode-mp3/downloads.xml b/pts/benchmark-resources/encode-mp3/downloads.xml
new file mode 100644
index 0000000..bc12ad2
--- /dev/null
+++ b/pts/benchmark-resources/encode-mp3/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://superb-east.dl.sourceforge.net/sourceforge/lame/lame-3.97.tar.gz</URL>
+			<MD5>90a4acbb730d150dfe80de145126eef7</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/encode-mp3/install.sh b/pts/benchmark-resources/encode-mp3/install.sh
index 2eea05f..b678a12 100644
--- a/pts/benchmark-resources/encode-mp3/install.sh
+++ b/pts/benchmark-resources/encode-mp3/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f lame.tar.gz ]
-  then
-     wget http://superb-east.dl.sourceforge.net/sourceforge/lame/lame-3.97.tar.gz -O lame.tar.gz
-fi
-
 if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
   then
      wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
@@ -17,7 +12,7 @@ fi
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/lame_
 
-tar -xvf lame.tar.gz
+tar -xvf lame-3.97.tar.gz
 cd lame-3.97/
 ./configure --prefix=$THIS_DIR/lame_
 make -j $NUM_CPU_JOBS
diff --git a/pts/benchmark-resources/encode-ogg/downloads.xml b/pts/benchmark-resources/encode-ogg/downloads.xml
new file mode 100644
index 0000000..7364566
--- /dev/null
+++ b/pts/benchmark-resources/encode-ogg/downloads.xml
@@ -0,0 +1,16 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz</URL>
+			<MD5>eaf7dc6ebbff30975de7527a80831585</MD5>
+		</Package>
+		<Package>
+			<URL>http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz</URL>
+			<MD5>478646358c49f34aedcce58948793619</MD5>
+		</Package>
+		<Package>
+			<URL>http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz</URL>
+			<MD5>df976d24e51ef3d87cd462edf747bf9a</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/encode-ogg/install.sh b/pts/benchmark-resources/encode-ogg/install.sh
index 0bb7b39..43197dd 100644
--- a/pts/benchmark-resources/encode-ogg/install.sh
+++ b/pts/benchmark-resources/encode-ogg/install.sh
@@ -2,21 +2,6 @@
 
 cd $1
 
-if [ ! -f libogg.tar.gz ]
-  then
-     wget http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz -O libogg.tar.gz
-fi
-
-if [ ! -f libvorbis.tar.gz ]
-  then
-     wget http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz -O libvorbis.tar.gz
-fi
-
-if [ ! -f vorbis-tools.tar.gz ]
-  then
-     wget http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz -O vorbis-tools.tar.gz
-fi
-
 if [ ! -f ../pts-shared/pts-wav-sample-file.wav ]
   then
      wget http://www.phoronix-test-suite.com/benchmark-files/pts-wav-sample-file.tar.bz2 -O ../pts-shared/pts-wav-sample-file.tar.bz2
@@ -27,9 +12,9 @@ fi
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/vorbis
 
-tar -xvf libogg.tar.gz
-tar -xvf libvorbis.tar.gz
-tar -xvf vorbis-tools.tar.gz
+tar -xvf libogg-1.1.3.tar.gz
+tar -xvf libvorbis-1.2.0.tar.gz
+tar -xvf vorbis-tools-1.2.0.tar.gz
 
 cd libogg-1.1.3/
 ./configure --prefix=$THIS_DIR/vorbis
diff --git a/pts/benchmark-resources/etqw/downloads.xml b/pts/benchmark-resources/etqw/downloads.xml
new file mode 100644
index 0000000..0def7bd
--- /dev/null
+++ b/pts/benchmark-resources/etqw/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>ftp://ftp.idsoftware.com/idstuff/etqw/ETQW-client-1.4-full.x86.run</URL>
+			<MD5>dd2cd05256a080922da33cc6804bc4c2</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/etqw/install.sh b/pts/benchmark-resources/etqw/install.sh
index 77390bd..34cb757 100755
--- a/pts/benchmark-resources/etqw/install.sh
+++ b/pts/benchmark-resources/etqw/install.sh
@@ -2,14 +2,9 @@
 
 cd $1
 
-if [ ! -f etqw-linux.run ]
-  then
-     wget ftp://ftp.idsoftware.com/idstuff/etqw/ETQW-client-1.4-full.x86.run -O etqw-linux.run
-fi
-
-chmod +x etqw-linux.run
+chmod +x ETQW-client-1.4-full.x86.run
 
-unzip -o etqw-linux.run
+unzip -o ETQW-client-1.4-full.x86.run
 
 echo "#!/bin/sh
 cd data
diff --git a/pts/benchmark-resources/fract/downloads.xml b/pts/benchmark-resources/fract/downloads.xml
new file mode 100644
index 0000000..58c0fa2
--- /dev/null
+++ b/pts/benchmark-resources/fract/downloads.xml
@@ -0,0 +1,12 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.fbench.com/fract-1.07b.tar.bz2</URL>
+			<MD5>ce550abd3ca93bbc8d79f58fb4d313c1</MD5>
+		</Package>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/fract-scene.h.patch</URL>
+			<MD5>402b4231ec35f8f6e209ac1c3929591d</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/fract/install.sh b/pts/benchmark-resources/fract/install.sh
index 11696e4..a4dcee8 100644
--- a/pts/benchmark-resources/fract/install.sh
+++ b/pts/benchmark-resources/fract/install.sh
@@ -2,15 +2,6 @@
 
 cd $1
 
-if [ ! -f fract-1.07b.tar.bz2 ]
-  then
-     wget http://www.fbench.com/fract-1.07b.tar.bz2 -O fract-1.07b.tar.bz2
-fi
-if [ ! -f fract-scene.h.patch ]
-  then
-     wget http://www.phoronix-test-suite.com/benchmark-files/fract-scene.h.patch -O fract-scene.h.patch
-fi
-
 tar -jxvf fract-1.07b.tar.bz2
 cp fract-scene.h.patch fract-1.07b/
 cd fract-1.07b/
diff --git a/pts/benchmark-resources/glmark/downloads.xml b/pts/benchmark-resources/glmark/downloads.xml
new file mode 100644
index 0000000..343dcc7
--- /dev/null
+++ b/pts/benchmark-resources/glmark/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://internap.dl.sourceforge.net/sourceforge/glmark/GLMark-0.1.tar.gz</URL>
+			<MD5>4340a31ce90ac9c5dc4c4d49d09c2d3f</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/glmark/install.sh b/pts/benchmark-resources/glmark/install.sh
index 6aba7a6..ed6e90e 100644
--- a/pts/benchmark-resources/glmark/install.sh
+++ b/pts/benchmark-resources/glmark/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f GLMark-0.1.tar.gz ]
-  then
-     wget http://internap.dl.sourceforge.net/sourceforge/glmark/GLMark-0.1.tar.gz -O GLMark-0.1.tar.gz
-fi
-
 tar -xvf GLMark-0.1.tar.gz
 gcc *.c -o glmark -lSDL -lGL -lGLU
 
diff --git a/pts/benchmark-resources/gtkperf/downloads.xml b/pts/benchmark-resources/gtkperf/downloads.xml
new file mode 100644
index 0000000..7c1ff3e
--- /dev/null
+++ b/pts/benchmark-resources/gtkperf/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://internap.dl.sourceforge.net/sourceforge/gtkperf/gtkperf_0.40.tar.gz</URL>
+			<MD5>4331dde4bb83865e15482885fcb0cc53</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/gtkperf/install.sh b/pts/benchmark-resources/gtkperf/install.sh
index 9f95917..e8adadf 100644
--- a/pts/benchmark-resources/gtkperf/install.sh
+++ b/pts/benchmark-resources/gtkperf/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f gtkperf_0.40.tar.gz ]
-  then
-     wget http://internap.dl.sourceforge.net/sourceforge/gtkperf/gtkperf_0.40.tar.gz -O gtkperf_0.40.tar.gz
-fi
-
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/gtkperf_env
 
diff --git a/pts/benchmark-resources/iozone/downloads.xml b/pts/benchmark-resources/iozone/downloads.xml
new file mode 100644
index 0000000..5e2b98e
--- /dev/null
+++ b/pts/benchmark-resources/iozone/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.iozone.org/src/current/iozone3_291.tar</URL>
+			<MD5>fceb0146e50e714a6c4b3618489e4880</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/iozone/install.sh b/pts/benchmark-resources/iozone/install.sh
index 190b68f..8ed76fd 100644
--- a/pts/benchmark-resources/iozone/install.sh
+++ b/pts/benchmark-resources/iozone/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f iozone3_291.tar ]
-	then
-     wget http://www.iozone.org/src/current/iozone3_291.tar -O iozone3_291.tar
-fi
-
 tar -xvf iozone3_291.tar
 cd iozone3_291/src/current/
 
diff --git a/pts/benchmark-resources/java-scimark2/downloads.xml b/pts/benchmark-resources/java-scimark2/downloads.xml
new file mode 100644
index 0000000..05ab271
--- /dev/null
+++ b/pts/benchmark-resources/java-scimark2/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://math.nist.gov/scimark2/scimark2lib.zip</URL>
+			<MD5>fce68e619b03c815fa56f2637a841fa9</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/java-scimark2/install.sh b/pts/benchmark-resources/java-scimark2/install.sh
index 6b07792..ad1e4db 100644
--- a/pts/benchmark-resources/java-scimark2/install.sh
+++ b/pts/benchmark-resources/java-scimark2/install.sh
@@ -2,12 +2,6 @@
 
 cd $1
 
-if [ ! -f scimark2lib.zip ]
- 
-	then
-     wget http://math.nist.gov/scimark2/scimark2lib.zip -O scimark2lib.zip
-fi
-
 unzip -o scimark2lib.zip
 
 echo "#!/bin/sh
diff --git a/pts/benchmark-resources/memory-bandwidth/downloads.xml b/pts/benchmark-resources/memory-bandwidth/downloads.xml
new file mode 100644
index 0000000..19a2931
--- /dev/null
+++ b/pts/benchmark-resources/memory-bandwidth/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/bandwidth-0.13.tar.gz</URL>
+			<MD5>8c5abed2a9bf2e5fe0fa528388556086</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/memory-bandwidth/install.sh b/pts/benchmark-resources/memory-bandwidth/install.sh
index 4b47e72..5635a44 100644
--- a/pts/benchmark-resources/memory-bandwidth/install.sh
+++ b/pts/benchmark-resources/memory-bandwidth/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f bandwidth-0.13.tar.gz ]
-  then
-     wget http://www.phoronix-test-suite.com/benchmark-files/bandwidth-0.13.tar.gz -O bandwidth-0.13.tar.gz
-fi
-
 tar -xvf bandwidth-0.13.tar.gz
 
 echo "#!/bin/sh
diff --git a/pts/benchmark-resources/nexuiz/downloads.xml b/pts/benchmark-resources/nexuiz/downloads.xml
new file mode 100644
index 0000000..cb589ab
--- /dev/null
+++ b/pts/benchmark-resources/nexuiz/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://internap.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-24.zip</URL>
+			<MD5>7ecf1e683c3db02cdbc8d4514e8e33ce</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/nexuiz/install.sh b/pts/benchmark-resources/nexuiz/install.sh
index 7922fba..4b72a14 100755
--- a/pts/benchmark-resources/nexuiz/install.sh
+++ b/pts/benchmark-resources/nexuiz/install.sh
@@ -8,10 +8,6 @@ cat > nexuiz <<'EOT'
 /usr/games/nexuiz +exec normal.cfg $@ | grep fps
 EOT
 else
-if [ ! -f nexuiz-24.zip ]
-  then
-     wget http://internap.dl.sourceforge.net/sourceforge/nexuiz/nexuiz-24.zip -O nexuiz-24.zip
-fi
 
 unzip -o nexuiz-24.zip
 
diff --git a/pts/benchmark-resources/norsetto-shadow/downloads.xml b/pts/benchmark-resources/norsetto-shadow/downloads.xml
new file mode 100644
index 0000000..7c426a3
--- /dev/null
+++ b/pts/benchmark-resources/norsetto-shadow/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/norsetto-shadow-01.tar.bz2</URL>
+			<MD5>0e6c0c096585a76f41bc8979b0a34084</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/norsetto-shadow/install.sh b/pts/benchmark-resources/norsetto-shadow/install.sh
index 9b039bf..66114fe 100644
--- a/pts/benchmark-resources/norsetto-shadow/install.sh
+++ b/pts/benchmark-resources/norsetto-shadow/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f norsetto-shadow-01.tar.bz2 ]
-  then
-     wget http://www.phoronix-test-suite.com/benchmark-files/norsetto-shadow-01.tar.bz2 -O norsetto-shadow-01.tar.bz2
-fi
-
 rm -rf shadow/
 tar -xjf norsetto-shadow-01.tar.bz2
 cd shadow/
diff --git a/pts/benchmark-resources/quake4/downloads.xml b/pts/benchmark-resources/quake4/downloads.xml
new file mode 100644
index 0000000..a231e08
--- /dev/null
+++ b/pts/benchmark-resources/quake4/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>ftp://ftp.idsoftware.com/idstuff/quake4/linux/quake4-linux-1.4.2.x86.run</URL>
+			<MD5>bd2cb8164ede4272adcc091f724855ac</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/quake4/install.sh b/pts/benchmark-resources/quake4/install.sh
index a21c632..8dcf5c4 100755
--- a/pts/benchmark-resources/quake4/install.sh
+++ b/pts/benchmark-resources/quake4/install.sh
@@ -2,18 +2,14 @@
 
 cd $1
 
-if [ ! -f quake4-linux.run ]
-  then
-     wget ftp://ftp.idsoftware.com/idstuff/quake4/linux/quake4-linux-1.4.2.x86.run -O quake4-linux.run
-fi
 if [ ! -f quake4-demo.tar.bz2 ]
   then
      wget http://www.phoronix-test-suite.com/benchmark-files/quake4-demo-1.tar.bz2 -O quake4-demo.tar.bz2
 fi
 
-chmod +x quake4-linux.run
+chmod +x quake4-linux-1.4.2.x86.run
 
-./quake4-linux.run --noexec --target .
+./quake4-linux-1.4.2.x86.run --noexec --target .
 ln bin/Linux/x86/quake4.x86 quake4-real
 chmod +x quake4-real
 
diff --git a/pts/benchmark-resources/ramspeed/downloads.xml b/pts/benchmark-resources/ramspeed/downloads.xml
new file mode 100644
index 0000000..501b26a
--- /dev/null
+++ b/pts/benchmark-resources/ramspeed/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.alasir.com/software/ramspeed/ramspeed-2.5.1.tar.gz</URL>
+			<MD5>b13f126a67f387cc48812607573f4d7a</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/ramspeed/install.sh b/pts/benchmark-resources/ramspeed/install.sh
index 640c9c7..c84c57e 100644
--- a/pts/benchmark-resources/ramspeed/install.sh
+++ b/pts/benchmark-resources/ramspeed/install.sh
@@ -2,13 +2,7 @@
 
 cd $1
 
-if [ ! -f ramspeed.tar.gz ]
-  then
-     wget http://www.alasir.com/software/ramspeed/ramspeed-2.5.1.tar.gz -O ramspeed.tar.gz
-fi
-
-tar -xvf ramspeed.tar.gz
-
+tar -xvf ramspeed-2.5.1.tar.gz
 
 echo "#!/bin/sh
 
diff --git a/pts/benchmark-resources/render-bench/downloads.xml b/pts/benchmark-resources/render-bench/downloads.xml
new file mode 100644
index 0000000..eb85cb1
--- /dev/null
+++ b/pts/benchmark-resources/render-bench/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/render_bench.tar.gz</URL>
+			<MD5>a3b6b8e4dc8017d948eeb81e4308acb5</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/render-bench/install.sh b/pts/benchmark-resources/render-bench/install.sh
index fc37f29..ee9a977 100644
--- a/pts/benchmark-resources/render-bench/install.sh
+++ b/pts/benchmark-resources/render-bench/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f render_bench.tar.gz ]
-  then
-     wget http://www.phoronix-test-suite.com/benchmark-files/render_bench.tar.gz -O render_bench.tar.gz
-fi
-
 rm -rf render_bench/
 tar -xvf render_bench.tar.gz
 cd render_bench/
diff --git a/pts/benchmark-resources/scimark2/downloads.xml b/pts/benchmark-resources/scimark2/downloads.xml
new file mode 100644
index 0000000..ee44523
--- /dev/null
+++ b/pts/benchmark-resources/scimark2/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://math.nist.gov/scimark2/scimark2_1c.zip</URL>
+			<MD5>6cc8d6d5312a07e32316c03580e0206b</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/scimark2/install.sh b/pts/benchmark-resources/scimark2/install.sh
index 660f4b8..6546ce9 100644
--- a/pts/benchmark-resources/scimark2/install.sh
+++ b/pts/benchmark-resources/scimark2/install.sh
@@ -2,12 +2,6 @@
 
 cd $1
 
-if [ ! -f scimark2_1c.zip ]
- 
-	then
-     wget http://math.nist.gov/scimark2/scimark2_1c.zip -O scimark2_1c.zip
-fi
-
 unzip -o scimark2_1c.zip -d scimark2_files
 cd scimark2_files/
 g++ -o scimark2 -O *.c
diff --git a/pts/benchmark-resources/specviewperf9/downloads.xml b/pts/benchmark-resources/specviewperf9/downloads.xml
new file mode 100644
index 0000000..8cd1472
--- /dev/null
+++ b/pts/benchmark-resources/specviewperf9/downloads.xml
@@ -0,0 +1,12 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>ftp://spec.unipv.it/dist/gpc/opc/viewperf/unix/SPECViewperf9.0.3.tar.gz</URL>
+			<MD5>1651c5c99cbc724bfdbb6cf70220502d</MD5>
+		</Package>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/SPECViewPerf9-Configure</URL>
+			<MD5>e01d9e4d7c9245b537ecea327852b8d2</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/specviewperf9/install.sh b/pts/benchmark-resources/specviewperf9/install.sh
index 4c3e6dc..2e7f4c0 100644
--- a/pts/benchmark-resources/specviewperf9/install.sh
+++ b/pts/benchmark-resources/specviewperf9/install.sh
@@ -2,19 +2,6 @@
 
 cd $1
 
-if [ ! -f SPECViewPerf9-Configure ]
- 
-	then
-     wget http://www.phoronix-test-suite.com/benchmark-files/SPECViewPerf9-Configure -O SPECViewPerf9-Configure
-fi
-
-if [ ! -f SPECViewperf9.0.3.tar.gz ]
- 
-	then
-     wget ftp://spec.unipv.it/dist/gpc/opc/viewperf/unix/SPECViewperf9.0.3.tar.gz -O SPECViewperf9.0.3.tar.gz
-fi
-
-
 tar -xvf SPECViewperf9.0.3.tar.gz
 cp -f SPECViewPerf9-Configure SPECViewperf9.0/src/Configure
 chmod +x SPECViewperf9.0/src/Configure
diff --git a/pts/benchmark-resources/sunflow/downloads.xml b/pts/benchmark-resources/sunflow/downloads.xml
new file mode 100644
index 0000000..08cfd6c
--- /dev/null
+++ b/pts/benchmark-resources/sunflow/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://internap.dl.sourceforge.net/sourceforge/sunflow/sunflow-bin-v0.07.2.zip</URL>
+			<MD5>5806cafff80db23c275203589ce2f5d4</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/sunflow/install.sh b/pts/benchmark-resources/sunflow/install.sh
index 2da4e69..5a4bcdd 100644
--- a/pts/benchmark-resources/sunflow/install.sh
+++ b/pts/benchmark-resources/sunflow/install.sh
@@ -2,12 +2,6 @@
 
 cd $1
 
-if [ ! -f sunflow-bin-v0.07.2.zip ]
- 
-	then
-     wget http://internap.dl.sourceforge.net/sourceforge/sunflow/sunflow-bin-v0.07.2.zip -O sunflow-bin-v0.07.2.zip
-fi
-
 unzip -o sunflow-bin-v0.07.2.zip
 
 echo "#!/bin/sh
diff --git a/pts/benchmark-resources/super-pi/downloads.xml b/pts/benchmark-resources/super-pi/downloads.xml
new file mode 100644
index 0000000..30c5587
--- /dev/null
+++ b/pts/benchmark-resources/super-pi/downloads.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/super_pi.tar.gz</URL>
+			<MD5>92356a09cd05553be2c26f6edfff0fc4</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/super-pi/install.sh b/pts/benchmark-resources/super-pi/install.sh
index f49eb46..c6379f0 100755
--- a/pts/benchmark-resources/super-pi/install.sh
+++ b/pts/benchmark-resources/super-pi/install.sh
@@ -2,11 +2,6 @@
 
 cd $1
 
-if [ ! -f super_pi.tar.gz ]
-  then
-     wget http://www.phoronix-test-suite.com/benchmark-files/super_pi.tar.gz
-fi
-
 tar -xvf super_pi.tar.gz
 
 # make wrapper shell script for total line
diff --git a/pts/benchmark-resources/warsow/downloads.xml b/pts/benchmark-resources/warsow/downloads.xml
new file mode 100644
index 0000000..88c81f0
--- /dev/null
+++ b/pts/benchmark-resources/warsow/downloads.xml
@@ -0,0 +1,12 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.speltips.org/~web1_mans/files/warsow_0.42_unified.zip</URL>
+			<MD5>cba5fe9b8af01b378e685959098fa84f</MD5>
+		</Package>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-warsow-04.wd10</URL>
+			<MD5>26beb08a58d89c39d97dc728461d20de</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
diff --git a/pts/benchmark-resources/warsow/install.sh b/pts/benchmark-resources/warsow/install.sh
index 5026fd4..46578b8 100755
--- a/pts/benchmark-resources/warsow/install.sh
+++ b/pts/benchmark-resources/warsow/install.sh
@@ -2,16 +2,6 @@
 
 cd $1
 
-if [ ! -f warsow_0.42_unified.zip ]
-  then
-     wget http://www.speltips.org/~web1_mans/files/warsow_0.42_unified.zip -O warsow_0.42_unified.zip
-fi
-
-if [ ! -f pts-warsow-04.wd10 ]
-  then
-     wget http://www.phoronix-test-suite.com/benchmark-files/pts-warsow-04.wd10 -O pts-warsow-04.wd10
-fi
-
 unzip -o warsow_0.42_unified.zip
 cp pts-warsow-04.wd10 warsow_0.42_unified/basewsw/demos
 cd warsow_0.42_unified/