Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

netcdf: update to 4.9.3 (retry) #27710

Merged
merged 5 commits into from
Mar 10, 2025
Merged

netcdf: update to 4.9.3 (retry) #27710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9c5def
netcdf: update to 4.9.3
remkos Feb 18, 2025
2a14eb4
netcdf: update to 4.9.3
remkos Feb 18, 2025
81faf59
Merge branch 'remkos-netcdf' of https://github.com/remkos/macports-po…
remkos Mar 6, 2025
a1e85a3
netcdf: update to 4.9.3
remkos Mar 6, 2025
72c83a7
netcdf: update to 4.9.3
remkos Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion R/R-RNetCDF/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
PortSystem 1.0
PortGroup R 1.0

# Only works on macos-14 and later after g95 fix: https://trac.macports.org/ticket/71068
Copy link
Contributor

@barracuda156 barracuda156 Mar 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@remkos I do not understand what you mean. It should work on macOS < 14, unless somebody has broken that.

Update. Okay, that is probably supposed to mean that on 14+ it started working after the fix and not that after the fix it only works on 14+, but the phrasing is confusing, IMO.

Copy link
Contributor Author

@remkos remkos Mar 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, @barracuda156, that was the intent of the comment. It was meant to say that on macos-14 and later it only works with the fix to the g95 package in place. Older MacOS versions already worked without the fix.
I agree that the language was a bit confusing. It probably should have said:
For this to build on macos-14 or later, a recent fix to g95 is required: https://trac.macports.org/ticket/71068

R.setup github mjwoods RNetCDF 2.9-2 v
revision 1
revision 2
extract.rename yes
maintainers nomaintainer
license GPL-2+
description Interface to NetCDF file formats
Expand Down
2 changes: 1 addition & 1 deletion R/R-easyNCDF/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup R 1.0

R.setup cran earth.bsc easyNCDF 0.1.2
revision 1
revision 2
categories-append math
maintainers nomaintainer
license GPL-3
Expand Down
2 changes: 1 addition & 1 deletion R/R-ncdf4/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup R 1.0

R.setup cran dpierce ncdf4 1.23
revision 0
revision 1
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license GPL-3+
description Interface to unidata netCDF (v. 4 or earlier) data files
Expand Down
2 changes: 1 addition & 1 deletion gis/gdal/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PortGroup muniversal 1.0

name gdal
version 3.10.2
revision 0
revision 1

checksums rmd160 35e3e3a75959d0ab949f4e68dcb39b947508046d \
sha256 67b4e08acd1cc4b6bd67b97d580be5a8118b586ad6a426b09d5853898deeada5 \
Expand Down
1 change: 1 addition & 0 deletions math/petsc/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ PortGroup muniversal 1.0

name petsc
version 3.22.1
revision 1
categories math science
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
license BSD
Expand Down
3 changes: 1 addition & 2 deletions octave/octave-netcdf/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0

octave.setup sourceforge octave netcdf 1.0.18
revision 0
platforms darwin
revision 1
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
description A MATLAB compatible NetCDF interface for Octave.
Expand Down
2 changes: 1 addition & 1 deletion python/py-netcdf4/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup mpi 1.0
name py-netcdf4
python.rootname netCDF4
version 1.7.2
revision 0
revision 1

categories-append science
license MIT
Expand Down
8 changes: 4 additions & 4 deletions python/py-nio/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup compilers 1.0

name py-nio
version 1.3.0b1
revision 28
revision 29
categories-append science
license PyNIO
maintainers {petr @petrrr} openmaintainer
Expand All @@ -24,9 +24,9 @@ distname PyNIO-${version}

master_sites "https://www.earthsystemgrid.org/download/fileDownload.htm?logicalFileId=e328ec94-306e-11df-8e89-00c0f03d5b7c&dummy="

