Date: Wed, 24 Aug 2016 08:20:31 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420774 - in head: . Mk Mk/Uses accessibility/jovie accessibility/kaccessible accessibility/kdeaccessibility4 accessibility/kmag accessibility/kmousetool accessibility/kmouth archivers/... Message-ID: <201608240820.u7O8KV4M023577@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Wed Aug 24 08:20:31 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 Added: head/Mk/Uses/kde.mk - copied, changed from r420773, head/Mk/bsd.kde4.mk Deleted: head/Mk/bsd.kde4.mk Modified: head/CHANGES 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-googledata/Makefile head/databases/akonadi/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-runtime/Makefile head/deskutils/kdepim4/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-kioslaves/Makefile head/devel/kdesdk4-strigi-analyzers/Makefile head/devel/kdesdk4-thumbnailers/Makefile head/devel/kdesdk4/Makefile head/devel/kdesvn-kde4/Makefile head/devel/kdevelop-kde4/Makefile head/devel/kdevelop-pg-qt/Makefile head/devel/kdevelop-php-docs/Makefile head/devel/kdevelop-php/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-l10n/Makefile head/editors/calligra-l10n/files/bsd.l10n.mk head/editors/calligra/Makefile head/editors/kate-plugin-pate/Makefile head/editors/kate/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-mobipocket/Makefile head/graphics/kdegraphics4-strigi-analyzer/Makefile head/graphics/kdegraphics4-svgpart/Makefile head/graphics/kdegraphics4-thumbnailers/Makefile head/graphics/kdegraphics4/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-ffmpegthumbs/Makefile head/multimedia/kdemultimedia4-mplayerthumbs/Makefile head/multimedia/kdemultimedia4/Makefile head/multimedia/kdenlive/Makefile head/multimedia/kmplayer-kde4/Makefile head/multimedia/kplayer-kde4/Makefile head/multimedia/mlt/Makefile head/multimedia/phonon-gstreamer/Makefile head/multimedia/phonon-vlc/Makefile head/multimedia/phonon-xine/Makefile head/multimedia/phonon/Makefile head/multimedia/subtitlecomposer-kde4/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-devel/Makefile head/net-p2p/amule-devel/pkg-plist head/net-p2p/amule/Makefile head/net-p2p/amule/pkg-plist head/net-p2p/ktorrent/Makefile head/net-p2p/libktorrent/Makefile head/net/cagibi/Makefile head/net/kdenetwork4-filesharing/Makefile head/net/kdenetwork4-strigi-analyzers/Makefile head/net/kdenetwork4/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/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-widgets/Makefile head/sysutils/baloo/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-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 head/x11/kactivities/Makefile head/x11/kactivitymanagerd/Makefile head/x11/kde4-baseapps/Makefile head/x11/kde4-runtime/Makefile head/x11/kde4-workspace/Makefile head/x11/kde4/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 Modified: head/CHANGES ============================================================================== --- head/CHANGES Wed Aug 24 08:12:34 2016 (r420773) +++ head/CHANGES Wed Aug 24 08:20:31 2016 (r420774) @@ -10,6 +10,20 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20160824: +AUTHOR: kde@FreeBSD.org + A new USES file has been introduced: USES=kde:4, which replaces the old + bsd.kde4.mk file in preparation for upcoming KDE Frameworks and Plasma5 + ports. + + Ports depending on KDE4 have to switch from + USE_KDE4=foo bar + to + USES=kde:4 + USE_KDE=foo bar + and make sure to switch from using KDE4_PREFIX to the new name KDE_PREFIX + in the Makefiles as well as plists. + 20160821: AUTHOR: kde@FreeBSD.org Copied and modified: head/Mk/Uses/kde.mk (from r420773, head/Mk/bsd.kde4.mk) ============================================================================== --- head/Mk/bsd.kde4.mk Wed Aug 24 08:12:34 2016 (r420773, copy source) +++ head/Mk/Uses/kde.mk Wed Aug 24 08:20:31 2016 (r420774) @@ -1,222 +1,211 @@ # $FreeBSD$ - -.if !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include) - -# Please make sure all changes to this file are past through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Kde_Include_MAINTAINER= kde@FreeBSD.org -Kde_Pre_Include= bsd.kde4.mk - -# -# This file contains some variable definitions that are supposed to make your -# life easier when dealing with ports related to the KDE Software Compilation 4. -# It's automatically included when ${USE_KDE4} is defined in a port's Makefile. -# -# KDE4 related ports can use this as follows: -# -# USE_KDE4= kdelibs -# USE_QT4= corelib # Set Qt 4 components here. # -# .include <bsd.port.mk> +# Provides support for KDE-based ports. # -# Additionally, '_build' and '_run' suffixes can be used to force components -# dependency type (e.g., 'marble_run'). If no suffix is set, a default -# dependency type will be used. If you want to force both types, add the -# component twice with both suffixes (e.g., 'pykde4_build pykde4_run'). +# Feature: kde +# Usage: USES=kde or USES=kde:ARGS +# Valid ARGS: 4 # -# Available KDE4 components are: +# 4: Depend on KDE4 components and variables. # -# baloo - Baloo core libraries -# baloo-widgets - Baloo widgets library -# baseapps - Basic applications for KDE Desktop -# kactivities - KDE activities library -# kate - KDE text editor framework -# kdelibs - KDE Developer Platform -# kfilemetadata - KDE library for extracting file metadata -# korundum - KDE Ruby bindings -# libkcddb - KDE CDDB library -# libkcompactdisc - KDE library for interfacing with audio CDs -# libkdcraw - KDE LibRaw library -# libkdeedu - Libraries used by KDE educational applications -# libkdegames - Libraries used by KDE games -# libkexiv2 - KDE Exiv2 library -# libkipi - KDE Image Plugin Interface -# libkonq - Konqueror core library -# libksane - KDE SANE library -# marble - KDE virtual globe -# okular - KDE universal document viewer -# nepomuk-core - Nepomuk core libraries -# nepomuk-widgets - Nepomuk widgets library -# oxygen - KDE icon theme -# perlkde - KDE Perl bindings -# perlqt - Qt 4 Perl bindings -# pimlibs - KDE-Pim libraries -# pykde4 - KDE Python bindings -# pykdeuic4 - PyKDE user interface compiler -# qtruby - Qt 4 Ruby bindings -# runtime - Components required by many KDE Applications -# smokegen - SMOKE base libraries -# smokekde - KDE SMOKE libraries -# smokeqt - Qt 4 SMOKE libraries -# workspace - KDE user environments -# akonadi - Storage server for KDE-Pim -# attica - Qt library implementing Open Collaboration Services API -# automoc4 - Automatic moc for Qt 4 packages -# ontologies - Shared ontologies for semantic searching -# qimageblitz - KDE graphical effects and filters library -# soprano - Qt 4 RDF framework -# strigi - Desktop search daemon +# Variables that can be set by a port: # -# These read-only variables can be used in a port's Makefile: -# -# KDE4_PREFIX - The place where KDE4 ports live. Currently it is -# ${LOCALBASE}/kde4, but this could change in the future. +# USE_KDE List of KDE4 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 (default) Add both dependencies on component <foo> # +# MAINTAINER: kde@FreeBSD.org -KDE4_VERSION?= 4.14.3 -KDE4_KDELIBS_VERSION= 4.14.10 -KDE4_ACTIVITES_VERSION= 4.13.3 -KDE4_WORKSPACE_VERSION= 4.11.21 -KDE4_APPLICATIONS_VERSION?= 15.04.3 -KDE4_APPLICATIONS_BRANCH?= Attic -KDE4_BRANCH?= stable -KTP_VERSION?= 0.9.0 -KTP_BRANCH?= stable -CALLIGRA_VERSION?= 2.9.11 -CALLIGRA_BRANCH?= stable -KDEVELOP_VERSION?= 4.7.3 -KDEVELOP_BRANCH?= stable - -KDE4_PREFIX?= ${LOCALBASE} - -# Help cmake to find files when testing ports with non-default PREFIX -CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE};${KDE4_PREFIX}" \ - -DKDE4_BUILD_TESTS:BOOL=OFF - -PLIST_SUB+= KDE4_PREFIX="${KDE4_PREFIX}" \ - KDE4_VERSION="${KDE4_VERSION}" \ - KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \ - KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \ - KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \ - KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} +.if !defined(_INCLUDE_USES_KDE_MK) +_INCLUDE_USES_KDE_MK= yes -# Keep in sync with cmake/modules/PythonMacros.cmake -_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} -.if ${_PYTHON_SHORT_VER} > 31 -PLIST_SUB+= PYCACHE="__pycache__/" \ - PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \ - PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo -.else -PLIST_SUB+= PYCACHE="" \ - PYC_SUFFIX=pyc \ - PYO_SUFFIX=pyo -.endif +_KDE_SUPPORTED= 4 -.endif # !defined(_POSTMKINCLUDED) && !defined(Kde_Pre_Include) +. if empty(kde_ARGS) +IGNORE= kde needs a version (${_KDE_SUPPORTED}) +. endif -.if defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include) +# At the moment we support KDE versions 4. +. for ver in ${_KDE_SUPPORTED:O:u} +. if ${kde_ARGS:M${ver}} +. if !defined(_KDE_VERSION) +_KDE_VERSION= ${ver} +. else +IGNORE?= cannot be installed: different KDE versions specified via kde:[${_KDE_SUPPORTED:S/ //g}] #' +. endif +. endif +. endfor -Kde_Post_Include= bsd.kde4.mk +. if empty(_KDE_VERSION) +IGNORE?= kde:[${_KDE_SUPPORTED:S/ //g}] needs an argument #' +. endif + +_KDE_RELNAME= KDE${_KDE_VERSION} + +# === VERSIONS OF THE DIFFERENT COMPONENTS ===================================== +# Old KDE desktop. +KDE4_VERSION?= 4.14.3 +KDE4_KDELIBS_VERSION= 4.14.10 +KDE4_ACTIVITIES_VERSION= 4.13.3 +KDE4_WORKSPACE_VERSION= 4.11.21 +KDE4_KDEPIM_VERSION?= 4.14.10 +# Applications version for the kde4-applications. +KDE4_APPLICATIONS_BRANCH?= Attic +KDE4_APPLICATIONS_VERSION?= 15.04.3 +KDE4_BRANCH?= stable -# -# KDE4 components. -# Set ${component}_TYPE to 'build' or 'run' to specify default dependency type -# for ${component}; otherwise, it will default to 'build run'. -# +# Extended KDE universe applications. +CALLIGRA_VERSION?= 2.9.11 +CALLIGRA_BRANCH?= stable + +KDEVELOP_VERSION?= 4.7.3 +KDEVELOP_BRANCH?= stable + +KTP_VERSION?= 0.9.0 +KTP_BRANCH?= stable +# ============================================================================== + +# === INSTALLATION PREFIX ====================================================== +# Define installation prefix. +KDE_PREFIX= ${LOCALBASE} +# ============================================================================== + +# ==== SETUP CMAKE ENVIRONMENT ================================================= +# Help cmake to find files when testing ports with non-default PREFIX. +CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}" + +. if ${_KDE_VERSION:M*4*} +CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF +. endif + +# Set man-page installation prefix. +CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_PREFIX}/man" \ + -DMAN_INSTALL_DIR:PATH="${KDE_PREFIX}/man" +# ============================================================================== + +# === SET-UP PLIST_SUB ========================================================= +# Prefix and include directory. +PLIST_SUB+= KDE_PREFIX="${KDE_PREFIX}" +# KDE Applications version. +PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" +# For KDE4 applications provide KDE4 version numbers. +. if ${_KDE_VERSION:M*4*} +PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" \ + KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \ + KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \ + KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \ + KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} +. endif +# ============================================================================== -_USE_KDE4_ALL= baloo baloo-widgets \ - baseapps kactivities kate kdelibs kfilemetadata \ - korundum libkcddb libkcompactdisc libkdcraw libkdeedu \ - libkexiv2 libkdegames libkipi libkonq libksane marble \ - nepomuk-core nepomuk-widgets \ - okular oxygen perlkde perlqt pimlibs pykde4 pykdeuic4 \ - qtruby runtime smokegen smokekde smokeqt \ +# === HANDLE PYTHON ============================================================ +# TODO: Keep in sync with cmake/modules/PythonMacros.cmake +_PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} +. if ${_PYTHON_SHORT_VER} > 31 +PLIST_SUB+= PYCACHE="__pycache__/" \ + PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \ + PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo +. else +PLIST_SUB+= PYCACHE="" \ + PYC_SUFFIX=pyc \ + PYO_SUFFIX=pyo +. endif +# ============================================================================== +_USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \ + kfilemetadata korundum libkcddb libkcompactdisc \ + libkdcraw libkdeedu libkdegames libkexiv2 libkipi \ + libkonq libksane marble nepomuk-core nepomuk-widgets \ + okular oxygen-icons4 perlkde perlqt pimlibs pykde4 \ + pykdeuic4 qtruby runtime smokegen smokekde smokeqt \ workspace # These components are not part of the Software Compilation. _USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \ strigi +# ====================== kde4 components ======================================= baloo_PORT= sysutils/baloo -baloo_PATH= ${KDE4_PREFIX}/lib/libbaloocore.so +baloo_PATH= ${KDE_PREFIX}/lib/libbaloocore.so baloo-widgets_PORT= sysutils/baloo-widgets -baloo-widgets_PATH= ${KDE4_PREFIX}/lib/libbaloowidgets.so +baloo-widgets_PATH= ${KDE_PREFIX}/lib/libbaloowidgets.so baseapps_PORT= x11/kde4-baseapps -baseapps_PATH= ${KDE4_PREFIX}/bin/kfmclient +baseapps_PATH= ${KDE_PREFIX}/bin/kfmclient baseapps_TYPE= run kactivities_PORT= x11/kactivities -kactivities_PATH= ${KDE4_PREFIX}/lib/libkactivities.so +kactivities_PATH= ${KDE_PREFIX}/lib/libkactivities.so kate_PORT= editors/kate -kate_PATH= ${KDE4_PREFIX}/lib/libkateinterfaces.so +kate_PATH= ${KDE_PREFIX}/lib/libkateinterfaces.so kdelibs_PORT= x11/kdelibs4 -kdelibs_PATH= ${KDE4_PREFIX}/lib/libkdecore.so +kdelibs_PATH= ${KDE_PREFIX}/lib/libkdecore.so kfilemetadata_PORT= sysutils/kfilemetadata -kfilemetadata_PATH= ${KDE4_PREFIX}/lib/libkfilemetadata.so +kfilemetadata_PATH= ${KDE_PREFIX}/lib/libkfilemetadata.so korundum_PORT= devel/ruby-korundum -korundum_PATH= ${KDE4_PREFIX}/lib/kde4/krubypluginfactory.so +korundum_PATH= ${KDE_PREFIX}/lib/kde4/krubypluginfactory.so korundum_TYPE= run libkcddb_PORT= audio/libkcddb -libkcddb_PATH= ${KDE4_PREFIX}/lib/libkcddb.so +libkcddb_PATH= ${KDE_PREFIX}/lib/libkcddb.so libkcompactdisc_PORT= audio/libkcompactdisc -libkcompactdisc_PATH= ${KDE4_PREFIX}/lib/libkcompactdisc.so +libkcompactdisc_PATH= ${KDE_PREFIX}/lib/libkcompactdisc.so libkdcraw_PORT= graphics/libkdcraw-kde4 -libkdcraw_PATH= ${KDE4_PREFIX}/lib/libkdcraw.so +libkdcraw_PATH= ${KDE_PREFIX}/lib/libkdcraw.so libkdeedu_PORT= misc/libkdeedu -libkdeedu_PATH= ${KDE4_PREFIX}/lib/libkeduvocdocument.so +libkdeedu_PATH= ${KDE_PREFIX}/lib/libkeduvocdocument.so libkdegames_PORT= games/libkdegames -libkdegames_PATH= ${KDE4_PREFIX}/lib/libkdegames.so +libkdegames_PATH= ${KDE_PREFIX}/lib/libkdegames.so libkexiv2_PORT= graphics/libkexiv2-kde4 -libkexiv2_PATH= ${KDE4_PREFIX}/lib/libkexiv2.so +libkexiv2_PATH= ${KDE_PREFIX}/lib/libkexiv2.so libkipi_PORT= graphics/libkipi-kde4 -libkipi_PATH= ${KDE4_PREFIX}/lib/libkipi.so +libkipi_PATH= ${KDE_PREFIX}/lib/libkipi.so libkonq_PORT= x11/libkonq -libkonq_PATH= ${KDE4_PREFIX}/lib/libkonq.so +libkonq_PATH= ${KDE_PREFIX}/lib/libkonq.so libksane_PORT= graphics/libksane -libksane_PATH= ${KDE4_PREFIX}/lib/libksane.so +libksane_PATH= ${KDE_PREFIX}/lib/libksane.so marble_PORT= astro/marble -marble_PATH= ${KDE4_PREFIX}/lib/libmarblewidget.so +marble_PATH= ${KDE_PREFIX}/lib/libmarblewidget.so nepomuk-core_PORT= sysutils/nepomuk-core -nepomuk-core_PATH= ${KDE4_PREFIX}/lib/libnepomukcore.so +nepomuk-core_PATH= ${KDE_PREFIX}/lib/libnepomukcore.so nepomuk-widgets_PORT= sysutils/nepomuk-widgets -nepomuk-widgets_PATH= ${KDE4_PREFIX}/lib/libnepomukwidgets.so +nepomuk-widgets_PATH= ${KDE_PREFIX}/lib/libnepomukwidgets.so okular_PORT= graphics/okular -okular_PATH= ${KDE4_PREFIX}/lib/libokularcore.so +okular_PATH= ${KDE_PREFIX}/lib/libokularcore.so -oxygen_PORT= x11-themes/kde4-icons-oxygen -oxygen_PATH= ${KDE4_PREFIX}/share/icons/oxygen/index.theme -oxygen_TYPE= run +oxygen-icons4_PORT= x11-themes/kde4-icons-oxygen +oxygen-icons4_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme +oxygen-icons4_TYPE= run perlkde_PORT= devel/p5-perlkde -perlkde_PATH= ${KDE4_PREFIX}/lib/kde4/kperlpluginfactory.so +perlkde_PATH= ${KDE_PREFIX}/lib/kde4/kperlpluginfactory.so perlkde_TYPE= run perlqt_PORT= devel/p5-perlqt -perlqt_PATH= ${KDE4_PREFIX}/bin/puic4 +perlqt_PATH= ${KDE_PREFIX}/bin/puic4 pimlibs_PORT= deskutils/kdepimlibs4 -pimlibs_PATH= ${KDE4_PREFIX}/lib/libkpimutils.so +pimlibs_PATH= ${KDE_PREFIX}/lib/libkpimutils.so pykde4_PORT= devel/py-pykde4 -pykde4_PATH= ${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so +pykde4_PATH= ${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so pykde4_TYPE= run pykdeuic4_PORT= devel/py-pykdeuic4 @@ -224,26 +213,27 @@ pykdeuic4_PATH= ${LOCALBASE}/bin/pykdeu pykdeuic4_TYPE= run qtruby_PORT= devel/ruby-qtruby -qtruby_PATH= ${KDE4_PREFIX}/lib/libqtruby4shared.so +qtruby_PATH= ${KDE_PREFIX}/lib/libqtruby4shared.so runtime_PORT= x11/kde4-runtime -runtime_PATH= ${KDE4_PREFIX}/bin/knotify4 +runtime_PATH= ${KDE_PREFIX}/bin/knotify4 runtime_TYPE= run smokegen_PORT= devel/smokegen -smokegen_PATH= ${KDE4_PREFIX}/lib/libsmokebase.so +smokegen_PATH= ${KDE_PREFIX}/lib/libsmokebase.so smokekde_PORT= devel/smokekde -smokekde_PATH= ${KDE4_PREFIX}/lib/libsmokekdecore.so +smokekde_PATH= ${KDE_PREFIX}/lib/libsmokekdecore.so smokeqt_PORT= devel/smokeqt -smokeqt_PATH= ${KDE4_PREFIX}/lib/libsmokeqtcore.so +smokeqt_PATH= ${KDE_PREFIX}/lib/libsmokeqtcore.so workspace_PORT= x11/kde4-workspace -workspace_PATH= ${KDE4_PREFIX}/lib/libkworkspace.so +workspace_PATH= ${KDE_PREFIX}/lib/libkworkspace.so +# Non-Software Compilation components akonadi_PORT= databases/akonadi -akonadi_PATH= ${KDE4_PREFIX}/lib/libakonadiprotocolinternals.so +akonadi_PATH= ${KDE_PREFIX}/lib/libakonadiprotocolinternals.so attica_PORT= x11-toolkits/attica attica_PATH= ${LOCALBASE}/lib/libattica.so @@ -263,39 +253,44 @@ soprano_PATH= ${LOCALBASE}/lib/libsopra strigi_PORT= deskutils/libstreamanalyzer strigi_PATH= ${LOCALBASE}/lib/libstreamanalyzer.so.0 +# ====================== end of kde4 components ================================ + +# end of component list ######################################################## + +_USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL} # Iterate through components deprived of suffix. -.for component in ${USE_KDE4:O:u:C/_.+//} +. for component in ${USE_KDE:O:u:C/_.+//} # Check that the component is valid. -. if ${_USE_KDE4_ALL:M${component}} != "" - # Skip meta-components -. if defined(${component}_PORT) && defined(${component}_PATH) +. if ${_USE_KDE_ALL:M${component}} != "" + # Skip meta-components (currently none). +. if defined(${component}_PORT) && defined(${component}_PATH) ${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} # Check if a dependency type is explicitly requested. -. if ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == "" +. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" ${component}_TYPE= # empty -. if ${USE_KDE4:M${component}_build} != "" +. if ${USE_KDE:M${component}_build} != "" ${component}_TYPE+= build -. endif -. if ${USE_KDE4:M${component}_run} != "" +. endif +. if ${USE_KDE:M${component}_run} != "" ${component}_TYPE+= run -. endif -. endif # ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == "" +. endif +. endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" # If no dependency type is set, default to full dependency. -. if !defined(${component}_TYPE) +. if !defined(${component}_TYPE) ${component}_TYPE= build run -. endif +. endif # Set real dependencies. -. if ${${component}_TYPE:Mbuild} != "" +. if ${${component}_TYPE:Mbuild} != "" BUILD_DEPENDS+= ${${component}_DEPENDS} -. endif -. if ${${component}_TYPE:Mrun} != "" +. endif +. if ${${component}_TYPE:Mrun} != "" RUN_DEPENDS+= ${${component}_DEPENDS} -. endif -. endif # defined(${component}_PORT) && defined(${component}_PATH) -. else # ! ${_USE_KDE4_ALL:M${component}} != "" -IGNORE= can't be installed: unknown USE_KDE4 component '${component}' -. endif # ${_USE_KDE4_ALL:M${component}} != "" -.endfor +. endif +. endif # defined(${component}_PORT) && defined(${component}_PATH) +. else # ! ${_USE_KDE_ALL:M${component}} != "" +IGNORE= cannot be installed: unknown USE_KDE component '${component}' +. endif # ${_USE_KDE_ALL:M${component}} != "" +. endfor -.endif # defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include) +.endif Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Aug 24 08:12:34 2016 (r420773) +++ head/Mk/bsd.port.mk Wed Aug 24 08:20:31 2016 (r420774) @@ -389,10 +389,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_WX - If set, this port uses the WxWidgets library and related # components. See bsd.wx.mk for more details. ## -# USE_KDE4 - A list of the KDE 4 dependencies the port has (e.g., -# kdelibs, kdebase). Implies that the port needs KDE. -# Implies inclusion of bsd.kde4.mk. See bsd.kde4.mk -# for more details. # # USE_QT4 - A list of the Qt 4 dependencies the port has (e.g, # corelib, webkit). Implies that the port needs Qt. @@ -1428,10 +1424,6 @@ USES+=mysql:${USE_MYSQL} .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif -.if defined(USE_KDE4) || defined(KDE4_BUILDENV) -.include "${PORTSDIR}/Mk/bsd.kde4.mk" -.endif - .if !defined(UID) UID!= ${ID} -u .endif @@ -1949,10 +1941,6 @@ _USES_POST+= php .include "${PORTSDIR}/Mk/bsd.gecko.mk" .endif -.if defined(USE_KDE4) -.include "${PORTSDIR}/Mk/bsd.kde4.mk" -.endif - .if exists(${PORTSDIR}/Makefile.inc) .include "${PORTSDIR}/Makefile.inc" USE_SUBMAKE= yes Modified: head/accessibility/jovie/Makefile ============================================================================== --- head/accessibility/jovie/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/accessibility/jovie/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -11,8 +11,8 @@ COMMENT= KDE text-to-speech system LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= xml qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes Modified: head/accessibility/kaccessible/Makefile ============================================================================== --- head/accessibility/kaccessible/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/accessibility/kaccessible/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -11,8 +11,8 @@ COMMENT= Accessibility services for KDE LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus gui xml \ qmake_build moc_build rcc_build uic_build Modified: head/accessibility/kdeaccessibility4/Makefile ============================================================================== --- head/accessibility/kdeaccessibility4/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/accessibility/kdeaccessibility4/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -8,25 +8,24 @@ CATEGORIES= accessibility kde MAINTAINER= kde@FreeBSD.org COMMENT= Accessibility applications for KDE 4 -USE_KDE4= # blank, needed to get KDE4_VERSION -USES= metaport +USES= kde:4 metaport OPTIONS_DEFINE= JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} JOVIE_DESC= Install Jovie text-to-speech system -JOVIE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/jovie:accessibility/jovie +JOVIE_RUN_DEPENDS= ${KDE_PREFIX}/bin/jovie:accessibility/jovie KACCESSIBLE_DESC= Install Accessibility services for KDE -KACCESSIBLE_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible +KACCESSIBLE_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible KMAG_DESC= Install Screen magnifier -KMAG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmag:accessibility/kmag +KMAG_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmag:accessibility/kmag KMOUSETOOL_DESC= Install Automatic mouse click tool -KMOUSETOOL_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmousetool:accessibility/kmousetool +KMOUSETOOL_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmousetool:accessibility/kmousetool KMOUTH_DESC= Install Speech synthesizer frontend -KMOUTH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmouth:accessibility/kmouth +KMOUTH_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmouth:accessibility/kmouth .include <bsd.port.mk> Modified: head/accessibility/kmag/Makefile ============================================================================== --- head/accessibility/kmag/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/accessibility/kmag/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE Screen magnifier -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build # Somebody has to create port for libkdeaccessibilityclient first Modified: head/accessibility/kmousetool/Makefile ============================================================================== --- head/accessibility/kmousetool/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/accessibility/kmousetool/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Automatic mouse click tool for KDE -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build USE_XORG= xtst Modified: head/accessibility/kmouth/Makefile ============================================================================== --- head/accessibility/kmouth/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/accessibility/kmouth/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -9,8 +9,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Speech synthesizer frontend for KDE -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build .include <bsd.port.mk> Modified: head/archivers/ark/Makefile ============================================================================== --- head/archivers/ark/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/archivers/ark/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -13,8 +13,8 @@ COMMENT= Archiving tool for KDE LIB_DEPENDS= libqjson.so:devel/qjson -USE_KDE4= automoc4 kdelibs libkonq -USES= cmake:outsource libarchive cpe tar:xz +USES= cmake:outsource kde:4 libarchive cpe tar:xz +USE_KDE= automoc4 kdelibs libkonq CPE_VENDOR= kde USE_QT4= qtestlib qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/astro/kstars/Makefile ============================================================================== --- head/astro/kstars/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/astro/kstars/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -16,13 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgc xplanet:astro/xplanet RUN_DEPENDS= xplanet:astro/xplanet -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource compiler:c++11-lib tar:xz +USES= cmake:outsource compiler:c++11-lib kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= opengl qmake_build moc_build rcc_build uic_build OPTIONS_DEFINE= PYKDE PYKDE_DESC= Support for updating supernovae data -PYKDE_USE= KDE4=pykde4_run +PYKDE_USE= KDE=pykde4_run .include <bsd.port.mk> Modified: head/astro/libkgeomap/Makefile ============================================================================== --- head/astro/libkgeomap/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/astro/libkgeomap/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -14,8 +14,8 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs -USE_KDE4= kdelibs automoc4 marble -USES= cmake:outsource pathfix tar:xz +USES= cmake:outsource kde:4 pathfix tar:xz +USE_KDE= kdelibs automoc4 marble USE_LDCONFIG= yes USE_QT4= network phonon xml moc_build qmake_build rcc_build uic_build Modified: head/astro/marble/Makefile ============================================================================== --- head/astro/marble/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/astro/marble/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -11,8 +11,8 @@ COMMENT= Virtual globe and world atlas f LIB_DEPENDS= libquazip.so:archivers/quazip -USE_KDE4= kdelibs automoc4 -USES= cmake:outsource gmake shared-mime-info tar:xz +USES= cmake:outsource gmake kde:4 shared-mime-info tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= corelib dbus declarative designer_build gui network phonon \ qtestlib script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build Modified: head/audio/amarok-kde4/Makefile ============================================================================== --- head/audio/amarok-kde4/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/amarok-kde4/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -20,16 +20,16 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libdbus-1.so:devel/dbus BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \ - ${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms + ${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms -USE_KDE4= kdelibs libkcddb libkcompactdisc \ +USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2 +USE_KDE= kdelibs libkcddb libkcompactdisc \ nepomuk-core runtime automoc4 strigi USE_MYSQL= embedded USE_QT4= corelib dbus designer gui network opengl \ phonon script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 -USES= cmake pkgconfig shared-mime-info shebangfix tar:bzip2 SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl USE_LDCONFIG= yes Modified: head/audio/audex/Makefile ============================================================================== --- head/audio/audex/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/audex/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -12,8 +12,8 @@ LICENSE= GPLv3 LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia -USES= tar:xz cmake -USE_KDE4= automoc4 kdelibs libkcddb libkcompactdisc +USES= tar:xz cmake kde:4 +USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc USE_QT4= gui dbus network svg xml \ qmake_build moc_build rcc_build uic_build Modified: head/audio/creox/Makefile ============================================================================== --- head/audio/creox/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/creox/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -17,8 +17,8 @@ USE_GITHUB= yes GH_ACCOUNT= laudrup GH_PROJECT= Creox4 -USES= cmake:outsource -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build USE_XORG= xft xpm Modified: head/audio/juk/Makefile ============================================================================== --- head/audio/juk/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/juk/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libtag.so:audio/taglib -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DWITH_TunePimp:BOOL=OFF Modified: head/audio/kaudiocreator/Makefile ============================================================================== --- head/audio/kaudiocreator/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/kaudiocreator/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -21,9 +21,9 @@ RUN_DEPENDS= flac:audio/flac \ RUN_DEPENDS+= lame:audio/lame .endif -USES= cmake tar:bzip2 +USES= cmake kde:4 tar:bzip2 USE_QT4= moc_build qmake_build rcc_build uic_build -USE_KDE4= automoc4 libkcddb libkcompactdisc +USE_KDE= automoc4 libkcddb libkcompactdisc WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/audio/kid3-kde4/Makefile ============================================================================== --- head/audio/kid3-kde4/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/kid3-kde4/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -12,7 +12,7 @@ COMMENT?= MP3/Ogg/FLAC tag editor for KD LICENSE= GPLv2 USE_PERL5= build -USES= cmake:outsource perl5 +USES= cmake:outsource kde:4 perl5 CMAKE_ARGS= -DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \ -DWITH_MANDIR=man \ -DFFMPEG_ROOT=${LOCALBASE} \ @@ -61,7 +61,7 @@ PLIST_SUB+= QT="" KDE="@comment " .else CONFLICTS_INSTALL+= kid3-qt4-3.* kid3-qt5-3.* -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}KDE" PLIST_SUB+= QT="@comment " KDE="" .endif Modified: head/audio/kio-audiocd/Makefile ============================================================================== --- head/audio/kio-audiocd/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/kio-audiocd/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -18,8 +18,8 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs libkcddb libkcompactdisc \ +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs libkcddb libkcompactdisc \ automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/audio/kmix/Makefile ============================================================================== --- head/audio/kmix/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/kmix/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -12,8 +12,8 @@ COMMENT= Sound mixer for KDE LICENSE= GPLv2 -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= gui phonon xml \ moc_build qmake_build rcc_build uic_build Modified: head/audio/kscd/Makefile ============================================================================== --- head/audio/kscd/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/kscd/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -14,8 +14,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libmusicbrainz3.so:audio/libmusicbrainz3 -USES= cmake:outsource tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= phonon moc_build qmake_build rcc_build uic_build OPTIONS_DEFINE= ALSA Modified: head/audio/kstreamripper/Makefile ============================================================================== --- head/audio/kstreamripper/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/kstreamripper/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -11,8 +11,8 @@ COMMENT= Program for recording streams f RUN_DEPENDS= ${LOCALBASE}/bin/streamripper:audio/streamripper -USES= cmake gettext-tools tar:bzip2 -USE_KDE4= kdelibs automoc4 +USES= cmake gettext-tools kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build rcc_build uic_build WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/audio/libkcddb/Makefile ============================================================================== --- head/audio/libkcddb/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/libkcddb/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -13,8 +13,8 @@ COMMENT= KDE CDDB library LIB_DEPENDS= libmusicbrainz5.so:audio/libmusicbrainz5 -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= qtestlib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/audio/libkcompactdisc/Makefile ============================================================================== --- head/audio/libkcompactdisc/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/libkcompactdisc/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -11,8 +11,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE library for interfacing with audio CDs -USES= cmake:outsource tar:xz -USE_KDE4= automoc4 kdelibs +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= phonon moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/audio/simon/Makefile ============================================================================== --- head/audio/simon/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/simon/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -17,8 +17,8 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib libsphinxad.so:audio/sphinxbase \ libqwt6.so:x11-toolkits/qwt6 -USE_KDE4= kdelibs automoc4 pimlibs -USES= cmake:outsource gettext tar:bz2 +USES= cmake:outsource gettext kde:4 tar:bz2 +USE_KDE= kdelibs automoc4 pimlibs USE_QT4= accessible corelib dbus gui script testlib xml \ moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/audio/soundkonverter/Makefile ============================================================================== --- head/audio/soundkonverter/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/soundkonverter/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -17,10 +17,10 @@ LIB_DEPENDS= libtag.so:audio/taglib \ libphonon.so:multimedia/phonon GH_ACCOUNT= HessiJames -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang kde:4 USE_GITHUB= yes USE_QT4= corelib dbus gui network moc_build qmake_build rcc_build svg uic_build xml -USE_KDE4= automoc4 kdelibs libkcddb +USE_KDE= automoc4 kdelibs libkcddb WRKSRC_SUBDIR= src OPTIONS_DEFAULT= VORBIS FLAC NORMALIZE VORBISGAIN CDPARANOIA Modified: head/audio/tomahawk/Makefile ============================================================================== --- head/audio/tomahawk/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/audio/tomahawk/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -34,7 +34,8 @@ GH_ACCOUNT= tomahawk-player TELEPATHY_LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 TELEPATHY_DESC= Configure Telepathy Settings -TELEPATHY_USE_KDE4= kdelibs automoc4 +TELEPATHY_USES= kde:4 +TELEPATHY_USE= KDE=kdelibs,automoc4 INSTALLS_ICONS= yes Modified: head/chinese/qterm/Makefile ============================================================================== --- head/chinese/qterm/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/chinese/qterm/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -44,7 +44,8 @@ QTSCRIPT_RUN_DEPENDS= ${QT_PLUGINDIR}/sc QTSCRIPT_CMAKE_ON= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE QTSCRIPT_CMAKE_OFF= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE -KDE_USE= KDE4=kdelibs,automoc4 +KDE_USES= kde:4 +KDE_USE= KDE=kdelibs,automoc4 post-patch-KDE-off: ${REINPLACE_CMD} -e "/^find_package(KDE4)/d" ${WRKSRC}/CMakeLists.txt Modified: head/comms/kremotecontrol/Makefile ============================================================================== --- head/comms/kremotecontrol/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/comms/kremotecontrol/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -11,8 +11,8 @@ COMMENT= KDE frontend for your remote co RUN_DEPENDS= lircd:comms/lirc -USE_KDE4= automoc4 kdelibs -USES= cmake:outsource tar:xz +USES= cmake:outsource kde:4 tar:xz +USE_KDE= automoc4 kdelibs USE_QT4= corelib script xmlpatterns \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/databases/akonadi-googledata/Makefile ============================================================================== --- head/databases/akonadi-googledata/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/databases/akonadi-googledata/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -12,8 +12,8 @@ COMMENT= Akonadi Resources for Google Co LIB_DEPENDS= libgcal.so:deskutils/libgcal -USES= cmake gettext tar:bzip2 +USES= cmake gettext kde:4 tar:bzip2 USE_QT4= qmake_build rcc_build moc_build uic_build dbus -USE_KDE4= kdelibs pimlibs automoc4 akonadi +USE_KDE= kdelibs pimlibs automoc4 akonadi .include <bsd.port.mk> Modified: head/databases/akonadi/Makefile ============================================================================== --- head/databases/akonadi/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/databases/akonadi/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -16,8 +16,9 @@ LIB_DEPENDS= libboost_thread.so:devel/bo # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt -USE_KDE4= automoc4 soprano -USES= cmake:outsource execinfo shared-mime-info compiler:c++11-lang tar:bzip2 +USES= cmake:outsource execinfo kde:4 shared-mime-info \ + compiler:c++11-lang tar:bzip2 +USE_KDE= automoc4 soprano USE_QT4= corelib dbus gui network qtestlib_build sql xml \ moc_build qmake_build rcc_build uic_build CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL=FALSE \ Modified: head/databases/kbibtex/Makefile ============================================================================== --- head/databases/kbibtex/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/databases/kbibtex/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -14,9 +14,9 @@ LIB_DEPENDS= libpoppler-qt4.so:graphics/ libqca.so:devel/qca \ libqoauth.so:net/qoauth -USES= cmake iconv shared-mime-info tar:xz +USES= cmake iconv kde:4 shared-mime-info tar:xz USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs automoc4 +USE_KDE= kdelibs automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ webkit USE_LDCONFIG= yes Modified: head/deskutils/basket/Makefile ============================================================================== --- head/deskutils/basket/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/deskutils/basket/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -14,9 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libgpgme.so:security/gpgme -USES= cmake gettext-tools tar:bzip2 +USES= cmake gettext-tools kde:4 tar:bzip2 USE_XORG= xft xpm -USE_KDE4= automoc4 pimlibs qimageblitz +USE_KDE= automoc4 pimlibs qimageblitz USE_QT4= moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes Modified: head/deskutils/cairo-dock-plugins/Makefile ============================================================================== --- head/deskutils/cairo-dock-plugins/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/deskutils/cairo-dock-plugins/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -94,7 +94,8 @@ IMPULSE_CMAKE_OFF= -Denable-impulse:BOOL #KDE_INTEGRATION_LIB_DEPENDS= KDE_INTEGRATION_USE_QT4= corelib -KDE_INTEGRATION_USE_KDE4= kdelibs +KDE_INTEGRATION_USES= kde:4 +KDE_INTEGRATION_USE= KDE=kdelibs KDE_INTEGRATION_CMAKE_ON= -Denable-kde-integration:BOOL=TRUE KDE_INTEGRATION_CMAKE_OFF= -Denable-kde-integration:BOOL=FALSE Modified: head/deskutils/homerun/Makefile ============================================================================== --- head/deskutils/homerun/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/deskutils/homerun/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -9,8 +9,8 @@ MASTER_SITES= KDE/unstable/${PORTNAME}/s MAINTAINER= yurkis@gmail.com COMMENT= Fullscreen launcher with content organized in tabs -USES= cmake:outsource compiler:c++0x gettext tar:bzip2 -USE_KDE4= kdelibs automoc4 workspace +USES= cmake:outsource compiler:c++0x gettext kde:4 tar:bzip2 +USE_KDE= kdelibs automoc4 workspace USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui USE_XORG= x11 USE_LDCONFIG= yes Modified: head/deskutils/kcharselect/Makefile ============================================================================== --- head/deskutils/kcharselect/Makefile Wed Aug 24 08:12:34 2016 (r420773) +++ head/deskutils/kcharselect/Makefile Wed Aug 24 08:20:31 2016 (r420774) @@ -10,8 +10,8 @@ DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608240820.u7O8KV4M023577>