CVS commit: pkgsrc/devel/gprbuild

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/gprbuild
From: "Dmytro Kazankov" <dkazankov%netbsd.org@localhost>
Date: Thu, 9 Oct 2025 15:46:44 +0000

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Thu Oct  9 15:46:43 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_imports.c patch-gprbuild.gpr
Added Files:
        pkgsrc/devel/gprbuild: ALTERNATIVES
Removed Files:
        pkgsrc/devel/gprbuild/patches: patch-deps_xmlada_Makefile.in
            patch-gpr_src_gpr-util-put__resource__usage____unix.adb
            patch-gpr_src_gpr-version.ads

Log Message:
gprbuild: update to upstream version 25.2

* Update to upstream bugfix version
* Use xmlada as inplace package rather than github module
* Unify with ada-libgpr-25
* Use pkg_alternatives to comply with gpr2-tools
* Some pkglinting


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

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.6 pkgsrc/devel/gprbuild/Makefile:1.7
--- pkgsrc/devel/gprbuild/Makefile:1.6  Sun Feb 16 10:11:48 2025
+++ pkgsrc/devel/gprbuild/Makefile      Thu Oct  9 15:46:43 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2025/02/16 10:11:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2025/10/09 15:46:43 dkazankov Exp $
 
-DISTNAME=      gprbuild-25.0.0
-PKGREVISION=   1
+DISTNAME=      gprbuild-${GITHUB_TAG}
+PKGNAME=       ${DISTNAME}.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+GITHUB_TAG=    25.2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/AdaCore/gprbuild
@@ -13,7 +13,6 @@ LICENSE=      gnu-gpl-v3
 
 USE_LANGUAGES= c ada
 
-GITHUB_SUBMODULES+=    AdaCore xmlada  ${GITHUB_TAG}   deps/xmlada
 GITHUB_SUBMODULES+=    AdaCore gprconfig_kb    ${GITHUB_TAG}   deps/gprconfig_kb
 
 USE_TOOLS+=    gmake
@@ -23,18 +22,42 @@ RELRO_SUPPORTED=    no
 
 HAS_CONFIGURE= yes
 
-GCC_REQD+=     13
+DEPENDS=       pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
+
+.include "../../mk/bsd.prefs.mk"
+
+GCC_REQD+=     14
+
+SUBST_CLASSES+=                version
+SUBST_MESSAGE.version= Replace version,date and type in ${SUBST_FILES.version}
+SUBST_STAGE.version=   post-extract
+SUBST_FILES.version=   gpr/src/gpr-version.ads
+SUBST_SED.version=     -e "s,18.0w,${GITHUB_TAG}w,"
+SUBST_SED.version+=    -e "s,19940713,20250225,"
+SUBST_SED.version+=    -e "s,\"2016\",\"2025\","
+SUBST_SED.version+=    -e "s,= Gnatpro;,= FSF;,"
+
+# Use C preprocessed symbols on NetBSD
+.if ${OPSYS} == "NetBSD"
+SUBST_CLASSES+=                        getrusage
+SUBST_MESSAGE.getrusage=       Replace getrusage with __netbsd_getrusage in ${SUBST_FILES.getrusage}
+SUBST_STAGE.getrusage=         post-extract
+SUBST_FILES.getrusage=         gpr/src/gpr-util-put_resource_usage__unix.adb
+SUBST_SED.getrusage=           -e "s,with Import\, Convention => C;,with Import\, Convention => C\, External_Name => \"__netbsd_getrusage\";,"
+.endif
 
 OBJDIR=                ${WRKDIR}/build
 BOOTSTRAPDIR=  ${WRKDIR}/bootstrap
 
 GPR_PROJECT_PATH=      ${WRKDIR}/.buildlink/share/gpr
+GPRBUILD_OPTIONS=      -aP ${GPR_PROJECT_PATH:Q}
+GPRINSTALL_OPTIONS=    -aP ${GPR_PROJECT_PATH:Q}
 
 # environment for bootstrap build
 PREBUILD_ENV=  ${CONFIGURE_ENV}
-PREBUILD_ENV+= CC=${CC}
+PREBUILD_ENV+= CC=${CC:Q}
 PREBUILD_ENV+= CFLAGS=${CFLAGS:M:Q}
