From nobody Sun Apr 30 21:04:17 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q8f3P3bpPz48JVL; Sun, 30 Apr 2023 21:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8f3P33hKz4DYF; Sun, 30 Apr 2023 21:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682888657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQXZrCSehhIXGxReuuwWVQjrJwgkLfZ1T0Kp4zwZMmQ=; b=GYy0wBv+VnJojPh6wFVrlsfuMRO4zVfPWv/3IGSaaae9QZvGWT7OBBc9sVRSbpbSNrSBck hoy+J7+tgy7xXs7iVbnNlYvEbcACXtBNe0Ycr3J8HgNfU6bAP9oFmRNZXufYAKlOizZWs5 GDNRl3gtsgJ3GKRhYACViGInn+qFMKIi3gm7sDfRLfsZQdU0cV0dnA3yhTWlQjgLN1xLph kcnJY6aq6jhlA79owYUaULiVd9u7q0noelglMiG2C5BnfcigwBpDrGH9qPlEmHYQf5XAhu 8YCyI1hbKZT363uyHJlLyXvnr4pRlxWC5cjZzbMuFvDhPzg+nd2vVdGtDgk/Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682888657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IQXZrCSehhIXGxReuuwWVQjrJwgkLfZ1T0Kp4zwZMmQ=; b=ffmX0B2RUqGBlt6vzJRjVL6ioEipGZVjd/VBjf8/LeLTaI8gapKRs5vsh+VFmG/fpjgIQG F3y375bK08h1I2F53mnFkqoKTWq2DJXV/utj/yLMZwNWVsvrkSKhHaFkWBbxW3jU/34/z+ EWiZUGOklAvLMHUy9YSKOOOBqN6YgdYB4WNDrJKkJhTN0w8QYVUaHyPh25Pc1Vcb0GDejd eyngezR5PVbN7rE9SeqArCtYLb0TqdnUHDmomyvSuXdMj37GJT0uDxfHQn/VRAhpNYLNnJ SJ2cKKnFskeR6pDQzNEbukRbbFO2eJystRF2MObXNPmXci6NpqckrCvyidmuUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682888657; a=rsa-sha256; cv=none; b=o2UMJ912OcmdPHX9MS8zxpoNP2Icr5EoeUNbQwK05Lbhk65I/eXzTSLCPJmo9zJCm2z/o+ bRti0ZH3SyZajLPsa8eVZj7SDZMl6o/S0T6p7i3u0TAcZafArayFaYh713Hpj2hgqgQEnc DMz4ATnycUYXDP8ocMfcQZcQLN1G1FmxPGZFWj2+NFgPAEayOlP1SIvgAYQVqiZWjylYDC uXlnM5DEW1vm8PZjjsjwFoJaCU7Dd/MnSCxo9RtdPZA5Yvplwo6hNtCwY2lHW6TMaL+p7Z or5eyYn8vOgM/hPdz7/5c6qwdih9yUtv0KtC40eC2RiBZAZNTahAEoqmZFVLdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q8f3P26Xjzdvk; Sun, 30 Apr 2023 21:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33UL4HcF074933; Sun, 30 Apr 2023 21:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UL4HfK074932; Sun, 30 Apr 2023 21:04:17 GMT (envelope-from git) Date: Sun, 30 Apr 2023 21:04:17 GMT Message-Id: <202304302104.33UL4HfK074932@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 00c46f9fe703 - main - devel/qt5-qmake: do not try to install qtconfig header List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00c46f9fe7030e70c10ea2f69714c0b70b03a175 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=00c46f9fe7030e70c10ea2f69714c0b70b03a175 commit 00c46f9fe7030e70c10ea2f69714c0b70b03a175 Author: Adriaan de Groot AuthorDate: 2023-04-28 21:55:35 +0000 Commit: Adriaan de Groot CommitDate: 2023-04-30 21:04:15 +0000 devel/qt5-qmake: do not try to install qtconfig header Qt-dist ports that are a module need to install their header to qt-config.h. This accidentally happens to qt5-qmake as well. This is only visible when *installing* qt5-qmake on an otherwise fresh system with no other Qt packages. If you install any other Qt packages, then the qt-config header is there for the post-install script to work on (though it doesn't do anything for qt5-qmake). In a clean system, the script fails. PR: 269232 Reported by: Zsolt Udvari --- Mk/Uses/qt-dist.mk | 4 ++++ devel/qt5-qmake/Makefile | 1 + 2 files changed, 5 insertions(+) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index de81ae118073..b000cd2b038b 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -457,7 +457,11 @@ _sub_need_clean= . else _sub_need_clean= \#\# . endif +# The Qt modules have an install- and deinstall-step for wrangling +# the qconfig-modules.h header, but qmake does not. +. if ${PORTNAME} != "qmake" post-install: qt-post-install +. endif # PORTNAME != qmake qt-post-install: # We can't use SUB_FILES with the shared pkg-change.in. # We need it to be a script instead of a group of @unexecs. diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 147f7b17cb93..548114ce4014 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -1,5 +1,6 @@ PORTNAME= qmake PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5-