4 files changed, 35 insertions, 0 deletions
diff --git a/var/spack/mock_packages/mpich/package.py b/var/spack/mock_packages/mpich/package.py
index 75a939a892..f77d3efc5d 100644
--- a/var/spack/mock_packages/mpich/package.py
+++ b/var/spack/mock_packages/mpich/package.py
@@ -30,6 +30,9 @@ class Mpich(Package):
     list_url   = "http://www.mpich.org/static/downloads/"
     list_depth = 2
 
+    variant('debug', default=False,
+            description="Compile MPICH with debug flags.")
+
     version('3.0.4', '9c5d5d4fe1e17dd12153f40bc5b6dbc0')
     version('3.0.3', 'foobarbaz')
     version('3.0.2', 'foobarbaz')
diff --git a/var/spack/mock_packages/mpileaks/package.py b/var/spack/mock_packages/mpileaks/package.py
index c6be37bc13..3989f1b452 100644
--- a/var/spack/mock_packages/mpileaks/package.py
+++ b/var/spack/mock_packages/mpileaks/package.py
@@ -33,6 +33,9 @@ class Mpileaks(Package):
     version(2.2, 'foobarbaz')
     version(2.3, 'foobarbaz')
 
+    variant('debug', default=False, description='Debug variant')
+    variant('opt',   default=False, description='Optimized variant')
+
     depends_on("mpi")
     depends_on("callpath")
 
diff --git a/var/spack/packages/cppcheck/package.py b/var/spack/packages/cppcheck/package.py
new file mode 100644
index 0000000000..8e98f457ee
--- /dev/null
+++ b/var/spack/packages/cppcheck/package.py
@@ -0,0 +1,15 @@
+from spack import *
+
+class Cppcheck(Package):
+    """A tool for static C/C++ code analysis."""
+    homepage = "http://cppcheck.sourceforge.net/"
+    url      = "http://downloads.sourceforge.net/project/cppcheck/cppcheck/1.68/cppcheck-1.68.tar.bz2"
+
+    version('1.68', 'c015195f5d61a542f350269030150708')
+
+    def install(self, spec, prefix):
+        # cppcheck does not have a configure script
+        make()
+        # manually install the final cppcheck binary
+        mkdirp(prefix.bin)
+        install('cppcheck', prefix.bin)
diff --git a/var/spack/packages/uncrustify/package.py b/var/spack/packages/uncrustify/package.py
new file mode 100644
index 0000000000..d3f2d1b473
--- /dev/null
+++ b/var/spack/packages/uncrustify/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Uncrustify(Package):
+    """Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"""
+
+    homepage = "http://uncrustify.sourceforge.net/"
+    url      = "http://downloads.sourceforge.net/project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
+
+    version('0.61', 'b6140106e74c64e831d0b1c4b6cf7727')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")