[150946] trunk/dports
takeshi at macports.org
takeshi at macports.org
Wed Aug 3 06:43:12 PDT 2016
Revision: 150946
https://trac.macports.org/changeset/150946
Author: takeshi at macports.org
Date: 2016-08-03 06:43:12 -0700 (Wed, 03 Aug 2016)
Log Message:
-----------
hdf5-18, octave-devel, h4h5tools, hdfeos5, ncarg.netcdf: change prefix of hdf5-18, closing #51925
Modified Paths:
--------------
trunk/dports/math/octave-devel/Portfile
trunk/dports/science/h4h5tools/Portfile
trunk/dports/science/hdf5-18/Portfile
trunk/dports/science/hdfeos5/Portfile
trunk/dports/science/ncarg/Portfile
trunk/dports/science/netcdf/Portfile
trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/math/octave-devel/Portfile 2016-08-03 13:43:12 UTC (rev 150946)
@@ -30,7 +30,7 @@
if { ${name} eq ${subport} } {
version ${version_tip}
- revision 13
+ revision 14
hg.tag 19e8eddd4773
# see http://savannah.gnu.org/bugs/?41027
@@ -343,8 +343,8 @@
# see http://savannah.gnu.org/bugs/?47858 for upstream report
depends_lib-append port:hdf5-18
configure.args-append \
- --with-hdf5-libdir=${prefix}/lib/hdf5-18 \
- --with-hdf5-includedir=${prefix}/include/hdf5-18
+ --with-hdf5-libdir=${prefix}/lib/hdf5-18/lib \
+ --with-hdf5-includedir=${prefix}/lib/hdf5-18/include
} else {
depends_lib-append port:hdf5
}
Modified: trunk/dports/science/h4h5tools/Portfile
===================================================================
--- trunk/dports/science/h4h5tools/Portfile 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/science/h4h5tools/Portfile 2016-08-03 13:43:12 UTC (rev 150946)
@@ -5,6 +5,7 @@
name h4h5tools
version 2.2.2
+revision 1
categories science
# Equivalent to BSD + explicitly requiring modifications to be documented
license Permissive
@@ -29,10 +30,10 @@
configure.args-append \
--with-hdfeos2=${prefix}
configure.cppflags \
- -I${prefix}/include/hdf5-18 \
+ -I${prefix}/lib/hdf5-18/include \
-I${prefix}/include
configure.ldflags \
- -L${prefix}/lib/hdf5-18 \
+ -L${prefix}/lib/hdf5-18/lib \
-L${prefix}/lib
configure.env-append \
LIBS="-ldf -lmfhdf"
Modified: trunk/dports/science/hdf5-18/Portfile
===================================================================
--- trunk/dports/science/hdf5-18/Portfile 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/science/hdf5-18/Portfile 2016-08-03 13:43:12 UTC (rev 150946)
@@ -9,7 +9,7 @@
set realname hdf5
name hdf5-18
version 1.8.16
-revision 5
+revision 6
categories science
maintainers takeshi mmoll openmaintainer
@@ -58,9 +58,7 @@
--disable-cxx --disable-hl --enable-shared --enable-static \
--disable-parallel --disable-threadsafe \
--with-default-plugindir=${prefix}/lib/${name} \
- --program-suffix=-18 \
- --includedir=${prefix}/include/${name} \
- --libdir=${prefix}/lib/${name}
+ --prefix=${prefix}/lib/${name}
# http://mail.hdfgroup.org/pipermail/hdf-forum_hdfgroup.org/2010-March/002682.html
license NCSA
@@ -86,24 +84,6 @@
}
}
-post-destroot {
- xinstall -d ${destroot}${prefix}/share/${name}/
- xinstall -m 444 ${worksrcpath}/COPYING\
- ${destroot}${prefix}/share/${name}/
- file rename ${destroot}${prefix}/share/hdf5_examples ${destroot}${prefix}/share/${name}
- if {[mpi_variant_isset]} {
- file rename ${destroot}${prefix}/bin/h5pcc ${destroot}${prefix}/bin/h5pcc-18
- if {[variant_isset fortran]} {
- file rename ${destroot}${prefix}/bin/h5pfc ${destroot}${prefix}/bin/h5pfc-18
- }
- } else {
- file rename ${destroot}${prefix}/bin/h5cc ${destroot}${prefix}/bin/h5cc-18
- if {[variant_isset fortran]} {
- file rename ${destroot}${prefix}/bin/h5fc ${destroot}${prefix}/bin/h5fc-18
- }
- }
-}
-
pre-activate {
if {![catch {set installed [lindex [registry_active hdf5-18] 0]}]} {
set _version [lindex $installed 1]
Modified: trunk/dports/science/hdfeos5/Portfile
===================================================================
--- trunk/dports/science/hdfeos5/Portfile 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/science/hdfeos5/Portfile 2016-08-03 13:43:12 UTC (rev 150946)
@@ -7,7 +7,7 @@
name hdfeos5
version 1.15
-revision 11
+revision 12
categories science
platforms darwin
license public-domain
@@ -30,7 +30,7 @@
compilers.choose cc cxx
mpi.setup -clang -dragonegg -llvm
-mpi.enforce_variant hdf5-18
+compilers.enforce_c hdf5-18
depends_build port:libtool
depends_lib port:hdf5-18
@@ -44,9 +44,9 @@
# patch-src-ZAapi.c.diff
if {[mpi_variant_isset]} {
- set h5cc h5pcc-18
+ set h5cc h5pcc
} else {
- set h5cc h5cc-18
+ set h5cc h5cc
}
if {![catch {set result [active_variants port:hdf5-18 szip]}]} {
if {$result} {
@@ -62,12 +62,12 @@
--disable-dependency-tracking
pre-configure {
- configure.cc ${prefix}/bin/${h5cc}
+ configure.cc ${prefix}/lib/hdf5-18/bin/${h5cc}
}
post-configure {
file copy -force ${prefix}/bin/glibtool ${worksrcpath}/libtool
- reinplace "s|\\\\\$CC|${prefix}/bin/${h5cc}|" ${worksrcpath}/libtool
+ reinplace "s|\\\\\$CC|${prefix}/lib/hdf5-18/bin/${h5cc}|" ${worksrcpath}/libtool
}
variant szip description {enables szip support} {
Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/science/ncarg/Portfile 2016-08-03 13:43:12 UTC (rev 150946)
@@ -10,7 +10,7 @@
name ncarg
version 6.3.0
-revision 6
+revision 7
categories science
platforms darwin
maintainers takeshi openmaintainer
@@ -84,10 +84,10 @@
}
pre-configure {
- if {[file exists ${prefix}/bin/h5pcc-18]} {
- configure.cc ${prefix}/bin/h5pcc-18
+ if {[file exists ${prefix}/lib/hdf5-18/bin/h5pcc]} {
+ configure.cc ${prefix}/lib/hdf5-18/bin/h5pcc
} else {
- configure.cc ${prefix}/bin/h5cc-18
+ configure.cc ${prefix}/lib/hdf5-18/bin/h5cc
}
# build modified g2clib
reinplace "s|CC=cc|CC=${configure.cc}|" ${workpath}/${g2clib_worksrcdir}/makefile
Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/science/netcdf/Portfile 2016-08-03 13:43:12 UTC (rev 150946)
@@ -9,6 +9,7 @@
github.setup Unidata netcdf-c 4.4.1 v
+revision 1
epoch 3
name netcdf
maintainers takeshi openmaintainer
@@ -42,14 +43,15 @@
default_variants +netcdf4 +dap
+
if {[variant_isset netcdf4]} {
mpi.enforce_variant hdf5-18
- configure.ldflags-append -L${prefix}/lib/hdf5-18
- configure.args-append -DHDF5_INCLUDE_DIR=${prefix}/include/hdf5-18 \
- -DHDF5_C_LIBRARY=${prefix}/lib/hdf5-18/libhdf5.dylib \
- -DHDF5_HL_LIBRARY=${prefix}/lib/hdf5-18/libhdf5_hl.dylib \
- -DHDF5_C_LIBRARIES=${prefix}/lib/hdf5-18/libhdf5.dylib \
- -DHDF5_HL_LIBRARIES=${prefix}/lib/hdf5-18/libhdf5_hl.dylib
+ configure.ldflags-append -L${prefix}/lib/hdf5-18/lib
+ configure.args-append -DHDF5_INCLUDE_DIR=${prefix}/lib/hdf5-18/include \
+ -DHDF5_C_LIBRARY=${prefix}/lib/hdf5-18/lib/libhdf5.dylib \
+ -DHDF5_HL_LIBRARY=${prefix}/lib/hdf5-18/lib/libhdf5_hl.dylib \
+ -DHDF5_C_LIBRARIES=${prefix}/lib/hdf5-18/lib/libhdf5.dylib \
+ -DHDF5_HL_LIBRARIES=${prefix}/lib/hdf5-18/lib/libhdf5_hl.dylib
}
variant netcdf4 description {enable support for netcdf-4 API} {
Modified: trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff 2016-08-03 11:19:54 UTC (rev 150945)
+++ trunk/dports/science/netcdf/files/patch-CMakeLists.txt.diff 2016-08-03 13:43:12 UTC (rev 150946)
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig 2016-01-14 06:40:17.000000000 +0900
-+++ CMakeLists.txt 2016-04-23 14:22:34.000000000 +0900
+--- CMakeLists.txt.orig 2016-08-03 15:12:13.000000000 +0900
++++ CMakeLists.txt 2016-08-03 15:17:39.000000000 +0900
@@ -82,8 +82,7 @@
ENDIF()
@@ -7,3 +7,17 @@
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/"
- CACHE INTERNAL "Location of our custom CMake modules.")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+
+ # auto-configure style checks, other CMake modules.
+ INCLUDE(${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+@@ -613,8 +612,8 @@
+ # Find out if HDF5 was built with parallel support.
+ # Do that by checking for the targets H5Pget_fapl_mpiposx and
+ # H5Pget_fapl_mpio in ${HDF5_LIB}.
+- CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX)
+- CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
++ CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX)
++ CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
+ IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO)
+ SET(HDF5_PARALLEL ON)
+ ELSE()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160803/cd35cb10/attachment-0001.html>
More information about the macports-changes
mailing list