spark2014: lint package

[Dmytro Kazankov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dkazankov%NetBSD.org@localhost>
Pushed By:	dkazankov
Date:		Tue May 20 06:26:54 2025 +0300
Changeset:	0c335d2f96181f0254185ead04d90db5e17b6ee4

Modified Files:
	spark2014/Makefile
	spark2014/buildlink3.mk
	spark2014/distinfo
	spark2014/patches/patch-gnatprove.gpr

Log Message:
spark2014: lint package

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0c335d2f96181f0254185ead04d90db5e17b6ee4

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

diffstat:
 spark2014/Makefile                    | 36 +++++++++++++++++------------------
 spark2014/buildlink3.mk               |  5 +----
 spark2014/distinfo                    |  8 ++++----
 spark2014/patches/patch-gnatprove.gpr |  4 ++--
 4 files changed, 25 insertions(+), 28 deletions(-)

diffs:
diff --git a/spark2014/Makefile b/spark2014/Makefile
index 52d0218484..0e0df170e2 100644
--- a/spark2014/Makefile
+++ b/spark2014/Makefile
@@ -1,8 +1,14 @@
 # $NetBSD: Makefile,v 1.2 2024/05/31 14:00:00 dkazankov Exp $
 
-PKGNAME=	spark2014-13.0.0
-PKGREVISION=	1
+DISTNAME=	spark2014-${PKGVERSION_NOREV}
+PKGNAME=	spark2014-13.1.0
 CATEGORIES=	lang devel
+MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
+GITHUB_PROJECT=	spark2014
+# latest fsf-13 branch commit
+GITHUB_TAG=	12db22e854defa9d1c993ef904af1e72330a68ca
+DISTFILES=	${DEFAULT_DISTFILES}
+
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/AdaCore/spark2014
 COMMENT=	SPARK 2014 toolset
@@ -10,18 +16,14 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	c ada
 USE_TOOLS+=	gmake
+# GNAT release must match SPARK2014 release
+GCC_REQD+=	13
+
 HAS_CONFIGURE=	yes
 
 MKPIE_SUPPORTED=	no
 RELRO_SUPPORTED=	no
 
-DISTNAME=	spark2014-${PKGVERSION_NOREV}
-GITHUB_PROJECT=	spark2014
-MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
-DISTFILES=	${DEFAULT_DISTFILES}
-
-# latest fsf-13 branch commit
-GITHUB_TAG=		12db22e854defa9d1c993ef904af1e72330a68ca
 GITHUB_SUBMODULES+=	AdaCore	alt-ergo	be23b7992464438d6b654d9e36e6917748862130	alt-ergo
 GITHUB_SUBMODULES+=	AdaCore	cvc5	98b5fb70e8a94fd258bfc959c4a6fd0cc3537564	cvc5
 GITHUB_SUBMODULES+=	AdaCore	why3	52b6a590ba9bfc64aa0d22b41715358f26124a1f	why3
@@ -35,7 +37,7 @@ GCC_DISTFILE=		${GCC_DISTNAME}${GCC_EXTRACT_SUFFIX}
 DISTFILES+=		${GCC_DISTFILE}
 SITES.${GCC_DISTFILE}=	${MASTER_SITE_GNU:=gcc/${GCC_DISTNAME}/}
 
-GCC_REQD+=	13
+.include "../../mk/bsd.prefs.mk"
 
 CONFIG_SHELL=		${MAKE_PROGRAM}
 CONFIGURE_ARGS+=	DESTDIR=${DESTDIR} PREFIX=${PREFIX}
@@ -51,12 +53,6 @@ SUBST_FILES.interpreter=	benchmark_script/*
 SUBST_MESSAGE.interpreter=	Fix interpreter
 SUBST_SED.interpreter=		-e 's,/bin/bash,/bin/sh,g'
 
-GENERATE_PLIST+= \
-	cd ${DESTDIR}${PREFIX} && \
-	${FIND} bin \( -type f -or -type l \) -print | ${SORT};
-
-.include "../../mk/bsd.prefs.mk"
-
 post-extract:
 # Link GNAT sources to main build tree
 	${RUN} cd ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG} \
@@ -67,13 +63,17 @@ post-install:
 	cd ${DESTDIR}${PREFIX} && \
 	${CHMOD} -R -P g-w ./*
 
-.include "../../wip/gprbuild/buildlink3.mk"
+GENERATE_PLIST+= \
+	cd ${DESTDIR}${PREFIX} && \
+	${FIND} bin \( -type f -or -type l \) -print | ${SORT};
+
+.include "../../devel/gprbuild/buildlink3.mk"
 
 .include "../../wip/xmlada/buildlink3.mk"
 .include "../../wip/gprlib/buildlink3.mk"
 .include "../../wip/gnatcoll-core/buildlink3.mk"
 
-PYTHON_VERSIONS_ACCEPTED=	312 311 310 39 38
+#PYTHON_VERSIONS_ACCEPTED=	312 311 310 39 38
 .include "../../lang/python/tool.mk"
 
 BUILDLINK_DEPMETHOD.ocaml=			build
diff --git a/spark2014/buildlink3.mk b/spark2014/buildlink3.mk
index b4aae8d10c..ad07224609 100644
--- a/spark2014/buildlink3.mk
+++ b/spark2014/buildlink3.mk
@@ -6,12 +6,9 @@ BUILDLINK_TREE+=	spark2014
 SPARK2014_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.spark2014+=	spark2014>=13.0
-BUILDLINK_PKGSRCDIR.spark2014=		../../wip/spark2014
+BUILDLINK_PKGSRCDIR.spark2014?=		../../wip/spark2014
 BUILDLINK_DEPMETHOD.spark2014?=		build
 
-BUILDLINK_FILES.spark2014=		#empty
-BUILDLINK_CONTENTS_FILTER.spark2014=	${FALSE}
-
 .endif
 
 BUILDLINK_TREE+=	-spark2014
diff --git a/spark2014/distinfo b/spark2014/distinfo
index 4e1f4ceaf0..0c343d1a13 100644
--- a/spark2014/distinfo
+++ b/spark2014/distinfo
@@ -15,11 +15,11 @@ Size (AdaCore-z3-7e79f0deb7c9d43f7637113be5b99391f14fcc2e.tar.gz) = 5237981 byte
 BLAKE2s (gcc-13.3.0.tar.xz) = d204b8987b4780b569f28226cbfff34ae27124e529857c36ff90d5d40ef0b511
 SHA512 (gcc-13.3.0.tar.xz) = ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
 Size (gcc-13.3.0.tar.xz) = 87909952 bytes
-BLAKE2s (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 32b2081dfd7bbb4442bc791848cc4900a8cb9214e69fce6b55ef3724b2c9b145
-SHA512 (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 17644c49e642b2e79cfe481414d12df5b27bad003cdabbb0c9e88f5eb1f8b705b159791612a2d5f720e67017f0867ffaa5cfa0bc5fae8188442cd15fb456890b
-Size (spark2014-13.0.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 11924977 bytes
+BLAKE2s (spark2014-13.1.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 32b2081dfd7bbb4442bc791848cc4900a8cb9214e69fce6b55ef3724b2c9b145
+SHA512 (spark2014-13.1.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 17644c49e642b2e79cfe481414d12df5b27bad003cdabbb0c9e88f5eb1f8b705b159791612a2d5f720e67017f0867ffaa5cfa0bc5fae8188442cd15fb456890b
+Size (spark2014-13.1.0-12db22e854defa9d1c993ef904af1e72330a68ca.tar.gz) = 11924977 bytes
 SHA1 (patch-Makefile) = e27afdf221bd7d527ba2e2d1046d67690319481c
-SHA1 (patch-gnatprove.gpr) = 5d2bcbfacbbd3785e084e0142cd7b660ee069d35
+SHA1 (patch-gnatprove.gpr) = 7ee0cb8d24c8b063431d5ecd8a4e1291a48c5980
 SHA1 (patch-spark2014vsn.ads) = ab6a841bf7398c2f3b8df312463cbbcc59a02808
 SHA1 (patch-src_common_platform.ads) = a81254a67a3a847e1d1de35b310d1b8d9a442c69
 SHA1 (patch-src_common_semaphores__c.c) = 70f91a26919bca7772c35cbf211b38ab5c4cadd3
diff --git a/spark2014/patches/patch-gnatprove.gpr b/spark2014/patches/patch-gnatprove.gpr
index 1610d4ef2e..555a0e1a15 100644
--- a/spark2014/patches/patch-gnatprove.gpr
+++ b/spark2014/patches/patch-gnatprove.gpr
@@ -1,10 +1,10 @@
 $NetBSD: patch-gnatprove.gpr,v 1.0 2024/05/19 22:00:00 dkazankov Exp $
 
-Add librt link on NetBSD
+Add libpthread link on NetBSD
 
 --- gnatprove.gpr.orig	2023-01-05 11:22:11.000000000 +0200
 +++ gnatprove.gpr
-@@ -61,6 +63,10 @@
+@@ -61,6 +61,10 @@
        case Target is
           when "x86-linux" | "x86_64-linux" =>
              for Default_Switches ("Ada") use ("-pthread");