git: a2786918253f - main - devel/root: Fix packaging on arm64

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Tue, 28 Feb 2023 08:05:46 UTC
The branch main has been updated by eduardo:

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

commit a2786918253fac9016b37ab984e6810e82fee1f2
Author:     Erik Jensen <erik@tenku.dk>
AuthorDate: 2023-02-28 08:03:04 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-02-28 08:04:59 +0000

    devel/root: Fix packaging on arm64
    
     ROOT version 6.28/00 fails to be packaged on arm64:
     https://pkg-status.freebsd.org/ampere2/data/main-arm64-default/p1b4f77b589d3_s357492c995/logs/root-6.28.00.log
    
     This patch fixes the reported errors.
    
    PR:             269853
---
 devel/root/Makefile  |   6 +-
 devel/root/pkg-plist | 228 ++++++++++++++++++++++++++-------------------------
 2 files changed, 118 insertions(+), 116 deletions(-)

diff --git a/devel/root/Makefile b/devel/root/Makefile
index 0ea1986943ee..0cfbe1096ef0 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -66,11 +66,11 @@ ROOT7_CMAKE_BOOL=	root7
 PLIST_SUB+=	SHLIB_SHVER="${DISTVERSION:R}" \
 		SHLIB_VER="${DISTVERSION}"
 
-# Some .modulemap and .idx files are not installed on aarch64, and files LIBRARY.pcm are renamed LIBRARY_rdict.pcm on aarch64
+# Some .modulemap, .pcm and .idx files are not installed on aarch64, a few .pcm files are exclusive to aarch64 and files LIBRARY.pcm are renamed libLIBRARY_rdict.pcm on aarch64
 .if ${ARCH} == "aarch64"
-PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_SUFFIX="_rdict"
+PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64="" AARCH64_PCM_PREFIX="lib" AARCH64_PCM_SUFFIX="_rdict"
 .else
-PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" AARCH64_PCM_SUFFIX=""
+PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment " AARCH64_PCM_PREFIX="" AARCH64_PCM_SUFFIX=""
 .endif
 
 # Some files only installed with LLVM/Clang 13 (used on FreeBSD 12.4 and 13.x)
diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
index 149a4f2488f7..6d4fcf978074 100644
--- a/devel/root/pkg-plist
+++ b/devel/root/pkg-plist
@@ -2802,11 +2802,11 @@ include/root/strtok.h
 include/root/v5/TF1Data.h
 include/root/v5/TFormula.h
 include/root/v5/TFormulaPrimitive.h
-lib/root/ASImage%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ASImageGui%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Cling_Runtime_Extra%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Cling_Runtime%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Core%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ASImage%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ASImageGui%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/Cling_Runtime_Extra.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/Cling_Runtime.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/Core.pcm
 lib/root/DistRDF/Backends/Base.py
 lib/root/DistRDF/Backends/Dask/Backend.py
 lib/root/DistRDF/Backends/Dask/__init__.py
@@ -2846,34 +2846,34 @@ lib/root/DistRDF/__pycache__/Proxy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 lib/root/DistRDF/__pycache__/Proxy%%PYTHON_EXT_SUFFIX%%.pyc
 lib/root/DistRDF/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 lib/root/DistRDF/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-lib/root/EG%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Eve%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/FFTW%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/FITSIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/FitPanel%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Foam%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Fumili%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GX11%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GX11TTF%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Gdml%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Ged%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GenVector%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Genetic%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Geom%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GeomBuilder%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GeomPainter%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Gpad%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Graf%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Graf3d%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Gui%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GuiBld%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/GuiHtml%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Gviz3d%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Hist%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/HistFactory%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/HistPainter%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Html%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Imt%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%EG%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Eve%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%FFTW%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%FITSIO%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%FitPanel%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Foam%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Fumili%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GX11%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GX11TTF%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Gdml%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Ged%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GenVector%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Genetic%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Geom%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GeomBuilder%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GeomPainter%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Gpad%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Graf%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Graf3d%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Gui%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GuiBld%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%GuiHtml%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Gviz3d%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Hist%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%HistFactory%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%HistPainter%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Html%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/Imt.pcm
 lib/root/JsMVA/DataLoader.py
 lib/root/JsMVA/Factory.py
 lib/root/JsMVA/JPyInterface.py
