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.mk3 Sep 2023 16:30:39 - 1.40
+++ lang/clang/clang.port.mk16 Nov 2023 10:03:32 -
@@ -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/PLIST28 Oct 2023 07:47:33 - 1.39
+++ devel/kdevelop/pkg/PLIST16 Nov 2023 10:03:32 -
@@ -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 - 1.29
+++ devel/qt-creator/pkg/PLIST 16 Nov 2023 10:03:32 -
@@ -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_VE