-PREBUILD_ENV+= GNATMAKE=${GMKPATH}
+PREBUILD_ENV+= GNATMAKE=${GMKPATH:Q}
 
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIG_SHELL=          ${MAKE_PROGRAM} -f
@@ -44,32 +67,23 @@ CONFIGURE_ARGS+=    prefix=${DESTDIR}${PREF
 
 BUILD_DIRS=            ${OBJDIR}
 MAKE_FILE=             ${WRKSRC}/Makefile
-BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS='-aP ${GPR_PROJECT_PATH}'
+BUILD_MAKE_FLAGS=      GPRBUILD_OPTIONS=${GPRBUILD_OPTIONS:Q}
 
 INSTALL_DIRS=          ${OBJDIR}
-INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS='-aP ${GPR_PROJECT_PATH}'
-
-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,25.0w,g'
+INSTALL_MAKE_FLAGS+=   GPRINSTALL_OPTIONS=${GPRINSTALL_OPTIONS:Q}
 
 GENERATE_PLIST+= \
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} bin libexec share \( -type f -or -type l \) -print | ${SORT};
 
-.include "../../mk/bsd.prefs.mk"
-
-post-extract:
-       ${RUN} ${MKDIR} ${OBJDIR}
-
 pre-configure:
+       ${MV} ${WRKSRC}/xmlada ${WRKSRC}/deps/
 # Bootstrap build. Moved here because configure script of gprbuild uses gprbuild itself.
-       ${RUN} ${MKDIR} ${BOOTSTRAPDIR}
-       ${RUN} cd ${BOOTSTRAPDIR} \
-       && set -x ; env ${PREBUILD_ENV} \
-       ${SHELL} ${WRKSRC}/bootstrap.sh \
+       ${RUN} ${MKDIR} ${OBJDIR} && \
+       ${MKDIR} ${BOOTSTRAPDIR} && \
+       cd ${BOOTSTRAPDIR} && \
+       ${PKGSRC_SETENV} ${PREBUILD_ENV} \
+       ${SH} ${WRKSRC}/bootstrap.sh \
            --prefix=${WRKDIR}/.buildlink \
            --srcdir=${WRKSRC} \
            --with-xmlada=${WRKSRC}/deps/xmlada \
@@ -77,13 +91,18 @@ pre-configure:
 
 pre-build:
 # Xmlada's configure uses gprbuild. So we configure it here.
-       ${RUN} cd ${WRKSRC}/deps/xmlada \
-       && set -x ; env ${CONFIGURE_ENV} \
+       ${RUN} cd ${WRKSRC}/deps/xmlada && \
+       ${PKGSRC_SETENV} ${CONFIGURE_ENV} \
        ./configure \
            --prefix=${WRKDIR}/.buildlink
 # Build xmlada with bootstrapped gprbuild. It then will be used in normal build.
-       ${RUN} cd ${WRKSRC}/deps/xmlada \
-       && set -x ; env ${MAKE_ENV} \
-       ${MAKE_PROGRAM} static-pic install-static-pic
+       ${RUN} cd ${WRKSRC}/deps/xmlada && \
+       ${PKGSRC_SETENV} ${MAKE_ENV} \
+       ${MAKE_PROGRAM} static install-static
+
+post-install:
+       ${RM} ${DESTDIR}${PREFIX}/share/gprconfig/linker.xml.orig
+
+.include "../../textproc/ada-xmlada-25/inplace.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gprbuild/PLIST
diff -u pkgsrc/devel/gprbuild/PLIST:1.2 pkgsrc/devel/gprbuild/PLIST:1.3
--- pkgsrc/devel/gprbuild/PLIST:1.2     Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/PLIST Thu Oct  9 15:46:43 2025
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2025/02/08 14:14:49 wiz Exp $
-bin/gprbuild
-bin/gprclean
-bin/gprconfig
+@comment $NetBSD: PLIST,v 1.3 2025/10/09 15:46:43 dkazankov Exp $
+bin/gpr1build
+bin/gpr1clean
+bin/gpr1config
 bin/gprinstall
 bin/gprls
 bin/gprname

