CVS commit: pkgsrc/devel/gpr2-tools

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Sun Oct 12 07:21:14 UTC 2025

Modified Files:
        pkgsrc/devel/gpr2-tools: Makefile buildlink3.mk distinfo
        pkgsrc/devel/gpr2-tools/patches: patch-tools_gpr-tools.gpr

Log Message:
gpr2-tools: update to upstream version 25.2

* Update to upstream bugfix release
* Use alternatives for tool's names
* Make possible use of gpr2-tools as a replacement of gprbuild
  in buildlink3 environment


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gpr2-tools/Makefile \
    pkgsrc/devel/gpr2-tools/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gpr2-tools/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/gpr2-tools/patches/patch-tools_gpr-tools.gpr

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

Modified files:

Index: pkgsrc/devel/gpr2-tools/Makefile
diff -u pkgsrc/devel/gpr2-tools/Makefile:1.1 pkgsrc/devel/gpr2-tools/Makefile:1.2
--- pkgsrc/devel/gpr2-tools/Makefile:1.1        Mon Jul 28 09:07:49 2025
+++ pkgsrc/devel/gpr2-tools/Makefile    Sun Oct 12 07:21:14 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2025/07/28 09:07:49 dkazankov Exp $
+# $NetBSD: Makefile,v 1.2 2025/10/12 07:21:14 dkazankov Exp $
 
-DISTNAME=      libgpr2-${PKGVERSION_NOREV}
-PKGNAME=       gpr2-tools-25.0.0
+DISTNAME=      gpr2-${GITHUB_TAG}
+PKGNAME=       gpr2-tools-${GITHUB_TAG}.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_PROJECT=        gpr
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+GITHUB_TAG=    25.2
 
 MAINTAINER=    dkazankov%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/AdaCore/gpr
