lang/gnat12: remove programs suffix

Since GNAT is now installed in a specific prefix, we can simplify by
removing the programs suffix: this will avoid the usage of binary
aliases, only setting the PATH is necessary.

4 files changed, 44 insertions, 53 deletions

diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index cadd45051c5e..f380112428dd 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -39,12 +39,9 @@ CC=		ada
 .  else
 _ADAPATH=	${LOCALBASE}/gnat${_ada_version}/bin
 _ADAPORT=	lang/gnat${_ada_version}
-_BINDEP=	${_ADAPATH}/gnat${_ada_version}
-CC=		gnatmake${_ada_version} -f -u
-BINARY_ALIAS+=	gcc=${_ADAPATH}/gcc12	\
-		ada=${_ADAPATH}/gcc12	\
-		gnatmake=${_ADAPATH}/gnatmake${_ada_version}	\
-		gnatbind=${_ADAPATH}/gnatbind${_ada_version}
+_BINDEP=	${_ADAPATH}/gnat
+CC=		gnatmake -f -u
+BINARY_ALIAS+=	ada=${_ADAPATH}/gcc
 .  endif
 
 .  if ${ada_ARGS:Mrun}
diff --git a/lang/gnat12/Makefile b/lang/gnat12/Makefile
index d46de74ea23f..bf8ddc51fa73 100644
--- a/lang/gnat12/Makefile
+++ b/lang/gnat12/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnat12
 PORTVERSION=	12.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}:gcc	\
 		LOCAL/thierry:gnat
@@ -59,7 +59,6 @@ CONFIGURE_ARGS=	--enable-languages="c,ada"	\
 		--enable-gnu-indirect-function	\
 		--with-as=${LOCALBASE}/bin/as	\
 		--with-ld=${LOCALBASE}/bin/ld	\
-		--program-suffix=${GCCVER}	\
 		--enable-threads=posix	\
 		--disable-libquadmath	\
 		--enable-host-shared	\
@@ -87,7 +86,7 @@ REVFILE=	${WRKSRC}/gcc/REVISION
 PHASEFILE=	${WRKSRC}/gcc/DEV-PHASE
 ASSET_FILE=	gnat-${GARCH}-${OPSYS:tl}.${OSREL:R}-${PKGVERSION}
 PREV_ASSET_VER?=	${PORTVERSION}
-PREV_ASSET_REV?=	_1
+PREV_ASSET_REV?=	_2
 PREV_ASSET_GCC=	${PREV_ASSET_VER:R:R}
 PREV_ASSET_OSREL?=	${OSREL:R}
 PREV_ASSET_FILE=gnat-${GARCH}-${OPSYS:tl}.${PREV_ASSET_OSREL}-${PREV_ASSET_VER}${PREV_ASSET_REV}
@@ -102,11 +101,6 @@ pre-configure:
 	${ECHO} "-=> GNAT ${OS_LABEL4VERS}" > ${REVFILE}
 	${ECHO} "release" > ${PHASEFILE}
 
