Bug 210667

Summary: Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and Plasma5 ports
Product: Ports & Packages Reporter: Tobias Berner <tcberner>
Component: Ports FrameworkAssignee: Tobias C. Berner <tcberner>
Status: Closed FIXED    
Severity: Affects Only Me CC: kde, pi, portmgr
Priority: --- Flags: tcberner: maintainer-feedback+
Version: Latest   
Hardware: Any   
OS: Any   
Bug Depends on: 211558    
Bug Blocks:    
Attachments:
Description Flags
Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and Plasma5 ports none

Description Tobias Berner 2016-06-28 15:49:43 UTC
Created attachment 171915 [details]
Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and Plasma5 ports

See Review Request: D6961 [0]

At the moment KDE ports use bsd.kde4.mk to handle their dependencies. When working on the ports for KDE Frameworks and Plasma5 it seemed to be more reasonable to create a new kde.mk instead of adding an bsd.kde5.mk.

The kde.mk in this review is a stripped down version of the one we are using in the KDE Test repositories plasma5 branch [1] to only contain the parts relevant to the current KDE4 ports in the portstree [2].

Changes to the KDE Ports needed by this:

Replace USE_KDE4 by USE_KDE [3]
Add USES=kde:4 [4]


As requested in the review [0] USES was shuffled up in the affected ports.


[0] https://reviews.freebsd.org/D6961
[1] http://src.mouf.net/area51/view/branches/plasma5/KDE/Mk/Uses/kde.mk
[2] The version in the plasma5 branch also handles frameworks/plasma5 and handles MASTER_SITES via a KDE_DIST variable similar to bsd.qt.mk for Qt Ports -- I chose to leave this out for now, as the diff is already large enough. 
[3] I chose USE_KDE instead of USE_KDE4, USE_KDE5, USE_KDEX as the version we want is already specified as argument to kde:<arg> 
[4] For KDE Frameworks and Plasma5 ports this would be kde:5
Comment 1 Antoine Brodin freebsd_committer freebsd_triage 2016-07-20 14:26:43 UTC
There is 1 new failure:

+ {"origin"=>"textproc/uim-kde4", "pkgname"=>"uim-kde4-1.8.6_2", "phase"=>"build", "errortype"=>"???"}

Failure log:

http://package18.nyi.freebsd.org/data/101i386-default-PR210667/2016-07-20_13h38m42s/logs/errors/uim-kde4-1.8.6_2.log
Comment 2 Tobias C. Berner freebsd_committer freebsd_triage 2016-07-20 14:49:03 UTC
Ah, I see. textproc/uim sets USES= thereby overriding the value from the slave ports.
So replacing the USES= by a USES+= in texproc/uim should solve that.
Comment 3 commit-hook freebsd_committer freebsd_triage 2016-08-24 08:21:09 UTC
A commit references this bug:

Author: tcberner
Date: Wed Aug 24 08:20:36 UTC 2016
New revision: 420774
URL: https://svnweb.freebsd.org/changeset/ports/420774

Log:
  Replace Mk/bsd.kde4.mk by Mk/Uses/kde.mk in preparation for KDE Frameworks and
  Plasma5 ports

  At the moment KDE ports use bsd.kde4.mk to handle their dependencies. When
  working on the ports for KDE Frameworks and Plasma5 it seemed to be more
  reasonable to create a new kde.mk instead of adding an bsd.kde5.mk.

  The kde.mk in this review is a stripped down version of the one we are using in
  the KDE Test repositories plasma5 branch [1] to only contain the parts relevant
  to the current KDE4 ports in the portstree [2].

  Changes to the KDE Ports needed by this:

  Replace USE_KDE4 by USE_KDE [3]
  Add USES=kde:4 [4]
  [1] http://src.mouf.net/area51/view/branches/plasma5/KDE/Mk/Uses/kde.mk
  [2] The version in the plasma5 branch also handles frameworks/plasma5 and
      handles MASTER_SITES via a KDE_DIST variable similar to bsd.qt.mk for Qt
      Ports -- I chose to leave this out for now, as the diff is already large
      enough.
  [3] I chose USE_KDE instead of USE_KDE4, USE_KDE5, USE_KDEX as the version we
      want is already specified as argument to kde:<arg>
  [4] For KDE Frameworks and Plasma5 ports this would be kde:5

  PR:             210667
  Approved by:    portmgr, mat (mentor), rakuco (mentor)
  Reviewed by:    mat, rakuco
  Differential Revision:   https://reviews.freebsd.org/D6961

