<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114487] trunk/dports/science/vapor</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114487">114487</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2013-12-09 10:41:05 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>vapor: update to version 2.2.4, dependencies, livecheck.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencevaporPortfile">trunk/dports/science/vapor/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencevaporfilespatchmakeconfigDarwinmkdiff">trunk/dports/science/vapor/files/patch-make-config-Darwin.mk.diff</a></li>
<li><a href="#trunkdportssciencevaporfilespatchoptionsmkdiff">trunk/dports/science/vapor/files/patch-options.mk.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencevaporfilespatchbasemkdiff">trunk/dports/science/vapor/files/patch-base.mk.diff</a></li>
<li><a href="#trunkdportssciencevaporfilespatchglewhdiff">trunk/dports/science/vapor/files/patch-glew.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencevaporPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/vapor/Portfile (114486 => 114487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/vapor/Portfile 2013-12-09 18:29:58 UTC (rev 114486)
+++ trunk/dports/science/vapor/Portfile 2013-12-09 18:41:05 UTC (rev 114487)
</span><span class="lines">@@ -3,8 +3,7 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> name vapor
</span><del>-version 1.5.2
-revision 3
</del><ins>+version 2.2.4
</ins><span class="cx"> categories science
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> description interactive 3D scientific visualization environment
</span><span class="lines">@@ -15,45 +14,55 @@
</span><span class="cx"> equipped with modern 3D graphics cards.
</span><span class="cx"> homepage http://www.vapor.ucar.edu/
</span><span class="cx"> platforms darwin
</span><del>-master_sites ftp://ftp.ucar.edu/vapor/source
</del><ins>+master_sites https://www.vapor.ucar.edu/sites/default/files/
</ins><span class="cx"> distname ${name}-${version}-src
</span><span class="cx">
</span><del>-checksums md5 615ac60aaf1680689e98dbb14fe6a6d3 \
- sha1 c023702a99ab4672b26634d178141384e8f3d5c7 \
- rmd160 2f940dcce85edd5f728ad3472f5737bd8a40cec2
</del><ins>+checksums rmd160 a690f7f587f858195db8bdbb6736ccb4f5ba8626 \
+ sha256 e43721801c89dc31766ae9304768670f24bea022690cefdd5cc73684249999af
</ins><span class="cx">
</span><del>-depends_lib port:expat \
- port:qt3 \
</del><ins>+depends_build port:gmake
+
+depends_lib port:assimp2 \
+ port:expat \
+ port:glew \
+ port:hdf5-18 \
+ port:libgeotiff \
</ins><span class="cx"> port:netcdf \
</span><span class="cx"> port:proj \
</span><del>- port:libgeotiff \
- port:hdf5-18
</del><ins>+ port:py27-numpy \
+ port:py27-scipy \
+ port:qt4-mac \
+ port:udunits2
</ins><span class="cx">
</span><del>-worksrcdir ${name}-${version}/${name}
-patchfiles patch-base.mk.diff \
- patch-glew.h.diff
-post-patch {
- reinplace "s|dynamic_lookup|dynamic_lookup -install_name ${prefix}/lib/${name}/lib\$(LIBRARY).dylib|" ${worksrcpath}/make/config/Darwin.mk
- reinplace "s|INSTALL_DOC_DIR = \$(INSTALL_SHAREDIR)/doc|INSTALL_DOC_DIR = ${destroot}${prefix}/share/doc/${name}|" ${worksrcpath}/doc/Makefile
-}
</del><ins>+patchfiles patch-options.mk.diff \
+ patch-make-config-Darwin.mk.diff
+
</ins><span class="cx"> use_configure no
</span><ins>+
</ins><span class="cx"> post-configure {
</span><del>- reinplace "s|INSTALL_PREFIX_DIR=/usr/local|INSTALL_PREFIX_DIR=${prefix}|" \
- ${worksrcpath}/options.mk
- reinplace "s|RELEASE=0|RELEASE=1|" ${worksrcpath}/options.mk
- reinplace "s|_INC_PATH=|_INC_PATH=${prefix}/include|" ${worksrcpath}/options.mk
- reinplace "s|_LIB_PATH=|_LIB_PATH=${prefix}/lib|" ${worksrcpath}/options.mk
- reinplace "s|QTDIR =|QTDIR =${prefix}/lib/qt3|" ${worksrcpath}/options.mk
- reinplace "s|QT_LIB_PATH = |QT_LIB_PATH=${prefix}/lib/qt3/lib|" ${worksrcpath}/options.mk
- reinplace "s|BUILD_AMR_SUPPORT = 0|BUILD_AMR_SUPPORT = 1|" ${worksrcpath}/options.mk
</del><ins>+ reinplace "s|@@MP_INSTALL_PREFIX@@|${destroot}${prefix}|g" ${worksrcpath}/options.mk
+ reinplace "s|@@MP_PREFIX@@|${prefix}|g" ${worksrcpath}/options.mk ${worksrcpath}/make/config/Darwin.mk
+ reinplace "s|@@MP_CC@@|${configure.cc}|" ${worksrcpath}/options.mk
+ reinplace "s|@@MP_CXX@@|${configure.cxx}|" ${worksrcpath}/options.mk
+ reinplace "s|-F.*/lib|-F${prefix}/Library/Frameworks|" ${worksrcpath}/apps/vaporgui/Makefile ${worksrcpath}/apps/asciitf2vtf/Makefile
</ins><span class="cx"> if {${build_arch} eq "x86_64"} {
</span><span class="cx"> set f [open ${worksrcpath}/site.mk "w"]
</span><span class="cx"> puts $f "MACHTYPE=x86_64"
</span><span class="cx"> close $f
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${homepage}/downloads/index.php?id=source
-livecheck.regex {Latest Release: ([0-9]+\.[0-9]+\.[0-9]+)}
</del><ins>+build.cmd gmake
+destroot.cmd gmake
+
+post-destroot {
+ file delete -force ${destroot}${prefix}/share/udunits
+}
+
+universal_variant no
+
+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex "Version (\\d+(?:\\.\\d+)*) of VAPOR"
</ins></span></pre></div>
<a id="trunkdportssciencevaporfilespatchbasemkdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/vapor/files/patch-base.mk.diff (114486 => 114487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/vapor/files/patch-base.mk.diff 2013-12-09 18:29:58 UTC (rev 114486)
+++ trunk/dports/science/vapor/files/patch-base.mk.diff 2013-12-09 18:41:05 UTC (rev 114487)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>---- make/config/base.mk.orig 2009-11-15 18:47:41.000000000 +0900
-+++ make/config/base.mk 2009-11-15 18:55:08.000000000 +0900
-@@ -367,7 +367,7 @@
- @$(LN) $(INCDIR)/$(PROJECT)/$@ $@
-
- install:: all
-- @$(ECHO) "Installing header files $(HEADER_FILES) in $(INSTALL_INCDIR)."
-+ @$(ECHO) "Installing header files $(HEADER_FILES) in $(DESTDIR)$(INSTALL_INCDIR)."
- @$(MAKE_INSTALL_INCDIR)
- @for i in $(HEADER_FILES); do $(INSTALL_NONEXEC) $(INCDIR)/$(PROJECT)/$$i $(INSTALL_INCDIR); done
-
-@@ -563,12 +563,12 @@
- INSTALL_PREFIX_DIR = /usr/local
- endif
-
--INSTALL_BINDIR = $(INSTALL_PREFIX_DIR)/bin
--INSTALL_LIBDIR = $(INSTALL_PREFIX_DIR)/lib
--INSTALL_DOCDIR = $(INSTALL_PREFIX_DIR)/doc
--INSTALL_INCDIR = $(INSTALL_PREFIX_DIR)/include/$(PROJECT)
--INSTALL_SHAREDIR = $(INSTALL_PREFIX_DIR)/share/$(VERSION_APP)
--INSTALL_MANDIR = $(INSTALL_PREFIX_DIR)/share/man
-+INSTALL_BINDIR = $(DESTDIR)$(INSTALL_PREFIX_DIR)/bin
-+INSTALL_LIBDIR = $(DESTDIR)$(INSTALL_PREFIX_DIR)/lib/$(PROJECT)
-+INSTALL_DOCDIR = $(DESTDIR)$(INSTALL_PREFIX_DIR)/share/doc/$(PROJECT)
-+INSTALL_INCDIR = $(DESTDIR)$(INSTALL_PREFIX_DIR)/include/$(PROJECT)
-+INSTALL_SHAREDIR = $(DESTDIR)$(INSTALL_PREFIX_DIR)/share/$(PROJECT)
-+INSTALL_MANDIR = $(DESTDIR)$(INSTALL_PREFIX_DIR)/share/man
-
- define MAKE_INSTALL_BINDIR
- if test ! -d $(INSTALL_BINDIR); then $(MKDIR) $(INSTALL_BINDIR); fi
</del></span></pre></div>
<a id="trunkdportssciencevaporfilespatchglewhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/vapor/files/patch-glew.h.diff (114486 => 114487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/vapor/files/patch-glew.h.diff 2013-12-09 18:29:58 UTC (rev 114486)
+++ trunk/dports/science/vapor/files/patch-glew.h.diff 2013-12-09 18:41:05 UTC (rev 114487)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>---- include/vaporinternal/GL/glew.h.orig 2009-11-16 14:12:32.000000000 +0900
-+++ include/vaporinternal/GL/glew.h 2009-11-16 14:20:28.000000000 +0900
-@@ -1152,7 +1152,7 @@
-
- typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
- typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
--typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
- typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-
- #define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D)
-@@ -1417,10 +1417,10 @@
- typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
- typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord);
- typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
--typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
--typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
-+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
- typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
--typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, GLfloat *params);
-+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
- typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
- typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
- typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-@@ -1437,7 +1437,7 @@
- typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
- typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
- typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
--typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
-+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
- typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
- typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p);
- typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-@@ -1719,12 +1719,12 @@
- typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
- typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param);
- typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
--typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
-+typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
- typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param);
--typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLint programObj, const GLchar* name);
-+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLuint programObj, const GLchar* name);
- typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params);
- typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params);
--typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint, GLenum, GLvoid*);
-+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint, GLenum, GLvoid**);
- typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint, GLenum, GLdouble*);
- typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint, GLenum, GLfloat*);
- typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint, GLenum, GLint*);
</del></span></pre></div>
<a id="trunkdportssciencevaporfilespatchmakeconfigDarwinmkdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/vapor/files/patch-make-config-Darwin.mk.diff (0 => 114487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/vapor/files/patch-make-config-Darwin.mk.diff (rev 0)
+++ trunk/dports/science/vapor/files/patch-make-config-Darwin.mk.diff 2013-12-09 18:41:05 UTC (rev 114487)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- make/config/Darwin.mk.orig 2013-12-09 00:02:26.000000000 -0800
++++ make/config/Darwin.mk 2013-12-09 00:04:26.000000000 -0800
+@@ -60,7 +60,7 @@
+ LIBSUFFIX = .a
+ OBJSUFFIX = .o
+ MV = mv
+-SHARED_LDFLAGS += -dynamiclib -current_version $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -compatibility_version $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -undefined dynamic_lookup
++SHARED_LDFLAGS += -dynamiclib -install_name @@MP_PREFIX@@/lib/$(LIB_REALNAME) -current_version $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -compatibility_version $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -undefined dynamic_lookup
+ PERL = perl
+ PYTHON = python
+
</ins></span></pre></div>
<a id="trunkdportssciencevaporfilespatchoptionsmkdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/vapor/files/patch-options.mk.diff (0 => 114487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/vapor/files/patch-options.mk.diff (rev 0)
+++ trunk/dports/science/vapor/files/patch-options.mk.diff 2013-12-09 18:41:05 UTC (rev 114487)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+--- options.mk.orig 2013-12-08 16:40:11.000000000 -0800
++++ options.mk 2013-12-08 16:46:43.000000000 -0800
+@@ -13,10 +13,10 @@
+ # in $(INSTALL_PREFIX_DIR)/bin, libraries in $(INSTALL_PREFIX_DIR)/lib
+ # etc,.
+ #
+-INSTALL_PREFIX_DIR=/usr/local
++INSTALL_PREFIX_DIR=@@MP_INSTALL_PREFIX@@
+
+ # Set RELEASE to 1 to compile with optimizations and without debug info.
+-RELEASE=0
++RELEASE=1
+
+ # Set DEBUG to 1 if you want diagnostic messages turned on
+ DEBUG=0
+@@ -25,8 +25,8 @@
+ # Specify an alternate C++ and C compiler. The default compiler is
+ # platform dependent
+ #
+-# CXX =
+-# CC =
++CXX = @@MP_CXX@@
++CC = @@MP_CC@@
+
+ # Set BENCHMARK or PROFILE to 1 for framerate diagnostics
+ BENCHMARK=0
+@@ -38,14 +38,14 @@
+ # linker normally checks. The linker will search the directories
+ # in the order specified.
+ #
+-LIB_SEARCH_DIRS =
++LIB_SEARCH_DIRS = @@MP_PREFIX@@/lib
+
+ # Set INC_SEARCH_DIRS to a list of directories containing include files
+ # not on the default search path for the compiler. Typically 3rd party
+ # dependencies (e.g. netCDF, IDL) are not installed in a location where
+ # compiler normally checks. The compiler will search the directories
+ # in the order specified.
+-INC_SEARCH_DIRS =
++INC_SEARCH_DIRS = @@MP_PREFIX@@/include @@MP_PREFIX@@/include/udunits2 @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/numarray/include @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include
+
+ # Set NETCDF_LIBS to the name of your netCDF library and any library
+ # dependencies that netcdf has. The default is simply 'netcdf'. Starting
+@@ -66,7 +66,7 @@
+ # http://www.trolltech.com, and when possible, from the vapor
+ # web site: www.vapor.ucar.edu. Qt version 4.6.1 or higher is required.
+ #
+-QTDIR =
++QTDIR = @@MP_PREFIX@@
+
+ # If BUILD_GUI is set to 1 **and** this is a Mac system, set HAVE_QT_FRAMEWORK
+ # to 1 if your Qt libraries are built as Mac Frameworks, or to 0 if
+@@ -92,7 +92,7 @@
+ # Python directory where the sub directories 'lib', and 'include'
+ # may be found. Python version 2.6.5 or higher is required.
+ #
+-PYTHONDIR =
++PYTHONDIR = @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7
+
+ # If BUILD_PYTHON is set to 1, set PYTHONVERSION to the version
+ # number (both major and minor, e.g. "2.6") of Python.
</ins></span></pre>
</div>
</div>
</body>
</html>