[123274] trunk/dports
mmoll at macports.org
mmoll at macports.org
Thu Aug 7 12:50:24 PDT 2014
Revision: 123274
https://trac.macports.org/changeset/123274
Author: mmoll at macports.org
Date: 2014-08-07 12:50:24 -0700 (Thu, 07 Aug 2014)
Log Message:
-----------
update hdf5 from 1.6.9 to hdf5 1.8.13, hdf5-18 is replaced by hdf5, update and rev bump all ports that depend on hdf5, either directly or via a variant
Modified Paths:
--------------
trunk/dports/archivers/blosc/Portfile
trunk/dports/devel/lua-numlua/Portfile
trunk/dports/gis/gdal/Portfile
trunk/dports/graphics/field3d/Portfile
trunk/dports/graphics/vigra/Portfile
trunk/dports/math/dolfin/Portfile
trunk/dports/math/gnudatalanguage/Portfile
trunk/dports/math/matio/Portfile
trunk/dports/math/octave/Portfile
trunk/dports/math/petsc/Portfile
trunk/dports/math/shogun/Portfile
trunk/dports/perl/p5-pdl/Portfile
trunk/dports/python/py-h5py/Portfile
trunk/dports/python/py-stfio/Portfile
trunk/dports/python/py-tables/Portfile
trunk/dports/science/H5Part/Portfile
trunk/dports/science/alps/Portfile
trunk/dports/science/armadillo/Portfile
trunk/dports/science/bob/Portfile
trunk/dports/science/cdo/Portfile
trunk/dports/science/crystfel/Portfile
trunk/dports/science/flann/Portfile
trunk/dports/science/grads/Portfile
trunk/dports/science/h4h5tools/Portfile
trunk/dports/science/h5utils/Portfile
trunk/dports/science/hdf5-18/Portfile
trunk/dports/science/hdfeos5/Portfile
trunk/dports/science/nco/Portfile
trunk/dports/science/ncview/Portfile
trunk/dports/science/netcdf/Portfile
trunk/dports/science/netcdf-cxx/Portfile
trunk/dports/science/netcdf-cxx4/Portfile
trunk/dports/science/netcdf-fortran/Portfile
trunk/dports/science/silo/Portfile
trunk/dports/science/splash/Portfile
trunk/dports/science/stimfit/Portfile
trunk/dports/science/swarm/Portfile
trunk/dports/science/vapor/Portfile
trunk/dports/science/wgrib2/Portfile
trunk/dports/science/yorick-hdf5/Portfile
Added Paths:
-----------
trunk/dports/science/hdf5/Portfile
Removed Paths:
-------------
trunk/dports/science/hdf5/Portfile
trunk/dports/science/hdf5/files/
Modified: trunk/dports/archivers/blosc/Portfile
===================================================================
--- trunk/dports/archivers/blosc/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/archivers/blosc/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
PortGroup github 1.0
github.setup Blosc c-blosc 1.4.1 v
-revision 0
+revision 1
name blosc
categories archivers devel
platforms darwin
@@ -35,7 +35,7 @@
-DBUILD_BENCHMARKS=OFF
variant hdf5 description {Build a blosc based compression filter for the HDF5 library.} {
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
configure.args-delete -DBUILD_HDF5_FILTER=OFF
configure.args-append -DBUILD_HDF5_FILTER=ON
}
Modified: trunk/dports/devel/lua-numlua/Portfile
===================================================================
--- trunk/dports/devel/lua-numlua/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/devel/lua-numlua/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -4,7 +4,7 @@
PortGroup github 1.0
github.setup carvalho numlua 0.3
-revision 4
+revision 5
name lua-numlua
license MIT
categories devel
@@ -34,7 +34,7 @@
depends_lib-append port:lua \
port:atlas \
lib:fftw:fftw-3 \
- lib:hdf5:hdf5-18
+ lib:hdf5:hdf5
post-extract {
xinstall -m 644 ${filespath}/Makefile ${worksrcpath} }
Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/gis/gdal/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,6 +5,7 @@
name gdal
version 1.11.0
+revision 1
categories gis
license MIT BSD
platforms darwin
@@ -187,7 +188,7 @@
}
variant hdf5 description {Enable HDF5 file format} {
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
configure.args-delete --without-hdf5
configure.args-append --with-hdf5=${prefix}
}
Modified: trunk/dports/graphics/field3d/Portfile
===================================================================
--- trunk/dports/graphics/field3d/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/graphics/field3d/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
github.setup imageworks Field3D 1.3.2 v
name field3d
-revision 4
+revision 5
categories graphics
maintainers blair
license BSD
@@ -34,7 +34,7 @@
depends_build port:scons
depends_lib port:boost \
port:ilmbase \
- port:hdf5-18
+ port:hdf5
variant universal {}
Modified: trunk/dports/graphics/vigra/Portfile
===================================================================
--- trunk/dports/graphics/vigra/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/graphics/vigra/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -10,7 +10,7 @@
github.setup ukoethe vigra 1-10-0 Version-
version [strsed ${github.version} {g/-/./}]
-revision 3
+revision 4
categories graphics
platforms darwin
maintainers gmail.com:benjamin.seppke
@@ -33,7 +33,7 @@
port:zlib \
port:openexr \
port:fftw-3-single \
- port:hdf5-18
+ port:hdf5
# Some additional parameters for cmake. All other params have already been set
# by the cmake PortGroup
Modified: trunk/dports/math/dolfin/Portfile
===================================================================
--- trunk/dports/math/dolfin/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/math/dolfin/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -7,7 +7,7 @@
PortGroup mpi 1.0
bitbucket.setup fenics-project dolfin 1.4.0 dolfin-
-revision 2
+revision 3
categories math
license LGPL-3+
platforms darwin
@@ -102,10 +102,10 @@
}
variant hdf5 description {Build with HDF5 interface} {
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
configure.args-delete -DDOLFIN_ENABLE_HDF5:BOOL=OFF
configure.args-append -DDOLFIN_ENABLE_HDF5:BOOL=ON
- mpi.enforce_variant hdf5-18
+ mpi.enforce_variant hdf5
}
variant parmetis description {Build with parmetisinterface} {
Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/math/gnudatalanguage/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -8,7 +8,7 @@
name gnudatalanguage
version 0.9.4
-revision 5
+revision 6
epoch 1
compilers.choose cc cxx
@@ -47,7 +47,7 @@
port:plplot \
port:netcdf-cxx \
port:hdf4 \
- port:hdf5-18 \
+ port:hdf5 \
port:grib_api \
port:libproj4 \
port:GraphicsMagick \
Modified: trunk/dports/math/matio/Portfile
===================================================================
--- trunk/dports/math/matio/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/math/matio/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,6 +5,7 @@
name matio
version 1.5.2
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers nomaintainer
license LGPL-2.1
@@ -23,7 +24,7 @@
checksums rmd160 7aa46ed93ab091c62d7972f21d0e0a18f1708cdc \
sha256 db02d0fb3373c3d766a606309b17e64a5d8da55610e921a9f1a0ec171e911d45
-depends_lib path:lib/libhdf5.dylib:hdf5-18 \
+depends_lib path:lib/libhdf5.dylib:hdf5 \
port:zlib
configure.args --enable-shared
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/math/octave/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -9,7 +9,7 @@
name octave
version 3.8.1
-revision 1
+revision 2
#conflicts octave-devel
categories math science
maintainers michaelld openmaintainer
@@ -54,7 +54,7 @@
port:GraphicsMagick \
port:grep \
port:gsed \
- port:hdf5-18 \
+ port:hdf5 \
port:less \
port:ncurses \
port:pcre \
Modified: trunk/dports/math/petsc/Portfile
===================================================================
--- trunk/dports/math/petsc/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/math/petsc/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,6 +6,7 @@
PortGroup mpi 1.0
bitbucket.setup petsc petsc 3.5.1 v
+revision 1
categories math science
maintainers sean
license BSD
@@ -140,10 +141,10 @@
}
variant hdf5 description {Build with HDF5 interface for parallel file io} {
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
configure.args-append --with-hdf5-dir=${prefix}
- mpi.enforce_variant hdf5-18
+ mpi.enforce_variant hdf5
}
variant netcdf description {Build with NetCDF interface for parallel file io} {
Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/math/shogun/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
name shogun
version 2.1.0
set branch [join [lrange [split ${version} .] 0 1] .]
-revision 5
+revision 6
categories math science
platforms darwin
license GPL-3
@@ -39,7 +39,7 @@
depends_build-append port:pkgconfig
-depends_lib-append port:hdf5-18 \
+depends_lib-append port:hdf5 \
port:json-c \
port:libxml2 \
port:readline \
Modified: trunk/dports/perl/p5-pdl/Portfile
===================================================================
--- trunk/dports/perl/p5-pdl/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/perl/p5-pdl/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -7,7 +7,7 @@
# Does not build for me (mf2k) with perl 5.18
perl5.branches 5.8 5.10 5.12 5.14 5.16 5.18 5.20
perl5.setup PDL 2.007
-revision 2
+revision 3
maintainers nomaintainer
license Artistic GPL-2
description Perl Data Language - scientific computing capability for perl
@@ -29,7 +29,7 @@
port:fftw-3 \
port:freeglut \
port:gsl \
- port:hdf5-18 \
+ port:hdf5 \
port:jpeg \
port:netpbm \
port:p${perl5.major}-astro-fits-header \
Modified: trunk/dports/python/py-h5py/Portfile
===================================================================
--- trunk/dports/python/py-h5py/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/python/py-h5py/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,8 +6,8 @@
name py-h5py
version 2.3.1
-# h5py needs to be re-built after hdf5-18 upgrades
-revision 0
+# h5py needs to be re-built after hdf5 upgrades
+revision 1
checksums \
rmd160 56b17092dd8d8a4ab949e0d3769b6e90bebf6cc1 \
@@ -59,7 +59,7 @@
if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-numpy \
- port:hdf5-18
+ port:hdf5
post-destroot {
system -W ${destroot}${prefix} "mkdir -p share/doc/${subport}"
Modified: trunk/dports/python/py-stfio/Portfile
===================================================================
--- trunk/dports/python/py-stfio/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/python/py-stfio/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
name py-stfio
version 0.13.15
-revision 1
+revision 2
categories python science
platforms darwin
license GPL-2
@@ -26,7 +26,7 @@
depends_build port:swig-python
depends_lib port:boost \
- port:hdf5-18 \
+ port:hdf5 \
port:py${python.version}-numpy
configure.args --disable-dependency-tracking \
Modified: trunk/dports/python/py-tables/Portfile
===================================================================
--- trunk/dports/python/py-tables/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/python/py-tables/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -8,7 +8,7 @@
set realname tables
name py-${realname}
version 3.1.1
-revision 2
+revision 3
categories-append science
platforms darwin
license BSD
@@ -53,7 +53,7 @@
depends_build-append \
port:py${python.version}-cython
- depends_lib-append port:hdf5-18 \
+ depends_lib-append port:hdf5 \
port:py${python.version}-numpy \
port:py${python.version}-numexpr \
port:zlib \
Modified: trunk/dports/science/H5Part/Portfile
===================================================================
--- trunk/dports/science/H5Part/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/H5Part/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name H5Part
version 1.6.6
-revision 4
+revision 5
categories science
maintainers lbl.gov:ghweber
license BSD
@@ -18,6 +18,6 @@
checksums rmd160 59b7860845b515198a6e6a28b8bcb53de18474ea \
sha256 10347e7535d1afbb08d51be5feb0ae008f73caf889df08e3f7dde717a99c7571
-depends_lib port:hdf5-18
+depends_lib port:hdf5
configure.args --with-hdf5=${prefix} --enable-shared
Modified: trunk/dports/science/alps/Portfile
===================================================================
--- trunk/dports/science/alps/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/alps/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -7,7 +7,7 @@
name alps
version 2.1.1
-revision 5
+revision 6
categories science
platforms darwin
maintainers gmail.com:gamperl
@@ -24,7 +24,7 @@
checksums rmd160 f2ab3938a364a026be8557406427521901091a51 \
sha256 554841986ad5a9d5d5a89941e5665c249fe1b8eba537078001bb6c5c21a1f335
-depends_lib port:hdf5-18
+depends_lib port:hdf5
# alps has its own internal boost it wants to use, and fails if MacPorts' newer boost is active.
conflicts_build boost
Modified: trunk/dports/science/armadillo/Portfile
===================================================================
--- trunk/dports/science/armadillo/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/armadillo/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,6 +6,7 @@
name armadillo
version 4.320.0
+revision 1
categories science
platforms darwin
maintainers gmail.com:christian.frisson openmaintainer
@@ -32,7 +33,7 @@
depends_build-append port:pkgconfig
depends_lib-append port:boost \
- port:hdf5-18
+ port:hdf5
configure.args-append -DARPACK_LIBRARY=
Modified: trunk/dports/science/bob/Portfile
===================================================================
--- trunk/dports/science/bob/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/bob/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -8,7 +8,7 @@
PortGroup compiler_blacklist_versions 1.0
github.setup idiap bob 1.2.2 v
-revision 4
+revision 5
set soversion 1.2
categories science math devel
platforms darwin
@@ -40,7 +40,7 @@
port:libpng \
port:tiff \
port:giflib \
- port:hdf5-18 \
+ port:hdf5 \
port:boost \
port:fftw-3 \
port:vlfeat \
Modified: trunk/dports/science/cdo/Portfile
===================================================================
--- trunk/dports/science/cdo/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/cdo/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -42,7 +42,7 @@
if {[mpi_variant_isset]} {
if {![file exists ${prefix}/bin/h5pcc]} {
- ui_error "${prefix}/bin/h5pcc not found. Install hdf5-18 with an mpi variant"
+ ui_error "${prefix}/bin/h5pcc not found. Install hdf5 with an mpi variant"
return -code error
}
depends_build-append port:yaxt
Modified: trunk/dports/science/crystfel/Portfile
===================================================================
--- trunk/dports/science/crystfel/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/crystfel/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,6 +5,7 @@
name crystfel
version 0.5.3a
+revision 1
categories science
platforms darwin
license GPL-3
@@ -30,7 +31,7 @@
port:fftw-3 \
port:gdk-pixbuf2 \
port:gtk2 \
- port:hdf5-18 \
+ port:hdf5 \
path:lib/pkgconfig/pango.pc:pango
configure.args --disable-silent-rules
Modified: trunk/dports/science/flann/Portfile
===================================================================
--- trunk/dports/science/flann/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/flann/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
name flann
version 1.8.4
-revision 6
+revision 7
categories science devel
maintainers mmoll
description Fast Library for Approximate Nearest Neighbors
@@ -26,7 +26,7 @@
checksums md5 a0ecd46be2ee11a68d2a7d9c6b4ce701 \
sha1 e03d9d458757f70f6af1d330ff453e3621550a4f \
rmd160 2f067dbe1ad583188a0ef587a13cc3e6179d88b6
-depends_lib port:hdf5-18
+depends_lib port:hdf5
patchfiles patch-src-python-CMakeLists.txt.diff patch-CMakeLists.txt.diff
patch.dir ${worksrcpath}/${worksrcdir}
Modified: trunk/dports/science/grads/Portfile
===================================================================
--- trunk/dports/science/grads/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/grads/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name grads
version 2.0.2
-revision 4
+revision 5
set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers takeshi
@@ -38,7 +38,7 @@
port:netcdf \
port:udunits \
port:hdf4 \
- port:hdf5-18 \
+ port:hdf5 \
port:gd2 \
port:libdap \
port:wgrib2 \
Modified: trunk/dports/science/h4h5tools/Portfile
===================================================================
--- trunk/dports/science/h4h5tools/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/h4h5tools/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -4,7 +4,7 @@
name h4h5tools
version 2.2.1
-revision 4
+revision 5
categories science
# Equivalent to BSD + explicitly requiring modifications to be documented
license Permissive
@@ -21,7 +21,7 @@
checksums rmd160 f90ac82c900e59564fe9d4da93dd2cf70cd87763 \
sha256 a814e5312355a97dc41b837dfcf057d925844b6a00f06c6d68fe9418094eb893
-depends_lib-append port:hdf5-18 \
+depends_lib-append port:hdf5 \
port:hdf4 \
port:netcdf
Modified: trunk/dports/science/h5utils/Portfile
===================================================================
--- trunk/dports/science/h5utils/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/h5utils/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name h5utils
version 1.12.1
-revision 6
+revision 7
categories science
platforms darwin
maintainers ece.pdx.edu:higginja
@@ -26,7 +26,7 @@
checksums sha1 1bd8ef8c50221da35aafb5424de9b5f177250d2d \
rmd160 f7d1d1b9254e5946c382fad2bd5ffc41e238860d
-depends_lib port:hdf5-18 \
+depends_lib port:hdf5 \
port:hdf4 \
port:libpng \
port:libmatheval
Deleted: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/hdf5/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -1,90 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-PortGroup mpi 1.0
-
-name hdf5
-version 1.6.9
-revision 4
-categories science
-license NCSA
-maintainers nomaintainer
-
-description HDF5 general purpose library and file format for storing scientific data
-long_description ${description}
-homepage http://www.hdfgroup.org/HDF5/
-platforms darwin
-conflicts hdf5-18
-master_sites ftp://ftp.hdfgroup.org/HDF5/current16/src/ \
- ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-${version}/src/
-
-checksums md5 751eb3317a47e7c58978e1c3a13a93fc \
- sha1 0481ce8cf2e62b9b10418065901369d4e0dbb4dc \
- rmd160 05ca8a3229bdd6e214d0e843afc065d0fe9f47c7
-
-mpi.setup
-
-depends_lib port:zlib
-patchfiles patch-commence.diff patch-c-commence.diff \
- patch-fortran-commence.diff patch-H5f90i.diff \
- patch-configure.diff patch-c++_configure.diff \
- patch-fortran_configure.diff
-
-universal_variant no
-
-use_parallel_build yes
-configure.ccache no
-
-configure.args --enable-cxx --with-zlib=yes --with-szlib=no --enable-shared
-configure.ldflags -L${worksrcpath}/src/.libs -L${prefix}/lib
-
-if {${os.platform} eq "darwin" && [string match *64 $build_arch]} {
- configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
-}
-
-post-destroot {
- # remove h5perf, which is pretty useless and would cause a rev-upgrade warning because it links
- # against libh5test.dylib, which is not being installed
- file delete ${destroot}${prefix}/bin/h5perf
-}
-
-destroot.destdir prefix=${destroot}${prefix}
-
-test.run yes
-test.target check
-
-
-# variant descriptions
-
-if {![fortran_variant_isset]} {
- configure.args-delete --disable-fortran
- configure.args-append --enable-fortran
-}
-
-if {[variant_isset g95]} {
- patchfiles-append patch-powerpc-apple.diff
-}
-
-if {[mpi_variant_isset]} {
- configure.args-delete --enable-cxx
-}
-
-variant szip description {Enable szip compression support} {
- configure.args-delete --with-szlib=no
- configure.args-append --with-szlib=yes
- depends_lib-append port:szip
-}
-
-variant threadsafe description {Enable threadsafety (experimental, fails unit-tests)} {
- configure.args-delete --disable-threadsafe
- configure.args-append --enable-threadsafe
-}
-
-variant optimized description {Higher compiler optimization for host machine} {
- configure.optflags-delete -O2
- configure.optflags-append -ftree-vectorize -O3
- if {[gcc_variant_isset]} {
- configure.optflags-append -march=native
- }
-}
Copied: trunk/dports/science/hdf5/Portfile (from rev 123254, trunk/dports/science/hdf5-18/Portfile)
===================================================================
--- trunk/dports/science/hdf5/Portfile (rev 0)
+++ trunk/dports/science/hdf5/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -0,0 +1,170 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+PortGroup conflicts_build 1.0
+PortGroup muniversal 1.0
+PortGroup mpi 1.0
+
+name hdf5
+version 1.8.13
+categories science
+maintainers mmoll openmaintainer
+
+description HDF5 general purpose library and file format for storing\
+ scientific data
+long_description HDF5 is a data model, library, and file format for storing\
+ and managing data. It supports an unlimited variety of\
+ datatypes, and is designed for flexible and efficient I/O\
+ and for high volume and complex data. HDF5 is portable and\
+ is extensible, allowing applications to evolve in their use\
+ of HDF5. The HDF5 Technology suite includes tools and\
+ applications for managing, manipulating, viewing, and\
+ analyzing data in the HDF5 format.
+homepage http://www.hdfgroup.org/HDF5/
+platforms darwin
+conflicts hdf5
+master_sites \
+ http://www.hdfgroup.org/ftp/HDF5/current/src \
+ ftp://ftp.hdfgroup.org/HDF5/current/src/ \
+ ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-${version}/src/
+checksums rmd160 59e690fcc8ce80c438c3d6977729e12a75b5d162 \
+ sha256 c2f5a412107aba6f99fd7a4a9db6ce5f5fc8171ec931472784e5839d26aa17ef
+
+mpi.setup
+
+use_bzip2 yes
+depends_lib port:zlib
+use_parallel_build yes
+
+# nawk: bailing out at source line 273
+conflicts_build nawk
+
+# llvm-gcc-4.2 produced code fails type conversion tests
+# Upstream suggestion is use -O0. Clang-produced code passes all tests.
+compiler.blacklist llvm-gcc-4.2
+
+configure.args --with-zlib=yes --enable-filters=all \
+ --enable-production --disable-fortran \
+ --disable-cxx --enable-shared --enable-static \
+ --disable-parallel --disable-threadsafe
+
+# http://mail.hdfgroup.org/pipermail/hdf-forum_hdfgroup.org/2010-March/002682.html
+license NCSA
+
+default_variants +cxx
+
+post-configure {
+ if {[variant_isset universal]} {
+ set dirs {}
+ foreach arch ${universal_archs_to_use} {
+ lappend dirs ${worksrcpath}-${arch}
+ }
+ } else {
+ set dirs ${worksrcpath}
+ }
+ foreach dir ${dirs} {
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
+ ${dir}/tools/misc/h5cc \
+ ${dir}/c++/src/h5c++ \
+ ${dir}/src/libhdf5.settings \
+ ${dir}/fortran/src/h5fc
+ }
+}
+
+post-destroot {
+ xinstall -d ${destroot}${prefix}/share/hdf5/
+ xinstall -m 444 ${worksrcpath}/COPYING\
+ ${destroot}${prefix}/share/hdf5/
+}
+
+pre-activate {
+ if {![catch {set installed [lindex [registry_active hdf5-18] 0]}]} {
+ set _version [lindex $installed 1]
+ if {[vercmp $_version 1.8.14] < 0} {
+ registry_deactivate_composite hdf5-18 "" [list ports_nodepcheck 1]
+ }
+ }
+}
+
+test.run yes
+test.target check
+
+variant szip description {Enable szip support. (Noncommercial license)} {
+ depends_lib-append port:szip
+ configure.args-append --with-szlib=yes
+ license Noncommercial
+}
+
+variant cxx description {
+ Enable c++ interfance.
+ +cxx is EXPERIMENTAL with +threadsafe or any mpi variant
+} {
+ configure.args-delete --disable-cxx
+ configure.args-append --enable-cxx
+}
+
+variant fortran description {
+ Enable fortran bindings.
+ +fortran is EXPERIMENTAL with +threadsafe
+} {
+ configure.args-delete --disable-fortran
+ configure.args-append --enable-fortran
+
+ if {![fortran_variant_isset]} {
+ default_variants +gfortran
+ }
+}
+
+if {[ variant_isset fortran ] && ![ fortran_variant_isset ] } {
+ ui_error "+fortran requires a fortran compiler to be selected"
+ return -code error
+}
+
+if {([ variant_isset gfortran ] || [ variant_isset g95 ]) && ![ variant_isset fortran ]} {
+ default_variants +fortran
+}
+
+variant threadsafe description {
+ Enable threadsafety.
+ +threadsafe is EXPERIMENTAL with +cxx, +fortran, or any mpi variant
+} {
+ configure.args-delete --disable-threadsafe
+ configure.args-append --enable-threadsafe --with-pthread
+}
+
+if {[ variant_isset threadsafe ] && ([ variant_isset cxx ] ||
+ [ variant_isset fortran ]) ||
+ ([ mpi_variant_isset ]) &&
+ ([ variant_isset cxx ] || [ variant_isset threadsafe ]) } {
+
+ # Tell hdf5-18 to configure in this experimental configuration
+ configure.args-append --enable-unsupported
+
+ notes {
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+hdf5-18 has been installed in an unsupported "Experimental" mode due to\
+selected variants. See "port variants hdf5 | grep EXPERIMENTAL" for more\
+information.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ }
+
+ pre-configure {
+ ui_warn {
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+hdf5-18 will been configured in an unsupported "Experimental" mode due to\
+selected variants. See "port variants hdf5 | grep EXPERIMENTAL" for more\
+information.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ }
+ }
+}
+
+if {[ mpi_variant_isset ]} {
+ configure.args-delete --disable-parallel
+ configure.args-append --enable-parallel
+}
+
+livecheck.type regex
+livecheck.url http://www.hdfgroup.org/HDF5/release/obtain5.html
+livecheck.regex 5-(\[0-9.\]+)
Modified: trunk/dports/science/hdf5-18/Portfile
===================================================================
--- trunk/dports/science/hdf5-18/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/hdf5-18/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -2,162 +2,10 @@
# $Id$
PortSystem 1.0
-PortGroup conflicts_build 1.0
-PortGroup muniversal 1.0
-PortGroup mpi 1.0
+replaced_by hdf5
+PortGroup obsolete 1.0
-set realname hdf5
-name ${realname}-18
+name hdf5-18
version 1.8.13
categories science
-maintainers mmoll openmaintainer
-
-description HDF5 general purpose library and file format for storing\
- scientific data
-long_description HDF5 is a data model, library, and file format for storing\
- and managing data. It supports an unlimited variety of\
- datatypes, and is designed for flexible and efficient I/O\
- and for high volume and complex data. HDF5 is portable and\
- is extensible, allowing applications to evolve in their use\
- of HDF5. The HDF5 Technology suite includes tools and\
- applications for managing, manipulating, viewing, and\
- analyzing data in the HDF5 format.
-homepage http://www.hdfgroup.org/HDF5/
-platforms darwin
-conflicts hdf5
-master_sites \
- http://www.hdfgroup.org/ftp/HDF5/current/src \
- ftp://ftp.hdfgroup.org/HDF5/current/src/ \
- ftp://ftp.hdfgroup.org/HDF5/prev-releases/hdf5-${version}/src/
-checksums rmd160 59e690fcc8ce80c438c3d6977729e12a75b5d162 \
- sha256 c2f5a412107aba6f99fd7a4a9db6ce5f5fc8171ec931472784e5839d26aa17ef
-distname ${realname}-${version}
-
-mpi.setup
-
-use_bzip2 yes
-depends_lib port:zlib
-use_parallel_build yes
-
-# nawk: bailing out at source line 273
-conflicts_build nawk
-
-# llvm-gcc-4.2 produced code fails type conversion tests
-# Upstream suggestion is use -O0. Clang-produced code passes all tests.
-compiler.blacklist llvm-gcc-4.2
-
-configure.args --with-zlib=yes --enable-filters=all \
- --enable-production --disable-fortran \
- --disable-cxx --enable-shared --enable-static \
- --disable-parallel --disable-threadsafe
-
-# http://mail.hdfgroup.org/pipermail/hdf-forum_hdfgroup.org/2010-March/002682.html
-license NCSA
-
-default_variants +cxx
-
-post-configure {
- if {[variant_isset universal]} {
- set dirs {}
- foreach arch ${universal_archs_to_use} {
- lappend dirs ${worksrcpath}-${arch}
- }
- } else {
- set dirs ${worksrcpath}
- }
- foreach dir ${dirs} {
- reinplace -E {s|-arch [a-z0-9_]+||g} \
- ${dir}/tools/misc/h5cc \
- ${dir}/c++/src/h5c++ \
- ${dir}/src/libhdf5.settings \
- ${dir}/fortran/src/h5fc
- }
-}
-
-post-destroot {
- xinstall -d ${destroot}${prefix}/share/hdf5/
- xinstall -m 444 ${worksrcpath}/COPYING\
- ${destroot}${prefix}/share/hdf5/
-}
-
-test.run yes
-test.target check
-
-variant szip description {Enable szip support. (Noncommercial license)} {
- depends_lib-append port:szip
- configure.args-append --with-szlib=yes
- license Noncommercial
-}
-
-variant cxx description {
- Enable c++ interfance.
- +cxx is EXPERIMENTAL with +threadsafe or any mpi variant
-} {
- configure.args-delete --disable-cxx
- configure.args-append --enable-cxx
-}
-
-variant fortran description {
- Enable fortran bindings.
- +fortran is EXPERIMENTAL with +threadsafe
-} {
- configure.args-delete --disable-fortran
- configure.args-append --enable-fortran
-
- if {![fortran_variant_isset]} {
- default_variants +gfortran
- }
-}
-
-if {[ variant_isset fortran ] && ![ fortran_variant_isset ] } {
- ui_error "+fortran requires a fortran compiler to be selected"
- return -code error
-}
-
-if {([ variant_isset gfortran ] || [ variant_isset g95 ]) && ![ variant_isset fortran ]} {
- default_variants +fortran
-}
-
-variant threadsafe description {
- Enable threadsafety.
- +threadsafe is EXPERIMENTAL with +cxx, +fortran, or any mpi variant
-} {
- configure.args-delete --disable-threadsafe
- configure.args-append --enable-threadsafe --with-pthread
-}
-
-if {[ variant_isset threadsafe ] && ([ variant_isset cxx ] ||
- [ variant_isset fortran ]) ||
- ([ mpi_variant_isset ]) &&
- ([ variant_isset cxx ] || [ variant_isset threadsafe ]) } {
-
- # Tell hdf5-18 to configure in this experimental configuration
- configure.args-append --enable-unsupported
-
- notes {
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-hdf5-18 has been installed in an unsupported "Experimental" mode due to\
-selected variants. See "port variants hdf5-18 | grep EXPERIMENTAL" for more\
-information.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- }
-
- pre-configure {
- ui_warn {
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-hdf5-18 will been configured in an unsupported "Experimental" mode due to\
-selected variants. See "port variants hdf5-18 | grep EXPERIMENTAL" for more\
-information.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- }
- }
-}
-
-if {[ mpi_variant_isset ]} {
- configure.args-delete --disable-parallel
- configure.args-append --enable-parallel
-}
-
-livecheck.type regex
-livecheck.url http://www.hdfgroup.org/HDF5/release/obtain5.html
-livecheck.regex 5-(\[0-9.\]+)
+maintainers nomaintainer
Modified: trunk/dports/science/hdfeos5/Portfile
===================================================================
--- trunk/dports/science/hdfeos5/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/hdfeos5/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -7,7 +7,7 @@
name hdfeos5
version 1.15
-revision 1
+revision 2
categories science
platforms darwin
license public-domain
@@ -32,12 +32,12 @@
mpi.setup
depends_build port:libtool
-depends_lib port:hdf5-18
+depends_lib port:hdf5
worksrcdir ${name}
extract.suffix .tar.Z
fetch.use_epsv no
-set v [mpi_active_variant_name bin:h5pcc:hdf5-18]
+set v [mpi_active_variant_name bin:h5pcc:hdf5]
if {${v} != "" } {
set h5cc h5pcc
default_variants +${v}
@@ -60,7 +60,7 @@
}
variant szip description {enables szip support} {
- require_active_variants hdf5-18 szip
+ require_active_variants hdf5 szip
depends_lib-append port:szip
configure.args-append --with-szlib=${prefix} \
}
Modified: trunk/dports/science/nco/Portfile
===================================================================
--- trunk/dports/science/nco/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/nco/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,6 +5,7 @@
name nco
version 4.4.4
+revision 1
platforms darwin
maintainers takeshi
license GPL-3
@@ -36,7 +37,7 @@
port:udunits2 \
port:zlib \
port:gsl \
- port:hdf5-18
+ port:hdf5
depends_build port:antlr \
port:bison \
port:m4 \
Modified: trunk/dports/science/ncview/Portfile
===================================================================
--- trunk/dports/science/ncview/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/ncview/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name ncview
version 2.1.1
-revision 5
+revision 6
maintainers nomaintainer
platforms darwin
categories science
@@ -30,7 +30,7 @@
patchfiles patch-configure.diff
depends_lib port:expat \
- port:hdf5-18 \
+ port:hdf5 \
port:libpng \
port:netcdf \
port:udunits2 \
Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/netcdf/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,13 +5,14 @@
PortGroup mpi 1.0
PortGroup github 1.0
-# If hdf5-18 is built without a compiler variant (with /usr/bin/clang),
+# If hdf5 is built without a compiler variant (with /usr/bin/clang),
# cxx is the only variant, which does not exist in netcdf.
# configure fails if mpi.enforce_variant is used.
-#mpi.enforce_variant hdf5-18
+#mpi.enforce_variant hdf5
github.setup Unidata netcdf-c 4.3.2 v
epoch 2
+revision 1
name netcdf
maintainers takeshi openmaintainer
platforms darwin
@@ -53,7 +54,7 @@
}
}
-set v [mpi_active_variant_name bin:h5pcc:hdf5-18]
+set v [mpi_active_variant_name bin:h5pcc:hdf5]
if {${v} != ""} {
configure.cc mpicc
default_variants +${v}
@@ -66,7 +67,7 @@
default_variants +netcdf4 +dap
variant netcdf4 description {enable support for netcdf-4 API} {
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
configure.args-delete --disable-netcdf-4
configure.args-append --enable-netcdf-4
}
Modified: trunk/dports/science/netcdf-cxx/Portfile
===================================================================
--- trunk/dports/science/netcdf-cxx/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/netcdf-cxx/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
name netcdf-cxx
version 4.2
-revision 5
+revision 6
distname ${name}-${version}
maintainers takeshi openmaintainer
platforms darwin
@@ -32,7 +32,7 @@
compilers.choose cc cpp cxx
mpi.setup
-mpi.enforce_variant hdf5-18
+mpi.enforce_variant hdf5
depends_lib port:netcdf
Modified: trunk/dports/science/netcdf-cxx4/Portfile
===================================================================
--- trunk/dports/science/netcdf-cxx4/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/netcdf-cxx4/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
PortGroup mpi 1.0
github.setup Unidata netcdf-cxx4 4.2.1 v
-revision 2
+revision 3
distname ${name}-${version}
maintainers takeshi openmaintainer
platforms darwin
@@ -28,7 +28,7 @@
compilers.choose cc cpp cxx
mpi.setup
-mpi.enforce_variant hdf5-18
+mpi.enforce_variant hdf5
depends_lib port:netcdf
Modified: trunk/dports/science/netcdf-fortran/Portfile
===================================================================
--- trunk/dports/science/netcdf-fortran/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/netcdf-fortran/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,10 +5,10 @@
PortGroup muniversal 1.0
PortGroup mpi 1.0
-# netcdf-fortran does not require the fortran interface of hdf5-18.
-# enforcing hdf5-18 varint does not allow installation of
-# hdf5-18+cxx (w/o a fortran variant) and netcdf-fortran.
-#mpi.enforce_variant hdf5-18
+# netcdf-fortran does not require the fortran interface of hdf5.
+# enforcing hdf5 variant does not allow installation of
+# hdf5+cxx (w/o a fortran variant) and netcdf-fortran.
+#mpi.enforce_variant hdf5
name netcdf-fortran
version 4.2
Modified: trunk/dports/science/silo/Portfile
===================================================================
--- trunk/dports/science/silo/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/silo/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name silo
version 4.9.1
-revision 2
+revision 3
categories science
platforms darwin
maintainers nomaintainer
@@ -68,7 +68,7 @@
}
variant hdf5 description {Enable HDF5 support (recommended)} {
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
configure.args-append --with-hdf5=${prefix}
}
Modified: trunk/dports/science/splash/Portfile
===================================================================
--- trunk/dports/science/splash/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/splash/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name splash
version 2.4.1
-revision 1
+revision 2
categories science graphics
platforms darwin
maintainers monash.edu:daniel.price
@@ -94,7 +94,7 @@
variant hdf5 description {compiles data reads that depend on HDF5} {
build.args-append gadgethdf5 HDF5ROOT=${prefix}
- depends_lib-append port:hdf5-18
+ depends_lib-append port:hdf5
}
variant h5part description {compiles H5Part data read} {
Modified: trunk/dports/science/stimfit/Portfile
===================================================================
--- trunk/dports/science/stimfit/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/stimfit/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
name stimfit
version 0.13.15
-revision 1
+revision 2
categories science
platforms darwin
license GPL-2
@@ -23,7 +23,7 @@
depends_lib port:boost \
port:fftw-3 \
- port:hdf5-18 \
+ port:hdf5 \
port:${wxWidgets.port}
configure.args --with-wx-config=${wxWidgets.wxconfig} \
Modified: trunk/dports/science/swarm/Portfile
===================================================================
--- trunk/dports/science/swarm/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/swarm/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -5,7 +5,7 @@
name swarm
version 2.4.1
-revision 8
+revision 9
categories science
maintainers nomaintainer
license GPL-2
@@ -26,7 +26,7 @@
port:libffi \
port:zlib \
port:libpng \
- port:hdf5-18
+ port:hdf5
# https://savannah.nongnu.org/bugs/?41491
# src/defobj/make-h2x needs GNU sed; causes build failure if only BSD sed is
Modified: trunk/dports/science/vapor/Portfile
===================================================================
--- trunk/dports/science/vapor/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/vapor/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -4,7 +4,7 @@
PortSystem 1.0
name vapor
version 2.2.4
-revision 2
+revision 3
categories science
maintainers nomaintainer
description interactive 3D scientific visualization environment
@@ -26,7 +26,7 @@
depends_lib port:assimp2 \
port:expat \
port:glew \
- port:hdf5-18 \
+ port:hdf5 \
port:libgeotiff \
port:netcdf \
port:proj \
Modified: trunk/dports/science/wgrib2/Portfile
===================================================================
--- trunk/dports/science/wgrib2/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/wgrib2/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,6 +6,7 @@
name wgrib2
version 2.0.0
+revision 1
platforms darwin
maintainers takeshi
license public-domain
@@ -33,7 +34,7 @@
depends_lib port:jasper \
port:libpng \
port:netcdf \
- port:hdf5-18
+ port:hdf5
worksrcdir grib2
Modified: trunk/dports/science/yorick-hdf5/Portfile
===================================================================
--- trunk/dports/science/yorick-hdf5/Portfile 2014-08-07 19:41:53 UTC (rev 123273)
+++ trunk/dports/science/yorick-hdf5/Portfile 2014-08-07 19:50:24 UTC (rev 123274)
@@ -6,7 +6,7 @@
set uname hdf5
github.setup frigaut yorick-${uname} 0.8.0
-revision 4
+revision 5
license GPL-2+
categories science yorick
platforms darwin
@@ -22,7 +22,7 @@
sha256 dec88a159c8a263ab2c94a2aa7e6cf5e48d584539990ccf600d86b6d742a40ed
depends_lib-append path:bin/yorick:yorick \
- path:lib/libhdf5.dylib:hdf5-18
+ path:lib/libhdf5.dylib:hdf5
depends_run port:yorick-yutils
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140807/169c1b0a/attachment-0001.html>
More information about the macports-changes
mailing list