From owner-svn-ports-head@freebsd.org Fri Dec 2 11:29:20 2016 Return-Path: Delivered-To: svn-ports-head@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 E4A95C61CFF; Fri, 2 Dec 2016 11:29:20 +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 B29071909; Fri, 2 Dec 2016 11:29:20 +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 uB2BTJX3079790; Fri, 2 Dec 2016 11:29:19 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB2BTJqH079787; Fri, 2 Dec 2016 11:29:19 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201612021129.uB2BTJqH079787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 2 Dec 2016 11:29:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427551 - in head/x11-toolkits/qt5-charts: . files X-SVN-Group: ports-head 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.23 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: Fri, 02 Dec 2016 11:29:21 -0000 Author: tcberner Date: Fri Dec 2 11:29:19 2016 New Revision: 427551 URL: https://svnweb.freebsd.org/changeset/ports/427551 Log: Fix build of x11-toolkits/qt5-charts after r427356. Unfortunately due to a wrong assumption, I missed the new port x11-toolkits/qt5-charts in r427356, so this port wrongly used QT_LIBDIR while not being part of QT_DIST (yet). While here, also add a patch to install the pkgconfig file to the proper location (another error, caused by not being QT_DIST-ed). Approved by: rakuco (mentor) Added: head/x11-toolkits/qt5-charts/files/ head/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro (contents, props changed) Modified: head/x11-toolkits/qt5-charts/Makefile head/x11-toolkits/qt5-charts/pkg-plist Modified: head/x11-toolkits/qt5-charts/Makefile ============================================================================== --- head/x11-toolkits/qt5-charts/Makefile Fri Dec 2 11:02:13 2016 (r427550) +++ head/x11-toolkits/qt5-charts/Makefile Fri Dec 2 11:29:19 2016 (r427551) @@ -3,6 +3,7 @@ PORTNAME= charts DISTVERSIONPREFIX= release- DISTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- Added: head/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro Fri Dec 2 11:29:19 2016 (r427551) @@ -0,0 +1,14 @@ +Fix the pkgconfig install path. + +--- src/charts/charts.pro.orig 2016-12-01 12:57:55 UTC ++++ src/charts/charts.pro +@@ -17,6 +17,9 @@ load(qt_module) + QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)" + QMAKE_TARGET_DESCRIPTION = "Charts component for Qt." + ++# Properly set up the pkgconfig install path -- relative to lib/ ++QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig ++ + ############################# SOURCES ########################################## + + SOURCES += \ Modified: head/x11-toolkits/qt5-charts/pkg-plist ============================================================================== --- head/x11-toolkits/qt5-charts/pkg-plist Fri Dec 2 11:02:13 2016 (r427550) +++ head/x11-toolkits/qt5-charts/pkg-plist Fri Dec 2 11:29:19 2016 (r427551) @@ -225,14 +225,13 @@ %%QT_INCDIR%%/QtCharts/qxylegendmarker.h %%QT_INCDIR%%/QtCharts/qxymodelmapper.h %%QT_INCDIR%%/QtCharts/qxyseries.h -%%QT_LIBDIR%%/cmake/Qt5Charts/Qt5ChartsConfig.cmake -%%QT_LIBDIR%%/cmake/Qt5Charts/Qt5ChartsConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Charts.prl -%%QT_LIBDIR%%/libQt5Charts.so -%%QT_LIBDIR%%/libQt5Charts.so.2 -%%QT_LIBDIR%%/libQt5Charts.so.2.1 -%%QT_LIBDIR%%/libQt5Charts.so.2.1.0 -%%QT_LIBDIR%%/pkgconfig/Qt5Charts.pc +lib/cmake/Qt5Charts/Qt5ChartsConfig.cmake +lib/cmake/Qt5Charts/Qt5ChartsConfigVersion.cmake +lib/libQt5Charts.prl +lib/libQt5Charts.so +lib/libQt5Charts.so.2 +lib/libQt5Charts.so.2.1 +lib/libQt5Charts.so.2.1.0 %%QT_MKSPECDIR%%/modules/qt_lib_charts.pri %%QT_MKSPECDIR%%/modules/qt_lib_charts_private.pri %%QT_QMLDIR%%/QtCharts/designer/ChartViewSpecifics.qml @@ -288,3 +287,4 @@ %%QT_QMLDIR%%/QtCharts/libqtchartsqml2.so %%QT_QMLDIR%%/QtCharts/plugins.qmltypes %%QT_QMLDIR%%/QtCharts/qmldir +libdata/pkgconfig/Qt5Charts.pc