CVS commit: pkgsrc/devel/gprbuild

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Feb  8 14:14:49 UTC 2025

Modified Files:
        pkgsrc/devel/gprbuild: Makefile PLIST buildlink3.mk distinfo
            gprbuild.mk
        pkgsrc/devel/gprbuild/patches: patch-Makefile patch-bootstrap.sh
            patch-gpr_gpr.gpr
            patch-gpr_src_gpr-util-put__resource__usage____unix.adb
            patch-gpr_src_gpr-version.ads patch-gprbuild.gpr
Removed Files:
        pkgsrc/devel/gprbuild: version.mk

Log Message:
devel/gprbuild: Update to 25.0.0

>From Dmytro Kazankov via wip.

* Major release update


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gprbuild/Makefile \
    pkgsrc/devel/gprbuild/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gprbuild/PLIST \
    pkgsrc/devel/gprbuild/gprbuild.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gprbuild/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/gprbuild/version.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gprbuild/patches/patch-Makefile \
    pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh \
    pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads \
    pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb

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

Modified files:

Index: pkgsrc/devel/gprbuild/Makefile
diff -u pkgsrc/devel/gprbuild/Makefile:1.3 pkgsrc/devel/gprbuild/Makefile:1.4
--- pkgsrc/devel/gprbuild/Makefile:1.3  Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/Makefile      Sat Feb  8 14:14:49 2025
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2025/02/06 11:27:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2025/02/08 14:14:49 wiz Exp $
 
-.include "version.mk"
-
-DISTNAME=      gprbuild-${GPRBUILD_VERSION}
-PKGREVISION=   3
+DISTNAME=      gprbuild-25.0.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/AdaCore/gprbuild
-COMMENT=       GPRbuild build system for Ada
+COMMENT=       Build system for Ada
 LICENSE=       gnu-gpl-v3
 
 USE_LANGUAGES= c ada
@@ -60,7 +57,7 @@ SUBST_CLASSES+=                       fixver
 SUBST_STAGE.fixver=            pre-configure
 SUBST_FILES.fixver=            deps/xmlada/configure
 SUBST_MESSAGE.fixver=          Fix version in configure
-SUBST_SED.fixver=              -e 's,18.0w,24.0w,g'
+SUBST_SED.fixver=              -e 's,18.0w,25.0w,g'
 
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
Index: pkgsrc/devel/gprbuild/distinfo
diff -u pkgsrc/devel/gprbuild/distinfo:1.3 pkgsrc/devel/gprbuild/distinfo:1.4
--- pkgsrc/devel/gprbuild/distinfo:1.3  Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/distinfo      Sat Feb  8 14:14:49 2025
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.3 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: distinfo,v 1.4 2025/02/08 14:14:49 wiz Exp $
 
