[114487] trunk/dports/science/vapor
devans at macports.org
devans at macports.org
Mon Dec 9 10:41:05 PST 2013
Revision: 114487
https://trac.macports.org/changeset/114487
Author: devans at macports.org
Date: 2013-12-09 10:41:05 -0800 (Mon, 09 Dec 2013)
Log Message:
-----------
vapor: update to version 2.2.4, dependencies, livecheck.
Modified Paths:
--------------
trunk/dports/science/vapor/Portfile
Added Paths:
-----------
trunk/dports/science/vapor/files/patch-make-config-Darwin.mk.diff
trunk/dports/science/vapor/files/patch-options.mk.diff
Removed Paths:
-------------
trunk/dports/science/vapor/files/patch-base.mk.diff
trunk/dports/science/vapor/files/patch-glew.h.diff
Modified: trunk/dports/science/vapor/Portfile
===================================================================
--- 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)
@@ -3,8 +3,7 @@
PortSystem 1.0
name vapor
-version 1.5.2
-revision 3
+version 2.2.4
categories science
maintainers nomaintainer
description interactive 3D scientific visualization environment
@@ -15,45 +14,55 @@
equipped with modern 3D graphics cards.
homepage http://www.vapor.ucar.edu/
platforms darwin
-master_sites ftp://ftp.ucar.edu/vapor/source
+master_sites https://www.vapor.ucar.edu/sites/default/files/
distname ${name}-${version}-src
-checksums md5 615ac60aaf1680689e98dbb14fe6a6d3 \
- sha1 c023702a99ab4672b26634d178141384e8f3d5c7 \
- rmd160 2f940dcce85edd5f728ad3472f5737bd8a40cec2
+checksums rmd160 a690f7f587f858195db8bdbb6736ccb4f5ba8626 \
+ sha256 e43721801c89dc31766ae9304768670f24bea022690cefdd5cc73684249999af
-depends_lib port:expat \
- port:qt3 \
+depends_build port:gmake
+
+depends_lib port:assimp2 \
+ port:expat \
+ port:glew \
+ port:hdf5-18 \
+ port:libgeotiff \
port:netcdf \
port:proj \
- port:libgeotiff \
- port:hdf5-18
+ port:py27-numpy \
+ port:py27-scipy \
+ port:qt4-mac \
+ port:udunits2
-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
-}
+patchfiles patch-options.mk.diff \
+ patch-make-config-Darwin.mk.diff
+
use_configure no
+
post-configure {
- 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
+ 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
if {${build_arch} eq "x86_64"} {
set f [open ${worksrcpath}/site.mk "w"]
puts $f "MACHTYPE=x86_64"
close $f
}
}
+
use_parallel_build no
-livecheck.type regex
-livecheck.url ${homepage}/downloads/index.php?id=source
-livecheck.regex {Latest Release: ([0-9]+\.[0-9]+\.[0-9]+)}
+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"
Deleted: trunk/dports/science/vapor/files/patch-base.mk.diff
===================================================================
--- 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)
@@ -1,30 +0,0 @@
---- 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
Deleted: trunk/dports/science/vapor/files/patch-glew.h.diff
===================================================================
--- 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)
@@ -1,50 +0,0 @@
---- 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*);
Added: trunk/dports/science/vapor/files/patch-make-config-Darwin.mk.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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
+
Added: trunk/dports/science/vapor/files/patch-options.mk.diff
===================================================================
--- 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)
@@ -0,0 +1,61 @@
+--- 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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131209/bd2586af/attachment-0001.html>
More information about the macports-changes
mailing list