From owner-svn-ports-all@freebsd.org Wed Feb 24 15:48:08 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF4645607F3; Wed, 24 Feb 2021 15:48:08 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dm0gW72k8z3hLD; Wed, 24 Feb 2021 15:48:07 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-lf1-f43.google.com with SMTP id m22so3726649lfg.5; Wed, 24 Feb 2021 07:48:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NJQPO8Z5Pe6aXXREQLjGsA2cnXZYd4nXaqjpFrRQM9Q=; b=XtbIryK0oIpngCWOv2hHQgP7KY4Bl2widrUN5ri21agxFX9OOVp4RonJ7FBeI4oVuG HelbtQWi4LFK3IsgEVDvldkcOMVJRgUqlVDr08XQybXF4dqJLSl1BTmwwkwjvb8/CGJa QVZ6K7ZsI5Wk1pgYUDtfu2BF1Hsg1YbnC7xaivOqye6eaooAOomfQst/BexKQSkbMbma IM0+YuYejbyv/w/h6uDfHBDEs+iROZbKJ50YocyI52vVpHIFEAHR2XRT2qhBv8Lg2Ce4 KVhviBlPdZrC2ASfVyvk9ZoUwadBgcANTkZnFIJ0q5d6oq1ifHGDRJebSrRbllwRjR4o eBMw== X-Gm-Message-State: AOAM5300sOtpwN+Ji/mUp7h/pW5tIaWYEVZCE0IW+YrB9fpOdAbJXw+m oRM38oU4wTqcgh4acSXZcAvhEBd9RzGK7SnM7hs4/tgXCBw= X-Google-Smtp-Source: ABdhPJwa2X+F4qMd4rSdrBR2wqxAjrS5P9ZiPk3Xl0r6hgTsxmc12hT2q2jOJBEX53hc45nVXKV/qyZckPMNQ+yy4To= X-Received: by 2002:ac2:482c:: with SMTP id 12mr930256lft.4.1614181686135; Wed, 24 Feb 2021 07:48:06 -0800 (PST) MIME-Version: 1.0 References: <202102232011.11NKBuTB080164@repo.freebsd.org> In-Reply-To: From: Antoine Brodin Date: Wed, 24 Feb 2021 16:47:55 +0100 Message-ID: Subject: Re: svn commit: r566427 - in head: Mk/Uses devel/qt5/files To: Adriaan de Groot Cc: ports-committers , svn-ports-all , svn-ports-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Dm0gW72k8z3hLD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of antoinebrodinfreebsd@gmail.com designates 209.85.167.43 as permitted sender) smtp.mailfrom=antoinebrodinfreebsd@gmail.com X-Spamd-Result: default: False [-2.99 / 15.00]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.167.43:from]; SPAMHAUS_ZRD(0.00)[209.85.167.43:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.991]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.43:from]; FORGED_SENDER(0.30)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.43:from]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; MAILMAN_DEST(0.00)[svn-ports-all,svn-ports-head] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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: Wed, 24 Feb 2021 15:48:08 -0000 On Wed, Feb 24, 2021 at 8:23 AM Antoine Brodin wrote: > > On Tue, Feb 23, 2021 at 9:12 PM Adriaan de Groot wrote: > > > > Author: adridg > > Date: Tue Feb 23 20:11:56 2021 > > New Revision: 566427 > > URL: https://svnweb.freebsd.org/changeset/ports/566427 > > > > Log: > > Re-work Qt5 install- and deinstall scripts. > > > > Qt5 packages *together* manage a header file qconfig-modules.h which > > `#includes` other headers. A given Qt5 package may get a line in there, > > or it might not: that depends on package settings. > > > > On installing a package, add the line (if needed), on deinstall, remove > > the line (if it was there). There's a tricky case, too: upgrading > > a package that *had* a line, but no longer has one. That behaves like > > deinstall. Previously we used @postexec and @postunexec lines, but > > these were fragile in their own special way. See the linked PRs for > > examples -- or tcberner's comment that his qconfig-modules.h file > > *was* a screenful, and is now much shorter (and alphabetical, too!) > > > > An additional complication comes from needing to update qtchooser, > > *if* it is installed and *if* the package needs it. There was another > > set of @postexec lines for that. > > > > Migrate all the update logic to a shell script (there already was one > > for deinstall, now make it do triple-duty). From the template file, > > `pkg-change.in`, we generate a pkg-install and a pkg-deinstall > > script that does the right thing. > > > > PR: 253356 253360 > > Reported by: Nimaje on IRC > > Reviewed by: tcberner > > Hi, > > A lot of qt5 ports fail to build after this change. > /usr/local/include/qt5/QtCore/qconfig.h:1:10: fatal error: > 'QtCore/qconfig-modules.h' file not found > #include > ^~~~~~~~~~~~~~~~~~~~~~~~~~ I see this error message when installing qt5-core too: Extracting qt5-core-5.15.2_1: .......... done /bin/sh: /usr/bin/sor: not found mv: rename /usr/local/include/q5/QCore/qconfig-modules.h.new to /usr/local/include/q5/QCore/qconfig-modules.h: No such file or directory Antoine