CVS commit: pkgsrc/devel/netcdf-cxx

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Oct  6 13:40:47 UTC 2023

Modified Files:
        pkgsrc/devel/netcdf-cxx: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/netcdf-cxx/patches: patch-Makefile.in
            patch-plugins_H5Zbzip2.c patch-plugins_H5Ztemplate.c

Log Message:
netcdf-cxx: fix build, especially on Darwin, by avoiding missing symbols


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/netcdf-cxx/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/netcdf-cxx/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/netcdf-cxx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/netcdf-cxx/patches/patch-Makefile.in \
    pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Zbzip2.c \
    pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Ztemplate.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/netcdf-cxx/Makefile
diff -u pkgsrc/devel/netcdf-cxx/Makefile:1.25 pkgsrc/devel/netcdf-cxx/Makefile:1.26
--- pkgsrc/devel/netcdf-cxx/Makefile:1.25       Sat Jun  3 03:38:52 2023
+++ pkgsrc/devel/netcdf-cxx/Makefile    Fri Oct  6 13:40:47 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2023/06/03 03:38:52 mef Exp $
+# $NetBSD: Makefile,v 1.26 2023/10/06 13:40:47 adam Exp $
 
 DISTNAME=      netcdf-cxx4-4.3.1
 PKGNAME=       ${DISTNAME:S/cxx4/cxx/}
 CATEGORIES=    devel
-MASTER_SITES=  https://downloads.unidata.ucar.edu/netcdf-cxx/4.3.1/
+MASTER_SITES=  https://downloads.unidata.ucar.edu/netcdf-cxx/${PKGVERSION_NOREV}/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.unidata.ucar.edu/software/netcdf/index.html
@@ -14,6 +14,7 @@ USE_LANGUAGES=                c c++
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
+TEST_TARGET=           check
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/netcdf-cxx/buildlink3.mk
diff -u pkgsrc/devel/netcdf-cxx/buildlink3.mk:1.22 pkgsrc/devel/netcdf-cxx/buildlink3.mk:1.23
--- pkgsrc/devel/netcdf-cxx/buildlink3.mk:1.22  Wed Apr 19 08:08:18 2023
+++ pkgsrc/devel/netcdf-cxx/buildlink3.mk       Fri Oct  6 13:40:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2023/04/19 08:08:18 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2023/10/06 13:40:47 adam Exp $
 
 BUILDLINK_TREE+=       netcdf-cxx
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        netcdf-cxx
 NETCDF_CXX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.netcdf-cxx+=     netcdf-cxx>=4.2
-BUILDLINK_ABI_DEPENDS.netcdf-cxx?=     netcdf-cxx>=4.2nb22
+BUILDLINK_ABI_DEPENDS.netcdf-cxx+=     netcdf-cxx>=4.2nb22
 BUILDLINK_PKGSRCDIR.netcdf-cxx?=       ../../devel/netcdf-cxx
 
 .include "../../devel/netcdf/buildlink3.mk"

Index: pkgsrc/devel/netcdf-cxx/distinfo
diff -u pkgsrc/devel/netcdf-cxx/distinfo:1.5 pkgsrc/devel/netcdf-cxx/distinfo:1.6
--- pkgsrc/devel/netcdf-cxx/distinfo:1.5        Sat Jun  3 03:38:52 2023
+++ pkgsrc/devel/netcdf-cxx/distinfo    Fri Oct  6 13:40:47 2023
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2023/06/03 03:38:52 mef Exp $
+$NetBSD: distinfo,v 1.6 2023/10/06 13:40:47 adam Exp $
 
 BLAKE2s (netcdf-cxx4-4.3.1.tar.gz) = 4558e0ef38dfe6a4ac399c445e2ede0fcafcded616419dcf8090a524ded89959
 SHA512 (netcdf-cxx4-4.3.1.tar.gz) = f5d9d26fb9f57430d0d681a9c7396bb0f03ed6446ac6fed51058dcc43690c02565da3f729f98b268b0bd923ca8b5b3cfa8340aca6a4f18f512c0c320ea20703f
 Size (netcdf-cxx4-4.3.1.tar.gz) = 598335 bytes
+SHA1 (patch-Makefile.in) = 13b4abce5248fbdeb60a50f12ddb7eedab258df3
+SHA1 (patch-plugins_H5Zbzip2.c) = 053b15728755c107b775d1c49319fac23fe83444
+SHA1 (patch-plugins_H5Ztemplate.c) = 9b2a3e0e59a77c05836c23b180d3aeedb896ef5e

Added files:

Index: pkgsrc/devel/netcdf-cxx/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/devel/netcdf-cxx/patches/patch-Makefile.in:1.1
--- /dev/null   Fri Oct  6 13:40:47 2023
+++ pkgsrc/devel/netcdf-cxx/patches/patch-Makefile.in   Fri Oct  6 13:40:47 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2023/10/06 13:40:47 adam Exp $
+
+Link against libnetcdf.
+
+--- cxx4/Makefile.in.orig      2023-10-06 13:23:06.487803070 +0000
++++ cxx4/Makefile.in
+@@ -137,7 +137,7 @@ am__uninstall_files_from_dir = { \
+   }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libnetcdf_c__4_la_LIBADD =
++libnetcdf_c__4_la_LIBADD = -lnetcdf
+ am_libnetcdf_c__4_la_OBJECTS = ncAtt.lo ncCheck.lo ncCompoundType.lo \
+       ncDim.lo ncEnumType.lo ncException.lo ncFile.lo ncGroup.lo \
+       ncGroupAtt.lo ncOpaqueType.lo ncType.lo ncVar.lo ncVarAtt.lo \
Index: pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Zbzip2.c
diff -u /dev/null pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Zbzip2.c:1.1
--- /dev/null   Fri Oct  6 13:40:47 2023
+++ pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Zbzip2.c    Fri Oct  6 13:40:47 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-plugins_H5Zbzip2.c,v 1.1 2023/10/06 13:40:47 adam Exp $
+
+Avoid missing symbols.
+
+--- plugins/H5Zbzip2.c.orig    2023-10-06 13:31:12.412087559 +0000
++++ plugins/H5Zbzip2.c
+@@ -201,7 +201,11 @@ size_t H5Z_filter_bzip2(unsigned int fla
+ 
+   /* Always replace the input buffer with the output buffer. */
+ 
++#ifdef HAVE_H5FREE_MEMORY
+   H5free_memory(*buf);
++#else
++  free(*buf);
++#endif
+ 
+   *buf = outbuf;
+   *buf_size = outbuflen;
+@@ -209,7 +213,11 @@ size_t H5Z_filter_bzip2(unsigned int fla
+ 
+  cleanupAndFail:
+   if (outbuf)
++#ifdef HAVE_H5FREE_MEMORY
+     H5free_memory(outbuf);
++#else
++    free(outbuf);
++#endif
+ 
+   return 0;
+ }
Index: pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Ztemplate.c
diff -u /dev/null pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Ztemplate.c:1.1
--- /dev/null   Fri Oct  6 13:40:47 2023
+++ pkgsrc/devel/netcdf-cxx/patches/patch-plugins_H5Ztemplate.c Fri Oct  6 13:40:47 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-plugins_H5Ztemplate.c,v 1.1 2023/10/06 13:40:47 adam Exp $
+
+Avoid missing symbols.
+
+--- plugins/H5Ztemplate.c.orig 2023-10-06 13:30:10.395421663 +0000
++++ plugins/H5Ztemplate.c
+@@ -92,13 +92,21 @@ size_t H5Z_filter_xxxx(unsigned int flag
+   }
+ 
+   /* Always replace the input buffer with the output buffer. */
++#ifdef HAVE_H5FREE_MEMORY
+   H5free_memory(*buf);
++#else
++  free(*buf);
++#endif
+   *buf = outbuf;
+   *buf_size = outbuflen;
+   return outdatalen;
+ 
+  cleanupAndFail:
+   if (outbuf)
++#ifdef HAVE_H5FREE_MEMORY
+     H5free_memory(outbuf);
++#else
++    free(outbud);
++#endif
+   return 0;
+ }