@@ -26,6 +26,8 @@ USE_GCC_RUNTIME=      yes
 
 CHECK_PIE_SKIP+=       bin/*
 
+DEPENDS=       pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
@@ -36,24 +38,6 @@ SUBST_MESSAGE.fixparam=      Fix realpath par
 SUBST_SED.fixparam=    -e 's, --relative-to=. , ,g'
 .endif
 
-#SUBST_CLASSES+=               gprconfig
-#SUBST_MESSAGE.gprconfig=      Replace gprconfig in ${SUBST_FILES.gprconfig}
-#SUBST_STAGE.gprconfig=        pre-configure
-#SUBST_FILES.gprconfig=        tools/src/gprconfig.adb
-#SUBST_SED.gprconfig=  -e "s,\"gprconfig\",\"gpr2config\","
-
-#SUBST_CLASSES+=               gprinstall
-#SUBST_MESSAGE.gprinstall=     Replace gprinstall in ${SUBST_FILES.gprinstall}
-#SUBST_STAGE.gprinstall=       pre-configure
-#SUBST_FILES.gprinstall=       tools/src/gprinstall-main.adb
-#SUBST_SED.gprinstall= -e "s,\"gprinstall\",\"gpr2install\","
-
-#SUBST_CLASSES+=               gprls
-#SUBST_MESSAGE.gprls=  Replace gprls in ${SUBST_FILES.gprls}
-#SUBST_STAGE.gprls=    pre-configure
-#SUBST_FILES.gprls=    tools/src/gprls-main.adb
-#SUBST_SED.gprls=      -e "s,\"gprls\",\"gpr2ls\","
-
 CONFIG_SHELL=          ${MAKE_PROGRAM} -f
 CONFIGURE_SCRIPT=      ${WRKSRC}/Makefile
 CONFIGURE_ARGS=                setup
@@ -77,7 +61,6 @@ GENERATE_PLIST+= \
 .include "../../devel/ada-gnatcoll-bindings-25/buildlink3.mk"
 
 .include "../../devel/gmp/buildlink3.mk"
-USE_GNU_ICONV=         yes
 .include "../../converters/libiconv/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/gpr2-tools/distinfo
diff -u pkgsrc/devel/gpr2-tools/distinfo:1.1 pkgsrc/devel/gpr2-tools/distinfo:1.2
--- pkgsrc/devel/gpr2-tools/distinfo:1.1        Mon Jul 28 09:07:49 2025
+++ pkgsrc/devel/gpr2-tools/distinfo    Sun Oct 12 07:21:14 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2025/07/28 09:07:49 dkazankov Exp $
+$NetBSD: distinfo,v 1.2 2025/10/12 07:21:14 dkazankov Exp $
 
-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 (libgpr2-25.0.0.tar.gz) = 17755dafff06fed43397492965dc2ff70338d8ad404932d4986a1dc51622b8db
-SHA512 (libgpr2-25.0.0.tar.gz) = 2fdcb4c7038dfe852c0636510a408d7dab95ca6ec7645ed6bda65e785cc1cb32709dda0f36ce6e1bc8d10c9df8ae5433b5fd4d2c2779116ef74ab5a2508226d0
-Size (libgpr2-25.0.0.tar.gz) = 1684646 bytes
-SHA1 (patch-tools_gpr-tools.gpr) = 6ec6562171983f3039f16a5d9ce3fa7b66e5856d
+BLAKE2s (AdaCore-gprconfig_kb-25.2.tar.gz) = 549d321895fe6b915492c66e3ad82861bcbfae9de4e395d925b043643b8fb665
+SHA512 (AdaCore-gprconfig_kb-25.2.tar.gz) = be2345270a0cfe6f57d9431174f86d90a50fd6c2989047bdcd6cf20b92690443c0f7cc24f52dff292446ad0e26c23f12c1a19ee525bc03d9f29d31e73ab4554e
+Size (AdaCore-gprconfig_kb-25.2.tar.gz) = 44291 bytes
+BLAKE2s (gpr2-25.2.tar.gz) = 28c761f96b3bc0c65cd5d1ce2da027f438da2f9d8ea4e3d695820dbab9d0f375
+SHA512 (gpr2-25.2.tar.gz) = be3e2bfa28e588d64e02d8dcfa1064f0450e94a4e1129be23b793351e26e5bf98f8ab57af023821f4fccb400b9549d1c4047bbdc0dc786ea29cf03f495aba3c8
+Size (gpr2-25.2.tar.gz) = 1684620 bytes
+SHA1 (patch-tools_gpr-tools.gpr) = ddb78eeac293f9e9b44c305ab09ab76f5700b51e

Index: pkgsrc/devel/gpr2-tools/buildlink3.mk
diff -u pkgsrc/devel/gpr2-tools/buildlink3.mk:1.2 pkgsrc/devel/gpr2-tools/buildlink3.mk:1.3
--- pkgsrc/devel/gpr2-tools/buildlink3.mk:1.2   Mon Jul 28 09:15:00 2025
+++ pkgsrc/devel/gpr2-tools/buildlink3.mk       Sun Oct 12 07:21:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2025/07/28 09:15:00 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/10/12 07:21:14 dkazankov Exp $
 
 BUILDLINK_TREE+=       gpr2-tools
 
@@ -9,6 +9,26 @@ BUILDLINK_API_DEPENDS.gpr2-tools+=     gpr2-
 BUILDLINK_PKGSRCDIR.gpr2-tools?=       ../../devel/gpr2-tools
 BUILDLINK_DEPMETHOD.gpr2-tools?=       build
 
+BUILDLINK_CONTENTS_FILTER.gpr2-tools=  \
+    ${EGREP} '(bin/.*|share/gpr/manifests/.*)'
+
+BUILDLINK_FNAME_TRANSFORM.gprbuild+=   -e "s|^${BUILDLINK_DIR}/bin/gpr2|${BUILDLINK_DIR}/bin/gpr|g"
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# 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}
+
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}'$$$$ORIGIN'
+
+GPRBUILD_OPTIONS?=     -eL -R -cargs $${CFLAGS} -largs $${LDFLAGS} -gargs
+GPRINSTALL_OPTIONS?=   #empty
+BUILD_MAKE_FLAGS+=     GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
+INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}
+
 .endif
 
 BUILDLINK_TREE+=       -gpr2-tools

Index: pkgsrc/devel/gpr2-tools/patches/patch-tools_gpr-tools.gpr
diff -u pkgsrc/devel/gpr2-tools/patches/patch-tools_gpr-tools.gpr:1.1 pkgsrc/devel/gpr2-tools/patches/patch-tools_gpr-tools.gpr:1.2
--- pkgsrc/devel/gpr2-tools/patches/patch-tools_gpr-tools.gpr:1.1       Mon Jul 28 09:07:49 2025
+++ pkgsrc/devel/gpr2-tools/patches/patch-tools_gpr-tools.gpr   Sun Oct 12 07:21:14 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_gpr-tools.gpr,v 1.1 2025/07/28 09:07:49 dkazankov Exp $
+$NetBSD: patch-tools_gpr-tools.gpr,v 1.2 2025/10/12 07:21:14 dkazankov Exp $
 
 Fix name prefix usage
 
---- tools/gpr2-tools.gpr.orig  2024-10-16 13:31:33.000000000 +0300
+--- tools/gpr2-tools.gpr.orig  2025-04-22 16:25:55.000000000 +0300
 +++ tools/gpr2-tools.gpr
-@@ -43,12 +43,12 @@
+@@ -43,7 +43,7 @@
  
     package Builder extends Shared.Builder is
        for Executable ("gprbuild-main.adb")   use "gpr2build";
@@ -13,10 +13,3 @@ Fix name prefix usage
        for Executable ("gprclean-main.adb")   use "gpr2clean";
        for Executable ("gprdoc-main.adb")     use "gprdoc";
        for Executable ("gprinspect-main.adb") use "gprinspect";
--      for Executable ("gprinstall-main.adb") use "gprinstall";
--      for Executable ("gprls-main.adb")      use "gprls";
-+      for Executable ("gprinstall-main.adb") use "gpr2install";
-+      for Executable ("gprls-main.adb")      use "gpr2ls";
-       for Executable ("gprremote-main.adb")  use "gprremote";
-       for Executable ("processes_wrapper-main.adb")   use "processes-wrapper";
-    end Builder;