Merge pull request #864 from davydden/kdiff3

kdiff3: initial version of the package

2 files changed, 46 insertions, 2 deletions

diff --git a/var/spack/repos/builtin/packages/kdiff3/package.py b/var/spack/repos/builtin/packages/kdiff3/package.py
new file mode 100644
index 0000000000..48f4b9c379
--- /dev/null
+++ b/var/spack/repos/builtin/packages/kdiff3/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 Kdiff3(Package):
+    """Compare and merge 2 or 3 files or directories."""
+    homepage = "http://kdiff3.sourceforge.net/"
+    url      = "https://downloads.sourceforge.net/project/kdiff3/kdiff3/0.9.98/kdiff3-0.9.98.tar.gz"
+
+    version('0.9.98', 'b52f99f2cf2ea75ed5719315cbf77446')
+
+    depends_on("qt@5.2.0:")
+
+    def install(self, spec, prefix):
+        # make is done inside
+        configure('qt4')
+
+        # there is no make install, bummer...
+        mkdirp(self.prefix.bin)
+        install(join_path(self.stage.source_path, 'releaseQt', 'kdiff3'),
+                self.prefix.bin)
diff --git a/var/spack/repos/builtin/packages/libxau/package.py b/var/spack/repos/builtin/packages/libxau/package.py
index 55816ecdbd..b9215bc601 100644
--- a/var/spack/repos/builtin/packages/libxau/package.py
+++ b/var/spack/repos/builtin/packages/libxau/package.py
@@ -24,6 +24,7 @@
 ##############################################################################
 from spack import *
 
+
 class Libxau(Package):
     """The libXau package contains a library implementing the X11
        Authorization Protocol. This is useful for restricting client
@@ -34,11 +35,10 @@ class Libxau(Package):
     version('1.0.8', '685f8abbffa6d145c0f930f00703b21b')
 
     depends_on('xproto')
+    depends_on('pkg-config', type='build')
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
         configure('--prefix=%s' % prefix)
 
-        # FIXME: Add logic to build and install here
         make()
         make("install")