-BLAKE2s (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = e39c1e70b80923db53f0e6c4687536fcbfdc951209a34dc039423f9cc31319fa
-SHA512 (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
-Size (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = 43010 bytes
-BLAKE2s (AdaCore-xmlada-v24.0.0.tar.gz) = a02dae17a91d326f06fc85e9b69ee5bfe181ab97ca3f7e3a846b71bc5928b643
-SHA512 (AdaCore-xmlada-v24.0.0.tar.gz) = 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d
-Size (AdaCore-xmlada-v24.0.0.tar.gz) = 1053363 bytes
-BLAKE2s (gprbuild-24.0.0.tar.gz) = d8279a6ae9f2df9fa76fa5eccb9d58a39f0a71cf27773ed140f2e20f93778e12
-SHA512 (gprbuild-24.0.0.tar.gz) = 09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03
-Size (gprbuild-24.0.0.tar.gz) = 959615 bytes
+BLAKE2s (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = eb32df0aa23a0ba4c8bcc88a580a06887ff7b12efc87bb0eac9b4d292ec548a6
+SHA512 (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8
+Size (AdaCore-gprconfig_kb-v25.0.0.tar.gz) = 44165 bytes
+BLAKE2s (AdaCore-xmlada-v25.0.0.tar.gz) = c7e2b06977998dadbde002a6b80a75d3921860f20946c02a983a2048ade6e987
+SHA512 (AdaCore-xmlada-v25.0.0.tar.gz) = c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0
+Size (AdaCore-xmlada-v25.0.0.tar.gz) = 1082553 bytes
+BLAKE2s (gprbuild-25.0.0.tar.gz) = e9462a136fe46fd9e62e7ba602f746275a41347098f273e90b41cd89c46ce386
+SHA512 (gprbuild-25.0.0.tar.gz) = eb2d7072194323cae90acd0c8683eeb6a806ef6ff2ed4d3496e8b94c5b63dae8a428ec428a3610b380df7e122d7a00d9e9634ef06b5369b165536c99209602ce
+Size (gprbuild-25.0.0.tar.gz) = 940774 bytes
 SHA1 (patch-Makefile) = a6fad4177b6537675ca5775c317ad05dbae63c95
 SHA1 (patch-bootstrap.sh) = 0f8fa38605225385975291a4d62d22a77762813f
 SHA1 (patch-deps_xmlada_Makefile.in) = 98632303e6829b0540abeca6a5a7cd427b455adf
 SHA1 (patch-gpr_gpr.gpr) = 321bce32cb8af1821e2e6b6b8d6ca75194410a0b
 SHA1 (patch-gpr_src_gpr-util-put__resource__usage____unix.adb) = c134d5aad0b90da41eef03cd2e5d98e2f14611fb
-SHA1 (patch-gpr_src_gpr-version.ads) = a55a6ee4d51e3321d9ed6dc6e69f27049f84003c
+SHA1 (patch-gpr_src_gpr-version.ads) = 40deea3a0eb6cf6a3fda3ed8ed898d4daabe0423
 SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
 SHA1 (patch-gprbuild.gpr) = e943f95bd4681e3cfde3e1782e9ec2efd9cdf181

Index: pkgsrc/devel/gprbuild/PLIST
diff -u pkgsrc/devel/gprbuild/PLIST:1.1 pkgsrc/devel/gprbuild/PLIST:1.2
--- pkgsrc/devel/gprbuild/PLIST:1.1     Tue Mar 12 17:50:12 2024
+++ pkgsrc/devel/gprbuild/PLIST Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/12 17:50:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/02/08 14:14:49 wiz Exp $
 bin/gprbuild
 bin/gprclean
 bin/gprconfig
@@ -149,6 +149,7 @@ share/gprconfig/fortran.xml
 share/gprconfig/gnat.xml
 share/gprconfig/gprconfig.xsd
 share/gprconfig/linker.xml
+share/gprconfig/morello-vx7r2.xml
 share/gprconfig/nocompiler.xml
 share/gprconfig/ppc-vx6.xml
 share/gprconfig/ppc-vx653.xml
Index: pkgsrc/devel/gprbuild/gprbuild.mk
diff -u pkgsrc/devel/gprbuild/gprbuild.mk:1.1 pkgsrc/devel/gprbuild/gprbuild.mk:1.2
--- pkgsrc/devel/gprbuild/gprbuild.mk:1.1       Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/gprbuild.mk   Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gprbuild.mk,v 1.1 2025/02/06 11:27:49 wiz Exp $
+# $NetBSD: gprbuild.mk,v 1.2 2025/02/08 14:14:49 wiz Exp $
 #
 # This Makefile fragment supports building using the GPRbuild tool.
 #
@@ -51,7 +51,7 @@ do-install: gprbuild-install
 .if !target(gprbuild-build)
 .PHONY: gprbuild-build
 gprbuild-build:
-       @for dir in ${BUILD_DIRS}; do \
+       for dir in ${BUILD_DIRS}; do \
            set -e; \
            cd $$dir && \
                ${PKGSRC_SETENV} ${GPRBUILD_ENV} \
@@ -62,7 +62,7 @@ gprbuild-build:
 .if !target(gprbuild-install)
 .PHONY: gprbuild-install
 gprbuild-install:
-       @for dir in ${INSTALL_DIRS}; do \
+       for dir in ${INSTALL_DIRS}; do \
            set -e; \
            cd $$dir && \
                ${PKGSRC_SETENV} ${GPRINSTALL_ENV} \

Index: pkgsrc/devel/gprbuild/buildlink3.mk
diff -u pkgsrc/devel/gprbuild/buildlink3.mk:1.2 pkgsrc/devel/gprbuild/buildlink3.mk:1.3
--- pkgsrc/devel/gprbuild/buildlink3.mk:1.2     Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/buildlink3.mk Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2025/02/06 11:27:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/02/08 14:14:49 wiz Exp $
 
 BUILDLINK_TREE+=       gprbuild
 
@@ -24,16 +24,13 @@ TARGET_LIBDIR.gprbuild=     ${PREFIX}/lib
 
 # Buildlinked libraries search path
 GPR_PROJECT_PATH?=     ${BUILDLINK_DIR}/share/gpr
+CONFIGURE_ENV+=                GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
 MAKE_ENV+=             GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
 INSTALL_ENV+=          GPR_PROJECT_PATH=${GPR_PROJECT_PATH:Q}
 
-.if defined(LD_RUN_PATH)
-LD_RUN_PATH:=  ${TARGET_LIBDIR.gprbuild}:${LD_RUN_PATH}
-.else
-LD_RUN_PATH:=  ${TARGET_LIBDIR.gprbuild}
-.endif
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}'$$$$ORIGIN'
 
-GPRBUILD_OPTIONS+=     -R -largs -Wl,-z,origin,-rpath,'$$$$ORIGIN':${LD_RUN_PATH} -gargs
+GPRBUILD_OPTIONS+=     -eL -R -largs $${LDFLAGS} -gargs
 BUILD_MAKE_FLAGS+=     GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
 
 .endif

Index: pkgsrc/devel/gprbuild/patches/patch-Makefile
diff -u pkgsrc/devel/gprbuild/patches/patch-Makefile:1.2 pkgsrc/devel/gprbuild/patches/patch-Makefile:1.3
--- pkgsrc/devel/gprbuild/patches/patch-Makefile:1.2    Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-Makefile        Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.2 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2025/02/08 14:14:49 wiz Exp $
 
 Make it possible to set install parameters, fix install parameters, ENABLE_SHARED
 
Index: pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh
diff -u pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.2 pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.3
--- pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.2        Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh    Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-bootstrap.sh,v 1.2 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: patch-bootstrap.sh,v 1.3 2025/02/08 14:14:49 wiz Exp $
 
 Fix out-of-tree bootstrap build
 
Index: pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.2 pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.3
--- pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.2     Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gpr_src_gpr-version.ads,v 1.2 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: patch-gpr_src_gpr-version.ads,v 1.3 2025/02/08 14:14:49 wiz Exp $
 
 Fix incorrect version reporting
 
@@ -9,14 +9,14 @@ Fix incorrect version reporting
  package GPR.Version is
  
 -   Gpr_Version : constant String := "18.0w";
-+   Gpr_Version : constant String := "24.0w";
++   Gpr_Version : constant String := "25.0w";
     --  Static string identifying this version
  
 -   Date : constant String := "19940713";
-+   Date : constant String := "20231113";
++   Date : constant String := "20241126";
  
 -   Current_Year : constant String := "2016";
-+   Current_Year : constant String := "2023";
++   Current_Year : constant String := "2024";
  
     type Gnat_Build_Type is (Gnatpro, FSF, GPL);
     --  See Get_Gnat_Build_Type below for the meaning of these values
Index: pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.2 pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.3
--- pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.2        Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr    Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gprbuild.gpr,v 1.2 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: patch-gprbuild.gpr,v 1.3 2025/02/08 14:14:49 wiz Exp $
 
 Remove redundant file from install list
 

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.3 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.4
--- pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.3 Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr     Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gpr_gpr.gpr,v 1.3 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: patch-gpr_gpr.gpr,v 1.4 2025/02/08 14:14:49 wiz Exp $
 
 Fix name conflict with grpc - same as linux distros
 

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb:1.1 pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb:1.2
--- pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb:1.1   Thu Feb  6 11:27:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-util-put__resource__usage____unix.adb       Sat Feb  8 14:14:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gpr_src_gpr-util-put__resource__usage____unix.adb,v 1.1 2025/02/06 11:27:49 wiz Exp $
+$NetBSD: patch-gpr_src_gpr-util-put__resource__usage____unix.adb,v 1.2 2025/02/08 14:14:49 wiz Exp $
 
 Fix warning at link stage on NetBSD