Merge branch 'releases/v0.11.0'v0.11.0

1 files changed, 16 insertions, 12 deletions

diff --git a/var/spack/repos/builtin/packages/tcl/package.py b/var/spack/repos/builtin/packages/tcl/package.py
index d9b535305d..219c63e62b 100644
--- a/var/spack/repos/builtin/packages/tcl/package.py
+++ b/var/spack/repos/builtin/packages/tcl/package.py
@@ -1,13 +1,13 @@
 ##############################################################################
-# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Copyright (c) 2013-2017, 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.
+# For details, see https://github.com/spack/spack
+# Please also see the NOTICE and LICENSE files 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
@@ -34,7 +34,9 @@ class Tcl(AutotoolsPackage):
        that is truly cross platform, easily deployed and highly
        extensible."""
     homepage = "http://www.tcl.tk"
+    url      = "http://prdownloads.sourceforge.net/tcl/tcl8.6.5-src.tar.gz"
 
+    version('8.6.6', '5193aea8107839a79df8ac709552ecb7')
     version('8.6.5', '0e6426a4ca9401825fbc6ecf3d89a326')
     version('8.6.4', 'd7cbb91f1ded1919370a30edd1534304')
     version('8.6.3', 'db382feca91754b7f93da16dc4cdad1f')
@@ -42,20 +44,22 @@ class Tcl(AutotoolsPackage):
 
     depends_on('zlib')
 
-    def url_for_version(self, version):
-        base_url = 'http://prdownloads.sourceforge.net/tcl'
-        return '{0}/tcl{1}-src.tar.gz'.format(base_url, version)
+    configure_directory = 'unix'
 
-    def setup_environment(self, spack_env, env):
+    def setup_environment(self, spack_env, run_env):
         # When using Tkinter from within spack provided python+tk, python
         # will not be able to find Tcl/Tk unless TCL_LIBRARY is set.
-        env.set('TCL_LIBRARY', join_path(self.prefix.lib, 'tcl{0}'.format(
-                self.spec.version.up_to(2))))
+        run_env.set('TCL_LIBRARY', join_path(self.prefix.lib, 'tcl{0}'.format(
+            self.spec.version.up_to(2))))
 
-    def build_directory(self):
-        return 'unix'
+    def install(self, spec, prefix):
+        with working_dir(self.build_directory):
+            make('install')
 
-    @AutotoolsPackage.sanity_check('install')
+            # Some applications like Expect require private Tcl headers.
+            make('install-private-headers')
+
+    @run_after('install')
     def symlink_tclsh(self):
         with working_dir(self.prefix.bin):
             symlink('tclsh{0}'.format(self.version.up_to(2)), 'tclsh')