Date: Thu, 21 Jan 2021 21:14:20 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562246 - head/Mk/Uses Message-ID: <202101212114.10LLEKbk049895@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Thu Jan 21 21:14:20 2021 New Revision: 562246 URL: https://svnweb.freebsd.org/changeset/ports/562246 Log: Mk/Uses/kde.mk: Minor clean-up - Remove several always-true conditions - Whitespace clean-up - Fix a few grammatical errors Approved by: tcberner Differential Revision: https://reviews.freebsd.org/D28271 Modified: head/Mk/Uses/kde.mk Modified: head/Mk/Uses/kde.mk ============================================================================== --- head/Mk/Uses/kde.mk Thu Jan 21 21:07:38 2021 (r562245) +++ head/Mk/Uses/kde.mk Thu Jan 21 21:14:20 2021 (r562246) @@ -144,33 +144,29 @@ IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #' # ============================================================================== -# ==== SETUP CMAKE ENVIRONMENT ================================================= +# === SET UP CMAKE ENVIRONMENT ================================================= # Help cmake to find files when testing ports with non-default PREFIX. CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}" -. if ${_KDE_VERSION:M*5*} # We set KDE_INSTALL_USE_QT_SYS_PATHS to install mkspecs files, plugins and # imports to the Qt 5 install directory. -CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF \ - -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ - -DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \ - -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=TRUE -. endif +CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF \ + -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \ + -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=true # 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 ========================================================= +# === 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}" -. if ${_KDE_VERSION:M*5*} -PLIST_SUB+= KDE_PLASMA_VERSION="${KDE_PLASMA_VERSION}" \ - KDE_FRAMEWORKS_VERSION="${KDE_FRAMEWORKS_VERSION}" -. endif +PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" \ + KDE_FRAMEWORKS_VERSION="${KDE_FRAMEWORKS_VERSION}" \ + KDE_PLASMA_VERSION="${KDE_PLASMA_VERSION}" # ============================================================================== _USE_KDE_BOTH= akonadi attica libkcddb libkcompactdisc libkdcraw libkdegames \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101212114.10LLEKbk049895>