From ce1b30c2298ed3a335c18bd27d5f34621c3197cd Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Thu, 23 Oct 2014 21:08:13 -0700
Subject: Adding initial version of MPE2 package.

---
 var/spack/packages/mpe2/package.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 var/spack/packages/mpe2/package.py

diff --git a/var/spack/packages/mpe2/package.py b/var/spack/packages/mpe2/package.py
new file mode 100644
index 0000000000..f043ad6ba6
--- /dev/null
+++ b/var/spack/packages/mpe2/package.py
@@ -0,0 +1,24 @@
+from spack import *
+
+class Mpe2(Package):
+    """Message Passing Extensions (MPE) -- Parallel, shared X window graphics"""
+
+    homepage = "http://www.mcs.anl.gov/research/projects/perfvis/software/MPE/"
+    url      = "ftp://ftp.mcs.anl.gov/pub/mpi/mpe/mpe2-1.3.0.tar.gz"
+
+    version('1.3.0', '67bf0c7b2e573df3ba0d2059a96c2f7b')
+
+    depends_on("mpi")
+
+    def install(self, spec, prefix):
+        configure("--prefix=" + prefix,
+                  "--x-includes=/usr/X11R6/include",
+                  "--x-libraries=/usr/X11R6/lib",
+                  "--enable-mpe_graphics=yes",
+                  "--disable-f77",
+                  "--enable-viewers=no",
+                  "--enable-slog2=no",
+                  "--with-mpicc=mpicc")
+
+        make()
+        make("install")
-- 
cgit v1.2.3-60-g2f50


From 76ed5c212cdf41e44428ef723c3d7f5695efbcc8 Mon Sep 17 00:00:00 2001
From: Bob Robey <brobey@lanl.gov>
Date: Sat, 25 Oct 2014 21:25:25 -0600
Subject: Adding autotools and ImageMagick and patch for mpe2

---
 var/spack/packages/ImageMagick/package.py | 21 +++++++++++++++++++++
 var/spack/packages/autoconf/package.py    | 14 ++++++++++++++
 var/spack/packages/automake/package.py    | 16 ++++++++++++++++
 var/spack/packages/cmake/package.py       | 10 ++++++++--
 var/spack/packages/fontconfig/package.py  | 16 ++++++++++++++++
 var/spack/packages/freetype/package.py    | 16 ++++++++++++++++
 var/spack/packages/jpeg/package.py        | 14 ++++++++++++++
 var/spack/packages/libpng/package.py      | 14 ++++++++++++++
 var/spack/packages/libtiff/package.py     | 16 ++++++++++++++++
 var/spack/packages/libtool/package.py     | 14 ++++++++++++++
 var/spack/packages/mpe2/mpe2.patch        | 12 ++++++++++++
 var/spack/packages/mpe2/package.py        |  4 ++++
 12 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 var/spack/packages/ImageMagick/package.py
 create mode 100644 var/spack/packages/autoconf/package.py
 create mode 100644 var/spack/packages/automake/package.py
 create mode 100644 var/spack/packages/fontconfig/package.py
 create mode 100644 var/spack/packages/freetype/package.py
 create mode 100644 var/spack/packages/jpeg/package.py
 create mode 100644 var/spack/packages/libpng/package.py
 create mode 100644 var/spack/packages/libtiff/package.py
 create mode 100644 var/spack/packages/libtool/package.py
 create mode 100644 var/spack/packages/mpe2/mpe2.patch

diff --git a/var/spack/packages/ImageMagick/package.py b/var/spack/packages/ImageMagick/package.py
new file mode 100644
index 0000000000..fc1ee56bbd
--- /dev/null
+++ b/var/spack/packages/ImageMagick/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Imagemagick(Package):
+    """ImageMagick is a image processing library"""
+    homepage = "http://www.imagemagic.org"
+    url      = "http://www.imagemagick.org/download/ImageMagick-6.8.9-8.tar.gz"
+
+    version('6.8.9-8', '74aa203286bfb8aaadd320f787eea64e')
+
+    depends_on(libtool)
+    depends_on(jpeg)
+    depends_on(libpng)
+    depends_on(freetype)
+    depends_on(fontconfig)
+    depends_on(libtiff)
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/autoconf/package.py b/var/spack/packages/autoconf/package.py
new file mode 100644
index 0000000000..5189faf054
--- /dev/null
+++ b/var/spack/packages/autoconf/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Autoconf(Package):
+    """Autoconf -- system configuration part of autotools"""
+    homepage = "https://www.gnu.org/software/autoconf/"
+    url      = "http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz"
+
+    version('2.69', '82d05e03b93e45f5a39b828dc9c6c29b')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/automake/package.py b/var/spack/packages/automake/package.py
new file mode 100644
index 0000000000..73c01afdd6
--- /dev/null
+++ b/var/spack/packages/automake/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Automake(Package):
+    """Automake -- make file builder part of autotools"""
+    homepage = "http://www.gnu.org/software/automake/"
+    url      = "http://ftp.gnu.org/gnu/automake/automake-1.14.tar.gz"
+
+    version('1.14.1', 'd052a3e884631b9c7892f2efce542d75')
+
+    depends_on(autoconf)
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/cmake/package.py b/var/spack/packages/cmake/package.py
index 890af9baa9..9efa370c8b 100644
--- a/var/spack/packages/cmake/package.py
+++ b/var/spack/packages/cmake/package.py
@@ -28,9 +28,15 @@ class Cmake(Package):
     """A cross-platform, open-source build system. CMake is a family of
        tools designed to build, test and package software."""
     homepage  = 'https://www.cmake.org'
