From 0f583d87000061087521fb77c44c9055d122d787 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Wed, 24 Aug 2016 08:20:31 +0000 Subject: 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: [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 --- www/choqok/Makefile | 4 ++-- www/kdewebdev4/Makefile | 4 ++-- www/kpartsplugin/Makefile | 4 ++-- www/kwebkitpart/Makefile | 4 ++-- www/opera/Makefile | 3 ++- www/qupzilla-qt4/Makefile | 3 ++- www/rekonq/Makefile | 6 +++--- 7 files changed, 15 insertions(+), 13 deletions(-) (limited to 'www') diff --git a/www/choqok/Makefile b/www/choqok/Makefile index 9c49a6ebbf4a..8f1286d808c3 100644 --- a/www/choqok/Makefile +++ b/www/choqok/Makefile @@ -17,10 +17,10 @@ LIB_DEPENDS= libqjson.so:devel/qjson \ libqoauth.so:net/qoauth \ libtelepathy-qt4.so:net-im/telepathy-qt4 -USE_KDE4= attica automoc4 kdelibs +USES= cmake gettext kde:4 tar:xz +USE_KDE= attica automoc4 kdelibs USE_QT4= gui imageformats_run network \ moc_build qmake_build rcc_build uic_build -USES= cmake gettext tar:xz USE_LDCONFIG= yes .include diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index a6bdab64a6b7..717ed7677c27 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -14,9 +14,9 @@ COMMENT= Comprehensive html/website development environment LIB_DEPENDS= libtidy.so:www/tidy-lib \ libboost_thread.so:devel/boost-libs +USES= cmake:outsource kde:4 tar:xz USE_GNOME= libxml2 libxslt -USE_KDE4= kdelibs pimlibs automoc4 -USES= cmake:outsource tar:xz +USE_KDE= kdelibs pimlibs automoc4 USE_QT4= dbus porting_build \ qmake_build moc_build rcc_build uic_build uic3_build USE_LDCONFIG= yes diff --git a/www/kpartsplugin/Makefile b/www/kpartsplugin/Makefile index 15cf96de68a8..20296237e724 100644 --- a/www/kpartsplugin/Makefile +++ b/www/kpartsplugin/Makefile @@ -10,9 +10,9 @@ DISTNAME= ${PORTNAME}-${PORTDATE} MAINTAINER= avilla@FreeBSD.org COMMENT= Browser file viewer using KDE technology -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 webplugin:native tar:bzip2 +USE_KDE= kdelibs automoc4 USE_QT4= corelib gui moc_build qmake_build rcc_build uic_build -USES= cmake webplugin:native tar:bzip2 CMAKE_ARGS= -DNSPLUGIN_INSTALL_DIR:PATH="${WEBPLUGIN_DIR}" PORTDATE= 20120723 diff --git a/www/kwebkitpart/Makefile b/www/kwebkitpart/Makefile index e8675d4238b3..d80a1bc89e62 100644 --- a/www/kwebkitpart/Makefile +++ b/www/kwebkitpart/Makefile @@ -9,10 +9,10 @@ MASTER_SITES= LOCAL/makc MAINTAINER= kde@FreeBSD.org COMMENT= Web browser component for KDE SC based on QtWebKit -USE_KDE4= kdelibs automoc4 +USES= cmake kde:4 cpe tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= designer gui webkit \ moc_build qmake_build rcc_build uic_build -USES= cmake cpe tar:xz CPE_VENDOR= urs_wolfer diff --git a/www/opera/Makefile b/www/opera/Makefile index eca0f1cad32d..3959591eedd3 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -46,7 +46,8 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups VIDEO_USE= gstreamer=vorbis,ogg,theora,vp8,good GTK2_USE= gnome=gtk20,libxml2 -KDE4_USE= kde4=kdelibs +KDE4_USES= kde:4 +KDE4_USE= KDE=kdelibs .include diff --git a/www/qupzilla-qt4/Makefile b/www/qupzilla-qt4/Makefile index 06c8f80df388..6780ba0518dd 100644 --- a/www/qupzilla-qt4/Makefile +++ b/www/qupzilla-qt4/Makefile @@ -37,7 +37,8 @@ DBUS_CONFIGURE_ENV_OFF= DISABLE_DBUS="true" GNOMEKEYRING_LIB_DEPENDS= libgnome-keyring.so:security/libgnome-keyring GNOMEKEYRING_CONFIGURE_ENV= GNOME_INTEGRATION="true" -KWALLET_USE= KDE4=kdelibs +KWALLET_USES= kde:4 +KWALLET_USE= KDE=kdelibs KWALLET_CONFIGURE_ENV= KDE_INTEGRATION="true" post-patch: diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile index 2cdd6f539a0e..27062d679b2a 100644 --- a/www/rekonq/Makefile +++ b/www/rekonq/Makefile @@ -9,8 +9,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:C,\..*,.0,}/ MAINTAINER= makc@FreeBSD.org COMMENT= Lightweight KDE browser based on WebKit -USES= cmake:outsource gettext tar:xz -USE_KDE4= kdelibs automoc4 +USES= cmake:outsource gettext kde:4 tar:xz +USE_KDE= kdelibs automoc4 USE_QT4= script webkit \ moc_build qmake_build rcc_build uic_build @@ -24,7 +24,7 @@ OPERA_CMAKE_OFF= -DWITH_QCA2=off \ -DWITH_QtOAuth=off NEPOMUK_DESC= Bookmarks tagging via Nepomuk -NEPOMUK_USE= KDE4=nepomuk-core +NEPOMUK_USE= KDE=nepomuk-core NEPOMUK_CMAKE_OFF= -DWITH_NepomukCore=off post-patch: -- cgit v1.2.3