git: 8fe63ef1cff2 - main - lang/dotnet: Properly fix packaging error for aarch64

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Wed, 12 Feb 2025 19:36:52 UTC
The branch main has been updated by arrowd:

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

commit 8fe63ef1cff2809bdfb315b817e1ca83b4d6cb94
Author:     Szczepan <sec@thinkcode.pl>
AuthorDate: 2025-02-12 18:17:07 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-02-12 19:36:24 +0000

    lang/dotnet: Properly fix packaging error for aarch64
    
    PR:             284744
    Pull Request:   https://github.com/freebsd/freebsd-ports/pull/345
---
 lang/dotnet/Makefile  | 4 ++--
 lang/dotnet/pkg-plist | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/dotnet/Makefile b/lang/dotnet/Makefile
index 9852dc5603fb..51e2f3725fd5 100644
--- a/lang/dotnet/Makefile
+++ b/lang/dotnet/Makefile
@@ -63,9 +63,9 @@ PLIST_SUB=	DOTNET_ARCH=${DOTNET_ARCH} FULL_DOTNETVERSION=${PORTVERSION} \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
-PLIST_SUB+=	VXSORT= CLRJIT=
+PLIST_SUB+=	VXSORT=
 .else
-PLIST_SUB+=	VXSORT="@comment " CLRJIT="@comment "
+PLIST_SUB+=	VXSORT="@comment "
 .endif
 
 post-extract:
diff --git a/lang/dotnet/pkg-plist b/lang/dotnet/pkg-plist
index 44e46256d28c..640d005fa6ed 100644
--- a/lang/dotnet/pkg-plist
+++ b/lang/dotnet/pkg-plist
@@ -1518,8 +1518,8 @@
 %%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/ilc
 %%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_universal_arm64_%%DOTNET_ARCH%%.so
 %%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_universal_arm_%%DOTNET_ARCH%%.so
-%%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_unix_%%DOTNET_ARCH%%_%%DOTNET_ARCH%%.so
-%%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_win_%%DOTNET_ARCH%%_%%DOTNET_ARCH%%.so
+%%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_unix_x64_%%DOTNET_ARCH%%.so
+%%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_win_x64_%%DOTNET_ARCH%%.so
 %%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libclrjit_win_x86_%%DOTNET_ARCH%%.so
 %%DATADIR%%/packs/runtime.%%SDK_RID%%.Microsoft.DotNet.ILCompiler/%%FULL_DOTNETVERSION%%/tools/libjitinterface_%%DOTNET_ARCH%%.so
 %%DATADIR%%/sdk-manifests/8.0.100/microsoft.net.sdk.aspire/8.2.2/WorkloadManifest.Aspire.targets