-    url       = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz'
 
-    version('2.8.10.2', '097278785da7182ec0aea8769d06860c')
+    version('2.8.10.2', '097278785da7182ec0aea8769d06860c',
+            url = 'http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz')
+ 
+    version('3.0.2', 'db4c687a31444a929d2fdc36c4dfb95f',
+            url = 'http://www.cmake.org/files/v3.0/cmake-3.0.2.tar.gz')
+
+#    version('3.0.1', 'e2e05d84cb44a42f1371d9995631dcf5')
+#    version('3.0.0', '21a1c85e1a3b803c4b48e7ff915a863e')
 
     def install(self, spec, prefix):
         configure('--prefix='   + prefix,
diff --git a/var/spack/packages/fontconfig/package.py b/var/spack/packages/fontconfig/package.py
new file mode 100644
index 0000000000..89b13604e8
--- /dev/null
+++ b/var/spack/packages/fontconfig/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Fontconfig(Package):
+    """Fontconfig customizing font access"""
+    homepage = "http://www.freedesktop.org/wiki/Software/fontconfig/"
+    url      = "http://www.freedesktop.org/software/fontconfig/release/fontconfig-2.11.1.tar.gz"
+
+    version('2.11.1' , 'e75e303b4f7756c2b16203a57ac87eba')
+
+    depends_on('freetype')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/freetype/package.py b/var/spack/packages/freetype/package.py
new file mode 100644
index 0000000000..0309b858a1
--- /dev/null
+++ b/var/spack/packages/freetype/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class Freetype(Package):
+    """Font package"""
+    homepage = "http://http://www.freetype.org"
+    url      = "http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz"
+
+    version('2.5.3'  , 'cafe9f210e45360279c730d27bf071e9')
+
+    depends_on('libpng')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/jpeg/package.py b/var/spack/packages/jpeg/package.py
new file mode 100644
index 0000000000..b34fd5cb2d
--- /dev/null
+++ b/var/spack/packages/jpeg/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Jpeg(Package):
+    """jpeg library"""
+    homepage = "http://www.ijg.org"
+    url      = "http://www.ijg.org/files/jpegsrc.v9a.tar.gz"
+
+    version('9', 'b397211ddfd506b92cd5e02a22ac924d')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/libpng/package.py b/var/spack/packages/libpng/package.py
new file mode 100644
index 0000000000..a6d9bf0b46
--- /dev/null
+++ b/var/spack/packages/libpng/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Libpng(Package):
+    """libpng graphics file format"""
+    homepage = "http://www.libpng.org/pub/png/libpng.html"
+    url      = "http://sourceforge.net/projects/libpng/files/libpng16/1.6.14/libpng-1.6.14.tar.gz/download"
+
+    version('1.6.14', '2101b3de1d5f348925990f9aa8405660')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/libtiff/package.py b/var/spack/packages/libtiff/package.py
new file mode 100644
index 0000000000..0de544ad92
--- /dev/null
+++ b/var/spack/packages/libtiff/package.py
@@ -0,0 +1,16 @@
+from spack import *
+
+class libtiff(Package):
+    """libtiff graphics format library"""
+    homepage = "http://www.remotesensing.org/libtiff/"
+    url      = "http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz"
+
+    version('4.0.3', '051c1068e6a0627f461948c365290410')
+
+    depends_on('jpeg')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/libtool/package.py b/var/spack/packages/libtool/package.py
new file mode 100644
index 0000000000..a07daf9781
--- /dev/null
+++ b/var/spack/packages/libtool/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Libtool(Package):
+    """libtool -- library building part of autotools"""
+    homepage = "https://www.gnu.org/software/libtool/"
+    url      = "http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz"
+
+    version('2.4.2' , 'd2f3b7d4627e69e13514a40e72a24d50')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/mpe2/mpe2.patch b/var/spack/packages/mpe2/mpe2.patch
new file mode 100644
index 0000000000..3ade1f04f4
--- /dev/null
+++ b/var/spack/packages/mpe2/mpe2.patch
@@ -0,0 +1,12 @@
+diff -rupN mpe2-1.3.0/src/graphics/src/mpe_graphics.c mpe2-1.3.0.new/src/graphics/src/mpe_graphics.c
+--- mpe2-1.3.0/src/graphics/src/mpe_graphics.c	2009-06-15 10:36:22.000000000 -0600
++++ mpe2-1.3.0.new/src/graphics/src/mpe_graphics.c	2014-10-25 00:11:22.000000000 -0600
+@@ -982,7 +982,7 @@ char *string;
+     return MPE_ERR_BAD_ARGS;
+   }
+ 
+-  printf("color = %d, string = %s\n",(int) color, string);
++//printf("color = %d, string = %s\n",(int) color, string);
+ 
+   XBSetPixVal( graph->xwin, graph->xwin->cmapping[color] );
+   returnVal = XDrawString( graph->xwin->disp, XBDrawable(graph->xwin),
diff --git a/var/spack/packages/mpe2/package.py b/var/spack/packages/mpe2/package.py
index f043ad6ba6..27295172cc 100644
--- a/var/spack/packages/mpe2/package.py
+++ b/var/spack/packages/mpe2/package.py
@@ -8,8 +8,12 @@ class Mpe2(Package):
 
     version('1.3.0', '67bf0c7b2e573df3ba0d2059a96c2f7b')
 
+    patch('mpe2.patch')
+
     depends_on("mpi")
 
+    provides("mpe")
+
     def install(self, spec, prefix):
         configure("--prefix=" + prefix,
                   "--x-includes=/usr/X11R6/include",
-- 
cgit v1.2.3-60-g2f50


From f9149b6cb63416af2f952c71db8750450f30cbc1 Mon Sep 17 00:00:00 2001
From: Bob Robey <brobey@lanl.gov>
Date: Sat, 25 Oct 2014 21:59:01 -0600
Subject: Fixing errors in depends_on and updating version for ImageMagick

---
 var/spack/packages/ImageMagick/package.py | 16 ++++++++--------
 var/spack/packages/automake/package.py    |  2 +-
 var/spack/packages/libtiff/package.py     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/var/spack/packages/ImageMagick/package.py b/var/spack/packages/ImageMagick/package.py
index fc1ee56bbd..39c733e0df 100644
--- a/var/spack/packages/ImageMagick/package.py
+++ b/var/spack/packages/ImageMagick/package.py
@@ -3,16 +3,16 @@ from spack import *
 class Imagemagick(Package):
     """ImageMagick is a image processing library"""
     homepage = "http://www.imagemagic.org"
-    url      = "http://www.imagemagick.org/download/ImageMagick-6.8.9-8.tar.gz"
+    url      = "http://www.imagemagick.org/download/ImageMagick-6.8.9-9.tar.gz"
 
-    version('6.8.9-8', '74aa203286bfb8aaadd320f787eea64e')
+    version('6.8.9-9', 'e63fed3e3550851328352c708f800676')
 
-    depends_on(libtool)
-    depends_on(jpeg)
-    depends_on(libpng)
-    depends_on(freetype)
-    depends_on(fontconfig)
-    depends_on(libtiff)
+    depends_on('libtool')
+    depends_on('jpeg')
+    depends_on('libpng')
+    depends_on('freetype')
+    depends_on('fontconfig')
+#   depends_on('libtiff')
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
diff --git a/var/spack/packages/automake/package.py b/var/spack/packages/automake/package.py
index 73c01afdd6..9115822730 100644
--- a/var/spack/packages/automake/package.py
+++ b/var/spack/packages/automake/package.py
@@ -7,7 +7,7 @@ class Automake(Package):
 
     version('1.14.1', 'd052a3e884631b9c7892f2efce542d75')
 
-    depends_on(autoconf)
+    depends_on('autoconf')
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
diff --git a/var/spack/packages/libtiff/package.py b/var/spack/packages/libtiff/package.py
index 0de544ad92..ec54cf7adf 100644
--- a/var/spack/packages/libtiff/package.py
+++ b/var/spack/packages/libtiff/package.py
@@ -1,6 +1,6 @@
 from spack import *
 
-class libtiff(Package):
+class Libtiff(Package):
     """libtiff graphics format library"""
     homepage = "http://www.remotesensing.org/libtiff/"
     url      = "http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz"
-- 
cgit v1.2.3-60-g2f50