Received: by mail.netbsd.org (Postfix, from userid 605) id 1DF6F84CEF; Tue, 24 Mar 2020 19:45:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9AA0784CD5 for ; Tue, 24 Mar 2020 19:45:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id cK1iyrjbSUQx for ; Tue, 24 Mar 2020 19:45:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id EEC7D84CCD for ; Tue, 24 Mar 2020 19:45:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E7A97FB27; Tue, 24 Mar 2020 19:45:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585079147206140" MIME-Version: 1.0 Date: Tue, 24 Mar 2020 19:45:47 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/x11/qt4-libs To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200324194547.E7A97FB27@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. --_----------=_1585079147206140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Tue Mar 24 19:45:47 UTC 2020 Modified Files: pkgsrc/x11/qt4-libs: Makefile.common Log Message: qt4-libs: Deal with non-portable unused files After extracting, remove a few files that have non-portable shell constructs. Both qt4-libs and qt4-tools build fine without them, so they are obviously (slight leap) not used by the build. (Someday, when we have a standard approach for this, this code can be updated, but today it's important that this build.) To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/qt4-libs/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585079147206140 Content-Disposition: inline Content-Length: 1015 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt4-libs/Makefile.common diff -u pkgsrc/x11/qt4-libs/Makefile.common:1.51 pkgsrc/x11/qt4-libs/Makefile.common:1.52 --- pkgsrc/x11/qt4-libs/Makefile.common:1.51 Wed Mar 18 21:55:23 2020 +++ pkgsrc/x11/qt4-libs/Makefile.common Tue Mar 24 19:45:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.51 2020/03/18 21:55:23 tnn Exp $ +# $NetBSD: Makefile.common,v 1.52 2020/03/24 19:45:47 gdt Exp $ # used by x11/qt4-docs/Makefile # used by x11/qt4-libs/Makefile # used by x11/qt4-mng/Makefile @@ -154,6 +154,11 @@ SUBST_SED.lt+= -e 's,$$$${first(QMAKE_E CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .endif +# Remove files with portability issues, thereby ~proving they are not used in the build. +post-extract: + rm ${WRKSRC}/src/3rdparty/webkit/Source/JavaScriptCore/gyp/generate-dtrace-header.sh + rm ${WRKSRC}/src/3rdparty/webkit/Source/WebCore/gyp/streamline-inspector-source.sh + pre-configure: sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \ -e 's:@X11BASE@:${X11BASE}:g' \ --_----------=_1585079147206140--