CVS commit: pkgsrc/devel/gprbuild

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Mar 19 13:20:35 UTC 2024

Modified Files:
        pkgsrc/devel/gprbuild: Makefile distinfo
        pkgsrc/devel/gprbuild/patches: patch-gpr_gpr.gpr
Added Files:
        pkgsrc/devel/gprbuild/patches: patch-gpr_src_gpr-version.ads

Log Message:
gprbuild: fix reported version.

>From Dmytro Kazankov via wip.

Fix a pkglint warning while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gprbuild/Makefile \
    pkgsrc/devel/gprbuild/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads

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.1 pkgsrc/devel/gprbuild/Makefile:1.2
--- pkgsrc/devel/gprbuild/Makefile:1.1  Tue Mar 12 17:50:12 2024
+++ pkgsrc/devel/gprbuild/Makefile      Tue Mar 19 13:20:35 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2024/03/12 17:50:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2024/03/19 13:20:35 wiz Exp $
 
 .include "version.mk"
 
 DISTNAME=      gprbuild-${GPRBUILD_VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
Index: pkgsrc/devel/gprbuild/distinfo
diff -u pkgsrc/devel/gprbuild/distinfo:1.1 pkgsrc/devel/gprbuild/distinfo:1.2
--- pkgsrc/devel/gprbuild/distinfo:1.1  Tue Mar 12 17:50:12 2024
+++ pkgsrc/devel/gprbuild/distinfo      Tue Mar 19 13:20:35 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/03/12 17:50:12 wiz Exp $
+$NetBSD: distinfo,v 1.2 2024/03/19 13:20:35 wiz Exp $
 
 BLAKE2s (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = e39c1e70b80923db53f0e6c4687536fcbfdc951209a34dc039423f9cc31319fa
 SHA512 (AdaCore-gprconfig_kb-v24.0.0.tar.gz) = 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84
@@ -12,7 +12,8 @@ Size (gprbuild-24.0.0.tar.gz) = 959615 b
 SHA1 (patch-Makefile) = 2feb8ed77093d88d70163366206ab4e4a716614a
 SHA1 (patch-bootstrap.sh) = f314016c046426d3f2a40013a9332cf433a4196a
 SHA1 (patch-deps_xmlada_Makefile.in) = 98632303e6829b0540abeca6a5a7cd427b455adf
-SHA1 (patch-gpr_gpr.gpr) = 28c7779f044db45b1daa029833c39e9c818fa061
+SHA1 (patch-gpr_gpr.gpr) = 8304a3a14be07908792a19af65750e3f6a968721
 SHA1 (patch-gpr_src_gpr-util-put__resource__usage____netbsd.adb) = d0acc610cce5a2a24b00efa196a658cbfd0afe77
+SHA1 (patch-gpr_src_gpr-version.ads) = 9321ae482f2f36b9d5a6c96225ae3a7a5e16a7e1
 SHA1 (patch-gpr_src_gpr_imports.c) = 945eefee50b198695ade7a4b88d4f87dd50f7925
 SHA1 (patch-gprbuild.gpr) = 557472a3b1fca73e14434b8ecd614e4fdfa726be

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr
diff -u pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.1 pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.2
--- pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr:1.1 Tue Mar 12 17:50:13 2024
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_gpr.gpr     Tue Mar 19 13:20:35 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-gpr_gpr.gpr,v 1.1 2024/03/12 17:50:13 wiz Exp $
+$NetBSD: patch-gpr_gpr.gpr,v 1.2 2024/03/19 13:20:35 wiz Exp $
 
 Fix link time warning on NetBSD
 
@@ -13,4 +13,3 @@ Fix link time warning on NetBSD
 +               use "gpr-util-put_resource_usage__netbsd.adb";
        end case;
     end Naming;
-

Added files:

Index: pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads
diff -u /dev/null pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads:1.1
--- /dev/null   Tue Mar 19 13:20:35 2024
+++ pkgsrc/devel/gprbuild/patches/patch-gpr_src_gpr-version.ads Tue Mar 19 13:20:35 2024
@@ -0,0 +1,28 @@
+$NetBSD: patch-gpr_src_gpr-version.ads,v 1.1 2024/03/19 13:20:35 wiz Exp $
+
+Fix incorrect version reporting
+
+--- gpr/src/gpr-version.ads.orig       2023-10-09 21:31:11.000000000 +0300
++++ gpr/src/gpr-version.ads    2024-03-19 14:10:13.533689309 +0200
+@@ -30,17 +30,17 @@
+ 
+ package GPR.Version is
+ 
+-   Gpr_Version : constant String := "18.0w";
++   Gpr_Version : constant String := "24.0.0";
+    --  Static string identifying this version
+ 
+-   Date : constant String := "19940713";
++   Date : constant String := "20231113";
+ 
+-   Current_Year : constant String := "2016";
++   Current_Year : constant String := "2023";
+ 
+    type Gnat_Build_Type is (Gnatpro, FSF, GPL);
+    --  See Get_Gnat_Build_Type below for the meaning of these values
+ 
+-   Build_Type : constant Gnat_Build_Type := Gnatpro;
++   Build_Type : constant Gnat_Build_Type := FSF;
+    --  Kind of GNAT Build:
+    --
+    --    FSF