Skip to content

Commit a90e961

Browse files
deckedecke
committed
*/*: Avoid extra CPE_VENDOR=kde by properly sorting USES
CPE_VENDOR=kde is already set in Uses/kde.mk so adding cpe after kde in our USES line makes sure that it's picked up properly. Approved by: portmgr (blanket)
1 parent c5420e8 commit a90e961

8 files changed

Lines changed: 13 additions & 25 deletions

File tree

‎archivers/ark/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ COMMENT= Archiving tool for KDE
88
LICENSE= GPLv2+
99
LICENSE_FILE= ${WRKSRC}/COPYING
1010

11-
USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext libarchive kde:5 \
12-
qt:5 shared-mime-info tar:xz
11+
USES= cmake compiler:c++11-lang desktop-file-utils gettext libarchive kde:5 \
12+
cpe qt:5 shared-mime-info tar:xz
1313
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
1414
coreaddons crash dbusaddons doctools i18n iconthemes \
1515
itemmodels itemviews jobwidgets khtml kio parts pty service \
@@ -19,7 +19,6 @@ USE_QT= concurrent core dbus gui network widgets xml \
1919
buildtools_build qmake_build
2020

2121
USE_LDCONFIG= yes
22-
CPE_VENDOR= kde
2322

2423
OPTIONS_DEFINE= 7ZIP RAR ZIP DOCS
2524
OPTIONS_DEFAULT= 7ZIP ZIP DOCS

‎devel/kf5-ktexteditor/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COMMENT= KF5 advanced embeddable text editor
88
LIB_DEPENDS= libgit2.so:devel/libgit2 \
99
libeditorconfig.so:editors/editorconfig-core-c
1010

11-
USES= cmake compiler:c++11-lib cpe gettext kde:5 pkgconfig qt:5 tar:xz
11+
USES= cmake compiler:c++11-lib gettext kde:5 cpe pkgconfig qt:5 tar:xz
1212
USE_KDE= archive auth codecs completion config configwidgets \
1313
coreaddons guiaddons i18n iconthemes itemviews \
1414
jobwidgets kio parts service sonnet syntaxhighlighting \
@@ -17,6 +17,5 @@ USE_KDE= archive auth codecs completion config configwidgets \
1717
USE_QT= concurrent core dbus declarative gui network printsupport \
1818
script widgets xml xmlpatterns \
1919
buildtools_build qmake_build
20-
CPE_VENDOR= kde
2120

2221
.include <bsd.port.mk>

‎graphics/okular/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ LIB_DEPENDS= libchm.so:misc/chmlib \
2121
libtiff.so:graphics/tiff \
2222
libzip.so:archivers/libzip
2323

24-
USES= cmake compiler:c++11-lib cpe desktop-file-utils \
25-
gettext jpeg kde:5 pkgconfig qca qt:5 tar:xz
24+
USES= cmake compiler:c++11-lib desktop-file-utils \
25+
gettext jpeg kde:5 cpe pkgconfig qca qt:5 tar:xz
2626
USE_KDE= activities archive auth bookmarks codecs completion config \
2727
configwidgets coreaddons crash dbusaddons emoticons i18n \
2828
iconthemes init itemmodels itemviews jobwidgets js \
@@ -33,7 +33,6 @@ USE_KDE= activities archive auth bookmarks codecs completion config \
3333
USE_QT= concurrent core dbus declarative gui network phonon4 printsupport speech \
3434
svg widgets xml \
3535
buildtools_build qmake_build testlib_build
36-
CPE_VENDOR= kde
3736

3837
OPTIONS_DEFINE= DOCS PURPOSE
3938
OPTIONS_DEFAULT= PURPOSE

‎security/plasma5-kscreenlocker/Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LIB_DEPENDS= libwayland-client.so:graphics/wayland \
1111
RUN_DEPENDS= ck-list-sessions:sysutils/consolekit2\
1212
dbus-send:devel/dbus
1313

14-
USES= cmake compiler:c++11-lib cpe gettext kde:5 pkgconfig qt:5 \
14+
USES= cmake compiler:c++11-lib gettext kde:5 cpe pkgconfig qt:5 \
1515
shebangfix tar:xz xorg
1616
USE_KDE= auth codecs config configwidgets coreaddons crash emoticons \
1717
globalaccel i18n idletime init itemmodels kcmutils \
@@ -23,8 +23,6 @@ USE_QT= core dbus declarative gui network qdbus widgets x11extras xml \
2323
buildtools_build qmake_build testlib_build
2424
USE_XORG= ice sm x11 xcb xcursor xext xi
2525

26-
CPE_VENDOR= kde
27-
2826
SHEBANG_FILES= updaters/ksreenlocker_5_3_separate_autologin.pl
2927

3028
.include <bsd.port.mk>

‎sysutils/plasma5-discover/Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ COMMENT= Plasma5 package management tools
88
# TODO: update packagekit-qt5
99
#LIB_DEPENDS= libpackagekit-qt.so:ports-mgmt/packagekit-qt5
1010

11-
USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 \
12-
pkgconfig qt:5 tar:xz
11+
USES= cmake compiler:c++11-lib desktop-file-utils gettext kde:5 \
12+
cpe pkgconfig qt:5 tar:xz
1313
USE_KDE= archive attica auth codecs completion config configwidgets \
1414
coreaddons crash dbusaddons i18n iconthemes idletime \
1515
itemmodels itemviews jobwidgets kcmutils kdeclarative kio \
@@ -21,6 +21,4 @@ USE_QT= concurrent core dbus declarative gui network svg widgets \
2121
x11extras xml \
2222
buildtools_build qmake_build testlib_build
2323

24-
CPE_VENDOR= kde
25-
2624
.include <bsd.port.mk>

‎sysutils/plasma5-kde-cli-tools/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CATEGORIES= sysutils kde kde-plasma
55
MAINTAINER= kde@FreeBSD.org
66
COMMENT= Plasma5 non-interactive system tools
77

8-
USES= cmake compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz xorg
8+
USES= cmake compiler:c++11-lib gettext kde:5 cpe qt:5 tar:xz xorg
99
USE_KDE= activities auth bookmarks codecs completion config \
1010
configwidgets coreaddons crash emoticons guiaddons i18n \
1111
iconthemes init itemmodels itemviews jobwidgets kcmutils \
@@ -17,6 +17,5 @@ USE_QT= concurrent core dbus declarative gui network printsupport svg \
1717
widgets x11extras xml \
1818
buildtools_build qmake_build testlib_build
1919
USE_XORG= x11
20-
CPE_VENDOR= kde
2120

2221
.include <bsd.port.mk>

‎x11/plasma5-plasma-desktop/Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ BUILD_DEPENDS= xf86-input-evdev>0:x11-drivers/xf86-input-evdev \
2323
xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics \
2424
xf86-input-libinput>0:x11-drivers/xf86-input-libinput
2525

26-
USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext gnome \
27-
kde:5 pkgconfig python:3.5+,run qt:5 shebangfix tar:xz xorg
26+
USES= cmake compiler:c++11-lib desktop-file-utils gettext gnome \
27+
kde:5 cpe pkgconfig python:3.5+,run qt:5 shebangfix tar:xz xorg
2828
USE_GNOME= glib20
2929
USE_KDE= activities activities-stats archive attica auth baloo \
3030
bookmarks codecs completion config configwidgets coreaddons \
@@ -43,8 +43,6 @@ USE_QT= concurrent core dbus declarative gui network phonon4 \
4343
buildtools_build qmake_build
4444
USE_XORG= ice sm x11 xcb xcursor xext xfixes xft xi xrender
4545

46-
CPE_VENDOR= kde
47-
4846
CMAKE_ON= WANT_SYNAPTICS
4947

5048
SHEBANG_FILES= kcms/ksmserver/kconf_update/*.py \

‎x11/plasma5-plasma-workspace/Makefile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ RUN_DEPENDS= ck-launch-session:sysutils/consolekit2\
2424
${LOCALBASE}/bin/genv:sysutils/coreutils
2525

2626

27-
USES= cmake compiler:c++11-lib cpe desktop-file-utils gettext kde:5 \
28-
pkgconfig qt:5 tar:xz xorg
27+
USES= cmake compiler:c++11-lib desktop-file-utils gettext kde:5 \
28+
cpe pkgconfig qt:5 tar:xz xorg
2929
USE_KDE= activities activities-stats activitymanagerd archive attica \
3030
auth baloo bookmarks codecs completion config configwidgets \
3131
coreaddons crash dbusaddons emoticons filemetadata globalaccel \
@@ -46,8 +46,6 @@ USE_QT= concurrent core dbus declarative graphicaleffects gui network \
4646
paths_run quickcontrols_run
4747
USE_XORG= ice sm x11 xau xcb xcomposite xcursor xext xfixes xft xkbfile xrender xtst
4848

49-
CPE_VENDOR= kde
50-
5149
CMAKE_OFF= BUILD_TESTING
5250

5351
# In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace:

0 commit comments

Comments
 (0)