Index: pkgsrc/devel/gprbuild/buildlink3.mk
diff -u pkgsrc/devel/gprbuild/buildlink3.mk:1.7 pkgsrc/devel/gprbuild/buildlink3.mk:1.8
--- pkgsrc/devel/gprbuild/buildlink3.mk:1.7     Sun Jul 27 19:11:18 2025
+++ pkgsrc/devel/gprbuild/buildlink3.mk Thu Oct  9 15:46:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2025/07/27 19:11:18 dkazankov Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2025/10/09 15:46:43 dkazankov Exp $
 
 BUILDLINK_TREE+=       gprbuild
 
@@ -9,14 +9,10 @@ BUILDLINK_API_DEPENDS.gprbuild+=      gprbuil
 BUILDLINK_PKGSRCDIR.gprbuild?=         ../../devel/gprbuild
 BUILDLINK_DEPMETHOD.gprbuild?=         build
 
-# GPRbuild does similar things in its own way
-BUILDLINK_AUTO_VARS.gprbuild=  no
-BUILDLINK_AUTO_DIRS.gprbuild=  no
-
 BUILDLINK_CONTENTS_FILTER.gprbuild=    \
        ${EGREP} '(bin/gpr.*|libexec/gprbuild/gpr.*|share/gpr/.*\.gpr$$|share/gpr/manifests/.*|share/gprconfig/.*)'
 
-TARGET_LIBDIR.gprbuild=        ${PREFIX}/lib
+.include "../../mk/bsd.fast.prefs.mk"
 
 # Buildlinked libraries search path
 GPR_PROJECT_PATH?=     ${BUILDLINK_DIR}/share/gpr

Index: pkgsrc/devel/gprbuild/distinfo
diff -u pkgsrc/devel/gprbuild/distinfo:1.5 pkgsrc/devel/gprbuild/distinfo:1.6
--- pkgsrc/devel/gprbuild/distinfo:1.5  Sun Feb 16 10:11:48 2025
+++ pkgsrc/devel/gprbuild/distinfo      Thu Oct  9 15:46:43 2025
@@ -1,20 +1,14 @@
-$NetBSD: distinfo,v 1.5 2025/02/16 10:11:48 wiz Exp $
+$NetBSD: distinfo,v 1.6 2025/10/09 15:46:43 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 (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) = 62aaca338e57df5c6ae5f008df078b991e9ebfdd
-SHA1 (patch-bootstrap.sh) = 0f8fa38605225385975291a4d62d22a77762813f
+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 (gprbuild-25.2.tar.gz) = 677bddddb79366bc959bb4cf54eceba646880a7e946bf9b1f23f04d3a9d98379
+SHA512 (gprbuild-25.2.tar.gz) = 0d7d161392d00592b06ab8a2af21b610f60897d90aee2a3c51f001de0f1f9c338ef4059a3c20b99cd29a0587f8ba1a8e652f1b593f1d3033d9b7795a9f4a9aaa
+Size (gprbuild-25.2.tar.gz) = 940851 bytes
+SHA1 (patch-Makefile) = b64390f5a5b9821628223e423d8dcead28a0600a
+SHA1 (patch-bootstrap.sh) = 49a80b50cb32245527e09c6859ad829cd2266445
 SHA1 (patch-deps_gprconfig__kb_db_linker.xml) = 6fdc8e78ba3651eae37a132fff8e53ad988b2a71
-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) = 40deea3a0eb6cf6a3fda3ed8ed898d4daabe0423
-SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
-SHA1 (patch-gprbuild.gpr) = e943f95bd4681e3cfde3e1782e9ec2efd9cdf181
+SHA1 (patch-gpr_gpr.gpr) = b18713da0795ebefd241414e5e9171ecfa9b79db
+SHA1 (patch-gpr_src_gpr_imports.c) = 1b72dd42355c7f7189d4a4a8a7bcf7153f206731
+SHA1 (patch-gprbuild.gpr) = 2940dc5235ddebdf8e2a486ef81cb38af7d001c9

