From owner-svn-ports-head@freebsd.org Wed Mar 20 07:24:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F821154A78F; Wed, 20 Mar 2019 07:24:50 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 13C2589683; Wed, 20 Mar 2019 07:24:50 +0000 (UTC) (envelope-from tcberner@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 B03031D85B; Wed, 20 Mar 2019 07:24:49 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2K7OnFf098845; Wed, 20 Mar 2019 07:24:49 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2K7Onpw098844; Wed, 20 Mar 2019 07:24:49 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903200724.x2K7Onpw098844@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 20 Mar 2019 07:24:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496316 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 496316 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 13C2589683 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.94)[-0.940,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 20 Mar 2019 07:24:50 -0000 Author: tcberner Date: Wed Mar 20 07:24:49 2019 New Revision: 496316 URL: https://svnweb.freebsd.org/changeset/ports/496316 Log: kde.mk: fix handling of versioned components When prefixing the components in r496296 the versioned components where neglected, which lead to for example the 'baloo' component no longer being defined properly. Reported by: antoine Modified: head/Mk/Uses/kde.mk Modified: head/Mk/Uses/kde.mk ============================================================================== --- head/Mk/Uses/kde.mk Wed Mar 20 07:02:30 2019 (r496315) +++ head/Mk/Uses/kde.mk Wed Mar 20 07:24:49 2019 (r496316) @@ -806,12 +806,12 @@ kde-okular5_LIB= libOkular5Core.so # ====================== select the proper multiversion component ============== . for comp in ${_USE_KDE_BOTH} -${comp}_PORT= ${${comp}${_KDE_VERSION}_PORT} -. if defined(${comp}${_KDE_VERSION}_LIB) -${comp}_LIB= ${${comp}${_KDE_VERSION}_LIB} +kde-${comp}_PORT= ${kde-${comp}${_KDE_VERSION}_PORT} +. if defined(kde-${comp}${_KDE_VERSION}_LIB) +kde-${comp}_LIB= ${kde-${comp}${_KDE_VERSION}_LIB} . else -. if defined(${comp}${_KDE_VERSION}_PATH}) -${comp}_PATH= ${${comp}${_KDE_VERSION}_LIB} +. if defined(kde-${comp}${_KDE_VERSION}_PATH}) +kde-${comp}_PATH= ${kde-${comp}${_KDE_VERSION}_LIB} . endif # If neither is defined, this gets caught below when checking components . endif