diff --git a/.gitignore b/.gitignore
index f25ac615faf6e8d7efd6861ef9384a82634fcfb2..a451f9e14ee1d1267ae70a35940311facbeb6ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 /share/spack/modules
 /share/spack/lmod
 /TAGS
+*.swp
 /htmlcov
 .coverage
 #*
diff --git a/.mailmap b/.mailmap
index 39ec18324132af4804b67ad2ace5ca46959c6abc..df0a82a1977337dd1f58f3c68cbbf6ef9eaa41b2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,20 +1,56 @@
-Todd Gamblin       <tgamblin@llnl.gov>          George Todd Gamblin <gamblin2@llnl.gov>
-Todd Gamblin       <tgamblin@llnl.gov>          Todd Gamblin        <gamblin2@llnl.gov>
-Adam Moody         <moody20@llnl.gov>           Adam T. Moody       <moody20@llnl.gov>
-Alfredo Gimenez    <gimenez1@llnl.gov>          Alfredo Gimenez     <alfredo.gimenez@gmail.com>
-David Boehme       <boehme3@llnl.gov>           David Boehme        <boehme3@sierra324.llnl.gov>
-David Boehme       <boehme3@llnl.gov>           David Boehme        <boehme3@sierra648.llnl.gov>
-Kevin Brandstatter <kjbrandstatter@gmail.com>   Kevin Brandstatter  <kbrandst@hawk.iit.edu>
-Luc Jaulmes        <luc.jaulmes@bsc.es>         Luc Jaulmes         <jaulmes1@llnl.gov>
-Saravan Pantham    <saravan.pantham@gmail.com>  Saravan Pantham     <pantham1@surface86.llnl.gov>
-Tom Scogland       <tscogland@llnl.gov>         Tom Scogland        <scogland1@llnl.gov>
-Tom Scogland       <tscogland@llnl.gov>         Tom Scogland        <tom.scogland@gmail.com>
-Joachim Protze     <protze@rz.rwth-aachen.de>   jprotze             <protze@rz.rwth-aachen.de>
-Gregory L. Lee     <lee218@llnl.gov>            Gregory L. Lee      <lee218@surface86.llnl.gov>
-Gregory L. Lee     <lee218@llnl.gov>            Gregory L. Lee      <lee218@cab687.llnl.gov>
-Gregory L. Lee     <lee218@llnl.gov>            Gregory L. Lee      <lee218@cab690.llnl.gov>
-Gregory L. Lee     <lee218@llnl.gov>            Gregory L. Lee      <lee218@catalyst159.llnl.gov>
-Gregory L. Lee     <lee218@llnl.gov>            Gregory Lee         <lee218@llnl.gov>
-Massimiliano Culpo <massimiliano.culpo@epfl.ch> Massimiliano Culpo  <massimiliano.culpo@googlemail.com>
-Massimiliano Culpo <massimiliano.culpo@epfl.ch> alalazo             <massimiliano.culpo@googlemail.com>
-Mark Miller        <miller86@llnl.gov>          miller86            <miller86@llnl.gov>
+Abhinav Bhatele       <bhatele@llnl.gov>                Abhinav Bhatele         <bhatele@gmail.com>
+Adam Moody            <moody20@llnl.gov>                Adam T. Moody           <moody20@llnl.gov>
+Alfredo Gimenez       <gimenez1@llnl.gov>               Alfredo Gimenez         <alfredo.gimenez@gmail.com>
+Alfredo Gimenez       <gimenez1@llnl.gov>               Alfredo Adolfo Gimenez  <alfredo.gimenez@gmail.com>
+Andrew Williams       <williamsa89@cardiff.ac.uk>       Andrew Williams         <andrew@alshain.org.uk>
+Ben Boeckel           <ben.boeckel@kitware.com>         Ben Boeckel             <mathstuf@gmail.com>
+Ben Boeckel           <ben.boeckel@kitware.com>         Ben Boeckel             <mathstuf@users.noreply.github.com>
+Benedikt Hegner       <hegner@cern.ch>                  Benedikt Hegner         <benedikt.hegner@cern.ch>
+Brett Viren           <bv@bnl.gov>                      Brett Viren             <brett.viren@gmail.com>
+David Boehme          <boehme3@llnl.gov>                David Boehme            <boehme3@sierra324.llnl.gov>
+David Boehme          <boehme3@llnl.gov>                David Boehme            <boehme3@sierra648.llnl.gov>
+David Poliakoff       <poliakoff1@llnl.gov>             David Poliakoff         <david.poliakoff@gmail.com>
+Dhanannjay Deo        <dhanannjay.deo@kitware.com>      Dhanannjay 'Djay' Deo   <dhanannjay.deo@kitware.com>
+Elizabeth Fischer     <elizabeth.fischer@columbia.edu>  Elizabeth F             <elizabeth.fischer@columbia.edu>
+Elizabeth Fischer     <elizabeth.fischer@columbia.edu>  Elizabeth F             <rpf2116@columbia.edu>
+Elizabeth Fischer     <elizabeth.fischer@columbia.edu>  Elizabeth Fischer       <rpf2116@columbia.edu>
+Elizabeth Fischer     <elizabeth.fischer@columbia.edu>  citibeth                <rpf2116@columbia.edu>
+Geoffrey Oxberry      <oxberry1@llnl.gov>               Geoffrey Oxberry        <goxberry@gmail.com>
+Glenn Johnson         <glenn-johnson@uiowa.edu>         Glenn Johnson           <gjohnson@argon-ohpc.hpc.uiowa.edu>
+Glenn Johnson         <glenn-johnson@uiowa.edu>         Glenn Johnson           <glennpj@gmail.com>
+Gregory Becker        <becker33@llnl.gov>               Gregory Becker          <becker33.llnl.gov>
+Gregory Becker        <becker33@llnl.gov>               becker33                <becker33.llnl.gov>
+Gregory Becker        <becker33@llnl.gov>               becker33                <becker33@llnl.gov>
+Gregory L. Lee        <lee218@llnl.gov>                 Greg Lee                <lee218@llnl.gov>
+Gregory L. Lee        <lee218@llnl.gov>                 Gregory L. Lee          <lee218@cab687.llnl.gov>
+Gregory L. Lee        <lee218@llnl.gov>                 Gregory L. Lee          <lee218@cab690.llnl.gov>
+Gregory L. Lee        <lee218@llnl.gov>                 Gregory L. Lee          <lee218@catalyst159.llnl.gov>
+Gregory L. Lee        <lee218@llnl.gov>                 Gregory L. Lee          <lee218@surface86.llnl.gov>
+Gregory L. Lee        <lee218@llnl.gov>                 Gregory Lee             <lee218@llnl.gov>
+Ian Lee               <lee1001@llnl.gov>                Ian Lee                 <IanLee1521@gmail.com>
+James Wynne III       <wynnejr@ornl.gov>                James Riley Wynne III   <wynnejr@ornl.gov>
+James Wynne III       <wynnejr@ornl.gov>                James Wynne III         <wynnejr@gpujake.com>
+Joachim Protze        <protze@rz.rwth-aachen.de>        jprotze                 <protze@rz.rwth-aachen.de>
+Kelly (KT) Thompson   <kgt@lanl.gov>                                            <kellyt@MENE.localdomain>
+Kelly (KT) Thompson   <kgt@lanl.gov>                    Kelly Thompson          <KineticTheory@users.noreply.github.com>
+Kevin Brandstatter    <kjbrandstatter@gmail.com>        Kevin Brandstatter      <kbrandst@hawk.iit.edu>
+Luc Jaulmes           <luc.jaulmes@bsc.es>              Luc Jaulmes             <jaulmes1@llnl.gov>
+Mario Melara          <maamelara@gmail.com>             Mario Melara            <mamelara@genepool1.nersc.gov>
+Mark Miller           <miller86@llnl.gov>               miller86                <miller86@llnl.gov>
+Massimiliano Culpo    <massimiliano.culpo@epfl.ch>      Massimiliano Culpo      <massimiliano.culpo@googlemail.com>
+Massimiliano Culpo    <massimiliano.culpo@epfl.ch>      alalazo                 <massimiliano.culpo@googlemail.com>
+Mayeul d'Avezac       <m.davezac@ucl.ac.uk>             Mayeul d'Avezac         <mdavezac@gmail.com>
+Mitchell Devlin       <mitchell.r.devlin@gmail.com>     Mitchell Devlin         <devlin@blogin4.lcrc.anl.gov>
+Nicolas Richart       <nicolas.richart@epfl.ch>         Nicolas                 <nrichart@users.noreply.github.com>
+Nicolas Richart       <nicolas.richart@epfl.ch>         Nicolas Richart         <nrichart@users.noreply.github.com>
+Peter Scheibel        <scheibel1@llnl.gov>              scheibelp               <scheibel1@llnl.gov>
+Robert D. French      <frenchrd@ornl.gov>               Robert D. French        <robert@robertdfrench.me>
+Robert D. French      <frenchrd@ornl.gov>               Robert.French           <frenchrd@ornl.gov>
+Robert D. French      <frenchrd@ornl.gov>               robertdfrench           <frenchrd@ornl.gov>
+Saravan Pantham       <saravan.pantham@gmail.com>       Saravan Pantham         <pantham1@surface86.llnl.gov>
+Stephen Herbein       <sherbein@udel.edu>               Stephen Herbein         <stephen272@gmail.com>
+Todd Gamblin          <tgamblin@llnl.gov>               George Todd Gamblin     <gamblin2@llnl.gov>
+Todd Gamblin          <tgamblin@llnl.gov>               Todd Gamblin            <gamblin2@llnl.gov>
+Tom Scogland          <tscogland@llnl.gov>              Tom Scogland            <scogland1@llnl.gov>
+Tom Scogland          <tscogland@llnl.gov>              Tom Scogland            <tom.scogland@gmail.com>
+Tzanio Kolev          <tzanio@llnl.gov>                 Tzanio                  <tzanio@llnl.gov>
diff --git a/.travis.yml b/.travis.yml
index 7961133c1a59bed8bff1fbb034217086c88d7e69..a1f21f5538d09046d18edf6cdd9538e7fb5b4e01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@ python:
   - 2.7
 
 env:
-  - TEST_SUITE=unit
+  - TEST_SUITE=unit CYAML=true
+  - TEST_SUITE=unit CYAML=false
   - TEST_SUITE=flake8
   - TEST_SUITE=doc
 
@@ -24,6 +25,7 @@ addons:
   apt:
     packages:
       - graphviz
+      - libyaml-dev
 
 # Install various dependencies
 install:
@@ -31,6 +33,7 @@ install:
   - pip install flake8
   - pip install sphinx
   - pip install mercurial
+  - if [[ $CYAML == true ]]; then pip install --global-option "--with-libyaml" pyyaml; fi
 
 before_script:
   # Need this for the git tests to succeed.
@@ -43,7 +46,7 @@ before_script:
 script: share/spack/qa/run-$TEST_SUITE-tests
 
 after_success:
-  - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi
+  - if [[ $TEST_SUITE == unit && $CYAML == false && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi
 
 notifications:
   email:
diff --git a/README.md b/README.md
index ec2da3934ec373f55a6de8efe9e5280da89401a3..853e071fc6e18970e0fffc80269723359e00c204 100644
--- a/README.md
+++ b/README.md
@@ -63,17 +63,11 @@ Contributing to Spack is relatively easy.  Just send us a
 When you send your request, make ``develop`` the destination branch on the
 [Spack repository](https://github.com/LLNL/spack).
 
-Before you send a PR, your code should pass the following checks:
-
-* Your contribution will need to pass the `spack test` command.
-  Run this before submitting your PR.
-
-* Also run the `share/spack/qa/run-flake8-tests` script to check for PEP8 compliance.
-  To encourage contributions and readability by a broad audience,
-  Spack uses the [PEP8](https://www.python.org/dev/peps/pep-0008/) coding
-  standard with [a few exceptions](https://github.com/LLNL/spack/blob/develop/.flake8).
-
+Your PR must pass Spack's unit tests and documentation tests, and must be
+[PEP 8](https://www.python.org/dev/peps/pep-0008/) compliant.
 We enforce these guidelines with [Travis CI](https://travis-ci.org/LLNL/spack).
+To run these tests locally, and for helpful tips on git, see our
+[Contribution Guide](http://spack.readthedocs.io/en/latest/contribution_guide.html).
 
 Spack uses a rough approximation of the [Git
 Flow](http://nvie.com/posts/a-successful-git-branching-model/)
diff --git a/bin/spack b/bin/spack
index dcc25c5c83c7df065f27758b26b7db3f5855a00d..29991c070dd660bce7dd8adee4a6227d96a8ccbf 100755
--- a/bin/spack
+++ b/bin/spack
@@ -40,6 +40,16 @@ SPACK_PREFIX = os.path.dirname(os.path.dirname(SPACK_FILE))
 # Allow spack libs to be imported in our scripts
 SPACK_LIB_PATH = os.path.join(SPACK_PREFIX, "lib", "spack")
 sys.path.insert(0, SPACK_LIB_PATH)
+
+# Try to use system YAML if it is available, as it might have libyaml
+# support (for faster loading via C).  Load it before anything in
+# lib/spack/external so it will take precedence over Spack's PyYAML.
+try:
+    import yaml
+except ImportError:
+    pass   # ignore and use slow yaml
+
+# Add external libs
 SPACK_EXTERNAL_LIBS = os.path.join(SPACK_LIB_PATH, "external")
 sys.path.insert(0, SPACK_EXTERNAL_LIBS)
 
@@ -161,7 +171,7 @@ def main():
     # If the user asked for it, don't check ssl certs.
     if args.insecure:
         tty.warn("You asked for --insecure. Will NOT check SSL certificates.")
-        spack.curl.add_default_arg('-k')
+        spack.insecure = True
 
     # Try to load the particular command asked for and run it
     command = spack.cmd.get_command(args.command.replace('-', '_'))
diff --git a/lib/spack/docs/basic_usage.rst b/lib/spack/docs/basic_usage.rst
index bbedfff3fc73d8de9046ed027c8231925a760d40..878f0df0dd28a9272df25267b45c7cd20872e2f1 100644
--- a/lib/spack/docs/basic_usage.rst
+++ b/lib/spack/docs/basic_usage.rst
@@ -39,27 +39,18 @@ Spack can install:
 
 .. command-output:: spack list
 
-The packages are listed by name in alphabetical order.  If you specify a
-pattern to match, it will follow this set of rules.  A pattern with no
-wildcards, ``*`` or ``?``, will be treated as though it started and ended with
-``*``, so ``util`` is equivalent to ``*util*``.  A pattern with no capital
-letters will be treated as case-insensitive. You can also add the ``-i`` flag
-to specify a case insensitive search, or ``-d`` to search the description of
+The packages are listed by name in alphabetical order.
+A pattern to match with no wildcards, ``*`` or ``?``,
+will be treated as though it started and ended with
+``*``, so ``util`` is equivalent to ``*util*``.  All patterns will be treated
+as case-insensitive. You can also add the ``-d`` to search the description of
 the package in addition to the name.  Some examples:
 
-All packages whose names contain "sql" case insensitive:
+All packages whose names contain "sql":
 
 .. command-output:: spack list sql
 
-All packages whose names start with a capital M:
-
-.. command-output:: spack list 'M*'
-
-All packages whose names or descriptions contain Documentation:
-
-.. command-output:: spack list --search-description Documentation
-
-All packages whose names contain documentation case insensitive:
+All packages whose names or descriptions contain documentation:
 
 .. command-output:: spack list --search-description documentation
 
@@ -1333,6 +1324,41 @@ load two or more versions of the same software at the same time.
 .. note::
    The ``conflict`` option is ``tcl`` specific
 
+The names of environment modules generated by spack are not always easy to
+fully comprehend due to the long hash in the name. There are two module
+configuration options to help with that. The first is a global setting to
+adjust the hash length. It can be set anywhere from 0 to 32 and has a default
+length of 7. This is the representation of the hash in the module file name and
+does not affect the size of the package hash. Be aware that the smaller the
+hash length the more likely naming conflicts will occur. The following snippet
+shows how to set hash length in the module file names:
+
+.. code-block:: yaml
+
+   modules:
+     tcl:
+       hash_length: 7
+
+To help make module names more readable, and to help alleviate name conflicts
+with a short hash, one can use the ``suffixes`` option in the modules
+configuration file. This option will add strings to modules that match a spec.
+For instance, the following config options,
+
+.. code-block:: yaml
+
+   modules:
+     tcl:
+       all:
+         suffixes:
+           ^python@2.7.12: 'python-2.7.12'
+           ^openblas: 'openblas'
+
+will add a ``python-2.7.12`` version string to any packages compiled with
+python matching the spec, ``python@2.7.12``. This is useful to know which
+version of python a set of python extensions is associated with. Likewise, the
+``openblas`` string is attached to any program that has openblas in the spec,
+most likely via the ``+blas`` variant specification.  
+
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 Regenerating Module files
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/lib/spack/docs/contribution_guide.rst b/lib/spack/docs/contribution_guide.rst
index 108b23a6d0b600904adf0c25edb3b8fdcd30e1cc..ebfab854d526fdd96b3018a1f2a7c717c9a3357e 100644
--- a/lib/spack/docs/contribution_guide.rst
+++ b/lib/spack/docs/contribution_guide.rst
@@ -1,247 +1,521 @@
 .. _contribution-guide:
 
+==================
 Contribution Guide
-=====================
+==================
 
 This guide is intended for developers or administrators who want to
 contribute a new package, feature, or bugfix to Spack.
 It assumes that you have at least some familiarity with Git VCS and Github.
-The guide will show a few examples of contributing workflow and discuss
-the granularity of pull-requests (PRs).
+The guide will show a few examples of contributing workflows and discuss
+the granularity of pull-requests (PRs). It will also discuss the tests your
+PR must pass in order to be accepted into Spack.
 
 First, what is a PR? Quoting `Bitbucket's tutorials <https://www.atlassian.com/git/tutorials/making-a-pull-request/>`_:
 
-  Pull requests are a mechanism for a developer to notify team members that they have **completed a feature**.
-  The pull request is more than just a notification—it’s a dedicated forum for discussing the proposed feature
+  Pull requests are a mechanism for a developer to notify team members that
+  they have **completed a feature**. The pull request is more than just a
+  notification—it’s a dedicated forum for discussing the proposed feature.
 
-Important is completed feature, i.e. the changes one propose in a PR should
+Important is **completed feature**. The changes one proposes in a PR should
 correspond to one feature/bugfix/extension/etc. One can create PRs with
 changes relevant to different ideas, however reviewing such PRs becomes tedious
-and error prone. If possible, try to follow the rule **one-PR-one-package/feature.**
+and error prone. If possible, try to follow the **one-PR-one-package/feature** rule.
 
-Spack uses a rough approximation of the `Git Flow <http://nvie.com/posts/a-successful-git-branching-model/>`_ branching
-model. The develop branch contains the latest contributions, and master is
-always tagged and points to the latest stable release. Thereby when you send
-your request, make ``develop`` the destination branch on the
+Spack uses a rough approximation of the `Git Flow <http://nvie.com/posts/a-successful-git-branching-model/>`_
+branching model. The develop branch contains the latest contributions, and
+master is always tagged and points to the latest stable release. Therefore, when
+you send your request, make ``develop`` the destination branch on the
 `Spack repository <https://github.com/LLNL/spack>`_.
 
-Let's assume that the current (patched) state of your fork of Spack is only
-relevant to yourself. Now you come across a bug in a package or would like to
-extend a package and contribute this fix to Spack. It is important that
-whenever you change something that might be of importance upstream,
-create a pull-request (PR) as soon as possible. Do not wait for weeks/months to
-do this: a) you might forget why did you modified certain files; b) it could get
-difficult to isolate this change into a stand-alone clean PR.
+----------------------
+Continuous Integration
+----------------------
 
-Now let us discuss several approaches one may use to submit a PR while
-also keeping your local version of Spack patched.
+Spack uses `Travis CI <https://travis-ci.org/LLNL/spack>`_ for Continuous Integration
+testing. This means that every time you submit a pull request, a series of tests will
+be run to make sure you didn't accidentally introduce any bugs into Spack. Your PR
+will not be accepted until it passes all of these tests. While you can certainly wait
+for the results of these tests after submitting a PR, we recommend that you run them
+locally to speed up the review process.
 
+If you take a look in ``$SPACK_ROOT/.travis.yml``, you'll notice that we test
+against Python 2.6 and 2.7. We currently perform 3 types of tests:
 
-First approach (cherry-picking):
---------------------------------
+^^^^^^^^^^
+Unit Tests
+^^^^^^^^^^
 
-First approach is as follows.
-You checkout your local develop branch, which for the purpose of this guide
-will be called ``develop_modified``:
+Unit tests ensure that core Spack features like fetching or spec resolution are
+working as expected. If your PR only adds new packages or modifies existing ones,
+there's very little chance that your changes could cause the unit tests to fail.
+However, if you make changes to Spack's core libraries, you should run the unit
+tests to make sure you didn't break anything.
+
+Since they test things like fetching from VCS repos, the unit tests require
+`git <https://git-scm.com/>`_, `mercurial <https://www.mercurial-scm.org/>`_,
+and `subversion <https://subversion.apache.org/>`_ to run. Make sure these are
+installed on your system and can be found in your ``PATH``. All of these can be
+installed with Spack or with your system package manager.
+
+To run *all* of the unit tests, use:
 
 .. code-block:: console
 
-  $ git checkout develop_modified
+   $ spack test
 
-Let us assume that lines in files you will be modifying
-are the same in `develop_modified` branch and upstream ``develop``.
-Next edit files, make sure they work for you and create a commit
+These tests may take several minutes to complete. If you know you are only
+modifying a single Spack feature, you can run a single unit test at a time:
 
 .. code-block:: console
 
-  $ git add <files_to_be_commited>
-  $ git commit -m <descriptive note about changes>
+   $ spack test architecture
 
-Normally we prefer that commits pertaining to a package ``<package-name>``` have
-a message ``<package-name>: descriptive message``. It is important to add
-descriptive message so that others, who might be looking at your changes later
-(in a year or maybe two), would understand the rationale behind.
+This allows you to develop iteratively: make a change, test that change, make
+another change, test that change, etc. To get a list of all available unit
+tests, run:
+
+.. command-output:: spack test --list
+
+Unit tests are crucial to making sure bugs aren't introduced into Spack. If you
+are modifying core Spack libraries or adding new functionality, please consider
+adding new unit tests or strengthening existing tests.
+
+.. note::
+
+   There is also a ``run-unit-tests`` script in ``share/spack/qa`` that runs the
+   unit tests. Afterwards, it reports back to Coverage with the percentage of Spack
+   that is covered by unit tests. This script is designed for Travis CI. If you
+   want to run the unit tests yourself, we suggest you use ``spack test``.
+
+^^^^^^^^^^^^
+Flake8 Tests
+^^^^^^^^^^^^
+
+Spack uses `Flake8 <http://flake8.pycqa.org/en/latest/>`_ to test for
+`PEP 8 <https://www.python.org/dev/peps/pep-0008/>`_ conformance. PEP 8 is
+a series of style guides for Python that provide suggestions for everything
+from variable naming to indentation. In order to limit the number of PRs that
+were mostly style changes, we decided to enforce PEP 8 conformance. Your PR
+needs to comply with PEP 8 in order to be accepted.
+
+Testing for PEP 8 compliance is easy. Simply add the quality assurance
+directory to your ``PATH`` and run the flake8 script:
+
+.. code-block:: console
+
+   $ export PATH+=":$SPACK_ROOT/share/spack/qa"
+   $ run-flake8-tests
 
+``run-flake8-tests`` has a couple advantages over running ``flake8`` by hand:
 
-Next we will create a branch off upstream's ``develop`` and copy this commit.
-Before doing this, while still on your modified branch, get the hash of the
-last commit
+#. It only tests files that you have modified since branching off of develop.
+
+#. It works regardless of what directory you are in.
+
+#. It automatically adds approved exemptions from the flake8 checks. For example,
+   URLs are often longer than 80 characters, so we exempt them from the line
+   length checks. We also exempt lines that start with "homepage", "url", "version",
+   "variant", "depends_on", and "extends" in the ``package.py`` files.
+
+More approved flake8 exemptions can be found
+`here <https://github.com/LLNL/spack/blob/develop/.flake8>`_.
+
+If all is well, you'll see something like this:
 
 .. code-block:: console
 
-  $ git log -1
+   $ run-flake8-tests
+   Dependencies found.
+   =======================================================
+   flake8: running flake8 code checks on spack.
 
-and copy-paste this ``<hash>`` to the buffer. Now switch to upstream's ``develop``,
-make sure it's updated, checkout the new branch, apply the patch and push to
-GitHub:
+   Modified files:
+
+     var/spack/repos/builtin/packages/hdf5/package.py
+     var/spack/repos/builtin/packages/hdf/package.py
+     var/spack/repos/builtin/packages/netcdf/package.py
+   =======================================================
+   Flake8 checks were clean.
+
+However, if you aren't compliant with PEP 8, flake8 will complain:
 
 .. code-block:: console
 
-  $ git checkout develop
-  $ git pull upstream develop
-  $ git checkout -b <descriptive_branch_name>
-  $ git cherry-pick <hash>
-  $ git push <your_origin> <descriptive_branch_name> -u
+   var/spack/repos/builtin/packages/netcdf/package.py:26: [F401] 'os' imported but unused
+   var/spack/repos/builtin/packages/netcdf/package.py:61: [E303] too many blank lines (2)
+   var/spack/repos/builtin/packages/netcdf/package.py:106: [E501] line too long (92 > 79 characters)
+   Flake8 found errors.
 
-Here we assume that local ``develop`` branch tracks upstream develop branch of
-Spack. This is not a requirement and you could also do the same with remote
-branches. Yet to some it is more convenient to have a local branch that
-tracks upstream.
+Most of the error messages are straightforward, but if you don't understand what
+they mean, just ask questions about them when you submit your PR. The line numbers
+will change if you add or delete lines, so simply run ``run-flake8-tests`` again
+to update them.
 
-Now you can create a PR from web-interface of GitHub. The net result is as
-follows:
+.. tip::
 
-#. You patched your local version of Spack and can use it further
-#. You "cherry-picked" these changes in a stand-alone branch and submitted it
-   as a PR upstream.
+   Try fixing flake8 errors in reverse order. This eliminates the need for
+   multiple runs of ``flake8`` just to re-compute line numbers and makes it
+   much easier to fix errors directly off of the Travis output.
 
+.. warning::
 
-Should you have several commits to contribute, you could follow the same
-procedure by getting hashes of all of them and cherry-picking to the PR branch.
-This could get tedious and therefore there is another way:
+   Flake8 requires setuptools in order to run. If you installed ``py-flake8``
+   with Spack, make sure to add ``py-setuptools`` to your ``PYTHONPATH``.
+   Otherwise, you will get an error message like:
+
+   .. code-block:: console
+
+      Traceback (most recent call last):
+        File: "/usr/bin/flake8", line 5, in <module>
+          from pkg_resources import load_entry_point
+      ImportError: No module named pkg_resources
 
+^^^^^^^^^^^^^^^^^^^
+Documentation Tests
+^^^^^^^^^^^^^^^^^^^
 
-Second approach:
-----------------
+Spack uses `Sphinx <http://www.sphinx-doc.org/en/stable/>`_ to build its
+documentation. In order to prevent things like broken links and missing imports,
+we added documentation tests that build the documentation and fail if there
+are any warning or error messages.
 
-In the second approach we start from upstream ``develop`` (again assuming
-that your local branch `develop` tracks upstream):
+Building the documentation requires several dependencies, all of which can be
+installed with Spack:
+
+* sphinx
+* graphviz
+* git
+* mercurial
+* subversion
+
+.. warning::
+
+   Sphinx has `several required dependencies <https://github.com/LLNL/spack/blob/develop/var/spack/repos/builtin/packages/py-sphinx/package.py>`_.
+   If you installed ``py-sphinx`` with Spack, make sure to add all of these
+   dependencies to your ``PYTHONPATH``. The easiest way to do this is to run
+   ``spack activate py-sphinx`` so that all of the dependencies are symlinked
+   to a central location. If you see an error message like:
+
+   .. code-block:: console
+
+      Traceback (most recent call last):
+        File: "/usr/bin/flake8", line 5, in <module>
+          from pkg_resources import load_entry_point
+      ImportError: No module named pkg_resources
+
+   that means Sphinx couldn't find setuptools in your ``PYTHONPATH``.
+
+Once all of the dependencies are installed, you can try building the documentation:
 
 .. code-block:: console
 
-  $ git checkout develop
-  $ git pull upstream develop
-  $ git checkout -b <descriptive_branch_name>
+   $ cd "$SPACK_ROOT/lib/spack/docs"
+   $ make clean
+   $ make
 
-Next edit a few files and create a few commits by
+If you see any warning or error messages, you will have to correct those before
+your PR is accepted.
+
+.. note::
+
+   There is also a ``run-doc-tests`` script in the Quality Assurance directory.
+   The only difference between running this script and running ``make`` by hand
+   is that the script will exit immediately if it encounters an error or warning.
+   This is necessary for Travis CI. If you made a lot of documentation tests, it
+   is much quicker to run ``make`` by hand so that you can see all of the warnings
+   at once.
+
+If you are editing the documentation, you should obviously be running the
+documentation tests. But even if you are simply adding a new package, your
+changes could cause the documentation tests to fail:
 
 .. code-block:: console
 
-  $ git add <files_to_be_part_of_the_commit>
-  $ git commit -m <descriptive_message_of_this_particular_commit>
+   package_list.rst:8745: WARNING: Block quote ends without a blank line; unexpected unindent.
+
+At first, this error message will mean nothing to you, since you didn't edit
+that file. Until you look at line 8745 of the file in question:
+
+.. code-block:: rst
+
+   Description:
+      NetCDF is a set of software libraries and self-describing, machine-
+     independent data formats that support the creation, access, and sharing
+     of array-oriented scientific data.
+
+Our documentation includes :ref:`a list of all Spack packages <package-list>`.
+If you add a new package, its docstring is added to this page. The problem in
+this case was that the docstring looked like:
 
-Now you can push it to your fork and create a PR
+.. code-block:: python
+
+   class Netcdf(Package):
+       """
+       NetCDF is a set of software libraries and self-describing,
+       machine-independent data formats that support the creation,
+       access, and sharing of array-oriented scientific data.
+       """
+
+Docstrings cannot start with a newline character, or else Sphinx will complain.
+Instead, they should look like:
+
+.. code-block:: python
+
+   class Netcdf(Package):
+       """NetCDF is a set of software libraries and self-describing,
+       machine-independent data formats that support the creation,
+       access, and sharing of array-oriented scientific data."""
+
+Documentation changes can result in much more obfuscated warning messages.
+If you don't understand what they mean, feel free to ask when you submit
+your PR.
+
+-------------
+Git Workflows
+-------------
+
+Spack is still in the beta stages of development. Most of our users run off of
+the develop branch, and fixes and new features are constantly being merged. So
+how do you keep up-to-date with upstream while maintaining your own local
+differences and contributing PRs to Spack?
+
+^^^^^^^^^
+Branching
+^^^^^^^^^
+
+The easiest way to contribute a pull request is to make all of your changes on
+new branches. Make sure your ``develop`` is up-to-date and create a new branch
+off of it:
 
 .. code-block:: console
 
-  $ git push <your_origin> <descriptive_branch_name> -u
+   $ git checkout develop
+   $ git pull upstream develop
+   $ git branch <descriptive_branch_name>
+   $ git checkout <descriptive_branch_name>
+
+Here we assume that the local ``develop`` branch tracks the upstream develop
+branch of Spack. This is not a requirement and you could also do the same with
+remote branches. But for some it is more convenient to have a local branch that
+tracks upstream.
 
-Most likely you would want to have those changes in your (modified) local
-version of Spack. To that end you need to merge this branch
+Normally we prefer that commits pertaining to a package ``<package-name>`` have
+a message ``<package-name>: descriptive message``. It is important to add
+descriptive message so that others, who might be looking at your changes later
+(in a year or maybe two), would understand the rationale behind them.
+
+Now, you can make your changes while keeping the ``develop`` branch pure.
+Edit a few files and commit them by running:
 
 .. code-block:: console
 
-  $ git checkout develop_modified
-  $ git merge <descriptive_branch_name>
+   $ git add <files_to_be_part_of_the_commit>
+   $ git commit --message <descriptive_message_of_this_particular_commit>
 
-The net result is similar to the first approach with a minor difference that
-you would also merge upstream develop into you modified version in the last
-step. Should this not be desirable, you have to follow the first approach.
+Next, push it to your remote fork and create a PR:
 
+.. code-block:: console
 
+   $ git push origin <descriptive_branch_name> --set-upstream
 
-How to clean-up a branch by rewriting history:
------------------------------------------------
+GitHub provides a `tutorial <https://help.github.com/articles/about-pull-requests/>`_
+on how to file a pull request. When you send the request, make ``develop`` the
+destination branch.
 
-Sometimes you may end up on a branch that has a lot of commits, merges of
-upstream branch and alike but it can't be rebased on ``develop`` due to a long
-and convoluted history. If the current commits history is more of an experimental
-nature and only the net result is important, you may rewrite the history.
-To that end you need to first merge upstream `develop` and reset you branch to
-it. So on the branch in question do:
+If you need this change immediately and don't have time to wait for your PR to
+be merged, you can always work on this branch. But if you have multiple PRs,
+another option is to maintain a Frankenstein branch that combines all of your
+other branches:
 
 .. code-block:: console
 
-   $ git merge develop
-   $ git reset develop
+   $ git co develop
+   $ git branch <your_modified_develop_branch>
+   $ git checkout <your_modified_develop_branch>
+   $ git merge <descriptive_branch_name>
 
-At this point you your branch will point to the same commit as develop and
-thereby the two are indistinguishable. However, all the files that were
-previously modified will stay as such. In other words, you do not loose the
-changes you made. Changes can be reviewed by looking at diffs
+This can be done with each new PR you submit. Just make sure to keep this local
+branch up-to-date with upstream ``develop`` too.
+
+^^^^^^^^^^^^^^
+Cherry-Picking
+^^^^^^^^^^^^^^
+
+What if you made some changes to your local modified develop branch and already
+committed them, but later decided to contribute them to Spack? You can use
+cherry-picking to create a new branch with only these commits.
+
+First, check out your local modified develop branch:
 
 .. code-block:: console
 
-   $ git status
-   $ git diff
+   $ git checkout <your_modified_develop_branch>
 
-One can also run GUI to visualize the current changes
+Now, get the hashes of the commits you want from the output of:
 
 .. code-block:: console
 
-   $ git difftool
+   $ git log
 
-Next step is to rewrite the history by adding files and creating commits
+Next, create a new branch off of upstream ``develop`` and copy the commits
+that you want in your PR:
 
 .. code-block:: console
 
-   $ git add <files_to_be_part_of_commit>
-   $ git commit -m <descriptive_message>
+   $ git checkout develop
+   $ git pull upstream develop
+   $ git branch <descriptive_branch_name>
+   $ git checkout <descriptive_branch_name>
+   $ git cherry-pick <hash>
+   $ git push origin <descriptive_branch_name> --set-upstream
 
+Now you can create a PR from the web-interface of GitHub. The net result is as
+follows:
 
-Shall you need to split changes within a file into separate commits, use
+#. You patched your local version of Spack and can use it further.
+#. You "cherry-picked" these changes in a stand-alone branch and submitted it
+   as a PR upstream.
+
+Should you have several commits to contribute, you could follow the same
+procedure by getting hashes of all of them and cherry-picking to the PR branch.
+
+.. note::
+
+   It is important that whenever you change something that might be of
+   importance upstream, create a pull request as soon as possible. Do not wait
+   for weeks/months to do this, because:
+
+   #. you might forget why you modified certain files
+   #. it could get difficult to isolate this change into a stand-alone clean PR.
+
+^^^^^^^^
+Rebasing
+^^^^^^^^
+
+Other developers are constantly making contributions to Spack, possibly on the
+same files that your PR changed. If their PR is merged before yours, it can
+create a merge conflict. This means that your PR can no longer be automatically
+merged without a chance of breaking your changes. In this case, you will be
+asked to rebase on top of the latest upstream ``develop``.
+
+First, make sure your develop branch is up-to-date:
 
 .. code-block:: console
 
-   $ git add <file> -p
+   $ git checkout develop
+   $ git pull upstream develop
 
-After all changed files are committed, you can push the branch to your fork
-and create a PR
+Now, we need to switch to the branch you submitted for your PR and rebase it
+on top of develop:
+
+.. code-block:: console
+
+   $ git checkout <descriptive_branch_name>
+   $ git rebase develop
+
+Git will likely ask you to resolve conflicts. Edit the file that it says can't
+be merged automatically and resolve the conflict. Then, run:
 
 .. code-block:: console
 
-   $ git push <you_origin> -u
+   $ git add <file_that_could_not_be_merged>
+   $ git rebase --continue
 
+You may have to repeat this process multiple times until all conflicts are resolved.
+Once this is done, simply force push your rebased branch to your remote fork:
 
+.. code-block:: console
 
-How to fix a bad rebase by "cherry-picking" commits:
-----------------------------------------------------
+   $ git push --force origin <descriptive_branch_name>
 
-Say you are working on a branch ``feature1``. It has several commits and is
-ready to be merged. However, there are a few minor merge conflicts and so
-you are asked to rebase onto ``develop`` upstream branch. Occasionally, it
-happens so that a contributor rebases not on top of the upstream branch, but
-on his/her local outdated copy of it. This would lead to an inclusion of the
-whole lot of duplicated history and of course can not be merged as-is.
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Rebasing with cherry-pick
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
-One way to get out of troubles is to ``cherry-pick`` important commits. To
-do that, first checkout a temporary back-up branch:
+You can also perform a rebase using ``cherry-pick``. First, create a temporary
+backup branch:
 
 .. code-block:: console
 
-  git checkout -b tmp
+   $ git checkout <descriptive_branch_name>
+   $ git branch tmp
 
-Now look at logs and save hashes of commits you would like to keep
+If anything goes wrong, you can always go back to your ``tmp`` branch.
+Now, look at the logs and save the hashes of any commits you would like to keep:
 
 .. code-block:: console
 
-  git log
+   $ git log
 
 Next, go back to the original branch and reset it to ``develop``.
 Before doing so, make sure that you local ``develop`` branch is up-to-date
-with the upstream.
+with upstream:
+
+.. code-block:: console
+
+   $ git checkout develop
+   $ git pull upstream develop
+   $ git checkout <descriptive_branch_name>
+   $ git reset --hard develop
+
+Now you can cherry-pick relevant commits:
+
+.. code-block:: console
+
+   $ git cherry-pick <hash1>
+   $ git cherry-pick <hash2>
+
+Push the modified branch to your fork:
 
 .. code-block:: console
 
-  git checkout feature1
-  git reset --hard develop
+   $ git push --force origin <descriptive_branch_name>
 
-Now you can cherry-pick relevant commits
+If everything looks good, delete the backup branch:
 
 .. code-block:: console
 
-  git cherry-pick  <hash1>
-  git cherry-pick  <hash2>
+   $ git branch --delete --force tmp
+
+^^^^^^^^^^^^^^^^^^
+Re-writing History
+^^^^^^^^^^^^^^^^^^
 
+Sometimes you may end up on a branch that has diverged so much from develop
+that it cannot easily be rebased. If the current commits history is more of
+an experimental nature and only the net result is important, you may rewrite
+the history.
 
-push the modified branch to your fork
+First, merge upstream ``develop`` and reset you branch to it. On the branch
+in question, run:
 
 .. code-block:: console
 
-  git push -f
+   $ git merge develop
+   $ git reset develop
 
-and if everything looks good, delete the back-up:
+At this point your branch will point to the same commit as develop and
+thereby the two are indistinguishable. However, all the files that were
+previously modified will stay as such. In other words, you do not lose the
+changes you made. Changes can be reviewed by looking at diffs:
 
 .. code-block:: console
 
-  git branch -D tmp
+   $ git status
+   $ git diff
+
+The next step is to rewrite the history by adding files and creating commits:
+
+.. code-block:: console
+
+   $ git add <files_to_be_part_of_commit>
+   $ git commit --message <descriptive_message>
+
+After all changed files are committed, you can push the branch to your fork
+and create a PR:
+
+.. code-block:: console
+
+   $ git push origin --set-upstream
+
diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst
index 155bbcdb084cc174f12f82634a14b004ab6485c8..efd4c459a204cc236e843f69d60e3a5f3d2fe08b 100644
--- a/lib/spack/docs/packaging_guide.rst
+++ b/lib/spack/docs/packaging_guide.rst
@@ -3004,13 +3004,18 @@ Cleans up all of Spack's temporary and cached files.  This can be used to
 recover disk space if temporary files from interrupted or failed installs
 accumulate in the staging area.
 
-When called with ``--stage`` or ``--all`` (or without arguments, in which case
-the default is ``--all``) this removes all staged files; this is equivalent to
-running ``spack clean`` for every package you have fetched or staged.
+When called with ``--stage`` or without arguments this removes all staged
+files and will be equivalent to running ``spack clean`` for every package
+you have fetched or staged.
 
-When called with ``--cache`` or ``--all`` this will clear all resources
+When called with ``--downloads`` this will clear all resources
 :ref:`cached <caching>` during installs.
 
+When called with ``--user-cache`` this will remove caches in the user home
+directory, including cached virtual indices.
+
+To remove all of the above, the command can be called with ``--all``.
+
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Keeping the stage directory on success
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index c9c29a32cc277142c06ce8975527ef98f6857c4c..c7d592befb7ecf80bea8f4056acce79ae7f63467 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -129,8 +129,9 @@
 # User's editor from the environment
 editor = Executable(os.environ.get("EDITOR", "vi"))
 
-# Curl tool for fetching files.
-curl = which("curl", required=True)
+# If this is enabled, tools that use SSL should not verify
+# certifiates. e.g., curl should use the -k option.
+insecure = False
 
 # Whether to build in tmp space or directly in the stage_path.
 # If this is true, then spack will make stage directories in
diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index 57e266722e6da1494f3636651b392617c6507e36..b14de35109e0939df612c554e349103843e73b85 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -83,7 +83,6 @@
 import llnl.util.tty as tty
 
 import spack
-import spack.compilers
 from spack.util.naming import mod_to_class
 from spack.util.environment import get_path
 from spack.util.multiproc import parmap
@@ -276,6 +275,8 @@ def find_compilers(self, *paths):
         # Once the paths are cleaned up, do a search for each type of
         # compiler.  We can spawn a bunch of parallel searches to reduce
         # the overhead of spelunking all these directories.
+        # NOTE: we import spack.compilers here to avoid init order cycles
+        import spack.compilers
         types = spack.compilers.all_compiler_types()
         compiler_lists = parmap(lambda cmp_cls:
                                 self.find_compiler(cmp_cls, *filtered_path),
diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index 98fb3b69176db14aad4c482e914bb75c67a1f7db..7579f9adc6b06d420256164292d82b1c04995491 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -221,6 +221,8 @@ def set_compiler_environment_variables(pkg, env):
     for mod in compiler.modules:
         load_module(mod)
 
+    compiler.setup_custom_environment(env)
+
     return env
 
 
diff --git a/lib/spack/spack/cmd/config.py b/lib/spack/spack/cmd/config.py
index c189e37036b50cea6116f0daad6f8f99aa7c05d2..5e041192e299b68e19425837a94fa61f44a6f9b4 100644
--- a/lib/spack/spack/cmd/config.py
+++ b/lib/spack/spack/cmd/config.py
@@ -29,13 +29,8 @@
 
 def setup_parser(subparser):
     # User can only choose one
-    scope_group = subparser.add_mutually_exclusive_group()
-    scope_group.add_argument(
-        '--user', action='store_const', const='user', dest='scope',
-        help="Use config file in user home directory (default).")
-    scope_group.add_argument(
-        '--site', action='store_const', const='site', dest='scope',
-        help="Use config file in spack prefix.")
+    subparser.add_argument('--scope', choices=spack.config.config_scopes,
+                           help="Configuration scope to read/modify.")
 
     sp = subparser.add_subparsers(metavar='SUBCOMMAND', dest='config_command')
 
diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py
index aa7c42def0428444be7ee930596380b45ee023f6..741a320ea789ce4a074e4a273536105fa60d7649 100644
--- a/lib/spack/spack/cmd/create.py
+++ b/lib/spack/spack/cmd/create.py
@@ -116,6 +116,10 @@ def install(self, spec, prefix):
     # FIXME: Add additional dependencies if required.
     depends_on('scons', type='build')""",
 
+    'bazel': """\
+    # FIXME: Add additional dependencies if required.
+    depends_on('bazel', type='build')""",
+
     'python': """\
     extends('python')
 
@@ -164,6 +168,10 @@ def install(self, spec, prefix):
         scons('prefix={0}'.format(prefix))
         scons('install')""",
 
+    'bazel': """\
+        # FIXME: Add logic to build and install here.
+        bazel()""",
+
     'python': """\
         # FIXME: Add logic to build and install here.
         setup_py('install', '--prefix={0}'.format(prefix))""",
@@ -238,7 +246,8 @@ def __call__(self, stage, url):
             (r'/CMakeLists.txt$', 'cmake'),
             (r'/SConstruct$',     'scons'),
             (r'/setup.py$',       'python'),
-            (r'/NAMESPACE$',      'R')
+            (r'/NAMESPACE$',      'R'),
+            (r'/WORKSPACE$',      'bazel')
         ]
 
         # Peek inside the compressed file.
diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py
index cc9b6c73ee99aaa85842ecb136872e30c950cb69..6ca75d7999a95571ee84dc431650bac4516356d3 100644
--- a/lib/spack/spack/cmd/install.py
+++ b/lib/spack/spack/cmd/install.py
@@ -34,12 +34,15 @@
 
 def setup_parser(subparser):
     subparser.add_argument(
-        '-i', '--ignore-dependencies', action='store_true', dest='ignore_deps',
-        help="Do not try to install dependencies of requested packages.")
-    subparser.add_argument(
-        '-d', '--dependencies-only', action='store_true', dest='deps_only',
-        help='Install dependencies of this package, ' +
-        'but not the package itself.')
+        '--only',
+        default='package,dependencies',
+        dest='things_to_install',
+        choices=['package', 'dependencies', 'package,dependencies'],
+        help="""Select the mode of installation.
+The default is to install the package along with all its dependencies.
+Alternatively one can decide to install only the package or only
+the dependencies."""
+    )
     subparser.add_argument(
         '-j', '--jobs', action='store', type=int,
         help="Explicitly set number of make jobs.  Default is #cpus.")
@@ -62,18 +65,17 @@ def setup_parser(subparser):
         '--dirty', action='store_true', dest='dirty',
         help="Install a package *without* cleaning the environment.")
     subparser.add_argument(
-        '--stop-at', help="Stop at a particular phase of installation"
+        'package',
+        nargs=argparse.REMAINDER,
+        help="spec of the package to install"
     )
-    subparser.add_argument(
-        'packages', nargs=argparse.REMAINDER,
-        help="specs of packages to install")
     subparser.add_argument(
         '--run-tests', action='store_true', dest='run_tests',
         help="Run tests during installation of a package.")
 
 
 def install(parser, args):
-    if not args.packages:
+    if not args.package:
         tty.die("install requires at least one package argument")
 
     if args.jobs is not None:
@@ -83,19 +85,33 @@ def install(parser, args):
     if args.no_checksum:
         spack.do_checksum = False        # TODO: remove this global.
 
-    specs = spack.cmd.parse_specs(args.packages, concretize=True)
-    for spec in specs:
+    # Parse cli arguments and construct a dictionary
+    # that will be passed to Package.do_install API
+    kwargs = {
+        'keep_prefix': args.keep_prefix,
+        'keep_stage': args.keep_stage,
+        'install_deps': 'dependencies' in args.things_to_install,
+        'make_jobs': args.jobs,
+        'run_tests': args.run_tests,
+        'verbose': args.verbose,
+        'fake': args.fake,
+        'dirty': args.dirty
+    }
+
+    # Spec from cli
+    specs = spack.cmd.parse_specs(args.package, concretize=True)
+    if len(specs) != 1:
+        tty.error('only one spec can be installed at a time.')
+    spec = specs.pop()
+
+    if args.things_to_install == 'dependencies':
+        # Install dependencies as-if they were installed
+        # for root (explicit=False in the DB)
+        kwargs['explicit'] = False
+        for s in spec.dependencies():
+            p = spack.repo.get(s)
+            p.do_install(**kwargs)
+    else:
         package = spack.repo.get(spec)
-        package.do_install(
-            keep_prefix=args.keep_prefix,
-            keep_stage=args.keep_stage,
-            install_deps=not args.ignore_deps,
-            install_self=not args.deps_only,
-            make_jobs=args.jobs,
-            run_tests=args.run_tests,
-            verbose=args.verbose,
-            fake=args.fake,
-            dirty=args.dirty,
-            explicit=True,
-            stop_at=args.stop_at
-        )
+        kwargs['explicit'] = True
+        package.do_install(**kwargs)
diff --git a/lib/spack/spack/cmd/test_install.py b/lib/spack/spack/cmd/test_install.py
index c35f2740a075646995a6f6fa22aefd03c4141fe1..f962c5988a9da9bf5eee0adca20fd0490566910c 100644
--- a/lib/spack/spack/cmd/test_install.py
+++ b/lib/spack/spack/cmd/test_install.py
@@ -181,7 +181,6 @@ def install_single_spec(spec, number_of_jobs):
         package.do_install(keep_prefix=False,
                            keep_stage=True,
                            install_deps=True,
-                           install_self=True,
                            make_jobs=number_of_jobs,
                            verbose=True,
                            fake=False)
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index a77991e4dc6990615649de46f9c56a224a9f3fd7..fc663ea646233ac0441cafc25911737e921296da 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -114,9 +114,15 @@ def fc_rpath_arg(self):
 
     def __init__(self, cspec, operating_system,
                  paths, modules=[], alias=None, **kwargs):
+        self.operating_system = operating_system
+        self.spec = cspec
+        self.modules = modules
+        self.alias = alias
+
         def check(exe):
             if exe is None:
                 return None
+            exe = self._find_full_path(exe)
             _verify_executables(exe)
             return exe
 
@@ -138,11 +144,6 @@ def check(exe):
             if value is not None:
                 self.flags[flag] = value.split()
 
-        self.operating_system = operating_system
-        self.spec = cspec
-        self.modules = modules
-        self.alias = alias
-
     @property
     def version(self):
         return self.spec.version
@@ -269,6 +270,21 @@ def check(key):
         successful.reverse()
         return dict(((v, p, s), path) for v, p, s, path in successful)
 
+    def _find_full_path(self, path):
+        """Return the actual path for a tool.
+
+        Some toolchains use forwarding executables (particularly Xcode-based
+        toolchains) which can be manipulated by external environment variables.
+        This method should be used to extract the actual path used for a tool
+        by finding out the end executable the forwarding executables end up
+        running.
+        """
+        return path
+
+    def setup_custom_environment(self, env):
+        """Set any environment variables necessary to use the compiler."""
+        pass
+
     def __repr__(self):
         """Return a string representation of the compiler toolchain."""
         return self.__str__()
diff --git a/lib/spack/spack/compilers/clang.py b/lib/spack/spack/compilers/clang.py
index f7f1bf106bbc834017a673de0fc92640f6f079b0..34eec4ea7be9c640c465270694d97dda3aae8835 100644
--- a/lib/spack/spack/compilers/clang.py
+++ b/lib/spack/spack/compilers/clang.py
@@ -23,11 +23,14 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 import re
+import os
+import spack
 import spack.compiler as cpr
 from spack.compiler import *
 from spack.util.executable import *
 import llnl.util.tty as tty
 from spack.version import ver
+from shutil import copytree, ignore_patterns
 
 
 class Clang(Compiler):
@@ -107,3 +110,79 @@ def default_version(cls, comp):
             cpr._version_cache[comp] = ver
 
         return cpr._version_cache[comp]
+
+    def _find_full_path(self, path):
+        basename = os.path.basename(path)
+
+        if not self.is_apple or basename not in ('clang', 'clang++'):
+            return super(Clang, self)._find_full_path(path)
+
+        xcrun = Executable('xcrun')
+        full_path = xcrun('-f', basename, output=str)
+        return full_path.strip()
+
+    def setup_custom_environment(self, env):
+        """Set the DEVELOPER_DIR environment for the Xcode toolchain.
+
+        On macOS, not all buildsystems support querying CC and CXX for the
+        compilers to use and instead query the Xcode toolchain for what
+        compiler to run. This side-steps the spack wrappers. In order to inject
+        spack into this setup, we need to copy (a subset of) Xcode.app and
+        replace the compiler executables with symlinks to the spack wrapper.
+        Currently, the stage is used to store the Xcode.app copies. We then set
+        the 'DEVELOPER_DIR' environment variables to cause the xcrun and
+        related tools to use this Xcode.app.
+        """
+        super(Clang, self).setup_custom_environment(env)
+
+        if not self.is_apple:
+            return
+
+        xcode_select = Executable('xcode-select')
+        real_root = xcode_select('--print-path', output=str).strip()
+        real_root = os.path.dirname(os.path.dirname(real_root))
+        developer_root = os.path.join(spack.stage_path,
+                                      'xcode-select',
+                                      self.name,
+                                      str(self.version))
+        xcode_link = os.path.join(developer_root, 'Xcode.app')
+
+        if not os.path.exists(developer_root):
+            tty.warn('Copying Xcode from %s to %s in order to add spack '
+                     'wrappers to it. Please do not interrupt.'
+                     % (real_root, developer_root))
+
+            # We need to make a new Xcode.app instance, but with symlinks to
+            # the spack wrappers for the compilers it ships. This is necessary
+            # because some projects insist on just asking xcrun and related
+            # tools where the compiler runs. These tools are very hard to trick
+            # as they do realpath and end up ignoring the symlinks in a
+            # "softer" tree of nothing but symlinks in the right places.
+            copytree(real_root, developer_root, symlinks=True,
+                     ignore=ignore_patterns('AppleTV*.platform',
+                                            'Watch*.platform',
+                                            'iPhone*.platform',
+                                            'Documentation',
+                                            'swift*'))
+
+            real_dirs = [
+                'Toolchains/XcodeDefault.xctoolchain/usr/bin',
+                'usr/bin',
+            ]
+
+            bins = ['c++', 'c89', 'c99', 'cc', 'clang', 'clang++', 'cpp']
+
+            for real_dir in real_dirs:
+                dev_dir = os.path.join(developer_root,
+                                       'Contents',
+                                       'Developer',
+                                       real_dir)
+                for fname in os.listdir(dev_dir):
+                    if fname in bins:
+                        os.unlink(os.path.join(dev_dir, fname))
+                        os.symlink(os.path.join(spack.build_env_path, 'cc'),
+                                   os.path.join(dev_dir, fname))
+
+            os.symlink(developer_root, xcode_link)
+
+        env.set('DEVELOPER_DIR', xcode_link)
diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py
index dec43726a03f208cd6ea78a6e555b1cfcaceae78..6a67f01d66fdcf5c6766d008cef30f2a99cc2231 100644
--- a/lib/spack/spack/config.py
+++ b/lib/spack/spack/config.py
@@ -30,18 +30,47 @@
 
 When Spack runs, it pulls configuration data from several config
 directories, each of which contains configuration files.  In Spack,
-there are two configuration scopes:
-
-1. ``site``: Spack loads site-wide configuration options from
-   ``$(prefix)/etc/spack/``.
-
-2. ``user``: Spack next loads per-user configuration options from
-   ``~/.spack/``.
-
-Spack may read configuration files from both of these locations.  When
-configurations conflict, the user config options take precedence over
-the site configurations.  Each configuration directory may contain
-several configuration files, such as compilers.yaml or mirrors.yaml.
+there are three configuration scopes (lowest to highest):
+
+1. ``defaults``: Spack loads default configuration settings from
+   ``$(prefix)/etc/spack/defaults/``. These settings are the "out of the
+   box" settings Spack will use without site- or user- modification, and
+   this is where settings that are versioned with Spack should go.
+
+2. ``site``: This scope affects only this *instance* of Spack, and
+   overrides the ``defaults`` scope. Configuration files in
+   ``$(prefix)/etc/spack/`` determine site scope. These can be used for
+   per-project settings (for users with their own spack instance) or for
+   site-wide settings (for admins maintaining a common spack instance).
+
+3. ``user``: User configuration goes in the user's home directory,
+   specifically in ``~/.spack/``.
+
+Spack may read configuration files from any of these locations.  When
+configurations conflict, settings from higher-precedence scopes override
+lower-precedence settings.
+
+fCommands that modify scopes (``spack compilers``, ``spack config``,
+etc.) take a ``--scope=<name>`` parameter that you can use to control
+which scope is modified.
+
+For each scope above, there can *also* be platform-specific
+overrides. For example, on Blue Gene/Q machines, Spack needs to know the
+location of cross-compilers for the compute nodes.  This configuration is
+in ``etc/spack/defaults/bgq/compilers.yaml``.  It will take precedence
+over settings in the ``defaults`` scope, but can still be overridden by
+settings in ``site``, ``site/bgq``, ``user``, or ``user/bgq``. So, the
+full list of scopes and their precedence is:
+
+1. ``defaults``
+2. ``defaults/<platform>``
+3. ``site``
+4. ``site/<platform>``
+5. ``user``
+6. ``user/<platform>``
+
+Each configuration directory may contain several configuration files,
+such as compilers.yaml or mirrors.yaml.
 
 =========================
 Configuration file format
@@ -118,6 +147,7 @@
 
 Will make Spack take compilers *only* from the user configuration, and
 the site configuration will be ignored.
+
 """
 
 import copy
@@ -135,6 +165,7 @@
 from llnl.util.filesystem import mkdirp
 
 import spack
+import spack.architecture
 from spack.error import SpackError
 import spack.schema
 
@@ -267,16 +298,30 @@ def clear(self):
         """Empty cached config information."""
         self.sections = {}
 
+#
+# Below are configuration scopes.
+#
+# Each scope can have per-platfom overrides in subdirectories of the
+# configuration directory.
+#
+_platform = spack.architecture.platform().name
+
 """Default configuration scope is the lowest-level scope. These are
    versioned with Spack and can be overridden by sites or users."""
-ConfigScope('defaults', os.path.join(spack.etc_path, 'spack', 'defaults'))
+_defaults_path = os.path.join(spack.etc_path, 'spack', 'defaults')
+ConfigScope('defaults', _defaults_path)
+ConfigScope('defaults/%s' % _platform, os.path.join(_defaults_path, _platform))
 
 """Site configuration is per spack instance, for sites or projects.
    No site-level configs should be checked into spack by default."""
-ConfigScope('site', os.path.join(spack.etc_path, 'spack'))
+_site_path = os.path.join(spack.etc_path, 'spack')
+ConfigScope('site', _site_path)
+ConfigScope('site/%s' % _platform, os.path.join(_site_path, _platform))
 
 """User configuration can override both spack defaults and site config."""
-ConfigScope('user', spack.user_config_path)
+_user_path = spack.user_config_path
+ConfigScope('user', _user_path)
+ConfigScope('user/%s' % _platform, os.path.join(_user_path, _platform))
 
 
 def highest_precedence_scope():
diff --git a/lib/spack/spack/environment.py b/lib/spack/spack/environment.py
index b0eadef7a6b5690e756442d62167439a49153fad..de30a9c7be5b70e70e6ac211247412efccfe08ba 100644
--- a/lib/spack/spack/environment.py
+++ b/lib/spack/spack/environment.py
@@ -271,8 +271,12 @@ def from_sourcing_files(*args, **kwargs):
 
         env = EnvironmentModifications()
         # Check if the files are actually there
-        if not all(os.path.isfile(file) for file in args):
-            raise RuntimeError('trying to source non-existing files')
+        files = [line.split(' ')[0] for line in args]
+        non_existing = [file for file in files if not os.path.isfile(file)]
+        if non_existing:
+            message = 'trying to source non-existing files\n'
+            message += '\n'.join(non_existing)
+            raise RuntimeError(message)
         # Relevant kwd parameters and formats
         info = dict(kwargs)
         info.setdefault('shell', '/bin/bash')
diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py
index 4b8829c32f38742210cb37b347fda1535b554afd..2becf9ed04db168ed2ae479707a9d342da224bf1 100644
--- a/lib/spack/spack/fetch_strategy.py
+++ b/lib/spack/spack/fetch_strategy.py
@@ -158,12 +158,20 @@ def __init__(self, url=None, digest=None, **kwargs):
             self.digest = digest
 
         self.expand_archive = kwargs.get('expand', True)
+        self.extra_curl_options = kwargs.get('curl_options', [])
+        self._curl = None
 
         self.extension = kwargs.get('extension', None)
 
         if not self.url:
             raise ValueError("URLFetchStrategy requires a url for fetching.")
 
+    @property
+    def curl(self):
+        if not self._curl:
+            self._curl = which('curl', required=True)
+        return self._curl
+
     @_needs_stage
     def fetch(self):
         self.stage.chdir()
@@ -196,15 +204,21 @@ def fetch(self):
             self.url,
         ]
 
+        if spack.insecure:
+            curl_args.append('-k')
+
         if sys.stdout.isatty():
             curl_args.append('-#')  # status bar when using a tty
         else:
             curl_args.append('-sS')  # just errors when not.
 
+        curl_args += self.extra_curl_options
+
         # Run curl but grab the mime type from the http headers
-        headers = spack.curl(*curl_args, output=str, fail_on_error=False)
+        curl = self.curl
+        headers = curl(*curl_args, output=str, fail_on_error=False)
 
-        if spack.curl.returncode != 0:
+        if curl.returncode != 0:
             # clean up archive on failure.
             if self.archive_file:
                 os.remove(self.archive_file)
@@ -212,12 +226,12 @@ def fetch(self):
             if partial_file and os.path.exists(partial_file):
                 os.remove(partial_file)
 
-            if spack.curl.returncode == 22:
+            if curl.returncode == 22:
                 # This is a 404.  Curl will print the error.
                 raise FailedDownloadError(
                     self.url, "URL %s was not found!" % self.url)
 
-            elif spack.curl.returncode == 60:
+            elif curl.returncode == 60:
                 # This is a certificate error.  Suggest spack -k
                 raise FailedDownloadError(
                     self.url,
@@ -233,7 +247,7 @@ def fetch(self):
                 # error, but print a spack message too
                 raise FailedDownloadError(
                     self.url,
-                    "Curl failed with error %d" % spack.curl.returncode)
+                    "Curl failed with error %d" % curl.returncode)
 
         # Check if we somehow got an HTML file rather than the archive we
         # asked for.  We only look at the last content type, to handle
@@ -530,6 +544,12 @@ def git_version(self):
     def git(self):
         if not self._git:
             self._git = which('git', required=True)
+
+            # If the user asked for insecure fetching, make that work
+            # with git as well.
+            if spack.insecure:
+                self._git.add_default_env('GIT_SSL_NO_VERIFY', 'true')
+
         return self._git
 
     @_needs_stage
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 7a459888083f209df77c521bc9f02a9ba9bd8cc9..3d1f87d599eabb253ffac100a81aa6009403314c 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -1115,8 +1115,6 @@ def do_install(self,
             even with exceptions.
         :param install_deps: Install dependencies before installing this \
             package
-        :param install_self: Install this package once dependencies have \
-            been installed.
         :param fake: Don't really build; install fake stub files instead.
         :param skip_patch: Skip patch stage of build if True.
         :param verbose: Display verbose build output (by default, suppresses \
@@ -1161,7 +1159,6 @@ def do_install(self,
                     keep_prefix=keep_prefix,
                     keep_stage=keep_stage,
                     install_deps=install_deps,
-                    install_self=True,
                     fake=fake,
                     skip_patch=skip_patch,
                     verbose=verbose,
@@ -1169,11 +1166,6 @@ def do_install(self,
                     run_tests=run_tests,
                     dirty=dirty)
 
-        # The rest of this function is to install ourself,
-        # once deps have been installed.
-        if not install_self:
-            return
-
         # Set run_tests flag before starting build.
         self.run_tests = run_tests
 
diff --git a/lib/spack/spack/platforms/darwin.py b/lib/spack/spack/platforms/darwin.py
index 974ce3a3f9e3ede63d3e4e3630b2e3250bd8ca38..ffefd3654623034cef1a75ca24a12750068aa60d 100644
--- a/lib/spack/spack/platforms/darwin.py
+++ b/lib/spack/spack/platforms/darwin.py
@@ -1,4 +1,4 @@
-import subprocess
+import platform
 from spack.architecture import Platform, Target
 from spack.operating_systems.mac_os import MacOs
 
@@ -22,6 +22,4 @@ def __init__(self):
 
     @classmethod
     def detect(self):
-        platform = subprocess.Popen(['uname', '-a'], stdout=subprocess.PIPE)
-        platform, _ = platform.communicate()
-        return 'darwin' in platform.strip().lower()
+        return 'darwin' in platform.system().lower()
diff --git a/lib/spack/spack/platforms/linux.py b/lib/spack/spack/platforms/linux.py
index 38d2cdbfecf0eea10870bf38802ec3a62c91e3ff..cee0cfd6e95656ee4d636b66d318193ada0996ed 100644
--- a/lib/spack/spack/platforms/linux.py
+++ b/lib/spack/spack/platforms/linux.py
@@ -1,4 +1,3 @@
-import subprocess
 import platform
 from spack.architecture import Platform, Target
 from spack.operating_systems.linux_distro import LinuxDistro
@@ -27,6 +26,4 @@ def __init__(self):
 
     @classmethod
     def detect(self):
-        platform = subprocess.Popen(['uname', '-a'], stdout=subprocess.PIPE)
-        platform, _ = platform.communicate()
-        return 'linux' in platform.strip().lower()
+        return 'linux' in platform.system().lower()
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index fc4bf41e349462a73ad29606f219dd206d0dd78d..69500255026c7c5577f3e6275dd36e241c62f26d 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -98,7 +98,7 @@
 import base64
 import hashlib
 import imp
-import sys
+import ctypes
 from StringIO import StringIO
 from operator import attrgetter
 
@@ -203,6 +203,9 @@
 
 legal_deps = tuple(special_types) + alldeps
 
+"""Max integer helps avoid passing too large a value to cyaml."""
+maxint = 2 ** (ctypes.sizeof(ctypes.c_int) * 8 - 1) - 1
+
 
 def validate_deptype(deptype):
     if isinstance(deptype, str):
@@ -969,12 +972,12 @@ def dag_hash(self, length=None):
             return self._hash[:length]
         else:
             yaml_text = syaml.dump(
-                self.to_node_dict(), default_flow_style=True, width=sys.maxint)
+                self.to_node_dict(), default_flow_style=True, width=maxint)
             sha = hashlib.sha1(yaml_text)
-            b32_hash = base64.b32encode(sha.digest()).lower()[:length]
+            b32_hash = base64.b32encode(sha.digest()).lower()
             if self.concrete:
                 self._hash = b32_hash
-            return b32_hash
+            return b32_hash[:length]
 
     def dag_hash_bit_prefix(self, bits):
         """Get the first <bits> bits of the DAG hash as an integer type."""
diff --git a/lib/spack/spack/test/data/sourceme_parameters.sh b/lib/spack/spack/test/data/sourceme_parameters.sh
new file mode 100644
index 0000000000000000000000000000000000000000..3826eb092bef4f70f5d7701ede3fb7b2fb123fa8
--- /dev/null
+++ b/lib/spack/spack/test/data/sourceme_parameters.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if [[ "$1" == "intel64" ]] ; then
+    export FOO='intel64'
+else
+    export FOO='default'
+fi
\ No newline at end of file
diff --git a/lib/spack/spack/test/environment.py b/lib/spack/spack/test/environment.py
index 9b5d75f27349945719017314c24ab22e717ef381..c404433a560e16a388e019f1e2f2f7a5108b6b74 100644
--- a/lib/spack/spack/test/environment.py
+++ b/lib/spack/spack/test/environment.py
@@ -119,7 +119,8 @@ def test_source_files(self):
                             'spack', 'test', 'data')
         files = [
             join_path(datadir, 'sourceme_first.sh'),
-            join_path(datadir, 'sourceme_second.sh')
+            join_path(datadir, 'sourceme_second.sh'),
+            join_path(datadir, 'sourceme_parameters.sh intel64')
         ]
         env = EnvironmentModifications.from_sourcing_files(*files)
         modifications = env.group_by_name()
@@ -134,6 +135,11 @@ def test_source_files(self):
         self.assertEqual(len(modifications['NEW_VAR']), 1)
         self.assertTrue(isinstance(modifications['NEW_VAR'][0], SetEnv))
         self.assertEqual(modifications['NEW_VAR'][0].value, 'new')
+
+        self.assertEqual(len(modifications['FOO']), 1)
+        self.assertTrue(isinstance(modifications['FOO'][0], SetEnv))
+        self.assertEqual(modifications['FOO'][0].value, 'intel64')
+
         # Unset variables
         self.assertEqual(len(modifications['EMPTY_PATH_LIST']), 1)
         self.assertTrue(isinstance(
diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py
index af4b8a51efb92af074f31650578577740147046e..884249561358f6eb354b4aa92ff02ea3f94c95cd 100644
--- a/lib/spack/spack/url.py
+++ b/lib/spack/spack/url.py
@@ -323,7 +323,7 @@ def parse_name_and_version(path):
 
 def insensitize(string):
     """Change upper and lowercase letters to be case insensitive in
-       the provided string.  e.g., 'a' because '[Aa]', 'B' becomes
+       the provided string.  e.g., 'a' becomes '[Aa]', 'B' becomes
        '[bB]', etc.  Use for building regexes."""
     def to_ins(match):
         char = match.group(1)
diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py
index 4fe4bd26bac82eeb4474c5569b116957fa5d29ab..2790508ee877ebd3bef551c6de26fe40f66d32fe 100644
--- a/lib/spack/spack/util/executable.py
+++ b/lib/spack/spack/util/executable.py
@@ -40,6 +40,7 @@ class Executable(object):
 
     def __init__(self, name):
         self.exe = name.split(' ')
+        self.default_env = {}
         self.returncode = None
 
         if not self.exe:
@@ -48,6 +49,9 @@ def __init__(self, name):
     def add_default_arg(self, arg):
         self.exe.append(arg)
 
+    def add_default_env(self, key, value):
+        self.default_env[key] = value
+
     @property
     def command(self):
         return ' '.join(self.exe)
@@ -103,7 +107,13 @@ def __call__(self, *args, **kwargs):
         fail_on_error = kwargs.pop("fail_on_error", True)
         ignore_errors = kwargs.pop("ignore_errors", ())
 
+        # environment
         env = kwargs.get('env', None)
+        if env is None:
+            env = os.environ.copy()
+            env.update(self.default_env)
+        else:
+            env = self.default_env.copy().update(env)
 
         # TODO: This is deprecated.  Remove in a future version.
         return_output = kwargs.pop("return_output", False)
@@ -149,6 +159,7 @@ def streamify(arg, mode):
 
         cmd_line = "'%s'" % "' '".join(
             map(lambda arg: arg.replace("'", "'\"'\"'"), cmd))
+
         tty.debug(cmd_line)
 
         try:
diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py
index 7bcdf2d61f03383fa1b2378fe22917a7d16b3298..506f56633ae20968dd3d0aecdac14d22de7e812a 100644
--- a/lib/spack/spack/util/spack_yaml.py
+++ b/lib/spack/spack/util/spack_yaml.py
@@ -32,6 +32,10 @@
 
 """
 import yaml
+try:
+    from yaml import CLoader as Loader, CDumper as Dumper
+except ImportError as e:
+    from yaml import Loader, Dumper
 from yaml.nodes import *
 from yaml.constructor import ConstructorError
 from ordereddict_backport import OrderedDict
@@ -64,7 +68,7 @@ def mark(obj, node):
     obj._end_mark = node.end_mark
 
 
-class OrderedLineLoader(yaml.Loader):
+class OrderedLineLoader(Loader):
     """YAML loader that preserves order and line numbers.
 
        Mappings read in by this loader behave like an ordered dict.
@@ -156,7 +160,7 @@ def construct_mapping(self, node, deep=False):
     u'tag:yaml.org,2002:str', OrderedLineLoader.construct_yaml_str)
 
 
-class OrderedLineDumper(yaml.Dumper):
+class OrderedLineDumper(Dumper):
     """Dumper that preserves ordering and formats ``syaml_*`` objects.
 
       This dumper preserves insertion ordering ``syaml_dict`` objects
diff --git a/lib/spack/spack/util/web.py b/lib/spack/spack/util/web.py
index 29ed6e0d3285cf1ce7f6ce1cf837b0986e2ccefe..935532266fa5540e4b14fd871cadb8a7f2f07a06 100644
--- a/lib/spack/spack/util/web.py
+++ b/lib/spack/spack/util/web.py
@@ -227,7 +227,16 @@ def find_versions_of_archive(*archive_urls, **kwargs):
 
         # We'll be a bit more liberal and just look for the archive
         # part, not the full path.
-        regexes.append(os.path.basename(url_regex))
+        url_regex = os.path.basename(url_regex)
+
+        # We need to add a $ anchor to the end of the regex to prevent
+        # Spack from picking up signature files like:
+        #   .asc
+        #   .md5
+        #   .sha256
+        #   .sig
+        # However, SourceForge downloads still need to end in '/download'.
+        regexes.append(url_regex + '(\/download)?$')
 
     # Build a dict version -> URL from any links that match the wildcards.
     versions = {}
diff --git a/var/spack/repos/builtin/packages/abinit/package.py b/var/spack/repos/builtin/packages/abinit/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..76fa044982dd62dea456f5676fd2a5f5198c1668
--- /dev/null
+++ b/var/spack/repos/builtin/packages/abinit/package.py
@@ -0,0 +1,175 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+#
+# Author: Matteo Giantomassi <matteo.giantomassiNOSPAM AT uclouvain.be>
+# Date: October 11, 2016
+
+from spack import *
+
+
+class Abinit(Package):
+    """ABINIT is a package whose main program allows one to find the total
+    energy, charge density and electronic structure of systems made of
+    electrons and nuclei (molecules and periodic solids) within
+    Density Functional Theory (DFT), using pseudopotentials and a planewave
+    or wavelet basis. ABINIT also includes options to optimize the geometry
+    according to the DFT forces and stresses, or to perform molecular dynamics
+    simulations using these forces, or to generate dynamical matrices,
+    Born effective charges, and dielectric tensors, based on Density-Functional
+    Perturbation Theory, and many more properties. Excited states can be
+    computed within the Many-Body Perturbation Theory (the GW approximation and
+    the Bethe-Salpeter equation), and Time-Dependent Density Functional Theory
+    (for molecules). In addition to the main ABINIT code, different utility
+    programs are provided.
+    """
+
+    homepage = "http://www.abinit.org"
+    url      = "http://ftp.abinit.org/abinit-8.0.8b.tar.gz"
+
+    # Versions before 8.0.8b are not supported.
+    version("8.0.8b", "abc9e303bfa7f9f43f95598f87d84d5d")
+
+    variant('mpi', default=True,
+            description='Builds with MPI support. Requires MPI2+')
+    variant('openmp', default=False,
+            description='Enables OpenMP threads. Use threaded FFTW3')
+    variant('scalapack', default=False,
+            description='Enables scalapack support. Requires MPI')
+    # variant('elpa', default=False,
+    # description='Uses elpa instead of scalapack. Requires MPI')
+
+    # TODO: To be tested.
+    # It was working before the last `git pull` but now all tests crash.
+    # For the time being, the default is netcdf3 and the internal fallbacks
+    variant('hdf5', default=False,
+            description='Enables HDF5+Netcdf4 with MPI. WARNING: experimental')
+
+    # Add dependencies
+    # currently one cannot forward options to virtual packages, see #1712.
+    # depends_on("blas", when="~openmp")
+    # depends_on("blas+openmp", when="+openmp")
+    depends_on('blas')
+    depends_on("lapack")
+
+    # Require MPI2+
+    depends_on("mpi@2:", when="+mpi")
+
+    depends_on("scalapack", when="+scalapack+mpi")
+    # depends_on("elpa", when="+elpa+mpi~openmp")
+    # depends_on("elpa+openmp", when="+elpa+mpi+openmp")
+
+    depends_on("fftw+float", when="~openmp")
+    depends_on("fftw+float+openmp", when="+openmp")
+
+    depends_on("netcdf-fortran", when="+hdf5")
+    depends_on("hdf5+mpi", when='+mpi+hdf5')  # required for NetCDF-4 support
+
+    # pin libxc version
+    depends_on("libxc@2.2.1")
+
+    def validate(self, spec):
+        """
+        Checks if incompatible variants have been activated at the same time
+
+        :param spec: spec of the package
+        :raises RuntimeError: in case of inconsistencies
+        """
+        error = 'you cannot ask for \'+{variant}\' when \'+mpi\' is not active'
+
+        if '+scalapack' in spec and '~mpi' in spec:
+            raise RuntimeError(error.format(variant='scalapack'))
+
+        if '+elpa' in spec and ('~mpi' in spec or '~scalapack' in spec):
+            raise RuntimeError(error.format(variant='elpa'))
+
+    def install(self, spec, prefix):
+        self.validate(spec)
+
+        options = ['--prefix=%s' % prefix]
+        oapp = options.append
+
+        if '+mpi' in spec:
+            # MPI version:
+            # let the configure script auto-detect MPI support from mpi_prefix
+            oapp("--with-mpi-prefix=%s" % spec["mpi"].prefix)
+            oapp("--enable-mpi=yes")
+            oapp("--enable-mpi-io=yes")
+
+        # Activate OpenMP in Abinit Fortran code.
+        if '+openmp' in spec:
+            oapp('--enable-openmp=yes')
+
+        # BLAS/LAPACK
+        if '+scalapack' in spec:
+            oapp("--with-linalg-flavor=custom+scalapack")
+            linalg = (spec['scalapack'].scalapack_libs +
+                      spec['lapack'].lapack_libs + spec['blas'].blas_libs)
+
+        # elif '+elpa' in spec:
+        else:
+            oapp("--with-linalg-flavor=custom")
+            linalg = spec['lapack'].lapack_libs + spec['blas'].blas_libs
+
+        oapp("--with-linalg-libs=%s" % linalg.ld_flags)
+
+        # FFTW3: use sequential or threaded version if +openmp
+        fftflavor, fftlibs = "fftw3", "-lfftw3 -lfftw3f"
+        if '+openmp' in spec:
+            fftflavor = "fftw3-threads"
+            fftlibs = "-lfftw3_omp -lfftw3 -lfftw3f"
+
+        options.extend([
+            "--with-fft-flavor=%s" % fftflavor,
+            "--with-fft-incs=-I%s" % spec["fftw"].prefix.include,
+            "--with-fft-libs=-L%s %s" % (spec["fftw"].prefix.lib, fftlibs),
+        ])
+        oapp("--with-dft-flavor=atompaw+libxc")
+
+        # LibXC library
+        options.extend([
+            "with_libxc_incs=-I%s" % spec["libxc"].prefix.include,
+            "with_libxc_libs=-L%s -lxcf90 -lxc" % spec["libxc"].prefix.lib,
+        ])
+
+        # Netcdf4/HDF5
+        if "+hdf5" in spec:
+            oapp("--with-trio-flavor=netcdf")
+            hdf_libs = "-L%s -lhdf5_hl -lhdf5" % spec["hdf5"].prefix.lib
+            options.extend([
+                "--with-netcdf-incs=-I%s" % (
+                    spec["netcdf-fortran"].prefix.include),
+                "--with-netcdf-libs=-L%s -lnetcdff -lnetcdf %s" % (
+                    spec["netcdf-fortran"].prefix.lib, hdf_libs),
+            ])
+        else:
+            # Use internal fallbacks (netcdf3)
+            oapp("--with-trio-flavor=netcdf-fallback")
+
+        configure(*options)
+        make()
+
+        # make("check")
+        # make("tests_in")
+        make("install")
diff --git a/var/spack/repos/builtin/packages/applewmproto/package.py b/var/spack/repos/builtin/packages/applewmproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8d7e360bfb05a2ecc2d53358a5d041c3ad14d506
--- /dev/null
+++ b/var/spack/repos/builtin/packages/applewmproto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Applewmproto(Package):
+    """Apple Rootless Window Management Extension.
+
+    This extension defines a protcol that allows X window managers
+    to better interact with the Mac OS X Aqua user interface when
+    running X11 in a rootless mode."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/applewmproto"
+    url      = "https://www.x.org/archive/individual/proto/applewmproto-1.4.2.tar.gz"
+
+    version('1.4.2', 'ecc8a4424a893ce120f5652dba62e9e6')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/appres/package.py b/var/spack/repos/builtin/packages/appres/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..47a9c5bb545f3ce6fe3b968f02ed7b4f469b59d5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/appres/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Appres(Package):
+    """The appres program prints the resources seen by an application (or
+    subhierarchy of an application) with the specified class and instance
+    names.  It can be used to determine which resources a particular
+    program will load."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/appres"
+    url      = "https://www.x.org/archive/individual/app/appres-1.0.4.tar.gz"
+
+    version('1.0.4', 'f82aabe6bbb8960781b63c6945bb361b')
+
+    depends_on('libx11')
+    depends_on('libxt')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/atompaw/package.py b/var/spack/repos/builtin/packages/atompaw/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..17d0ef82099e3db6fcb2eb8765620aaa13200192
--- /dev/null
+++ b/var/spack/repos/builtin/packages/atompaw/package.py
@@ -0,0 +1,63 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Atompaw(Package):
+    """A Projector Augmented Wave (PAW) code for generating
+    atom-centered functions.
+
+    Official website: http://pwpaw.wfu.edu
+
+    User's guide: ~/doc/atompaw-usersguide.pdf
+    """
+    homepage = "http://users.wfu.edu/natalie/papers/pwpaw/man.html"
+    url = "http://users.wfu.edu/natalie/papers/pwpaw/atompaw-4.0.0.13.tar.gz"
+
+    version('4.0.0.13', 'af4a042380356f6780183c4b325aad1d')
+    version('3.1.0.3', 'c996a277e11707887177f47bbb229aa6')
+
+    depends_on("lapack")
+    depends_on("blas")
+
+    # pin libxc version
+    depends_on("libxc@2.2.1")
+
+    def install(self, spec, prefix):
+        options = ['--prefix=%s' % prefix]
+
+        linalg = spec['lapack'].lapack_libs + spec['blas'].blas_libs
+        options.extend([
+            "--with-linalg-libs=%s" % linalg.ld_flags,
+            "--enable-libxc",
+            "--with-libxc-incs=-I%s" % spec["libxc"].prefix.include,
+            "--with-libxc-libs=-L%s -lxcf90 -lxc" % spec["libxc"].prefix.lib,
+        ])
+
+        configure(*options)
+        make(parallel=False)  # parallel build fails
+        make("check")
+        make("install")
diff --git a/var/spack/repos/builtin/packages/bazel/cc_configure.patch b/var/spack/repos/builtin/packages/bazel/cc_configure.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3e108c3b5e9dd8b43100af7afd9a6d08ee6abcd2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bazel/cc_configure.patch
@@ -0,0 +1,28 @@
+--- bazel-0.3.1/tools/cpp/cc_configure.bzl	2016-10-13 14:00:32.118358387 +0200
++++ bazel-0.3.1/tools/cpp/cc_configure.bzl	2016-10-13 13:52:45.342610147 +0200
+@@ -173,8 +173,23 @@
+   else:
+     inc_dirs = result.stderr[index1 + 1:index2].strip()
+ 
+-  return [repository_ctx.path(_cxx_inc_convert(p))
+-          for p in inc_dirs.split("\n")]
++  default_inc_directories = [
++    repository_ctx.path(_cxx_inc_convert(p))
++    for p in inc_dirs.split("\n")
++  ]
++
++  env = repository_ctx.os.environ
++  if "SPACK_DEPENDENCIES" in env:
++    for dep in env["SPACK_DEPENDENCIES"].split(":"):
++      path = dep + "/include"
++      # path = repository_ctx.os.path.join(dep, "include")
++      # if not repository_ctx.os.path.exists(path):
++      #   continue
++      default_inc_directories.append(
++        repository_ctx.path(_cxx_inc_convert(path))
++      )
++
++  return default_inc_directories
+ 
+ def _add_option_if_supported(repository_ctx, cc, option):
+   """Checks that `option` is supported by the C compiler."""
diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9be9f97d699590c9af4d6b99b329485c0316471c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch
@@ -0,0 +1,119 @@
+diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 
+--- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 11:56:01.565756979 +0200
++++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java	2016-09-14 12:04:13.292839801 +0200
+@@ -92,5 +92,115 @@ public class BazelConfiguration extends
+     if (tmpdir != null) {
+       builder.put("TMPDIR", tmpdir);
+     }
++
++    String spack_prefix = System.getenv("SPACK_PREFIX");
++    if (spack_prefix != null) {
++      builder.put("SPACK_PREFIX", spack_prefix);
++    }
++
++    String spack_env_path = System.getenv("SPACK_ENV_PATH");
++    if (spack_env_path != null) {
++      builder.put("SPACK_ENV_PATH", spack_env_path);
++    }
++
++    String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR");
++    if (spack_debug_log_dir != null) {
++      builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir);
++    }
++
++    String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC");
++    if (spack_compiler_spec != null) {
++      builder.put("SPACK_COMPILER_SPEC", spack_compiler_spec);
++    }
++
++    String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG");
++    if (spack_cc_rpath_arg != null) {
++      builder.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg);
++    }
++
++    String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG");
++    if (spack_cxx_rpath_arg != null) {
++      builder.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg);
++    }
++
++    String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG");
++    if (spack_f77_rpath_arg != null) {
++      builder.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg);
++    }
++
++    String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG");
++    if (spack_fc_rpath_arg != null) {
++      builder.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg);
++    }
++
++    String spack_short_spec = System.getenv("SPACK_SHORT_SPEC");
++    if (spack_short_spec != null) {
++      builder.put("SPACK_SHORT_SPEC", spack_short_spec);
++    }
++
++    String spack_cc = System.getenv("SPACK_CC");
++    if (spack_cc != null) {
++      builder.put("SPACK_CC", spack_cc);
++    }
++
++    String spack_cxx = System.getenv("SPACK_CXX");
++    if (spack_cxx != null) {
++      builder.put("SPACK_CXX", spack_cxx);
++    }
++
++    String spack_f77 = System.getenv("SPACK_F77");
++    if (spack_f77 != null) {
++      builder.put("SPACK_F77", spack_f77);
++    }
++
++    String spack_fc = System.getenv("SPACK_FC");
++    if (spack_fc != null) {
++      builder.put("SPACK_FC", spack_fc);
++    }
++
++    String spack_cflags = System.getenv("SPACK_CFLAGS");
++    if (spack_cflags != null) {
++      builder.put("SPACK_CFLAGS", spack_cflags);
++    }
++
++    String spack_cxxflags = System.getenv("SPACK_CXXFLAGS");
++    if (spack_cxxflags != null) {
++      builder.put("SPACK_CXXFLAGS", spack_cxxflags);
++    }
++
++    String spack_fcflags = System.getenv("SPACK_FCFLAGS");
++    if (spack_fcflags != null) {
++      builder.put("SPACK_FCFLAGS", spack_fcflags);
++    }
++
++    String spack_fflags = System.getenv("SPACK_FFLAGS");
++    if (spack_fflags != null) {
++      builder.put("SPACK_FFLAGS", spack_fflags);
++    }
++
++    String spack_ldflags = System.getenv("SPACK_LDFLAGS");
++    if (spack_ldflags != null) {
++      builder.put("SPACK_LDFLAGS", spack_ldflags);
++    }
++
++    String spack_ldlibs = System.getenv("SPACK_LDLIBS");
++    if (spack_ldlibs != null) {
++      builder.put("SPACK_LDLIBS", spack_ldlibs);
++    }
++
++    String spack_debug = System.getenv("SPACK_DEBUG");
++    if (spack_debug != null) {
++      builder.put("SPACK_DEBUG", spack_debug);
++    }
++
++    String spack_test_command = System.getenv("SPACK_TEST_COMMAND");
++    if (spack_test_command != null) {
++      builder.put("SPACK_TEST_COMMAND", spack_test_command);
++    }
++
++    String spack_dependencies = System.getenv("SPACK_DEPENDENCIES");
++    if (spack_dependencies != null) {
++      builder.put("SPACK_DEPENDENCIES", spack_dependencies);
++    }
+   }
+ }
diff --git a/var/spack/repos/builtin/packages/bazel/link.patch b/var/spack/repos/builtin/packages/bazel/link.patch
new file mode 100644
index 0000000000000000000000000000000000000000..69d100f62ce82ba06abbc1a137a41d69de1aa839
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bazel/link.patch
@@ -0,0 +1,133 @@
+--- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java	2016-07-29 10:22:16.000000000 +0200
++++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java	2016-10-13 15:21:35.036617890 +0200
+@@ -214,6 +214,130 @@
+               .getParentDirectory()
+               .getPathString());
+     }
++
++    String path = System.getenv("PATH");
++    result.put("PATH", path == null ? "/bin:/usr/bin" : path);
++
++    String ldLibraryPath = System.getenv("LD_LIBRARY_PATH");
++    if (ldLibraryPath != null) {
++      result.put("LD_LIBRARY_PATH", ldLibraryPath);
++    }
++
++    String tmpdir = System.getenv("TMPDIR");
++    if (tmpdir != null) {
++      result.put("TMPDIR", tmpdir);
++    }
++
++    String spack_prefix = System.getenv("SPACK_PREFIX");
++    if (spack_prefix != null) {
++      result.put("SPACK_PREFIX", spack_prefix);
++    }
++
++    String spack_env_path = System.getenv("SPACK_ENV_PATH");
++    if (spack_env_path != null) {
++      result.put("SPACK_ENV_PATH", spack_env_path);
++    }
++
++    String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR");
++    if (spack_debug_log_dir != null) {
++      result.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir);
++    }
++
++    String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC");
++    if (spack_compiler_spec != null) {
++      result.put("SPACK_COMPILER_SPEC", spack_compiler_spec);
++    }
++
++    String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG");
++    if (spack_cc_rpath_arg != null) {
++      result.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg);
++    }
++
++    String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG");
++    if (spack_cxx_rpath_arg != null) {
++      result.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg);
++    }
++
++    String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG");
++    if (spack_f77_rpath_arg != null) {
++      result.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg);
++    }
++
++    String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG");
++    if (spack_fc_rpath_arg != null) {
++      result.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg);
++    }
++
++    String spack_short_spec = System.getenv("SPACK_SHORT_SPEC");
++    if (spack_short_spec != null) {
++      result.put("SPACK_SHORT_SPEC", spack_short_spec);
++    }
++
++    String spack_cc = System.getenv("SPACK_CC");
++    if (spack_cc != null) {
++      result.put("SPACK_CC", spack_cc);
++    }
++
++    String spack_cxx = System.getenv("SPACK_CXX");
++    if (spack_cxx != null) {
++      result.put("SPACK_CXX", spack_cxx);
++    }
++
++    String spack_f77 = System.getenv("SPACK_F77");
++    if (spack_f77 != null) {
++      result.put("SPACK_F77", spack_f77);
++    }
++
++    String spack_fc = System.getenv("SPACK_FC");
++    if (spack_fc != null) {
++      result.put("SPACK_FC", spack_fc);
++    }
++
++    String spack_cflags = System.getenv("SPACK_CFLAGS");
++    if (spack_cflags != null) {
++      result.put("SPACK_CFLAGS", spack_cflags);
++    }
++
++    String spack_cxxflags = System.getenv("SPACK_CXXFLAGS");
++    if (spack_cxxflags != null) {
++      result.put("SPACK_CXXFLAGS", spack_cxxflags);
++    }
++
++    String spack_fcflags = System.getenv("SPACK_FCFLAGS");
++    if (spack_fcflags != null) {
++      result.put("SPACK_FCFLAGS", spack_fcflags);
++    }
++
++    String spack_fflags = System.getenv("SPACK_FFLAGS");
++    if (spack_fflags != null) {
++      result.put("SPACK_FFLAGS", spack_fflags);
++    }
++
++    String spack_ldflags = System.getenv("SPACK_LDFLAGS");
++    if (spack_ldflags != null) {
++      result.put("SPACK_LDFLAGS", spack_ldflags);
++    }
++
++    String spack_ldlibs = System.getenv("SPACK_LDLIBS");
++    if (spack_ldlibs != null) {
++      result.put("SPACK_LDLIBS", spack_ldlibs);
++    }
++
++    String spack_debug = System.getenv("SPACK_DEBUG");
++    if (spack_debug != null) {
++      result.put("SPACK_DEBUG", spack_debug);
++    }
++
++    String spack_test_command = System.getenv("SPACK_TEST_COMMAND");
++    if (spack_test_command != null) {
++      result.put("SPACK_TEST_COMMAND", spack_test_command);
++    }
++
++    String spack_dependencies = System.getenv("SPACK_DEPENDENCIES");
++    if (spack_dependencies != null) {
++      result.put("SPACK_DEPENDENCIES", spack_dependencies);
++    }
++
+     return result.build();
+   }
+ 
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..94ac73cbd2d5a6804fe30faaa6f9bcb9f3a32ea6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bazel/package.py
@@ -0,0 +1,89 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+from multiprocessing import cpu_count
+from spack.util.environment import env_flag
+from spack.build_environment import SPACK_NO_PARALLEL_MAKE
+
+
+class Bazel(Package):
+    """Bazel is Google's own build tool"""
+
+    homepage = "https://www.bazel.io"
+    url = "https://github.com/bazelbuild/bazel/archive/0.3.1.tar.gz"
+
+    version('0.3.1', '5c959467484a7fc7dd2e5e4a1e8e866b')
+    version('0.3.0', '33a2cb457d28e1bee9282134769b9283')
+    version('0.2.3', '393a491d690e43caaba88005efe6da91')
+    version('0.2.2b', '75081804f073cbd194da1a07b16cba5f')
+    version('0.2.2', '644bc4ea7f429d835e74f255dc1054e6')
+
+    depends_on('jdk@8:')
+    patch('fix_env_handling.patch')
+    patch('link.patch')
+    patch('cc_configure.patch')
+
+    def install(self, spec, prefix):
+        bash = which('bash')
+        bash('-c', './compile.sh')
+        mkdir(prefix.bin)
+        install('output/bazel', prefix.bin)
+
+    def setup_dependent_package(self, module, dep_spec):
+        class BazelExecutable(Executable):
+            """Special callable executable object for bazel so the user can
+               specify parallel or not on a per-invocation basis.  Using
+               'parallel' as a kwarg will override whatever the package's
+               global setting is, so you can either default to true or false
+               and override particular calls.
+
+               Note that if the SPACK_NO_PARALLEL_MAKE env var is set it
+               overrides everything.
+            """
+
+            def __init__(self, name, command, jobs):
+                super(BazelExecutable, self).__init__(name)
+                self.bazel_command = command
+                self.jobs = jobs
+
+            def __call__(self, *args, **kwargs):
+                disable = env_flag(SPACK_NO_PARALLEL_MAKE)
+                parallel = ((not disable) and
+                            kwargs.get('parallel', self.jobs > 1))
+
+                jobs = "--jobs=1"
+                if parallel:
+                    jobs = "--jobs=%d" % self.jobs
+
+                args = (self.bazel_command,) + (jobs,) + args
+
+                return super(BazelExecutable, self).__call__(*args, **kwargs)
+
+        jobs = cpu_count()
+        if not dep_spec.package.parallel:
+            jobs = 1
+        elif dep_spec.package.make_jobs:
+            jobs = dep_spec.package.make_jobs
+        module.bazel = BazelExecutable('bazel', 'build', jobs)
diff --git a/var/spack/repos/builtin/packages/bdftopcf/package.py b/var/spack/repos/builtin/packages/bdftopcf/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..095f0c1bd4c3ec61ce0d20bf02ca3a92443056a4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bdftopcf/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Bdftopcf(Package):
+    """bdftopcf is a font compiler for the X server and font server.  Fonts
+    in Portable Compiled Format can be read by any architecture, although
+    the file is structured to allow one particular architecture to read
+    them directly without reformatting.  This allows fast reading on the
+    appropriate machine, but the files are still portable (but read more
+    slowly) on other machines."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/bdftopcf"
+    url      = "https://www.x.org/archive/individual/app/bdftopcf-1.0.5.tar.gz"
+
+    version('1.0.5', '456416d33e0d41a96b5a3725d99e1be3')
+
+    depends_on('libxfont')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/beforelight/package.py b/var/spack/repos/builtin/packages/beforelight/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..37a91f56148ff45f2317584c083aef8a9b38b79e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/beforelight/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Beforelight(Package):
+    """The beforelight program is a sample implementation of a screen saver
+    for X servers supporting the MIT-SCREEN-SAVER extension.   It is only
+    recommended for use as a code sample, as it does not include features
+    such as screen locking or configurability."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/beforelight"
+    url      = "https://www.x.org/archive/individual/app/beforelight-1.0.5.tar.gz"
+
+    version('1.0.5', 'f0433eb6df647f36bbb5b38fb2beb22a')
+
+    depends_on('libx11')
+    depends_on('libxscrnsaver')
+    depends_on('libxt')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/bigreqsproto/package.py b/var/spack/repos/builtin/packages/bigreqsproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..61fd9c512168a360c11e262cb9bbca814e1c548a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bigreqsproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Bigreqsproto(Package):
+    """Big Requests Extension.
+
+    This extension defines a protocol to enable the use of requests
+    that exceed 262140 bytes in length."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/bigreqsproto"
+    url      = "https://www.x.org/archive/individual/proto/bigreqsproto-1.1.2.tar.gz"
+
+    version('1.1.2', '9b83369ac7a5eb2bf54c8f34db043a0e')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/bitmap/package.py b/var/spack/repos/builtin/packages/bitmap/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..55fdacefd5a990a2300974c731e972683fdb9f62
--- /dev/null
+++ b/var/spack/repos/builtin/packages/bitmap/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Bitmap(Package):
+    """bitmap, bmtoa, atobm - X bitmap (XBM) editor and converter utilities."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/bitmap"
+    url      = "https://www.x.org/archive/individual/app/bitmap-1.0.8.tar.gz"
+
+    version('1.0.8', '0ca600041bb0836ae7c9f5db5ce09091')
+
+    depends_on('libx11')
+    depends_on('libxmu')
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+
+    depends_on('xbitmaps', type='build')
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
index cbf36c3b61f323cec50edec4b492cdfb5228a634..06e752d199ce87e9a4a1d8d6b280b485b5ef210b 100644
--- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py
@@ -57,14 +57,13 @@ class CbtfArgonavis(Package):
     version('1.6', branch='master',
             git='https://github.com/OpenSpeedShop/cbtf-argonavis.git')
 
-    depends_on("cmake@3.0.2", type='build')
+    depends_on("cmake@3.0.2:", type='build')
     depends_on("boost@1.50.0:")
     depends_on("papi")
-    depends_on("mrnet@5.0.1:+lwthreads+krellpatch")
+    depends_on("mrnet@5.0.1:+lwthreads")
     depends_on("cbtf")
     depends_on("cbtf-krell")
-    depends_on("cuda@6.0.37")
-    # depends_on("cuda")
+    depends_on("cuda")
 
     parallel = False
 
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index 6f15c3f83530a7f6fd7fb4175ce7ac70540e4603..efcd7200d83dd1af9020970d3b26a5b7e04423b8 100644
--- a/var/spack/repos/builtin/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
@@ -74,7 +74,7 @@ class CbtfKrell(Package):
             description="Build mpi experiment collector for mpich MPI.")
 
     # Dependencies for cbtf-krell
-    depends_on("cmake@3.0.2", type='build')
+    depends_on("cmake@3.0.2:", type='build')
 
     # For binutils service
     depends_on("binutils@2.24+krellpatch")
@@ -82,7 +82,7 @@ class CbtfKrell(Package):
     # collectionTool
     depends_on("boost@1.50.0:")
     depends_on("dyninst@8.2.1:")
-    depends_on("mrnet@5.0.1:+lwthreads+krellpatch")
+    depends_on("mrnet@5.0.1:+lwthreads")
 
     depends_on("xerces-c@3.1.1:")
     depends_on("cbtf")
@@ -138,34 +138,22 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions):
 
         # openmpi
         if '+openmpi' in spec:
-            MPIOptions.extend([
-                '-DOPENMPI_DIR=%s' % spec['openmpi'].prefix
-            ])
+            MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix)
         # mpich
         if '+mpich' in spec:
-            MPIOptions.extend([
-                '-DMPICH_DIR=%s' % spec['mpich'].prefix
-            ])
+            MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix)
         # mpich2
         if '+mpich2' in spec:
-            MPIOptions.extend([
-                '-DMPICH2_DIR=%s' % spec['mpich2'].prefix
-            ])
+            MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix)
         # mvapich
         if '+mvapich' in spec:
-            MPIOptions.extend([
-                '-DMVAPICH_DIR=%s' % spec['mvapich'].prefix
-            ])
+            MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix)
         # mvapich2
         if '+mvapich2' in spec:
-            MPIOptions.extend([
-                '-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix
-            ])
+            MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix)
         # mpt
         if '+mpt' in spec:
-            MPIOptions.extend([
-                '-DMPT_DIR=%s' % spec['mpt'].prefix
-            ])
+            MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix)
 
         cmakeOptions.extend(MPIOptions)
 
diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index b614a325f9e7088f2993caf4b2d2b69fca0b750f..2b4e8873252e4cce9ab583e151d7d86ba8759bc2 100644
--- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
@@ -55,9 +55,9 @@ class CbtfLanl(Package):
     version('1.6', branch='master',
             git='http://git.code.sf.net/p/cbtf-lanl/cbtf-lanl')
 
-    depends_on("cmake@3.0.2", type='build')
+    depends_on("cmake@3.0.2:", type='build')
     # Dependencies for cbtf-krell
-    depends_on("mrnet@5.0.1:+lwthreads+krellpatch")
+    depends_on("mrnet@5.0.1:+lwthreads")
     depends_on("xerces-c@3.1.1:")
     depends_on("cbtf")
     depends_on("cbtf-krell")
diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py
index bc3116bf2a478841b5c982d43ced0837c49d663b..a711a918caacb640c1246f260005c8db12f20589 100644
--- a/var/spack/repos/builtin/packages/cbtf/package.py
+++ b/var/spack/repos/builtin/packages/cbtf/package.py
@@ -63,9 +63,9 @@ class Cbtf(Package):
     variant('runtime', default=False,
             description="build only the runtime libraries and collectors.")
 
-    depends_on("cmake@3.0.2", type='build')
+    depends_on("cmake@3.0.2:", type='build')
     depends_on("boost@1.50.0:")
-    depends_on("mrnet@5.0.1:+lwthreads+krellpatch")
+    depends_on("mrnet@5.0.1:+lwthreads")
     depends_on("xerces-c@3.1.1:")
     # Work around for spack libxml2 package bug, take off python when fixed
     depends_on("libxml2+python")
diff --git a/var/spack/repos/builtin/packages/cdd/package.py b/var/spack/repos/builtin/packages/cdd/package.py
index 8896942baecf52b963c55fac43cad35aa5af7cf6..bff942af2560b453f4a25fb3ad0751f17861ea43 100644
--- a/var/spack/repos/builtin/packages/cdd/package.py
+++ b/var/spack/repos/builtin/packages/cdd/package.py
@@ -37,7 +37,7 @@ class Cdd(Package):
 
     def url_for_version(self, version):
         return ("ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cdd-%s.tar.gz" %
-                str(version.dotted()).replace('.', ''))
+                str(version.dotted).replace('.', ''))
 
     version('0.61a', '22c24a7a9349dd7ec0e24531925a02d9')
 
diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py
index ebfd3f9250e909b4abc2f5143f24eb552f3399f3..a16572246bc9c634e9c9090644bf5ab72bbb1f74 100644
--- a/var/spack/repos/builtin/packages/cgal/package.py
+++ b/var/spack/repos/builtin/packages/cgal/package.py
@@ -44,13 +44,31 @@ class Cgal(Package):
     variant('debug', default=False,
             description='Builds a debug version of the libraries')
 
+    # ---- See "7 CGAL Libraries" at:
+    # http://doc.cgal.org/latest/Manual/installation.html
+
+    # The CORE library provides exact arithmetic for geometric computations.
+    # See: http://cs.nyu.edu/exact/core_pages/
+    #      http://cs.nyu.edu/exact/core_pages/svn-core.html
+    variant('core', default=False,
+            description='Build the CORE library for algebraic numbers')
+    variant('imageio', default=False,
+            description='Build utilities to read/write image files')
+    variant('demos', default=False,
+            description='Build CGAL demos')
+
     # Essential Third Party Libraries
-    depends_on('boost')
+    depends_on('boost+thread+system')
     depends_on('gmp')
     depends_on('mpfr')
+
+    # Required for CGAL_ImageIO
+    # depends_on('opengl', when='+imageio') # not yet in Spack
     depends_on('zlib')
-    # depends_on('opengl')
-    depends_on('qt@5:')
+
+    # Optional to build CGAL_Qt5 (demos)
+    # depends_on('opengl', when='+demos')   # not yet in Spack
+    depends_on('qt@5:', when='+demos')
 
     # Optional Third Party Libraries
     # depends_on('leda')
@@ -70,20 +88,19 @@ def install(self, spec, prefix):
         # Installation instructions:
         # http://doc.cgal.org/latest/Manual/installation.html
 
-        options = []
-        options.extend(std_cmake_args)
-
-        # CGAL supports only Release and Debug build type. Any other build type
-        # will raise an error at configure time
-        if '+debug' in spec:
-            options.append('-DCMAKE_BUILD_TYPE:STRING=Debug')
-        else:
-            options.append('-DCMAKE_BUILD_TYPE:STRING=Release')
-
-        if '+shared' in spec:
-            options.append('-DBUILD_SHARED_LIBS:BOOL=ON')
-        else:
-            options.append('-DBUILD_SHARED_LIBS:BOOL=OFF')
+        options = std_cmake_args + [
+            # CGAL supports only Release and Debug build type. Any
+            # other build type will raise an error at configure time
+            '-DCMAKE_BUILD_TYPE:STRING=%s' %
+            ('Debug' if '+debug' in spec else 'Release'),
+            '-DBUILD_SHARED_LIBS:BOOL=%s' %
+            ('ON' if '+shared' in spec else 'OFF'),
+            '-DWITH_CGAL_Core:BOOL=%s' %
+            ('YES' if '+core' in spec else 'NO'),
+            '-DWITH_CGAL_ImageIO:BOOL=%s' %
+            ('YES' if '+imageio' in spec else 'NO'),
+            '-DWITH_CGAL_Qt5:BOOL=%s' %
+            ('YES' if '+demos' in spec else 'NO')]
 
         with working_dir('spack-build', create=True):
             cmake('..', *options)
diff --git a/var/spack/repos/builtin/packages/compiz/package.py b/var/spack/repos/builtin/packages/compiz/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ec21f5b4f2f91d27416e427f18d5945124f7344f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/compiz/package.py
@@ -0,0 +1,63 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Compiz(Package):
+    """compiz - OpenGL window and compositing manager.
+
+    Compiz is an OpenGL compositing manager that use
+    GLX_EXT_texture_from_pixmap for binding redirected top-level
+    windows to texture objects. It has a flexible plug-in system
+    and it is designed to run well on most graphics hardware."""
+
+    homepage = "http://www.compiz.org/"
+    url      = "https://www.x.org/archive/individual/app/compiz-0.7.8.tar.gz"
+
+    version('0.7.8', 'e99977d9170a7bd5d571004eed038428')
+
+    depends_on('libxcb')
+    depends_on('libxcomposite')
+    depends_on('libxfixes')
+    depends_on('libxdamage')
+    depends_on('libxrandr')
+    depends_on('libxinerama')
+    depends_on('libice')
+    depends_on('libsm')
+    depends_on('libxml2')
+    depends_on('libxslt')
+
+    # TODO: add dependencies
+    # libstartup-notification-1.0 >= 0.7
+    depends_on('libxrender')
+    depends_on('libpng')
+    depends_on('glib')
+    depends_on('gconf')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/compositeproto/package.py b/var/spack/repos/builtin/packages/compositeproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b3fbda0af4ef6f5f54730505f071bdefc88066d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/compositeproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Compositeproto(Package):
+    """Composite Extension.
+
+    This package contains header files and documentation for the composite
+    extension.  Library and server implementations are separate."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/compositeproto"
+    url      = "https://www.x.org/archive/individual/proto/compositeproto-0.4.2.tar.gz"
+
+    version('0.4.2', '2dea7c339432b3363faf2d29c208e7b5')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/constype/package.py b/var/spack/repos/builtin/packages/constype/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..dcf88fdd55c0da000386c69a0438da8cc063fed8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/constype/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Constype(Package):
+    """constype prints on the standard output the Sun code for the type of
+    display that the specified device is.
+
+    It was originally written for SunOS, but has been ported to other
+    SPARC OS'es and to Solaris on both SPARC & x86."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/constype"
+    url      = "https://www.x.org/archive/individual/app/constype-1.0.4.tar.gz"
+
+    version('1.0.4', '2333b9ac9fd32e58b05afa651c4590a3')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/damageproto/package.py b/var/spack/repos/builtin/packages/damageproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..84e0fac3110d81cc16275e8ca60ef131d8507865
--- /dev/null
+++ b/var/spack/repos/builtin/packages/damageproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Damageproto(Package):
+    """X Damage Extension.
+
+    This package contains header files and documentation for the X Damage
+    extension.  Library and server implementations are separate."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/damageproto"
+    url      = "https://www.x.org/releases/individual/proto/damageproto-1.2.1.tar.gz"
+
+    version('1.2.1', 'bf8c47b7f48625230cff155180f8ddce')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index 1dee94bfffb2a619fa20ee33c3b12248e4a12095..dbccd01b996b90b1e501be37652f11f0e3767161 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -244,118 +244,5 @@ def install(self, spec, prefix):
             make("test")
         make("install")
 
-        # run some MPI examples with different solvers from PETSc and Trilinos
-        if self.run_tests:
-            env['DEAL_II_DIR'] = prefix
-            print('=====================================')
-            print('============ EXAMPLES ===============')
-            print('=====================================')
-            # take bare-bones step-3
-            print('=====================================')
-            print('============ Step-3 =================')
-            print('=====================================')
-            with working_dir('examples/step-3'):
-                cmake('.')
-                make('release')
-                make('run', parallel=False)
-
-            # An example which uses Metis + PETSc
-            # FIXME: switch step-18 to MPI
-            with working_dir('examples/step-18'):
-                print('=====================================')
-                print('============= Step-18 ===============')
-                print('=====================================')
-                # list the number of cycles to speed up
-                filter_file(r'(end_time = 10;)',  ('end_time = 3;'),
-                            'step-18.cc')
-                if '^petsc' in spec and '^metis' in spec:
-                    cmake('.')
-                    make('release')
-                    make('run', parallel=False)
-
-            # take step-40 which can use both PETSc and Trilinos
-            # FIXME: switch step-40 to MPI run
-            with working_dir('examples/step-40'):
-                print('=====================================')
-                print('========== Step-40 PETSc ============')
-                print('=====================================')
-                # list the number of cycles to speed up
-                filter_file(r'(const unsigned int n_cycles = 8;)',
-                            ('const unsigned int n_cycles = 2;'), 'step-40.cc')
-                cmake('.')
-                if '^petsc' in spec:
-                    make('release')
-                    make('run', parallel=False)
-
-                print('=====================================')
-                print('========= Step-40 Trilinos ==========')
-                print('=====================================')
-                # change Linear Algebra to Trilinos
-                # The below filter_file should be different for versions
-                # before and after 8.4.0
-                if spec.satisfies('@8.4.0:'):
-                    filter_file(r'(\/\/ #define FORCE_USE_OF_TRILINOS.*)',
-                                ('#define FORCE_USE_OF_TRILINOS'),
-                                'step-40.cc')
-                else:
-                    filter_file(r'(#define USE_PETSC_LA.*)',
-                                ('// #define USE_PETSC_LA'), 'step-40.cc')
-                if '^trilinos+hypre' in spec:
-                    make('release')
-                    make('run', parallel=False)
-
-                # the rest of the tests on step 40 only works for
-                # dealii version 8.4.0 and after
-                if spec.satisfies('@8.4.0:'):
-                    print('=====================================')
-                    print('=== Step-40 Trilinos SuperluDist ====')
-                    print('=====================================')
-                    # change to direct solvers
-                    filter_file(r'(LA::SolverCG solver\(solver_control\);)',  ('TrilinosWrappers::SolverDirect::AdditionalData data(false,"Amesos_Superludist"); TrilinosWrappers::SolverDirect solver(solver_control,data);'), 'step-40.cc')  # noqa
-                    filter_file(
-                        r'(LA::MPI::PreconditionAMG preconditioner;)',
-                        (''), 'step-40.cc')
-                    filter_file(
-                        r'(LA::MPI::PreconditionAMG::AdditionalData data;)',
-                        (''), 'step-40.cc')
-                    filter_file(
-                        r'(preconditioner.initialize\(system_matrix, data\);)',
-                        (''), 'step-40.cc')
-                    filter_file(
-                        r'(solver\.solve \(system_matrix, completely_distributed_solution, system_rhs,)',  ('solver.solve (system_matrix, completely_distributed_solution, system_rhs);'), 'step-40.cc')  # noqa
-                    filter_file(
-                        r'(preconditioner\);)',  (''), 'step-40.cc')
-                    if '^trilinos+superlu-dist' in spec:
-                        make('release')
-                        make('run', paralle=False)
-
-                    print('=====================================')
-                    print('====== Step-40 Trilinos MUMPS =======')
-                    print('=====================================')
-                    # switch to Mumps
-                    filter_file(r'(Amesos_Superludist)',
-                                ('Amesos_Mumps'), 'step-40.cc')
-                    if '^trilinos+mumps' in spec:
-                        make('release')
-                        make('run', parallel=False)
-
-            print('=====================================')
-            print('============ Step-36 ================')
-            print('=====================================')
-            with working_dir('examples/step-36'):
-                if 'slepc' in spec:
-                    cmake('.')
-                    make('release')
-                    make('run', parallel=False)
-
-            print('=====================================')
-            print('============ Step-54 ================')
-            print('=====================================')
-            with working_dir('examples/step-54'):
-                if 'oce' in spec:
-                    cmake('.')
-                    make('release')
-                    make('run', parallel=False)
-
     def setup_environment(self, spack_env, env):
         env.set('DEAL_II_DIR', self.prefix)
diff --git a/var/spack/repos/builtin/packages/dmxproto/package.py b/var/spack/repos/builtin/packages/dmxproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..34213bba5f55e3d53f8c5790a79758e43681a8c8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/dmxproto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Dmxproto(Package):
+    """Distributed Multihead X (DMX) Extension.
+
+    This extension defines a protocol for clients to access a front-end proxy
+    X server that controls multiple back-end X servers making up a large
+    display."""
+
+    homepage = "http://dmx.sourceforge.net/"
+    url      = "https://www.x.org/archive/individual/proto/dmxproto-2.3.1.tar.gz"
+
+    version('2.3.1', '7c52af95aac192e8de31bd9a588ce121')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/dri2proto/package.py b/var/spack/repos/builtin/packages/dri2proto/package.py
index 65b86714f12e6bb2402920fc068a5ddda3baee6f..d05e7ea2316512d76f6e2fb6696407d93b9a1f0a 100644
--- a/var/spack/repos/builtin/packages/dri2proto/package.py
+++ b/var/spack/repos/builtin/packages/dri2proto/package.py
@@ -26,14 +26,21 @@
 
 
 class Dri2proto(Package):
-    """DRI2 Protocol Headers."""
-    homepage = "http://http://cgit.freedesktop.org/xorg/proto/dri2proto/"
-    url      = "http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.8.tar.gz"
+    """Direct Rendering Infrastructure 2 Extension.
+
+    This extension defines a protocol to securely allow user applications to
+    access the video hardware without requiring data to be passed through the
+    X server."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/dri2proto/"
+    url      = "https://www.x.org/releases/individual/proto/dri2proto-2.8.tar.gz"
 
     version('2.8', '19ea18f63d8ae8053c9fa84b60365b77')
 
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
 
-        make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/dri3proto/package.py b/var/spack/repos/builtin/packages/dri3proto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..cd2594d5da6b48404aefe5e0c0a0b62cf2985ea5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/dri3proto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Dri3proto(Package):
+    """Direct Rendering Infrastructure 3 Extension.
+
+    This extension defines a protocol to securely allow user applications to
+    access the video hardware without requiring data to be passed through the
+    X server."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/dri3proto/"
+    url      = "https://www.x.org/releases/individual/proto/dri3proto-1.0.tar.gz"
+
+    version('1.0', '25e84a49a076862277ee12aebd49ff5f')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/editres/package.py b/var/spack/repos/builtin/packages/editres/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..52ad33b1334d482a32be77ab5afca931a7ba36dc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/editres/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Editres(Package):
+    """Dynamic resource editor for X Toolkit applications."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/editres"
+    url      = "https://www.x.org/archive/individual/app/editres-1.0.6.tar.gz"
+
+    version('1.0.6', '310c504347ca499874593ac96e935353')
+
+    depends_on('libxaw')
+    depends_on('libx11')
+    depends_on('libxt')
+    depends_on('libxmu')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/encodings/package.py b/var/spack/repos/builtin/packages/encodings/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..67b21a6e073606f58d03ca016dcf586bbdcc0065
--- /dev/null
+++ b/var/spack/repos/builtin/packages/encodings/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Encodings(Package):
+    """X.org encodings font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/encodings"
+    url      = "https://www.x.org/archive/individual/font/encodings-1.0.4.tar.gz"
+
+    version('1.0.4', '1a631784ce204d667abcc329b851670c')
+
+    depends_on('font-util')
+
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/etsf_io/package.py b/var/spack/repos/builtin/packages/etsf_io/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c1e6f2ededaaadddd2c2a39d24d653402fee2bf8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/etsf_io/package.py
@@ -0,0 +1,67 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class EtsfIo(Package):
+    """ETSF_IO is a library implementing the Nanoquanta/ETSF file
+    format specifications.
+
+    ETSF_IO enables an architecture-independent exchange of crystallographic
+    data, electronic wavefunctions, densities and potentials, as well as
+    spectroscopic data. It is meant to be used by quantum-physical and
+    quantum-chemical applications relying upon Density Functional Theory (DFT).
+    """
+
+    homepage = "http://www.etsf.eu/resources/software/libraries_and_tools"
+    url = "https://launchpad.net/etsf-io/1.0/1.0.4/+download/etsf_io-1.0.4.tar.gz"
+
+    version('1.0.4', '32d0f7143278bd925b334c69fa425da1')
+
+    depends_on("netcdf-fortran")
+    depends_on("hdf5+mpi~cxx", when='+mpi')  # required for NetCDF-4 support
+
+    def install(self, spec, prefix):
+        options = ['--prefix=%s' % prefix]
+        oapp = options.append
+
+        # Specify installation directory for Fortran module files
+        # Default is [INCLUDEDIR/FC_TYPE]
+        oapp("--with-moduledir=%s" % prefix.include)
+
+        # Netcdf4/HDF
+        hdf_libs = "-L%s -lhdf5_hl -lhdf5" % spec["hdf5"].prefix.lib
+        options.extend([
+            "--with-netcdf-incs=-I%s" % spec["netcdf-fortran"].prefix.include,
+            "--with-netcdf-libs=-L%s -lnetcdff -lnetcdf %s" % (
+                spec["netcdf-fortran"].prefix.lib, hdf_libs),
+        ])
+
+        configure(*options)
+
+        make()
+        make("check")
+        make("install")
diff --git a/var/spack/repos/builtin/packages/evieext/package.py b/var/spack/repos/builtin/packages/evieext/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..afc0245f506c5d8422331a04a63314e845c3ac12
--- /dev/null
+++ b/var/spack/repos/builtin/packages/evieext/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Evieext(Package):
+    """Extended Visual Information Extension (XEVIE).
+
+    This extension defines a protocol for a client to determine information
+    about core X visuals beyond what the core protocol provides."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/evieproto"
+    url      = "https://www.x.org/archive/individual/proto/evieext-1.1.1.tar.gz"
+
+    version('1.1.1', '018a7d24d0c7926d594246320bcb6a86')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/exodusii/cmake-exodus.patch b/var/spack/repos/builtin/packages/exodusii/cmake-exodus.patch
new file mode 100644
index 0000000000000000000000000000000000000000..014381de888da43346f74238f0ef51acd163ede1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/exodusii/cmake-exodus.patch
@@ -0,0 +1,9 @@
+diff --git a/cmake-exodus b/cmake-exodus
+index 67ccd34..9b749e3 100755
+--- a/cmake-exodus
++++ b/cmake-exodus
+@@ -1,3 +1,4 @@
++#!/bin/bash
+ EXTRA_ARGS=$@
+ 
+ ### The following assumes you are building in a subdirectory of ACCESS Root
diff --git a/var/spack/repos/builtin/packages/exodusii/exodus-cmake.patch b/var/spack/repos/builtin/packages/exodusii/exodus-cmake.patch
deleted file mode 100644
index 25355269caec11afaa1d45d4e0bf5903b71ff9b6..0000000000000000000000000000000000000000
--- a/var/spack/repos/builtin/packages/exodusii/exodus-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake-exodus b/cmake-exodus
-index 787fd9d..ed073a2 100755
---- a/cmake-exodus
-+++ b/cmake-exodus
-@@ -1,4 +1,6 @@
--EXTRA_ARGS=$@
-+#!/bin/bash
-+
-+EXTRA_ARGS=-DSEACASProj_ENABLE_CXX11=OFF
- 
- ### Change this to point to the compilers you want to use
- CC=gcc
diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py
index 15fe1e89a666425842a58d9750264ab558faeea6..67024673b23ed20e27f28d3f442760d3e9e1da2e 100644
--- a/var/spack/repos/builtin/packages/exodusii/package.py
+++ b/var/spack/repos/builtin/packages/exodusii/package.py
@@ -27,10 +27,8 @@
 # TODO: Add support for a C++11 enabled installation that filters out the
 # TODO: "C++11-Disabled" flag (but only if the spec compiler supports C++11).
 
-# TODO: Add support for parallel installation that uses MPI.
-
-# TODO: Create installation options for NetCDF that support larger page size
-# TODO: suggested by Exodus (see the repository "README" file).
+# TODO: Use variant forwarding to forward the 'mpi' variant to the direct
+# TODO: dependencies 'hdf5' and 'netcdf'.
 
 
 class Exodusii(Package):
@@ -46,34 +44,43 @@ class Exodusii(Package):
     homepage = "https://github.com/gsjaardema/seacas"
     url      = "https://github.com/gsjaardema/seacas/archive/master.zip"
 
-    version('2016-02-08',
-            git='https://github.com/gsjaardema/seacas.git', commit='dcf3529')
+    version('2016-08-09', git='https://github.com/gsjaardema/seacas.git', commit='2ffeb1b')
 
-    depends_on('cmake@2.8.7:', type='build')
-    depends_on('hdf5~shared~mpi')
-    depends_on('netcdf~mpi')
+    variant('mpi', default=True, description='Enables MPI parallelism.')
 
-    patch('exodus-cmake.patch')
+    depends_on('cmake@2.8.11:', type='build')
+    depends_on('mpi', when='+mpi')
 
-    def patch(self):
-        ff = FileFilter('cmake-exodus')
+    # https://github.com/gsjaardema/seacas/blob/master/NetCDF-Mapping.md
+    depends_on('netcdf maxdims=65536 maxvars=524288')
+    depends_on('hdf5+shared')
 
-        ff.filter('CMAKE_INSTALL_PREFIX:PATH=${ACCESS}',
-                  'CMAKE_INSTALL_PREFIX:PATH=%s' % self.spec.prefix,
-                  string=True)
-        ff.filter('NetCDF_DIR:PATH=${TPL}',
-                  'NetCDF_DIR:PATH=%s' % self.spec['netcdf'].prefix,
-                  string=True)
-        ff.filter('HDF5_ROOT:PATH=${TPL}',
-                  'HDF5_ROOT:PATH=%s' % self.spec['hdf5'].prefix,
-                  string=True)
+    patch('cmake-exodus.patch')
 
     def install(self, spec, prefix):
-        mkdirp('build')
-        cd('build')
+        cc_path = spec['mpi'].mpicc if '+mpi' in spec else self.compiler.cc
+        cxx_path = spec['mpi'].mpicxx if '+mpi' in spec else self.compiler.cxx
+
+        config_args = std_cmake_args[:]
+        config_args.extend([
+            # General Flags #
+            '-DSEACASProj_ENABLE_CXX11:BOOL=OFF',
+            '-DSEACASProj_ENABLE_Zoltan:BOOL=OFF',
+            '-DHDF5_ROOT:PATH={0}'.format(spec['hdf5'].prefix),
+            '-DNetCDF_DIR:PATH={0}'.format(spec['netcdf'].prefix),
+
+            # MPI Flags #
+            '-DTPL_ENABLE_MPI={0}'.format('ON' if '+mpi' in spec else 'OFF'),
+            '-DCMAKE_C_COMPILER={0}'.format(cc_path),
+            '-DCMAKE_CXX_COMPILER={0}'.format(cxx_path),
+        ])
+
+        build_directory = join_path(self.stage.source_path, 'spack-build')
+        source_directory = self.stage.source_path
 
-        cmake_exodus = Executable('../cmake-exodus')
-        cmake_exodus()
+        with working_dir(build_directory, create=True):
+            mcmake = Executable(join_path(source_directory, 'cmake-exodus'))
+            mcmake(*config_args)
 
-        make()
-        make('install')
+            make()
+            make('install')
diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py
index 0e85f410c19fb31bf5b53e52c63d7634d0899367..fb784b7571a6c4dc56ba12cbe211a7ab4d91fa57 100644
--- a/var/spack/repos/builtin/packages/fish/package.py
+++ b/var/spack/repos/builtin/packages/fish/package.py
@@ -32,8 +32,7 @@ class Fish(Package):
 
     homepage = "http://fishshell.com/"
     url      = "http://fishshell.com/files/2.2.0/fish-2.2.0.tar.gz"
-    list_url = "http://fishshell.com/files/"
-    list_depth = 2
+    list_url = "http://fishshell.com/"
 
     version('2.2.0', 'a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a')
 
diff --git a/var/spack/repos/builtin/packages/fixesproto/package.py b/var/spack/repos/builtin/packages/fixesproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..64852b40e2939e94bd124c798c471a9566e9064a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fixesproto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fixesproto(Package):
+    """X Fixes Extension.
+
+    The extension makes changes to many areas of the protocol to resolve
+    issues raised by application interaction with core protocol mechanisms
+    that cannot be adequately worked around on the client side of the wire."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/fixesproto"
+    url      = "https://www.x.org/archive/individual/proto/fixesproto-5.0.tar.gz"
+
+    version('5.0', '1b3115574cadd4cbea1f197faa7c1de4')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..bde6f352da6b0a790865b13ea2ee2211b0b499f8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-adobe-100dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontAdobe100dpi(Package):
+    """X.org adobe-100dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/adobe-100dpi"
+    url      = "https://www.x.org/archive/individual/font/font-adobe-100dpi-1.0.3.tar.gz"
+
+    version('1.0.3', 'ba61e7953f4f5cec5a8e69c262bbc7f9')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..380fcf363e479a6a0bf4e6ea62f038f7fcf69103
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-adobe-75dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontAdobe75dpi(Package):
+    """X.org adobe-75dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/adobe-75dpi"
+    url      = "https://www.x.org/archive/individual/font/font-adobe-75dpi-1.0.3.tar.gz"
+
+    version('1.0.3', '7a414bb661949cec938938fd678cf649')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9782d259b5fe503ef9da6f6ec0bc4053f64d8ba4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-adobe-utopia-100dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontAdobeUtopia100dpi(Package):
+    """X.org adobe-utopia-100dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/adobe-utopia-100dpi"
+    url      = "https://www.x.org/archive/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.gz"
+
+    version('1.0.4', '128416eccd59b850f77a9b803681da3c')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b687a7814ee6a5696bb19f01a0b6e641b106898
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-adobe-utopia-75dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontAdobeUtopia75dpi(Package):
+    """X.org adobe-utopia-75dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/adobe-utopia-75dpi"
+    url      = "https://www.x.org/archive/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.gz"
+
+    version('1.0.4', '74c73a5b73c6c3224b299f1fc033e508')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..14004e98833eaa022bf390d449c7a8072f90f970
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-adobe-utopia-type1/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontAdobeUtopiaType1(Package):
+    """X.org adobe-utopia-type1 font."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/font/adobe-utopia-type1"
+    url      = "https://www.x.org/archive/individual/font/font-adobe-utopia-type1-1.0.4.tar.gz"
+
+    version('1.0.4', 'b0676c3495acabad519ee98a94163904')
+
+    depends_on('font-util', type='build')
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-alias/package.py b/var/spack/repos/builtin/packages/font-alias/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..eb8c79fe2a6cb63ffcf700931e0c112117bbd54e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-alias/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontAlias(Package):
+    """X.org alias font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/alias"
+    url      = "https://www.x.org/archive/individual/font/font-alias-1.0.3.tar.gz"
+
+    version('1.0.3', '535138efe0a95f5fe521be6a6b9c4888')
+
+    depends_on('font-util')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-arabic-misc/package.py b/var/spack/repos/builtin/packages/font-arabic-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8307d58d6e52e02f44d65cfc01e3be4ab82a1db7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-arabic-misc/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontArabicMisc(Package):
+    """X.org arabic-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/arabic-misc"
+    url      = "https://www.x.org/archive/individual/font/font-arabic-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '918457df65ef93f09969c6ab01071789')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bh-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1d488a6cd9dfcc0a23b369530173225d7091bc4c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bh-100dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBh100dpi(Package):
+    """X.org bh-100dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bh-100dpi"
+    url      = "https://www.x.org/archive/individual/font/font-bh-100dpi-1.0.3.tar.gz"
+
+    version('1.0.3', '09e63a5608000531179e1ab068a35878')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bh-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..22420dd88730360bec2f96404c1382273e59ac49
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bh-75dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBh75dpi(Package):
+    """X.org bh-75dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bh-75dpi"
+    url      = "https://www.x.org/archive/individual/font/font-bh-75dpi-1.0.3.tar.gz"
+
+    version('1.0.3', '88fec4ebc4a265684bff3abdd066f14f')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..173195a5572e6a6881407e56c6a81115b658dca5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-100dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBhLucidatypewriter100dpi(Package):
+    """X.org bh-lucidatypewriter-100dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi"
+    url      = "https://www.x.org/archive/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.gz"
+
+    version('1.0.3', '5f716f54e497fb4ec1bb3a5d650ac6f7')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9066823bc36b05d7d921527384440ad502de0c72
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bh-lucidatypewriter-75dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBhLucidatypewriter75dpi(Package):
+    """X.org bh-lucidatypewriter-75dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi"
+    url      = "https://www.x.org/archive/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.gz"
+
+    version('1.0.3', 'cab8a44ae329aab7141c7adeef0daf5a')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bh-ttf/package.py b/var/spack/repos/builtin/packages/font-bh-ttf/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a10b88d355e764dbfd3c63fb7e7327b4d4939156
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bh-ttf/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBhTtf(Package):
+    """X.org bh-ttf font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bh-ttf"
+    url      = "https://www.x.org/archive/individual/font/font-bh-ttf-1.0.3.tar.gz"
+
+    version('1.0.3', '4ce741ec4edaa11cd38988d355a7578b')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bh-type1/package.py b/var/spack/repos/builtin/packages/font-bh-type1/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..fffc2e40953ab1cd07b9f307e254b3073233e794
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bh-type1/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBhType1(Package):
+    """X.org bh-type1 font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bh-type1"
+    url      = "https://www.x.org/archive/individual/font/font-bh-type1-1.0.3.tar.gz"
+
+    version('1.0.3', '62d4e8f782a6a0658784072a5df5ac98')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e8e11ae627304964c9e6afb997c14c93141a65f4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bitstream-100dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBitstream100dpi(Package):
+    """X.org bitstream-100dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bitstream-100dpi"
+    url      = "https://www.x.org/archive/individual/font/font-bitstream-100dpi-1.0.3.tar.gz"
+
+    version('1.0.3', 'c27bf37e9b8039f93bd90b8131ed37ad')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5dd033964ba654ab43545136b8e9f22f1b9a912c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bitstream-75dpi/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBitstream75dpi(Package):
+    """X.org bitstream-75dpi font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bitstream-75dpi"
+    url      = "https://www.x.org/archive/individual/font/font-bitstream-75dpi-1.0.3.tar.gz"
+
+    version('1.0.3', '4ff6c5d6aebe69371e27b09ad8313d25')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e746f241df34aacbb6065fcd3bfd942be167288f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bitstream-speedo/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBitstreamSpeedo(Package):
+    """X.org bitstream-speedo font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bitstream-speedo"
+    url      = "https://www.x.org/archive/individual/font/font-bitstream-speedo-1.0.2.tar.gz"
+
+    version('1.0.2', 'f0a777b351cf5adefefcf4823e0c1c01')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-bitstream-type1/package.py b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..65289685c396af03069971fc4ad4e1445cfb7ed6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-bitstream-type1/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontBitstreamType1(Package):
+    """X.org bitstream-type1 font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/bitstream-type1"
+    url      = "https://www.x.org/archive/individual/font/font-bitstream-type1-1.0.3.tar.gz"
+
+    version('1.0.3', 'ff91738c4d3646d7999e00aa9923f2a0')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..07e1330fe653ea76844e531bde22522ccb62769c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-cronyx-cyrillic/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontCronyxCyrillic(Package):
+    """X.org cronyx-cyrillic font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/cronyx-cyrillic"
+    url      = "https://www.x.org/archive/individual/font/font-cronyx-cyrillic-1.0.3.tar.gz"
+
+    version('1.0.3', '3119ba1bc7f775c162c96e17a912fe30')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-cursor-misc/package.py b/var/spack/repos/builtin/packages/font-cursor-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6fddc015e309d1ad65691b1f4d6319c3e0837d63
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-cursor-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontCursorMisc(Package):
+    """X.org cursor-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/cursor-misc"
+    url      = "https://www.x.org/archive/individual/font/font-cursor-misc-1.0.3.tar.gz"
+
+    version('1.0.3', 'a0bf70c7e498f1cd8e3fdf6154f2bb00')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-daewoo-misc/package.py b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3dd3b59b1430dcb72fb3d7fd403997bb6df15150
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-daewoo-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontDaewooMisc(Package):
+    """X.org daewoo-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/daewoo-misc"
+    url      = "https://www.x.org/archive/individual/font/font-daewoo-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '71a7e2796f045c9d217a19c4e6c25bc1')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-dec-misc/package.py b/var/spack/repos/builtin/packages/font-dec-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..035ae3eb15f0906e0bebc99f308d2b8a69e8be44
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-dec-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontDecMisc(Package):
+    """X.org dec-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/dec-misc"
+    url      = "https://www.x.org/archive/individual/font/font-dec-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '5a9242f6b60ecf2b8c5b158322ca2a40')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-ibm-type1/package.py b/var/spack/repos/builtin/packages/font-ibm-type1/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..34bbe85cfb5cd992635f3d5c93be7dbd2decdb46
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-ibm-type1/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontIbmType1(Package):
+    """X.org ibm-type1 font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/ibm-type1"
+    url      = "https://www.x.org/archive/individual/font/font-ibm-type1-1.0.3.tar.gz"
+
+    version('1.0.3', '2806116e4adcb89d3d5ff5faf65e57c1')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-isas-misc/package.py b/var/spack/repos/builtin/packages/font-isas-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..b0575f8ffc754a458dca1ddd0f77944b6476a74d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-isas-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontIsasMisc(Package):
+    """X.org isas-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/isas-misc"
+    url      = "https://www.x.org/archive/individual/font/font-isas-misc-1.0.3.tar.gz"
+
+    version('1.0.3', 'ecc3b6fbe8f5721ddf5c7fc66f73e76f')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-jis-misc/package.py b/var/spack/repos/builtin/packages/font-jis-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a5bee3fe31efbca4b0c5f95fbb6f86cdc25a55b6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-jis-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontJisMisc(Package):
+    """X.org jis-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/jis-misc"
+    url      = "https://www.x.org/archive/individual/font/font-jis-misc-1.0.3.tar.gz"
+
+    version('1.0.3', 'c48ee5749ae25075d2c7a6111c195e7b')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-micro-misc/package.py b/var/spack/repos/builtin/packages/font-micro-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..930a299beb5b70e0a2bf0afbbe409a61a696cda6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-micro-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontMicroMisc(Package):
+    """X.org micro-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/micro-misc"
+    url      = "https://www.x.org/archive/individual/font/font-micro-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '4de3f0ce500aef85f198c52ace5e66ac')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4d25552732edb3ceb9b9415f4aea149de1ef3d33
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-misc-cyrillic/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontMiscCyrillic(Package):
+    """X.org misc-cyrillic font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/misc-cyrillic"
+    url      = "https://www.x.org/archive/individual/font/font-misc-cyrillic-1.0.3.tar.gz"
+
+    version('1.0.3', 'e7b13da5325f62dd3f630beade6d2656')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6ccdc4e4820db5c3a33c6125c201a64836351bd9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-misc-ethiopic/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontMiscEthiopic(Package):
+    """X.org misc-ethiopic font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/misc-ethiopic"
+    url      = "https://www.x.org/archive/individual/font/font-misc-ethiopic-1.0.3.tar.gz"
+
+    version('1.0.3', '02ddea9338d9d36804ad38f3daadb55a')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-misc-meltho/package.py b/var/spack/repos/builtin/packages/font-misc-meltho/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..eda84e2b32172c52908f2354a7e2aaebc6ecee0e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-misc-meltho/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontMiscMeltho(Package):
+    """X.org misc-meltho font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/misc-meltho"
+    url      = "https://www.x.org/archive/individual/font/font-misc-meltho-1.0.3.tar.gz"
+
+    version('1.0.3', '8380696483478449c39b04612f20eea8')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-misc-misc/package.py b/var/spack/repos/builtin/packages/font-misc-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c960d18b393c77da2a53776bf5acdcb76ec8973e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-misc-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontMiscMisc(Package):
+    """X.org misc-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/misc-misc"
+    url      = "https://www.x.org/archive/individual/font/font-misc-misc-1.1.2.tar.gz"
+
+    version('1.1.2', '23a79b92275375315129b440206c85b9')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-mutt-misc/package.py b/var/spack/repos/builtin/packages/font-mutt-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a5d4cae0605177eb244de935eb2d18d70db52a45
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-mutt-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontMuttMisc(Package):
+    """X.org mutt-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/mutt-misc"
+    url      = "https://www.x.org/archive/individual/font/font-mutt-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '6c2de53ba514f720e02af48eef28ff32')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-schumacher-misc/package.py b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..193fa2691e66ad21569c3751b74b69c913a805dc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-schumacher-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontSchumacherMisc(Package):
+    """X.org schumacher-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/schumacher-misc"
+    url      = "https://www.x.org/archive/individual/font/font-schumacher-misc-1.1.2.tar.gz"
+
+    version('1.1.2', '1f3386a0a690ba8117fc05b501f9f91b')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5914a3c9de8d94b3fd08b2818270fe5bcea55fde
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-screen-cyrillic/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontScreenCyrillic(Package):
+    """X.org screen-cyrillic font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/screen-cyrillic"
+    url      = "https://www.x.org/archive/individual/font/font-screen-cyrillic-1.0.4.tar.gz"
+
+    version('1.0.4', '4cadaf2ba4c4d0f4cb9b4e7b8f0a3019')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-sony-misc/package.py b/var/spack/repos/builtin/packages/font-sony-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..145ee20971e0c6b4ef6307126c4fd08382f56c9a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-sony-misc/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontSonyMisc(Package):
+    """X.org sony-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/sony-misc"
+    url      = "https://www.x.org/archive/individual/font/font-sony-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '4026cb88e2253efc0b8376003780ccb6')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-sun-misc/package.py b/var/spack/repos/builtin/packages/font-sun-misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..dcf5b9e2178e74b2e0542304a207850aff0640c5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-sun-misc/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontSunMisc(Package):
+    """X.org sun-misc font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/sun-misc"
+    url      = "https://www.x.org/archive/individual/font/font-sun-misc-1.0.3.tar.gz"
+
+    version('1.0.3', '87ce97ce0582e76bc4064a4d4d10db09')
+
+    depends_on('font-util')
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0b310117c673a3abcf51c3e84adedd452c726cf2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-util/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontUtil(Package):
+    """X.Org font package creation/installation utilities."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/util"
+    url      = "https://www.x.org/archive/individual/font/font-util-1.3.1.tar.gz"
+
+    version('1.3.1', 'd153a9af216e4498fa171faea2c82514')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0af366c7423725f66b9a0cba59679861e1c19d4a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-winitzki-cyrillic/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontWinitzkiCyrillic(Package):
+    """X.org winitzki-cyrillic font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/winitzki-cyrillic"
+    url      = "https://www.x.org/archive/individual/font/font-winitzki-cyrillic-1.0.3.tar.gz"
+
+    version('1.0.3', '777c667b080b33793528d5abf3247a48')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/font-xfree86-type1/package.py b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..dceac106a948bc7856bea8bb314a12064aabb975
--- /dev/null
+++ b/var/spack/repos/builtin/packages/font-xfree86-type1/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class FontXfree86Type1(Package):
+    """X.org xfree86-type1 font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/font/xfree86-type1"
+    url      = "https://www.x.org/archive/individual/font/font-xfree86-type1-1.0.4.tar.gz"
+
+    version('1.0.4', '89c33c5176cd580de6636ad50ce7777b')
+
+    depends_on('font-util')
+
+    depends_on('fontconfig', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('mkfontscale', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
+
+        # `make install` copies the files to the font-util installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/fontcacheproto/package.py b/var/spack/repos/builtin/packages/fontcacheproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..77feb8757384eaef05982f2667c12444d795bbf2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fontcacheproto/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fontcacheproto(Package):
+    """X.org FontcacheProto protocol headers."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/fontcacheproto"
+    url      = "https://www.x.org/archive/individual/proto/fontcacheproto-0.1.3.tar.gz"
+
+    version('0.1.3', '5a91ab914ffbfbc856e6fcde52e6f3e3')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/fontsproto/package.py b/var/spack/repos/builtin/packages/fontsproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c3771e18fae9c3d8a4e85f9f8542a4d78be881a2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fontsproto/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fontsproto(Package):
+    """X Fonts Extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/fontsproto"
+    url      = "https://www.x.org/archive/individual/proto/fontsproto-2.1.3.tar.gz"
+
+    version('2.1.3', '0415f0360e33f3202af67c6c46782251')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/fonttosfnt/package.py b/var/spack/repos/builtin/packages/fonttosfnt/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..016cab1ac86f9fc26f6695ec349b43fa6eb5070d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fonttosfnt/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fonttosfnt(Package):
+    """Wrap a bitmap font in a sfnt (TrueType) wrapper."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/fonttosfnt"
+    url      = "https://www.x.org/archive/individual/app/fonttosfnt-1.0.4.tar.gz"
+
+    version('1.0.4', 'ba77fd047a9cca400f17db8c46b06ce8')
+
+    depends_on('freetype')
+    depends_on('libfontenc')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/fslsfonts/package.py b/var/spack/repos/builtin/packages/fslsfonts/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6e46bd6b5aa471441008836001f4da0cc969ea34
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fslsfonts/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fslsfonts(Package):
+    """fslsfonts produces a list of fonts served by an X font server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/fslsfonts"
+    url      = "https://www.x.org/archive/individual/app/fslsfonts-1.0.5.tar.gz"
+
+    version('1.0.5', 'ef781bd6a7b529d3ed7a256055715730')
+
+    depends_on('libfs')
+
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/fstobdf/package.py b/var/spack/repos/builtin/packages/fstobdf/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6358e33d2a761397edbe020f84f190d131d9fdce
--- /dev/null
+++ b/var/spack/repos/builtin/packages/fstobdf/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Fstobdf(Package):
+    """The fstobdf program reads a font from a font server and prints a BDF
+    file on the standard output that may be used to recreate the font.
+    This is useful in testing servers, debugging font metrics, and
+    reproducing lost BDF files."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/fstobdf"
+    url      = "https://www.x.org/archive/individual/app/fstobdf-1.0.6.tar.gz"
+
+    version('1.0.6', '6d3f24673fcb9ce266f49dc140bbf250')
+
+    depends_on('libx11')
+    depends_on('libfs')
+
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index d152ce61c7a44d584b87e471f0736559911aa585..792b624f095f83d83eb083665a343ba8a8028103 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -66,7 +66,8 @@ def install(self, spec, prefix):
 
         enabled_languages = set(('c', 'c++', 'fortran', 'java', 'objc'))
 
-        if spec.satisfies("@4.7.1:") and sys.platform != 'darwin':
+        if spec.satisfies("@4.7.1:") and sys.platform != 'darwin' and \
+           not (spec.satisfies('@:4.9.3') and 'ppc64le' in spec.architecture):
             enabled_languages.add('go')
 
         # Fix a standard header file for OS X Yosemite that
diff --git a/var/spack/repos/builtin/packages/gccmakedep/package.py b/var/spack/repos/builtin/packages/gccmakedep/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ed2530d89e1b984519b62a68a1b3d24a8a3a726d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gccmakedep/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Gccmakedep(Package):
+    """X.org gccmakedep utilities."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/util/gccmakedep/"
+    url      = "https://www.x.org/archive/individual/util/gccmakedep-1.0.3.tar.gz"
+
+    version('1.0.3', '127ddb6131eb4a56fdf6644a63ade788')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/gconf/package.py b/var/spack/repos/builtin/packages/gconf/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3b3abc71ed854bea78a74751e7328a7998c236b3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gconf/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Gconf(Package):
+    """GConf is a system for storing application preferences."""
+
+    homepage = "https://projects.gnome.org/gconf/"
+    url      = "ftp://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz"
+
+    version('3.2.6', '2b16996d0e4b112856ee5c59130e822c')
+
+    depends_on('glib@2.14.0:')
+    depends_on('libxml2')
+
+    # TODO: add missing dependencies
+    # gio-2.0 >= 2.31.0
+    # gthread-2.0
+    # gmodule-2.0 >= 2.7.0
+    # gobject-2.0 >= 2.7.0
+    # dbus-1 >= 1.0.0
+    # dbus-glib-1 >= 0.74
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/glproto/package.py b/var/spack/repos/builtin/packages/glproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..462e5290676364fe71a20ebb2eae37f61ffb04ce
--- /dev/null
+++ b/var/spack/repos/builtin/packages/glproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Glproto(Package):
+    """OpenGL Extension to the X Window System.
+
+    This extension defines a protocol for the client to send 3D rendering
+    commands to the X server."""
+
+    homepage = "https://www.x.org/wiki/"
+    url      = "https://www.x.org/archive/individual/proto/glproto-1.4.17.tar.gz"
+
+    version('1.4.17', 'd69554c1b51a83f2c6976a640819911b')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/gperf/package.py b/var/spack/repos/builtin/packages/gperf/package.py
index 0e54d0e0372301e6811d698ccf3bcfb1029f1b8f..0ae07b33fcb9a62c6c65e192a3df18d4d5629116 100644
--- a/var/spack/repos/builtin/packages/gperf/package.py
+++ b/var/spack/repos/builtin/packages/gperf/package.py
@@ -39,6 +39,8 @@ class Gperf(Package):
     version('3.0.4', 'c1f1db32fb6598d6a93e6e88796a8632')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
+
         make()
-        make("install")
+        # make('check')  # fails tests
+        make('install')
diff --git a/var/spack/repos/builtin/packages/grandr/package.py b/var/spack/repos/builtin/packages/grandr/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8097d4fa01c78d538d845972967c431b1533511f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/grandr/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Grandr(Package):
+    """RandR user interface using GTK+ libraries."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/app/grandr"
+    url      = "https://www.x.org/archive/individual/app/grandr-0.1.tar.gz"
+
+    version('0.1', '707109a105f2ab1bb216e6e6a5a10ba4')
+
+    depends_on('gtkplus@2.0.0:')
+    depends_on('gconf')
+    depends_on('xrandr@1.2:')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/hsakmt/package.py b/var/spack/repos/builtin/packages/hsakmt/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0daad4afedf0e36b9d80b76463f26eb6d5ac57b6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hsakmt/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Hsakmt(Package):
+    """hsakmt is a thunk library that provides a userspace interface to amdkfd
+    (AMD's HSA Linux kernel driver). It is the HSA equivalent of libdrm."""
+
+    homepage = "https://cgit.freedesktop.org/amd/hsakmt/"
+    url      = "https://www.x.org/archive/individual/lib/hsakmt-1.0.0.tar.gz"
+
+    version('1.0.0', '9beb20104e505300daf541266c4c3c3d')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xorg-util-macros/package.py b/var/spack/repos/builtin/packages/htop/package.py
similarity index 77%
rename from var/spack/repos/builtin/packages/xorg-util-macros/package.py
rename to var/spack/repos/builtin/packages/htop/package.py
index 3cfc4c24081f8580974ac0b4c8aefa8674e64fc6..3df0a353567c92336a7f78a3b1af9d450c6b7ece 100644
--- a/var/spack/repos/builtin/packages/xorg-util-macros/package.py
+++ b/var/spack/repos/builtin/packages/htop/package.py
@@ -25,15 +25,17 @@
 from spack import *
 
 
-class XorgUtilMacros(Package):
-    """The m4 macros used by all of the Xorg packages."""
+class Htop(Package):
+    """htop is an interactive text-mode process viewer for Unix systems."""
 
-    homepage = "https://cgit.freedesktop.org/xorg/util/macros/"
-    url = "http://ftp.x.org/pub/individual/util/util-macros-1.19.0.tar.bz2"
+    homepage = "https://github.com/hishamhm/htop"
+    url      = "https://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz"
 
-    version('1.19.0', '1cf984125e75f8204938d998a8b6c1e1')
+    version('2.0.2', '7d354d904bad591a931ad57e99fea84a')
+
+    depends_on('ncurses')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix=%s' % prefix)
         make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index 53c3b851b39a1fd065bf41d71cfc959247c3d32b..3c288e79337ef22c17940a64c003d67a1a532cf0 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -35,6 +35,7 @@ class Hypre(Package):
     homepage = "http://computation.llnl.gov/project/linear_solvers/software.php"
     url      = "http://computation.llnl.gov/project/linear_solvers/download/hypre-2.10.0b.tar.gz"
 
+    version('2.11.1', '3f02ef8fd679239a6723f60b7f796519')
     version('2.10.1', 'dc048c4cabb3cd549af72591474ad674')
     version('2.10.0b', '768be38793a35bb5d055905b271f5b8e')
 
diff --git a/var/spack/repos/builtin/packages/iceauth/package.py b/var/spack/repos/builtin/packages/iceauth/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..59c6e0e7b710e6a52f77eb7d4ae4bb5dc5f03c56
--- /dev/null
+++ b/var/spack/repos/builtin/packages/iceauth/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Iceauth(Package):
+    """The iceauth program is used to edit and display the authorization
+    information used in connecting with ICE.   It operates very much
+    like the xauth program for X11 connection authentication records."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/iceauth"
+    url      = "https://www.x.org/archive/individual/app/iceauth-1.0.7.tar.gz"
+
+    version('1.0.7', '183e834ec8bd096ac084ad4acbc29f51')
+
+    depends_on('libice')
+
+    depends_on('xproto@7.0.22:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/ico/package.py b/var/spack/repos/builtin/packages/ico/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5e523575cab28ecec146431463656274546d760b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/ico/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Ico(Package):
+    """ico is a simple animation program that may be used for testing various
+    X11 operations and extensions.  It displays a wire-frame rotating
+    polyhedron, with hidden lines removed, or a solid-fill polyhedron with
+    hidden faces removed."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/ico"
+    url      = "https://www.x.org/archive/individual/app/ico-1.0.4.tar.gz"
+
+    version('1.0.4', '8833b2da01a7f919b0db8e5a49184c0f')
+
+    depends_on('libx11@0.99.1:')
+
+    depends_on('xproto@7.0.22:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py
index 848ebfdeace4470d4aeb21d194816ee4dd0caa9d..e2fcb7bd5ffb6c4b90fe503288865e16f1e73fb7 100644
--- a/var/spack/repos/builtin/packages/icu4c/package.py
+++ b/var/spack/repos/builtin/packages/icu4c/package.py
@@ -42,7 +42,8 @@ def url_for_version(self, version):
 
     def install(self, spec, prefix):
         with working_dir('source'):
-            configure('--prefix={0}'.format(prefix))
+            configure('--prefix={0}'.format(prefix),
+                      '--enable-rpath')
 
             make()
             make('check')
diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..32542b039169e9b46c9a287c9b60b9c5bca88994
--- /dev/null
+++ b/var/spack/repos/builtin/packages/imake/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Imake(Package):
+    """The imake build system."""
+
+    homepage = "http://www.snake.net/software/imake-stuff/"
+    url      = "https://www.x.org/archive/individual/util/imake-1.0.7.tar.gz"
+
+    version('1.0.7', '186ca7b8ff0de8752f2a2d0426542363')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/inputproto/package.py b/var/spack/repos/builtin/packages/inputproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..915986ef6810ea0de145a4fdc8f8d4b1014be98a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/inputproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Inputproto(Package):
+    """X Input Extension.
+
+    This extension defines a protocol to provide additional input devices
+    management such as graphic tablets."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/inputproto"
+    url      = "https://www.x.org/archive/individual/proto/inputproto-2.3.2.tar.gz"
+
+    version('2.3.2', '6450bad6f8d5ebe354b01b734d1fd7ca')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/intel-gpu-tools/package.py b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..132e29839b2fe4c4a96fac6456a5014e4548f979
--- /dev/null
+++ b/var/spack/repos/builtin/packages/intel-gpu-tools/package.py
@@ -0,0 +1,67 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class IntelGpuTools(Package):
+    """Intel GPU Tools is a collection of tools for development and testing of
+    the Intel DRM driver. There are many macro-level test suites that get used
+    against the driver, including xtest, rendercheck, piglit, and oglconform,
+    but failures from those can be difficult to track down to kernel changes,
+    and many require complicated build procedures or specific testing
+    environments to get useful results. Therefore, Intel GPU Tools includes
+    low-level tools and tests specifically for development and testing of the
+    Intel DRM Driver."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
+    url      = "https://www.x.org/archive/individual/app/intel-gpu-tools-1.16.tar.gz"
+
+    version('1.16', '3996f10fc86a28ec59e1cf7b227dad78')
+
+    depends_on('libdrm@2.4.64:')
+    depends_on('libpciaccess@0.10:')
+    depends_on('cairo@1.12.0:')
+    depends_on('glib')
+
+    depends_on('flex', type='build')
+    depends_on('bison', type='build')
+    depends_on('python@3:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    # xrandr ?
+
+    # gtk-doc-tools
+    # libunwind-dev
+    # python-docutils
+    # x11proto-dri2-dev
+    # xutils-dev
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py
index bab09204345d001a25d071e60f7188b9ba676d38..518a46943506c387df6bf00d39964ab313bc193d 100644
--- a/var/spack/repos/builtin/packages/jdk/package.py
+++ b/var/spack/repos/builtin/packages/jdk/package.py
@@ -26,10 +26,7 @@
 # Author: Justin Too <too1@llnl.gov>
 #
 import distutils.dir_util
-
-import spack
 from spack import *
-import llnl.util.tty as tty
 
 
 class Jdk(Package):
@@ -37,11 +34,6 @@ class Jdk(Package):
        in the form of a binary product aimed at Java developers."""
     homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html"
 
-    version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf',
-            url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz")
-    version('8u92-linux-x64', '65a1cc17ea362453a6e0eb4f13be76e4',
-            url="http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz")
-
     # Oracle requires that you accept their License Agreement in order
     # to access the Java packages in download.oracle.com. In order to
     # automate this process, we need to utilize these additional curl
@@ -53,18 +45,12 @@ class Jdk(Package):
         '-H',  # specify required License Agreement cookie
         'Cookie: oraclelicense=accept-securebackup-cookie']
 
-    def do_fetch(self, mirror_only=False):
-        # Add our custom curl commandline options
-        tty.msg(
-            "[Jdk] Adding required commandline options to curl " +
-            "before performing fetch: %s" %
-            (self.curl_options))
-
-        for option in self.curl_options:
-            spack.curl.add_default_arg(option)
-
-        # Now perform the actual fetch
-        super(Jdk, self).do_fetch(mirror_only)
+    version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf',
+            url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz",
+            curl_options=curl_options)
+    version('8u92-linux-x64', '65a1cc17ea362453a6e0eb4f13be76e4',
+            url="http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz",
+            curl_options=curl_options)
 
     def install(self, spec, prefix):
         distutils.dir_util.copy_tree(".", prefix)
diff --git a/var/spack/repos/builtin/packages/kbproto/package.py b/var/spack/repos/builtin/packages/kbproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..356d1c6b4fd4a5ec48638855cf08e37eb37092c5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/kbproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Kbproto(Package):
+    """X Keyboard Extension.
+
+    This extension defines a protcol to provide a number of new capabilities
+    and controls for text keyboards."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/kbproto"
+    url      = "https://www.x.org/archive/individual/proto/kbproto-1.0.7.tar.gz"
+
+    version('1.0.7', '19acc5f02ae80381e216f443134e0bbb')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/lbxproxy/package.py b/var/spack/repos/builtin/packages/lbxproxy/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3de3ade0c9d364e854c2729343c2e50024fb3ac8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/lbxproxy/package.py
@@ -0,0 +1,58 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Lbxproxy(Package):
+    """lbxproxy accepts client connections, multiplexes them over a single
+    connection to the X server, and performs various optimizations on the
+    X protocol to make it faster over low bandwidth and/or high latency
+    connections.
+
+    Note that the X server source from X.Org no longer supports the LBX
+    extension, so this program is only useful in connecting to older
+    X servers."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/lbxproxy"
+    url      = "https://www.x.org/archive/individual/app/lbxproxy-1.0.3.tar.gz"
+
+    version('1.0.3', '50a2a1ae15e8edf7582f76bcdf6b8197')
+
+    depends_on('libxext')
+    depends_on('liblbxutil')
+    depends_on('libx11')
+    depends_on('libice')
+
+    depends_on('xtrans', type='build')
+    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('bigreqsproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libapplewm/package.py b/var/spack/repos/builtin/packages/libapplewm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..85408053ad2d2a17d168085f04f070c18cd963d2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libapplewm/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libapplewm(Package):
+    """AppleWM is a simple library designed to interface with the Apple-WM
+    extension. This extension allows X window managers to better interact with
+    the Mac OS X Aqua user interface when running X11 in a rootless mode."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libAppleWM"
+    url      = "https://www.x.org/archive/individual/lib/libAppleWM-1.4.1.tar.gz"
+
+    version('1.4.1', '52c587641eb57f00978d28d98d487af8')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('applewmproto@1.4:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        # Crashes with this error message on Linux:
+        # HIServices/Processes.h: No such file or directory
+        # May only build properly on macOS?
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..fa469fd4232bb8ec2023ef99064725cc9c476c55
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libdmx/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libdmx(Package):
+    """libdmx - X Window System DMX (Distributed Multihead X) extension
+    library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libdmx"
+    url      = "https://www.x.org/archive/individual/lib/libdmx-1.1.3.tar.gz"
+
+    version('1.1.3', 'eed755e7cdb161e05f70e955f2b0ef4d')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('dmxproto@2.2.99.1:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libdrm/package.py b/var/spack/repos/builtin/packages/libdrm/package.py
index 543eab11b3832e60b0b3260a600f91877d0caf29..ab9661269eae089c9ee6483d0217d214bc8de6ff 100644
--- a/var/spack/repos/builtin/packages/libdrm/package.py
+++ b/var/spack/repos/builtin/packages/libdrm/package.py
@@ -30,16 +30,21 @@ class Libdrm(Package):
     rendering  manager, on  Linux,  BSD and  other  operating
     systems that support the  ioctl interface."""
 
-    homepage = "http://dri.freedesktop.org/libdrm/"  # no real website...
+    homepage = "http://dri.freedesktop.org/libdrm/"
     url      = "http://dri.freedesktop.org/libdrm/libdrm-2.4.59.tar.gz"
 
+    version('2.4.70', 'a8c275bce5f3d71a5ca25e8fb60df084')
     version('2.4.59', '105ac7af1afcd742d402ca7b4eb168b6')
     version('2.4.33', '86e4e3debe7087d5404461e0032231c8')
 
-    depends_on('libpciaccess')
+    depends_on('libpciaccess@0.10:')
+    depends_on('libpthread-stubs')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix),
+                  '--enable-static',
+                  'LIBS=-lrt')  # This fixes a bug with `make check`
 
         make()
-        make("install")
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libfontenc/package.py b/var/spack/repos/builtin/packages/libfontenc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1c7fa196d9d88631add1f460b534d521e94665e9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libfontenc/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libfontenc(Package):
+    """libfontenc - font encoding library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libfontenc"
+    url      = "https://www.x.org/archive/individual/lib/libfontenc-1.1.3.tar.gz"
+
+    version('1.1.3', '0ffa28542aa7d246299b1f7211cdb768')
+
+    depends_on('zlib')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libfs/package.py b/var/spack/repos/builtin/packages/libfs/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..96bf62afd7f965f9522ec1492e0c214232b2e85f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libfs/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libfs(Package):
+    """libFS - X Font Service client library.
+
+    This library is used by clients of X Font Servers (xfs), such as
+    xfsinfo, fslsfonts, and the X servers themselves."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libFS"
+    url      = "https://www.x.org/archive/individual/lib/libFS-1.0.7.tar.gz"
+
+    version('1.0.7', 'd8c1246f5b3d0e7ccf2190d3bf2ecb73')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('fontsproto', type='build')
+    depends_on('xtrans', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libice/package.py b/var/spack/repos/builtin/packages/libice/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1f6fd2f9015b91d3d5f46e03e7efc56b9fc552c7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libice/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libice(Package):
+    """libICE - Inter-Client Exchange Library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libICE"
+    url      = "https://www.x.org/archive/individual/lib/libICE-1.0.9.tar.gz"
+
+    version('1.0.9', '95812d61df8139c7cacc1325a26d5e37')
+
+    depends_on('xproto', type='build')
+    depends_on('xtrans', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/liblbxutil/package.py b/var/spack/repos/builtin/packages/liblbxutil/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1de59defd6c7b86b36fab89c3be9586ea8aef1d8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/liblbxutil/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Liblbxutil(Package):
+    """liblbxutil - Low Bandwith X extension (LBX) utility routines."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/liblbxutil"
+    url      = "https://www.x.org/archive/individual/lib/liblbxutil-1.1.0.tar.gz"
+
+    version('1.1.0', '2735cd23625d4cc870ec4eb7ca272788')
+
+    depends_on('xextproto@7.0.99.1:', type='build')
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    # There is a bug in the library that causes the following messages:
+    # undefined symbol: Xfree
+    # undefined symbol: Xalloc
+    # See https://bugs.freedesktop.org/show_bug.cgi?id=8421
+    # Adding a dependency on libxdmcp and adding LIBS=-lXdmcp did not fix it
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/liboldx/package.py b/var/spack/repos/builtin/packages/liboldx/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9e85f1ed65f8470095ab458119793a622b92d5c8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/liboldx/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Liboldx(Package):
+    """X version 10 backwards compatibility."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/liboldX/"
+    url      = "https://www.x.org/archive/individual/lib/liboldX-1.0.1.tar.gz"
+
+    version('1.0.1', 'ea7c4b6a19bf2d04100e2580abf83fae')
+
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libpciaccess/package.py b/var/spack/repos/builtin/packages/libpciaccess/package.py
index 1775a24ebc8e7b5f36c789ca7bdb647b2a76a928..f4a3cf7157ff24dfa06aee8f76f811da206a19d9 100644
--- a/var/spack/repos/builtin/packages/libpciaccess/package.py
+++ b/var/spack/repos/builtin/packages/libpciaccess/package.py
@@ -29,11 +29,13 @@ class Libpciaccess(Package):
     """Generic PCI access library."""
 
     homepage = "http://cgit.freedesktop.org/xorg/lib/libpciaccess/"
-    url      = "http://xorg.freedesktop.org/archive/individual/lib/libpciaccess-0.13.4.tar.bz2"
+    url      = "http://xorg.freedesktop.org/archive/individual/lib/libpciaccess-0.13.4.tar.gz"
 
-    version('0.13.4', 'ace78aec799b1cf6dfaea55d3879ed9f')
+    version('0.13.4', 'cc1fad87da60682af1d5fa43a5da45a4')
 
     depends_on('libtool', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):
         # libpciaccess does not support OS X
@@ -42,6 +44,7 @@ def install(self, spec, prefix):
             mkdir(prefix.lib)
             return
 
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
+
         make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libpthread-stubs/package.py b/var/spack/repos/builtin/packages/libpthread-stubs/package.py
index ea36758a83c40204db865ff1ba6f786430d0b25d..fdaf327c2a7e5837243bff10ba7d6fd7e861b2c9 100644
--- a/var/spack/repos/builtin/packages/libpthread-stubs/package.py
+++ b/var/spack/repos/builtin/packages/libpthread-stubs/package.py
@@ -27,14 +27,14 @@
 
 class LibpthreadStubs(Package):
     """The libpthread-stubs package provides weak aliases for pthread
-       functions not provided in libc or otherwise available by
-       default. """
-    homepage = "http://xcb.freedesktop.org/"
-    url      = "http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2"
+    functions not provided in libc or otherwise available by default."""
 
-    version('0.3', 'e8fa31b42e13f87e8f5a7a2b731db7ee')
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.gz"
+
+    version('0.3', 'a09d928c4af54fe5436002345ef71138')
 
     def install(self, spec, prefix):
-        configure('--prefix=%s' % prefix)
-        make()
-        make("install")
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py
index 715d24bcf7a38e6c75db0d4039ce2485e2e1a461..6c8b27478ac3d5553545d5f23fd18a2b995a5ef2 100644
--- a/var/spack/repos/builtin/packages/libsigsegv/package.py
+++ b/var/spack/repos/builtin/packages/libsigsegv/package.py
@@ -30,6 +30,8 @@ class Libsigsegv(Package):
     homepage = "https://www.gnu.org/software/libsigsegv/"
     url      = "ftp://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.10.tar.gz"
 
+    patch('patch.new_config_guess', when='@2.10')
+
     version('2.10', '7f96fb1f65b3b8cbc1582fb7be774f0f')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/libsigsegv/patch.new_config_guess b/var/spack/repos/builtin/packages/libsigsegv/patch.new_config_guess
new file mode 100644
index 0000000000000000000000000000000000000000..3ecc7458f7774f28f7ca1a233e763736c26a105c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libsigsegv/patch.new_config_guess
@@ -0,0 +1,1187 @@
+--- a/build-aux/config.guess	2010-11-06 04:18:40.000000000 -0700
++++ b/build-aux/config.guess	2016-10-18 13:38:39.950379000 -0700
+@@ -1,14 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2016 Free Software Foundation, Inc.
+ 
+-timestamp='2010-09-24'
++timestamp='2016-10-02'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -17,26 +15,22 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner.  Please send patches (context
+-# diff format) to <config-patches@gnu.org> and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
++#
++# Please send patches to <config-patches@gnu.org>.
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,9 +50,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+-Software Foundation, Inc.
++Copyright 1992-2016 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -92,7 +84,7 @@
+   exit 1
+ fi
+ 
+-trap 'exit 1' HUP INT TERM
++trap 'exit 1' 1 2 15
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+@@ -106,7 +98,7 @@
+ 
+ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+@@ -140,12 +132,33 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
++case "${UNAME_SYSTEM}" in
++Linux|GNU|GNU/*)
++	# If the system lacks a compiler, then just pick glibc.
++	# We could probably try harder.
++	LIBC=gnu
++
++	eval $set_cc_for_build
++	cat <<-EOF > $dummy.c
++	#include <features.h>
++	#if defined(__UCLIBC__)
++	LIBC=uclibc
++	#elif defined(__dietlibc__)
++	LIBC=dietlibc
++	#else
++	LIBC=gnu
++	#endif
++	EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
++	;;
++esac
++
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+ 	# NetBSD (nbsd) targets should (where applicable) match one or
+-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+@@ -155,19 +168,29 @@
+ 	# Note: NetBSD doesn't particularly care about the vendor
+ 	# portion of the name.  We always set it to "unknown".
+ 	sysctl="sysctl -n hw.machine_arch"
+-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
++	    /sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || \
++	    echo unknown)`
+ 	case "${UNAME_MACHINE_ARCH}" in
+ 	    armeb) machine=armeb-unknown ;;
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
+ 	    sh5el) machine=sh5le-unknown ;;
++	    earmv*)
++		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
++		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
++		machine=${arch}${endian}-unknown
++		;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+-	# to ELF recently, or will in the future.
++	# to ELF recently (or will in the future) and ABI.
+ 	case "${UNAME_MACHINE_ARCH}" in
++	    earm*)
++		os=netbsdelf
++		;;
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -181,7 +204,14 @@
+ 		fi
+ 		;;
+ 	    *)
+-	        os=netbsd
++		os=netbsd
++		;;
++	esac
++	# Determine ABI tags.
++	case "${UNAME_MACHINE_ARCH}" in
++	    earm*)
++		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
++		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ 		;;
+ 	esac
+ 	# The OS release
+@@ -194,18 +224,26 @@
+ 		release='-gnu'
+ 		;;
+ 	    *)
+-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ 		;;
+ 	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+-	echo "${machine}-${os}${release}"
++	echo "${machine}-${os}${release}${abi}"
++	exit ;;
++    *:Bitrig:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ 	exit ;;
+     *:OpenBSD:*:*)
+ 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ 	exit ;;
++    *:LibertyBSD:*:*)
++	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
++	exit ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ 	exit ;;
+@@ -218,13 +256,16 @@
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ 	exit ;;
++    *:Sortix:*:*)
++	echo ${UNAME_MACHINE}-unknown-sortix
++	exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 		;;
+ 	*5.*)
+-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ 		;;
+ 	esac
+ 	# According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -234,43 +275,46 @@
+ 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ 	case "$ALPHA_CPU_TYPE" in
+ 	    "EV4 (21064)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "EV4.5 (21064)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "LCA4 (21066/21068)")
+-		UNAME_MACHINE="alpha" ;;
++		UNAME_MACHINE=alpha ;;
+ 	    "EV5 (21164)")
+-		UNAME_MACHINE="alphaev5" ;;
++		UNAME_MACHINE=alphaev5 ;;
+ 	    "EV5.6 (21164A)")
+-		UNAME_MACHINE="alphaev56" ;;
++		UNAME_MACHINE=alphaev56 ;;
+ 	    "EV5.6 (21164PC)")
+-		UNAME_MACHINE="alphapca56" ;;
++		UNAME_MACHINE=alphapca56 ;;
+ 	    "EV5.7 (21164PC)")
+-		UNAME_MACHINE="alphapca57" ;;
++		UNAME_MACHINE=alphapca57 ;;
+ 	    "EV6 (21264)")
+-		UNAME_MACHINE="alphaev6" ;;
++		UNAME_MACHINE=alphaev6 ;;
+ 	    "EV6.7 (21264A)")
+-		UNAME_MACHINE="alphaev67" ;;
++		UNAME_MACHINE=alphaev67 ;;
+ 	    "EV6.8CB (21264C)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.8AL (21264B)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.8CX (21264D)")
+-		UNAME_MACHINE="alphaev68" ;;
++		UNAME_MACHINE=alphaev68 ;;
+ 	    "EV6.9A (21264/EV69A)")
+-		UNAME_MACHINE="alphaev69" ;;
++		UNAME_MACHINE=alphaev69 ;;
+ 	    "EV7 (21364)")
+-		UNAME_MACHINE="alphaev7" ;;
++		UNAME_MACHINE=alphaev7 ;;
+ 	    "EV7.9 (21364A)")
+-		UNAME_MACHINE="alphaev79" ;;
++		UNAME_MACHINE=alphaev79 ;;
+ 	esac
+ 	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit ;;
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++	exitcode=$?
++	trap '' 0
++	exit $exitcode ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+@@ -296,12 +340,12 @@
+ 	echo s390-ibm-zvmoe
+ 	exit ;;
+     *:OS400:*:*)
+-        echo powerpc-ibm-os400
++	echo powerpc-ibm-os400
+ 	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit ;;
+-    arm:riscos:*:*|arm:RISCOS:*:*)
++    arm*:riscos:*:*|arm*:RISCOS:*:*)
+ 	echo arm-unknown-riscos
+ 	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+@@ -339,16 +383,16 @@
+ 	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	eval $set_cc_for_build
+-	SUN_ARCH="i386"
++	SUN_ARCH=i386
+ 	# If there is a compiler, see if it is configured for 64-bit objects.
+ 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ 	# This test works for both compilers.
+-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+ 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+ 		grep IS_64BIT_ARCH >/dev/null
+ 	    then
+-		SUN_ARCH="x86_64"
++		SUN_ARCH=x86_64
+ 	    fi
+ 	fi
+ 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+@@ -373,7 +417,7 @@
+ 	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
++	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+ 		echo m68k-sun-sunos${UNAME_RELEASE}
+@@ -395,23 +439,23 @@
+     # MiNT.  But MiNT is downward compatible to TOS, so this should
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit ;;
++	exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+-        echo m68k-atari-mint${UNAME_RELEASE}
++	echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+-        echo m68k-milan-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-milan-mint${UNAME_RELEASE}
++	exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+-        echo m68k-hades-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-hades-mint${UNAME_RELEASE}
++	exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+-        echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit ;;
++	echo m68k-unknown-mint${UNAME_RELEASE}
++	exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit ;;
+@@ -481,8 +525,8 @@
+ 	echo m88k-motorola-sysv3
+ 	exit ;;
+     AViiON:dgux:*:*)
+-        # DG/UX returns AViiON for all architectures
+-        UNAME_PROCESSOR=`/usr/bin/uname -p`
++	# DG/UX returns AViiON for all architectures
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
+ 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -495,7 +539,7 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit ;;
++	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+ 	exit ;;
+@@ -559,8 +603,9 @@
+ 	else
+ 		IBM_ARCH=powerpc
+ 	fi
+-	if [ -x /usr/bin/oslevel ] ; then
+-		IBM_REV=`/usr/bin/oslevel`
++	if [ -x /usr/bin/lslpp ] ; then
++		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
++			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+ 	else
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+@@ -595,58 +640,58 @@
+ 	    9000/[678][0-9][0-9])
+ 		if [ -x /usr/bin/getconf ]; then
+ 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+-                    case "${sc_cpu_version}" in
+-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+-                      532)                      # CPU_PA_RISC2_0
+-                        case "${sc_kernel_bits}" in
+-                          32) HP_ARCH="hppa2.0n" ;;
+-                          64) HP_ARCH="hppa2.0w" ;;
+-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+-                        esac ;;
+-                    esac
++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++		    case "${sc_cpu_version}" in
++		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
++		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
++		      532)                      # CPU_PA_RISC2_0
++			case "${sc_kernel_bits}" in
++			  32) HP_ARCH=hppa2.0n ;;
++			  64) HP_ARCH=hppa2.0w ;;
++			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
++			esac ;;
++		    esac
+ 		fi
+ 		if [ "${HP_ARCH}" = "" ]; then
+ 		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++		    sed 's/^		//' << EOF >$dummy.c
+ 
+-              #define _HPUX_SOURCE
+-              #include <stdlib.h>
+-              #include <unistd.h>
+-
+-              int main ()
+-              {
+-              #if defined(_SC_KERNEL_BITS)
+-                  long bits = sysconf(_SC_KERNEL_BITS);
+-              #endif
+-                  long cpu  = sysconf (_SC_CPU_VERSION);
+-
+-                  switch (cpu)
+-              	{
+-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+-              	case CPU_PA_RISC2_0:
+-              #if defined(_SC_KERNEL_BITS)
+-              	    switch (bits)
+-              		{
+-              		case 64: puts ("hppa2.0w"); break;
+-              		case 32: puts ("hppa2.0n"); break;
+-              		default: puts ("hppa2.0"); break;
+-              		} break;
+-              #else  /* !defined(_SC_KERNEL_BITS) */
+-              	    puts ("hppa2.0"); break;
+-              #endif
+-              	default: puts ("hppa1.0"); break;
+-              	}
+-                  exit (0);
+-              }
++		#define _HPUX_SOURCE
++		#include <stdlib.h>
++		#include <unistd.h>
++
++		int main ()
++		{
++		#if defined(_SC_KERNEL_BITS)
++		    long bits = sysconf(_SC_KERNEL_BITS);
++		#endif
++		    long cpu  = sysconf (_SC_CPU_VERSION);
++
++		    switch (cpu)
++			{
++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++			case CPU_PA_RISC2_0:
++		#if defined(_SC_KERNEL_BITS)
++			    switch (bits)
++				{
++				case 64: puts ("hppa2.0w"); break;
++				case 32: puts ("hppa2.0n"); break;
++				default: puts ("hppa2.0"); break;
++				} break;
++		#else  /* !defined(_SC_KERNEL_BITS) */
++			    puts ("hppa2.0"); break;
++		#endif
++			default: puts ("hppa1.0"); break;
++			}
++		    exit (0);
++		}
+ EOF
+-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ 		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
+-	if [ ${HP_ARCH} = "hppa2.0w" ]
++	if [ ${HP_ARCH} = hppa2.0w ]
+ 	then
+ 	    eval $set_cc_for_build
+ 
+@@ -659,12 +704,12 @@
+ 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ 	    # => hppa64-hp-hpux11.23
+ 
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
+ 		grep -q __LP64__
+ 	    then
+-		HP_ARCH="hppa2.0w"
++		HP_ARCH=hppa2.0w
+ 	    else
+-		HP_ARCH="hppa64"
++		HP_ARCH=hppa64
+ 	    fi
+ 	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+@@ -731,22 +776,22 @@
+ 	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit ;;
++	exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit ;;
++	exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit ;;
++	exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit ;;
++	exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit ;;
++	exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+@@ -769,15 +814,15 @@
+ 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit ;;
++	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
++	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit ;;
+     5000:UNIX_System_V:4.*:*)
+-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -789,30 +834,35 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit ;;
+     *:FreeBSD:*:*)
+-	case ${UNAME_MACHINE} in
+-	    pc98)
+-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	UNAME_PROCESSOR=`/usr/bin/uname -p`
++	case ${UNAME_PROCESSOR} in
+ 	    amd64)
+ 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	    *)
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ 	esac
+ 	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    *:MINGW64*:*)
++	echo ${UNAME_MACHINE}-pc-mingw64
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
++    *:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     i*:windows32*:*)
+-    	# uname -m includes "-pc" on this system.
+-    	echo ${UNAME_MACHINE}-mingw32
++	# uname -m includes "-pc" on this system.
++	echo ${UNAME_MACHINE}-mingw32
+ 	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+     *:Interix*:*)
+-    	case ${UNAME_MACHINE} in
++	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+@@ -849,15 +899,22 @@
+ 	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ 	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    aarch64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    aarch64_be:Linux:*:*)
++	UNAME_MACHINE=aarch64_be
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+@@ -867,52 +924,62 @@
+ 	  EV6)   UNAME_MACHINE=alphaev6 ;;
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
++	esac
+ 	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    arc:Linux:*:* | arceb:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	else
+-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++		| grep -q __ARM_PCS_VFP
++	    then
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
++	    else
++		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
++	    fi
+ 	fi
+ 	exit ;;
+     avr32*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     cris:Linux:*:*)
+-	echo cris-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ 	exit ;;
+     crisv32:Linux:*:*)
+-	echo crisv32-axis-linux-gnu
++	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
++	exit ;;
++    e2k:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     frv:Linux:*:*)
+-    	echo frv-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    hexagon:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:Linux:*:*)
+-	LIBC=gnu
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    k1om:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m32r*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+@@ -931,54 +998,69 @@
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+ 	;;
+-    or32:Linux:*:*)
+-	echo or32-unknown-linux-gnu
++    mips64el:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++	exit ;;
++    openrisc*:Linux:*:*)
++	echo or1k-unknown-linux-${LIBC}
++	exit ;;
++    or32:Linux:*:* | or1k*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     padre:Linux:*:*)
+-	echo sparc-unknown-linux-gnu
++	echo sparc-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++	echo hppa64-unknown-linux-${LIBC}
+ 	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+-	  *)    echo hppa-unknown-linux-gnu ;;
++	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
++	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
++	  *)    echo hppa-unknown-linux-${LIBC} ;;
+ 	esac
+ 	exit ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
++	echo powerpc64-unknown-linux-${LIBC}
+ 	exit ;;
+     ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
++	echo powerpc-unknown-linux-${LIBC}
++	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
++	exit ;;
++    riscv32:Linux:*:* | riscv64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+-	echo ${UNAME_MACHINE}-ibm-linux
++	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ 	exit ;;
+     sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     tile*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-tilera-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     vax:Linux:*:*)
+-	echo ${UNAME_MACHINE}-dec-linux-gnu
++	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ 	exit ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ 	exit ;;
+     xtensa*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ 	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -987,11 +1069,11 @@
+ 	echo i386-sequent-sysv4
+ 	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+-        # Unixware is an offshoot of SVR4, but it has its own version
+-        # number series starting with 2...
+-        # I am not positive that other SVR4 systems won't match this,
++	# Unixware is an offshoot of SVR4, but it has its own version
++	# number series starting with 2...
++	# I am not positive that other SVR4 systems won't match this,
+ 	# I just have to hope.  -- rms.
+-        # Use sysv4.2uw... so that sysv4* matches it.
++	# Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit ;;
+     i*86:OS/2:*:*)
+@@ -1023,7 +1105,7 @@
+ 	fi
+ 	exit ;;
+     i*86:*:5:[678]*)
+-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+@@ -1051,13 +1133,13 @@
+ 	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i586.
++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
++	# the processor, so we play safe by assuming i586.
+ 	# Note: whatever this is, it MUST be the same as what config.sub
+-	# prints for the "djgpp" host, or else GDB configury will decide that
++	# prints for the "djgpp" host, or else GDB configure will decide that
+ 	# this is a cross-build.
+ 	echo i586-pc-msdosdjgpp
+-        exit ;;
++	exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+ 	exit ;;
+@@ -1092,8 +1174,8 @@
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && { echo i486-ncr-sysv4; exit; } ;;
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	  && { echo i486-ncr-sysv4; exit; } ;;
+     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ 	OS_REL='.3'
+ 	test -r /etc/.relid \
+@@ -1136,10 +1218,10 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit ;;
+-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+-        echo i586-unisys-sysv4
+-        exit ;;
++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++			# says <Richard.M.Bartel@ccMail.Census.GOV>
++	echo i586-unisys-sysv4
++	exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+@@ -1165,11 +1247,11 @@
+ 	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+-	        echo mips-nec-sysv${UNAME_RELEASE}
++		echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+-	        echo mips-unknown-sysv${UNAME_RELEASE}
++		echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit ;;
++	exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+ 	exit ;;
+@@ -1182,6 +1264,9 @@
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+ 	echo i586-pc-haiku
+ 	exit ;;
++    x86_64:Haiku:*:*)
++	echo x86_64-unknown-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+ 	exit ;;
+@@ -1200,6 +1285,9 @@
+     SX-8R:SUPER-UX:*:*)
+ 	echo sx8r-nec-superux${UNAME_RELEASE}
+ 	exit ;;
++    SX-ACE:SUPER-UX:*:*)
++	echo sxace-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit ;;
+@@ -1208,24 +1296,36 @@
+ 	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+-	case $UNAME_PROCESSOR in
+-	    i386)
+-		eval $set_cc_for_build
+-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+-		      grep IS_64BIT_ARCH >/dev/null
+-		  then
+-		      UNAME_PROCESSOR="x86_64"
+-		  fi
+-		fi ;;
+-	    unknown) UNAME_PROCESSOR=powerpc ;;
+-	esac
++	eval $set_cc_for_build
++	if test "$UNAME_PROCESSOR" = unknown ; then
++	    UNAME_PROCESSOR=powerpc
++	fi
++	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
++		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
++		    grep IS_64BIT_ARCH >/dev/null
++		then
++		    case $UNAME_PROCESSOR in
++			i386) UNAME_PROCESSOR=x86_64 ;;
++			powerpc) UNAME_PROCESSOR=powerpc64 ;;
++		    esac
++		fi
++	    fi
++	elif test "$UNAME_PROCESSOR" = i386 ; then
++	    # Avoid executing cc on OS X 10.9, as it ships with a stub
++	    # that puts up a graphical alert prompting to install
++	    # developer tools.  Any system running Mac OS X 10.7 or
++	    # later (Darwin 11 and later) is required to have a 64-bit
++	    # processor. This is not true of the ARM version of Darwin
++	    # that Apple uses in portable devices.
++	    UNAME_PROCESSOR=x86_64
++	fi
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+-	if test "$UNAME_PROCESSOR" = "x86"; then
++	if test "$UNAME_PROCESSOR" = x86; then
+ 		UNAME_PROCESSOR=i386
+ 		UNAME_MACHINE=pc
+ 	fi
+@@ -1237,7 +1337,7 @@
+     NEO-?:NONSTOP_KERNEL:*:*)
+ 	echo neo-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+-    NSE-?:NONSTOP_KERNEL:*:*)
++    NSE-*:NONSTOP_KERNEL:*:*)
+ 	echo nse-tandem-nsk${UNAME_RELEASE}
+ 	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+@@ -1256,7 +1356,7 @@
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+ 	# operating systems.
+-	if test "$cputype" = "386"; then
++	if test "$cputype" = 386; then
+ 	    UNAME_MACHINE=i386
+ 	else
+ 	    UNAME_MACHINE="$cputype"
+@@ -1282,13 +1382,13 @@
+ 	echo pdp10-unknown-its
+ 	exit ;;
+     SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++	echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit ;;
+     *:*VMS:*:*)
+-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+ 	    A*) echo alpha-dec-vms ; exit ;;
+ 	    I*) echo ia64-dec-vms ; exit ;;
+@@ -1298,7 +1398,7 @@
+ 	echo i386-pc-xenix
+ 	exit ;;
+     i*86:skyos:*:*)
+-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
+ 	exit ;;
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
+@@ -1306,174 +1406,28 @@
+     i*86:AROS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-aros
+ 	exit ;;
+-esac
+-
+-#echo '(No uname command or uname output not recognized.)' 1>&2
+-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+-
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#endif
+-main ()
+-{
+-#if defined (sony)
+-#if defined (MIPSEB)
+-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+-     I don't know....  */
+-  printf ("mips-sony-bsd\n"); exit (0);
+-#else
+-#include <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
+-          "4"
+-#else
+-	  ""
+-#endif
+-         ); exit (0);
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix\n"); exit (0);
+-#endif
+-
+-#if defined (hp300) && !defined (hpux)
+-  printf ("m68k-hp-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (NeXT)
+-#if !defined (__ARCHITECTURE__)
+-#define __ARCHITECTURE__ "m68k"
+-#endif
+-  int version;
+-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  if (version < 4)
+-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+-  else
+-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+-  exit (0);
+-#endif
+-
+-#if defined (MULTIMAX) || defined (n16)
+-#if defined (UMAXV)
+-  printf ("ns32k-encore-sysv\n"); exit (0);
+-#else
+-#if defined (CMU)
+-  printf ("ns32k-encore-mach\n"); exit (0);
+-#else
+-  printf ("ns32k-encore-bsd\n"); exit (0);
+-#endif
+-#endif
+-#endif
+-
+-#if defined (__386BSD__)
+-  printf ("i386-pc-bsd\n"); exit (0);
+-#endif
+-
+-#if defined (sequent)
+-#if defined (i386)
+-  printf ("i386-sequent-dynix\n"); exit (0);
+-#endif
+-#if defined (ns32000)
+-  printf ("ns32k-sequent-dynix\n"); exit (0);
+-#endif
+-#endif
+-
+-#if defined (_SEQUENT_)
+-    struct utsname un;
+-
+-    uname(&un);
+-
+-    if (strncmp(un.version, "V2", 2) == 0) {
+-	printf ("i386-sequent-ptx2\n"); exit (0);
+-    }
+-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+-	printf ("i386-sequent-ptx1\n"); exit (0);
+-    }
+-    printf ("i386-sequent-ptx\n"); exit (0);
+-
+-#endif
+-
+-#if defined (vax)
+-# if !defined (ultrix)
+-#  include <sys/param.h>
+-#  if defined (BSD)
+-#   if BSD == 43
+-      printf ("vax-dec-bsd4.3\n"); exit (0);
+-#   else
+-#    if BSD == 199006
+-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+-#    else
+-      printf ("vax-dec-bsd\n"); exit (0);
+-#    endif
+-#   endif
+-#  else
+-    printf ("vax-dec-bsd\n"); exit (0);
+-#  endif
+-# else
+-    printf ("vax-dec-ultrix\n"); exit (0);
+-# endif
+-#endif
+-
+-#if defined (alliant) && defined (i860)
+-  printf ("i860-alliant-bsd\n"); exit (0);
+-#endif
+-
+-  exit (1);
+-}
+-EOF
+-
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+-	{ echo "$SYSTEM_NAME"; exit; }
+-
+-# Apollos put the system type in the environment.
+-
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+-
+-# Convex versions that predate uname can use getsysinfo(1)
+-
+-if [ -x /usr/convex/getsysinfo ]
+-then
+-    case `getsysinfo -f cpu_type` in
+-    c1*)
+-	echo c1-convex-bsd
+-	exit ;;
+-    c2*)
+-	if getsysinfo -f scalar_acc
+-	then echo c32-convex-bsd
+-	else echo c2-convex-bsd
+-	fi
+-	exit ;;
+-    c34*)
+-	echo c34-convex-bsd
+-	exit ;;
+-    c38*)
+-	echo c38-convex-bsd
++    x86_64:VMkernel:*:*)
++	echo ${UNAME_MACHINE}-unknown-esx
+ 	exit ;;
+-    c4*)
+-	echo c4-convex-bsd
++    amd64:Isilon\ OneFS:*:*)
++	echo x86_64-unknown-onefs
+ 	exit ;;
+-    esac
+-fi
++esac
+ 
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 
+-This script, last modified $timestamp, has failed to recognize
+-the operating system you are using. It is advised that you
+-download the most up to date version of the config scripts from
++This script (version $timestamp), has failed to recognize the
++operating system you are using. If your script is old, overwrite
++config.guess and config.sub with the latest versions from:
+ 
+-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+ and
+-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+ 
+-If the version you run ($0) is already up to date, please
+-send the following data and any information you think might be
+-pertinent to <config-patches@gnu.org> in order to provide the needed
+-information to handle your system.
++If $0 has already been updated, send the following data and any
++information you think might be pertinent to config-patches@gnu.org to
++provide the necessary information to handle your system.
+ 
+ config.guess timestamp = $timestamp
+ 
diff --git a/var/spack/repos/builtin/packages/libsm/package.py b/var/spack/repos/builtin/packages/libsm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4affd50127b4a50ebaafa9e5340be562d59241b4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libsm/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libsm(Package):
+    """libSM - X Session Management Library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libSM"
+    url      = "https://www.x.org/archive/individual/lib/libSM-1.2.2.tar.gz"
+
+    version('1.2.2', '18e5084ed9500b1b47719fd1758f0ec8')
+
+    depends_on('libice@1.0.5:')
+
+    depends_on('xproto', type='build')
+    depends_on('xtrans', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libwindowswm/package.py b/var/spack/repos/builtin/packages/libwindowswm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3836e0d419477d590762908588efb91ae0830604
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libwindowswm/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libwindowswm(Package):
+    """WindowsWM - Cygwin/X rootless window management extension.
+
+    WindowsWM is a simple library designed to interface with the
+    Windows-WM extension.  This extension allows X window managers to
+    better interact with the Cygwin XWin server when running X11 in a
+    rootless mode."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libWindowsWM"
+    url      = "https://www.x.org/archive/individual/lib/libWindowsWM-1.0.1.tar.gz"
+
+    version('1.0.1', 'f260e124706ff6209c566689528667c6')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('windowswmproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c5df2e0f83efa7d929b5acf4063cc68138abbcb5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libx11/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libx11(Package):
+    """libX11 - Core X11 protocol client library."""
+
+    homepage = "https://www.x.org/"
+    url      = "https://www.x.org/archive/individual/lib/libX11-1.6.3.tar.gz"
+
+    version('1.6.3', '7d16653fe7c36209799175bb3dc1ae46')
+
+    depends_on('libxcb@1.1.92:')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('xtrans', type='build')
+    depends_on('kbproto', type='build')
+    depends_on('inputproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py
index b9215bc6013fa983053b51671b159746fe40fe7f..eb1f1326c64cb5e190c5c13cd146708551465190 100644
--- a/var/spack/repos/builtin/packages/libxau/package.py
+++ b/var/spack/repos/builtin/packages/libxau/package.py
@@ -27,18 +27,21 @@
 
 class Libxau(Package):
     """The libXau package contains a library implementing the X11
-       Authorization Protocol. This is useful for restricting client
-       access to the display."""
-    homepage = "http://xcb.freedesktop.org/"
-    url      = "http://ftp.x.org/pub/individual/lib/libXau-1.0.8.tar.bz2"
+    Authorization Protocol. This is useful for restricting client
+    access to the display."""
 
-    version('1.0.8', '685f8abbffa6d145c0f930f00703b21b')
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libXau/"
+    url      = "https://www.x.org/archive/individual/lib/libXau-1.0.8.tar.gz"
 
-    depends_on('xproto')
-    depends_on('pkg-config', type='build')
+    version('1.0.8', 'a85cd601d82bc79c0daa280917572e20')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):
-        configure('--prefix=%s' % prefix)
+        configure('--prefix={0}'.format(prefix))
 
         make()
-        make("install")
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxaw/package.py b/var/spack/repos/builtin/packages/libxaw/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9f92ff57d2dff0984a373543867df78d7973f9a4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxaw/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxaw(Package):
+    """Xaw is the X Athena Widget Set.
+    Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXaw"
+    url      = "https://www.x.org/archive/individual/lib/libXaw-1.0.13.tar.gz"
+
+    version('1.0.13', '6c522476024df5872cddc5f1562fb656')
+
+    depends_on('libx11')
+    depends_on('libxext')
+    depends_on('libxt')
+    depends_on('libxmu')
+    depends_on('libxpm')
+
+    depends_on('xproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxaw3d/package.py b/var/spack/repos/builtin/packages/libxaw3d/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..498f57cbca319ae052f25a11d051ffad66d84b85
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxaw3d/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxaw3d(Package):
+    """Xaw3d is the X 3D Athena Widget Set.
+    Xaw3d is a widget set based on the X Toolkit Intrinsics (Xt) Library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXaw3d"
+    url      = "https://www.x.org/archive/individual/lib/libXaw3d-1.6.2.tar.gz"
+
+    version('1.6.2', 'e51e00b734853e555ae9b367d213de45')
+
+    depends_on('libx11')
+    depends_on('libxt')
+    depends_on('libxmu')
+    depends_on('libxext')
+    depends_on('libxpm')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxc/package.py b/var/spack/repos/builtin/packages/libxc/package.py
index fe82613ce2d6626c672881582c253dc8297e3c3c..d773395e6c7612e267d0f336ccaf7b7661485721 100644
--- a/var/spack/repos/builtin/packages/libxc/package.py
+++ b/var/spack/repos/builtin/packages/libxc/package.py
@@ -34,6 +34,7 @@ class Libxc(Package):
 
     version('3.0.0', '8227fa3053f8fc215bd9d7b0d36de03c')
     version('2.2.2', 'd9f90a0d6e36df6c1312b6422280f2ec')
+    version('2.2.1', '38dc3a067524baf4f8521d5bb1cd0b8f')
 
     def install(self, spec, prefix):
         # Optimizations for the Intel compiler, suggested by CP2K
diff --git a/var/spack/repos/builtin/packages/libxcb/package.py b/var/spack/repos/builtin/packages/libxcb/package.py
index 82ddb2742e6226caac60bf8d0d9df06605b1704c..9fa1c6f97ce79b8cab05b0caab62caeb49e0834c 100644
--- a/var/spack/repos/builtin/packages/libxcb/package.py
+++ b/var/spack/repos/builtin/packages/libxcb/package.py
@@ -31,17 +31,21 @@ class Libxcb(Package):
     access to the protocol, improved threading support, and
     extensibility."""
 
-    homepage = "http://xcb.freedesktop.org/"
-    url      = "http://xcb.freedesktop.org/dist/libxcb-1.11.tar.gz"
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/libxcb-1.11.tar.gz"
 
+    version('1.12', '95eee7c28798e16ba5443f188b27a476')
     version('1.11', '1698dd837d7e6e94d029dbe8b3a82deb')
     version('1.11.1', '118623c15a96b08622603a71d8789bf3')
 
-    depends_on("python", type='build')
-    depends_on("xcb-proto")
-    depends_on("pkg-config", type='build')
-    depends_on("libpthread-stubs")
-    depends_on('libxau')
+    depends_on('libpthread-stubs')
+    depends_on('libxau@0.99.2:')
+    depends_on('libxdmcp')
+
+    depends_on('xcb-proto', type='build')
+    depends_on('python@2:2.8', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
 
     def patch(self):
         filter_file(
@@ -50,9 +54,8 @@ def patch(self):
             'src/xcb.h')
 
     def install(self, spec, prefix):
-        env['PKG_CONFIG_PATH'] = env[
-            'PKG_CONFIG_PATH'] + ':/usr/lib64/pkgconfig'
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
 
         make()
-        make("install")
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxcomposite/package.py b/var/spack/repos/builtin/packages/libxcomposite/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..48cba002500d9ce097de029c947faab51b21f086
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxcomposite/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxcomposite(Package):
+    """libXcomposite - client library for the Composite extension to the
+    X11 protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXcomposite"
+    url      = "https://www.x.org/archive/individual/lib/libXcomposite-0.4.4.tar.gz"
+
+    version('0.4.4', 'af860b1554a423735d831e6f29ac1ef5')
+
+    depends_on('libx11')
+    depends_on('libxfixes')
+
+    depends_on('compositeproto@0.4:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxcursor/package.py b/var/spack/repos/builtin/packages/libxcursor/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..215452ef52545fa79828ecdb4bde6f6dee8b8331
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxcursor/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxcursor(Package):
+    """libXcursor - X Window System Cursor management library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXcursor"
+    url      = "https://www.x.org/archive/individual/lib/libXcursor-1.1.14.tar.gz"
+
+    version('1.1.14', '39c8423de190d64f1c52fbc00022e52c')
+
+    depends_on('libxrender@0.8.2:')
+    depends_on('libxfixes')
+    depends_on('libx11')
+
+    depends_on('fixesproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxdamage/package.py b/var/spack/repos/builtin/packages/libxdamage/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..448ac21945ccd762446640efe43a00a006cf90e9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxdamage/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxdamage(Package):
+    """This package contains the library for the X Damage extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXdamage"
+    url      = "https://www.x.org/archive/individual/lib/libXdamage-1.1.4.tar.gz"
+
+    version('1.1.4', '95867778da012623815214769007c0d7')
+
+    depends_on('libxfixes')
+    depends_on('libx11')
+
+    depends_on('damageproto@1.1:', type='build')
+    depends_on('fixesproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxdmcp/package.py b/var/spack/repos/builtin/packages/libxdmcp/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c05d4b87719b96d1a51d555f6e24e16115ad6f33
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxdmcp/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxdmcp(Package):
+    """libXdmcp - X Display Manager Control Protocol library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXdmcp"
+    url      = "https://www.x.org/archive/individual/lib/libXdmcp-1.1.2.tar.gz"
+
+    version('1.1.2', 'ab0d6a38f0344a05d698ec7d48cfa5a8')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxevie/package.py b/var/spack/repos/builtin/packages/libxevie/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..b9f0e4163137e5bdf883e7d8c3acc6f054d66777
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxevie/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxevie(Package):
+    """Xevie - X Event Interception Extension (XEvIE)."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXevie"
+    url      = "https://www.x.org/archive/individual/lib/libXevie-1.0.3.tar.gz"
+
+    version('1.0.3', '100e6485cabfe6e788e09c110ca680d8')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('evieext', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..192ab3957a13362d23b74745ebb4466ce99ff30f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxext/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxext(Package):
+    """libXext - library for common extensions to the X11 protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXext"
+    url      = "https://www.x.org/archive/individual/lib/libXext-1.3.3.tar.gz"
+
+    version('1.3.3', '93f5ec084c998efbfb0befed22f9b57f')
+
+    depends_on('libx11@1.6:')
+
+    depends_on('xproto@7.0.13:', type='build')
+    depends_on('xextproto@7.1.99:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxfixes/package.py b/var/spack/repos/builtin/packages/libxfixes/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6b8b599a8566d5d0c5551b0c69f72ecf7fefec6c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxfixes/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxfixes(Package):
+    """This package contains header files and documentation for the XFIXES
+    extension.  Library and server implementations are separate."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXfixes"
+    url      = "https://www.x.org/archive/individual/lib/libXfixes-5.0.2.tar.gz"
+
+    version('5.0.2', '3636e59f8f5fa2e469d556d49f30e98d')
+
+    depends_on('libx11@1.6:')
+
+    depends_on('xproto', type='build')
+    depends_on('fixesproto@5.0:', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxfont/package.py b/var/spack/repos/builtin/packages/libxfont/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1ebf321c9f74c749bfb1a50f12270fd8547a436f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxfont/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxfont(Package):
+    """libXfont provides the core of the legacy X11 font system, handling the
+    index files (fonts.dir, fonts.alias, fonts.scale), the various font file
+    formats, and rasterizing them.   It is used by the X servers, the
+    X Font Server (xfs), and some font utilities (bdftopcf for instance),
+    but should not be used by normal X11 clients.  X11 clients access fonts
+    via either the new API's in libXft, or the legacy API's in libX11."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXfont"
+    url      = "https://www.x.org/archive/individual/lib/libXfont-1.5.2.tar.gz"
+
+    version('1.5.2', 'e8c616db0e59df4614980915e79bb05e')
+
+    depends_on('libfontenc')
+    depends_on('freetype')
+
+    depends_on('xtrans', type='build')
+    depends_on('xproto', type='build')
+    depends_on('fontsproto@2.1.3:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxfont2/package.py b/var/spack/repos/builtin/packages/libxfont2/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8611e65ebb9c5b1d1ba64d58f7299d73d48f568f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxfont2/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxfont2(Package):
+    """libXfont provides the core of the legacy X11 font system, handling the
+    index files (fonts.dir, fonts.alias, fonts.scale), the various font file
+    formats, and rasterizing them.   It is used by the X servers, the
+    X Font Server (xfs), and some font utilities (bdftopcf for instance),
+    but should not be used by normal X11 clients.  X11 clients access fonts
+    via either the new API's in libXft, or the legacy API's in libX11."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXfont"
+    url      = "https://www.x.org/archive/individual/lib/libXfont2-2.0.1.tar.gz"
+
+    version('2.0.1', '6ae5ae1f9fb1213b04f14a802a1d721c')
+
+    depends_on('libfontenc')
+    depends_on('freetype')
+
+    depends_on('xtrans', type='build')
+    depends_on('xproto', type='build')
+    depends_on('fontsproto@2.1.3:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxfontcache/package.py b/var/spack/repos/builtin/packages/libxfontcache/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5421f093cad90d4809e82c98d1fe6ed076f52884
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxfontcache/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxfontcache(Package):
+    """Xfontcache - X-TrueType font cache extension client library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXfontcache"
+    url      = "https://www.x.org/archive/individual/lib/libXfontcache-1.0.5.tar.gz"
+
+    version('1.0.5', '5030fc9c7f16dbb52f92a8ba2c574f5c')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('fontcacheproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxft/package.py b/var/spack/repos/builtin/packages/libxft/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1b8f853d0d98263ade282fb1802bc2ae6e66b4f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxft/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxft(Package):
+    """X FreeType library.
+
+    Xft version 2.1 was the first stand alone release of Xft, a library that
+    connects X applications with the FreeType font rasterization library. Xft
+    uses fontconfig to locate fonts so it has no configuration files."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXft"
+    url      = "https://www.x.org/archive/individual/lib/libXft-2.3.2.tar.gz"
+
+    version('2.3.2', '3a2c1ce2641817dace55cd2bfe10b0f0')
+
+    depends_on('freetype@2.1.6:')
+    depends_on('fontconfig@2.5.92:')
+    depends_on('libx11')
+    depends_on('libxrender@0.8.2:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxi/package.py b/var/spack/repos/builtin/packages/libxi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e9a2735790e605b11b7817bae357e235c31701b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxi/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxi(Package):
+    """libXi - library for the X Input Extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXi"
+    url      = "https://www.x.org/archive/individual/lib/libXi-1.7.6.tar.gz"
+
+    version('1.7.6', 'f3828f9d7893068f6f6f10fe15b31afa')
+
+    depends_on('libx11@1.6:')
+    depends_on('libxext@1.0.99.1:')
+    depends_on('libxfixes@5:')
+
+    depends_on('xproto@7.0.13:', type='build')
+    depends_on('xextproto@7.0.3:', type='build')
+    depends_on('inputproto@2.2.99.1:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxinerama/package.py b/var/spack/repos/builtin/packages/libxinerama/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a001c41ca7870451338ffe88b92208c6440577ae
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxinerama/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxinerama(Package):
+    """libXinerama - API for Xinerama extension to X11 Protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXinerama"
+    url      = "https://www.x.org/archive/individual/lib/libXinerama-1.1.3.tar.gz"
+
+    version('1.1.3', '7224a1baa9733a54053550a3fb4be118')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('xineramaproto@1.1.99.1:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxkbfile/package.py b/var/spack/repos/builtin/packages/libxkbfile/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..af8029a024afdd02b95b2469b23353df86960621
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxkbfile/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxkbfile(Package):
+    """XKB file handling routines."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libxkbfile"
+    url      = "https://www.x.org/archive/individual/lib/libxkbfile-1.0.9.tar.gz"
+
+    version('1.0.9', '5aab87eba67f37dd910a19be5c1129ee')
+
+    depends_on('libx11')
+
+    depends_on('kbproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxkbui/package.py b/var/spack/repos/builtin/packages/libxkbui/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..d0c132d97002ddd85beff319c8c3cce905a7e6c0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxkbui/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxkbui(Package):
+    """X.org libxkbui library."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libxkbui/"
+    url      = "https://www.x.org/archive/individual/lib/libxkbui-1.0.2.tar.gz"
+
+    version('1.0.2', 'a6210171defde64d9e8bcf6a6f6074b0')
+
+    depends_on('libx11')
+    depends_on('libxt')
+    depends_on('libxkbfile')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxmu/package.py b/var/spack/repos/builtin/packages/libxmu/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..dbba5f168d213abf3cbe6a37611f1a8a351b5b8a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxmu/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxmu(Package):
+    """This library contains miscellaneous utilities and is not part of the
+    Xlib standard.  It contains routines which only use public interfaces so
+    that it may be layered on top of any proprietary implementation of Xlib
+    or Xt."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXmu"
+    url      = "https://www.x.org/archive/individual/lib/libXmu-1.1.2.tar.gz"
+
+    version('1.1.2', 'd5be323b02e6851607205c8e941b4e61')
+
+    depends_on('libxt')
+    depends_on('libxext')
+    depends_on('libx11')
+
+    depends_on('xextproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxp/package.py b/var/spack/repos/builtin/packages/libxp/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..10aaccc54f292d638de0cc839b5dd6d6097533a8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxp/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxp(Package):
+    """libXp - X Print Client Library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXp"
+    url      = "https://www.x.org/archive/individual/lib/libXp-1.0.3.tar.gz"
+
+    version('1.0.3', '1157da663b28e110f440ce64cede6e18')
+
+    depends_on('libx11@1.6:')
+    depends_on('libxext')
+    depends_on('libxau')
+
+    depends_on('xextproto', type='build')
+    depends_on('printproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxpm/package.py b/var/spack/repos/builtin/packages/libxpm/package.py
index 10ca8158c2cbfde137a7d888f335e306c8063dd9..b726e74b0becd4b260064990b534c529aaf56eee 100644
--- a/var/spack/repos/builtin/packages/libxpm/package.py
+++ b/var/spack/repos/builtin/packages/libxpm/package.py
@@ -26,9 +26,9 @@
 
 
 class Libxpm(Package):
-    """Xpm file format library"""
+    """libXpm - X Pixmap (XPM) image file format library."""
 
-    homepage = "https://www.x.org/"
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXpm"
     url      = "https://www.x.org/archive//individual/lib/libXpm-3.5.11.tar.gz"
 
     version('3.5.11', '7c67c878ee048206b070bc0b24154f04')
@@ -37,8 +37,14 @@ class Libxpm(Package):
     version('3.5.8', '2d81d6633e67ac5562e2fbee126b2897')
     version('3.5.7', '7bbc8f112f7143ed6961a58ce4e14558')
 
+    depends_on('libx11')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
     def install(self, spec, prefix):
-        configure('--prefix=%s' % prefix)
+        configure('--prefix={0}'.format(prefix))
 
         make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxpresent/package.py b/var/spack/repos/builtin/packages/libxpresent/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e65d4353a00fc00787b82a00c0b204e7c7cdcdc9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxpresent/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxpresent(Package):
+    """This package contains header files and documentation for the Present
+    extension.  Library and server implementations are separate."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libXpresent/"
+    url      = "https://www.x.org/archive/individual/lib/libXpresent-1.0.0.tar.gz"
+
+    version('1.0.0', '2f543a595c3e6a519e2e38d079002958')
+
+    depends_on('libx11')
+
+    depends_on('xproto', type='build')
+    depends_on('presentproto@1.0:', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxprintapputil/package.py b/var/spack/repos/builtin/packages/libxprintapputil/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc66b76ac087aa94480a11212870bcffb4918eca
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxprintapputil/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxprintapputil(Package):
+    """Xprint application utility routines."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libXprintAppUtil/"
+    url      = "https://www.x.org/archive/individual/lib/libXprintAppUtil-1.0.1.tar.gz"
+
+    version('1.0.1', '3adb71fa34a2d4e75d8b840310318f76')
+
+    depends_on('libx11')
+    depends_on('libxp')
+    depends_on('libxprintutil')
+    depends_on('libxau')
+
+    depends_on('printproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxprintutil/package.py b/var/spack/repos/builtin/packages/libxprintutil/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8eb768958f666cb2cbf410760967e447357f4bfc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxprintutil/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxprintutil(Package):
+    """Xprint application utility routines."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libXprintUtil/"
+    url      = "https://www.x.org/archive/individual/lib/libXprintUtil-1.0.1.tar.gz"
+
+    version('1.0.1', '2f02e812f3e419534ced6fcb5860825f')
+
+    depends_on('libx11')
+    depends_on('libxp')
+    depends_on('libxt')
+    depends_on('libxau')
+
+    depends_on('printproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxrandr/package.py b/var/spack/repos/builtin/packages/libxrandr/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..56c36c0c7bcdbc278eb886b494a5af217a554829
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxrandr/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxrandr(Package):
+    """libXrandr - X Resize, Rotate and Reflection extension library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXrandr"
+    url      = "https://www.x.org/archive/individual/lib/libXrandr-1.5.0.tar.gz"
+
+    version('1.5.0', 'e2fafff575b94ba0b15983eb4df93656')
+
+    depends_on('libx11@1.6:')
+    depends_on('libxext')
+    depends_on('libxrender')
+
+    depends_on('randrproto@1.5:', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('renderproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxrender/package.py b/var/spack/repos/builtin/packages/libxrender/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c5a6dac1be2b3090b91a124990876c72083bc1b4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxrender/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxrender(Package):
+    """libXrender - library for the Render Extension to the X11 protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXrender"
+    url      = "https://www.x.org/archive/individual/lib/libXrender-0.9.9.tar.gz"
+
+    version('0.9.9', '0c797c4f2a7b782896bc223e6dac4333')
+
+    depends_on('libx11@1.6:')
+
+    depends_on('renderproto@0.9:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxres/package.py b/var/spack/repos/builtin/packages/libxres/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d0684c4b812bec51bfcc22e4ccdb359303ef1e6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxres/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxres(Package):
+    """libXRes - X-Resource extension client library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXRes"
+    url      = "https://www.x.org/archive/individual/lib/libXres-1.0.7.tar.gz"
+
+    version('1.0.7', '7fad9ab34201bb4adffcbf0cd7e87a89')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('resourceproto@1.0:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxscrnsaver/package.py b/var/spack/repos/builtin/packages/libxscrnsaver/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c9ca6ac1c864efb5eef7e12d5ab15cf5b39b8e06
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxscrnsaver/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxscrnsaver(Package):
+    """XScreenSaver - X11 Screen Saver extension client library"""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXScrnSaver"
+    url      = "https://www.x.org/archive/individual/lib/libXScrnSaver-1.2.2.tar.gz"
+
+    version('1.2.2', '79227e7d8c0dad27654c526de3d6fef3')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('scrnsaverproto@1.2:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxshmfence/package.py b/var/spack/repos/builtin/packages/libxshmfence/package.py
index fe5d5667e9bff4a2d249fafccb8014dc07ca4d9a..d4f4c8520305316d5cac88e29d3725fbb4548383 100644
--- a/var/spack/repos/builtin/packages/libxshmfence/package.py
+++ b/var/spack/repos/builtin/packages/libxshmfence/package.py
@@ -26,16 +26,24 @@
 
 
 class Libxshmfence(Package):
-    """This is a tiny library that exposes a event API on top of Linux
-    futexes."""
+    """libxshmfence - Shared memory 'SyncFence' synchronization primitive.
 
-    homepage = "http://keithp.com/blogs/dri3_extension/"  # not really...
+    This library offers a CPU-based synchronization primitive compatible
+    with the X SyncFence objects that can be shared between processes
+    using file descriptor passing."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libxshmfence/"
     url      = "http://xorg.freedesktop.org/archive/individual/lib/libxshmfence-1.2.tar.gz"
 
     version('1.2', 'f0b30c0fc568b22ec524859ee28556f1')
 
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
 
         make()
-        make("install")
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxt/package.py b/var/spack/repos/builtin/packages/libxt/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c657c866b40d092b0bddc4f4d9b65b176f4fc913
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxt/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxt(Package):
+    """libXt - X Toolkit Intrinsics library."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXt"
+    url      = "https://www.x.org/archive/individual/lib/libXt-1.1.5.tar.gz"
+
+    version('1.1.5', '77d317fbc508dd6adefb59d57a663032')
+
+    depends_on('libsm')
+    depends_on('libice')
+    depends_on('libx11')
+
+    depends_on('xproto', type='build')
+    depends_on('kbproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxtrap/package.py b/var/spack/repos/builtin/packages/libxtrap/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4589f98a8704ba14cfc472b031fc32b958c2cd82
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxtrap/package.py
@@ -0,0 +1,58 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxtrap(Package):
+    """libXTrap is the Xlib-based client API for the DEC-XTRAP extension.
+
+    XTrap was a proposed standard extension for X11R5 which facilitated the
+    capturing of server protocol and synthesizing core input events.
+
+    Digital participated in the X Consortium's xtest working group which chose
+    to evolve XTrap functionality into the XTEST & RECORD extensions for X11R6.
+
+    As X11R6 was released in 1994, XTrap has now been deprecated for over
+    15 years, and uses of it should be quite rare."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXTrap"
+    url      = "https://www.x.org/archive/individual/lib/libXTrap-1.0.1.tar.gz"
+
+    version('1.0.1', 'fde266b82ee14da3e4f4f81c9584c1ea')
+
+    depends_on('libx11')
+    depends_on('libxt')
+    depends_on('libxext')
+
+    depends_on('trapproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxtst/package.py b/var/spack/repos/builtin/packages/libxtst/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0d16643f94f545378bffcd70e277ed3bffead0bd
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxtst/package.py
@@ -0,0 +1,59 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxtst(Package):
+    """libXtst provides the Xlib-based client API for the XTEST & RECORD
+    extensions.
+
+    The XTEST extension is a minimal set of client and server extensions
+    required to completely test the X11 server with no user intervention.
+    This extension is not intended to support general journaling and
+    playback of user actions.
+
+    The RECORD extension supports the recording and reporting of all
+    core X protocol and arbitrary X extension protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXtst"
+    url      = "https://www.x.org/archive/individual/lib/libXtst-1.2.2.tar.gz"
+
+    version('1.2.2', 'efef3b1e44bd8074a601c0c5ce0788f4')
+
+    depends_on('libx11')
+    depends_on('libxext@1.0.99.4:')
+    depends_on('libxi')
+
+    depends_on('recordproto@1.13.99.1:', type='build')
+    depends_on('xextproto@7.0.99.3:', type='build')
+    depends_on('inputproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxv/package.py b/var/spack/repos/builtin/packages/libxv/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..03f10a1842c2c8084f978d835c148926f44c754c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxv/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxv(Package):
+    """libXv - library for the X Video (Xv) extension to the
+    X Window System."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXv"
+    url      = "https://www.x.org/archive/individual/lib/libXv-1.0.10.tar.gz"
+
+    version('1.0.10', 'e7182673b4bbe3ca00ac932e22edc038')
+
+    depends_on('libx11@1.6:')
+    depends_on('libxext')
+
+    depends_on('xextproto', type='build')
+    depends_on('videoproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxvmc/package.py b/var/spack/repos/builtin/packages/libxvmc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d5695c2c1036a8b60c0a453f35169f2c6168c02
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxvmc/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxvmc(Package):
+    """X.org libXvMC library."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/lib/libXvMC"
+    url      = "https://www.x.org/archive/individual/lib/libXvMC-1.0.9.tar.gz"
+
+    version('1.0.9', 'a28c0780373537f4774565309b31a69e')
+
+    depends_on('libx11@1.6:')
+    depends_on('libxext')
+    depends_on('libxv')
+
+    depends_on('xextproto', type='build')
+    depends_on('videoproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxxf86dga/package.py b/var/spack/repos/builtin/packages/libxxf86dga/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..292c5d213bd3f01ecf7558dc7b146425a9cf2024
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxxf86dga/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxxf86dga(Package):
+    """libXxf86dga - Client library for the XFree86-DGA extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXxf86dga"
+    url      = "https://www.x.org/archive/individual/lib/libXxf86dga-1.1.4.tar.gz"
+
+    version('1.1.4', '8ed1c8674e730e8d333dfe4b9f2097d9')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('xf86dgaproto@2.0.99.2:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxxf86misc/package.py b/var/spack/repos/builtin/packages/libxxf86misc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0247f8b57cfc7ac8964c5c9ab4f1981146579dd6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxxf86misc/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxxf86misc(Package):
+    """libXxf86misc - Extension library for the XFree86-Misc X extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXxf86misc"
+    url      = "https://www.x.org/archive/individual/lib/libXxf86misc-1.0.3.tar.gz"
+
+    version('1.0.3', 'c8d8743e146bcd2aa9856117ac5ef6c0')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('xproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('xf86miscproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/libxxf86vm/package.py b/var/spack/repos/builtin/packages/libxxf86vm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..feec5ff3d21fdb4e70b419024ed7d2cadefcc93b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libxxf86vm/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Libxxf86vm(Package):
+    """libXxf86vm - Extension library for the XFree86-VidMode X extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libXxf86vm"
+    url      = "https://www.x.org/archive/individual/lib/libXxf86vm-1.1.4.tar.gz"
+
+    version('1.1.4', '675bd0c521472628d5796602f625ef51')
+
+    depends_on('libx11@1.6:')
+    depends_on('libxext')
+
+    depends_on('xproto', type='build')
+    depends_on('xextproto', type='build')
+    depends_on('xf86vidmodeproto@2.2.99.1:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/listres/package.py b/var/spack/repos/builtin/packages/listres/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c6b3d149f68c65df0a4d1031d4dbd634904f9c89
--- /dev/null
+++ b/var/spack/repos/builtin/packages/listres/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Listres(Package):
+    """The listres program generates a list of X resources for a widget
+    in an X client written using a toolkit based on libXt."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/listres"
+    url      = "https://www.x.org/archive/individual/app/listres-1.0.3.tar.gz"
+
+    version('1.0.3', '77cafc32e8e02cca2d4453e73e0c0e7d')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+    depends_on('libxmu')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/lndir/package.py b/var/spack/repos/builtin/packages/lndir/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a7ce892502daf4318103f383d5c110ee5daeed21
--- /dev/null
+++ b/var/spack/repos/builtin/packages/lndir/package.py
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Lndir(Package):
+    """lndir - create a shadow directory of symbolic links to another
+    directory tree."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/util/lndir"
+    url      = "https://www.x.org/archive/individual/util/lndir-1.0.3.tar.gz"
+
+    version('1.0.3', '7173b2e4832658d319c2980a7c834205')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/luit/package.py b/var/spack/repos/builtin/packages/luit/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..54fd740bdc37042abae5f6d7114bc5499d095508
--- /dev/null
+++ b/var/spack/repos/builtin/packages/luit/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Luit(Package):
+    """Luit is a filter that can be run between an arbitrary application and
+    a UTF-8 terminal emulator such as xterm.  It will convert application
+    output from the locale's encoding into UTF-8, and convert terminal
+    input from UTF-8 into the locale's encoding."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/luit"
+    url      = "https://www.x.org/archive/individual/app/luit-1.1.1.tar.gz"
+
+    version('1.1.1', '04128a52f68c05129f709196819ddad3')
+
+    depends_on('libfontenc')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix),
+                  # see http://www.linuxquestions.org/questions/linux-from-scratch-13/can't-compile-luit-xorg-applications-4175476308/  # noqa
+                  'CFLAGS=-U_XOPEN_SOURCE -D_XOPEN_SOURCE=600')
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5675793abc092fc120ac41dd110a07aa29f11d75
--- /dev/null
+++ b/var/spack/repos/builtin/packages/makedepend/package.py
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Makedepend(Package):
+    """makedepend - create dependencies in makefiles."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/util/makedepend"
+    url      = "https://www.x.org/archive/individual/util/makedepend-1.0.5.tar.gz"
+
+    version('1.0.5', 'efb2d7c7e22840947863efaedc175747')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py
index 299b9a9267e259dc6c411725419bcff9f2f6907c..f19bb466fd99a3044f195377777073cefe55ae26 100644
--- a/var/spack/repos/builtin/packages/mesa/package.py
+++ b/var/spack/repos/builtin/packages/mesa/package.py
@@ -30,28 +30,38 @@ class Mesa(Package):
     specification - a system for rendering interactive 3D graphics."""
 
     homepage = "http://www.mesa3d.org"
-    url      = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/8.0.5/MesaLib-8.0.5.tar.gz"
+    url      = "ftp://ftp.freedesktop.org/pub/mesa/12.0.3/mesa-12.0.3.tar.gz"
 
-    # version('10.4.4', '8d863a3c209bf5116b2babfccccc68ce')
-    version('8.0.5', 'cda5d101f43b8784fa60bdeaca4056f2')
+    version('12.0.3', '60c5f9897ddc38b46f8144c7366e84ad')
 
-    # mesa 7.x, 8.x, 9.x
-    depends_on("libdrm@2.4.33")
-    depends_on("llvm@3.0")
-    depends_on("libxml2+python")
+    # General dependencies
+    depends_on('python@2.6.4:')
+    depends_on('py-mako@0.3.4:')
+    depends_on('flex@2.5.35:', type='build')
+    depends_on('bison@2.4.1:', type='build')
 
-    # patch("llvm-fixes.patch") # using newer llvm
+    # For DRI and hardware acceleration
+    depends_on('libpthread-stubs')
+    depends_on('libdrm')
+    depends_on('openssl')
+    depends_on('libxcb@1.9.3:')
+    depends_on('libxshmfence@1.1:')
+    depends_on('libx11')
+    depends_on('libxext')
+    depends_on('libxdamage')
+    depends_on('libxfixes')
 
-    # mesa 10.x
-    # depends_on("py-mako")
-    # depends_on("flex", type='build')
-    # depends_on("bison", type='build')
-    # depends_on("dri2proto")
-    # depends_on("libxcb")
-    # depends_on("libxshmfence")
+    depends_on('glproto@1.4.14:', type='build')
+    depends_on('dri2proto@2.6:', type='build')
+    depends_on('dri3proto@1.0:', type='build')
+    depends_on('presentproto@1.0:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    # TODO: Add package for systemd, provides libudev
+    # Using the system package manager to install systemd didn't work for me
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
 
         make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/mkfontdir/package.py b/var/spack/repos/builtin/packages/mkfontdir/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..15c85b24e46e354ce5ba2c9ee41bc25dad0c3147
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mkfontdir/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Mkfontdir(Package):
+    """mkfontdir creates the fonts.dir files needed by the legacy X server
+    core font system.   The current implementation is a simple wrapper script
+    around the mkfontscale program, which must be built and installed first."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/mkfontdir"
+    url      = "https://www.x.org/archive/individual/app/mkfontdir-1.0.7.tar.gz"
+
+    version('1.0.7', '52a5bc129f3f3ac54e7115608cec3cdc')
+
+    depends_on('mkfontscale', type='run')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/mkfontscale/package.py b/var/spack/repos/builtin/packages/mkfontscale/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4c907831b6874e75fcffbcc5b244ebd147c1c980
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mkfontscale/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Mkfontscale(Package):
+    """mkfontscale creates the fonts.scale and fonts.dir index files used by the
+    legacy X11 font system."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/mkfontscale"
+    url      = "https://www.x.org/archive/individual/app/mkfontscale-1.1.2.tar.gz"
+
+    version('1.1.2', 'fab4e1598b8948c124ec7a9f06d30e5b')
+
+    depends_on('libfontenc')
+    depends_on('freetype')
+
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index bb034f9fc730b86fa619ca5eed665aa6032aaf96..940a44a1b4be8568c01d46ee26ba4b9b2fed6ea1 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
+import os
 
 
 class Mpich(Package):
diff --git a/var/spack/repos/builtin/packages/mrnet/package.py b/var/spack/repos/builtin/packages/mrnet/package.py
index 490e99dd8386b9fcb4ef5febac3ea1f78aec92fb..9da9e29a2e9360cfa957584e1604e7696c3de502 100644
--- a/var/spack/repos/builtin/packages/mrnet/package.py
+++ b/var/spack/repos/builtin/packages/mrnet/package.py
@@ -37,13 +37,6 @@ class Mrnet(Package):
     version('4.1.0', '5a248298b395b329e2371bf25366115c')
     version('4.0.0', 'd00301c078cba57ef68613be32ceea2f')
 
-    # Add a patch that brings mrnet-5.0.1 up to date with the current
-    # development tree The development tree contains fixes needed for the
-    # krell based tools
-    variant('krellpatch', default=False,
-            description="Build MRNet with krell openspeedshop based patch.")
-    patch('krell-5.0.1.patch', when='@5.0.1+krellpatch')
-
     variant('lwthreads', default=False,
             description="Also build the MRNet LW threadsafe libraries")
     parallel = False
@@ -51,8 +44,8 @@ class Mrnet(Package):
     depends_on("boost")
 
     def install(self, spec, prefix):
-        # Build the MRNet LW thread safe libraries when the krelloptions
-        # variant is present
+        # Build the MRNet LW thread safe libraries when the
+        # lwthreads variant is present
         if '+lwthreads' in spec:
             configure("--prefix=%s" % prefix, "--enable-shared",
                       "--enable-ltwt-threadsafe")
diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py
index e0d7a00c557f2c6ff3ec5e482bd1205ab7283df4..7bc113472b66314ddd6206314d3677205fea1a0e 100644
--- a/var/spack/repos/builtin/packages/mumps/package.py
+++ b/var/spack/repos/builtin/packages/mumps/package.py
@@ -34,6 +34,7 @@ class Mumps(Package):
     homepage = "http://mumps.enseeiht.fr"
     url      = "http://mumps.enseeiht.fr/MUMPS_5.0.1.tar.gz"
 
+    version('5.0.2', '591bcb2c205dcb0283872608cdf04927')
     # Alternate location if main server is down.
     # version('5.0.1', 'b477573fdcc87babe861f62316833db0', url='http://pkgs.fedoraproject.org/repo/pkgs/MUMPS/MUMPS_5.0.1.tar.gz/md5/b477573fdcc87babe861f62316833db0/MUMPS_5.0.1.tar.gz')
     version('5.0.1', 'b477573fdcc87babe861f62316833db0')
diff --git a/var/spack/repos/builtin/packages/ncview/package.py b/var/spack/repos/builtin/packages/ncview/package.py
index 4abc09deb05d3bcfa9a4e6b7742cc2b60e0f21c4..5c3cf300d2dde2392973938ec50b8b906350c0c8 100644
--- a/var/spack/repos/builtin/packages/ncview/package.py
+++ b/var/spack/repos/builtin/packages/ncview/package.py
@@ -32,15 +32,13 @@ class Ncview(Package):
 
     version('2.1.7', 'debd6ca61410aac3514e53122ab2ba07')
 
-    depends_on("netcdf")
-    depends_on("udunits2")
-    depends_on("libpng")
-
-    # OS Dependencies
-    # Ubuntu: apt-get install libxaw7-dev
-    # CentOS 7: yum install libXaw-devel
+    depends_on('netcdf')
+    depends_on('udunits2')
+    depends_on('libpng')
+    depends_on('libxaw')
 
     def install(self, spec, prefix):
-        configure('--prefix=%s' % prefix)
+        configure('--prefix={0}'.format(prefix))
+
         make()
-        make("install")
+        make('install')
diff --git a/var/spack/repos/builtin/packages/netcdf/package.py b/var/spack/repos/builtin/packages/netcdf/package.py
index d4d7fd16916ba83157a27083059459da368a760b..b1e406157bf01882e73bb9e278877e437c38bab9 100644
--- a/var/spack/repos/builtin/packages/netcdf/package.py
+++ b/var/spack/repos/builtin/packages/netcdf/package.py
@@ -27,8 +27,8 @@
 
 class Netcdf(Package):
     """NetCDF is a set of software libraries and self-describing,
-    machine-independent data formats that support the creation, access,
-    and sharing of array-oriented scientific data.
+       machine-independent data formats that support the creation, access,
+       and sharing of array-oriented scientific data.
 
     """
 
@@ -41,6 +41,13 @@ class Netcdf(Package):
 
     variant('mpi',  default=True,  description='Enables MPI parallelism')
     variant('hdf4', default=False, description='Enable HDF4 support')
+    # These variants control the number of dimensions (i.e. coordinates and
+    # attributes) and variables (e.g. time, entity ID, number of coordinates)
+    # that can be used in any particular NetCDF file.
+    variant('maxdims', default=1024,
+            description='Defines the maximum dimensions of NetCDF files.')
+    variant('maxvars', default=8192,
+            description='Defines the maximum variables of NetCDF files.')
 
     depends_on("m4", type='build')
     depends_on("hdf", when='+hdf4')
@@ -56,6 +63,20 @@ class Netcdf(Package):
     # https://github.com/Unidata/netcdf-c/issues/250
     depends_on('hdf5@:1.8', when='@:4.4.0')
 
+    def patch(self):
+        try:
+            max_dims = int(self.spec.variants['maxdims'].value)
+            max_vars = int(self.spec.variants['maxvars'].value)
+        except (ValueError, TypeError):
+            raise TypeError('NetCDF variant values max[dims|vars] must be '
+                            'integer values.')
+
+        ff = FileFilter(join_path('include', 'netcdf.h'))
+        ff.filter(r'^(#define\s+NC_MAX_DIMS\s+)\d+(.*)$',
+                  r'\1{0}\2'.format(max_dims))
+        ff.filter(r'^(#define\s+NC_MAX_VARS\s+)\d+(.*)$',
+                  r'\1{0}\2'.format(max_vars))
+
     def install(self, spec, prefix):
         # Workaround until variant forwarding works properly
         if '+mpi' in spec and spec.satisfies('^hdf5~mpi'):
diff --git a/var/spack/repos/builtin/packages/oce/package.py b/var/spack/repos/builtin/packages/oce/package.py
index 4f9f7b2e1290d0be2426dbce953b80cdaf086080..2d518d83c344709f52088fc52dda7bae07367f87 100644
--- a/var/spack/repos/builtin/packages/oce/package.py
+++ b/var/spack/repos/builtin/packages/oce/package.py
@@ -54,6 +54,11 @@ class Oce(Package):
     # https://github.com/tpaviot/oce/commit/61cb965b9ffeca419005bc15e635e67589c421dd.patch
     patch('null.patch', when='@0.16:0.17.1')
 
+    # fix build with Xcode 8 "previous definition of CLOCK_REALTIME"
+    # reported 27 Sep 2016 https://github.com/tpaviot/oce/issues/643
+    if (platform.system() == "Darwin") and (platform.mac_ver()[0] == '10.12'):
+        patch('sierra.patch')
+
     def install(self, spec, prefix):
         options = []
         options.extend(std_cmake_args)
diff --git a/var/spack/repos/builtin/packages/oce/sierra.patch b/var/spack/repos/builtin/packages/oce/sierra.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8db3af5e37cd6f3fe4cccf387a7f95fbd0f46e34
--- /dev/null
+++ b/var/spack/repos/builtin/packages/oce/sierra.patch
@@ -0,0 +1,45 @@
+diff --git a/adm/cmake/TKernel/CMakeLists.txt b/adm/cmake/TKernel/CMakeLists.txt
+index 54e241e..72873c6 100644
+--- a/adm/cmake/TKernel/CMakeLists.txt
++++ b/adm/cmake/TKernel/CMakeLists.txt
+@@ -29,7 +29,7 @@ if(WIN32)
+ 	set(TOOLKIT_LIBS ${TOOLKIT_LIBS} ${CSF_SOCKETLibs_LIB} ${CSF_advapi32_LIB} ${CSF_gdi32_LIB} ${CSF_user32_LIB} ${CSF_kernel32_LIB} ${CSF_psapi_LIB})
+ else(WIN32)
+ 	#  An implementation for Mac OS X has been added in src/OSD/gettime_osx.h
+-	if(NOT APPLE)
++	if(APPLE)
+ 		include( CheckFunctionExists )
+ 		check_function_exists( clock_gettime CLOCK_GETTIME_IN_LIBC )
+ 		if(NOT CLOCK_GETTIME_IN_LIBC)
+@@ -40,7 +40,7 @@ else(WIN32)
+ 			endif(NOT CLOCK_GETTIME_IN_LIBRT)
+ 			set(TOOLKIT_LIBS ${TOOLKIT_LIBS} rt)
+ 		endif(NOT CLOCK_GETTIME_IN_LIBC)
+-	endif(NOT APPLE)
++	endif(APPLE)
+ endif(WIN32)
+
+ # Adde-DHAVE_TBB in TKernel in order to benefit from Standard_MMgrTBBalloc
+@@ -70,4 +70,3 @@ if (OCE_BUILD_TKERNEL_WITH_INSTALL_RPATH)
+ 	set_target_properties_install_rpath(${TOOLKIT} "${OCE_INSTALL_LIB_DIR_RPATH};${OCE_INSTALL_PACKAGE_LIB_DIR_RPATH}")
+ 	set_target_properties(${TOOLKIT} PROPERTIES BUILD_WITH_INSTALL_RPATH ON)
+ endif ()
+-
+diff --git a/src/OSD/OSD_Chronometer.cxx b/src/OSD/OSD_Chronometer.cxx
+index 444f844..25970d0 100644
+--- a/src/OSD/OSD_Chronometer.cxx
++++ b/src/OSD/OSD_Chronometer.cxx
+@@ -51,7 +51,7 @@
+   #include <mach/mach.h>
+ #endif
+
+-#if defined(__APPLE__) && defined(__MACH__)
++#if defined(__OOOOPPLE__) && defined(__MACH__)
+ #include "gettime_osx.h"
+ #endif
+
+@@ -283,4 +283,3 @@ void OSD_Chronometer::Show (Standard_Real& user,
+   system = Cumul_sys;
+   if (!StopSav) Start();
+ }
+-
diff --git a/var/spack/repos/builtin/packages/oclock/package.py b/var/spack/repos/builtin/packages/oclock/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..84da93c36ec8662569d081b0034f3d85baf8f7d3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/oclock/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Oclock(Package):
+    """oclock is a simple analog clock using the SHAPE extension to make
+    a round (possibly transparent) window."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/oclock"
+    url      = "https://www.x.org/archive/individual/app/oclock-1.0.3.tar.gz"
+
+    version('1.0.3', 'f25b05d987ef8ed6dd5a887c82eace62')
+
+    depends_on('libx11')
+    depends_on('libxmu')
+    depends_on('libxext')
+    depends_on('libxt')
+    depends_on('libxkbfile')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index 270a4e68d8185c101b5fbb972e52cb64324fbb51..3c725f957e2feb44d6c5872443d5d15b0be16c5c 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -22,88 +22,96 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-##########################################################################
+##############################################################################
 # Copyright (c) 2015-2016 Krell Institute. All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
 #
 # You should have received a copy of the GNU General Public License along with
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA
-##########################################################################
+##############################################################################
 
 from spack import *
+import os
+import os.path
 
 
 class Openspeedshop(Package):
     """OpenSpeedShop is a community effort by The Krell Institute with
-    current direct funding from DOEs NNSA.  It builds on top of a broad
-    list of community infrastructures, most notably Dyninst and MRNet
-    from UW, libmonitor from Rice, and PAPI from UTK. OpenSpeedShop is an
-    open source multi platform Linux performance tool which is targeted
-    to support performance analysis of applications running on both
-    single node and large scale IA64, IA32, EM64T, AMD64, PPC, ARM, Blue
-    Gene and Cray platforms.  OpenSpeedShop development is hosted by the
-    Krell Institute. The infrastructure and base components of
-    OpenSpeedShop are released as open source code primarily under LGPL.
-
+       current direct funding from DOEs NNSA.  It builds on top of a
+       broad list of community infrastructures, most notably Dyninst
+       and MRNet from UW, libmonitor from Rice, and PAPI from UTK.
+       OpenSpeedShop is an open source multi platform Linux performance
+       tool which is targeted to support performance analysis of
+       applications running on both single node and large scale IA64,
+       IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue Gene and
+       Cray platforms.  OpenSpeedShop development is hosted by the Krell
+       Institute. The infrastructure and base components of OpenSpeedShop
+       are released as open source code primarily under LGPL.
     """
 
     homepage = "http://www.openspeedshop.org"
-    url = "https://github.com/OpenSpeedShop"
+    url	= "https://github.com/OpenSpeedShop"
     version('2.2', '16cb051179c2038de4e8a845edf1d573')
     # Use when the git repository is available
     version('2.2', branch='master',
             git='https://github.com/OpenSpeedShop/openspeedshop.git')
 
     # Optional mirror template
-    # url="file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/openspeedshop-2.2.tar.gz"
-    # version('2.2', '643337740dc6c2faca60f42d3620b0e1')
+    # url = "file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/openspeedshop-2.2.tar.gz"
+    # version('2.2', '517a7798507241ad8abd8b0626a4d2cf')
 
     parallel = False
 
-    variant('offline', default=True,
+    variant('offline', default=False,
             description="build with offline instrumentor enabled.")
-    variant('cbtf', default=False,
+    variant('cbtf', default=True,
             description="build with cbtf instrumentor enabled.")
     variant('runtime', default=False,
             description="build only the runtime libraries and collectors.")
     variant('frontend', default=False,
-            description="build only the front-end tool using the runtime_dir "
-                        "to point to the target build.")
+            description="build only the FE tool using the runtime_dir \
+                         to point to target build.")
     variant('cuda', default=False,
             description="build with cuda packages included.")
     variant('ptgf', default=False,
             description="build with the PTGF based gui package enabled.")
     variant('rtfe', default=False,
-            description="build for generic cluster platforms that have "
-                        "different processors on the fe and be nodes.")
+            description="build for clusters heterogeneous processors \
+                         on fe/be nodes.")
 
     # MPI variants
     variant('openmpi', default=False,
-            description="Build mpi experiment collector for openmpi MPI.")
+            description="Build mpi collector for openmpi \
+                         MPI when variant is enabled.")
     variant('mpt', default=False,
-            description="Build mpi experiment collector for SGI MPT MPI.")
+            description="Build mpi collector for SGI \
+                         MPT MPI when variant is enabled.")
     variant('mvapich2', default=False,
-            description="Build mpi experiment collector for mvapich2 MPI.")
+            description="Build mpi collector for mvapich2\
+                         MPI when variant is enabled.")
     variant('mvapich', default=False,
-            description="Build mpi experiment collector for mvapich MPI.")
+            description="Build mpi collector for mvapich\
+                         MPI when variant is enabled.")
     variant('mpich2', default=False,
-            description="Build mpi experiment collector for mpich2 MPI.")
+            description="Build mpi collector for mpich2\
+                         MPI when variant is enabled.")
     variant('mpich', default=False,
-            description="Build mpi experiment collector for mpich MPI.")
+            description="Build mpi collector for mpich\
+                         MPI when variant is enabled.")
 
-    depends_on("cmake@3.0.2", type='build')
-    # Dependencies for openspeedshop that are common to all the variants of
-    # the OpenSpeedShop build
+    depends_on("cmake@3.0.2:", type='build')
+    # Dependencies for openspeedshop that are common to all
+    # the variants of the OpenSpeedShop build
     depends_on("bison", type='build')
     depends_on("flex", type='build')
     depends_on("binutils@2.24+krellpatch", type='build')
@@ -111,7 +119,7 @@ class Openspeedshop(Package):
     depends_on("libdwarf")
     depends_on("sqlite")
     depends_on("boost@1.50.0:")
-    depends_on("dyninst@9.1.0")
+    depends_on("dyninst@9.1.0:")
     depends_on("python")
     depends_on("qt@3.3.8b+krellpatch")
 
@@ -130,16 +138,16 @@ class Openspeedshop(Package):
     depends_on("cbtf", when='+cbtf')
     depends_on("cbtf-krell", when='+cbtf')
     depends_on("cbtf-argonavis", when='+cbtf+cuda')
-    depends_on("mrnet@5.0.1:+lwthreads+krellpatch", when='+cbtf')
+    depends_on("mrnet@5.0.1:+lwthreads", when='+cbtf')
 
     def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions):
-        # Sets build type parameters into cmakeOptions the options that will
-        # enable the cbtf-krell built type settings
+        # Sets build type parameters into cmakeOptions the
+        # options that will enable the cbtf-krell built type settings
 
         compile_flags = "-O2 -g"
         BuildTypeOptions = []
-        # Set CMAKE_BUILD_TYPE to what cbtf-krell wants it to be, not the
-        # stdcmakeargs
+        # Set CMAKE_BUILD_TYPE to what cbtf-krell wants it
+        # to be, not the stdcmakeargs
         for word in cmakeOptions[:]:
             if word.startswith('-DCMAKE_BUILD_TYPE'):
                 cmakeOptions.remove(word)
@@ -147,67 +155,130 @@ def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions):
                 cmakeOptions.remove(word)
             if word.startswith('-DCMAKE_C_FLAGS'):
                 cmakeOptions.remove(word)
-        BuildTypeOptions.extend([
-            '-DCMAKE_BUILD_TYPE=None',
-            '-DCMAKE_CXX_FLAGS=%s'         % compile_flags,
-            '-DCMAKE_C_FLAGS=%s'           % compile_flags
-        ])
+        BuildTypeOptions.extend(['-DCMAKE_BUILD_TYPE=None',
+                                 '-DCMAKE_CXX_FLAGS=%s'  % compile_flags,
+                                 '-DCMAKE_C_FLAGS=%s'    % compile_flags])
 
         cmakeOptions.extend(BuildTypeOptions)
 
+    def set_defaultbase_cmakeOptions(self, spec, cmakeOptions):
+        # Appends to cmakeOptions the options that will enable
+        # the appropriate base level options to the openspeedshop
+        # cmake build.
+        python_vers = format(spec['python'].version.up_to(2))
+        python_pv = '/python' + python_vers
+        python_pvs = '/libpython' + python_vers + '.' + format(dso_suffix)
+
+        BaseOptions = []
+
+        BaseOptions.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix)
+        BaseOptions.append('-DLIBELF_DIR=%s' % spec['libelf'].prefix)
+        BaseOptions.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix)
+        BaseOptions.append(
+            '-DPYTHON_EXECUTABLE=%s'
+            % join_path(spec['python'].prefix + '/bin/python'))
+        BaseOptions.append(
+            '-DPYTHON_INCLUDE_DIR=%s'
+            % join_path(spec['python'].prefix.include) + python_pv)
+        BaseOptions.append(
+            '-DPYTHON_LIBRARY=%s'
+            % join_path(spec['python'].prefix.lib) + python_pvs)
+        BaseOptions.append('-DBoost_NO_SYSTEM_PATHS=TRUE')
+        BaseOptions.append('-DBoost_NO_BOOST_CMAKE=TRUE')
+        BaseOptions.append('-DBOOST_ROOT=%s' % spec['boost'].prefix)
+        BaseOptions.append('-DBoost_DIR=%s' % spec['boost'].prefix)
+        BaseOptions.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib)
+        BaseOptions.append('-DDYNINST_DIR=%s' % spec['dyninst'].prefix)
+
+        cmakeOptions.extend(BaseOptions)
+
     def set_mpi_cmakeOptions(self, spec, cmakeOptions):
-        # Appends to cmakeOptions the options that will enable the appropriate
-        # MPI implementations
+        # Appends to cmakeOptions the options that will enable
+        # the appropriate MPI implementations
 
         MPIOptions = []
 
         # openmpi
         if '+openmpi' in spec:
-            MPIOptions.extend([
-                '-DOPENMPI_DIR=%s' % spec['openmpi'].prefix
-            ])
+            MPIOptions.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix)
         # mpich
         if '+mpich' in spec:
-            MPIOptions.extend([
-                '-DMPICH_DIR=%s' % spec['mpich'].prefix
-            ])
+            MPIOptions.append('-DMPICH_DIR=%s' % spec['mpich'].prefix)
         # mpich2
         if '+mpich2' in spec:
-            MPIOptions.extend([
-                '-DMPICH2_DIR=%s' % spec['mpich2'].prefix
-            ])
+            MPIOptions.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix)
         # mvapich
         if '+mvapich' in spec:
-            MPIOptions.extend([
-                '-DMVAPICH_DIR=%s' % spec['mvapich'].prefix
-            ])
+            MPIOptions.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix)
         # mvapich2
         if '+mvapich2' in spec:
-            MPIOptions.extend([
-                '-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix
-            ])
+            MPIOptions.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix)
         # mpt
         if '+mpt' in spec:
-            MPIOptions.extend([
-                '-DMPT_DIR=%s' % spec['mpt'].prefix
-            ])
+            MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix)
 
         cmakeOptions.extend(MPIOptions)
 
-    def install(self, spec, prefix):
-
-        # openmpi_prefix_path = "/opt/openmpi-1.8.2"
-        # mvapich_prefix_path = "/usr/local/tools/mvapich-gnu"
-        #    '-DOPENMPI_DIR=%s'            % spec['openmpi'].prefix,
-        #    '-DOPENMPI_DIR=%s'            % openmpi_prefix_path,
-        #    '-DMVAPICH_DIR=%s'            % mvapich_prefix_path,
+    def setup_environment(self, spack_env, run_env):
+        """Set up the compile and runtime environments for a package."""
+
+        # Common settings to both offline and cbtf versions
+        # of OpenSpeedShop
+        run_env.prepend_path('PATH', self.prefix.bin)
+
+        # Find Dyninst library path, this is needed to
+        # set the DYNINSTAPI_RT_LIB library which is
+        # required for OpenSpeedShop to find loop level
+        # performance information
+        dyninst_libdir = find_libraries(['libdyninstAPI_RT'],
+                                        root=self.spec['dyninst'].prefix,
+                                        shared=True, recurse=True)
+
+        # Set Dyninst RT library path to support OSS loop resolution code
+        run_env.set('DYNINSTAPI_RT_LIB', dyninst_libdir)
+
+        # Find openspeedshop library path
+        oss_libdir = find_libraries(['libopenss-framework'],
+                                    root=self.spec['openspeedshop'].prefix,
+                                    shared=True, recurse=True)
+        run_env.prepend_path('LD_LIBRARY_PATH',
+                             os.path.dirname(oss_libdir.joined()))
+
+        # Settings specific to the version, checking here
+        # for the cbtf instrumentor
+        if '+cbtf' in self.spec:
+            cbtf_mc = '/sbin/cbtf_mrnet_commnode'
+            cbtf_lmb = '/sbin/cbtf_libcbtf_mrnet_backend'
+            run_env.set('XPLAT_RSH', 'ssh')
+            run_env.set('MRNET_COMM_PATH',
+                        join_path(self.spec['cbtf-krell'].prefix + cbtf_mc))
+
+            run_env.set('CBTF_MRNET_BACKEND_PATH',
+                        join_path(self.spec['cbtf-krell'].prefix + cbtf_lmb))
+
+            run_env.prepend_path('PATH', self.spec['mrnet'].prefix.bin)
+            run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.bin)
+            run_env.prepend_path('PATH', self.spec['cbtf-krell'].prefix.sbin)
+
+        elif '+offline' in self.spec:
+            # Had to use this form of syntax self.prefix.lib and
+            # self.prefix.lib64 returned None all the time
+            run_env.set('OPENSS_RAWDATA_DIR', '.')
+            run_env.set('OPENSS_PLUGIN_PATH',
+                        join_path(oss_libdir + '/openspeedshop'))
+            run_env.prepend_path('PATH', self.spec['papi'].prefix.bin)
+            run_env.prepend_path('PATH', self.spec['libdwarf'].prefix.bin)
+
+            if '+mpich' in self.spec:
+                run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mpich')
+            if '+mpich2' in self.spec:
+                run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mpich2')
+            if '+mvapich2' in self.spec:
+                run_env.set('OPENSS_MPI_IMPLEMENTATION', 'mvapich2')
+            if '+openmpi' in self.spec:
+                run_env.set('OPENSS_MPI_IMPLEMENTATION', 'openmpi')
 
-        # FIXME: How do we make this dynamic in spack?
-        # FIXME: That is, can we specify the paths to cuda dynamically?
-        # WAITING for external package support.
-        # if '+cuda' in spec:
-        #    cuda_prefix_path = "/usr/local/cuda-6.0"
-        #    cupti_prefix_path = "/usr/local/cuda-6.0/extras/CUPTI"
+    def install(self, spec, prefix):
 
         if '+offline' in spec:
             instrumentor_setting = "offline"
@@ -217,18 +288,17 @@ def install(self, spec, prefix):
                     cmakeOptions = []
                     cmakeOptions.extend([
                         '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
-                        '-DCMAKE_LIBRARY_PATH=%s' % prefix.lib64,
-                        '-DINSTRUMENTOR=%s' % instrumentor_setting,
-                        '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
-                        '-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
-                        '-DPAPI_DIR=%s' % spec['papi'].prefix])
+                        '-DINSTRUMENTOR=%s'     % instrumentor_setting,
+                        '-DLIBMONITOR_DIR=%s'   % spec['libmonitor'].prefix,
+                        '-DLIBUNWIND_DIR=%s'    % spec['libunwind'].prefix,
+                        '-DPAPI_DIR=%s'         % spec['papi'].prefix])
 
                     # Add any MPI implementations coming from variant settings
                     self.set_mpi_cmakeOptions(spec, cmakeOptions)
                     cmakeOptions.extend(std_cmake_args)
 
-                    # Adjust the build options to the favored ones for this
-                    # build
+                    # Adjust the build options to the favored
+                    # ones for this build
                     self.adjustBuildTypeParams_cmakeOptions(spec, cmakeOptions)
 
                     cmake('..', *cmakeOptions)
@@ -239,50 +309,35 @@ def install(self, spec, prefix):
             else:
                 cmake_prefix_path = join_path(spec['dyninst'].prefix)
                 with working_dir('build', create=True):
-
-                    # python_vers=join_path(spec['python'].version[:2])
-                    # '-DOPENMPI_DIR=%s'            % openmpi_prefix_path,
-                    # '-DMVAPICH_DIR=%s'            % mvapich_prefix_path,
-                    # '-DMPICH_DIR=%s'              % spec['mpich'].prefix,
-                    # '-DMPICH2_DIR=%s'             % spec['mpich2'].prefix,
-                    # '-DBoost_NO_SYSTEM_PATHS=TRUE',
-                    # '-DBOOST_ROOT=%s'             % spec['boost'].prefix,
-                    # '-DOPENMPI_DIR=%s'            % spec['openmpi'].prefix,
-
-                    python_vers = '%d.%d' % spec['python'].version[:2]
-
                     cmakeOptions = []
-                    cmakeOptions.extend([
-                        '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
-                        '-DCMAKE_LIBRARY_PATH=%s' % prefix.lib64,
-                        '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
-                        '-DINSTRUMENTOR=%s'   % instrumentor_setting,
-                        '-DBINUTILS_DIR=%s'   % spec['binutils'].prefix,
-                        '-DLIBELF_DIR=%s'     % spec['libelf'].prefix,
-                        '-DLIBDWARF_DIR=%s'   % spec['libdwarf'].prefix,
-                        '-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
-                        '-DLIBUNWIND_DIR=%s'  % spec['libunwind'].prefix,
-                        '-DPAPI_DIR=%s'       % spec['papi'].prefix,
-                        '-DSQLITE3_DIR=%s'    % spec['sqlite'].prefix,
-                        '-DQTLIB_DIR=%s'      % spec['qt'].prefix,
-                        '-DPYTHON_EXECUTABLE=%s' % join_path(
-                            spec['python'].prefix, '/bin/python'),
-                        '-DPYTHON_INCLUDE_DIR=%s' % join_path(
-                            spec['python'].prefix.include,
-                            'python' + python_vers),
-                        '-DPYTHON_LIBRARY=%s' % join_path(
-                            spec['python'].prefix.lib,
-                            'libpython' + python_vers + '.so'),
-                        '-DBoost_NO_SYSTEM_PATHS=TRUE',
-                        '-DBOOST_ROOT=%s'          % spec['boost'].prefix,
-                        '-DDYNINST_DIR=%s'         % spec['dyninst'].prefix])
+
+                    # Appends base options to cmakeOptions
+                    self.set_defaultbase_cmakeOptions(spec, cmakeOptions)
+
+                    cmakeOptions.extend(
+                        ['-DCMAKE_INSTALL_PREFIX=%s'
+                            % prefix,
+                         '-DCMAKE_PREFIX_PATH=%s'
+                            % cmake_prefix_path,
+                         '-DINSTRUMENTOR=%s'
+                            % instrumentor_setting,
+                         '-DLIBMONITOR_DIR=%s'
+                            % spec['libmonitor'].prefix,
+                         '-DLIBUNWIND_DIR=%s'
+                            % spec['libunwind'].prefix,
+                         '-DPAPI_DIR=%s'
+                            % spec['papi'].prefix,
+                         '-DSQLITE3_DIR=%s'
+                            % spec['sqlite'].prefix,
+                         '-DQTLIB_DIR=%s'
+                            % spec['qt'].prefix])
 
                     # Add any MPI implementations coming from variant settings
                     self.set_mpi_cmakeOptions(spec, cmakeOptions)
                     cmakeOptions.extend(std_cmake_args)
 
-                    # Adjust the build options to the favored ones for this
-                    # build
+                    # Adjust the build options to the favored
+                    # ones for this build
                     self.adjustBuildTypeParams_cmakeOptions(spec, cmakeOptions)
 
                     cmake('..', *cmakeOptions)
@@ -293,74 +348,37 @@ def install(self, spec, prefix):
 
         elif '+cbtf' in spec:
             instrumentor_setting = "cbtf"
-            cmake_prefix_path = ':'.join(spec['cbtf'].prefix,
-                                         spec['cbtf-krell'].prefix,
-                                         spec['dyninst'].prefix)
-
             # resolve_symbols = "symtabapi"
-            # runtime_platform_cray = "cray"
-            # if '+cray' in spec:
-            #    if '+runtime' in spec:
-            #      #-DCBTF_KRELL_CN_RUNTIME_DIR=${CBTF_KRELL_CN_INSTALL_DIR} \
-            #      with working_dir('build_cbtf_cray_runtime', create=True):
-            #        python_vers='%d.%d' % spec['python'].version[:2]
-            #        cmake('..',
-            #   '-DCMAKE_INSTALL_PREFIX=%s'   % prefix,
-            #   '-DCMAKE_LIBRARY_PATH=%s'     % prefix.lib64,
-            #   '-DRUNTIME_PLATFORM=%s' % runtime_platform_cray,
-            #   '-DCMAKE_PREFIX_PATH=%s'      % cmake_prefix_path,
-            #   '-DRESOLVE_SYMBOLS=%s' % resolve_symbols,
-            #   '-DINSTRUMENTOR=%s'           % instrumentor_setting,
-            #   '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
-            #   '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
-            #   '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' % spec['cbtf-krell'].prefix,
-            #   '-DBINUTILS_DIR=%s'           % spec['binutils'].prefix,
-            #   '-DLIBELF_DIR=%s'             % spec['libelf'].prefix,
-            #   '-DLIBDWARF_DIR=%s'           % spec['libdwarf'].prefix,
-            #   '-DLIBUNWIND_DIR=%s'          % spec['libunwind'].prefix,
-            #   '-DPAPI_DIR=%s'               % spec['papi'].prefix,
-            #   '-DDYNINST_DIR=%s'            % spec['dyninst'].prefix,
-            #   '-DXERCESC_DIR=%s'            % spec['xerces-c'].prefix,
-            #   '-DMRNET_DIR=%s'              % spec['mrnet'].prefix,
-            #   '-DBoost_NO_SYSTEM_PATHS=TRUE',
-            #   '-DBOOST_ROOT=%s'             % spec['boost'].prefix,
-            #   *std_cmake_args)
-
-            #           make("clean")
-            #           make()
-            #           make("install")
-
-            # elif '+mic' in spec:
-            # comment out else and shift over the default case below
-            # until arch detection is in else:
+            cmake_prefix_path = join_path(spec['cbtf'].prefix) \
+                + ':' + join_path(spec['cbtf-krell'].prefix)\
+                + ':' + join_path(spec['dyninst'].prefix)
 
             if '+runtime' in spec:
                 with working_dir('build_cbtf_runtime', create=True):
-                    python_vers = '%d.%d' % spec['python'].version[:2]
-                    cmake(
-                        '..',
-                        '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
-                        '-DCMAKE_LIBRARY_PATH=%s' % prefix.lib64,
-                        '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
-                        '-DINSTRUMENTOR=%s' % instrumentor_setting,
-                        '-DBINUTILS_DIR=%s' % spec['binutils'].prefix,
-                        '-DLIBELF_DIR=%s' % spec['libelf'].prefix,
-                        '-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix,
-                        '-DCBTF_DIR=%s' % spec['cbtf'].prefix,
-                        '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
-                        '-DPYTHON_EXECUTABLE=%s' % join_path(
-                            spec['python'].prefix, 'bin', 'python'),
-                        '-DPYTHON_INCLUDE_DIR=%s' % join_path(
-                            spec['python'].prefix.include,
-                            'python' + python_vers),
-                        '-DPYTHON_LIBRARY=%s' % join_path(
-                            spec['python'].prefix.lib,
-                            'libpython' + python_vers + '.so'),
-                        '-DBoost_NO_SYSTEM_PATHS=TRUE',
-                        '-DBOOST_ROOT=%s' % spec['boost'].prefix,
-                        '-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
-                        '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
-                        *std_cmake_args)
+                    cmakeOptions = []
+
+                    # Appends base options to cmakeOptions
+                    self.set_defaultbase_cmakeOptions(spec, cmakeOptions)
+
+                    cmakeOptions.extend(
+                        ['-DCMAKE_INSTALL_PREFIX=%s'
+                            % prefix,
+                         '-DCMAKE_PREFIX_PATH=%s'
+                            % cmake_prefix_path,
+                         '-DINSTRUMENTOR=%s'
+                            % instrumentor_setting,
+                         '-DCBTF_DIR=%s'
+                            % spec['cbtf'].prefix,
+                         '-DCBTF_KRELL_DIR=%s'
+                            % spec['cbtf-krell'].prefix,
+                         '-DMRNET_DIR=%s'
+                            % spec['mrnet'].prefix])
+
+                    # Adjust the build options to the
+                    # favored ones for this build
+                    self.adjustBuildTypeParams_cmakeOptions(spec, cmakeOptions)
+
+                    cmake('..', *cmakeOptions)
 
                     make("clean")
                     make()
@@ -368,96 +386,35 @@ def install(self, spec, prefix):
 
             else:
                 with working_dir('build_cbtf', create=True):
-                    python_vers = '%d.%d' % spec['python'].version[:2]
-                    # python_vers=join_path(spec['python'].version[:2])
-                    cmake(
-                        '..',
-                        '-DCMAKE_INSTALL_PREFIX=%s' % prefix,
-                        '-DCMAKE_LIBRARY_PATH=%s'   % prefix.lib64,
-                        '-DCMAKE_PREFIX_PATH=%s'    % cmake_prefix_path,
-                        '-DINSTRUMENTOR=%s'         % instrumentor_setting,
-                        '-DBINUTILS_DIR=%s'         % spec['binutils'].prefix,
-                        '-DLIBELF_DIR=%s'         % spec['libelf'].prefix,
-                        '-DLIBDWARF_DIR=%s'       % spec['libdwarf'].prefix,
-                        '-DSQLITE3_DIR=%s'        % spec['sqlite'].prefix,
-                        '-DCBTF_DIR=%s'           % spec['cbtf'].prefix,
-                        '-DCBTF_KRELL_DIR=%s'     % spec['cbtf-krell'].prefix,
-                        '-DQTLIB_DIR=%s'          % spec['qt'].prefix,
-                        '-DPYTHON_EXECUTABLE=%s' % join_path(
-                            spec['python'].prefix, 'bin', 'python'),
-                        '-DPYTHON_INCLUDE_DIR=%s' % join_path(
-                            spec['python'].prefix.include,
-                            'python' + python_vers),
-                        '-DPYTHON_LIBRARY=%s' % join_path(
-                            spec['python'].prefix.lib,
-                            'libpython' + python_vers + '.so'),
-                        '-DBoost_NO_SYSTEM_PATHS=TRUE',
-                        '-DBOOST_ROOT=%s' % spec['boost'].prefix,
-                        '-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
-                        '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
-                        *std_cmake_args)
+                    cmakeOptions = []
+
+                    # Appends base options to cmakeOptions
+                    self.set_defaultbase_cmakeOptions(spec, cmakeOptions)
+
+                    cmakeOptions.extend(
+                        ['-DCMAKE_INSTALL_PREFIX=%s'
+                            % prefix,
+                         '-DCMAKE_PREFIX_PATH=%s'
+                            % cmake_prefix_path,
+                         '-DINSTRUMENTOR=%s'
+                            % instrumentor_setting,
+                         '-DSQLITE3_DIR=%s'
+                            % spec['sqlite'].prefix,
+                         '-DCBTF_DIR=%s'
+                            % spec['cbtf'].prefix,
+                         '-DCBTF_KRELL_DIR=%s'
+                            % spec['cbtf-krell'].prefix,
+                         '-DQTLIB_DIR=%s'
+                            % spec['qt'].prefix,
+                         '-DMRNET_DIR=%s'
+                            % spec['mrnet'].prefix])
+
+                    # Adjust the build options to the favored
+                    # ones for this build
+                    self.adjustBuildTypeParams_cmakeOptions(spec, cmakeOptions)
+
+                    cmake('..', *cmakeOptions)
 
                     make("clean")
                     make()
                     make("install")
-
-# if '+frontend' in spec:
-#    with working_dir('build_frontend', create=True):
-#         tbd
-
-# if '+cbtf' in spec:
-#   if cray build type detected:
-#        if '+runtime' in spec:
-#            with working_dir('build_cray_cbtf_compute', create=True):
-#                tbd
-#        else:
-#            with working_dir('build_cray_cbtf_frontend', create=True):
-#                tbd
-#            with working_dir('build_cray_osscbtf_frontend', create=True):
-#                tbd
-#        fi
-#    elif '+intelmic' in spec:
-#        if '+runtime' in spec:
-#            with working_dir('build_intelmic_cbtf_compute', create=True):
-#                tbd
-#        else:
-#            with working_dir('build_intelmic_cbtf_frontend', create=True):
-#                tbd
-#            with working_dir('build_intelmic_osscbtf_frontend', create=True):
-#        fi
-#    else
-#        with working_dir('build_cluster_cbtf', create=True):
-#             tbd
-#        with working_dir('build_cluster osscbtf', create=True):
-#             tbd
-#    fi
-# elif '+offline' in spec:
-#   if cray build type detected:
-#        if '+runtime' in spec:
-#            with working_dir('build_cray_ossoff_compute', create=True):
-#                tbd
-#        else:
-#            with working_dir('build_cray_ossoff_frontend', create=True):
-#                tbd
-#        fi
-#    elif '+intelmic' in spec:
-#        if '+runtime' in spec:
-#            with working_dir('build_intelmic_ossoff_compute', create=True):
-#                tbd
-#        else:
-#            with working_dir('build_intelmic_ossoff_frontend', create=True):
-#                tbd
-#        fi
-#    elif bgq build type detected:
-#        if '+runtime' in spec:
-#            with working_dir('build_bgq_ossoff_compute', create=True):
-#                tbd
-#        else:
-#            with working_dir('build_bgq_ossoff_frontend', create=True):
-#                tbd
-#        fi
-#    else
-#        with working_dir('build_cluster ossoff', create=True):
-#             tbd
-#    fi
-# fi
diff --git a/var/spack/repos/builtin/packages/paraver/package.py b/var/spack/repos/builtin/packages/paraver/package.py
index 1b6e3ce8e66d14727e49282e305c7f1afcf8625c..0a2ffdbb8431974c8e18611c7f6a79cb2b4be877 100644
--- a/var/spack/repos/builtin/packages/paraver/package.py
+++ b/var/spack/repos/builtin/packages/paraver/package.py
@@ -32,9 +32,11 @@ class Paraver(Package):
         is expressed on its input trace format.  Traces for parallel MPI,
         OpenMP and other programs can be genereated with Extrae."""
     homepage = "http://www.bsc.es/computer-sciences/performance-tools/paraver"
-    url      = "http://www.bsc.es/ssl/apps/performanceTools/files/paraver-sources-4.5.3.tar.gz"
+    url      = "http://www.bsc.es/ssl/apps/performanceTools/files/paraver-sources-4.6.2.tar.gz"
 
-    version('4.5.3', '625de9ec0d639acd18d1aaa644b38f72')
+    # NOTE: Paraver provides only latest version for download.
+    #       Don't keep/add older versions.
+    version('4.6.2', 'c54e124382b597574628b00e31649803')
 
     depends_on("boost")
     # depends_on("extrae")
diff --git a/var/spack/repos/builtin/packages/patchelf/package.py b/var/spack/repos/builtin/packages/patchelf/package.py
index cd1f67906292612f2cfaec8f614deeb94d74be61..c391f491ebb7e33cbe7965eb477e72e86c8f2a01 100644
--- a/var/spack/repos/builtin/packages/patchelf/package.py
+++ b/var/spack/repos/builtin/packages/patchelf/package.py
@@ -30,10 +30,12 @@ class Patchelf(Package):
        ELF executables."""
 
     homepage = "https://nixos.org/patchelf.html"
-    url      = "http://nixos.org/releases/patchelf/patchelf-0.8/patchelf-0.8.tar.gz"
+    url = "http://nixos.org/releases/patchelf/patchelf-0.8/patchelf-0.8.tar.gz"
+
     list_url = "http://nixos.org/releases/patchelf/"
     list_depth = 2
 
+    version('0.9', '3c265508526760f233620f35d79c79fc')
     version('0.8', '407b229e6a681ffb0e2cdd5915cb2d01')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 7ee2d29f4d607e33ae58180e9670ef50dc630e89..4ac96b81273a51618f127d4cdf9e3b3a1fdd37f8 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -37,6 +37,7 @@ class Petsc(Package):
     homepage = "http://www.mcs.anl.gov/petsc/index.html"
     url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-3.5.3.tar.gz"
 
+    version('3.7.4', 'aaf94fa54ef83022c14091f10866eedf')
     version('3.7.2', '50da49867ce7a49e7a0c1b37f4ec7b34')
     version('3.6.4', '7632da2375a3df35b8891c9526dbdde7')
     version('3.6.3', '91dd3522de5a5ef039ff8f50800db606')
@@ -74,7 +75,7 @@ class Petsc(Package):
     depends_on('python @2.6:2.7')
 
     # Other dependencies
-    depends_on('boost', when='+boost')
+    depends_on('boost', when='@:3.5+boost')
     depends_on('metis@5:', when='+metis')
 
     depends_on('hdf5+mpi', when='+hdf5+mpi')
@@ -124,7 +125,9 @@ def mpi_dependent_options(self):
         return compiler_opts
 
     def install(self, spec, prefix):
-        options = ['--with-ssl=0']
+        options = ['--with-ssl=0',
+                   '--download-c2html=0',
+                   '--download-hwloc=0']
         options.extend(self.mpi_dependent_options())
         options.extend([
             '--with-precision=%s' % (
diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py
index 8fe3e1f9d90b8396ce80273ca30c60b069dcb9df..c780fd64aa2716441eb150e07c76c5f4f4d0fa0f 100644
--- a/var/spack/repos/builtin/packages/pixman/package.py
+++ b/var/spack/repos/builtin/packages/pixman/package.py
@@ -28,15 +28,17 @@
 
 class Pixman(Package):
     """The Pixman package contains a library that provides low-level
-       pixel manipulation features such as image compositing and
-       trapezoid rasterization."""
+    pixel manipulation features such as image compositing and
+    trapezoid rasterization."""
+
     homepage = "http://www.pixman.org"
     url      = "http://cairographics.org/releases/pixman-0.32.6.tar.gz"
 
+    version('0.34.0', 'e80ebae4da01e77f68744319f01d52a3')
     version('0.32.6', '3a30859719a41bd0f5cccffbfefdd4c2')
 
-    depends_on("pkg-config", type="build")
-    depends_on("libpng")
+    depends_on('pkg-config', type='build')
+    depends_on('libpng')
 
     def install(self, spec, prefix):
         config_args = ["--prefix=" + prefix,
@@ -48,4 +50,5 @@ def install(self, spec, prefix):
         configure(*config_args)
 
         make()
-        make("install")
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/presentproto/package.py b/var/spack/repos/builtin/packages/presentproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ca145abb6b1a9db1edb678e4929b8a7a5958273f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/presentproto/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Presentproto(Package):
+    """Present protocol specification and Xlib/Xserver headers."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/presentproto/"
+    url      = "https://www.x.org/archive/individual/proto/presentproto-1.0.tar.gz"
+
+    version('1.0', '57eaf4bb58e86476ec89cfb42d675961')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/printproto/package.py b/var/spack/repos/builtin/packages/printproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..151924dd490b9982c71a6b60b66c1de7678b9fb5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/printproto/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Printproto(Package):
+    """Xprint extension to the X11 protocol - a portable, network-transparent
+    printing system."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/printproto"
+    url      = "https://www.x.org/archive/individual/proto/printproto-1.0.5.tar.gz"
+
+    version('1.0.5', '5afeb3a7de8a14b417239a14ea724268')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/proxymngr/package.py b/var/spack/repos/builtin/packages/proxymngr/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..896f4a516b7c07d9893620f0f58f5bf6d4fffacf
--- /dev/null
+++ b/var/spack/repos/builtin/packages/proxymngr/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Proxymngr(Package):
+    """The proxy manager (proxymngr) is responsible for resolving requests from
+    xfindproxy (and other similar clients), starting new proxies when
+    appropriate, and keeping track of all of the available proxy services.
+    The proxy manager strives to reuse existing proxies whenever possible."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/proxymngr"
+    url      = "https://www.x.org/archive/individual/app/proxymngr-1.0.4.tar.gz"
+
+    version('1.0.4', 'a165cf704f6a413f0bacf65ea470331f')
+
+    depends_on('libice')
+    depends_on('libxt')
+    depends_on('lbxproxy')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py
index 5b0026eda96801454c0b8ab0229ff623f94e569f..3f5bf989c15cead3827ce39f8c04d370e34539d9 100644
--- a/var/spack/repos/builtin/packages/py-basemap/package.py
+++ b/var/spack/repos/builtin/packages/py-basemap/package.py
@@ -23,6 +23,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
+import os
 
 
 class PyBasemap(Package):
@@ -37,10 +38,83 @@ class PyBasemap(Package):
     extends('python')
     depends_on('py-setuptools', type='build')
     depends_on('py-numpy', type=nolink)
-    depends_on('py-matplotlib+gui', type=nolink)
+    depends_on('py-matplotlib', type=nolink)
     depends_on('pil', type=nolink)
     depends_on("geos")
 
     def install(self, spec, prefix):
         env['GEOS_DIR'] = spec['geos'].prefix
         setup_py('install', '--prefix=%s' % prefix)
+
+        # We are not sure if this fix is needed before Python 3.5.2.
+        # If it is needed, this test should be changed.
+        # See: https://github.com/LLNL/spack/pull/1964
+        if spec['python'].version >= Version('3.5.2'):
+            # Use symlinks to join the two mpl_toolkits/ directories into
+            # one, inside of basemap.  This is because Basemap tries to
+            # "add to" an existing package in Matplotlib, which is only
+            # legal Python for "Implicit Namespace Packages":
+            #     https://www.python.org/dev/peps/pep-0420/
+            #     https://github.com/Homebrew/homebrew-python/issues/112
+            # In practice, Python will see only the basemap version of
+            # mpl_toolkits
+            path_m = find_package_dir(
+                spec['py-matplotlib'].prefix, 'mpl_toolkits')
+            path_b = find_package_dir(spec.prefix, 'mpl_toolkits')
+            link_dir(path_m, path_b)
+
+
+def find_package_dir(spack_package_root, name):
+
+    """Finds directory with a specific name, somewhere inside a Spack
+    package.
+
+    spack_package_root:
+        Root directory to start searching
+    oldname:
+        Original name of package (not fully qualified, just the leaf)
+    newname:
+        What to rename it to
+
+    """
+    for root, dirs, files in os.walk(spack_package_root):
+        path = os.path.join(root, name)
+
+        # Make sure it's a directory
+        if not os.path.isdir(path):
+            continue
+
+        # Make sure it's really a package
+        if not os.path.exists(os.path.join(path, '__init__.py')):
+            continue
+
+        return path
+
+    return None
+
+
+def link_dir(src_root, dest_root, link=os.symlink):
+    """Link all files in src_root into directory dest_root"""
+
+    for src_path, dirnames, filenames in os.walk(src_root):
+        if not filenames:
+            continue        # avoid explicitly making empty dirs
+
+        # Avoid internal Python stuff
+        src_leaf = os.path.split(src_path)[1]
+        if src_leaf.startswith('__'):
+            continue
+
+        # Make sure the destination directory exists
+        dest_path = os.path.join(dest_root, src_path[len(src_root) + 1:])
+        try:
+            os.makedirs(dest_path)
+        except:
+            pass
+
+        # Link all files from src to dest directory
+        for fname in filenames:
+            src = os.path.join(src_path, fname)
+            dst = os.path.join(dest_path, fname)
+            if not os.path.exists(dst):
+                link(src, dst)
diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..df5b00555faf753c3f501b366446aa608e7eeac6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-macs2/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class PyMacs2(Package):
+    """MACS2 Model-based Analysis of ChIP-Seq"""
+
+    homepage = "https://github.com/taoliu/MACS"
+    url      = "https://pypi.python.org/packages/9f/99/a8ac96b357f6b0a6f559fe0f5a81bcae12b98579551620ce07c5183aee2c/MACS2-2.1.1.20160309.tar.gz"
+
+    version('2.1.1.20160309', '2008ba838f83f34f8e0fddefe2a3a0159f4a740707c68058f815b31ddad53d26')
+
+    extends('python')
+    depends_on('python@2.7:2.8')
+
+    # Most Python packages only require py-setuptools as a build dependency.
+    # However, py-macs2 requires py-setuptools during runtime as well.
+    depends_on('py-setuptools', type=nolink)
+    depends_on('py-numpy@1.6:', type=nolink)
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py
index ed4ccc7364d7a34961edb49b200b230dd21651c1..460666081e6cae65a18e000bf152d2c40c7fe9dc 100644
--- a/var/spack/repos/builtin/packages/py-mako/package.py
+++ b/var/spack/repos/builtin/packages/py-mako/package.py
@@ -32,10 +32,15 @@ class PyMako(Package):
     homepage = "https://pypi.python.org/pypi/mako"
     url = "https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz"
 
+    version('1.0.4', 'c5fc31a323dd4990683d2f2da02d4e20')
     version('1.0.1', '9f0aafd177b039ef67b90ea350497a54')
 
-    depends_on('py-setuptools', type='build')
     extends('python')
 
+    depends_on('py-setuptools', type='build')
+    # depends_on('py-mock',   type='test')  # TODO: Add test deptype
+    # depends_on('py-pytest', type='test')  # TODO: Add test deptype
+    depends_on('py-markupsafe@0.9.2:', type=nolink)
+
     def install(self, spec, prefix):
-        setup_py('install', '--prefix=%s' % prefix)
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py
index 0b8ff4715d1c54bba52e28620d91d13b2edc3766..3ddca6d2bfb5c24fe5f7d67ac18573dbacd0f6ab 100644
--- a/var/spack/repos/builtin/packages/py-matplotlib/package.py
+++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py
@@ -38,36 +38,51 @@ class PyMatplotlib(Package):
     version('1.4.3', '86af2e3e3c61849ac7576a6f5ca44267')
     version('1.4.2', '7d22efb6cce475025733c50487bd8898')
 
-    variant('gui',     default=False, description='Enable GUI')
+    # See: http://matplotlib.org/users/installing.html
+
+    # Variants enabled by default for a standard configuration
+    variant('tk', default=True, description='Enable Tk GUI')
+    variant('image', default=True,
+            description='Enable reading/saving JPEG, BMP and TIFF files')
+
+    # Variants optionally available to user
     variant('ipython', default=False, description='Enable ipython support')
+    variant('qt', default=False, description='Enable Qt GUI')
+    variant('latex', default=False,
+            description='Enable LaTeX text rendering support')
+    variant('animation', default=False,
+            description='Enable animation support')
 
     # Python 2.7, 3.4, or 3.5
     extends('python', ignore=r'bin/nosetests.*$|bin/pbr$')
 
-    # Required dependencies
-    depends_on('py-numpy@1.6:',    type=nolink)
-    depends_on('py-setuptools',    type='build')
-    depends_on('py-dateutil@1.1:', type=nolink)
-    depends_on('py-pyparsing',     type=nolink)
+    # ------ Required dependencies
+    depends_on('py-setuptools', type='build')
+
     depends_on('libpng@1.2:')
-    depends_on('py-pytz',          type=nolink)
     depends_on('freetype@2.3:')
-    depends_on('py-cycler@0.9:',   type=nolink)
 
-    # Optional GUI framework
-    depends_on('tk@8.3:',   when='+gui')  # not 8.6.0 or 8.6.1
-    depends_on('qt',        when='+gui')
-    depends_on('py-pyside', when='+gui', type=nolink)
-    # TODO: Add more GUI dependencies
+    depends_on('py-numpy@1.6:', type=nolink)
+    depends_on('py-dateutil@1.1:', type=nolink)
+    depends_on('py-pyparsing', type=nolink)
+    depends_on('py-pytz', type=nolink)
+    depends_on('py-cycler@0.9:', type=nolink)
+
+    # ------ Optional GUI frameworks
+    depends_on('tk@8.3:', when='+tk')  # not 8.6.0 or 8.6.1
+    depends_on('qt', when='+qt')
+    depends_on('py-pyside', when='+qt', type=nolink)
 
-    # Optional external programs
+    # --------- Optional external programs
     # ffmpeg/avconv or mencoder
-    depends_on('ImageMagick')
+    depends_on('ImageMagick', when='+animation')
 
-    # Optional dependencies
-    depends_on('py-pillow',  type=nolink)
-    depends_on('pkg-config', type='build')
+    # --------- Optional dependencies
+    depends_on('pkg-config', type='build')    # why not...
+    depends_on('py-pillow', when='+image', type=nolink)
     depends_on('py-ipython', when='+ipython')
+    depends_on('ghostscript', when='+latex', type='run')
+    depends_on('texlive', when='+latex', type='run')
 
     # Testing dependencies
     depends_on('py-nose')  # type='test'
@@ -83,7 +98,7 @@ def install(self, spec, prefix):
         setup_py('build')
         setup_py('install', '--prefix={0}'.format(prefix))
 
-        if '+gui' in spec:
+        if '+qt' in spec or '+tk' in spec:
             # Set backend in matplotlib configuration file
             config_file = None
             for p, d, f in os.walk(prefix.lib):
@@ -95,5 +110,11 @@ def install(self, spec, prefix):
 
             kwargs = {'ignore_absent': False, 'backup': False, 'string': False}
             rc = FileFilter(config_file)
-            rc.filter('^backend.*',      'backend     : Qt4Agg', **kwargs)
-            rc.filter('^#backend.qt4.*', 'backend.qt4 : PySide', **kwargs)
+
+            # Only make Qt4 be the default backend if Tk is turned off
+            if '+qt' in spec and '+tk' not in spec:
+                rc.filter('^backend.*', 'backend     : Qt4Agg', **kwargs)
+
+            # Additional options in case user is doing Qt4:
+            if '+qt' in spec:
+                rc.filter('^#backend.qt4.*', 'backend.qt4 : PySide', **kwargs)
diff --git a/var/spack/repos/builtin/packages/py-py/package.py b/var/spack/repos/builtin/packages/py-py/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f624aaf3894331cb99a529109a36315e597aa125
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-py/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPy(Package):
+    """library with cross-python path, ini-parsing, io, code, log facilities"""
+
+    homepage = "http://pylib.readthedocs.io/en/latest/"
+    url      = "https://pypi.python.org/packages/source/p/py/py-1.4.31.tar.gz"
+
+    version('1.4.31', '5d2c63c56dc3f2115ec35c066ecd582b')
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4208b9d3ec5b5d285c47934d2d3b55ba7523faba
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pytest/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class PyPytest(Package):
+    """pytest: simple powerful testing with Python."""
+
+    homepage = "http://doc.pytest.org/en/latest/"
+    url      = "https://pypi.python.org/packages/source/p/pytest/pytest-3.0.2.tar.gz"
+
+    version('3.0.2', '61dc36e65a6f6c11c53b1388e043a9f5',
+            url="https://pypi.python.org/packages/2b/05/e20806c99afaff43331f5fd8770bb346145303882f98ef3275fa1dd66f6d/pytest-3.0.2.tar.gz")
+
+    extends('python')
+
+    depends_on('py-setuptools', type='build')
+    depends_on('py-py@1.4.29:', type=nolink)
+
+    def install(self, spec, prefix):
+        setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 2dba05ce1316626955038f466b2b3cebb1d1b6f8..f04f05ec89bf64ac9f702ed5433d1d2b3712c994 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -183,7 +183,6 @@ def common_config_args(self):
                 '-no-xcb-xlib',
                 '-no-pulseaudio',
                 '-no-alsa',
-                '-no-gtkstyle',
             ])
 
         if '@4' in self.spec and sys.platform == 'darwin':
diff --git a/var/spack/repos/builtin/packages/randrproto/package.py b/var/spack/repos/builtin/packages/randrproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ecff886a3ba58a5dcd9425a3894ea13c39bee195
--- /dev/null
+++ b/var/spack/repos/builtin/packages/randrproto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Randrproto(Package):
+    """X Resize and Rotate Extension (RandR).
+
+    This extension defines a protocol for clients to dynamically change X
+    screens, so as to resize, rotate and reflect the root window of a screen.
+    """
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/randrproto"
+    url      = "https://www.x.org/archive/individual/proto/randrproto-1.5.0.tar.gz"
+
+    version('1.5.0', '863d6ee3e0b2708f75d968470ed31eb9')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/recordproto/package.py b/var/spack/repos/builtin/packages/recordproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..02018a76ff50f45143631fbb0132d7a8bcce4d6f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/recordproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Recordproto(Package):
+    """X Record Extension.
+
+    This extension defines a protocol for the recording and playback of user
+    actions in the X Window System."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/recordproto"
+    url      = "https://www.x.org/archive/individual/proto/recordproto-1.14.2.tar.gz"
+
+    version('1.14.2', '868235e1e150e68916d5a316ebc4ccc4')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/rendercheck/package.py b/var/spack/repos/builtin/packages/rendercheck/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..07cc809e9ad38cebe6d448e30b87c5f222ce36d5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/rendercheck/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Rendercheck(Package):
+    """rendercheck is a program to test a Render extension implementation
+    against separate calculations of expected output."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/rendercheck"
+    url      = "https://www.x.org/archive/individual/app/rendercheck-1.5.tar.gz"
+
+    version('1.5', '92ddef6d01f02529521af103f9b9bf60')
+
+    depends_on('libxrender')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/renderproto/package.py b/var/spack/repos/builtin/packages/renderproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..10be4c941c4ab0f4681b03f1d989ac742ee836d8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/renderproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Renderproto(Package):
+    """X Rendering Extension.
+
+    This extension defines the protcol for a digital image composition as
+    the foundation of a new rendering model within the X Window System."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/renderproto"
+    url      = "https://www.x.org/archive/individual/proto/renderproto-0.11.1.tar.gz"
+
+    version('0.11.1', '9b103359123e375bb7760f7dbae3dece')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/resourceproto/package.py b/var/spack/repos/builtin/packages/resourceproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e0a495d83ff185fba2cdcab44bf80920ed37c61
--- /dev/null
+++ b/var/spack/repos/builtin/packages/resourceproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Resourceproto(Package):
+    """X Resource Extension.
+
+    This extension defines a protocol that allows a client to query the
+    X server about its usage of various resources."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/resourceproto"
+    url      = "https://www.x.org/archive/individual/proto/resourceproto-1.2.0.tar.gz"
+
+    version('1.2.0', '33091d5358ec32dd7562a1aa225a70aa')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/rgb/package.py b/var/spack/repos/builtin/packages/rgb/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ddc5419305537b225e1fb07bcd03b8603c9d1366
--- /dev/null
+++ b/var/spack/repos/builtin/packages/rgb/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Rgb(Package):
+    """X color name database.
+
+    This package includes both the list mapping X color names to RGB values
+    (rgb.txt) and, if configured to use a database for color lookup, the
+    rgb program to convert the text file into the binary database format.
+
+    The "others" subdirectory contains some alternate color databases."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/rgb"
+    url      = "https://www.x.org/archive/individual/app/rgb-1.0.6.tar.gz"
+
+    version('1.0.6', '9759d058108f39066bbdf1d5d6de048c')
+
+    depends_on('xorg-server')
+
+    depends_on('xproto', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/rstart/package.py b/var/spack/repos/builtin/packages/rstart/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..7b80e88ae7e1a5056321b2e49d33d533bd009991
--- /dev/null
+++ b/var/spack/repos/builtin/packages/rstart/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Rstart(Package):
+    """This package includes both the client and server sides implementing
+    the protocol described in the "A Flexible Remote Execution Protocol
+    Based on rsh" paper found in the specs/ subdirectory.
+
+    This software has been deprecated in favor of the X11 forwarding
+    provided in common ssh implementations."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/rstart"
+    url      = "https://www.x.org/archive/individual/app/rstart-1.0.5.tar.gz"
+
+    version('1.0.5', '32db3625cb5e841e17d6bc696f21edfb')
+
+    depends_on('xproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/scripts/package.py b/var/spack/repos/builtin/packages/scripts/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..7086cfd6fe1499e8b579cebb6ba344a802eb2733
--- /dev/null
+++ b/var/spack/repos/builtin/packages/scripts/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Scripts(Package):
+    """Various X related scripts."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/scripts"
+    url      = "https://www.x.org/archive/individual/app/scripts-1.0.1.tar.gz"
+
+    version('1.0.1', '1e8294a126a2a7556b21025a8d933e8b')
+
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/scrnsaverproto/package.py b/var/spack/repos/builtin/packages/scrnsaverproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3675fd0effadc8bc38897165219bc7e79861d22b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/scrnsaverproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Scrnsaverproto(Package):
+    """MIT Screen Saver Extension.
+
+    This extension defines a protocol to control screensaver features
+    and also to query screensaver info on specific windows."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/scrnsaverproto"
+    url      = "https://www.x.org/archive/individual/proto/scrnsaverproto-1.2.2.tar.gz"
+
+    version('1.2.2', '21704f1bad472d94abd22fea5704bb48')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/sessreg/package.py b/var/spack/repos/builtin/packages/sessreg/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..2ab505cc7ae10c249f0ac6262ad9c8294824e57d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/sessreg/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Sessreg(Package):
+    """Sessreg is a simple program for managing utmp/wtmp entries for X
+    sessions. It was originally written for use with xdm, but may also be
+    used with other display managers such as gdm or kdm."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/sessreg"
+    url      = "https://www.x.org/archive/individual/app/sessreg-1.1.0.tar.gz"
+
+    version('1.1.0', '5d7eb499043c7fdd8d53c5ba43660312')
+
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def patch(self):
+        kwargs = {'string': True}
+        filter_file('$(CPP) $(DEFS)', '$(CPP) -P $(DEFS)',
+                    'man/Makefile.in', **kwargs)
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..db365530c9442a468bf6c60f6f7cf4997c0cd778
--- /dev/null
+++ b/var/spack/repos/builtin/packages/setxkbmap/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Setxkbmap(Package):
+    """setxkbmap is an X11 client to change the keymaps in the X server for a
+    specified keyboard to use the layout determined by the options listed
+    on the command line."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/setxkbmap"
+    url      = "https://www.x.org/archive/individual/app/setxkbmap-1.3.1.tar.gz"
+
+    version('1.3.1', 'fdfc0fc643a50fb0b5fa7546e4d28868')
+
+    depends_on('libxkbfile')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/showfont/package.py b/var/spack/repos/builtin/packages/showfont/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..232988193bf60477b2cf6cb052aa45355eee9d27
--- /dev/null
+++ b/var/spack/repos/builtin/packages/showfont/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Showfont(Package):
+    """showfont displays data about a font from an X font server.
+    The information shown includes font information, font properties,
+    character metrics, and character bitmaps."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/showfont"
+    url      = "https://www.x.org/archive/individual/app/showfont-1.0.5.tar.gz"
+
+    version('1.0.5', 'cea973363df01fb27a87e939600137fd')
+
+    depends_on('libfs')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py
index fd6c42d9fc0ee77f4ac962e398d7f891922b6ae8..e208400eead34cec71c3f3190bccf59a784d7403 100644
--- a/var/spack/repos/builtin/packages/slepc/package.py
+++ b/var/spack/repos/builtin/packages/slepc/package.py
@@ -34,6 +34,7 @@ class Slepc(Package):
     homepage = "http://www.grycap.upv.es/slepc"
     url = "http://slepc.upv.es/download/download.php?filename=slepc-3.6.2.tar.gz"
 
+    version('3.7.3', '3ef9bcc645a10c1779d56b3500472ceb66df692e389d635087d30e7c46424df9')
     version('3.7.1', '670216f263e3074b21e0623c01bc0f562fdc0bffcd7bd42dd5d8edbe73a532c2')
     version('3.6.3', '384939d009546db37bc05ed81260c8b5ba451093bf891391d32eb7109ccff876')
     version('3.6.2', '2ab4311bed26ccf7771818665991b2ea3a9b15f97e29fd13911ab1293e8e65df')
diff --git a/var/spack/repos/builtin/packages/smproxy/package.py b/var/spack/repos/builtin/packages/smproxy/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5bdde800d48bc34306512caadea0fa80807afb9f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/smproxy/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Smproxy(Package):
+    """smproxy allows X applications that do not support X11R6 session
+    management to participate in an X11R6 session."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/smproxy"
+    url      = "https://www.x.org/archive/individual/app/smproxy-1.0.6.tar.gz"
+
+    version('1.0.6', '012c259f5a89e5c636037446d44eb354')
+
+    depends_on('libsm')
+    depends_on('libice')
+    depends_on('libxt')
+    depends_on('libxmu')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py
index 78c2e14b34043fba943e6bd069506ff3ca643a36..c57ee723233b9486772fcaed79f3c9df19f922d0 100644
--- a/var/spack/repos/builtin/packages/sqlite/package.py
+++ b/var/spack/repos/builtin/packages/sqlite/package.py
@@ -34,7 +34,7 @@ class Sqlite(Package):
     homepage = "www.sqlite.org"
 
     version('3.8.5', '0544ef6d7afd8ca797935ccc2685a9ed',
-            url='http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz')
+            url='https://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz')
 
     def get_arch(self):
         arch = architecture.Arch()
diff --git a/var/spack/repos/builtin/packages/sublime-text/package.py b/var/spack/repos/builtin/packages/sublime-text/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..81d8690db857bb60b321d35c8e8235afc6264b71
--- /dev/null
+++ b/var/spack/repos/builtin/packages/sublime-text/package.py
@@ -0,0 +1,59 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+from distutils.dir_util import copy_tree
+
+
+class SublimeText(Package):
+    """Sublime Text is a sophisticated text editor for code, markup and
+    prose."""
+
+    homepage = "http://www.sublimetext.com/"
+    url      = "https://download.sublimetext.com/sublime_text_3_build_3126_x64.tar.bz2"
+
+    version('3126',  'acc34252b0ea7dff1f581c5db1564dcb')
+    version('2.0.2', '699cd26d7fe0bada29eb1b2cd7b50e4b')
+
+    # Sublime text comes as a pre-compiled binary.
+    # Since we can't link to Spack packages, we'll just have to
+    # add them as runtime dependencies.
+
+    # depends_on('libgobject', type='run')
+    depends_on('glib', type='run')
+    depends_on('libx11', type='run')
+    depends_on('pcre', type='run')
+    depends_on('libffi', type='run')
+    depends_on('libxcb', type='run')
+    depends_on('libxau', type='run')
+
+    def url_for_version(self, version):
+        if version.up_to(1) == '2':
+            return "https://download.sublimetext.com/Sublime%20Text%20{0}%20x64.tar.bz2".format(version)
+        else:
+            return "https://download.sublimetext.com/sublime_text_3_build_{0}_x64.tar.bz2".format(version)
+
+    def install(self, spec, prefix):
+        # Sublime text comes as a pre-compiled binary.
+        copy_tree('.', prefix)
diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py
index a29b74bf0848621e991ad390c50343a067870655..e9c345eeb226b1ce84ec90c84dd3a5123a54f0fc 100644
--- a/var/spack/repos/builtin/packages/superlu-dist/package.py
+++ b/var/spack/repos/builtin/packages/superlu-dist/package.py
@@ -32,6 +32,8 @@ class SuperluDist(Package):
     homepage = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/"
     url = "http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_dist_4.1.tar.gz"
 
+    version('5.1.1', '12638c631733a27dcbd87110e9f9cb1e')
+    version('5.1.0', '6bb86e630bd4bd8650243aed8fd92eb9')
     version('5.0.0', '2b53baf1b0ddbd9fcf724992577f0670')
     version('4.3', 'ee66c84e37b4f7cc557771ccc3dc43ae')
     version('4.2', 'ae9fafae161f775fbac6eba11e530a65')
diff --git a/var/spack/repos/builtin/packages/taskd/package.py b/var/spack/repos/builtin/packages/taskd/package.py
index d13f4803744e45888efb3426f5d899ad9d175917..bfe77aaa5c41a5268f51597b16a1b9ebd8944860 100644
--- a/var/spack/repos/builtin/packages/taskd/package.py
+++ b/var/spack/repos/builtin/packages/taskd/package.py
@@ -27,7 +27,7 @@
 
 class Taskd(Package):
     """TaskWarrior task synchronization daemon"""
-    # FIXME: add a proper url for your package's homepage here.
+
     homepage = "http://www.taskwarrior.org"
     url      = "http://taskwarrior.org/download/taskd-1.1.0.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/transset/package.py b/var/spack/repos/builtin/packages/transset/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0f607387417dc52e2826a6ecce156aa48b3e1aa1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/transset/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Transset(Package):
+    """transset is an utility for setting opacity property."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/transset"
+    url      = "https://www.x.org/archive/individual/app/transset-1.0.1.tar.gz"
+
+    version('1.0.1', '4bbee6f6ea6fbd403280b4bb311db6dc')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/trapproto/package.py b/var/spack/repos/builtin/packages/trapproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..eebab74410035b5c09398c39c4d656cb556dff48
--- /dev/null
+++ b/var/spack/repos/builtin/packages/trapproto/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Trapproto(Package):
+    """X.org TrapProto protocol headers."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/trapproto"
+    url      = "https://www.x.org/archive/individual/proto/trapproto-3.4.3.tar.gz"
+
+    version('3.4.3', '1344759ae8d7d923e64f5eec078a679b')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/twm/package.py b/var/spack/repos/builtin/packages/twm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e37f4903d3b701e75e7718021c2728f9365cf7d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/twm/package.py
@@ -0,0 +1,56 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Twm(Package):
+    """twm is a window manager for the X Window System.  It provides
+    titlebars, shaped windows, several forms of icon management,
+    user-defined macro functions, click-to-type and pointer-driven
+    keyboard focus, and user-specified key and pointer button bindings."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/twm"
+    url      = "https://www.x.org/archive/individual/app/twm-1.0.9.tar.gz"
+
+    version('1.0.9', 'e98fcb32f774ac1ff7bf82101b79f61e')
+
+    depends_on('libx11')
+    depends_on('libxext')
+    depends_on('libxt')
+    depends_on('libxmu')
+    depends_on('libice')
+    depends_on('libsm')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('bison', type='build')
+    depends_on('flex', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/util-macros/package.py b/var/spack/repos/builtin/packages/util-macros/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..486d4463b0dc355a0532d6a734587d5a1050fca0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/util-macros/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class UtilMacros(Package):
+    """This is a set of autoconf macros used by the configure.ac scripts in
+    other Xorg modular packages, and is needed to generate new versions
+    of their configure scripts with autoconf."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/util/macros/"
+    url = "https://www.x.org/archive/individual/util/util-macros-1.19.0.tar.bz2"
+
+    version('1.19.0', '1cf984125e75f8204938d998a8b6c1e1')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/videoproto/package.py b/var/spack/repos/builtin/packages/videoproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..93b0e61ca430663b3a53857e4bc806736c182469
--- /dev/null
+++ b/var/spack/repos/builtin/packages/videoproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Videoproto(Package):
+    """X Video Extension.
+
+    This extension provides a protocol for a video output mechanism,
+    mainly to rescale video playback in the video controller hardware."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/videoproto"
+    url      = "https://www.x.org/archive/individual/proto/videoproto-2.3.3.tar.gz"
+
+    version('2.3.3', 'd984100603ee2420072f27bb491f4b7d')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/viewres/package.py b/var/spack/repos/builtin/packages/viewres/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3a3255507569a801efbd354e19b37f6483bca585
--- /dev/null
+++ b/var/spack/repos/builtin/packages/viewres/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Viewres(Package):
+    """viewres displays a tree showing the widget class hierarchy of the
+    Athena Widget Set (libXaw)."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/viewres"
+    url      = "https://www.x.org/archive/individual/app/viewres-1.0.4.tar.gz"
+
+    version('1.0.4', 'a3c7fe561945951f848e319680753760')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/windowswmproto/package.py b/var/spack/repos/builtin/packages/windowswmproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f163d1afb0b3d2f771a01c382c6d3452f8cd164d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/windowswmproto/package.py
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Windowswmproto(Package):
+    """This module provides the definition of the WindowsWM extension to the
+    X11 protocol, used for coordination between an X11 server and the
+    Microsoft Windows native window manager.
+
+    WindowsWM is only intended to be used on Cygwin when running a
+    rootless XWin server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/windowswmproto"
+    url      = "https://www.x.org/archive/individual/proto/windowswmproto-1.0.4.tar.gz"
+
+    version('1.0.4', '558db92a8e4e1b07e9c62eca3f04dd8d')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/x11perf/package.py b/var/spack/repos/builtin/packages/x11perf/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..91db1e8a59bdb10d9654befc603dd39c1e7655ac
--- /dev/null
+++ b/var/spack/repos/builtin/packages/x11perf/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class X11perf(Package):
+    """Simple X server performance benchmarker."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/x11perf"
+    url      = "https://www.x.org/archive/individual/app/x11perf-1.6.0.tar.gz"
+
+    version('1.6.0', '8dcdb74db8c70dca4b4eab11dc33dd31')
+
+    depends_on('libx11')
+    depends_on('libxmu')
+    depends_on('libxrender')
+    depends_on('libxft')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xauth/package.py b/var/spack/repos/builtin/packages/xauth/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d6a03c8996317767d7136b0b3c8709881c0a4fa
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xauth/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xauth(Package):
+    """The xauth program is used to edit and display the authorization
+    information used in connecting to the X server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xauth"
+    url      = "https://www.x.org/archive/individual/app/xauth-1.0.9.tar.gz"
+
+    version('1.0.9', 'def3b4588504ee3d8ec7be607826df02')
+
+    depends_on('libx11')
+    depends_on('libxau')
+    depends_on('libxext')
+    depends_on('libxmu')
+
+    depends_on('xproto@7.0.17:')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        # make('check')  # TODO: add package for cmdtest build dependency
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xbacklight/package.py b/var/spack/repos/builtin/packages/xbacklight/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f1a9ecc1242df9589b05944f72bbb16e65a99416
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xbacklight/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xbacklight(Package):
+    """Xbacklight is used to adjust the backlight brightness where supported.
+    It uses the RandR extension to find all outputs on the X server
+    supporting backlight brightness control and changes them all in the
+    same way."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xbacklight"
+    url      = "https://www.x.org/archive/individual/app/xbacklight-1.2.1.tar.gz"
+
+    version('1.2.1', 'e8e4c86b0f867e23aa3532618a697609')
+
+    depends_on('libxcb')
+    depends_on('xcb-util')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xbiff/package.py b/var/spack/repos/builtin/packages/xbiff/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f5c53c5997de00a030e88cc15fef5758aa79b2b9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xbiff/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xbiff(Package):
+    """xbiff provides graphical notification of new e-mail.
+    It only handles mail stored in a filesystem accessible file,
+    not via IMAP, POP or other remote access protocols."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xbiff"
+    url      = "https://www.x.org/archive/individual/app/xbiff-1.0.3.tar.gz"
+
+    version('1.0.3', '779c888cb45da82a612e7f47971df9ab')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxext')
+    depends_on('libx11')
+
+    depends_on('xbitmaps', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xbitmaps/package.py b/var/spack/repos/builtin/packages/xbitmaps/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..1c6fb79d3add3ae32e202875f140d9cb403e03d5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xbitmaps/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xbitmaps(Package):
+    """The xbitmaps package contains bitmap images used by multiple
+    applications built in Xorg."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/data/bitmaps/"
+    url      = "https://www.x.org/archive/individual/data/xbitmaps-1.1.1.tar.gz"
+
+    version('1.1.1', '288bbe310db67280a9e2e5ebc5602595')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcalc/package.py b/var/spack/repos/builtin/packages/xcalc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a470d1c9d06d12445a37e84306b702e9efa16722
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcalc/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xcalc(Package):
+    """xcalc is a scientific calculator X11 client that can emulate a TI-30
+    or an HP-10C."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xcalc"
+    url      = "https://www.x.org/archive/individual/app/xcalc-1.0.6.tar.gz"
+
+    version('1.0.6', 'a192ebb5e5f33925c71713501173d8e0')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-demo/package.py b/var/spack/repos/builtin/packages/xcb-demo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..62433e3b32eb8c25626e73ca2a509ec688a1b58c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-demo/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbDemo(Package):
+    """xcb-demo: A collection of demo programs that use the XCB library."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-demo-0.1.tar.gz"
+
+    version('0.1', '803c5c91d54e734e6f6fa3f04f2463ff')
+
+    depends_on('libxcb')
+    depends_on('xcb-util')
+    depends_on('xcb-util-image')
+    depends_on('xcb-util-wm')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        # FIXME: crashes with the following error message
+        # X11/XCB/xcb.h: No such file or directory
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-proto/package.py b/var/spack/repos/builtin/packages/xcb-proto/package.py
index 587983f6bddc5ebfc96ade02297484b68fe6772e..d2ac54d34f4dbbd60ce89ced9d2f65c8e4955e46 100644
--- a/var/spack/repos/builtin/packages/xcb-proto/package.py
+++ b/var/spack/repos/builtin/packages/xcb-proto/package.py
@@ -26,15 +26,19 @@
 
 
 class XcbProto(Package):
-    """Protocol for libxcb"""
+    """xcb-proto provides the XML-XCB protocol descriptions that libxcb uses to
+    generate the majority of its code and API."""
 
     homepage = "http://xcb.freedesktop.org/"
     url      = "http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.gz"
 
+    version('1.12', '5ee1ec124ea8d56bd9e83b8e9e0b84c4')
     version('1.11', 'c8c6cb72c84f58270f4db1f39607f66a')
 
+    extends('python')
+
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix)
+        configure('--prefix={0}'.format(prefix))
 
-        make()
-        make("install")
+        # make('check')  # fails xmllint validation
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util-cursor/package.py b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..b25fb181a612a7c96d5a4e3bbb0ebdcda8566e48
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util-cursor/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtilCursor(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.gz"
+
+    version('0.1.3', '4b0768fa497127131a47f07e5c8cf745')
+
+    depends_on('libxcb@1.4:')
+    depends_on('xcb-util-renderutil')
+    depends_on('xcb-util-image')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util-errors/package.py b/var/spack/repos/builtin/packages/xcb-util-errors/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c287a0ec6e7455ed935714f44d1c3bf0c2555a0c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util-errors/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtilErrors(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.gz"
+
+    version('1.0', 'dc4a6ce073a81a0b7e614a2988f275cc')
+
+    depends_on('libxcb@1.4:')
+
+    depends_on('xcb-proto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util-image/package.py b/var/spack/repos/builtin/packages/xcb-util-image/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4413c7e11dcc70126cde2ab84e0674b250b7ee4a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util-image/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtilImage(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.gz"
+
+    version('0.4.0', '32c9c2f72ebd58a2b2e210f27fee86f7')
+
+    depends_on('libxcb@1.4:')
+    depends_on('xcb-util')
+
+    depends_on('xproto@7.0.8:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0de6391b1831e17d1f870ab41ba9d33a4ef52e8f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util-keysyms/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtilKeysyms(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.gz"
+
+    version('0.4.0', '2decde7b02b4b3bde99a02c17b64d5dc')
+
+    depends_on('libxcb@1.4:')
+
+    depends_on('xproto@7.0.8:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..d41c88206c9d22056874c8442ca6c20ab6a1028c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util-renderutil/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtilRenderutil(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.gz"
+
+    version('0.3.9', 'ac18c1b70ae69845e112f1d987926436')
+
+    depends_on('libxcb@1.4:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util-wm/package.py b/var/spack/repos/builtin/packages/xcb-util-wm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef3db06aec1ca492273f36ebe244edc8b496d8c8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util-wm/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtilWm(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.gz"
+
+    version('0.4.1', '0831399918359bf82930124fa9fd6a9b')
+
+    depends_on('libxcb@1.4:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcb-util/package.py b/var/spack/repos/builtin/packages/xcb-util/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..820592a31972c6f5c88c712821ec871e12002f85
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcb-util/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcbUtil(Package):
+    """The XCB util modules provides a number of libraries which sit on top
+    of libxcb, the core X protocol library, and some of the extension
+    libraries. These experimental libraries provide convenience functions
+    and interfaces which make the raw X protocol more usable. Some of the
+    libraries also provide client-side code which is not strictly part of
+    the X protocol but which have traditionally been provided by Xlib."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.gz"
+
+    version('0.4.0', '157d82738aa89934b6adaf3ca508a0f5')
+
+    depends_on('libxcb@1.4:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xclipboard/package.py b/var/spack/repos/builtin/packages/xclipboard/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..d9af19da719b7f879871c6e10e6999879cb4cb54
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xclipboard/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xclipboard(Package):
+    """xclipboard is used to collect and display text selections that are
+    sent to the CLIPBOARD by other clients.  It is typically used to save
+    CLIPBOARD selections for later use.  It stores each CLIPBOARD
+    selection as a separate string, each of which can be selected."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xclipboard"
+    url      = "https://www.x.org/archive/individual/app/xclipboard-1.1.3.tar.gz"
+
+    version('1.1.3', 'cee91df9df1b5d63034681546fd78c0b')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt@1.1:')
+    depends_on('libx11')
+    depends_on('libxkbfile')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xclock/package.py b/var/spack/repos/builtin/packages/xclock/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5bd38826db23b51296915bc911a50f3f8b43ed1f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xclock/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xclock(Package):
+    """xclock is the classic X Window System clock utility.  It displays
+    the time in analog or digital form, continuously updated at a
+    frequency which may be specified by the user."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xclock"
+    url      = "https://www.x.org/archive/individual/app/xclock-1.0.7.tar.gz"
+
+    version('1.0.7', 'bbade10e6234d8db276212014e8c77fa')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libx11')
+    depends_on('libxrender')
+    depends_on('libxft')
+    depends_on('libxkbfile')
+    depends_on('libxt')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcmiscproto/package.py b/var/spack/repos/builtin/packages/xcmiscproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..2b15d1b3e7771d34a2bae691da4e24ca69dcd2f4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcmiscproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xcmiscproto(Package):
+    """XC-MISC Extension.
+
+    This extension defines a protocol that provides Xlib two ways to query
+    the server for available resource IDs."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/xcmiscproto"
+    url      = "https://www.x.org/archive/individual/proto/xcmiscproto-1.2.2.tar.gz"
+
+    version('1.2.2', 'ded6cd23fb2800df93ebf2b3f3b01119')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcmsdb/package.py b/var/spack/repos/builtin/packages/xcmsdb/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4d12e3a843ab2240a7c584aa9f27d50055ba7e16
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcmsdb/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xcmsdb(Package):
+    """xcmsdb is used to load, query, or remove Device Color Characterization
+    data stored in properties on the root window of the screen as
+    specified in section 7, Device Color Characterization, of the
+    X11 Inter-Client Communication Conventions Manual (ICCCM)."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xcmsdb"
+    url      = "https://www.x.org/archive/individual/app/xcmsdb-1.0.5.tar.gz"
+
+    version('1.0.5', 'e7b1699c831b44d7005bff45977ed56a')
+
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcompmgr/package.py b/var/spack/repos/builtin/packages/xcompmgr/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc5bbb4b9c695de326d7b51d4b329fd61f3e532f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcompmgr/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xcompmgr(Package):
+    """xcompmgr is a sample compositing manager for X servers supporting the
+    XFIXES, DAMAGE, RENDER, and COMPOSITE extensions.  It enables basic
+    eye-candy effects."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xcompmgr"
+    url      = "https://www.x.org/archive/individual/app/xcompmgr-1.1.7.tar.gz"
+
+    version('1.1.7', '4992895c8934bbc99bb2447dfe5081f2')
+
+    depends_on('libxcomposite')
+    depends_on('libxfixes')
+    depends_on('libxdamage')
+    depends_on('libxrender')
+    depends_on('libxext')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f86fe753b6a4d3d4f688f1adbb0176d07fe1fce1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xconsole/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xconsole(Package):
+    """xconsole displays in a X11 window the messages which are usually sent
+    to /dev/console."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xconsole"
+    url      = "https://www.x.org/archive/individual/app/xconsole-1.0.6.tar.gz"
+
+    version('1.0.6', '46cb988e31a0cf9a02c2bbc4a82bd572')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt@1.0:')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xcursor-themes/package.py b/var/spack/repos/builtin/packages/xcursor-themes/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..7c38c9999cccf058c66d030baf2efdedab910c37
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcursor-themes/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XcursorThemes(Package):
+    """This is a default set of cursor themes for use with libXcursor,
+    originally created for the XFree86 Project, and now shipped as part
+    of the X.Org software distribution."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/data/cursors"
+    url      = "https://www.x.org/archive/individual/data/xcursor-themes-1.0.4.tar.gz"
+
+    version('1.0.4', 'c82628f35e9950ba225050ad5803b92a')
+
+    depends_on('libxcursor')
+
+    depends_on('xcursorgen', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
+
+        # `make install` copies the files to the libxcursor installation.
+        # Create a fake directory to convince Spack that we actually
+        # installed something.
+        mkdir(prefix.lib)
diff --git a/var/spack/repos/builtin/packages/xcursorgen/package.py b/var/spack/repos/builtin/packages/xcursorgen/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4e43844646cdbacc6df4f58f99dc46b19b51e3ad
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xcursorgen/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xcursorgen(Package):
+    """xcursorgen prepares X11 cursor sets for use with libXcursor."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xcursorgen"
+    url      = "https://www.x.org/archive/individual/app/xcursorgen-1.0.6.tar.gz"
+
+    version('1.0.6', '669df84fc30d89c12ce64b95aba26677')
+
+    depends_on('libx11')
+    depends_on('libxcursor')
+    depends_on('libpng@1.2.0:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xdbedizzy/package.py b/var/spack/repos/builtin/packages/xdbedizzy/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..7a8f97401f5f2e15b5a4b5666419da997f8eab53
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xdbedizzy/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xdbedizzy(Package):
+    """xdbedizzy is a demo of the X11 Double Buffer Extension (DBE)
+    creating a double buffered spinning scene."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xdbedizzy"
+    url      = "https://www.x.org/archive/individual/app/xdbedizzy-1.1.0.tar.gz"
+
+    version('1.1.0', '969be2f6bc62455431ab027f99720dc3')
+
+    depends_on('libx11')
+    depends_on('libxext')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xditview/package.py b/var/spack/repos/builtin/packages/xditview/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3fececd12e36de5b93a2286dd98f1331b008111e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xditview/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xditview(Package):
+    """xditview displays ditroff output on an X display."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xditview"
+    url      = "https://www.x.org/archive/individual/app/xditview-1.0.4.tar.gz"
+
+    version('1.0.4', '46dffbbc4de3039fdecabb73d10d6a4f')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..d42ced9a57916a841494a127d65fda21b7ab066a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xdm/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xdm(Package):
+    """X Display Manager / XDMCP server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xdm"
+    url      = "https://www.x.org/archive/individual/app/xdm-1.1.11.tar.gz"
+
+    version('1.1.11', 'aaf8c3d05d4a1e689d2d789c99a6023c')
+
+    depends_on('libxmu')
+    depends_on('libx11')
+    depends_on('libxau')
+    depends_on('libxinerama')
+    depends_on('libxft')
+    depends_on('libxpm')
+    depends_on('libxaw')
+    depends_on('libxdmcp')
+    depends_on('libxt')
+    depends_on('libxext')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xdpyinfo/package.py b/var/spack/repos/builtin/packages/xdpyinfo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c69af3b357b7739950b15c1b1243205e41fc74d8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xdpyinfo/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xdpyinfo(Package):
+    """xdpyinfo is a utility for displaying information about an X server.
+
+    It is used to examine the capabilities of a server, the predefined
+    values for various parameters used in communicating between clients
+    and the server, and the different types of screens, visuals, and X11
+    protocol extensions that are available."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xdpyinfo"
+    url      = "https://www.x.org/archive/individual/app/xdpyinfo-1.3.2.tar.gz"
+
+    version('1.3.2', 'dab410719d36c9df690cf3a8cd7d117e')
+
+    depends_on('libxext')
+    depends_on('libx11')
+    depends_on('libxtst')
+    depends_on('libxcb')
+
+    depends_on('xproto@7.0.22:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xdriinfo/package.py b/var/spack/repos/builtin/packages/xdriinfo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..7548175f6f909f33a58adc557e6c66266cd3b103
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xdriinfo/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xdriinfo(Package):
+    """xdriinfo - query configuration information of X11 DRI drivers."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xdriinfo"
+    url      = "https://www.x.org/archive/individual/app/xdriinfo-1.0.5.tar.gz"
+
+    version('1.0.5', '34a4a9ae69c60f4c2566bf9ea4bcf311')
+
+    depends_on('libx11')
+    depends_on('expat')
+    depends_on('libxshmfence')
+    depends_on('libxext')
+    depends_on('libxdamage')
+    depends_on('libxfixes')
+    depends_on('pcre')
+
+    depends_on('glproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xedit/package.py b/var/spack/repos/builtin/packages/xedit/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..da5f28809f5ef5b78d7baf53419095f1035dffe1
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xedit/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xedit(Package):
+    """Xedit is a simple text editor for X."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/app/xedit"
+    url      = "https://www.x.org/archive/individual/app/xedit-1.2.2.tar.gz"
+
+    version('1.2.2', '9fb9d6f63b574e5a4937384fbe6579c1')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt@1.0:')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5727d4e428717b735cec7516fe2d5f8f53b1cf2c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xev/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xev(Package):
+    """xev creates a window and then asks the X server to send it X11 events
+    whenever anything happens to the window (such as it being moved,
+    resized, typed in, clicked in, etc.).  You can also attach it to an
+    existing window.  It is useful for seeing what causes events to occur
+    and to display the information that they contain; it is essentially a
+    debugging and development tool, and should not be needed in normal
+    usage."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xev"
+    url      = "https://www.x.org/archive/individual/app/xev-1.2.2.tar.gz"
+
+    version('1.2.2', 'fdb374f77cdad8e104b989a0148c4c1f')
+
+    depends_on('libxrandr@1.2:')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xextproto/package.py b/var/spack/repos/builtin/packages/xextproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..97e65ff17be83c47a1b0a59bd86f28c969c35c54
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xextproto/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xextproto(Package):
+    """X Protocol Extensions."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/xextproto"
+    url      = "https://www.x.org/archive/individual/proto/xextproto-7.3.0.tar.gz"
+
+    version('7.3.0', '37b700baa8c8ea7964702d948dd13821')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xeyes/package.py b/var/spack/repos/builtin/packages/xeyes/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..cfea92fda37461d63f3a989ca13bc447a47b9b18
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xeyes/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xeyes(Package):
+    """xeyes - a follow the mouse X demo, using the X SHAPE extension"""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xeyes"
+    url      = "https://www.x.org/archive/individual/app/xeyes-1.1.1.tar.gz"
+
+    version('1.1.1', '2c0522bce5c61bbe784d2b3491998d31')
+
+    depends_on('libx11')
+    depends_on('libxt')
+    depends_on('libxext')
+    depends_on('libxmu')
+    depends_on('libxrender@0.4:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86bigfontproto/package.py b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6c1dc8f37d9b665951199e3c1378a3b0c6346052
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86bigfontproto/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86bigfontproto(Package):
+    """X.org XF86BigFontProto protocol headers."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86bigfontproto"
+    url      = "https://www.x.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.gz"
+
+    version('1.2.0', '91b0733ff4cbe55808d96073258aa3d1')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86dga/package.py b/var/spack/repos/builtin/packages/xf86dga/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8add6fbca7e8ef965c20b898f5dd93223074b282
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86dga/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86dga(Package):
+    """dga is a simple test client for the XFree86-DGA extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xf86dga"
+    url      = "https://www.x.org/archive/individual/app/xf86dga-1.0.3.tar.gz"
+
+    version('1.0.3', '3b87bb916c9df68cf5e4e969307b25b5')
+
+    depends_on('libx11')
+    depends_on('libxxf86dga@1.1:')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86dgaproto/package.py b/var/spack/repos/builtin/packages/xf86dgaproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..05b64c9534c7931134c5819028efc3fb34988a9b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86dgaproto/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86dgaproto(Package):
+    """X.org XF86DGAProto protocol headers."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86dgaproto"
+    url      = "https://www.x.org/archive/individual/proto/xf86dgaproto-2.1.tar.gz"
+
+    version('2.1', '1fe79dc07857ad3e1fb8b8f2bdd70d1b')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86driproto/package.py b/var/spack/repos/builtin/packages/xf86driproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..655d1bc60ba1a4f3ab4d64379f6c18b81e645fea
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86driproto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86driproto(Package):
+    """XFree86 Direct Rendering Infrastructure Extension.
+
+    This extension defines a protocol to allow user applications to access
+    the video hardware without requiring data to be passed through the X
+    server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/xf86driproto"
+    url      = "https://www.x.org/archive/individual/proto/xf86driproto-2.1.1.tar.gz"
+
+    version('2.1.1', '3ba16a48d8d9f9f746f9bd281ba8fb3f')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86miscproto/package.py b/var/spack/repos/builtin/packages/xf86miscproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4b7e27907710d423f2e9bd4aa1635adca80d884e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86miscproto/package.py
@@ -0,0 +1,42 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86miscproto(Package):
+    """This package includes the protocol definitions of the "XFree86-Misc"
+    extension to the X11 protocol.  The "XFree86-Misc" extension is
+    supported by the XFree86 X server and versions of the Xorg X server
+    prior to Xorg 1.6."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/xf86miscproto"
+    url      = "https://www.x.org/archive/individual/proto/xf86miscproto-0.9.3.tar.gz"
+
+    version('0.9.3', 'c6432f04f84929c94fa05b3a466c489d')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86rushproto/package.py b/var/spack/repos/builtin/packages/xf86rushproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..bdd192970b6b79774435f9b8bc451e9ae463c961
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86rushproto/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86rushproto(Package):
+    """X.org XF86RushProto protocol headers."""
+
+    homepage = "https://cgit.freedesktop.org/xorg/proto/xf86rushproto"
+    url      = "https://www.x.org/archive/individual/proto/xf86rushproto-1.1.2.tar.gz"
+
+    version('1.1.2', '6a6389473332ace01146cccfef228576')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ece389f9e60cb043c9c71f22981660b5fcf188ae
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xf86vidmodeproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xf86vidmodeproto(Package):
+    """XFree86 Video Mode Extension.
+
+    This extension defines a protocol for dynamically configuring modelines
+    and gamma."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/xf86vidmodeproto"
+    url      = "https://www.x.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.gz"
+
+    version('2.3.1', '99016d0fe355bae0bb23ce00fb4d4a2c')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xfd/package.py b/var/spack/repos/builtin/packages/xfd/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..669cd83bf5901fe1ae04c922a54516463846ae6b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xfd/package.py
@@ -0,0 +1,52 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xfd(Package):
+    """xfd - display all the characters in a font using either the
+    X11 core protocol or libXft2."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xfd"
+    url      = "https://www.x.org/archive/individual/app/xfd-1.1.2.tar.gz"
+
+    version('1.1.2', '12fe8f7c3e71352bf22124ad56d4ceaf')
+
+    depends_on('libxaw')
+    depends_on('fontconfig')
+    depends_on('libxft')
+    depends_on('libxrender')
+    depends_on('libxmu')
+    depends_on('libxt')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xfindproxy/package.py b/var/spack/repos/builtin/packages/xfindproxy/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e4b83433c4eb26ea11726356e064a460cff80218
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xfindproxy/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xfindproxy(Package):
+    """xfindproxy is used to locate available X11 proxy services.
+
+    It utilizes the Proxy Management Protocol to communicate with a proxy
+    manager.  The proxy manager keeps track of all available proxy
+    services, starts new proxies when necessary, and makes sure that
+    proxies are shared whenever possible."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xfindproxy"
+    url      = "https://www.x.org/archive/individual/app/xfindproxy-1.0.4.tar.gz"
+
+    version('1.0.4', 'd0a7b53ae5827b342bccd3ebc7ec672f')
+
+    depends_on('libice')
+    depends_on('libxt')
+
+    depends_on('xproto', type='build')
+    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xfontsel/package.py b/var/spack/repos/builtin/packages/xfontsel/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..772ff8d5705181129d56284b20adfcd655c6f246
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xfontsel/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xfontsel(Package):
+    """xfontsel application provides a simple way to display the X11 core
+    protocol fonts known to your X server, examine samples of each, and
+    retrieve the X Logical Font Description ("XLFD") full name for a font."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xfontsel"
+    url      = "https://www.x.org/archive/individual/app/xfontsel-1.0.5.tar.gz"
+
+    version('1.0.5', '72a35e7fa786eb2b0194d75eeb4a02e3')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xfs/package.py b/var/spack/repos/builtin/packages/xfs/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..72429dee90e50a06c767316aa25d2fce5afa234e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xfs/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xfs(Package):
+    """X Font Server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xfs"
+    url      = "https://www.x.org/archive/individual/app/xfs-1.1.4.tar.gz"
+
+    version('1.1.4', '0818a2e0317e0f0a1e8a15ca811827e2')
+
+    depends_on('libxfont@1.4.5:')
+    depends_on('font-util')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xtrans', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xfsinfo/package.py b/var/spack/repos/builtin/packages/xfsinfo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..b31ad1c1e05fa7a585b8c26f153c7601c59640b9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xfsinfo/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xfsinfo(Package):
+    """xfsinfo is a utility for displaying information about an X font
+    server.  It is used to examine the capabilities of a server, the
+    predefined values for various parameters used in communicating between
+    clients and the server, and the font catalogues and alternate servers
+    that are available."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xfsinfo"
+    url      = "https://www.x.org/archive/individual/app/xfsinfo-1.0.5.tar.gz"
+
+    version('1.0.5', '36b64a3f37b87c759c5d17634e129fb9')
+
+    depends_on('libfs')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xfwp/package.py b/var/spack/repos/builtin/packages/xfwp/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5f073a880686e2239af0b60aaf101892fd4baa77
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xfwp/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xfwp(Package):
+    """xfwp proxies X11 protocol connections, such as through a firewall."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xfwp"
+    url      = "https://www.x.org/archive/individual/app/xfwp-1.0.3.tar.gz"
+
+    version('1.0.3', 'e23cc01894ae57e5959ca6a56d0f4f94')
+
+    depends_on('libice')
+
+    depends_on('xproto', type='build')
+    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        # FIXME: fails with the error message:
+        # io.c:1039:7: error: implicit declaration of function 'swab'
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xgamma/package.py b/var/spack/repos/builtin/packages/xgamma/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..b8abec293a17557f6cb7f800071a19cb19515188
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xgamma/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xgamma(Package):
+    """xgamma allows X users to query and alter the gamma correction of a
+    monitor via the X video mode extension (XFree86-VidModeExtension)."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xgamma"
+    url      = "https://www.x.org/archive/individual/app/xgamma-1.0.6.tar.gz"
+
+    version('1.0.6', 'ac4f91bf1d9aa0433152ba6196288cc6')
+
+    depends_on('libx11')
+    depends_on('libxxf86vm')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xgc/package.py b/var/spack/repos/builtin/packages/xgc/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..608e6e0360d71b19cc53018c29a121dd979866b7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xgc/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xgc(Package):
+    """xgc is an X11 graphics demo that shows various features of the X11
+    core protocol graphics primitives."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xgc"
+    url      = "https://www.x.org/archive/individual/app/xgc-1.0.5.tar.gz"
+
+    version('1.0.5', '605557a9c138f6dc848c87a21bc7c7fc')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+
+    depends_on('flex', type='build')
+    depends_on('bison', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xhost/package.py b/var/spack/repos/builtin/packages/xhost/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f01c481ee7ee98f8519fccb9e10222f947a1bd2b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xhost/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xhost(Package):
+    """xhost is used to manage the list of host names or user names
+    allowed to make connections to the X server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xhost"
+    url      = "https://www.x.org/archive/individual/app/xhost-1.0.7.tar.gz"
+
+    version('1.0.7', 'de34b4ba5194634dbeb29a1f008f495a')
+
+    depends_on('libx11')
+    depends_on('libxmu')
+    depends_on('libxau')
+
+    depends_on('xproto@7.0.22:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xineramaproto/package.py b/var/spack/repos/builtin/packages/xineramaproto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..baededbb253b5806e79890cce06d2fcdf36ea2d2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xineramaproto/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xineramaproto(Package):
+    """X Xinerama Extension.
+
+    This is an X extension that allows multiple physical screens controlled
+    by a single X server to appear as a single screen."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/xineramaproto"
+    url      = "https://www.x.org/archive/individual/proto/xineramaproto-1.2.1.tar.gz"
+
+    version('1.2.1', 'e0e148b11739e144a546b8a051b17dde')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xinit/package.py b/var/spack/repos/builtin/packages/xinit/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9f3bc092297795060c02afa21245ce51622cc159
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xinit/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xinit(Package):
+    """The xinit program is used to start the X Window System server and a
+    first client program on systems that are not using a display manager
+    such as xdm."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xinit"
+    url      = "https://www.x.org/archive/individual/app/xinit-1.3.4.tar.gz"
+
+    version('1.3.4', '91c5697345016ec7841f5e5fccbe7a4c')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xinput/package.py b/var/spack/repos/builtin/packages/xinput/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3c4fb35503d4b99ce60f06b794e045aedb08b1a9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xinput/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xinput(Package):
+    """xinput is a utility to configure and test XInput devices."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xinput"
+    url      = "https://www.x.org/archive/individual/app/xinput-1.6.2.tar.gz"
+
+    version('1.6.2', '6684f6015298d22936438173be3b7ef5')
+
+    depends_on('libx11')
+    depends_on('libxext')
+    depends_on('libxi@1.5.99.1:')
+    depends_on('libxrandr')
+    depends_on('libxinerama')
+
+    depends_on('inputproto@2.1.99.1:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkbcomp/package.py b/var/spack/repos/builtin/packages/xkbcomp/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e6e8875fa7a34d42c7c251118722537a2a40a228
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkbcomp/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xkbcomp(Package):
+    """The X Keyboard (XKB) Extension essentially replaces the core protocol
+    definition of a keyboard. The extension makes it possible to specify
+    clearly and explicitly most aspects of keyboard behaviour on a per-key
+    basis, and to track more closely the logical and physical state of a
+    keyboard. It also includes a number of keyboard controls designed to
+    make keyboards more accessible to people with physical impairments."""
+
+    homepage = "https://www.x.org/wiki/XKB/"
+    url      = "https://www.x.org/archive/individual/app/xkbcomp-1.3.1.tar.gz"
+
+    version('1.3.1', '9e8ca110ed40d4703f8f73d99bc81576')
+
+    depends_on('libx11')
+    depends_on('libxkbfile')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('bison', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkbdata/package.py b/var/spack/repos/builtin/packages/xkbdata/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..fc84631e36929bf96794a34bad7702c80c5e96c0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkbdata/package.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xkbdata(Package):
+    """The XKB data files for the various keyboard models, layouts,
+    and locales."""
+
+    homepage = "https://www.x.org/wiki/XKB/"
+    url      = "https://www.x.org/archive/individual/data/xkbdata-1.0.1.tar.gz"
+
+    version('1.0.1', 'a7e0fbc9cc84c621243c777694388064')
+
+    depends_on('xkbcomp', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkbevd/package.py b/var/spack/repos/builtin/packages/xkbevd/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..462d989db2ebf36377d5004b8599e9c0f31fda4f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkbevd/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xkbevd(Package):
+    """XKB event daemon demo."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xkbevd"
+    url      = "https://www.x.org/archive/individual/app/xkbevd-1.1.4.tar.gz"
+
+    version('1.1.4', '0e9e05761551b1e58bd541231f90ae87')
+
+    depends_on('libxkbfile')
+    depends_on('libx11')
+
+    depends_on('bison', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkbprint/package.py b/var/spack/repos/builtin/packages/xkbprint/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..dc92ac412648b3498469f7ae306565175b1951ba
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkbprint/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xkbprint(Package):
+    """xkbprint generates a printable or encapsulated PostScript description
+    of an XKB keyboard description."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xkbprint"
+    url      = "https://www.x.org/archive/individual/app/xkbprint-1.0.4.tar.gz"
+
+    version('1.0.4', '4dd9d4fdbdc08f70dc402da149e4d5d8')
+
+    depends_on('libxkbfile')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a4c6c9757807dc836d7748e4edbab29589bfc768
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkbutils/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xkbutils(Package):
+    """xkbutils is a collection of small utilities utilizing the XKeyboard
+    (XKB) extension to the X11 protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xkbutils"
+    url      = "https://www.x.org/archive/individual/app/xkbutils-1.0.4.tar.gz"
+
+    version('1.0.4', '6b898346b84e07c2f13b097193ca0413')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('inputproto', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkeyboard-config/package.py b/var/spack/repos/builtin/packages/xkeyboard-config/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3ad7ea197c87e39ad79548c6b39e5cb1c2609ec6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkeyboard-config/package.py
@@ -0,0 +1,57 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XkeyboardConfig(Package):
+    """This project provides a consistent, well-structured, frequently
+    released, open source database of keyboard configuration data. The
+    project is targeted to XKB-based systems."""
+
+    homepage = "https://www.freedesktop.org/wiki/Software/XKeyboardConfig/"
+    url      = "https://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.gz"
+
+    version('2.18', '96c43e04dbfbb1e6e6abd4678292062c')
+
+    depends_on('libx11@1.4.3:')
+
+    depends_on('libxslt', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('intltool@0.30:', type='build')
+    depends_on('xproto@7.0.20:', type='build')
+
+    # TODO: missing dependencies
+    # xgettext
+    # msgmerge
+    # msgfmt
+    # gmsgfmt
+    # perl@5.8.1:
+    # perl XML::Parser
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xkill/package.py b/var/spack/repos/builtin/packages/xkill/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..061d756eec59afd7a117137241c39018f6851c4d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xkill/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xkill(Package):
+    """xkill is a utility for forcing the X server to close connections to
+    clients.  This program is very dangerous, but is useful for aborting
+    programs that have displayed undesired windows on a user's screen."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xkill"
+    url      = "https://www.x.org/archive/individual/app/xkill-1.0.4.tar.gz"
+
+    version('1.0.4', 'b04c15bfd0b619f1e4ff3e44607e738d')
+
+    depends_on('libx11')
+    depends_on('libxmu')
+
+    depends_on('xproto@7.0.22:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..2fc91043b5010b9a64a7cd0cd4f59ea0ded83326
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xload/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xload(Package):
+    """xload displays a periodically updating histogram of the
+    system load average."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xload"
+    url      = "https://www.x.org/archive/individual/app/xload-1.1.2.tar.gz"
+
+    version('1.1.2', '0af9a68193849b16f8168f096682efb4')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xlogo/package.py b/var/spack/repos/builtin/packages/xlogo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..77f5bd3639caf684c6b431e838e2d5061b2b2b8c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xlogo/package.py
@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xlogo(Package):
+    """The xlogo program simply displays the X Window System logo."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xlogo"
+    url      = "https://www.x.org/archive/individual/app/xlogo-1.0.4.tar.gz"
+
+    version('1.0.4', '4c4f82c196a55a90800a77906f4353fb')
+
+    depends_on('libsm')
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt@1.0:')
+    depends_on('libxext')
+    depends_on('libx11')
+    depends_on('libxft')
+    depends_on('libxrender')
+    depends_on('libxt')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xlsatoms/package.py b/var/spack/repos/builtin/packages/xlsatoms/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8722b57c8c1efe85a69247c712392643a372fff8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xlsatoms/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xlsatoms(Package):
+    """xlsatoms lists the interned atoms defined on an X11 server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xlsatoms"
+    url      = "https://www.x.org/archive/individual/app/xlsatoms-1.1.2.tar.gz"
+
+    version('1.1.2', '1f32e2b8c2135b5867291517848cb396')
+
+    depends_on('libxcb', when='@1.1:')
+    depends_on('libx11', when='@:1.0')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xlsclients/package.py b/var/spack/repos/builtin/packages/xlsclients/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3714de27069b6eecaaae11d9e604514313314f7d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xlsclients/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xlsclients(Package):
+    """xlsclients is a utility for listing information about the client
+    applications running on a X11 server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xlsclients"
+    url      = "https://www.x.org/archive/individual/app/xlsclients-1.1.3.tar.gz"
+
+    version('1.1.3', '093c748d98b61dbddcaf3de1740fbd26')
+
+    depends_on('libxcb@1.6:', when='@1.1:')
+    depends_on('libx11', when='@:1.0')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xlsfonts/package.py b/var/spack/repos/builtin/packages/xlsfonts/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..011ca5aa0e78f1c51c4cc9aaeef90a39f00bd679
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xlsfonts/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xlsfonts(Package):
+    """xlsfonts lists fonts available from an X server via the X11
+    core protocol."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xlsfonts"
+    url      = "https://www.x.org/archive/individual/app/xlsfonts-1.0.5.tar.gz"
+
+    version('1.0.5', '074cc44e5238c6a501523ef06caba517')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xmag/package.py b/var/spack/repos/builtin/packages/xmag/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..27843299c8647ab8e1f567211a69c17eaf9f4023
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xmag/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xmag(Package):
+    """xmag displays a magnified snapshot of a portion of an X11 screen."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xmag"
+    url      = "https://www.x.org/archive/individual/app/xmag-1.0.6.tar.gz"
+
+    version('1.0.6', '2827ae4b293535623b9f7b659c506dcd')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xman/package.py b/var/spack/repos/builtin/packages/xman/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..629a457edc0a9a3004de2fa784bca1922fae8e72
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xman/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xman(Package):
+    """xman is a graphical manual page browser using the Athena Widgets (Xaw)
+    toolkit."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xman"
+    url      = "https://www.x.org/archive/individual/app/xman-1.1.4.tar.gz"
+
+    version('1.1.4', 'f4238c79ee7227ea193898fc159f31e5')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xmessage/package.py b/var/spack/repos/builtin/packages/xmessage/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b2ee5102ef5dd71aed759842703b4acf16dc3dc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xmessage/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xmessage(Package):
+    """xmessage displays a message or query in a window.  The user can click
+    on an "okay" button to dismiss it or can select one of several buttons
+    to answer a question.  xmessage can also exit after a specified time."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xmessage"
+    url      = "https://www.x.org/archive/individual/app/xmessage-1.0.4.tar.gz"
+
+    version('1.0.4', '69df5761fbec14c782948065a6f36028')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..cdde63e1494567ba9bb70fc6bc9b1217c647d14a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xmh/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xmh(Package):
+    """The xmh program provides a graphical user interface to the
+    MH Message Handling System.  To actually do things with your
+    mail, it makes calls to the MH package."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xmh"
+    url      = "https://www.x.org/archive/individual/app/xmh-1.0.3.tar.gz"
+
+    version('1.0.3', '7547c5a5ab7309a1b10e8ecf48e60105')
+
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libxt')
+    depends_on('libx11')
+
+    depends_on('xbitmaps@1.1.0:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xmlto/package.py b/var/spack/repos/builtin/packages/xmlto/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0dbc81de32cd6549f365d7ea2504eadd6282d157
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xmlto/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xmlto(Package):
+    """Utility xmlto is a simple shell script for converting XML files to various
+    formats. It serves as easy to use command line frontend to make fine output
+    without remembering many long options and searching for the syntax of the
+    backends."""
+
+    homepage = "http://cyberelk.net/tim/software/xmlto/"
+    url      = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.28.tar.gz"
+
+    version('0.0.28', 'a1fefad9d83499a15576768f60f847c6')
+
+    # FIXME: missing a lot of dependencies
+    depends_on('libxslt')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xmodmap/package.py b/var/spack/repos/builtin/packages/xmodmap/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..abe40dbb43793e998de8061656696377a3396ab9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xmodmap/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xmodmap(Package):
+    """The xmodmap program is used to edit and display the keyboard modifier
+    map and keymap table that are used by client applications to convert
+    event keycodes into keysyms.  It is usually run from the user's
+    session startup script to configure the keyboard according to personal
+    tastes."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xmodmap"
+    url      = "https://www.x.org/archive/individual/app/xmodmap-1.0.9.tar.gz"
+
+    version('1.0.9', '771cf86bcdc3589e7add2e761f675099')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xmore/package.py b/var/spack/repos/builtin/packages/xmore/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f8ccd713830ff0d32c7941ad89c75775ec3040f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xmore/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xmore(Package):
+    """xmore - plain text display program for the X Window System."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xmore"
+    url      = "https://www.x.org/archive/individual/app/xmore-1.0.2.tar.gz"
+
+    version('1.0.2', '40b1850494f8af0939a1989c399efa11')
+
+    depends_on('libxaw')
+    depends_on('libxt')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c7b22d904fb71568392da829467eb91edd8114c6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XorgCfFiles(Package):
+    """The xorg-cf-files package contains the data files for the imake utility,
+    defining the known settings for a wide variety of platforms (many of which
+    have not been verified or tested in over a decade), and for many of the
+    libraries formerly delivered in the X.Org monolithic releases."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/util/cf"
+    url      = "https://www.x.org/archive/individual/util/xorg-cf-files-1.0.6.tar.gz"
+
+    version('1.0.6', 'c0ce98377c70d95fb48e1bd856109bf8')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xorg-docs/package.py b/var/spack/repos/builtin/packages/xorg-docs/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..5c320bba7b9979c5f01bc32cb2dd8d39d40f8094
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xorg-docs/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XorgDocs(Package):
+    """This package provides miscellaneous documentation for the X Window
+    System that doesn't better fit into other packages.
+
+    The preferred documentation format for these documents is DocBook XML."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/doc/xorg-docs"
+    url      = "https://www.x.org/archive/individual/doc/xorg-docs-1.7.1.tar.gz"
+
+    version('1.7.1', 'ca689ccbf8ebc362afbe5cc5792a4abd')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+    depends_on('xorg-sgml-doctools@1.8:', type='build')
+    depends_on('xmlto', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xorg-gtest/package.py b/var/spack/repos/builtin/packages/xorg-gtest/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6978d610d32c28cbd0f0f9e0c92c764821c23c3f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xorg-gtest/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XorgGtest(Package):
+    """Provides a Google Test environment for starting and stopping
+    a X server for testing purposes."""
+
+    homepage = "https://people.freedesktop.org/~cndougla/xorg-gtest/"
+    url      = "https://www.x.org/archive/individual/test/xorg-gtest-0.7.1.tar.bz2"
+
+    version('0.7.1', '31beb4d7d2b4eba7f9265fa0cb4c6428')
+
+    depends_on('libx11')
+    depends_on('libxi')
+    depends_on('xorg-server')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    # TODO: may be missing evemu package?
+    # TODO: what is the difference between xorg-gtest and googletest packages?
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xorg-server/package.py b/var/spack/repos/builtin/packages/xorg-server/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d9b49f9c26c44b56a286281e5f39a18aca1f4ad
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xorg-server/package.py
@@ -0,0 +1,108 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XorgServer(Package):
+    """X.Org Server is the free and open source implementation of the display
+    server for the X Window System stewarded by the X.Org Foundation."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/xserver"
+    url      = "https://www.x.org/archive/individual/xserver/xorg-server-1.18.99.901.tar.gz"
+
+    version('1.18.99.901', 'd0242b95991c221c4fcc0d283aba7a42')
+
+    depends_on('pixman@0.27.2:')
+    depends_on('font-util')
+    depends_on('libxshmfence@1.1:')
+    depends_on('libdrm@2.3.0:')
+    depends_on('libx11')
+    # depends_on('gl@9.2.0:')
+
+    depends_on('dri2proto@2.8:', type='build')
+    depends_on('dri3proto@1.0:', type='build')
+    depends_on('glproto@1.4.17:', type='build')
+
+    depends_on('flex', type='build')
+    depends_on('bison', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    # TODO: add missing dependencies
+    # $LIBSELINUX $REQUIRED_MODULES $REQUIRED_LIBS
+    # $LIBPCIACCESS $DGAPROTO $XORG_MODULES epoxy xdmcp xau xfixes x11-xcb
+    # xcb-aux xcb-image xcb-ewmh xcb-icccm $WINDOWSWMPROTO windowsdriproto
+    # khronos-opengl-registry
+    # $APPLEWMPROTO $LIBAPPLEWM xfixes $LIBDMX $LIBXEXT $LIBDMX xmu $LIBXEXT
+    # $LIBDMX $LIBXI $LIBXEXT $LIBXTST $LIBXEXT xres $LIBXEXT $LIBXEXT
+    # $XEPHYR_REQUIRED_LIBS
+
+    # VIDEOPROTO="videoproto"
+    # COMPOSITEPROTO="compositeproto >= 0.4"
+    # RECORDPROTO="recordproto >= 1.13.99.1"
+    # SCRNSAVERPROTO="scrnsaverproto >= 1.1"
+    # RESOURCEPROTO="resourceproto >= 1.2.0"
+    # DRIPROTO="xf86driproto >= 2.1.0"
+    # XINERAMAPROTO="xineramaproto"
+    # BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
+    # DGAPROTO="xf86dgaproto >= 2.0.99.1"
+    # DMXPROTO="dmxproto >= 2.2.99.1"
+    # VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
+    # WINDOWSWMPROTO="windowswmproto"
+    # APPLEWMPROTO="applewmproto >= 1.4"
+
+    # XPROTO="xproto >= 7.0.28"
+    # RANDRPROTO="randrproto >= 1.5.0"
+    # RENDERPROTO="renderproto >= 0.11"
+    # XEXTPROTO="xextproto >= 7.2.99.901"
+    # INPUTPROTO="inputproto >= 2.3"
+    # KBPROTO="kbproto >= 1.0.3"
+    # FONTSPROTO="fontsproto >= 2.1.3"
+    # FIXESPROTO="fixesproto >= 5.0"
+    # DAMAGEPROTO="damageproto >= 1.1"
+    # XCMISCPROTO="xcmiscproto >= 1.2.0"
+    # BIGREQSPROTO="bigreqsproto >= 1.1.0"
+    # XTRANS="xtrans >= 1.3.5"
+    # PRESENTPROTO="presentproto >= 1.0"
+
+    # LIBAPPLEWM="applewm >= 1.4"
+    # LIBDMX="dmx >= 1.0.99.1"
+    # LIBDRI="dri >= 7.8.0"
+    # LIBEGL="egl"
+    # LIBGBM="gbm >= 10.2.0"
+    # LIBXEXT="xext >= 1.0.99.4"
+    # LIBXFONT="xfont2 >= 2.0.0"
+    # LIBXI="xi >= 1.2.99.1"
+    # LIBXTST="xtst >= 1.0.99.2"
+    # LIBPCIACCESS="pciaccess >= 0.12.901"
+    # LIBUDEV="libudev >= 143"
+    # LIBSELINUX="libselinux >= 2.0.86"
+    # LIBDBUS="dbus-1 >= 1.0"
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c2e5797efa965e618b9174b73acff9fae4f6a565
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xorg-sgml-doctools/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class XorgSgmlDoctools(Package):
+    """This package provides a common set of SGML entities and XML/CSS style
+    sheets used in building/formatting the documentation provided in other
+    X.Org packages."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/doc/xorg-sgml-doctools"
+    url      = "https://www.x.org/archive/individual/doc/xorg-sgml-doctools-1.11.tar.gz"
+
+    version('1.11', '51cf4c6b476e2b98a068fea6975b9b21')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xphelloworld/package.py b/var/spack/repos/builtin/packages/xphelloworld/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..6d445d69bed9f1332f442bd9e6491ffd764821f0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xphelloworld/package.py
@@ -0,0 +1,54 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xphelloworld(Package):
+    """Xprint sample applications."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xphelloworld"
+    url      = "https://www.x.org/archive/individual/app/xphelloworld-1.0.1.tar.gz"
+
+    version('1.0.1', 'b1851337a8e850d5c8e5a5ca5e3033da')
+
+    depends_on('libx11')
+    depends_on('libxaw')
+    depends_on('libxprintapputil')
+    depends_on('libxprintutil')
+    depends_on('libxp')
+    depends_on('libxt')
+
+    # FIXME: xphelloworld requires libxaw8, but libxaw only provides 6 and 7.
+    # It looks like xprint support was removed from libxaw at some point.
+    # But even the oldest version of libxaw doesn't build libxaw8.
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xplsprinters/package.py b/var/spack/repos/builtin/packages/xplsprinters/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..55de272a337483bca8dc62d4d0e71b5f10513b94
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xplsprinters/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xplsprinters(Package):
+    """List Xprint printers."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xplsprinters"
+    url      = "https://www.x.org/archive/individual/app/xplsprinters-1.0.1.tar.gz"
+
+    version('1.0.1', '8e5698b5a2a2a0fc78caeb23909dd284')
+
+    depends_on('libxp')
+    depends_on('libxprintutil')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xpr/package.py b/var/spack/repos/builtin/packages/xpr/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..669693e084210c39b21cbb4b427922229fc30777
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xpr/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xpr(Package):
+    """xpr takes as input a window dump file produced by xwd
+    and formats it for output on various types of printers."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xpr"
+    url      = "https://www.x.org/archive/individual/app/xpr-1.0.4.tar.gz"
+
+    version('1.0.4', '6adfa60f458474c0c226454c233fc32f')
+
+    depends_on('libxmu')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xprehashprinterlist/package.py b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4578c3c1918f329a817a2b7c9a2aad829a8667c4
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xprehashprinterlist/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xprehashprinterlist(Package):
+    """Rehash list of Xprint printers."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xprehashprinterlist"
+    url      = "https://www.x.org/archive/individual/app/xprehashprinterlist-1.0.1.tar.gz"
+
+    version('1.0.1', '395578955634e4b2daa5b78f6fa9222c')
+
+    depends_on('libxp')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..0e1a591bcbf197ae861f81dc0a85860f544d65e2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xprop/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xprop(Package):
+    """xprop is a command line tool to display and/or set window and font
+    properties of an X server."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xprop"
+    url      = "https://www.x.org/archive/individual/app/xprop-1.2.2.tar.gz"
+
+    version('1.2.2', 'db03a6bcf7b0d0c2e691ea3083277cbc')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xproto/package.py b/var/spack/repos/builtin/packages/xproto/package.py
index dbceaa157583c70778d63a7b1c98a1bb32d423fa..67074a69939c05dd0198b98407cb796c6c7f0031 100644
--- a/var/spack/repos/builtin/packages/xproto/package.py
+++ b/var/spack/repos/builtin/packages/xproto/package.py
@@ -26,17 +26,24 @@
 
 
 class Xproto(Package):
-    """The Xorg protocol headers provide the header files required to
-       build the system, and to allow other applications to build against
-       the installed X Window system."""
-    homepage = "http://www.x.org/"
-    url      = "https://www.x.org/archive//individual/proto/xproto-7.0.29.tar.gz"
+    """X Window System Core Protocol.
+
+    This package provides the headers and specification documents defining
+    the X Window System Core Protocol, Version 11.
+
+    It also includes a number of headers that aren't purely protocol related,
+    but are depended upon by many other X Window System packages to provide
+    common definitions and porting layer."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/x11proto"
+    url      = "https://www.x.org/archive/individual/proto/xproto-7.0.29.tar.gz"
 
     version('7.0.29', '16a78dd2c5ad73011105c96235f6a0af')
 
-    depends_on("xorg-util-macros")
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
 
     def install(self, spec, prefix):
-        configure('--prefix=%s' % prefix)
-        make()
-        make("install")
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e5bfcb8cbcbde9243ad84a79813b4805ff72e157
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xproxymanagementprotocol/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xproxymanagementprotocol(Package):
+    """The Proxy Management Protocol is an ICE based protocol that provides a
+    way for application servers to easily locate proxy services available to
+    them."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/proto/pmproto"
+    url      = "https://www.x.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.gz"
+
+    version('1.0.3', 'c4ab05a6174b4e9b6ae5b7cfbb6d718e')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xpyb/package.py b/var/spack/repos/builtin/packages/xpyb/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ff9f0f933344eca5aeb10014b17dace727576178
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xpyb/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xpyb(Package):
+    """xpyb provides a Python binding to the X Window System protocol
+    via libxcb."""
+
+    homepage = "https://xcb.freedesktop.org/"
+    url      = "https://xcb.freedesktop.org/dist/xpyb-1.3.1.tar.gz"
+
+    version('1.3.1', '75d567e25517fb883a56f10b77fd2757')
+
+    extends('python')
+
+    depends_on('libxcb@1.5:')
+
+    depends_on('xcb-proto@1.7.1:', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xrandr/package.py b/var/spack/repos/builtin/packages/xrandr/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..35e21c60477dcf63d5b4a9d05f5354d13b8d6516
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xrandr/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xrandr(Package):
+    """xrandr - primitive command line interface to X11 Resize, Rotate, and
+    Reflect (RandR) extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xrandr"
+    url      = "https://www.x.org/archive/individual/app/xrandr-1.5.0.tar.gz"
+
+    version('1.5.0', 'fe9cf76033fe5d973131eac67b6a3118')
+
+    depends_on('libxrandr@1.5:')
+    depends_on('libxrender')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xrdb/package.py b/var/spack/repos/builtin/packages/xrdb/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..93847a19a0bf8c799c5c981227d21f226f2fc5b8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xrdb/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xrdb(Package):
+    """xrdb - X server resource database utility."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xrdb"
+    url      = "https://www.x.org/archive/individual/app/xrdb-1.1.0.tar.gz"
+
+    version('1.1.0', 'd48983e561ef8b4b2e245feb584c11ce')
+
+    depends_on('libxmu')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f99810beea80653e1912e4e5c255de3432fc411d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xrefresh/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xrefresh(Package):
+    """xrefresh - refresh all or part of an X screen."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xrefresh"
+    url      = "https://www.x.org/archive/individual/app/xrefresh-1.0.5.tar.gz"
+
+    version('1.0.5', 'e41c5148d894406484af59887257c465')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xrx/package.py b/var/spack/repos/builtin/packages/xrx/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..4457c2f16469ee1161689dd6e6cbbc633878abdc
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xrx/package.py
@@ -0,0 +1,57 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xrx(Package):
+    """The remote execution (RX) service specifies a MIME format for invoking
+    applications remotely, for example via a World Wide Web browser.  This
+    RX format specifies a syntax for listing network services required by
+    the application, for example an X display server.  The requesting Web
+    browser must identify specific instances of the services in the request
+    to invoke the application."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xrx"
+    url      = "https://www.x.org/archive/individual/app/xrx-1.0.4.tar.gz"
+
+    version('1.0.4', 'dd4b8bf6eca5fc5be5df30c14050074c')
+
+    depends_on('libx11')
+    depends_on('libxt')
+    depends_on('libxext')
+    depends_on('libxau')
+    depends_on('libice')
+    depends_on('libxaw')
+
+    depends_on('xtrans', type='build')
+    depends_on('xproxymanagementprotocol', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xscope/package.py b/var/spack/repos/builtin/packages/xscope/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..cf33c9767ea14c7516b68031511df6618a46e6f2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xscope/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xscope(Package):
+    """XSCOPE -- a program to monitor X11/Client conversations."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xscope"
+    url      = "https://www.x.org/archive/individual/app/xscope-1.4.1.tar.gz"
+
+    version('1.4.1', 'c476fb73b354f4a5c388f3814052ce0d')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('xtrans', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xset/package.py b/var/spack/repos/builtin/packages/xset/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..462bea8cfe892c903922243611aad274e4f2afb7
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xset/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xset(Package):
+    """User preference utility for X."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xset"
+    url      = "https://www.x.org/archive/individual/app/xset-1.2.3.tar.gz"
+
+    version('1.2.3', '1a76965ed0e8cb51d3fa04d458cb3d8f')
+
+    depends_on('libxmu')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xsetmode/package.py b/var/spack/repos/builtin/packages/xsetmode/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..f05fd0f123b87c32b9d3e7c5111ac2f0fedec006
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xsetmode/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xsetmode(Package):
+    """Set the mode for an X Input device."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xsetmode"
+    url      = "https://www.x.org/archive/individual/app/xsetmode-1.0.0.tar.gz"
+
+    version('1.0.0', '0dc2a917138d0345c00e016ac720e085')
+
+    depends_on('libxi')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xsetpointer/package.py b/var/spack/repos/builtin/packages/xsetpointer/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..e9bf2fc9fe2f07bd9f8804cd92f8d545790b1b3b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xsetpointer/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xsetpointer(Package):
+    """Set an X Input device as the main pointer."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xsetpointer"
+    url      = "https://www.x.org/archive/individual/app/xsetpointer-1.0.1.tar.gz"
+
+    version('1.0.1', 'bb206b6875f2428c2281e1165b6c7f88')
+
+    depends_on('libxi')
+    depends_on('libx11')
+
+    depends_on('inputproto@1.4:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xsetroot/package.py b/var/spack/repos/builtin/packages/xsetroot/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e62d41e9b2216f7c83e5421592218d5d7062f66
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xsetroot/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xsetroot(Package):
+    """xsetroot - root window parameter setting utility for X."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xsetroot"
+    url      = "https://www.x.org/archive/individual/app/xsetroot-1.1.1.tar.gz"
+
+    version('1.1.1', '8c794914a2d0456317288c41451dbee3')
+
+    depends_on('libxmu')
+    depends_on('libx11')
+    depends_on('libxcursor')
+
+    depends_on('xbitmaps', type='build')
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xsm/package.py b/var/spack/repos/builtin/packages/xsm/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..9d9c8963657376ed45e05f7955a3b61f783d7671
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xsm/package.py
@@ -0,0 +1,49 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xsm(Package):
+    """X Session Manager."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xsm"
+    url      = "https://www.x.org/archive/individual/app/xsm-1.0.3.tar.gz"
+
+    version('1.0.3', '60a2e5987d8e49a568599ba8fe59c8db')
+
+    depends_on('libx11')
+    depends_on('libxt@1.1.0:')
+    depends_on('libice')
+    depends_on('libsm')
+    depends_on('libxaw')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xstdcmap/package.py b/var/spack/repos/builtin/packages/xstdcmap/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..bb19bdff1ae5a2f308b7515542971508ca53ce93
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xstdcmap/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xstdcmap(Package):
+    """The xstdcmap utility can be used to selectively define standard colormap
+    properties.  It is intended to be run from a user's X startup script to
+    create standard colormap definitions in order to facilitate sharing of
+    scarce colormap resources among clients using PseudoColor visuals."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xstdcmap"
+    url      = "https://www.x.org/archive/individual/app/xstdcmap-1.0.3.tar.gz"
+
+    version('1.0.3', '70c1fd18b79c3ea1dae136e2eabe1c82')
+
+    depends_on('libxmu')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xtrans/package.py b/var/spack/repos/builtin/packages/xtrans/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ed46059d9d5f5c06638bf3bf57bfada6bcce5532
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xtrans/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xtrans(Package):
+    """xtrans is a library of code that is shared among various X packages to
+    handle network protocol transport in a modular fashion, allowing a
+    single place to add new transport types.  It is used by the X server,
+    libX11, libICE, the X font server, and related components."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/lib/libxtrans"
+    url      = "https://www.x.org/archive//individual/lib/xtrans-1.3.5.tar.gz"
+
+    version('1.3.5', '6e4eac1b7c6591da0753052e1eccfb58')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xtrap/package.py b/var/spack/repos/builtin/packages/xtrap/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..405ec2f8485cefefe11e2055e2be90a7c2a85551
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xtrap/package.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xtrap(Package):
+    """XTrap sample clients."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xtrap"
+    url      = "https://www.x.org/archive/individual/app/xtrap-1.0.2.tar.gz"
+
+    version('1.0.2', '601e4945535d2d25eb1bc640332e2363')
+
+    depends_on('libx11')
+    depends_on('libxtrap')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xts/package.py b/var/spack/repos/builtin/packages/xts/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..c3993cf3913d961e40a131132471b7a4de1ae8b8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xts/package.py
@@ -0,0 +1,60 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xts(Package):
+    """This is a revamped version of X Test Suite (XTS) which removes some of
+    the ugliness of building and running the tests."""
+
+    homepage = "https://www.x.org/wiki/XorgTesting/"
+    url      = "https://www.x.org/archive/individual/test/xts-0.99.1.tar.gz"
+
+    version('0.99.1', '1e5443fede389be606f3745a71483bac')
+
+    depends_on('libx11')
+    depends_on('libxext')
+    depends_on('libxi')
+    depends_on('libxtst')
+    depends_on('libxau')
+    depends_on('libxt')
+    depends_on('libxmu')
+    depends_on('libxaw')
+
+    depends_on('xtrans', type='build')
+    depends_on('bdftopcf', type='build')
+    depends_on('mkfontdir', type='build')
+    depends_on('perl', type='build')
+    depends_on('xset', type='build')
+    depends_on('xdpyinfo', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        # FIXME: Crashes during compilation
+        # error: redeclaration of enumerator 'XawChainTop'
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xvidtune/package.py b/var/spack/repos/builtin/packages/xvidtune/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..ac5352df5f584656f108dea81f3924ca3f78d4ea
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xvidtune/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xvidtune(Package):
+    """xvidtune is a client interface to the X server video mode
+    extension (XFree86-VidModeExtension)."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xvidtune"
+    url      = "https://www.x.org/archive/individual/app/xvidtune-1.0.3.tar.gz"
+
+    version('1.0.3', 'e0c31d78741ae4aab2f4bfcc2abd4a3d')
+
+    depends_on('libxxf86vm')
+    depends_on('libxt')
+    depends_on('libxaw')
+    depends_on('libxmu')
+    depends_on('libx11')
+
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xvinfo/package.py b/var/spack/repos/builtin/packages/xvinfo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..359f1f23deab158710d0849040ed95886da9cc3a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xvinfo/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xvinfo(Package):
+    """xvinfo prints out the capabilities of any video adaptors associated
+    with the display that are accessible through the X-Video extension."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xvinfo"
+    url      = "https://www.x.org/archive/individual/app/xvinfo-1.1.3.tar.gz"
+
+    version('1.1.3', '6890a19226c07344ae12e7a2ef12f2c6')
+
+    depends_on('libxv')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.25:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xwd/package.py b/var/spack/repos/builtin/packages/xwd/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..d1f9ee1dfbf5ba5b8a8019bb4c04867eaf899633
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xwd/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xwd(Package):
+    """xwd - dump an image of an X window."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xwd"
+    url      = "https://www.x.org/archive/individual/app/xwd-1.0.6.tar.gz"
+
+    version('1.0.6', 'd6c132f5f00188ce2a1393f12bd34ad4')
+
+    depends_on('libx11')
+    depends_on('libxkbfile')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..bba97ca6710659e99fba91cba347b61dfc35072d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xwininfo/package.py
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xwininfo(Package):
+    """xwininfo prints information about windows on an X server. Various
+    information is displayed depending on which options are selected."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xwininfo"
+    url      = "https://www.x.org/archive/individual/app/xwininfo-1.1.3.tar.gz"
+
+    version('1.1.3', 'd26623fe240659a320367bc453f1d301')
+
+    depends_on('libxcb@1.6:')
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')
diff --git a/var/spack/repos/builtin/packages/xwud/package.py b/var/spack/repos/builtin/packages/xwud/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..a30d55b7c68f6c99e15fc3ea5664831349945eec
--- /dev/null
+++ b/var/spack/repos/builtin/packages/xwud/package.py
@@ -0,0 +1,47 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class Xwud(Package):
+    """xwud allows X users to display in a window an image saved in a
+    specially formatted dump file, such as produced by xwd."""
+
+    homepage = "http://cgit.freedesktop.org/xorg/app/xwud"
+    url      = "https://www.x.org/archive/individual/app/xwud-1.0.4.tar.gz"
+
+    version('1.0.4', 'bb44485a37496f0121e5843bcf5bb01b')
+
+    depends_on('libx11')
+
+    depends_on('xproto@7.0.17:', type='build')
+    depends_on('pkg-config@0.9.0:', type='build')
+    depends_on('util-macros', type='build')
+
+    def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
+
+        make()
+        make('install')