Skip to content

Commit

Permalink
Mk/Uses: always use colon for build/run suffix
Browse files Browse the repository at this point in the history 
Most USES use a colon for build/run(/test) suffixes. Change kde.mk,
qt.mk and pyqt.mk to do the same, and update all ports using that.

Document in CHANGES.

PR:			266034
Exp-run by:		antoine
Approved by:		tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D36349
  • Loading branch information
@Zirias
Zirias committed Sep 11, 2022
1 parent 51a360b commit ddae4e9
Show file tree
Hide file tree
Showing 1,105 changed files with 1,654 additions and 1,637 deletions.
17 changes: 17 additions & 0 deletions CHANGES
View file
Expand Up @@ -10,6 +10,23 @@ in the release notes and/or placed into UPDATING.

All ports committers are allowed to commit to this file.

20220911:
AUTHOR: zirias@FreeBSD.org

kde.mk, qt.mk and pyqt.mk now use a colon for component suffixes

Suffixes for build, run and test (for pyqt) dependencies used an underscore
previously. This was not in line with most other USES, using a colon for
that purpose.

So if you previously had for example

USE_QT= buildtools_build

replace it with

USE_QT= buildtools:build

20220907:
AUTHOR: se@FreeBSD.org

Expand Down
16 changes: 8 additions & 8 deletions Mk/Uses/kde.mk
View file
Expand Up @@ -9,8 +9,8 @@
#
# USE_KDE List of KF5/Plasma5 components (other ports) that this
# port depends on.
# * foo_build Add a build-time dependency (BUILD_DEPENDS)
# * foo_run Add a run-time dependency (RUN_DEPENDS)
# * foo:build Add a build-time dependency (BUILD_DEPENDS)
# * foo:run Add a run-time dependency (RUN_DEPENDS)
# * foo (default) Add both dependencies on component <foo>, or
# a LIB_DEPENDS if applicable.
#
Expand All @@ -25,7 +25,7 @@
#
# option DOCS If the port is part of kde-applications (see CATEGORIES,
# above) and has an option defined for DOCS then a dependency
# for doctools_build is added. The option itself doesn't
# for doctools:build is added. The option itself doesn't
# have to do anything -- the dependency is always there.
#
# KDE_INVENT If the port does not have a regular release, and should
Expand Down Expand Up @@ -159,7 +159,7 @@ _KDE_OPTIONS= bogus ${OPTIONS_DEFINE}
. if ${_KDE_OPTIONS:MDOCS}
DOCSDIR= ${PREFIX}/share/doc
PORTDOCS?= HTML/*
USE_KDE+= doctools_build
USE_KDE+= doctools:build
. endif
# Further pass along a SHLIB_VER PLIST_SUB
PLIST_SUB+= KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \
Expand Down Expand Up @@ -870,18 +870,18 @@ kde-${comp}_PATH= ${kde-${comp}${_KDE_VERSION}_LIB}
_USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL}

# Iterate through components deprived of suffix.
. for component in ${USE_KDE:O:u:C/_.+//}
. for component in ${USE_KDE:O:u:C/:.+//}
# Check that the component is valid.
. if ${_USE_KDE_ALL:M${component}} != ""
# Skip meta-components (currently none).
. if defined(kde-${component}_PORT) && (defined(kde-${component}_PATH) || defined(kde-${component}_LIB))
# Check if a dependency type is explicitly requested.
. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
. if ${USE_KDE:M${component}\:*} != "" && ${USE_KDE:M${component}} == ""
kde-${component}_TYPE= # empty
. if ${USE_KDE:M${component}_build} != ""
. if ${USE_KDE:M${component}\:build} != ""
kde-${component}_TYPE+= build
. endif
. if ${USE_KDE:M${component}_run} != ""
. if ${USE_KDE:M${component}\:run} != ""
kde-${component}_TYPE+= run
. endif
. endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
Expand Down
16 changes: 8 additions & 8 deletions Mk/Uses/pyqt.mk
View file
Expand Up @@ -11,10 +11,10 @@
# targets are then set assuming a certain tarball and
# port layout.
# USE_PYQT - List of PyQt components to depend on
# * foo_build only build depend
# * foo_run only run depend
# * foo_test only test depend
# * foo both (default)
# * foo:build only build depend
# * foo:run only run depend
# * foo:test only test depend
# * foo build and run depend (default)
# PYQT_SIPDIR - where sip files will be installed to
# PYQT_APIDIR - where api files will be installed to
# PYQT_DOCDIR - where doc files will be installed to
Expand Down Expand Up @@ -199,7 +199,7 @@ _USE_PYQT_ALL+= ${_USE_SIP_ALL} \
${_USE_QSCINTILLA} \
${_USE_PYQTBUILDER}
. for comp in ${_USE_PYQT_ALL:O:u}
_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run py-${comp}_test
_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}:build py-${comp}:run py-${comp}:test
py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
py-${comp}_TEST_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR}
Expand All @@ -211,9 +211,9 @@ py-${comp}_test_TEST_DEPENDS?= ${py-${comp}_TEST_DEPENDS}
_USE_PYQT= ${USE_PYQT:O:u}
. for comp in ${_USE_PYQT}
. if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS}
RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS}
TEST_DEPENDS+= ${py-${comp}_TEST_DEPENDS}
BUILD_DEPENDS+= ${py-${comp:S/:/_/}_BUILD_DEPENDS}
RUN_DEPENDS+= ${py-${comp:S/:/_/}_RUN_DEPENDS}
TEST_DEPENDS+= ${py-${comp:S/:/_/}_TEST_DEPENDS}
. else
IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #'
. endif
Expand Down
2 changes: 1 addition & 1 deletion Mk/Uses/qmake.mk
View file
Expand Up @@ -110,7 +110,7 @@ QMAKE_SOURCE_PATH?= # empty

# Add qmake to USE_QT -- unless it's qmake itself
. if !${PORTNAME} == qmake && ${_QT_VER:M5}
USE_QT+= qmake_build
USE_QT+= qmake:build
. endif

. if empty(qmake_ARGS:Mno_env)
Expand Down
12 changes: 6 additions & 6 deletions Mk/Uses/qt.mk
View file
Expand Up @@ -11,8 +11,8 @@
# Versions: 5
#
# Port variables:
# USE_QT - List of Qt modules to depend on, with optional '_build'
# and '_run' suffixes. Define it empty to include this file
# USE_QT - List of Qt modules to depend on, with optional ':build'
# and ':run' suffixes. Define it empty to include this file
# without depending on Qt ports.
#
# MAINTAINER: kde@FreeBSD.org
Expand Down Expand Up @@ -399,18 +399,18 @@ _USE_QT_ALL= ${_USE_QT_COMMON} \
${_USE_QT${_QT_VER}_ONLY}
_USE_QT= ${USE_QT}
# Iterate through components deprived of suffix.
. for component in ${_USE_QT:O:u:C/_(build|run)$//}
. for component in ${_USE_QT:O:u:C/:(build|run)$//}
# Check that the component is valid.
. if ${_USE_QT_ALL:M${component}} != ""
# Skip meta-components (currently none).
. if defined(qt-${component}_PORT) && (defined(qt-${component}_PATH) || defined(qt-${component}_LIB))
# Check if a dependency type is explicitly requested.
. if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
. if ${_USE_QT:M${component}\:*} != "" && ${_USE_QT:M${component}} == ""
qt-${component}_TYPE= # empty
. if ${_USE_QT:M${component}_build} != ""
. if ${_USE_QT:M${component}\:build} != ""
qt-${component}_TYPE+= build
. endif
. if ${_USE_QT:M${component}_run} != ""
. if ${_USE_QT:M${component}\:run} != ""
qt-${component}_TYPE+= run
. endif
. endif # ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
Expand Down
2 changes: 1 addition & 1 deletion accessibility/gammy/Makefile
View file
Expand Up @@ -15,7 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= Fushko
USE_GL= gl
USE_QT= core dbus gui widgets \
buildtools_build qmake_build
buildtools:build qmake:build
USE_XORG= x11 xext xxf86vm

PLIST_FILES= bin/gammy \
Expand Down
4 changes: 2 additions & 2 deletions accessibility/kmag/Makefile
View file
Expand Up @@ -12,9 +12,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons \
i18n kio service widgetsaddons xmlgui \
ecm_build
ecm:build
USE_QT= concurrent core dbus gui network printsupport widgets xml \
buildtools_build qmake_build
buildtools:build qmake:build

OPTIONS_DEFINE= DOCS

Expand Down
4 changes: 2 additions & 2 deletions accessibility/kmousetool/Makefile
View file
Expand Up @@ -11,9 +11,9 @@ LICENSE= GPLv2
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons \
i18n iconthemes notifications widgetsaddons windowsystem xmlgui \
ecm_build
ecm:build
USE_QT= core dbus gui phonon4 widgets xml \
buildtools_build qmake_build
buildtools:build qmake:build
USE_XORG= ice sm x11 xext xtst

OPTIONS_DEFINE= DOCS
Expand Down
4 changes: 2 additions & 2 deletions accessibility/kmouth/Makefile
View file
Expand Up @@ -12,9 +12,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz xorg
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
i18n jobwidgets kio service solid widgetsaddons windowsystem xmlgui \
ecm_build
ecm:build
USE_QT= concurrent core dbus gui network printsupport speech widgets xml \
buildtools_build qmake_build
buildtools:build qmake:build
USE_XORG= x11

OPTIONS_DEFINE= DOCS
Expand Down
2 changes: 1 addition & 1 deletion accessibility/libqaccessibilityclient/Makefile
View file
Expand Up @@ -14,6 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++11-lang kde:5 qt:5 tar:xz
USE_KDE= ecm
USE_QT= core dbus gui widgets \
buildtools_build qmake_build
buildtools:build qmake:build

.include <bsd.port.mk>
2 changes: 1 addition & 1 deletion accessibility/qt5-speech/Makefile
View file
Expand Up @@ -10,7 +10,7 @@ USES= compiler:c++11-lang gl pkgconfig perl5 qmake:outsource,norecursive \
qt-dist:5,speech xorg
USE_GL= gl
USE_PERL5= extract
USE_QT= core gui buildtools_build qmake_build
USE_QT= core gui buildtools:build qmake:build

OPTIONS_DEFINE= ALSA
OPTIONS_GROUP= BACKEND
Expand Down
4 changes: 2 additions & 2 deletions archivers/ark/Makefile
View file
Expand Up @@ -14,9 +14,9 @@ USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools i18n iconthemes \
itemmodels itemviews jobwidgets khtml kio parts pty service \
solid sonnet textwidgets widgetsaddons windowsystem xmlgui \
ecm_build
ecm:build
USE_QT= concurrent core dbus gui network widgets xml \
buildtools_build qmake_build
buildtools:build qmake:build
USE_XORG= x11
USE_LDCONFIG= yes

Expand Down
4 changes: 2 additions & 2 deletions archivers/kf5-karchive/Makefile
View file
Expand Up @@ -9,8 +9,8 @@ COMMENT= KF5 library that provides classes for handling archive formats
LICENSE= LGPL20

USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm_build
USE_KDE= ecm:build
USE_QT= core \
buildtools_build qmake_build
buildtools:build qmake:build

.include <bsd.port.mk>
2 changes: 1 addition & 1 deletion archivers/libarchive-qt/Makefile
View file
Expand Up @@ -10,7 +10,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE

USES= cmake qt:5
USE_QT= buildtools_build core dbus gui network qmake_build widgets
USE_QT= buildtools:build core dbus gui network qmake:build widgets
USE_LDCONFIG= yes
USE_GITLAB= yes

Expand Down
2 changes: 1 addition & 1 deletion archivers/lxqt-archiver/Makefile
View file
Expand Up @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/unzip:archivers/unzip
USES= cmake compiler:c++14-lang desktop-file-utils lxqt pkgconfig tar:xz gnome qt:5 xorg

USE_GNOME= glib20
USE_QT= buildtools_build qmake_build core dbus gui linguisttools \
USE_QT= buildtools:build qmake:build core dbus gui linguisttools \
network printsupport svg widgets x11extras
USE_LXQT= buildtools lxqt
USE_XORG= xcb
Expand Down
2 changes: 1 addition & 1 deletion archivers/quazip/Makefile
View file
Expand Up @@ -16,7 +16,7 @@ GH_ACCOUNT= stachenov
CPE_VENDOR= quazip_project
USE_LDCONFIG= yes
USE_QT= core network \
buildtools_build testlib_build qmake_build
buildtools:build testlib:build qmake:build
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE

PLIST_SUB= QTVER_SUFFIX=5 \
Expand Down
2 changes: 1 addition & 1 deletion archivers/v1541commander/Makefile
View file
Expand Up @@ -18,7 +18,7 @@ LIB_DEPENDS= lib1541img.so:archivers/lib1541img

USES= compiler:c++11-lang gmake pkgconfig qt:5 shared-mime-info

USE_QT= core gui network widgets buildtools_build linguisttools_build
USE_QT= core gui network widgets buildtools:build linguisttools:build

USE_GITHUB= yes
GH_PROJECT= zimk:zimk
Expand Down
4 changes: 2 additions & 2 deletions astro/gpsbabel/Makefile
View file
Expand Up @@ -11,7 +11,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

USES= compiler:c++11-lang gmake localbase qt:5
USE_QT= core qmake_build
USE_QT= core qmake:build

CONFLICTS= gpsbabel14

Expand All @@ -24,7 +24,7 @@ OPTIONS_SUB= yes
GUI_USES= gl
GUI_USE= GL=gl \
QT=declarative,gui,location,network,printsupport,webchannel \
QT=webengine,widgets,xml,buildtools_build,linguisttools_build
QT=webengine,widgets,xml,buildtools:build,linguisttools:build
GUI_ALL_TARGET= gui
GUI_VARS= MAKE_JOBS_UNSAFE=yes

Expand Down
2 changes: 1 addition & 1 deletion astro/indiwebmanagerapp/Makefile
View file
Expand Up @@ -16,7 +16,7 @@ USES= cmake iconv gettext kde:5 ninja qt:5 pkgconfig python:3.7+ xorg
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons doctools i18n kio itemviews jobwidgets service \
solid widgetsaddons windowsystem xmlgui
USE_QT= buildtools concurrent core dbus gui qmake_build network widgets \
USE_QT= buildtools concurrent core dbus gui qmake:build network widgets \
xml
USE_XORG= x11
USE_GITHUB= yes
Expand Down
4 changes: 2 additions & 2 deletions astro/kosmindoormap/Makefile
View file
Expand Up @@ -10,9 +10,9 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf

USES= bison cmake compiler:c++11-lang kde:5 qt:5 tar:xz
USE_KDE= i18n kpublictransport \
ecm_build
ecm:build
USE_QT= core declarative gui network quick3d \
buildtools_build qmake_build
buildtools:build qmake:build

OPTIONS_DEFINE= DOCS

Expand Down
4 changes: 2 additions & 2 deletions astro/kstars/Makefile
View file
Expand Up @@ -31,11 +31,11 @@ USE_KDE= attica auth bookmarks codecs completion config configwidgets\
iconthemes init itemviews jobwidgets kio newstuff notifications \
notifyconfig parts plotting service solid texteditor \
widgetsaddons windowsystem xmlgui \
doctools_build ecm_build
doctools:build ecm:build
USE_QT= concurrent core datavis3d dbus declarative gui multimedia \
network opengl printsupport sql svg testlib websockets widgets \
xml \
buildtools_build qmake_build
buildtools:build qmake:build
USE_XORG= x11

.include <bsd.port.mk>
4 changes: 2 additions & 2 deletions astro/marble/Makefile
View file
Expand Up @@ -20,10 +20,10 @@ USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools i18n jobwidgets kio newstuff package parts \
plasma-framework plasma-workspace-wallpapers runner service solid \
sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \
ecm_build
ecm:build
USE_QT= concurrent core dbus declarative designer gui location network opengl \
phonon4 printsupport script serialport sql svg webchannel widgets xml \
buildtools_build qmake_build testlib_build
buildtools:build qmake:build testlib:build
USE_XORG= x11

USE_LDCONFIG= yes
Expand Down
4 changes: 2 additions & 2 deletions astro/merkaartor/Makefile
View file
Expand Up @@ -20,7 +20,7 @@ GH_ACCOUNT= openstreetmap
USE_LDCONFIG= yes

QMAKE_ARGS= SYSTEM_QUAZIP=1
USE_QT= buildtools_build \
USE_QT= buildtools:build \
concurrent core gui imageformats network printsupport svg \
webkit widgets xml

Expand All @@ -44,7 +44,7 @@ ZBAR_BROKEN= Does not build with option ZBAR selected
DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1

NLS_USES= qt:5
NLS_USE= QT=linguisttools_build
NLS_USE= QT=linguisttools:build

OPTIONS_SUB= yes

Expand Down
2 changes: 1 addition & 1 deletion astro/oskar/Makefile
View file
Expand Up @@ -20,7 +20,7 @@ LIB_DEPENDS= libcfitsio.so:astro/cfitsio \

USES= cmake compiler:c++11-lang localbase:ldflags python qt:5 \
shebangfix
USE_QT= core gui network widgets buildtools_build qmake_build
USE_QT= core gui network widgets buildtools:build qmake:build
USE_LDCONFIG= yes

SHEBANG_FILES= apps/oskar_convert_cst_to_scalar.py
Expand Down
6 changes: 3 additions & 3 deletions astro/stellarium/Makefile
View file
Expand Up @@ -15,7 +15,7 @@ GH_ACCOUNT= Stellarium

USES= cmake compiler:c++11-lang desktop-file-utils \
qt:5 shared-mime-info
USE_QT= qmake_build buildtools_build \
USE_QT= qmake:build buildtools:build \
charts concurrent core gui network opengl \
printsupport widgets

Expand Down Expand Up @@ -47,7 +47,7 @@ GPS_CMAKE_OFF= -DENABLE_GPS:BOOL=OFF
MULTIMEDIA_USE= QT=multimedia
MULTIMEDIA_CMAKE_OFF= -DENABLE_MEDIA:BOOL=OFF

NLS_USE= QT=linguisttools_build
NLS_USE= QT=linguisttools:build
NLS_CMAKE_OFF= -DENABLE_NLS:BOOL=OFF

SCRIPTS_USE= QT=script
Expand All @@ -56,7 +56,7 @@ SCRIPTS_CMAKE_OFF= -DENABLE_SCRIPTING:BOOL=OFF
TELESCOPE_USE= QT=serialport
TELESCOPE_CMAKE_OFF= -DUSE_PLUGIN_TELESCOPECONTROL:BOOL=OFF

TEST_USE= QT=testlib_build
TEST_USE= QT=testlib:build
TEST_CMAKE_ON= -DENABLE_TESTING:BOOL=ON

TEXTURES_MASTER_SITES= SF/${PORTNAME}/Extra-data-files/textures:gfx
Expand Down

0 comments on commit ddae4e9

Please sign in to comment.