Index: pkgsrc/devel/gprbuild/gprbuild.mk
diff -u pkgsrc/devel/gprbuild/gprbuild.mk:1.3 pkgsrc/devel/gprbuild/gprbuild.mk:1.4
--- pkgsrc/devel/gprbuild/gprbuild.mk:1.3       Sun Feb  9 13:33:26 2025
+++ pkgsrc/devel/gprbuild/gprbuild.mk   Thu Oct  9 15:46:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gprbuild.mk,v 1.3 2025/02/09 13:33:26 wiz Exp $
+# $NetBSD: gprbuild.mk,v 1.4 2025/10/09 15:46:43 dkazankov Exp $
 #
 # This Makefile fragment supports building using the GPRbuild tool.
 #
@@ -32,8 +32,13 @@
 #      Directories relative in which to run the 'install' step.
 #      Default: WRKSRC
 
+.include "../../mk/bsd.fast.prefs.mk"
+
 .include "../../devel/gprbuild/buildlink3.mk"
 
+GPRBUILD_OPTIONS?=     #empty
+GPRINSTALL_OPTIONS?=   #empty
+
 GPRBUILD_PROJECT_FILE?=        ${MAKE_FILE}
 GPRBUILD_ENV?=         ${MAKE_ENV}
 GPRINSTALL_ENV?=       ${INSTALL_ENV}

Index: pkgsrc/devel/gprbuild/patches/patch-Makefile
diff -u pkgsrc/devel/gprbuild/patches/patch-Makefile:1.4 pkgsrc/devel/gprbuild/patches/patch-Makefile:1.5
--- pkgsrc/devel/gprbuild/patches/patch-Makefile:1.4    Sun Feb 16 10:11:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-Makefile        Thu Oct  9 15:46:43 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.4 2025/02/16 10:11:49 wiz Exp $
+$NetBSD: patch-Makefile,v 1.5 2025/10/09 15:46:43 dkazankov Exp $
 
 Make it possible to set install parameters
 Fix install parameters
 Fix ENABLE_SHARED position
 
---- Makefile.orig      2024-10-07 15:45:16.000000000 +0300
+--- Makefile.orig      2025-02-25 14:35:21.000000000 +0200
 +++ Makefile
 @@ -34,9 +34,6 @@
  SOURCE_DIR    := $(shell dirname "$(MAKEFILE_LIST)")
@@ -30,7 +30,7 @@ Fix ENABLE_SHARED position
  INSTALLER=$(LIB_INSTALLER)
  EXEC_INSTALLER=$(INSTALLER) -XBUILD=${BUILD}
  
-@@ -61,32 +65,29 @@
+@@ -61,9 +65,6 @@
  MAKEPREFIX=$(SOURCE_DIR)/
  endif
  
@@ -40,9 +40,7 @@ Fix ENABLE_SHARED position
  ifeq ($(ENABLE_SHARED), yes)
     LIBGPR_TYPES=static shared static-pic
  else
--   LIBGPR_TYPES=static
-+   LIBGPR_TYPES=static static-pic
- endif
+@@ -72,13 +73,13 @@
  
  # Make sure Windows's "OS" environment variable does not cause
  # confusion for cross-Linux builds.
@@ -58,8 +56,7 @@ Fix ENABLE_SHARED position
  CLEANER=gprclean -q $(RBD)
  
  GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \
--      -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
-+      -XLIBRARY_TYPE=static-pic -XXMLADA_BUILD=static-pic
+@@ -86,7 +87,7 @@
  LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) $(LIBGPR_OS)
  LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) $(LIBGPR_OS) -XBUILD=${BUILD} \
        --install-name=gpr \
Index: pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.4 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.5
--- pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.4 Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr     Thu Oct  9 15:46:43 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-gpr_gpr.gpr,v 1.4 2025/02/08 14:14:49 wiz Exp $
+$NetBSD: patch-gpr_gpr.gpr,v 1.5 2025/10/09 15:46:43 dkazankov Exp $
 
 Fix name conflict with grpc - same as linux distros
 
 --- gpr/gpr.gpr.orig   2023-10-09 21:31:11.000000000 +0300
-+++ gpr/gpr.gpr        2024-05-07 16:34:34.759672549 +0300
++++ gpr/gpr.gpr
 @@ -38,7 +38,7 @@
  
     for Source_Dirs use ("src");

