From owner-dev-commits-ports-main@freebsd.org Mon Apr 26 14:39:01 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 ED6B85E29C7; Mon, 26 Apr 2021 14:39:01 +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 4FTSFd6Ng5z3hTK; Mon, 26 Apr 2021 14:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C3A74C75; Mon, 26 Apr 2021 14:39:01 +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 13QEd1PL019286; Mon, 26 Apr 2021 14:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13QEd1OJ019285; Mon, 26 Apr 2021 14:39:01 GMT (envelope-from git) Date: Mon, 26 Apr 2021 14:39:01 GMT Message-Id: <202104261439.13QEd1OJ019285@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: c237911a72ac - main - [Qt, GNOME] Handle os-release a little more smartly 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: c237911a72ac5890045007e7929954a9d48eee96 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 14:39:02 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=c237911a72ac5890045007e7929954a9d48eee96 commit c237911a72ac5890045007e7929954a9d48eee96 Author: Adriaan de Groot AuthorDate: 2021-04-26 11:47:25 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-26 14:38:11 +0000 [Qt, GNOME] Handle os-release a little more smartly Synth -- and therefore not all FreeBSD installations that *could* have an /etc/os-release, or that *ought* to have an os-release file at runtime -- doesn't have the RC script installed, so was triggering the "depend on ports os-release" clause. Partly revert, to checking for existence, but **also** assume that sufficiently-new 13 (or later) releases have os-release in base. This means that 12.2 (which ought to have it) will rely on base, while 12.1 and 11.4 and other legacy releases will rely on the port. PR: 255354 251073 --- devel/qt5-core/Makefile | 9 +++++++-- sysutils/gnome-control-center/Makefile | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 5c6214cf3ade..1e4ef798f7bc 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -1,6 +1,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -39,7 +39,12 @@ QT_CONFIG= glib icu MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr .include -.if !exists(/etc/rc.d/os-release) + +# FreeBSD base gained an os-release in r354922, but that does not exist +# always (see Synth bug 191, or PR 255354). Be a little more forgiving: +# assume sufficiently recent base "will have it", and check otherwise +# because 12.2 does, others like 12.1 do not have it. +.if !exists(/etc/rc.d/os-release) && (${OSVERSION} < 1300060) RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release post-patch: ${REINPLACE_CMD} -e '/readEtcFile/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 93aea90e1bec..949ed263b96f 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnome-control-center PORTVERSION= 3.38.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -73,7 +73,12 @@ LDFLAGS+= -fuse-ld=lld .endif .include -.if !exists(/etc/rc.d/os-release) + +# FreeBSD base gained an os-release in r354922, but that does not exist +# always (see Synth bug 191, or PR 255354). Be a little more forgiving: +# assume sufficiently recent base "will have it", and check otherwise +# because 12.2 does, others like 12.1 do not have it. +.if !exists(/etc/rc.d/os-release) && (${OSVERSION} < 1300060) RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release post-patch: @${REINPLACE_CMD} -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \