CVS commit: pkgsrc/devel/hdf5

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr  9 07:11:41 UTC 2026

Modified Files:
        pkgsrc/devel/hdf5: Makefile Makefile.common PLIST options.mk

Log Message:
hdf5: add mpi option

While here:
- ignore a file for shell checking because it's a bash script
- comment out unwrap SUBST block because it fails to do anything here


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/hdf5/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/hdf5/Makefile.common
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/hdf5/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/hdf5/options.mk

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

Modified files:

Index: pkgsrc/devel/hdf5/Makefile
diff -u pkgsrc/devel/hdf5/Makefile:1.55 pkgsrc/devel/hdf5/Makefile:1.56
--- pkgsrc/devel/hdf5/Makefile:1.55     Wed Mar 19 09:18:14 2025
+++ pkgsrc/devel/hdf5/Makefile  Thu Apr  9 07:11:41 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2025/03/19 09:18:14 adam Exp $
+# $NetBSD: Makefile,v 1.56 2026/04/09 07:11:41 wiz Exp $
 
 COMMENT=       Hierarchical Data Format (new generation)
 
@@ -9,10 +9,7 @@ INSTALLATION_DIRS+=    share/examples/hdf5/
 .include "Makefile.common"
 .include "options.mk"
 
-SUBST_FILES.unwrap+=   ${DESTDIR}${PREFIX}/bin/h5cc
-.if empty(PKG_OPTIONS:Mthreads)
-SUBST_FILES.unwrap+=   ${DESTDIR}${PREFIX}/bin/h5hlcc
-.endif
+#SUBST_FILES.unwrap+=  ${DESTDIR}${PREFIX}/bin/h5cc
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hdf5/Makefile.common
diff -u pkgsrc/devel/hdf5/Makefile.common:1.29 pkgsrc/devel/hdf5/Makefile.common:1.30
--- pkgsrc/devel/hdf5/Makefile.common:1.29      Wed Mar 19 09:18:14 2025
+++ pkgsrc/devel/hdf5/Makefile.common   Thu Apr  9 07:11:41 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2025/03/19 09:18:14 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2026/04/09 07:11:41 wiz Exp $
 # used by devel/hdf5/Makefile
 # used by devel/hdf5-c++/Makefile
 
@@ -24,16 +24,17 @@ CHECK_PORTABILITY_SKIP+=    HDF5Examples/*/
 CHECK_PORTABILITY_SKIP+=       bin/snapshot
 CHECK_PORTABILITY_SKIP+=       hl/tools/h5watch/testh5watch.sh.in
 CHECK_PORTABILITY_SKIP+=       java/test/junit.sh.in
+# bash script
+CHECK_PORTABILITY_SKIP+=       utils/subfiling_vfd/h5fuse.in
+REPLACE_BASH+=                 utils/subfiling_vfd/h5fuse.in
 
 # it appears that this file is informative only and is not actually
 # used by any installed tools
 CHECK_WRKREF_SKIP=     ${PREFIX}/lib/libhdf5.settings
 
-REPLACE_BASH+=         utils/subfiling_vfd/h5fuse.in
-
-SUBST_CLASSES+=                unwrap
-SUBST_STAGE.unwrap=    post-install
-SUBST_SED.unwrap=      -e "s,${WRAPPER_BINDIR}/,,g"
+#SUBST_CLASSES+=       unwrap
+#SUBST_STAGE.unwrap=   post-install
+#SUBST_SED.unwrap=     -e "s,${WRAPPER_BINDIR}/,,g"
 
 post-extract:
        ${CP} ${WRKSRC}/config/freebsd ${WRKSRC}/config/netbsd

Index: pkgsrc/devel/hdf5/PLIST
diff -u pkgsrc/devel/hdf5/PLIST:1.33 pkgsrc/devel/hdf5/PLIST:1.34
--- pkgsrc/devel/hdf5/PLIST:1.33        Wed Mar  5 06:24:20 2025
+++ pkgsrc/devel/hdf5/PLIST     Thu Apr  9 07:11:41 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2025/03/05 06:24:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2026/04/09 07:11:41 wiz Exp $
 bin/h5cc
 bin/h5clear
 bin/h5copy
@@ -13,6 +13,8 @@ bin/h5import
 bin/h5jam
 bin/h5ls
 bin/h5mkgrp
+${PLIST.mpi}bin/h5pcc
+${PLIST.mpi}bin/h5perf
 bin/h5perf_serial
 bin/h5repack
 bin/h5repart
@@ -21,6 +23,7 @@ bin/h5unjam
 ${PLIST.hl}bin/h5watch
 bin/mirror_server
 bin/mirror_server_stop
+${PLIST.mpi}bin/ph5diff
 cmake/hdf5-config-version.cmake
 cmake/hdf5-config.cmake
 cmake/hdf5-targets-noconfig.cmake

Index: pkgsrc/devel/hdf5/options.mk
diff -u pkgsrc/devel/hdf5/options.mk:1.14 pkgsrc/devel/hdf5/options.mk:1.15
--- pkgsrc/devel/hdf5/options.mk:1.14   Wed Mar 19 09:18:14 2025
+++ pkgsrc/devel/hdf5/options.mk        Thu Apr  9 07:11:41 2026
@@ -1,13 +1,22 @@
-# $NetBSD: options.mk,v 1.14 2025/03/19 09:18:14 adam Exp $
+# $NetBSD: options.mk,v 1.15 2026/04/09 07:11:41 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.hdf5
-PKG_SUPPORTED_OPTIONS= szip threads hdf5-unsafe-threads
+PKG_SUPPORTED_OPTIONS= mpi szip threads hdf5-unsafe-threads
 PKG_SUGGESTED_OPTIONS= szip
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=   mpi
+.if !empty(PKG_OPTIONS:Mmpi)
+PLIST.mpi=     yes
+CMAKE_CONFIGURE_ARGS+= -DHDF5_ENABLE_PARALLEL=ON
+.include "../../parallel/openmpi/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+= -DHDF5_ENABLE_PARALLEL=OFF
+.endif
+
 .if !empty(PKG_OPTIONS:Mszip)
-CONFIGURE_ARGS+=       --with-szlib
+CMAKE_CONFIGURE_ARGS+= -DHDF5_ENABLE_SZIP_SUPPORT=ON
 .include "../../archivers/libaec/buildlink3.mk"
 .endif
 
@@ -16,6 +25,7 @@ PLIST_VARS+=  hl
 .if !empty(PKG_OPTIONS:Mthreads)
 CMAKE_CONFIGURE_ARGS+= -DHDF5_BUILD_HL_LIB=OFF # not compatible with threadsafe
 CMAKE_CONFIGURE_ARGS+= -DHDF5_ENABLE_THREADSAFE=ON
+#SUBST_FILES.unwrap+=  ${DESTDIR}${PREFIX}/bin/h5hlcc
 .include "../../mk/pthread.buildlink3.mk"
 .else
 PLIST.hl=      yes