checksums md5 c881b552cf914549f46d65a61f2d8cb0 \
sha1 288b70d83828e1cb99d3d7c61bd32b5c406c8b1a \
rmd160 b33d00041783ba259ae95f772c7fde0cf37d7303
checksums rmd160 b33d00041783ba259ae95f772c7fde0cf37d7303 \
sha256 b9aa2f22db6a31196a465bb3a036fd248f68148e8ada1e1054106e6925cab7bf \
size 71262

python.versions 27

Expand Down
2 changes: 1 addition & 1 deletion python/py-scientific/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup python 1.0
PortGroup mpi 1.0

bitbucket.setup khinsen scientificpython 2.9.4 rel
revision 6
revision 7
checksums rmd160 11d3cb9077cc17ea4dadac2f7887a9f76be300f3 \
sha256 ed5c2048a64a83cd56374d6a048c793066d0060e8589f0ec70d95caadbaaa5ed \
size 414165
Expand Down
2 changes: 1 addition & 1 deletion science/cdo/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup legacysupport 1.0

name cdo
version 2.5.0
revision 0
revision 1
maintainers {takeshi @tenomoto} \
{me.com:remko.scharroo @remkos} \
openmaintainer
Expand Down
2 changes: 1 addition & 1 deletion science/ecCodes/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup compilers 1.0

name ecCodes
version 2.39.0
revision 0
revision 1
maintainers {takeshi @tenomoto} \
{me.com:remko.scharroo @remkos} \
openmaintainer
Expand Down
2 changes: 1 addition & 1 deletion science/elmerfem/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ legacysupport.newest_darwin_requires_legacy 10

github.setup ElmerCSC elmerfem 394d98700a395d5fbcc4bc47a8f186252f41c13f
version 2024.11.29
revision 0
revision 1
categories science
license GPL-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
Expand Down
2 changes: 1 addition & 1 deletion science/esmf/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mpi.setup
mpi.enforce_variant netcdf-fortran

github.setup esmf-org esmf 8.5.0 v
revision 2
revision 3
checksums rmd160 3d1edb514d5b09b46f1f60047e3f5cd3c0bf7b43 \
sha256 acd0b2641587007cc3ca318427f47b9cae5bfd2da8d2a16ea778f637107c29c4 \
size 14091400
Expand Down
2 changes: 1 addition & 1 deletion science/gerris/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup mpi 1.0
name gerris
set snapshot 131206
version 0.9.2-20${snapshot}
revision 5
revision 6
categories science
license GPL-2+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
Expand Down
3 changes: 1 addition & 2 deletions science/gmt4/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ PortSystem 1.0

name gmt4
version 4.5.18
revision 20
revision 21
categories science
platforms darwin
maintainers {takeshi @tenomoto} openmaintainer
license GPL-2
description The Generic Mapping Tools
Expand Down
2 changes: 1 addition & 1 deletion science/gmt5/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ name gmt5
github.setup GenericMappingTools gmt 5.4.5
github.tarball_from releases
distname ${github.project}-${github.version}-src
revision 20
revision 21

categories science
maintainers {me.com:remko.scharroo @remkos} openmaintainer
Expand Down
2 changes: 1 addition & 1 deletion science/gmt6/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name gmt6
github.setup GenericMappingTools gmt 6.5.0
github.tarball_from releases
distname ${github.project}-${github.version}-src
revision 2
revision 3
epoch 1

categories science
Expand Down
2 changes: 1 addition & 1 deletion science/grads/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PortSystem 1.0

name grads
version 2.2.1
revision 21
revision 22
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers {takeshi @tenomoto}
license GPL-2
Expand Down
2 changes: 1 addition & 1 deletion science/libminc/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PortGroup active_variants 1.1
github.setup BIC-MNI libminc 2.4.06 release-
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
revision 2
revision 3

