diff --git a/sci-libs/netcdf/netcdf-4.6.1.recipe b/sci-libs/netcdf/netcdf-4.6.1.recipe index 81bc34664..b8690378f 100644 --- a/sci-libs/netcdf/netcdf-4.6.1.recipe +++ b/sci-libs/netcdf/netcdf-4.6.1.recipe @@ -8,7 +8,7 @@ and sharing of scientific data." HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/" COPYRIGHT="1993-2016 University Corporation for Atmospheric Research/Unidata" LICENSE="UCAR_Unidata" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/Unidata/netcdf-c/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="a2fabf27c72a5ee746e3843e1debbaad37cd035767eaede2045371322211eebb" SOURCE_DIR="netcdf-c-$portVersion" @@ -16,14 +16,14 @@ SOURCE_DIR="netcdf-c-$portVersion" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" -libnetcdfVersion="13.1.1" -libnetcdfVersionCompat="$libnetcdfVersion compat >= ${libnetcdfVersion%%.*}" +libVersion="13.1.1" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" netcdf$secondaryArchSuffix = $portVersion lib:libbzip2$secondaryArchSuffix = $portVersion lib:libmisc$secondaryArchSuffix = $portVersion - lib:libnetcdf$secondaryArchSuffix = $libnetcdfVersionCompat + lib:libnetcdf$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -43,9 +43,10 @@ PROVIDES_devel=" cmd:ocprint$secondaryArchSuffix = $portVersion devel:libbzip2$secondaryArchSuffix = $portVersion devel:libmisc$secondaryArchSuffix = $portVersion - devel:libnetcdf$secondaryArchSuffix = $libnetcdfVersionCompat + devel:libnetcdf$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" + haiku$secondaryArchSuffix netcdf$secondaryArchSuffix == $portVersion base lib:libcurl$secondaryArchSuffix lib:libhdf5$secondaryArchSuffix @@ -74,7 +75,7 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage netcdf$secondaryArchSuffix \ "$libDir"/libbzip2.so \ "$libDir"/libmisc.so \ - "$libDir"/libnetcdf.so.$libnetcdfVersion + "$libDir"/libnetcdf.so.$libVersion BUILD() { diff --git a/sci-libs/netcdf_cxx/netcdf_cxx-4.3.0.recipe b/sci-libs/netcdf_cxx/netcdf_cxx-4.3.0.recipe index 37660fb64..0848b9181 100644 --- a/sci-libs/netcdf_cxx/netcdf_cxx-4.3.0.recipe +++ b/sci-libs/netcdf_cxx/netcdf_cxx-4.3.0.recipe @@ -17,12 +17,12 @@ SOURCE_DIR="netcdf-cxx4-$portVersion" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" -libnetcdf_cppVersion="1.0.3" -libnetcdf_cppVersionCompat="$libnetcdf_cppVersion compat >= ${libnetcdf_cppVersion%%.*}" +libVersion="1.0.3" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" netcdf_cxx$secondaryArchSuffix = $portVersion - lib:libnetcdf_c++4$secondaryArchSuffix = $libnetcdf_cppVersionCompat + lib:libnetcdf_c++4$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -32,7 +32,7 @@ REQUIRES=" PROVIDES_devel=" netcdf_cxx${secondaryArchSuffix}_devel = $portVersion cmd:ncxx4_config$secondaryArchSuffix = $portVersion - devel:libnetcdf_c++4$secondaryArchSuffix = $libnetcdf_cppVersionCompat + devel:libnetcdf_c++4$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" netcdf_cxx$secondaryArchSuffix == $portVersion base @@ -54,7 +54,7 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage netcdf_cxx$secondaryArchSuffix \ - "$libDir"/libnetcdf_c++4.so.$libnetcdf_cppVersion + "$libDir"/libnetcdf_c++4.so.$libVersion BUILD() { diff --git a/sci-libs/netcdf_fortran/netcdf_fortran-4.4.4.recipe b/sci-libs/netcdf_fortran/netcdf_fortran-4.4.4.recipe index 046a58046..cc3b44d16 100644 --- a/sci-libs/netcdf_fortran/netcdf_fortran-4.4.4.recipe +++ b/sci-libs/netcdf_fortran/netcdf_fortran-4.4.4.recipe @@ -17,12 +17,12 @@ SOURCE_DIR="netcdf-fortran-$portVersion" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" -libnetcdf_fortranVersion="6.1.1" -libnetcdf_fortranVersionVersionCompat="$libnetcdf_fortranVersion compat >= ${libnetcdf_fortranVersion%%.*}" +libVersion="6.1.1" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" netcdf_fortran$secondaryArchSuffix = $portVersion - lib:libnetcdff$secondaryArchSuffix = $libnetcdf_fortranVersionVersionCompat + lib:libnetcdff$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -34,7 +34,7 @@ REQUIRES=" PROVIDES_devel=" netcdf_fortran${secondaryArchSuffix}_devel = $portVersion cmd:nf_config$secondaryArchSuffix = $portVersion - devel:libnetcdff$secondaryArchSuffix = $libnetcdf_fortranVersionVersionCompat + devel:libnetcdff$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" netcdf_fortran$secondaryArchSuffix == $portVersion base @@ -59,7 +59,7 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage netcdf_fortran$secondaryArchSuffix \ - "$libDir"/libnetcdff.so.$libnetcdf_fortranVersion + "$libDir"/libnetcdff.so.$libVersion BUILD() {