From owner-svn-ports-head@freebsd.org Thu Jan 21 21:14:20 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B4194E0108; Thu, 21 Jan 2021 21:14:20 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMFWc3zKrz4vsY; Thu, 21 Jan 2021 21:14:20 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7B3AC12EBE; Thu, 21 Jan 2021 21:14:20 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10LLEKZX049896; Thu, 21 Jan 2021 21:14:20 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10LLEKbk049895; Thu, 21 Jan 2021 21:14:20 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <202101212114.10LLEKbk049895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Thu, 21 Jan 2021 21:14:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562246 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 562246 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 21:14:20 -0000 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 \