categories science
maintainers nomaintainer
Expand Down
2 changes: 1 addition & 1 deletion science/magicspp/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if {[variant_isset qt5]} {

name magicspp
version 4.5.1
revision 14
revision 15
maintainers {takeshi @tenomoto}
license Apache-2
categories science
Expand Down
2 changes: 1 addition & 1 deletion science/mfem/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PortGroup linear_algebra 1.0
# PortGroup mpi 1.0

github.setup mfem mfem 4.7 v
revision 0
revision 1
categories science
license BSD
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
Expand Down
5 changes: 4 additions & 1 deletion science/ncarg/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ compilers.allow_arguments_mismatch \

name ncarg
version 6.6.2
revision 32
revision 33
epoch 1
set version_no_dot [join [split ${version} "."] ""]
categories science
Expand Down Expand Up @@ -90,6 +90,9 @@ patchfiles patch-Configure.diff \
patch-ni-src-lib-nfpfort-yMakefile.diff \
patch-ni-src-lib-hlu-Format.c.diff \
patch-ni-src-ncl-global-vars.diff \
patch-ni-src-ncl-MakeNcl.diff \
patch-ni-src-ncl-remove-nc-set-log.diff \
patch-ni-src-ncl-yMakefile.diff \
patch-ncarg2d-src-libncarg_gks-bwi-argb2ci.f.diff
if {$build_arch eq "x86_64" | $build_arch eq "arm64"} {
patchfiles-append patch-config-ymake.diff
Expand Down
15 changes: 15 additions & 0 deletions science/ncarg/files/patch-ni-src-ncl-MakeNcl.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Remove check for install lib directory $libpath, because it does not exist yet
--- ni/src/ncl/MakeNcl.csh.orig 2019-02-28 00:44:39
+++ ni/src/ncl/MakeNcl.csh 2025-02-19 14:06:58
@@ -28,11 +28,6 @@
set libmath = "-lngmath"
set ncarg_libs = "$libncl $libnfp $libhlu $libncarg $libgks $libncarg_c $libmath"

-if (! -d "$libpath") then
- echo "Library directory <$libpath> does not exist."
- exit 1
-endif
-
set files = ""
set extra_opts = ""

41 changes: 41 additions & 0 deletions science/ncarg/files/patch-ni-src-ncl-remove-nc-set-log.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Remove nc_set_log_level() because it is not (no longer?) available in libnetcdf
--- ni/src/ncl/NclNetCDF4.c.orig 2019-02-28 00:44:39
+++ ni/src/ncl/NclNetCDF4.c 2025-02-19 14:07:33
@@ -409,7 +409,6 @@
}

/*nc_set_log_level(3);*/
- nc_set_log_level(3);

ChunkSizeHint = 2 * blksize;

--- ni/src/ncl/NclNetCdf.c.orig 2019-02-28 00:44:39
+++ ni/src/ncl/NclNetCdf.c 2025-02-19 14:07:38
@@ -614,7 +614,6 @@
}

/*nc_set_log_level(3);*/
- nc_set_log_level(3);

ChunkSizeHint = 64 * blksize;
therec = (NetCdfFileRecord*)NclCalloc(1, sizeof(NetCdfFileRecord));
--- ni/src/ncl/NclNewHDF5.c.orig 2019-02-28 00:44:39
+++ ni/src/ncl/NclNewHDF5.c 2025-02-19 14:08:16
@@ -3834,7 +3834,6 @@
}

/*nc_set_log_level(3);*/
- nc_set_log_level(3);

grpnode = (NclFileGrpNode *)NclCalloc(1, sizeof(NclFileGrpNode));
assert(grpnode);
--- ni/src/ncl/NclNewHDFEOS5.c.orig 2019-02-28 00:44:39
+++ ni/src/ncl/NclNewHDFEOS5.c 2025-02-19 14:08:21
@@ -530,7 +530,6 @@
}

/*nc_set_log_level(3);*/
- nc_set_log_level(3);

grpnode = (NclFileGrpNode *)NclCalloc(1, sizeof(NclFileGrpNode));
assert(grpnode);
22 changes: 22 additions & 0 deletions science/ncarg/files/patch-ni-src-ncl-yMakefile.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Replace '+' with '|' in sed. With '+' it complains about wrong flag
--- ni/src/ncl/yMakefile.orig 2019-02-28 00:44:39
+++ ni/src/ncl/yMakefile 2025-02-19 14:06:24
@@ -655,12 +655,12 @@