Index: pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh
diff -u pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.3 pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.4
--- pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh:1.3        Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-bootstrap.sh    Thu Oct  9 15:46:43 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-bootstrap.sh,v 1.3 2025/02/08 14:14:49 wiz Exp $
+$NetBSD: patch-bootstrap.sh,v 1.4 2025/10/09 15:46:43 dkazankov Exp $
 
 Fix out-of-tree bootstrap build
 
 --- bootstrap.sh.orig  2023-10-09 21:31:11.000000000 +0300
-+++ bootstrap.sh       2024-08-09 10:47:46.065852328 +0300
++++ bootstrap.sh
 @@ -90,13 +90,13 @@
  UName=`uname | cut -b -5`
  PutUsage=gpr/src/gpr-util-put_resource_usage
Index: pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.3 pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.4
--- pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr:1.3        Sat Feb  8 14:14:49 2025
+++ pkgsrc/devel/gprbuild/patches/patch-gprbuild.gpr    Thu Oct  9 15:46:43 2025
@@ -1,9 +1,23 @@
-$NetBSD: patch-gprbuild.gpr,v 1.3 2025/02/08 14:14:49 wiz Exp $
+$NetBSD: patch-gprbuild.gpr,v 1.4 2025/10/09 15:46:43 dkazankov Exp $
 
+Rename executables to prevent conflict with gpr2-tools
 Remove redundant file from install list
 
---- gprbuild.gpr.orig  2023-10-09 21:31:11.000000000 +0300
-+++ gprbuild.gpr       2024-05-07 15:26:53.971304204 +0300
+--- gprbuild.gpr.orig  2025-02-25 14:35:21.000000000 +0200
++++ gprbuild.gpr
+@@ -66,9 +66,9 @@
+    -------------
+ 
+    package Builder is
+-      for Executable ("gprconfig-main.adb")  use "gprconfig";
+-      for Executable ("gprbuild-main.adb")   use "gprbuild";
+-      for Executable ("gprclean-main.adb")   use "gprclean";
++      for Executable ("gprconfig-main.adb")  use "gpr1config";
++      for Executable ("gprbuild-main.adb")   use "gpr1build";
++      for Executable ("gprclean-main.adb")   use "gpr1clean";
+       for Executable ("gprinstall-main.adb") use "gprinstall";
+       for Executable ("gprls-main.adb")      use "gprls";
+       for Executable ("gprname-main.adb")    use "gprname";
 @@ -165,7 +165,7 @@
                 when "Windows_NT" =>
                    for Artifacts ("bin") use ("src/gprinstall.exe.manifest");

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr_imports.c
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr_imports.c:1.1 pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr_imports.c:1.2
--- pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr_imports.c:1.1       Tue Mar 12 17:50:13 2024
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr_imports.c   Thu Oct  9 15:46:43 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-gpr_src_gpr_imports.c,v 1.1 2024/03/12 17:50:13 wiz Exp $
+$NetBSD: patch-gpr_src_gpr_imports.c,v 1.2 2025/10/09 15:46:43 dkazankov Exp $
 
 Add support for NetBSD (same as for FreeBSD) and fix getrusage() warning at linking stage
 
 --- gpr/src/gpr_imports.c.orig 2023-10-09 21:31:11.000000000 +0300
-+++ gpr/src/gpr_imports.c      2023-12-21 19:52:58.220771312 +0200
++++ gpr/src/gpr_imports.c
 @@ -64,6 +64,15 @@
  char __gnat_shared_libgcc_default = STATIC;
  const char *__gnat_default_libgcc_subdir = "lib";

Added files:

Index: pkgsrc/devel/gprbuild/ALTERNATIVES
diff -u /dev/null pkgsrc/devel/gprbuild/ALTERNATIVES:1.1
--- /dev/null   Thu Oct  9 15:46:43 2025
+++ pkgsrc/devel/gprbuild/ALTERNATIVES  Thu Oct  9 15:46:43 2025
@@ -0,0 +1,3 @@
+bin/gprbuild @PREFIX@/bin/gpr1build
+bin/gprclean @PREFIX@/bin/gpr1clean
+bin/gprconfig @PREFIX@/bin/gpr1config

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index