@@ -2929,31 +2929,31 @@ lib/root/JupyROOT/magics/__pycache__/jsrootmagic%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 lib/root/JupyROOT/magics/__pycache__/jsrootmagic%%PYTHON_EXT_SUFFIX%%.pyc
 lib/root/JupyROOT/magics/cppmagic.py
 lib/root/JupyROOT/magics/jsrootmagic.py
-lib/root/MLP%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/MathCore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/MathMore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Matrix%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Minuit%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Minuit2%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/MultiProc%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Net%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Netx%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/NetxNG%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/PgSQL%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Physics%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Postscript%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Proof%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ProofBench%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ProofDraw%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ProofPlayer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/PyMVA%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Quadp%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RCsg%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RGL%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RHTTP%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RMySQL%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%MLP%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%MathCore%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%MathMore%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Matrix%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Minuit%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Minuit2%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Net%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Netx%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%NetxNG%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%PgSQL%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Physics%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Postscript%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Proof%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ProofBench%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ProofDraw%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ProofPlayer%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%PyMVA%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Quadp%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RCsg%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RGL%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RHTTP%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RHTTPSniff%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/RIO.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RMySQL%%AARCH64_PCM_SUFFIX%%.pcm
 lib/root/ROOT/__init__.py
 lib/root/ROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 lib/root/ROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -3115,42 +3115,42 @@ lib/root/ROOT/_pythonization/_tstring.py
 lib/root/ROOT/_pythonization/_ttree.py
 lib/root/ROOT/_pythonization/_tvector3.py
 lib/root/ROOT/_pythonization/_tvectort.py
-lib/root/ROOTDataFrame%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOTTMVASofie%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOTTPython%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOTVecOps%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOT_Config%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOT_Foundation_C%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOT_Foundation_Stage1_NoRTTI%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOT_Rtypes%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RSQLite%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Recorder%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Rint%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFit%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFitCore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFitHS3%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFitMore%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFitRDataFrameHelpers%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooStats%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RootAuth%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/SPlot%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/SQLIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/SessionViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Smatrix%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Spectrum%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/SpectrumPainter%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/TMVA%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/TMVAGui%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Thread%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Tree%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/TreePlayer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/TreeViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/Unfold%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/X3d%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/XMLIO%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/XMLParser%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/_Builtin_intrinsics%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/_Builtin_stddef_max_align_t%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTDataFrame%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTTMVASofie%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTTPython%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTVecOps%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Config.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Foundation_C.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Foundation_Stage1_NoRTTI.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Rtypes.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RSQLite%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Recorder%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/Rint.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFit%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFitCore%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFitHS3%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFitMore%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFitRDataFrameHelpers%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooStats%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RootAuth%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%SPlot%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%SQLIO%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%SessionViewer%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Smatrix%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Spectrum%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%SpectrumPainter%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%TMVA%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%TMVAGui%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/Thread.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Tree%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%TreePlayer%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%TreeViewer%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%Unfold%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%X3d%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%XMLIO%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%XMLParser%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/_Builtin_intrinsics.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/_Builtin_stddef_max_align_t.pcm
 lib/root/cmdLineUtils.py
 lib/root/cppyy/__init__.py
 lib/root/cppyy/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -3487,7 +3487,7 @@ lib/root/libXMLIO.so.%%SHLIB_VER%%
 lib/root/libXMLParser.so
 lib/root/libXMLParser.so.%%SHLIB_SHVER%%
 lib/root/libXMLParser.so.%%SHLIB_VER%%
-lib/root/libc%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/libc.pcm
 lib/root/libcomplexDict.rootmap
 lib/root/libcomplexDict.so
 lib/root/libcomplexDict.so.%%SHLIB_SHVER%%
@@ -3559,8 +3559,8 @@ lib/root/libvectorDict.so
 lib/root/libvectorDict.so.%%SHLIB_SHVER%%
 lib/root/libvectorDict.so.%%SHLIB_VER%%
 %%NOT_INSTALLED_ON_AARCH64%%lib/root/modules.idx
