diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
index 3ef5859e51c..7f5cf6e7772 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
@@ -77,20 +77,20 @@ def cmake_args(self):
             spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
 
         cmake_args = [
-             '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
-             '-DCUDA_DIR=%s' % spec['cuda'].prefix,
-             '-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix,
-             '-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix,
-             '-DCUPTI_DIR=%s' % spec['cuda'].prefix.extras.CUPTI,
-             '-DCUPTI_ROOT=%s' % spec['cuda'].prefix.extras.CUPTI,
-             '-DPAPI_ROOT=%s' % spec['papi'].prefix,
-             '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
-             '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
-             '-DBOOST_ROOT=%s' % spec['boost'].prefix,
-             '-DBoost_DIR=%s' % spec['boost'].prefix,
-             '-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib,
-             '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
-             '-DBoost_NO_SYSTEM_PATHS=ON']
+            '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
+            '-DCUDA_DIR=%s' % spec['cuda'].prefix,
+            '-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix,
+            '-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix,
+            '-DCUPTI_DIR=%s' % spec['cuda'].prefix.extras.CUPTI,
+            '-DCUPTI_ROOT=%s' % spec['cuda'].prefix.extras.CUPTI,
+            '-DPAPI_ROOT=%s' % spec['papi'].prefix,
+            '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
+            '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
+            '-DBOOST_ROOT=%s' % spec['boost'].prefix,
+            '-DBoost_DIR=%s' % spec['boost'].prefix,
+            '-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib,
+            '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
+            '-DBoost_NO_SYSTEM_PATHS=ON']
 
         # Adjust the standard cmake arguments to what we want the build
         # type, etc to be
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index e62ca14fce1..cafb34e2212 100644
--- a/var/spack/repos/builtin/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
@@ -164,15 +164,15 @@ def cmake_args(self):
         # Add in paths for finding package config files that tell us
         # where to find these packages
         cmake_args = [
-             '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
-             '-DBINUTILS_DIR=%s' % spec['binutils'].prefix,
-             '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
-             '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
-             '-DPAPI_DIR=%s' % spec['papi'].prefix,
-             '-DBOOST_DIR=%s' % spec['boost'].prefix,
-             '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
-             '-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
-             '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix]
+            '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
+            '-DBINUTILS_DIR=%s' % spec['binutils'].prefix,
+            '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
+            '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
+            '-DPAPI_DIR=%s' % spec['papi'].prefix,
+            '-DBOOST_DIR=%s' % spec['boost'].prefix,
+            '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
+            '-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
+            '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix]
 
         # Add any MPI implementations coming from variant settings
         self.set_mpi_cmakeOptions(spec, cmake_args)
diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index a6a7b69aa03..f0a92e2aa60 100644
--- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
@@ -75,12 +75,12 @@ def cmake_args(self):
             spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
 
         cmake_args = [
-             '-DCBTF_DIR=%s'               % spec['cbtf'].prefix,
-             '-DCBTF_KRELL_DIR=%s'         % spec['cbtf-krell'].prefix,
-             '-DMRNET_DIR=%s'              % spec['mrnet'].prefix,
-             '-DXERCESC_DIR=%s'            % spec['xerces-c'].prefix,
-             '-DCMAKE_PREFIX_PATH=%s'      % cmake_prefix_path,
-             '-DCMAKE_MODULE_PATH=%s'      % join_path(
+            '-DCBTF_DIR=%s'               % spec['cbtf'].prefix,
+            '-DCBTF_KRELL_DIR=%s'         % spec['cbtf-krell'].prefix,
+            '-DMRNET_DIR=%s'              % spec['mrnet'].prefix,
+            '-DXERCESC_DIR=%s'            % spec['xerces-c'].prefix,
+            '-DCMAKE_PREFIX_PATH=%s'      % cmake_prefix_path,
+            '-DCMAKE_MODULE_PATH=%s'      % join_path(
                  prefix.share, 'KrellInstitute', 'cmake')]
 
         # Adjust the standard cmake arguments to what we want the build
diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py
index ec96de462c4..7ef887c6d76 100644
--- a/var/spack/repos/builtin/packages/cbtf/package.py
+++ b/var/spack/repos/builtin/packages/cbtf/package.py
@@ -87,11 +87,11 @@ def cmake_args(self):
             # cbtf-krell build
             # FIXME
             cmake_args = [
-                 '-DBoost_NO_SYSTEM_PATHS=TRUE',
-                 '-DXERCESC_DIR=%s'         % spec['xerces-c'].prefix,
-                 '-DBOOST_ROOT=%s'          % spec['boost'].prefix,
-                 '-DMRNET_DIR=%s'           % spec['mrnet'].prefix,
-                 '-DCMAKE_MODULE_PATH=%s'   % join_path(
+                '-DBoost_NO_SYSTEM_PATHS=TRUE',
+                '-DXERCESC_DIR=%s'         % spec['xerces-c'].prefix,
+                '-DBOOST_ROOT=%s'          % spec['boost'].prefix,
+                '-DMRNET_DIR=%s'           % spec['mrnet'].prefix,
+                '-DCMAKE_MODULE_PATH=%s'   % join_path(
                      prefix.share, 'KrellInstitute', 'cmake')]
 
             # Add in the standard cmake arguments
@@ -103,11 +103,11 @@ def cmake_args(self):
 
         else:
             cmake_args = [
-                 '-DBoost_NO_SYSTEM_PATHS=TRUE',
-                 '-DXERCESC_DIR=%s'         % spec['xerces-c'].prefix,
-                 '-DBOOST_ROOT=%s'          % spec['boost'].prefix,
-                 '-DMRNET_DIR=%s'           % spec['mrnet'].prefix,
-                 '-DCMAKE_MODULE_PATH=%s'   % join_path(
+                '-DBoost_NO_SYSTEM_PATHS=TRUE',
+                '-DXERCESC_DIR=%s'         % spec['xerces-c'].prefix,
+                '-DBOOST_ROOT=%s'          % spec['boost'].prefix,
+                '-DMRNET_DIR=%s'           % spec['mrnet'].prefix,
+                '-DCMAKE_MODULE_PATH=%s'   % join_path(
                      prefix.share, 'KrellInstitute', 'cmake')]
 
             # Add in the standard cmake arguments