git: 7d359e6b779d - main - lang/gnat12: bootstrap from previous assets by default

The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7d359e6b779d96d82f383e3aeee8259057b16df0

commit 7d359e6b779d96d82f383e3aeee8259057b16df0
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-12-13 21:41:20 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2023-12-13 21:48:38 +0000

    lang/gnat12: bootstrap from previous assets by default
    
    All assets have been built, and it is now possible to bootstrap without
    lang/gcc6-aux!
    
    But the option GCC6AUX it not removed, just in case, if for some reason
    we had to rebuild everything from the beginning.
    
    Do not bump PORTREVISION: the resulting package should not be impacted.
---
 lang/gnat12/Makefile |  9 ++-------
 lang/gnat12/distinfo | 16 +++-------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index 967629108a00..c9ba667e6438 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -63,7 +63,7 @@ OPTIONS_DEFINE_powerpc64+=	MULTILIB
 .endif
 OPTIONS_RADIO=			BOOTSTRAP
 OPTIONS_RADIO_BOOTSTRAP=	GCC6AUX PREVASSET
-OPTIONS_DEFAULT=		GCC6AUX
+OPTIONS_DEFAULT=		PREVASSET
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=		ASSETS
 .endif
@@ -105,18 +105,13 @@ _PREV_ASSET_FILE=	gnat-${_GNAT_ARCH}-${OPSYS:tl}.${_PREV_ASSET_OSREL}-${_PREV_AS
 _PREV_ASSET_GCC=	${PREV_ASSET_VER:R:R}
 _PREV_ASSET_OSREL?=	${OSREL:R}
 _PREV_ASSET_VER?=	${DISTVERSION}
+_PREV_ASSET_REV?=	_6
 _REV_FILE=		${WRKSRC}/gcc/REVISION
 _TARGLIB=		${_PKG_PREFIX}/lib ${_PKG_PREFIX}/lib/gcc${_GCC_VER}
 _TOOLCHAIN_PATHS=	/sbin:/bin:/usr/sbin:/usr/bin:${_GCC6AUX_PATH}:${PREFIX}/bin:${LOCALBASE}/bin
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == aarch64 && ${OSREL:R} == 15
-_PREV_ASSET_REV?=	_5
-.else
-_PREV_ASSET_REV?=	_6
-.endif
-
 .if ${ARCH} == i386 || ${ARCH} == aarch64
 LIB_DIR_32=	""
 PLIST_SUB+=	64BITS="@comment "
diff --git a/lang/gnat12/distinfo b/lang/gnat12/distinfo
index d6b5f5da61b2..b470bb956198 100644
--- a/lang/gnat12/distinfo
+++ b/lang/gnat12/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1701193442
+TIMESTAMP = 1702501263
 SHA256 (gcc-12.2.0.tar.xz) = e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 SIZE (gcc-12.2.0.tar.xz) = 84645292
 SHA256 (gnat-aarch64-freebsd.12-12.2.0_6.tar.xz) = 7b82c7589272101597e0a8c220241225a3811afbc224d63e8deaf390265da54f
@@ -7,8 +7,8 @@ SHA256 (gnat-aarch64-freebsd.13-12.2.0_6.tar.xz) = 5632d44659109b4487ac4f9658fab
 SIZE (gnat-aarch64-freebsd.13-12.2.0_6.tar.xz) = 63359820
 SHA256 (gnat-aarch64-freebsd.14-12.2.0_6.tar.xz) = 9de5e4959af90cea8ddcb3e3bea3d1e9146235abbca28cb1e662c9368e9596db
 SIZE (gnat-aarch64-freebsd.14-12.2.0_6.tar.xz) = 63563568
-SHA256 (gnat-aarch64-freebsd.15-12.2.0_5.tar.xz) = 0a7e0f5d4972a54a869e4b278c40da9bcd65221a36b0c4c101b62b68088caf2e
-SIZE (gnat-aarch64-freebsd.15-12.2.0_5.tar.xz) = 63250072
+SHA256 (gnat-aarch64-freebsd.15-12.2.0_6.tar.xz) = 413cf6b63522c59600afb5ff75914aac113b90ce45537f28ac6586f100e2e094
+SIZE (gnat-aarch64-freebsd.15-12.2.0_6.tar.xz) = 63557180
 SHA256 (gnat-i386-freebsd.12-12.2.0_6.tar.xz) = 7fed6b6fb2d8f7de4b5a226a0a1f48d37fd1bc4c747260caac8b161bf7c999ca
 SIZE (gnat-i386-freebsd.12-12.2.0_6.tar.xz) = 77422396
 SHA256 (gnat-i386-freebsd.13-12.2.0_6.tar.xz) = 44b971d7cff0661d9858c343327f2920775b30136202d2307cb1e26cb9e2d3b2
@@ -25,13 +25,3 @@ SHA256 (gnat-x86_64-freebsd.14-12.2.0_6.tar.xz) = a02e07d8e00caf3975549cac6b86b0
 SIZE (gnat-x86_64-freebsd.14-12.2.0_6.tar.xz) = 90319148
 SHA256 (gnat-x86_64-freebsd.15-12.2.0_6.tar.xz) = a486e0257eadcc1f90770df06d849978d070551b929f347e906030632374f6a2
 SIZE (gnat-x86_64-freebsd.15-12.2.0_6.tar.xz) = 90213972
-SHA256 (gnat-aarch64-freebsd.13-12.2.0_6.tar.xz) = 5632d44659109b4487ac4f9658fab83eb88ceb1bef2e2171c8fc6426475154ec
-SIZE (gnat-aarch64-freebsd.13-12.2.0_6.tar.xz) = 63359820
-SHA256 (gnat-aarch64-freebsd.14-12.2.0_6.tar.xz) = 9de5e4959af90cea8ddcb3e3bea3d1e9146235abbca28cb1e662c9368e9596db
-SIZE (gnat-aarch64-freebsd.14-12.2.0_6.tar.xz) = 63563568
-SHA256 (gnat-i386-freebsd.14-12.2.0_6.tar.xz) = c5dd57060e2fa39112e2fa2a544c4c9a2646860bf4e77273362e9c2ec38ff455
-SIZE (gnat-i386-freebsd.14-12.2.0_6.tar.xz) = 77319804
-SHA256 (gnat-x86_64-freebsd.12-12.2.0_6.tar.xz) = 56cf46d15cb8861b376b54fa1ca4c5c6582dab75b445f7574e6560630e8b9743
-SIZE (gnat-x86_64-freebsd.12-12.2.0_6.tar.xz) = 90367400
-SHA256 (gnat-x86_64-freebsd.14-12.2.0_6.tar.xz) = a02e07d8e00caf3975549cac6b86b08736b1d8d8eed1e0e385fe1752841d9757
-SIZE (gnat-x86_64-freebsd.14-12.2.0_6.tar.xz) = 90319148