Received: by mail.netbsd.org (Postfix, from userid 605) id 7CC7D84D4D; Sun, 24 Nov 2019 01:31:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0584184D37 for ; Sun, 24 Nov 2019 01:31:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id SAxdH566fG-H for ; Sun, 24 Nov 2019 01:31:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 57CF484C85 for ; Sun, 24 Nov 2019 01:31:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4C320FA97; Sun, 24 Nov 2019 01:31:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1574559098279400" MIME-Version: 1.0 Date: Sun, 24 Nov 2019 01:31:38 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/x11/qwt6-qt5 To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20191124013138.4C320FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1574559098279400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Sun Nov 24 01:31:38 UTC 2019 Modified Files: pkgsrc/x11/qwt6-qt5: Makefile Log Message: x11/qwt6-qt5: Fix two minor build problems Use bsdtar, to avoid installing pax droppings and failing the PLIST check. Skip the shlib check on a plugin, on the theory that the plugin expects the missing library to already have been loaded, and this appears to be the case when used in qgis. Should perhaps be addressed upstream, if someone really understands what is going on. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qwt6-qt5/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1574559098279400 Content-Disposition: inline Content-Length: 1100 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qwt6-qt5/Makefile diff -u pkgsrc/x11/qwt6-qt5/Makefile:1.2 pkgsrc/x11/qwt6-qt5/Makefile:1.3 --- pkgsrc/x11/qwt6-qt5/Makefile:1.2 Sun Nov 3 09:14:17 2019 +++ pkgsrc/x11/qwt6-qt5/Makefile Sun Nov 24 01:31:38 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/11/03 09:14:17 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/24 01:31:38 gdt Exp $ DISTNAME= qwt-6.1.4 PKGNAME= qwt6-qt5-6.1.4 @@ -11,6 +11,7 @@ HOMEPAGE= https://sourceforge.net/projec COMMENT= Qt widget library for technical purposes LICENSE= gnu-lgpl-v2 +EXTRACT_USING= bsdtar USE_LANGUAGES= c++ USE_TOOLS+= gmake USE_LIBTOOL= yes @@ -23,6 +24,10 @@ PLIST_SUBST+= VERSION=${PKGVERSION_NOREV do-configure: cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake +# Appparently this plugin has a valid expectation that libqwt is +# already loaded, at least as used in qgis. +CHECK_SHLIBS_SKIP+= qt5/plugins/designer/libqwt_designer_plugin.so + .include "../../x11/qt5-qttools/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtsvg/buildlink3.mk" --_----------=_1574559098279400--