From owner-svn-ports-all@freebsd.org Tue Oct 4 06:18:33 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78C21AF4B12; Tue, 4 Oct 2016 06:18:33 +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 mx1.freebsd.org (Postfix) with ESMTPS id 45678E3B; Tue, 4 Oct 2016 06:18:33 +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 u946IWhr015189; Tue, 4 Oct 2016 06:18:32 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u946IWiR015188; Tue, 4 Oct 2016 06:18:32 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201610040618.u946IWiR015188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Tue, 4 Oct 2016 06:18:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423237 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2016 06:18:33 -0000 Author: tcberner Date: Tue Oct 4 06:18:32 2016 New Revision: 423237 URL: https://svnweb.freebsd.org/changeset/ports/423237 Log: Teach pathfix.mk about LIB_DESTINATION Some cmake projects use LIB_DESTINATION/pkgconfig to install the pc-files. For example: * deskutils/libstreamanalyzer * sysutils/polkit-qt{,5} * x11-toolkits/attica By adding this, we can convert these ports to use pathfix instead of an uncessessary patch-foo or confusing sed call. Reviewed by: mat Approved by: portmgr (mat), mat (mentor) Differential Revision: https://reviews.freebsd.org/D8141 Modified: head/Mk/Uses/pathfix.mk Modified: head/Mk/Uses/pathfix.mk ============================================================================== --- head/Mk/Uses/pathfix.mk Tue Oct 4 05:59:00 2016 (r423236) +++ head/Mk/Uses/pathfix.mk Tue Oct 4 06:18:32 2016 (r423237) @@ -27,6 +27,7 @@ pathfix: 's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ + s|[{]LIB_DESTINATION[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]LIB_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \ s|[{]KDE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \