CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 19 09:18:15 UTC 2025

Modified Files:
        pkgsrc/devel/hdf5: Makefile Makefile.common options.mk
        pkgsrc/devel/hdf5-c++: Makefile

Log Message:
hdf5: unwrap scripts


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/hdf5/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/hdf5/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/hdf5/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/hdf5-c++/Makefile

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.54 pkgsrc/devel/hdf5/Makefile:1.55
--- pkgsrc/devel/hdf5/Makefile:1.54     Thu Aug 31 11:57:27 2023
+++ pkgsrc/devel/hdf5/Makefile  Wed Mar 19 09:18:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2023/08/31 11:57:27 adam Exp $
+# $NetBSD: Makefile,v 1.55 2025/03/19 09:18:14 adam Exp $
 
 COMMENT=       Hierarchical Data Format (new generation)
 
@@ -9,5 +9,10 @@ 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
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hdf5/Makefile.common
diff -u pkgsrc/devel/hdf5/Makefile.common:1.28 pkgsrc/devel/hdf5/Makefile.common:1.29
--- pkgsrc/devel/hdf5/Makefile.common:1.28      Wed Mar  5 15:32:30 2025
+++ pkgsrc/devel/hdf5/Makefile.common   Wed Mar 19 09:18:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2025/03/05 15:32:30 wiz Exp $
+# $NetBSD: Makefile.common,v 1.29 2025/03/19 09:18:14 adam Exp $
 # used by devel/hdf5/Makefile
 # used by devel/hdf5-c++/Makefile
 
@@ -31,6 +31,10 @@ CHECK_WRKREF_SKIP=   ${PREFIX}/lib/libhdf5
 
 REPLACE_BASH+=         utils/subfiling_vfd/h5fuse.in
 
+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
        ${CP} ${WRKSRC}/config/freebsd ${WRKSRC}/config/netbsdelf

Index: pkgsrc/devel/hdf5/options.mk
diff -u pkgsrc/devel/hdf5/options.mk:1.13 pkgsrc/devel/hdf5/options.mk:1.14
--- pkgsrc/devel/hdf5/options.mk:1.13   Wed Mar  5 06:24:20 2025
+++ pkgsrc/devel/hdf5/options.mk        Wed Mar 19 09:18:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2025/03/05 06:24:20 adam Exp $
+# $NetBSD: options.mk,v 1.14 2025/03/19 09:18:14 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.hdf5
 PKG_SUPPORTED_OPTIONS= szip threads hdf5-unsafe-threads
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+=      --with-szlib
 # Threadsafe API is incompatible with high-level and C++ APIs.
 PLIST_VARS+=   hl
 .if !empty(PKG_OPTIONS:Mthreads)
-CMAKE_CONFIGURE_ARGS+= -DHDF5_BUILD_HL_LIB=OFF # why?
+CMAKE_CONFIGURE_ARGS+= -DHDF5_BUILD_HL_LIB=OFF # not compatible with threadsafe
 CMAKE_CONFIGURE_ARGS+= -DHDF5_ENABLE_THREADSAFE=ON
 .include "../../mk/pthread.buildlink3.mk"
 .else

Index: pkgsrc/devel/hdf5-c++/Makefile
diff -u pkgsrc/devel/hdf5-c++/Makefile:1.12 pkgsrc/devel/hdf5-c++/Makefile:1.13
--- pkgsrc/devel/hdf5-c++/Makefile:1.12 Thu Mar  6 13:09:53 2025
+++ pkgsrc/devel/hdf5-c++/Makefile      Wed Mar 19 09:18:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/03/06 13:09:53 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2025/03/19 09:18:14 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-c++-/}
 COMMENT=       Hierarchical Data Format (new generation) - C++ wrappers
@@ -30,4 +30,6 @@ CMAKE_GENERATOR=      make
 PKG_FAIL_REASON=       "Threadsafe HDF5 with C++ interface is unsupported."
 .endif
 
+SUBST_FILES.unwrap+=   ${DESTDIR}${PREFIX}/bin/h5c++
+
 .include "../../mk/bsd.pkg.mk"