-pre-configure-PREVASSET-on:
-	cd ${PATHAUX} ; for f in *${PREV_ASSET_GCC} ; do	\
-	${LN} -sf $${f} $${f%${PREV_ASSET_GCC}} ;			\
-	done
-
 post-install-ASSETS-on:
 	${MKDIR} ${WRKDIR}/${ASSET_FILE} ${STAGEDIR}${DATADIR}/assets
 	${CP} -Rp ${STAGEDIR}${PKG_PREFIX}/* ${WRKDIR}/${ASSET_FILE}
diff --git a/lang/gnat12/distinfo b/lang/gnat12/distinfo
index 0623f155c892..6a96545f1105 100644
--- a/lang/gnat12/distinfo
+++ b/lang/gnat12/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1670953881
+TIMESTAMP = 1671106162
 SHA256 (gcc-12.2.0.tar.xz) = e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
 SIZE (gcc-12.2.0.tar.xz) = 84645292
-SHA256 (gnat-x86_64-freebsd.13-12.2.0_1.tar.xz) = e6f8f35902e2587c8da152023d7117fefcbcefbe1a2b6557f1bd96b2a7a69b76
-SIZE (gnat-x86_64-freebsd.13-12.2.0_1.tar.xz) = 90112804
-SHA256 (gnat-x86_64-freebsd.14-12.2.0_1.tar.xz) = 23ffc2ac732d81d389fb650d2dbb1e2115e4fb839cceb41e628ad77f5b0ede49
-SIZE (gnat-x86_64-freebsd.14-12.2.0_1.tar.xz) = 89051200
+SHA256 (gnat-x86_64-freebsd.13-12.2.0_2.tar.xz) = 4b476ac56bc6c044d411d4fe0ebebe0059fc4021158f7191c5f8685d344d2d0a
+SIZE (gnat-x86_64-freebsd.13-12.2.0_2.tar.xz) = 89935208
+SHA256 (gnat-x86_64-freebsd.14-12.2.0_2.tar.xz) = 882c8463bc5c6b685df9bc95b85dd4f1e006fe280b13a4ff39d8a9fd7315e56b
+SIZE (gnat-x86_64-freebsd.14-12.2.0_2.tar.xz) = 89050524
diff --git a/lang/gnat12/pkg-plist b/lang/gnat12/pkg-plist
index 63bc3f168b2b..c18e202a5523 100644
--- a/lang/gnat12/pkg-plist
+++ b/lang/gnat12/pkg-plist
@@ -1,31 +1,31 @@
-gnat12/bin/c++12
-gnat12/bin/cpp12
-gnat12/bin/g++12
-gnat12/bin/gcc-ar12
-gnat12/bin/gcc-nm12
-gnat12/bin/gcc-ranlib12
-gnat12/bin/gcc12
-gnat12/bin/gcov-dump12
-gnat12/bin/gcov-tool12
-gnat12/bin/gcov12
-gnat12/bin/gnat12
-gnat12/bin/gnatbind12
-gnat12/bin/gnatchop12
-gnat12/bin/gnatclean12
-gnat12/bin/gnatkr12
-gnat12/bin/gnatlink12
-gnat12/bin/gnatls12
-gnat12/bin/gnatmake12
-gnat12/bin/gnatname12
-gnat12/bin/gnatprep12
-gnat12/bin/lto-dump12
-gnat12/bin/%%CONFTRGT%%-c++12
-gnat12/bin/%%CONFTRGT%%-g++12
+gnat12/bin/c++
+gnat12/bin/cpp
+gnat12/bin/g++
+gnat12/bin/gcc-ar
+gnat12/bin/gcc-nm
+gnat12/bin/gcc-ranlib
+gnat12/bin/gcc
+gnat12/bin/gcov-dump
+gnat12/bin/gcov-tool
+gnat12/bin/gcov
+gnat12/bin/gnat
+gnat12/bin/gnatbind
+gnat12/bin/gnatchop
+gnat12/bin/gnatclean
+gnat12/bin/gnatkr
+gnat12/bin/gnatlink
+gnat12/bin/gnatls
+gnat12/bin/gnatmake
+gnat12/bin/gnatname
+gnat12/bin/gnatprep
+gnat12/bin/lto-dump
+gnat12/bin/%%CONFTRGT%%-c++
+gnat12/bin/%%CONFTRGT%%-g++
 gnat12/bin/%%CONFTRGT%%-gcc-%%VER%%
-gnat12/bin/%%CONFTRGT%%-gcc-ar12
-gnat12/bin/%%CONFTRGT%%-gcc-nm12
-gnat12/bin/%%CONFTRGT%%-gcc-ranlib12
-gnat12/bin/%%CONFTRGT%%-gcc12
+gnat12/bin/%%CONFTRGT%%-gcc-ar
+gnat12/bin/%%CONFTRGT%%-gcc-nm
+gnat12/bin/%%CONFTRGT%%-gcc-ranlib
+gnat12/bin/%%CONFTRGT%%-gcc
 gnat12/include/c++/%%VER%%/algorithm
 gnat12/include/c++/%%VER%%/any
 gnat12/include/c++/%%VER%%/array
@@ -6398,13 +6398,13 @@ gnat12/share/locale/zh_CN/LC_MESSAGES/cpplib.mo
 gnat12/share/locale/zh_CN/LC_MESSAGES/gcc.mo
 gnat12/share/locale/zh_TW/LC_MESSAGES/cpplib.mo
 gnat12/share/locale/zh_TW/LC_MESSAGES/gcc.mo
-gnat12/man/man1/cpp12.1.gz
-gnat12/man/man1/g++12.1.gz
-gnat12/man/man1/gcc12.1.gz
-gnat12/man/man1/gcov-dump12.1.gz
-gnat12/man/man1/gcov-tool12.1.gz
-gnat12/man/man1/gcov12.1.gz
-gnat12/man/man1/lto-dump12.1.gz
+gnat12/man/man1/cpp.1.gz
+gnat12/man/man1/g++.1.gz
+gnat12/man/man1/gcc.1.gz
+gnat12/man/man1/gcov-dump.1.gz
+gnat12/man/man1/gcov-tool.1.gz
+gnat12/man/man1/gcov.1.gz
+gnat12/man/man1/lto-dump.1.gz
 gnat12/man/man7/fsf-funding.7.gz
 gnat12/man/man7/gfdl.7.gz
 gnat12/man/man7/gpl.7.gz