Various ports using the clang module have ended up with bogus
${MODCLANG_VERSION} substitutions in PLISTs.
I think we should stop adding MODCLANG_VERSION to SUBST_VARS
automatically and just include it in places which actually need it.
The use in icons is particularly special (16x16...)
OK?
Index: lang/clang/clang.port.mk
===================================================================
RCS file: /cvs/ports/lang/clang/clang.port.mk,v
retrieving revision 1.40
diff -u -p -r1.40 clang.port.mk
--- lang/clang/clang.port.mk 3 Sep 2023 16:30:39 -0000 1.40
+++ lang/clang/clang.port.mk 16 Nov 2023 10:03:32 -0000
@@ -74,5 +74,3 @@ WANTLIB += ${MODCLANG_CPPWANTLIB}
. endif
. endif
.endif
-
-SUBST_VARS+= MODCLANG_VERSION
Index: devel/kdevelop/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/kdevelop/pkg/PLIST,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST
--- devel/kdevelop/pkg/PLIST 28 Oct 2023 07:47:33 -0000 1.39
+++ devel/kdevelop/pkg/PLIST 16 Nov 2023 10:03:32 -0000
@@ -533,7 +533,7 @@ share/doc/HTML/en/kdevelop/index.docbook
share/doc/HTML/en/kdevelop/kdevelop-10.png
share/doc/HTML/en/kdevelop/kdevelop-11.png
share/doc/HTML/en/kdevelop/kdevelop-12.png
-share/doc/HTML/en/kdevelop/kdevelop-${MODCLANG_VERSION}.png
+share/doc/HTML/en/kdevelop/kdevelop-16.png
share/doc/HTML/en/kdevelop/kdevelop-14.png
share/doc/HTML/en/kdevelop/kdevelop-15.png
share/doc/HTML/en/kdevelop/kdevelop-16.png
Index: devel/qt-creator/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qt-creator/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- devel/qt-creator/pkg/PLIST 27 Oct 2023 10:57:04 -0000 1.29
+++ devel/qt-creator/pkg/PLIST 16 Nov 2023 10:03:32 -0000
@@ -140,7 +140,7 @@ libexec/qtcreator/
@bin libexec/qtcreator/sdktool
share/applications/org.qt-project.qtcreator.desktop
share/icons/hicolor/128x128/apps/QtProject-qtcreator.png
-share/icons/hicolor/${MODCLANG_VERSION}x${MODCLANG_VERSION}/apps/QtProject-qtcreator.png
+share/icons/hicolor/16x16/apps/QtProject-qtcreator.png
share/icons/hicolor/24x24/apps/QtProject-qtcreator.png
share/icons/hicolor/256x256/apps/QtProject-qtcreator.png
share/icons/hicolor/32x32/apps/QtProject-qtcreator.png
@@ -1137,62 +1137,62 @@ share/qtcreator/qmldesigner/workspacePre
share/qtcreator/qmldesigner/workspacePresets/order.json
share/qtcreator/qmlicons/
share/qtcreator/qmlicons/Qt/
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/BorderImage.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/BusyIndicator.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Button.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ButtonColumn.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ButtonRow.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/CheckBox.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ChoiceList.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ColorAnimation.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Component.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/CountBubble.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/DatePickerDialog.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Flickable.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Flipable.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/FocusScope.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/GridView.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Image.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/InfoBanner.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Item.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ListButton.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ListDelegate.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ListView.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/MoreIndicator.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/MouseArea.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/PageIndicator.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ParallelAnimation.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/PathView.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/PauseAnimation.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ProgressBar.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/PropertyChanges.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/RadioButton.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/RatingIndicator.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Rectangle.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/SequentialAnimation.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Slider.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/State.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Switch.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TabBar.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TabButton.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Text.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TextArea.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TextEdit.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TextField.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TextInput.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TimePickerDialog.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/ToolBar.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Transition.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Tumbler.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TumblerButton.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TumblerColumn.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/TumblerDialog.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/Window.png
-share/qtcreator/qmlicons/Qt/${MODCLANG_VERSION}x${MODCLANG_VERSION}/item-icon${MODCLANG_VERSION}.png
+share/qtcreator/qmlicons/Qt/16x16/
+share/qtcreator/qmlicons/Qt/16x16/BorderImage.png
+share/qtcreator/qmlicons/Qt/16x16/BusyIndicator.png
+share/qtcreator/qmlicons/Qt/16x16/Button.png
+share/qtcreator/qmlicons/Qt/16x16/ButtonColumn.png
+share/qtcreator/qmlicons/Qt/16x16/ButtonRow.png
+share/qtcreator/qmlicons/Qt/16x16/CheckBox.png
+share/qtcreator/qmlicons/Qt/16x16/ChoiceList.png
+share/qtcreator/qmlicons/Qt/16x16/ColorAnimation.png
+share/qtcreator/qmlicons/Qt/16x16/Component.png
+share/qtcreator/qmlicons/Qt/16x16/CountBubble.png
+share/qtcreator/qmlicons/Qt/16x16/DatePickerDialog.png
+share/qtcreator/qmlicons/Qt/16x16/Flickable.png
+share/qtcreator/qmlicons/Qt/16x16/Flipable.png
+share/qtcreator/qmlicons/Qt/16x16/FocusScope.png
+share/qtcreator/qmlicons/Qt/16x16/GridView.png
+share/qtcreator/qmlicons/Qt/16x16/Image.png
+share/qtcreator/qmlicons/Qt/16x16/InfoBanner.png
+share/qtcreator/qmlicons/Qt/16x16/Item.png
+share/qtcreator/qmlicons/Qt/16x16/ListButton.png
+share/qtcreator/qmlicons/Qt/16x16/ListDelegate.png
+share/qtcreator/qmlicons/Qt/16x16/ListView.png
+share/qtcreator/qmlicons/Qt/16x16/MoreIndicator.png
+share/qtcreator/qmlicons/Qt/16x16/MouseArea.png
+share/qtcreator/qmlicons/Qt/16x16/PageIndicator.png
+share/qtcreator/qmlicons/Qt/16x16/ParallelAnimation.png
+share/qtcreator/qmlicons/Qt/16x16/PathView.png
+share/qtcreator/qmlicons/Qt/16x16/PauseAnimation.png
+share/qtcreator/qmlicons/Qt/16x16/ProgressBar.png
+share/qtcreator/qmlicons/Qt/16x16/PropertyChanges.png
+share/qtcreator/qmlicons/Qt/16x16/RadioButton.png
+share/qtcreator/qmlicons/Qt/16x16/RatingIndicator.png
+share/qtcreator/qmlicons/Qt/16x16/Rectangle.png
+share/qtcreator/qmlicons/Qt/16x16/SequentialAnimation.png
+share/qtcreator/qmlicons/Qt/16x16/Slider.png
+share/qtcreator/qmlicons/Qt/16x16/State.png
+share/qtcreator/qmlicons/Qt/16x16/Switch.png
+share/qtcreator/qmlicons/Qt/16x16/TabBar.png
+share/qtcreator/qmlicons/Qt/16x16/TabButton.png
+share/qtcreator/qmlicons/Qt/16x16/Text.png
+share/qtcreator/qmlicons/Qt/16x16/TextArea.png
+share/qtcreator/qmlicons/Qt/16x16/TextEdit.png
+share/qtcreator/qmlicons/Qt/16x16/TextField.png
+share/qtcreator/qmlicons/Qt/16x16/TextInput.png
+share/qtcreator/qmlicons/Qt/16x16/TimePickerDialog.png
+share/qtcreator/qmlicons/Qt/16x16/ToolBar.png
+share/qtcreator/qmlicons/Qt/16x16/Transition.png
+share/qtcreator/qmlicons/Qt/16x16/Tumbler.png
+share/qtcreator/qmlicons/Qt/16x16/TumblerButton.png
+share/qtcreator/qmlicons/Qt/16x16/TumblerColumn.png
+share/qtcreator/qmlicons/Qt/16x16/TumblerDialog.png
+share/qtcreator/qmlicons/Qt/16x16/Window.png
+share/qtcreator/qmlicons/Qt/16x16/item-icon16.png
share/qtcreator/qmlicons/QtWebkit/
-share/qtcreator/qmlicons/QtWebkit/${MODCLANG_VERSION}x${MODCLANG_VERSION}/
-share/qtcreator/qmlicons/QtWebkit/${MODCLANG_VERSION}x${MODCLANG_VERSION}/WebView.png
+share/qtcreator/qmlicons/QtWebkit/16x16/
+share/qtcreator/qmlicons/QtWebkit/16x16/WebView.png
share/qtcreator/schemes/
share/qtcreator/schemes/MS_Visual_C++.kms
share/qtcreator/schemes/Xcode.kms
Index: lang/zig/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/zig/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- lang/zig/pkg/PLIST 5 Sep 2023 10:09:06 -0000 1.10
+++ lang/zig/pkg/PLIST 16 Nov 2023 10:03:32 -0000
@@ -299,40 +299,40 @@ lib/zig/include/__wmmintrin_pclmul.h
lib/zig/include/adxintrin.h
lib/zig/include/altivec.h
lib/zig/include/ammintrin.h
-lib/zig/include/amxfp${MODCLANG_VERSION}intrin.h
+lib/zig/include/amxfp16intrin.h
lib/zig/include/amxintrin.h
lib/zig/include/arm64intr.h
lib/zig/include/arm_acle.h
-lib/zig/include/arm_bf${MODCLANG_VERSION}.h
+lib/zig/include/arm_bf16.h
lib/zig/include/arm_cde.h
lib/zig/include/arm_cmse.h
-lib/zig/include/arm_fp${MODCLANG_VERSION}.h
+lib/zig/include/arm_fp16.h
lib/zig/include/arm_mve.h
lib/zig/include/arm_neon.h
lib/zig/include/arm_neon_sve_bridge.h
lib/zig/include/arm_sve.h
lib/zig/include/armintr.h
lib/zig/include/avx2intrin.h
-lib/zig/include/avx512bf${MODCLANG_VERSION}intrin.h
+lib/zig/include/avx512bf16intrin.h
lib/zig/include/avx512bitalgintrin.h
lib/zig/include/avx512bwintrin.h
lib/zig/include/avx512cdintrin.h
lib/zig/include/avx512dqintrin.h
lib/zig/include/avx512erintrin.h
lib/zig/include/avx512fintrin.h
-lib/zig/include/avx512fp${MODCLANG_VERSION}intrin.h
+lib/zig/include/avx512fp16intrin.h
lib/zig/include/avx512ifmaintrin.h
lib/zig/include/avx512ifmavlintrin.h
lib/zig/include/avx512pfintrin.h
lib/zig/include/avx512vbmi2intrin.h
lib/zig/include/avx512vbmiintrin.h
lib/zig/include/avx512vbmivlintrin.h
-lib/zig/include/avx512vlbf${MODCLANG_VERSION}intrin.h
+lib/zig/include/avx512vlbf16intrin.h
lib/zig/include/avx512vlbitalgintrin.h
lib/zig/include/avx512vlbwintrin.h
lib/zig/include/avx512vlcdintrin.h
lib/zig/include/avx512vldqintrin.h
-lib/zig/include/avx512vlfp${MODCLANG_VERSION}intrin.h
+lib/zig/include/avx512vlfp16intrin.h
lib/zig/include/avx512vlintrin.h
lib/zig/include/avx512vlvbmi2intrin.h
lib/zig/include/avx512vlvnniintrin.h
@@ -365,7 +365,7 @@ lib/zig/include/cuda_wrappers/complex
lib/zig/include/cuda_wrappers/new
lib/zig/include/emmintrin.h
lib/zig/include/enqcmdintrin.h
-lib/zig/include/f${MODCLANG_VERSION}cintrin.h
+lib/zig/include/f16cintrin.h
lib/zig/include/float.h
lib/zig/include/fma4intrin.h
lib/zig/include/fmaintrin.h
@@ -2168,7 +2168,7 @@ lib/zig/libc/include/any-linux-any/sound
lib/zig/libc/include/any-linux-any/sound/intel/
lib/zig/libc/include/any-linux-any/sound/intel/avs/
lib/zig/libc/include/any-linux-any/sound/intel/avs/tokens.h
-lib/zig/libc/include/any-linux-any/sound/sb${MODCLANG_VERSION}_csp.h
+lib/zig/libc/include/any-linux-any/sound/sb16_csp.h
lib/zig/libc/include/any-linux-any/sound/sfnt_info.h
lib/zig/libc/include/any-linux-any/sound/skl-tplg-interface.h
lib/zig/libc/include/any-linux-any/sound/snd_ar_tokens.h
@@ -2208,7 +2208,7 @@ lib/zig/libc/include/any-macos-any/_type
lib/zig/libc/include/any-macos-any/_types.h
lib/zig/libc/include/any-macos-any/_types/_intmax_t.h
lib/zig/libc/include/any-macos-any/_types/_nl_item.h
-lib/zig/libc/include/any-macos-any/_types/_uint${MODCLANG_VERSION}_t.h
+lib/zig/libc/include/any-macos-any/_types/_uint16_t.h
lib/zig/libc/include/any-macos-any/_types/_uint32_t.h
lib/zig/libc/include/any-macos-any/_types/_uint64_t.h
lib/zig/libc/include/any-macos-any/_types/_uint8_t.h
@@ -2480,7 +2480,7 @@ lib/zig/libc/include/any-macos-any/sys/_
lib/zig/libc/include/any-macos-any/sys/_types/_in_port_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_ino64_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_ino_t.h
-lib/zig/libc/include/any-macos-any/sys/_types/_int${MODCLANG_VERSION}_t.h
+lib/zig/libc/include/any-macos-any/sys/_types/_int16_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_int32_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_int64_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_int8_t.h
@@ -2518,7 +2518,7 @@ lib/zig/libc/include/any-macos-any/sys/_
lib/zig/libc/include/any-macos-any/sys/_types/_timeval64.h
lib/zig/libc/include/any-macos-any/sys/_types/_u_char.h
lib/zig/libc/include/any-macos-any/sys/_types/_u_int.h
-lib/zig/libc/include/any-macos-any/sys/_types/_u_int${MODCLANG_VERSION}_t.h
+lib/zig/libc/include/any-macos-any/sys/_types/_u_int16_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_u_int32_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_u_int64_t.h
lib/zig/libc/include/any-macos-any/sys/_types/_u_int8_t.h
@@ -3621,7 +3621,7 @@ lib/zig/libc/include/any-windows-any/ipx
lib/zig/libc/include/any-windows-any/ipxtfflt.h
lib/zig/libc/include/any-windows-any/iscsidsc.h
lib/zig/libc/include/any-windows-any/isguids.h
-lib/zig/libc/include/any-windows-any/issper${MODCLANG_VERSION}.h
+lib/zig/libc/include/any-windows-any/issper16.h
lib/zig/libc/include/any-windows-any/issperr.h
lib/zig/libc/include/any-windows-any/isysmon.h
lib/zig/libc/include/any-windows-any/ivec.h
@@ -4002,7 +4002,7 @@ lib/zig/libc/include/any-windows-any/psh
lib/zig/libc/include/any-windows-any/pshpack2.h
lib/zig/libc/include/any-windows-any/pshpack4.h
lib/zig/libc/include/any-windows-any/pshpack8.h
-lib/zig/libc/include/any-windows-any/pshpck${MODCLANG_VERSION}.h
+lib/zig/libc/include/any-windows-any/pshpck16.h
lib/zig/libc/include/any-windows-any/pstore.h
lib/zig/libc/include/any-windows-any/pthread_signal.h
lib/zig/libc/include/any-windows-any/pthread_time.h
@@ -4372,7 +4372,7 @@ lib/zig/libc/include/any-windows-any/win
lib/zig/libc/include/any-windows-any/windows.system.threading.h
lib/zig/libc/include/any-windows-any/windowscontracts.h
lib/zig/libc/include/any-windows-any/windowsx.h
-lib/zig/libc/include/any-windows-any/windowsx.h${MODCLANG_VERSION}
+lib/zig/libc/include/any-windows-any/windowsx.h16
lib/zig/libc/include/any-windows-any/winefs.h
lib/zig/libc/include/any-windows-any/winerror.h
lib/zig/libc/include/any-windows-any/winevt.h
@@ -4435,7 +4435,7 @@ lib/zig/libc/include/any-windows-any/wms
lib/zig/libc/include/any-windows-any/wmsecure.h
lib/zig/libc/include/any-windows-any/wnnc.h
lib/zig/libc/include/any-windows-any/wow64apiset.h
-lib/zig/libc/include/any-windows-any/wownt${MODCLANG_VERSION}.h
+lib/zig/libc/include/any-windows-any/wownt16.h
lib/zig/libc/include/any-windows-any/wownt32.h
lib/zig/libc/include/any-windows-any/wpapi.h
lib/zig/libc/include/any-windows-any/wpapimsg.h
@@ -8084,9 +8084,9 @@ lib/zig/libc/mingw/misc/tdelete.c
lib/zig/libc/mingw/misc/tfind.c
lib/zig/libc/mingw/misc/tsearch.c
lib/zig/libc/mingw/misc/twalk.c
-lib/zig/libc/mingw/misc/uchar_c${MODCLANG_VERSION}rtomb.c
+lib/zig/libc/mingw/misc/uchar_c16rtomb.c
lib/zig/libc/mingw/misc/uchar_c32rtomb.c
-lib/zig/libc/mingw/misc/uchar_mbrtoc${MODCLANG_VERSION}.c
+lib/zig/libc/mingw/misc/uchar_mbrtoc16.c
lib/zig/libc/mingw/misc/uchar_mbrtoc32.c
lib/zig/libc/mingw/misc/wassert.c
lib/zig/libc/mingw/misc/wcrtomb.c
@@ -9942,13 +9942,13 @@ lib/zig/libc/musl/src/mq/mq_timedsend.c
lib/zig/libc/musl/src/mq/mq_unlink.c
lib/zig/libc/musl/src/multibyte/
lib/zig/libc/musl/src/multibyte/btowc.c
-lib/zig/libc/musl/src/multibyte/c${MODCLANG_VERSION}rtomb.c
+lib/zig/libc/musl/src/multibyte/c16rtomb.c
lib/zig/libc/musl/src/multibyte/c32rtomb.c
lib/zig/libc/musl/src/multibyte/internal.c
lib/zig/libc/musl/src/multibyte/internal.h
lib/zig/libc/musl/src/multibyte/mblen.c
lib/zig/libc/musl/src/multibyte/mbrlen.c
-lib/zig/libc/musl/src/multibyte/mbrtoc${MODCLANG_VERSION}.c
+lib/zig/libc/musl/src/multibyte/mbrtoc16.c
lib/zig/libc/musl/src/multibyte/mbrtoc32.c
lib/zig/libc/musl/src/multibyte/mbrtowc.c
lib/zig/libc/musl/src/multibyte/mbsinit.c
@@ -11834,13 +11834,13 @@ lib/zig/libc/wasi/libc-top-half/musl/src
lib/zig/libc/wasi/libc-top-half/musl/src/misc/uname.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/btowc.c
-lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/c${MODCLANG_VERSION}rtomb.c
+lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/c16rtomb.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/c32rtomb.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/internal.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/internal.h
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mblen.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mbrlen.c
-lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mbrtoc${MODCLANG_VERSION}.c
+lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mbrtoc16.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mbrtoc32.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mbrtowc.c
lib/zig/libc/wasi/libc-top-half/musl/src/multibyte/mbsinit.c
Index: lang/wasi-sdk/compiler-rt/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/compiler-rt/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- lang/wasi-sdk/compiler-rt/Makefile 15 Sep 2023 08:02:34 -0000 1.5
+++ lang/wasi-sdk/compiler-rt/Makefile 16 Nov 2023 10:03:32 -0000
@@ -10,6 +10,8 @@ BUILD_DEPENDS += lang/wasi-libc>=0.20220
# In transition from BSD-ish to Apache 2 + LLVM exceptions
PERMIT_PACKAGE = Yes
+SUBST_VARS += MODCLANG_VERSION
+
CONFIGURE_ARGS= \
-DLLVM_MAIN_SRC_DIR=${WRKDIR}/llvm-${LLVM_V}.src \
-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config-${MODCLANG_VERSION} \
