git: cc5192d32c8a - 2025Q1 - devel/llvm-cheri: Actually add files/llvm## to patches

The branch 2025Q1 has been updated by brooks:

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

commit cc5192d32c8ab964c5d3e318b8b1aa8a5c22d2b1
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-01-06 16:35:35 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-01-08 20:03:45 +0000

    devel/llvm-cheri: Actually add files/llvm## to patches
    
    Move conditional EXTRA_PATCHES additions after bsd.port.pre.mk so
    PATCHDIR is defined.
    
    Sponsored by:   DARPA, AFRL
    
    (cherry picked from commit dab073e2c95b0f20992b57f1a8ac41bf6d0e9825)
---
 devel/llvm-cheri/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 282f5c1bcfad..efed661a6eec 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -111,13 +111,6 @@ STRIP_LIBS=	BugpointPasses.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
-.if exists(${PATCHDIR}/llvm${LLVM_MAJOR})
-EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}
-.endif
-.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files)
-EXTRA_PATCHES+=	${.CURDIR}/files
-.endif
-
 .include <bsd.port.options.mk>
 
 # keep in sync with /usr/src/lib/clang/clang.build.mk
@@ -156,6 +149,14 @@ _USES_PYTHON?=	python:build
 USES+=		${_USES_PYTHON}
 
 .include <bsd.port.pre.mk>
+
+.if exists(${PATCHDIR}/llvm${LLVM_MAJOR})
+EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}
+.endif
+.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files)
+EXTRA_PATCHES+=	${.CURDIR}/files
+.endif
+
 .include "${.CURDIR}/Makefile.COMMANDS"
 .sinclude "${.CURDIR}/Makefile.MAN1SRCS"