> --git a/pts-core/external-test-dependencies/scripts/install-dragonfly-packages.sh b/pts-core/external-test-dependencies/scripts/install-dragonfly-packages.sh
new file mode 100755
index 0000000..6ee694e
--- /dev/null
+++ b/pts-core/external-test-dependencies/scripts/install-dragonfly-packages.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# DragonFlyBSD pkgsrc package installation
+
+echo "For now with this test profile script, please run: phoronix-test-suite install-dependencies xxx as root."
+
+# Check that ports is setup, below code should work for making sure good state with PC-BSD at least
+if [ -d /usr/pkgsrc ] && [ ! -d /usr/pkgsrc/devel ];
+then
+    cd /usr
+
+    if [ -d /usr/pkgsrc/.git ];
+    then
+        make pkgsrc-update
+    else
+        make pkgsrc-create
+    fi
+fi
+
+for portdir in $*
+do
+    if [ -d /usr/pkgsrc/$portdir ];
+    then
+        cd /usr/pkgsrc/$portdir
+        bmake install clean BATCH="yes"
+    fi
+done
diff --git a/pts-core/external-test-dependencies/scripts/install-dragonflybsd-packages.sh b/pts-core/external-test-dependencies/scripts/install-dragonflybsd-packages.sh
deleted file mode 100755
index 75d625d..0000000
--- a/pts-core/external-test-dependencies/scripts/install-dragonflybsd-packages.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# DragonFlyBSD pkgsrc package installation
-
-echo "For now with this test profile script, please run: phoronix-test-suite install-dependencies xxx as root."
-
-# Check that ports is setup, below code should work for making sure good state with PC-BSD at least
-if [ -d /usr/pkgsrc ] && [ ! -d /usr/pkgsrc/devel ];
-then
-    cd /usr
-
-    if [ -d /usr/pkgsrc/.git ];
-    then
-        make pkgsrc-update
-    elif
-        make pkgsrc-create
-    fi
-fi
-
-for portdir in $*
-do
-    if [ -d /usr/pkgsrc/$portdir ];
-    then
-        cd /usr/pkgsrc/$portdir
-        bmake install clean BATCH="yes"
-    fi
-done
diff --git a/pts-core/external-test-dependencies/xml/dragonfly-packages.xml b/pts-core/external-test-dependencies/xml/dragonfly-packages.xml
new file mode 100644
index 0000000..8aa2373
--- /dev/null
+++ b/pts-core/external-test-dependencies/xml/dragonfly-packages.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="xsl/pts-exdep-viewer.xsl" ?>
+<PhoronixTestSuite>
+    <ExternalDependencies>
+        <Information>
+            <Name>DragonFlyBSD</Name>
+        </Information>
+        <Package>
+            <GenericName>gtk-development</GenericName>
+            <PackageName>x11/gtk2</PackageName>
+            <FileCheck>/usr/pkg/include/gtk-2.0/</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>sdl-development</GenericName>
+            <PackageName>devel/SDL devel/SDL_gfx devel/SDL_image</PackageName>
+            <FileCheck>/usr/pkg/include/SDL/SDL.h, /usr/pkg/include/SDL/SDL_image.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>libpng-development</GenericName>
+            <PackageName>graphics/png</PackageName>
+            <FileCheck>/usr/pkg/include/png.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>openssl-development</GenericName>
+            <PackageName>security/openssl</PackageName>
+            <FileCheck>/usr/pkg/include/openssl/ssl.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>build-utilities</GenericName>
+            <PackageName>devel/autoconf</PackageName>
+            <FileCheck>/usr/pkg/bin/autoconf</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>cairo-development</GenericName>
+            <PackageName>graphics/cairo</PackageName>
+            <FileCheck>/usr/pkg/include/cairo/cairo.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>bison</GenericName>
+            <PackageName>devel/bison</PackageName>
+            <FileCheck>/usr/pkg/bin/bison</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>imlib2-development</GenericName>
+            <PackageName>graphics/imlib2</PackageName>
+            <FileCheck>/usr/pkg/lib/imlib2/</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>portaudio-development</GenericName>
+            <PackageName>audio/portaudio</PackageName>
+            <FileCheck>/usr/pkg/include/portaudio.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>fortran-compiler</GenericName>
+            <PackageName>lang/g95</PackageName>
+            <FileCheck>/usr/pkg/bin/g95</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>glew</GenericName>
+            <PackageName>graphics/glew</PackageName>
+            <FileCheck>/usr/pkg/include/GL/glew.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>lib3ds</GenericName>
+            <PackageName>graphics/lib3ds</PackageName>
+            <FileCheck>/usr/pkg/include/lib3ds/io.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>scons</GenericName>
+            <PackageName>devel/scons</PackageName>
+            <FileCheck>/usr/pkg/bin/scons</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>jpeg-development</GenericName>
+            <PackageName>graphics/jpeg</PackageName>
+            <FileCheck>/usr/pkg/include/jpeglib.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>perl</GenericName>
+            <PackageName>lang/perl5</PackageName>
+            <FileCheck>/usr/pkg/bin/perl</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>openal-development</GenericName>
+            <PackageName>audio/openal</PackageName>
+            <FileCheck>/usr/pkg/include/AL/al.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>vorbis-development</GenericName>
+            <PackageName>audio/libvorbis</PackageName>
+            <FileCheck>/usr/pkg/include/vorbis/vorbisfile.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>jam</GenericName>
+            <PackageName>devel/jam</PackageName>
+            <FileCheck>/usr/pkg/bin/jam</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>p7zip</GenericName>
+            <PackageName>archivers/p7zip</PackageName>
+            <FileCheck>/usr/pkg/bin/7za</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>qt4-development</GenericName>
+            <PackageName>x11/qt4</PackageName>
+            <FileCheck>/usr/pkg/include/qt4/Qt/qgl.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>autoconf</GenericName>
+            <PackageName>devel/autoconf</PackageName>
+            <FileCheck>/usr/pkg/bin/autoconf</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>libtool</GenericName>
+            <PackageName>devel/libtool</PackageName>
+            <FileCheck>/usr/pkg/bin/libtool</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>ncurses-development</GenericName>
+            <PackageName>devel/ncurses</PackageName>
+            <FileCheck>/usr/pkg/include/ncurses/ncurses.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>popt</GenericName>
+            <PackageName>devel/popt</PackageName>
+            <FileCheck>/usr/pkg/include/popt.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>fftw3-development</GenericName>
+            <PackageName>math/fftw</PackageName>
+            <FileCheck>/usr/pkg/include/fftw3.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>blas-development</GenericName>
+            <PackageName>math/blas</PackageName>
+            <FileCheck>/usr/pkg/lib/libblas.so</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>lapack-development</GenericName>
+            <PackageName>math/lapack</PackageName>
+            <FileCheck>/usr/pkg/lib/liblapack.so</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>cmake</GenericName>
+            <PackageName>devel/cmake-fedora</PackageName>
+            <FileCheck>/usr/pkg/bin/cmake</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>boost-development</GenericName>
+            <PackageName>devel/boost-build devel/boost-headers devel/boost-libs</PackageName>
+            <FileCheck>/usr/pkg/include/boost/iostreams/write.hpp</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>bzip2-development</GenericName>
+            <PackageName>archivers/bzip2</PackageName>
+            <FileCheck>/usr/pkg/include/bzlib.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>tcl</GenericName>
+            <PackageName>devel/tcllib</PackageName>
+            <FileCheck>/usr/pkg/bin/tclsh8.5</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>python</GenericName>
+            <PackageName>lang/python</PackageName>
+            <FileCheck>/usr/pkg/bin/python</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>python-boost-development</GenericName>
+            <PackageName>devel/boost-python</PackageName>
+            <FileCheck>/usr/pkg/include/boost/python.hpp</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>yasm</GenericName>
+            <PackageName>devel/yasm</PackageName>
+            <FileCheck>/usr/pkg/bin/yasm</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>gmp-library</GenericName>
+            <PackageName>math/fgmp</PackageName>
+            <FileCheck>/usr/pkg/include/gmp.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>subversion</GenericName>
+            <PackageName>devel/subversion</PackageName>
+            <FileCheck>/usr/pkg/bin/svn</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>superlu</GenericName>
+            <PackageName>math/superlu</PackageName>
+            <FileCheck>/usr/pkg/include/superlu/</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>glut</GenericName>
+            <PackageName>graphics/glut</PackageName>
+            <FileCheck>/usr/pkg/include/GL/glut.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>csh</GenericName>
+            <PackageName>shells/tcsh</PackageName>
+            <FileCheck>/usr/local/bin/tcsh</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>flex</GenericName>
+            <PackageName>devel/flex</PackageName>
+            <FileCheck>/usr/pkg/bin/flex</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>curl</GenericName>
+            <PackageName>www/curl</PackageName>
+            <FileCheck>/usr/pkg/bin/curl</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>openmpi-development</GenericName>
+            <PackageName>parallel/openmpi parallel/mpi-ch</PackageName>
+            <FileCheck>/usr/pkg/mpi/openmpi/lib, /usr/pkg/include/mpicxx.h</FileCheck>
+        </Package>
+        <Package>
+            <GenericName>git</GenericName>
+            <PackageName>misc/git</PackageName>
+            <FileCheck>/usr/pkg/bin/git</FileCheck>
+        </Package>
+    </ExternalDependencies>
+</PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/dragonflybsd-packages.xml b/pts-core/external-test-dependencies/xml/dragonflybsd-packages.xml
deleted file mode 100644
index 8aa2373..0000000
--- a/pts-core/external-test-dependencies/xml/dragonflybsd-packages.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="xsl/pts-exdep-viewer.xsl" ?>
-<PhoronixTestSuite>
-    <ExternalDependencies>
-        <Information>
-            <Name>DragonFlyBSD</Name>
-        </Information>
-        <Package>
-            <GenericName>gtk-development</GenericName>
-            <PackageName>x11/gtk2</PackageName>
-            <FileCheck>/usr/pkg/include/gtk-2.0/</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>sdl-development</GenericName>
-            <PackageName>devel/SDL devel/SDL_gfx devel/SDL_image</PackageName>
-            <FileCheck>/usr/pkg/include/SDL/SDL.h, /usr/pkg/include/SDL/SDL_image.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>libpng-development</GenericName>
-            <PackageName>graphics/png</PackageName>
-            <FileCheck>/usr/pkg/include/png.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>openssl-development</GenericName>
-            <PackageName>security/openssl</PackageName>
-            <FileCheck>/usr/pkg/include/openssl/ssl.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>build-utilities</GenericName>
-            <PackageName>devel/autoconf</PackageName>
-            <FileCheck>/usr/pkg/bin/autoconf</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>cairo-development</GenericName>
-            <PackageName>graphics/cairo</PackageName>
-            <FileCheck>/usr/pkg/include/cairo/cairo.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>bison</GenericName>
-            <PackageName>devel/bison</PackageName>
-            <FileCheck>/usr/pkg/bin/bison</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>imlib2-development</GenericName>
-            <PackageName>graphics/imlib2</PackageName>
-            <FileCheck>/usr/pkg/lib/imlib2/</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>portaudio-development</GenericName>
-            <PackageName>audio/portaudio</PackageName>
-            <FileCheck>/usr/pkg/include/portaudio.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>fortran-compiler</GenericName>
-            <PackageName>lang/g95</PackageName>
-            <FileCheck>/usr/pkg/bin/g95</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>glew</GenericName>
-            <PackageName>graphics/glew</PackageName>
-            <FileCheck>/usr/pkg/include/GL/glew.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>lib3ds</GenericName>
-            <PackageName>graphics/lib3ds</PackageName>
-            <FileCheck>/usr/pkg/include/lib3ds/io.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>scons</GenericName>
-            <PackageName>devel/scons</PackageName>
-            <FileCheck>/usr/pkg/bin/scons</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>jpeg-development</GenericName>
-            <PackageName>graphics/jpeg</PackageName>
-            <FileCheck>/usr/pkg/include/jpeglib.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>perl</GenericName>
-            <PackageName>lang/perl5</PackageName>
-            <FileCheck>/usr/pkg/bin/perl</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>openal-development</GenericName>
-            <PackageName>audio/openal</PackageName>
-            <FileCheck>/usr/pkg/include/AL/al.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>vorbis-development</GenericName>
-            <PackageName>audio/libvorbis</PackageName>
-            <FileCheck>/usr/pkg/include/vorbis/vorbisfile.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>jam</GenericName>
-            <PackageName>devel/jam</PackageName>
-            <FileCheck>/usr/pkg/bin/jam</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>p7zip</GenericName>
-            <PackageName>archivers/p7zip</PackageName>
-            <FileCheck>/usr/pkg/bin/7za</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>qt4-development</GenericName>
-            <PackageName>x11/qt4</PackageName>
-            <FileCheck>/usr/pkg/include/qt4/Qt/qgl.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>autoconf</GenericName>
-            <PackageName>devel/autoconf</PackageName>
-            <FileCheck>/usr/pkg/bin/autoconf</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>libtool</GenericName>
-            <PackageName>devel/libtool</PackageName>
-            <FileCheck>/usr/pkg/bin/libtool</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>ncurses-development</GenericName>
-            <PackageName>devel/ncurses</PackageName>
-            <FileCheck>/usr/pkg/include/ncurses/ncurses.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>popt</GenericName>
-            <PackageName>devel/popt</PackageName>
-            <FileCheck>/usr/pkg/include/popt.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>fftw3-development</GenericName>
-            <PackageName>math/fftw</PackageName>
-            <FileCheck>/usr/pkg/include/fftw3.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>blas-development</GenericName>
-            <PackageName>math/blas</PackageName>
-            <FileCheck>/usr/pkg/lib/libblas.so</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>lapack-development</GenericName>
-            <PackageName>math/lapack</PackageName>
-            <FileCheck>/usr/pkg/lib/liblapack.so</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>cmake</GenericName>
-            <PackageName>devel/cmake-fedora</PackageName>
-            <FileCheck>/usr/pkg/bin/cmake</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>boost-development</GenericName>
-            <PackageName>devel/boost-build devel/boost-headers devel/boost-libs</PackageName>
-            <FileCheck>/usr/pkg/include/boost/iostreams/write.hpp</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>bzip2-development</GenericName>
-            <PackageName>archivers/bzip2</PackageName>
-            <FileCheck>/usr/pkg/include/bzlib.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>tcl</GenericName>
-            <PackageName>devel/tcllib</PackageName>
-            <FileCheck>/usr/pkg/bin/tclsh8.5</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>python</GenericName>
-            <PackageName>lang/python</PackageName>
-            <FileCheck>/usr/pkg/bin/python</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>python-boost-development</GenericName>
-            <PackageName>devel/boost-python</PackageName>
-            <FileCheck>/usr/pkg/include/boost/python.hpp</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>yasm</GenericName>
-            <PackageName>devel/yasm</PackageName>
-            <FileCheck>/usr/pkg/bin/yasm</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>gmp-library</GenericName>
-            <PackageName>math/fgmp</PackageName>
-            <FileCheck>/usr/pkg/include/gmp.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>subversion</GenericName>
-            <PackageName>devel/subversion</PackageName>
-            <FileCheck>/usr/pkg/bin/svn</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>superlu</GenericName>
-            <PackageName>math/superlu</PackageName>
-            <FileCheck>/usr/pkg/include/superlu/</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>glut</GenericName>
-            <PackageName>graphics/glut</PackageName>
-            <FileCheck>/usr/pkg/include/GL/glut.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>csh</GenericName>
-            <PackageName>shells/tcsh</PackageName>
-            <FileCheck>/usr/local/bin/tcsh</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>flex</GenericName>
-            <PackageName>devel/flex</PackageName>
-            <FileCheck>/usr/pkg/bin/flex</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>curl</GenericName>
-            <PackageName>www/curl</PackageName>
-            <FileCheck>/usr/pkg/bin/curl</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>openmpi-development</GenericName>
-            <PackageName>parallel/openmpi parallel/mpi-ch</PackageName>
-            <FileCheck>/usr/pkg/mpi/openmpi/lib, /usr/pkg/include/mpicxx.h</FileCheck>
-        </Package>
-        <Package>
-            <GenericName>git</GenericName>
-            <PackageName>misc/git</PackageName>
-            <FileCheck>/usr/pkg/bin/git</FileCheck>
-        </Package>
-    </ExternalDependencies>