CVS commit: pkgsrc/devel/hdf5

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Wed May  1 22:39:29 UTC 2019

Modified Files:
        pkgsrc/devel/hdf5: Makefile buildlink3.mk options.mk

Log Message:
devel/hdf5: Enable szip support by default

Support was off by default due to non-distributable archivers/szip dependency.
Replaced with BSD-licensed archivers/libaec, containing drop-in replacement
szip library.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/hdf5/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/hdf5/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 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.50 pkgsrc/devel/hdf5/Makefile:1.51
--- pkgsrc/devel/hdf5/Makefile:1.50     Wed May 16 02:37:06 2018
+++ pkgsrc/devel/hdf5/Makefile  Wed May  1 22:39:29 2019
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2018/05/16 02:37:06 wen Exp $
+# $NetBSD: Makefile,v 1.51 2019/05/01 22:39:29 bacon Exp $
 
+PKGREVISION=   1
 COMMENT=       Hierarchical Data Format (new generation)
 
 INSTALLATION_DIRS=     bin lib include

Index: pkgsrc/devel/hdf5/buildlink3.mk
diff -u pkgsrc/devel/hdf5/buildlink3.mk:1.14 pkgsrc/devel/hdf5/buildlink3.mk:1.15
--- pkgsrc/devel/hdf5/buildlink3.mk:1.14        Sun Sep  1 12:14:06 2013
+++ pkgsrc/devel/hdf5/buildlink3.mk     Wed May  1 22:39:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2013/09/01 12:14:06 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2019/05/01 22:39:29 bacon Exp $
 
 BUILDLINK_TREE+=       hdf5
 
@@ -13,7 +13,7 @@ pkgbase := hdf5
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.hdf5:Mszip)
-.include "../../archivers/szip/buildlink3.mk"
+.include "../../archivers/libaec/buildlink3.mk"
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/hdf5/options.mk
diff -u pkgsrc/devel/hdf5/options.mk:1.7 pkgsrc/devel/hdf5/options.mk:1.8
--- pkgsrc/devel/hdf5/options.mk:1.7    Fri Oct  7 10:38:50 2011
+++ pkgsrc/devel/hdf5/options.mk        Wed May  1 22:39:29 2019
@@ -1,15 +1,14 @@
-# $NetBSD: options.mk,v 1.7 2011/10/07 10:38:50 alnsn Exp $
+# $NetBSD: options.mk,v 1.8 2019/05/01 22:39:29 bacon Exp $
 
 PKG_OPTIONS_VAR=PKG_OPTIONS.hdf5
 PKG_SUPPORTED_OPTIONS= szip threads
-# szip is non-Free, so leave out by default
-PKG_SUGGESTED_OPTIONS=
+PKG_SUGGESTED_OPTIONS= szip
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mszip)
 CONFIGURE_ARGS+=       --with-szlib
-.include "../../archivers/szip/buildlink3.mk"
+.include "../../archivers/libaec/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mthreads)