pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/hdf5 Convert this package to use bsd.options.mk,...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d03c7011eb5a
branches:  trunk
changeset: 494115:d03c7011eb5a
user:      jwise <jwise%pkgsrc.org@localhost>
date:      Thu May 19 15:39:04 2005 +0000

description:
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.

diffstat:

 devel/hdf5/Makefile      |   6 +++---
 devel/hdf5/buildlink3.mk |  12 +++++++++++-
 devel/hdf5/options.mk    |  12 ++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 4684a853e633 -r d03c7011eb5a devel/hdf5/Makefile
--- a/devel/hdf5/Makefile       Thu May 19 15:35:41 2005 +0000
+++ b/devel/hdf5/Makefile       Thu May 19 15:39:04 2005 +0000
@@ -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 @@
 
 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 @@
        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 -r 4684a853e633 -r d03c7011eb5a devel/hdf5/buildlink3.mk
--- a/devel/hdf5/buildlink3.mk  Thu May 19 15:35:41 2005 +0000
+++ b/devel/hdf5/buildlink3.mk  Thu May 19 15:39:04 2005 +0000
@@ -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_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 -r 4684a853e633 -r d03c7011eb5a devel/hdf5/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/hdf5/options.mk     Thu May 19 15:39:04 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index