MakeNcl: MakeNcl.csh Makefile
@sed \
- -e 's+SED_CC_LD+$(CC_LD)+' \
- -e 's+SED_CC_OPT+$(CCOPTIONS)+' \
- -e 's+SED_LDLIBS+$(LDLIBS)+' \
- -e 's+SED_EXTRA_LDLIBS+$(EXTRA_LDLIBS)+' \
- -e 's+SED_LIBPATH+$(LIBPATH)+' \
- -e 's+SED_INCPATH+$(INCPATH)+' \
+ -e 's|SED_CC_LD|$(CC_LD)|' \
+ -e 's|SED_CC_OPT|$(CCOPTIONS)|' \
+ -e 's|SED_LDLIBS|$(LDLIBS)|' \
+ -e 's|SED_EXTRA_LDLIBS|$(EXTRA_LDLIBS)|' \
+ -e 's|SED_LIBPATH|$(LIBPATH)|' \
+ -e 's|SED_INCPATH|$(INCPATH)|' \
<MakeNcl.csh > MakeNcl

#if defined(Darwin)
2 changes: 1 addition & 1 deletion science/nccmp/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup gitlab 1.0
#PortGroup cmake 1.1

gitlab.setup remikz nccmp 1.9.1.0
revision 0
revision 1
checksums rmd160 d3eb0a8d2b55c93f42832e74dedab358f42fa243 \
sha256 44768ebdc5633207fbf1a7e087767782c6811f600c6a6c91b5829fb7787064ae \
size 312482
Expand Down
2 changes: 1 addition & 1 deletion science/nco/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PortGroup github 1.0
github.setup nco nco 5.3.1
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
revision 0
revision 1
maintainers {takeshi @tenomoto} \
{me.com:remko.scharroo @remkos} \
openmaintainer
Expand Down
2 changes: 1 addition & 1 deletion science/ncplot/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup github 1.0
github.setup ncar ncplot 4.11.0 v
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
revision 2
revision 3
epoch 1

categories science
Expand Down
2 changes: 1 addition & 1 deletion science/ncpp/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup github 1.0
github.setup NCAR ncpp 2.3.0 v
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
revision 3
revision 4

categories science
license permissive
Expand Down
3 changes: 1 addition & 2 deletions science/ncview/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ PortGroup conflicts_build 1.0

name ncview
version 2.1.11
revision 0
revision 1
maintainers {@thiagoveloso gmail.com:thiagoveloso} openmaintainer
platforms darwin
categories science
license GPL-3

Expand Down
9 changes: 4 additions & 5 deletions science/netcdf-cxx/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ PortGroup mpi 1.0

name netcdf-cxx
version 4.2
revision 17
revision 18
distname ${name}-${version}
maintainers {takeshi @tenomoto} openmaintainer
platforms darwin
categories science
license Permissive

Expand All @@ -24,9 +23,9 @@ master_sites ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
http://www.gfd-dennou.org/arch/netcdf/unidata-mirror/ \
ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/

checksums md5 d32b20c00f144ae6565d9e98d9f6204c \
sha1 bab9b2d873acdddbdbf07ab35481cd0267a3363b \
rmd160 69e9348ced7da8b6ddf08dad4c3a92c4f18d0648
checksums rmd160 69e9348ced7da8b6ddf08dad4c3a92c4f18d0648 \
sha256 95ed6ab49a0ee001255eac4e44aacb5ca4ea96ba850c08337a3e4c9a0872ccd1 \
size 703482

compilers.choose cc cpp cxx
mpi.setup
Expand Down
2 changes: 1 addition & 1 deletion science/netcdf-cxx4/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PortGroup mpi 1.0
github.setup Unidata netcdf-cxx4 4.3.1 v
# Change github.tarball_from to 'releases' or 'archive' next update
github.tarball_from tarball
revision 1
revision 2
distname ${name}-${version}
maintainers {takeshi @tenomoto} openmaintainer
categories science
Expand Down
Loading