svn commit: r420914 - in head/Mk: Scripts Uses
Mathieu Arnold
mat at FreeBSD.org
Fri Aug 26 12:43:58 UTC 2016
Author: mat
Date: Fri Aug 26 12:43:57 2016
New Revision: 420914
URL: https://svnweb.freebsd.org/changeset/ports/420914
Log:
Use LIB_DEPENDS when appropriate in KDE components.
Lots of KDE components are providing libraries, and they were,
strangely, written as BUILD_ or RUN_DEPENDS, with a full path to the
library. Change this so that if a component is needed at both build,
and, run-time, then it gets a LIB_DEPENDS.
Reviewed by: rakuco, tcberner
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D7625
Modified:
head/Mk/Scripts/qa.sh (contents, props changed)
head/Mk/Uses/kde.mk
Modified: head/Mk/Scripts/qa.sh
==============================================================================
--- head/Mk/Scripts/qa.sh Fri Aug 26 12:21:39 2016 (r420913)
+++ head/Mk/Scripts/qa.sh Fri Aug 26 12:43:57 2016 (r420914)
@@ -440,6 +440,38 @@ proxydeps_suggest_uses() {
elif [ ${pkg} = "x11/mate-menus" ]; then warn "you need USE_MATE+=menus"
elif [ ${pkg} = "x11/mate-panel" ]; then warn "you need USE_MATE+=panel"
elif [ ${pkg} = "sysutils/mate-polkit" ]; then warn "you need USE_MATE+=polkit"
+ # KDE
+ # grep -B1 _LIB= Mk/Uses/kde.mk | grep _PORT=|sed -e 's/^\(.*\)_PORT=[[:space:]]*\([^[:space:]]*\).*/elif [ ${pkg} = "\2" ]; then warn "you need to use USE_KDE+=\1"/'
+ elif [ ${pkg} = "sysutils/baloo" ]; then warn "you need to use USE_KDE+=baloo"
+ elif [ ${pkg} = "sysutils/baloo-widgets" ]; then warn "you need to use USE_KDE+=baloo-widgets"
+ elif [ ${pkg} = "x11/kactivities" ]; then warn "you need to use USE_KDE+=kactivities"
+ elif [ ${pkg} = "editors/kate" ]; then warn "you need to use USE_KDE+=kate"
+ elif [ ${pkg} = "x11/kdelibs4" ]; then warn "you need to use USE_KDE+=kdelibs"
+ elif [ ${pkg} = "sysutils/kfilemetadata" ]; then warn "you need to use USE_KDE+=kfilemetadata"
+ elif [ ${pkg} = "audio/libkcddb" ]; then warn "you need to use USE_KDE+=libkcddb"
+ elif [ ${pkg} = "audio/libkcompactdisc" ]; then warn "you need to use USE_KDE+=libkcompactdisc"
+ elif [ ${pkg} = "graphics/libkdcraw-kde4" ]; then warn "you need to use USE_KDE+=libkdcraw"
+ elif [ ${pkg} = "misc/libkdeedu" ]; then warn "you need to use USE_KDE+=libkdeedu"
+ elif [ ${pkg} = "games/libkdegames" ]; then warn "you need to use USE_KDE+=libkdegames"
+ elif [ ${pkg} = "graphics/libkexiv2-kde4" ]; then warn "you need to use USE_KDE+=libkexiv2"
+ elif [ ${pkg} = "graphics/libkipi-kde4" ]; then warn "you need to use USE_KDE+=libkipi"
+ elif [ ${pkg} = "x11/libkonq" ]; then warn "you need to use USE_KDE+=libkonq"
+ elif [ ${pkg} = "graphics/libksane" ]; then warn "you need to use USE_KDE+=libksane"
+ elif [ ${pkg} = "astro/marble" ]; then warn "you need to use USE_KDE+=marble"
+ elif [ ${pkg} = "sysutils/nepomuk-core" ]; then warn "you need to use USE_KDE+=nepomuk-core"
+ elif [ ${pkg} = "sysutils/nepomuk-widgets" ]; then warn "you need to use USE_KDE+=nepomuk-widgets"
+ elif [ ${pkg} = "graphics/okular" ]; then warn "you need to use USE_KDE+=okular"
+ elif [ ${pkg} = "deskutils/kdepimlibs4" ]; then warn "you need to use USE_KDE+=pimlibs"
+ elif [ ${pkg} = "devel/ruby-qtruby" ]; then warn "you need to use USE_KDE+=qtruby"
+ elif [ ${pkg} = "devel/smokegen" ]; then warn "you need to use USE_KDE+=smokegen"
+ elif [ ${pkg} = "devel/smokekde" ]; then warn "you need to use USE_KDE+=smokekde"
+ elif [ ${pkg} = "devel/smokeqt" ]; then warn "you need to use USE_KDE+=smokeqt"
+ elif [ ${pkg} = "x11/kde4-workspace" ]; then warn "you need to use USE_KDE+=workspace"
+ elif [ ${pkg} = "databases/akonadi" ]; then warn "you need to use USE_KDE+=akonadi"
+ elif [ ${pkg} = "x11-toolkits/attica" ]; then warn "you need to use USE_KDE+=attica"
+ elif [ ${pkg} = "x11/qimageblitz" ]; then warn "you need to use USE_KDE+=qimageblitz"
+ elif [ ${pkg} = "textproc/soprano" ]; then warn "you need to use USE_KDE+=soprano"
+ elif [ ${pkg} = "deskutils/libstreamanalyzer" ]; then warn "you need to use USE_KDE+=strigi"
# sdl-related
elif [ ${pkg} = 'devel/sdl12' ]; then
warn "you need USE_SDL+=sdl"
@@ -474,9 +506,13 @@ proxydeps_suggest_uses() {
# Qt4
elif expr ${pkg} : '.*/qt4-.*' > /dev/null; then
warn "you need USE_QT4+=$(echo ${pkg} | sed -E 's|.*/qt4-||')"
+ elif expr ${pkg} : '.*/.*-qt4' > /dev/null; then
+ warn "you need USE_QT4+=$(echo ${pkg} | sed -E 's|.*/(.*)-qt4|\1|')"
# Qt5
elif expr ${pkg} : '.*/qt5-.*' > /dev/null; then
warn "you need USE_QT5+=$(echo ${pkg} | sed -E 's|.*/qt5-||')"
+ elif expr ${pkg} : '.*/.*-qt5' > /dev/null; then
+ warn "you need USE_QT5+=$(echo ${pkg} | sed -E 's|.*/(.*)-qt5|\1|')"
# MySQL
elif expr ${lib_file} : "${LOCALBASE}/lib/mysql/[^/]*$" > /dev/null; then
warn "you need USES+=mysql"
Modified: head/Mk/Uses/kde.mk
==============================================================================
--- head/Mk/Uses/kde.mk Fri Aug 26 12:21:39 2016 (r420913)
+++ head/Mk/Uses/kde.mk Fri Aug 26 12:43:57 2016 (r420914)
@@ -126,69 +126,69 @@ _USE_KDE4_ALL+= akonadi attica automoc4
# ====================== kde4 components =======================================
baloo_PORT= sysutils/baloo
-baloo_PATH= ${KDE_PREFIX}/lib/libbaloocore.so
+baloo_LIB= libbaloocore.so
baloo-widgets_PORT= sysutils/baloo-widgets
-baloo-widgets_PATH= ${KDE_PREFIX}/lib/libbaloowidgets.so
+baloo-widgets_LIB= libbaloowidgets.so
baseapps_PORT= x11/kde4-baseapps
baseapps_PATH= ${KDE_PREFIX}/bin/kfmclient
baseapps_TYPE= run
kactivities_PORT= x11/kactivities
-kactivities_PATH= ${KDE_PREFIX}/lib/libkactivities.so
+kactivities_LIB= libkactivities.so
kate_PORT= editors/kate
-kate_PATH= ${KDE_PREFIX}/lib/libkateinterfaces.so
+kate_LIB= libkateinterfaces.so
kdelibs_PORT= x11/kdelibs4
-kdelibs_PATH= ${KDE_PREFIX}/lib/libkdecore.so
+kdelibs_LIB= libkdecore.so
kfilemetadata_PORT= sysutils/kfilemetadata
-kfilemetadata_PATH= ${KDE_PREFIX}/lib/libkfilemetadata.so
+kfilemetadata_LIB= libkfilemetadata.so
korundum_PORT= devel/ruby-korundum
korundum_PATH= ${KDE_PREFIX}/lib/kde4/krubypluginfactory.so
korundum_TYPE= run
libkcddb_PORT= audio/libkcddb
-libkcddb_PATH= ${KDE_PREFIX}/lib/libkcddb.so
+libkcddb_LIB= libkcddb.so
libkcompactdisc_PORT= audio/libkcompactdisc
-libkcompactdisc_PATH= ${KDE_PREFIX}/lib/libkcompactdisc.so
+libkcompactdisc_LIB= libkcompactdisc.so
libkdcraw_PORT= graphics/libkdcraw-kde4
-libkdcraw_PATH= ${KDE_PREFIX}/lib/libkdcraw.so
+libkdcraw_LIB= libkdcraw.so
libkdeedu_PORT= misc/libkdeedu
-libkdeedu_PATH= ${KDE_PREFIX}/lib/libkeduvocdocument.so
+libkdeedu_LIB= libkeduvocdocument.so
libkdegames_PORT= games/libkdegames
-libkdegames_PATH= ${KDE_PREFIX}/lib/libkdegames.so
+libkdegames_LIB= libkdegames.so
libkexiv2_PORT= graphics/libkexiv2-kde4
-libkexiv2_PATH= ${KDE_PREFIX}/lib/libkexiv2.so
+libkexiv2_LIB= libkexiv2.so
libkipi_PORT= graphics/libkipi-kde4
-libkipi_PATH= ${KDE_PREFIX}/lib/libkipi.so
+libkipi_LIB= libkipi.so
libkonq_PORT= x11/libkonq
-libkonq_PATH= ${KDE_PREFIX}/lib/libkonq.so
+libkonq_LIB= libkonq.so
libksane_PORT= graphics/libksane
-libksane_PATH= ${KDE_PREFIX}/lib/libksane.so
+libksane_LIB= libksane.so
marble_PORT= astro/marble
-marble_PATH= ${KDE_PREFIX}/lib/libmarblewidget.so
+marble_LIB= libmarblewidget.so
nepomuk-core_PORT= sysutils/nepomuk-core
-nepomuk-core_PATH= ${KDE_PREFIX}/lib/libnepomukcore.so
+nepomuk-core_LIB= libnepomukcore.so
nepomuk-widgets_PORT= sysutils/nepomuk-widgets
-nepomuk-widgets_PATH= ${KDE_PREFIX}/lib/libnepomukwidgets.so
+nepomuk-widgets_LIB= libnepomukwidgets.so
okular_PORT= graphics/okular
-okular_PATH= ${KDE_PREFIX}/lib/libokularcore.so
+okular_LIB= libokularcore.so
oxygen-icons4_PORT= x11-themes/kde4-icons-oxygen
oxygen-icons4_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme
@@ -202,7 +202,7 @@ perlqt_PORT= devel/p5-perlqt
perlqt_PATH= ${KDE_PREFIX}/bin/puic4
pimlibs_PORT= deskutils/kdepimlibs4
-pimlibs_PATH= ${KDE_PREFIX}/lib/libkpimutils.so
+pimlibs_LIB= libkpimutils.so
pykde4_PORT= devel/py-pykde4
pykde4_PATH= ${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so
@@ -213,30 +213,30 @@ pykdeuic4_PATH= ${LOCALBASE}/bin/pykdeu
pykdeuic4_TYPE= run
qtruby_PORT= devel/ruby-qtruby
-qtruby_PATH= ${KDE_PREFIX}/lib/libqtruby4shared.so
+qtruby_LIB= libqtruby4shared.so
runtime_PORT= x11/kde4-runtime
runtime_PATH= ${KDE_PREFIX}/bin/knotify4
runtime_TYPE= run
smokegen_PORT= devel/smokegen
-smokegen_PATH= ${KDE_PREFIX}/lib/libsmokebase.so
+smokegen_LIB= libsmokebase.so
smokekde_PORT= devel/smokekde
-smokekde_PATH= ${KDE_PREFIX}/lib/libsmokekdecore.so
+smokekde_LIB= libsmokekdecore.so
smokeqt_PORT= devel/smokeqt
-smokeqt_PATH= ${KDE_PREFIX}/lib/libsmokeqtcore.so
+smokeqt_LIB= libsmokeqtcore.so
workspace_PORT= x11/kde4-workspace
-workspace_PATH= ${KDE_PREFIX}/lib/libkworkspace.so
+workspace_LIB= libkworkspace.so
# Non-Software Compilation components
akonadi_PORT= databases/akonadi
-akonadi_PATH= ${KDE_PREFIX}/lib/libakonadiprotocolinternals.so
+akonadi_LIB= libakonadiprotocolinternals.so
attica_PORT= x11-toolkits/attica
-attica_PATH= ${LOCALBASE}/lib/libattica.so
+attica_LIB= libattica.so
automoc4_PORT= devel/automoc4
automoc4_PATH= ${LOCALBASE}/bin/automoc4
@@ -246,13 +246,13 @@ ontologies_PORT= x11-toolkits/shared-des
ontologies_PATH= ${LOCALBASE}/share/ontology/core/rdf.ontology
qimageblitz_PORT= x11/qimageblitz
-qimageblitz_PATH= ${LOCALBASE}/lib/libqimageblitz.so
+qimageblitz_LIB= libqimageblitz.so
soprano_PORT= textproc/soprano
-soprano_PATH= ${LOCALBASE}/lib/libsoprano.so
+soprano_LIB= libsoprano.so
strigi_PORT= deskutils/libstreamanalyzer
-strigi_PATH= ${LOCALBASE}/lib/libstreamanalyzer.so.0
+strigi_LIB= libstreamanalyzer.so.0
# ====================== end of kde4 components ================================
# end of component list ########################################################
@@ -264,8 +264,7 @@ _USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL
# Check that the component is valid.
. if ${_USE_KDE_ALL:M${component}} != ""
# Skip meta-components (currently none).
-. if defined(${component}_PORT) && defined(${component}_PATH)
-${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT}
+. if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB))
# Check if a dependency type is explicitly requested.
. if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == ""
${component}_TYPE= # empty
@@ -281,12 +280,18 @@ ${component}_TYPE+= run
${component}_TYPE= build run
. endif
# Set real dependencies.
-. if ${${component}_TYPE:Mbuild} != ""
+. if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun}
+LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT}
+. else
+${component}_PATH?= ${KDE_PREFIX}/lib/${${component}_LIB}
+${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT}
+. if ${${component}_TYPE:Mbuild} != ""
BUILD_DEPENDS+= ${${component}_DEPENDS}
-. endif
-. if ${${component}_TYPE:Mrun} != ""
+. endif
+. if ${${component}_TYPE:Mrun} != ""
RUN_DEPENDS+= ${${component}_DEPENDS}
-. endif
+. endif
+. endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun}
. endif # defined(${component}_PORT) && defined(${component}_PATH)
. else # ! ${_USE_KDE_ALL:M${component}} != ""
IGNORE= cannot be installed: unknown USE_KDE component '${component}'
More information about the svn-ports-all
mailing list