gprbuild: simplify, and fix download step after gcc.mk removal

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Fri Mar 8 16:48:26 2024 +0100
Changeset:	1f15b86fa82f670775b4221673d816709fd05bec

Modified Files:
	gprbuild/Makefile
Removed Files:
	gprbuild/version.mk

Log Message:
gprbuild: simplify, and fix download step after gcc.mk removal

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f15b86fa82f670775b4221673d816709fd05bec

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

diffstat:
 gprbuild/Makefile   | 33 +++++++++++++++------------------
 gprbuild/version.mk |  3 ---
 2 files changed, 15 insertions(+), 21 deletions(-)

diffs:
diff --git a/gprbuild/Makefile b/gprbuild/Makefile
index 774ebc7c67..9fdfb68a96 100644
--- a/gprbuild/Makefile
+++ b/gprbuild/Makefile
@@ -1,27 +1,20 @@
 # $NetBSD: Makefile,v 1.0 2023/12/11 11:20:00 dkazankov Exp $
 
-.include "version.mk"
-PKGNAME=gprbuild-${GPRBUILD_VERSION}
-
+DISTNAME=	gprbuild-24.0.0
 CATEGORIES=	devel
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+
 HOMEPAGE=	https://github.com/AdaCore/gprbuild
-COMMENT=	GPRbuild build system
+COMMENT=	GPRbuild build system for Ada
 LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	c ada
 
-.include "../../mk/bsd.prefs.mk"
-
-DISTNAME=	${PKGNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=	xmlada-${GPRBUILD_VERSION}${EXTRACT_SUFX}
-DISTFILES+=	gprconfig_kb-${GPRBUILD_VERSION}${EXTRACT_SUFX}
-GITHUB_TAG=	v${GPRBUILD_VERSION}
-MASTER_SITES=	${MASTER_SITE_GITHUB:=AdaCore/}
-
-SITES.xmlada-${GPRBUILD_VERSION}${EXTRACT_SUFX}=	-${MASTER_SITE_GITHUB:=AdaCore/}xmlada/archive/${GITHUB_TAG}${EXTRACT_SUFX}
-SITES.gprconfig_kb-${GPRBUILD_VERSION}${EXTRACT_SUFX}=	-${MASTER_SITE_GITHUB:=AdaCore/}gprconfig_kb/archive/${GITHUB_TAG}${EXTRACT_SUFX}
+DISTFILES+=	xmlada-${PKGVERSION_NOREV}${EXTRACT_SUFX}
+DISTFILES+=	gprconfig_kb-${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
 USE_TOOLS+=	gmake patch
 
@@ -65,9 +58,11 @@ GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 	${FIND} bin libexec share \( -type f -or -type l \) -print | ${SORT};
 
+.include "../../mk/bsd.prefs.mk"
+
 post-patch:
 	${RUN} cd ${PKGDIR} \
-	&& ${PATCH} -d ${WRKDIR}/xmlada-${GPRBUILD_VERSION} -E -p0 -F0 <files/patch-Makefile.in
+	&& ${PATCH} -d ${WRKDIR}/xmlada-${PKGVERSION_NOREV} -E -p0 -F0 <files/patch-Makefile.in
 .if ${MACHINE_PLATFORM:MNetBSD-*-*}
 	${RUN} cd ${PKGDIR} \
 	&& ${PATCH} -d ${WRKSRC} -E -p0 -F0 <files/patch-gpr_src_put_resource_usage__unix.adb
@@ -81,12 +76,12 @@ pre-configure:
 	${SHELL} ${WRKSRC}/bootstrap.sh \
 	    --prefix=${WRKDIR}/.buildlink \
 	    --srcdir=${WRKSRC} \
-	    --with-xmlada=${WRKDIR}/xmlada-${GPRBUILD_VERSION} \
-	    --with-kb=${WRKDIR}/gprconfig_kb-${GPRBUILD_VERSION}
+	    --with-xmlada=${WRKDIR}/xmlada-${PKGVERSION_NOREV} \
+	    --with-kb=${WRKDIR}/gprconfig_kb-${PKGVERSION_NOREV}
 	${RUN} ${MKDIR} ${OBJDIR}
 
 post-configure:
-	${RUN} cd ${WRKDIR}/xmlada-${GPRBUILD_VERSION} \
+	${RUN} cd ${WRKDIR}/xmlada-${PKGVERSION_NOREV} \
 	&& set -x ; env ${POSTCONFIGURE_ENV} \
 	./configure \
 	    --prefix=${WRKDIR}/.buildlink \
@@ -94,3 +89,5 @@ post-configure:
 	${MAKE_PROGRAM} all install GPROPTS='--config=${CGPRDIR}/buildlink.cgpr'
 
 .include "../../mk/bsd.pkg.mk"
+SITES.xmlada-${PKGVERSION_NOREV}${EXTRACT_SUFX}=	-${MASTER_SITE_GITHUB:=AdaCore/}xmlada/archive/${GITHUB_TAG}${EXTRACT_SUFX}
+SITES.gprconfig_kb-${PKGVERSION_NOREV}${EXTRACT_SUFX}=	-${MASTER_SITE_GITHUB:=AdaCore/}gprconfig_kb/archive/${GITHUB_TAG}${EXTRACT_SUFX}
diff --git a/gprbuild/version.mk b/gprbuild/version.mk
deleted file mode 100644
index 72d4bc3fd6..0000000000
--- a/gprbuild/version.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: version.mk,v 1.0 2023/12/11 11:45:00 dkazankov Exp $
-
-GPRBUILD_VERSION:=	24.0.0