Changes:
  head/CHANGES
  head/Mk/Uses/kde.mk
  head/Mk/bsd.kde4.mk
  head/Mk/bsd.port.mk
  head/accessibility/jovie/Makefile
  head/accessibility/kaccessible/Makefile
  head/accessibility/kdeaccessibility4/Makefile
  head/accessibility/kmag/Makefile
  head/accessibility/kmousetool/Makefile
  head/accessibility/kmouth/Makefile
  head/archivers/ark/Makefile
  head/astro/kstars/Makefile
  head/astro/libkgeomap/Makefile
  head/astro/marble/Makefile
  head/audio/amarok-kde4/Makefile
  head/audio/audex/Makefile
  head/audio/creox/Makefile
  head/audio/juk/Makefile
  head/audio/kaudiocreator/Makefile
  head/audio/kid3-kde4/Makefile
  head/audio/kio-audiocd/Makefile
  head/audio/kmix/Makefile
  head/audio/kscd/Makefile
  head/audio/kstreamripper/Makefile
  head/audio/libkcddb/Makefile
  head/audio/libkcompactdisc/Makefile
  head/audio/simon/Makefile
  head/audio/soundkonverter/Makefile
  head/audio/tomahawk/Makefile
  head/chinese/qterm/Makefile
  head/comms/kremotecontrol/Makefile
  head/databases/akonadi/Makefile
  head/databases/akonadi-googledata/Makefile
  head/databases/kbibtex/Makefile
  head/deskutils/basket/Makefile
  head/deskutils/cairo-dock-plugins/Makefile
  head/deskutils/homerun/Makefile
  head/deskutils/kcharselect/Makefile
  head/deskutils/kchmviewer-kde4/Makefile
  head/deskutils/kdeconnect/Makefile
  head/deskutils/kdepim4/Makefile
  head/deskutils/kdepim4-runtime/Makefile
  head/deskutils/kdepimlibs4/Makefile
  head/deskutils/kdepimlibs4/files/patch-cmake__modules__FindQGpgme.cmake
  head/deskutils/kdeplasma-addons/Makefile
  head/deskutils/kruler/Makefile
  head/deskutils/ksshaskpass/Makefile
  head/deskutils/plasma-applet-cwp/Makefile
  head/deskutils/plasma-applet-daisy/Makefile
  head/deskutils/plasma-applet-fancytasks/Makefile
  head/deskutils/plasma-applet-panelspacer/Makefile
  head/deskutils/plasma-applet-playwolf/Makefile
  head/deskutils/plasma-applet-qstardict/Makefile
  head/deskutils/plasma-applet-serverstatuswidget/Makefile
  head/deskutils/plasma-applet-simpleweatherforecast/Makefile
  head/deskutils/plasma-applet-teacooker/Makefile
  head/deskutils/plasma-applet-yawp/Makefile
  head/deskutils/semantik/Makefile
  head/deskutils/silence/Makefile
  head/deskutils/strigi/Makefile
  head/deskutils/superkaramba/Makefile
  head/devel/cervisia/Makefile
  head/devel/cmake/Makefile
  head/devel/dolphin-plugins/Makefile
  head/devel/kapptemplate/Makefile
  head/devel/kcachegrind/Makefile
  head/devel/kdbg/Makefile
  head/devel/kde-dev-scripts/Makefile
  head/devel/kde-dev-utils/Makefile
  head/devel/kdebindings4/Makefile
  head/devel/kdesdk4/Makefile
  head/devel/kdesdk4-kioslaves/Makefile
  head/devel/kdesdk4-strigi-analyzers/Makefile
  head/devel/kdesdk4-thumbnailers/Makefile
  head/devel/kdesvn-kde4/Makefile
  head/devel/kdevelop-kde4/Makefile
  head/devel/kdevelop-pg-qt/Makefile
  head/devel/kdevelop-php/Makefile
  head/devel/kdevelop-php-docs/Makefile
  head/devel/kdevplatform/Makefile
  head/devel/libkgapi/Makefile
  head/devel/libkolab/Makefile
  head/devel/lokalize/Makefile
  head/devel/okteta/Makefile
  head/devel/p5-perlkde/Makefile
  head/devel/p5-perlqt/Makefile
  head/devel/piklab/Makefile
  head/devel/poxml/Makefile
  head/devel/py-krosspython/Makefile
  head/devel/py-pykde4/Makefile
  head/devel/py-pykdeuic4/Makefile
  head/devel/ruby-korundum/Makefile
  head/devel/ruby-krossruby/Makefile
  head/devel/ruby-qtruby/Makefile
  head/devel/smokegen/Makefile
  head/devel/smokekde/Makefile
  head/devel/smokeqt/Makefile
  head/devel/umbrello/Makefile
  head/editors/calligra/Makefile
  head/editors/calligra-l10n/Makefile
  head/editors/calligra-l10n/files/bsd.l10n.mk
  head/editors/kate/Makefile
  head/editors/kate-plugin-pate/Makefile
  head/editors/kile-kde4/Makefile
  head/editors/klat4/Makefile
  head/editors/libreoffice/Makefile
  head/editors/libreoffice4/Makefile
  head/editors/yzis/Makefile
  head/finance/kmymoney-kde4/Makefile
  head/finance/libalkimia/Makefile
  head/finance/skrooge/Makefile
  head/ftp/plasma-applet-ftpmonitor/Makefile
  head/games/blinken/Makefile
  head/games/bomber/Makefile
  head/games/bovo/Makefile
  head/games/granatier/Makefile
  head/games/kajongg/Makefile
  head/games/kanagram/Makefile
  head/games/kapman/Makefile
  head/games/katomic/Makefile
  head/games/kblackbox/Makefile
  head/games/kblocks/Makefile
  head/games/kbounce/Makefile
  head/games/kbreakout/Makefile
  head/games/kdegames4/Makefile
  head/games/kdegames4/Makefile.common
  head/games/kdiamond/Makefile
  head/games/kfourinline/Makefile
  head/games/kgoldrunner/Makefile
  head/games/khangman/Makefile
  head/games/kigo/Makefile
  head/games/killbots/Makefile
  head/games/kiriki/Makefile
  head/games/kjumpingcube/Makefile
  head/games/klickety/Makefile
  head/games/klines/Makefile
  head/games/kmahjongg/Makefile
  head/games/kmines/Makefile
  head/games/knavalbattle/Makefile
  head/games/knetwalk/Makefile
  head/games/knights-kde4/Makefile
  head/games/kolf/Makefile
  head/games/kollision/Makefile
  head/games/konquest/Makefile
  head/games/kpat/Makefile
  head/games/kreversi/Makefile
  head/games/kshisen/Makefile
  head/games/ksirk/Makefile
  head/games/ksnakeduel/Makefile
  head/games/kspaceduel/Makefile
  head/games/ksquares/Makefile
  head/games/ksudoku/Makefile
  head/games/ktuberling/Makefile
  head/games/kubrick/Makefile
  head/games/libkdegames/Makefile
  head/games/libkmahjongg/Makefile
  head/games/lskat/Makefile
  head/games/pairs/Makefile
  head/games/palapeli/Makefile
  head/games/picmi/Makefile
  head/graphics/digikam-kde4/Makefile
  head/graphics/digikam-kde4/Makefile.common
  head/graphics/gnash/Makefile
  head/graphics/gwenview-kde4/Makefile
  head/graphics/kamera-kde4/Makefile
  head/graphics/kcolorchooser/Makefile
  head/graphics/kcoloredit/Makefile
  head/graphics/kdegraphics4/Makefile
  head/graphics/kdegraphics4-mobipocket/Makefile
  head/graphics/kdegraphics4-strigi-analyzer/Makefile
  head/graphics/kdegraphics4-svgpart/Makefile
  head/graphics/kdegraphics4-thumbnailers/Makefile
  head/graphics/kiconedit/Makefile
  head/graphics/kipi-plugin-acquireimages/Makefile
  head/graphics/kipi-plugin-calendar/Makefile
  head/graphics/kolourpaint/Makefile
  head/graphics/kphotoalbum-kde4/Makefile
  head/graphics/kpovmodeler/Makefile
  head/graphics/kqtquickcharts/Makefile
  head/graphics/ksaneplugin/Makefile
  head/graphics/ksnapshot/Makefile
  head/graphics/libkdcraw-kde4/Makefile
  head/graphics/libkexiv2-kde4/Makefile
  head/graphics/libkface/Makefile
  head/graphics/libkipi-kde4/Makefile
  head/graphics/libkipiplugins/Makefile
  head/graphics/libksane/Makefile
  head/graphics/libkscreen/Makefile
  head/graphics/okular/Makefile
  head/graphics/showimage/Makefile
  head/graphics/skanlite/Makefile
  head/irc/konversation-kde4/Makefile
  head/irc/kvirc/Makefile
  head/japanese/kiten/Makefile
  head/lang/kturtle/Makefile
  head/mail/kbiff/Makefile
  head/mail/kshowmail/Makefile
  head/math/abakus/Makefile
  head/math/analitza/Makefile
  head/math/cantor/Makefile
  head/math/kalgebra/Makefile
  head/math/kbruch/Makefile
  head/math/kcalc/Makefile
  head/math/kig/Makefile
  head/math/kmplot/Makefile
  head/math/labplot/Makefile
  head/math/rkward-kde4/Makefile
  head/math/rocs/Makefile
  head/misc/artikulate/Makefile
  head/misc/kde-thumbnailer-chm/Makefile
  head/misc/kde-thumbnailer-epub/Makefile
  head/misc/kde-thumbnailer-fb2/Makefile
  head/misc/kde4-l10n/Makefile
  head/misc/kde4-l10n/files/bsd.l10n.mk
  head/misc/kdeedu4/Makefile
  head/misc/kdeutils4/Makefile
  head/misc/kgeography/Makefile
  head/misc/klettres/Makefile
  head/misc/krecipes-kde4/Makefile
  head/misc/ktouch/Makefile
  head/misc/kwordquiz/Makefile
  head/misc/libkdeedu/Makefile
  head/misc/parley/Makefile
  head/misc/tellico-kde4/Makefile
  head/multimedia/bangarang/Makefile
  head/multimedia/dragon/Makefile
  head/multimedia/gstreamer-qt4/Makefile
  head/multimedia/k9copy-kde4/Makefile
  head/multimedia/kaffeine/Makefile
  head/multimedia/kdemultimedia4/Makefile
  head/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
  head/multimedia/kdemultimedia4-mplayerthumbs/Makefile
  head/multimedia/kdenlive/Makefile
  head/multimedia/kmplayer-kde4/Makefile
  head/multimedia/kplayer-kde4/Makefile
  head/multimedia/mlt/Makefile
  head/multimedia/phonon/Makefile
  head/multimedia/phonon-gstreamer/Makefile
  head/multimedia/phonon-vlc/Makefile
  head/multimedia/phonon-xine/Makefile
  head/multimedia/subtitlecomposer-kde4/Makefile
  head/net/cagibi/Makefile
  head/net/kdenetwork4/Makefile
  head/net/kdenetwork4-filesharing/Makefile
  head/net/kdenetwork4-strigi-analyzers/Makefile
  head/net/kget/Makefile
  head/net/kio-upnp-ms/Makefile
  head/net/knemo-kde4/Makefile
  head/net/krdc/Makefile
  head/net/krfb/Makefile
  head/net/kwooty/Makefile
  head/net/libkfbapi/Makefile
  head/net/libkvkontakte/Makefile
  head/net/libproxy-kde/Makefile
  head/net/smb4k-kde4/Makefile
  head/net/zeroconf-ioslave/Makefile
  head/net-im/ekiga/Makefile
  head/net-im/hotot/Makefile
  head/net-im/kde-telepathy/Makefile
  head/net-im/kmess-kde4/Makefile
  head/net-im/kopete-kde4/Makefile
  head/net-im/ktp-accounts-kcm/Makefile
  head/net-im/ktp-approver/Makefile
  head/net-im/ktp-auth-handler/Makefile
  head/net-im/ktp-common-internals/Makefile
  head/net-im/ktp-contact-list/Makefile
  head/net-im/ktp-contact-runner/Makefile
  head/net-im/ktp-desktop-applets/Makefile
  head/net-im/ktp-filetransfer-handler/Makefile
  head/net-im/ktp-kded-integration-module/Makefile
  head/net-im/ktp-send-file/Makefile
  head/net-im/ktp-text-ui/Makefile
  head/net-im/licq-qt-gui/Makefile
  head/net-im/plasma-applet-ktp/Makefile
  head/net-im/telepathy-logger-qt4/Makefile
  head/net-p2p/amule/Makefile
  head/net-p2p/amule/pkg-plist
  head/net-p2p/amule-devel/Makefile
  head/net-p2p/amule-devel/pkg-plist
  head/net-p2p/ktorrent/Makefile
  head/net-p2p/libktorrent/Makefile
  head/ports-mgmt/kpackagekit/Makefile
  head/print/frescobaldi/Makefile
  head/print/kde4-print-manager/Makefile
  head/print/kover/Makefile
  head/science/kalzium/Makefile
  head/science/step/Makefile
  head/security/kgpg-kde4/Makefile
  head/security/kwalletmanager/Makefile
  head/security/py-keyrings.alt/Makefile
  head/security/subversion-kwallet/Makefile
  head/sysutils/baloo/Makefile
  head/sysutils/baloo-widgets/Makefile
  head/sysutils/filelight-kde4/Makefile
  head/sysutils/k3b-kde4/Makefile
  head/sysutils/kcm-polkit-kde/Makefile
  head/sysutils/kcron/Makefile
  head/sysutils/kdeadmin4/Makefile
  head/sysutils/kdf/Makefile
  head/sysutils/kdirstat/Makefile
  head/sysutils/kfilemetadata/Makefile
  head/sysutils/kfloppy/Makefile
  head/sysutils/knutclient-kde4/Makefile
  head/sysutils/krename-kde4/Makefile
  head/sysutils/kshutdown-kde4/Makefile
  head/sysutils/ksysguardd/Makefile
  head/sysutils/ksystemlog/Makefile
  head/sysutils/kuser/Makefile
  head/sysutils/nepomuk-core/Makefile
  head/sysutils/nepomuk-widgets/Makefile
  head/sysutils/plasma-applet-apcups/Makefile
  head/sysutils/policykit-qt/Makefile
  head/sysutils/polkit-kde/Makefile
  head/sysutils/polkit-qt/Makefile
  head/sysutils/qzeitgeist/Makefile
  head/sysutils/sweeper/Makefile
  head/textproc/dikt/Makefile
  head/textproc/kdiff3/Makefile
  head/textproc/kompare/Makefile
  head/textproc/libkomparediff2/Makefile
  head/textproc/uim-kde4/Makefile
  head/www/choqok/Makefile
  head/www/kdewebdev4/Makefile
  head/www/kpartsplugin/Makefile
  head/www/kwebkitpart/Makefile
  head/www/opera/Makefile
  head/www/qupzilla-qt4/Makefile
  head/www/rekonq/Makefile
  head/x11/kactivities/Makefile
  head/x11/kactivitymanagerd/Makefile
  head/x11/kde4/Makefile
  head/x11/kde4-baseapps/Makefile
  head/x11/kde4-runtime/Makefile
  head/x11/kde4-workspace/Makefile
  head/x11/kdelibs4/Makefile
  head/x11/kgamma/Makefile
  head/x11/konsole/Makefile
  head/x11/libkonq/Makefile
  head/x11/plasma-scriptengine-python/Makefile
  head/x11/plasma-scriptengine-ruby/Makefile
  head/x11/rsibreak-kde4/Makefile
  head/x11/yakuake-kde4/Makefile
  head/x11-clocks/amor/Makefile
  head/x11-clocks/kdetoys4/Makefile
  head/x11-clocks/kteatime/Makefile
  head/x11-clocks/ktimer/Makefile
  head/x11-clocks/ktux/Makefile
  head/x11-clocks/plasma-applet-adjustableclock/Makefile
  head/x11-clocks/plasma-applet-geekclock/Makefile
  head/x11-fm/krusader2/Makefile
  head/x11-themes/gtk-qt4-engine/Makefile
  head/x11-themes/kde-gtk-config/Makefile
  head/x11-themes/kde4-base-artwork/Makefile
  head/x11-themes/kde4-icons-oxygen/Makefile
  head/x11-themes/kde4-style-bespin/Makefile
  head/x11-themes/kde4-style-nitrogen/Makefile
  head/x11-themes/kde4-style-oxygen-transparent/Makefile
  head/x11-themes/kde4-style-polyester/Makefile
  head/x11-themes/kde4-style-skulpture/Makefile
  head/x11-themes/kde4-wallpapers/Makefile
  head/x11-themes/kde4-windeco-crystal/Makefile
  head/x11-themes/kde4-windeco-dekorator/Makefile
  head/x11-themes/kdeartwork4/Makefile
  head/x11-themes/qtcurve/Makefile