Convert this package to use bsd.options.mk, with one option, `szip'.

This allows szip support (which uses a package with a no-commercial-use
license) to be disabled.

3 files changed, 26 insertions, 4 deletions

diff --git a/devel/hdf5/Makefile b/devel/hdf5/Makefile
index 0bd2c100322..20a6aaf6e3d 100644
--- a/devel/hdf5/Makefile
+++ b/devel/hdf5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/18 13:39:05 adam Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/19 15:39:04 jwise Exp $
 
 DISTNAME=	hdf5-1.6.4
 CATEGORIES=	devel
@@ -12,9 +12,10 @@ COMMENT=	Hierarchical Data Format (new generation)
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-szlib
 TEST_TARGET=		check
 
+.include "options.mk"
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5cc ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/misc/h5redeploy.in ${PREFIX}/bin/h5redeploy
@@ -25,6 +26,5 @@ post-install:
 	cd ${WRKSRC}/doc/html && ${PAX} -rw . ${PREFIX}/share/doc/html/hdf5
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/html/hdf5
 
-.include "../../archivers/szip/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hdf5/buildlink3.mk b/devel/hdf5/buildlink3.mk
index 958bfbec1ff..fa19ed7d8b3 100644
--- a/devel/hdf5/buildlink3.mk
+++ b/devel/hdf5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/30 18:09:47 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/05/19 15:39:04 jwise Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HDF5_BUILDLINK3_MK:=	${HDF5_BUILDLINK3_MK}+
@@ -16,7 +16,17 @@ BUILDLINK_RECOMMENDED.hdf5+=	hdf5>=1.6.2nb1
 BUILDLINK_PKGSRCDIR.hdf5?=	../../devel/hdf5
 .endif	# HDF5_BUILDLINK3_MK
 
+.if !defined(PKG_BUILD_OPTIONS.hdf5)
+PKG_BUILD_OPTIONS.apr!=	cd ${BUILDLINK_PKGSRCDIR.hdf5} && \
+			${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.hdf5=${PKG_BUILD_OPTIONS.hdf5:Q}
+.endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.hdf5
+
+.if !empty(PKG_BUILD_OPTIONS.hdf5:Mszip)
 .include "../../archivers/szip/buildlink3.mk"
+.endif
+
 .include "../../devel/zlib/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/hdf5/options.mk b/devel/hdf5/options.mk
new file mode 100644
index 00000000000..539af401d72
--- /dev/null
+++ b/devel/hdf5/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2005/05/19 15:39:04 jwise Exp $
+
+PKG_OPTIONS_VAR=PKG_OPTIONS.hdf5
+PKG_SUPPORTED_OPTIONS=	szip
+PKG_SUGGESTED_OPTIONS=	szip
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mszip)
+CONFIGURE_ARGS+=	--with-szlib
+.include "../../archivers/szip/buildlink3.mk"
+.endif