From owner-dev-commits-ports-all@freebsd.org Thu Apr 22 23:10:29 2021 Return-Path: Delivered-To: dev-commits-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 A3CAB621CE3; Thu, 22 Apr 2021 23:10:29 +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 4FRCnd3lvDz4tJx; Thu, 22 Apr 2021 23:10:29 +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 6FFC3226C2; Thu, 22 Apr 2021 23:10:29 +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 13MNATwU053037; Thu, 22 Apr 2021 23:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MNATAg053036; Thu, 22 Apr 2021 23:10:29 GMT (envelope-from git) Date: Thu, 22 Apr 2021 23:10:29 GMT Message-Id: <202104222310.13MNATAg053036@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: 1ef5284b2340 - main - Handle os-release 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: 1ef5284b234036d33f1afbbfc4c1e4a67dafdf3f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 23:10:29 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ef5284b234036d33f1afbbfc4c1e4a67dafdf3f commit 1ef5284b234036d33f1afbbfc4c1e4a67dafdf3f Author: Mikael Urankar AuthorDate: 2021-04-22 22:14:37 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-22 23:10:06 +0000 Handle os-release more smartly The Qt ports, and GNOME control center, can read /etc/os-release, and have patches to read /usr/local/etc/os-release -- however, the two files update differently, and /etc/os-release is preferred. Tighten up the .if to select when to depend on the extra port for /usr/local/etc/os-release (basically: pre 11.4 and 12.1) - Bumps PORTREVISION because dependencies may change. - Note that I used the --author command-line option to set that mikael@ wrote this patch. PR: 251073 --- devel/qt5-core/Makefile | 6 ++---- sysutils/gnome-control-center/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index f12f3fdf7b27..5c6214cf3ade 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -1,6 +1,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -39,9 +39,7 @@ QT_CONFIG= glib icu MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr .include -# FreeBSD base gained /etc/os-release in r354922, which -# corresponds to __FreeBSD_version 1300060 -.if ${OSVERSION} < 1300060 +.if !exists(/etc/rc.d/os-release) 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 39ce0ca9eb54..93aea90e1bec 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -2,6 +2,7 @@ PORTNAME= gnome-control-center PORTVERSION= 3.38.3 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -72,9 +73,7 @@ LDFLAGS+= -fuse-ld=lld .endif .include -# FreeBSD base gained /etc/os-release in r354922, which -# corresponds to __FreeBSD_version 1300060 -.if ${OSVERSION} < 1300060 +.if !exists(/etc/rc.d/os-release) RUN_DEPENDS+= etc_os-release>0:sysutils/etc_os-release post-patch: @${REINPLACE_CMD} -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \