Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_168968507315180"
MIME-Version: 1.0
Date: Tue, 18 Jul 2023 12:57:53 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/biology
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: nia@netbsd.org
Message-Id: <20230718125753.2F759FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_168968507315180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Tue Jul 18 12:57:53 UTC 2023

Modified Files:
	pkgsrc/biology/molsketch: Makefile
	pkgsrc/biology/ncbi-blast+: Makefile buildlink3.mk

Log Message:
biology: Where possible, adjust packages to use USE_(CC|CXX)_FEATURES


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/biology/molsketch/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/biology/ncbi-blast+/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/biology/ncbi-blast+/buildlink3.mk

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


--_----------=_168968507315180
Content-Disposition: inline
Content-Length: 2351
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/biology/molsketch/Makefile
diff -u pkgsrc/biology/molsketch/Makefile:1.16 pkgsrc/biology/molsketch/Makefile:1.17
--- pkgsrc/biology/molsketch/Makefile:1.16	Mon May 22 21:00:17 2023
+++ pkgsrc/biology/molsketch/Makefile	Tue Jul 18 12:57:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/05/22 21:00:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2023/07/18 12:57:52 nia Exp $
 
 DISTNAME=	Molsketch-0.8.0-src
 PKGNAME=	${DISTNAME:S/-src//:tl}
@@ -16,9 +16,10 @@ USE_TOOLS=	pkg-config
 USE_CMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+USE_LANGUAGES=	c c++
+
 # std::transform_reduce
-GCC_REQD+=	12
-USE_LANGUAGES=	c c++17
+USE_CXX_FEATURES+=	parallelism_ts
 
 CMAKE_ARGS+=	-DMSK_PREFIX=${PREFIX:Q}
 CMAKE_ARGS+=	-DMSK_INSTALL_PREFIX=${PREFIX:Q}

Index: pkgsrc/biology/ncbi-blast+/Makefile
diff -u pkgsrc/biology/ncbi-blast+/Makefile:1.36 pkgsrc/biology/ncbi-blast+/Makefile:1.37
--- pkgsrc/biology/ncbi-blast+/Makefile:1.36	Sun Jul  9 08:39:03 2023
+++ pkgsrc/biology/ncbi-blast+/Makefile	Tue Jul 18 12:57:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2023/07/09 08:39:03 nia Exp $
+# $NetBSD: Makefile,v 1.37 2023/07/18 12:57:52 nia Exp $
 
 DISTNAME=	ncbi-blast-2.14.0+-src
 PKGNAME=	${DISTNAME:S/+-src//:S/blast/blast+/}
@@ -11,9 +11,7 @@ HOMEPAGE=	http://blast.ncbi.nlm.nih.gov/
 COMMENT=	NCBI implementation of Basic Local Alignment Search Tool
 LICENSE=	public-domain
 
-# configure: error:
-# Please upgrade to a compiler supporting C++ '17, such as GCC 7.1 or newer.
-GCC_REQD+=	7
+USE_CXX_FEATURES+=	c++17
 
 # Nobody does bioinformatics on 32-bit processors anymore
 ONLY_FOR_PLATFORM=	${LP64PLATFORMS}

Index: pkgsrc/biology/ncbi-blast+/buildlink3.mk
diff -u pkgsrc/biology/ncbi-blast+/buildlink3.mk:1.6 pkgsrc/biology/ncbi-blast+/buildlink3.mk:1.7
--- pkgsrc/biology/ncbi-blast+/buildlink3.mk:1.6	Sun May 28 22:48:27 2023
+++ pkgsrc/biology/ncbi-blast+/buildlink3.mk	Tue Jul 18 12:57:52 2023
@@ -1,10 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2023/05/28 22:48:27 bacon Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2023/07/18 12:57:52 nia Exp $
 
 BUILDLINK_TREE+=	ncbi-blast+
 
 .if !defined(NCBI_BLAST+_BUILDLINK3_MK)
 NCBI_BLAST+_BUILDLINK3_MK:=
 
+USE_CXX_FEATURES+=			c++17
+
 BUILDLINK_API_DEPENDS.ncbi-blast++=	ncbi-blast+>=2.14.0
 BUILDLINK_PKGSRCDIR.ncbi-blast+?=	../../biology/ncbi-blast+
 

--_----------=_168968507315180--