Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jun 2024 13:21:43 GMT
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8769afe94a68 - main - graphics/mesa: Only use MESAVERSION
Message-ID:  <202406191321.45JDLhkk065924@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8769afe94a68c307baea90b54825cf352c236337

commit 8769afe94a68c307baea90b54825cf352c236337
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2024-06-19 07:49:49 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-06-19 13:21:00 +0000

    graphics/mesa: Only use MESAVERSION
    
    We don't deal with -rc or such here so no need for a lot of variable to
    just specify one simple version.
    
    While here drop the MASTER_SITE that do not work and the ftp ones.
    
    No functional changes intended.
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 graphics/mesa-dri/Makefile.common | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index a8fef07ebacb..201d01e69fa8 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -9,19 +9,11 @@
 #    - graphics/mesa-libs
 #    - lang/clover
 
-MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
-MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
+MESAVERSION=	24.0.9
 
-MESABASEVERSION=	24.0.9
-# if there is a subversion, don't include the '-' between 7.11-rc2.
-MESASUBVERSION=
+MASTER_SITES=	https://mesa.freedesktop.org/archive/
 
-MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
-		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
-		ftp://ftp.freedesktop.org/pub/mesa/ \
-		ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
-
-DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
+DISTFILES=	mesa-${MESAVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	https://gitlab.freedesktop.org/mesa/mesa/-/commit/
 PATCHFILES+=	4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
@@ -69,7 +61,7 @@ SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
 
 MASTERDIR=	${.CURDIR:H:H}/graphics/mesa-dri
 PATCHDIR=	${MASTERDIR}/files
-WRKSRC=		${WRKDIR}/mesa-${MESADISTVERSION}
+WRKSRC=		${WRKDIR}/mesa-${MESAVERSION}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 PKGHELP=	${.CURDIR}/pkg-help



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406191321.45JDLhkk065924>