Merge branch 'mplegendre-multi_pkgsrc_roots' into develop

- This moves var/spack/packages to var/spack/repos/builtin/packages.

- Packages that did not exist in the source branch, or were changed in
  develop, were moved into var/spack/repos/builtin/packages as part of
  the integration.

Conflicts:
	lib/spack/spack/test/unit_install.py
	var/spack/repos/builtin/packages/clang/package.py

1 files changed, 21 insertions, 0 deletions

diff --git a/var/spack/repos/builtin/packages/otf/package.py b/var/spack/repos/builtin/packages/otf/package.py
new file mode 100644
index 0000000000..52893dd265
--- /dev/null
+++ b/var/spack/repos/builtin/packages/otf/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Otf(Package):
+    """To improve scalability for very large and massively parallel
+       traces the Open Trace Format (OTF) is developed at ZIH as a
+       successor format to the Vampir Trace Format (VTF3)."""
+
+    homepage = "http://tu-dresden.de/die_tu_dresden/zentrale_einrichtungen/zih/forschung/projekte/otf/index_html/document_view?set_language=en"
+    url      = "http://wwwpub.zih.tu-dresden.de/%7Emlieber/dcount/dcount.php?package=otf&get=OTF-1.12.5salmon.tar.gz"
+
+    version('1.12.5salmon', 'bf260198633277031330e3356dcb4eec')
+
+    depends_on('zlib')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix,
+                  '--without-vtf3',
+                  '--with-zlib',
+                  '--with-zlibsymbols')
+        make()
+        make("install")