-lib/root/std%%AARCH64_PCM_SUFFIX%%.pcm
-%%ONLY_INSTALLED_WITH_LLVM_CLANG_13%%lib/root/std_config%%AARCH64_PCM_SUFFIX%%.pcm
+%%NOT_INSTALLED_ON_AARCH64%%lib/root/std.pcm
+%%ONLY_INSTALLED_WITH_LLVM_CLANG_13%%lib/root/%%AARCH64_PCM_PREFIX%%std_config%%AARCH64_PCM_SUFFIX%%.pcm
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/DEVELOPMENT.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -6421,15 +6421,15 @@ share/man/man1/xpdtest.1.gz
 %%ROOT7%%lib/root/libROOTObjectDraw7Provider.so
 %%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTObjectDraw7Provider.so.%%SHLIB_VER%%
-%%ROOT7%%lib/root/ROOTBrowsable%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTBrowserv7%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTEve%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTFitPanelv7%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTGpadv7%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTGraphicsPrimitives%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTHist%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTHistDraw%%AARCH64_PCM_SUFFIX%%.pcm
-%%ROOT7%%lib/root/ROOTNTuple%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTBrowsable%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTBrowserv7%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTEve%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTFitPanelv7%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTGpadv7%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTGraphicsPrimitives%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTHist%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTHistDraw%%AARCH64_PCM_SUFFIX%%.pcm
+%%ROOT7%%lib/root/%%AARCH64_PCM_PREFIX%%ROOTNTuple%%AARCH64_PCM_SUFFIX%%.pcm
 include/root/ROOT/RWebDisplayArgs.hxx
 include/root/ROOT/RWebDisplayHandle.hxx
 include/root/ROOT/RWebWindow.hxx
@@ -6456,11 +6456,11 @@ lib/root/DistRDF/Backends/Dask/__pycache__/Backend%%PYTHON_EXT_SUFFIX%%.pyc
 lib/root/libROOTWebDisplay.so
 lib/root/libROOTWebDisplay.so.%%SHLIB_SHVER%%
 lib/root/libROOTWebDisplay.so.%%SHLIB_VER%%
-lib/root/ROOTWebDisplay%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTWebDisplay%%AARCH64_PCM_SUFFIX%%.pcm
 lib/root/libWebGui6.so
 lib/root/libWebGui6.so.%%SHLIB_SHVER%%
 lib/root/libWebGui6.so.%%SHLIB_VER%%
-lib/root/WebGui6%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%WebGui6%%AARCH64_PCM_SUFFIX%%.pcm
 bin/rootreadspeed
 bin/rootssh
 %%ETCDIR%%/plugins/TCanvasImp/P010_TWebCanvas.C
@@ -6563,11 +6563,11 @@ lib/root/ROOT/_pythonization/_tmva/_rbdt.py
 lib/root/ROOT/_pythonization/_tmva/_rtensor.py
 lib/root/ROOT/_pythonization/_tmva/_tree_inference.py
 lib/root/ROOT/_pythonization/_tmva/_utils.py
-lib/root/ROOTGeomViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOTNTupleUtil%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/ROOTTreeViewer%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFitJSONInterface%%AARCH64_PCM_SUFFIX%%.pcm
-lib/root/RooFitXRooFit%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTGeomViewer%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTNTupleUtil%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%ROOTTreeViewer%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFitJSONInterface%%AARCH64_PCM_SUFFIX%%.pcm
+lib/root/%%AARCH64_PCM_PREFIX%%RooFitXRooFit%%AARCH64_PCM_SUFFIX%%.pcm
 lib/root/libROOTBrowserTreeWidget.so
 lib/root/libROOTBrowserTreeWidget.so.%%SHLIB_SHVER%%
 lib/root/libROOTBrowserTreeWidget.so.%%SHLIB_VER%%
@@ -7119,3 +7119,5 @@ lib/root/libRooFitXRooFit.so.%%SHLIB_VER%%
 %%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/arrow_up.png
 %%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_belize/img-RTL/tree/TreeNode_Coll.gif
 %%DATADIR%%/ui5/distribution/resources/sap/ui/commons/themes/sap_fiori_3/img-RTL/arrow_up.png
+%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%GenVector_G__GenVector32%%AARCH64_PCM_SUFFIX%%.pcm
+%%ONLY_INSTALLED_ON_AARCH64%%lib/root/%%AARCH64_PCM_PREFIX%%Smatrix_G__Smatrix32%%AARCH64_PCM_SUFFIX%%.pcm