From nobody Wed Aug 10 10:07:56 2022 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 4M2lxS5LZsz4YcBX; Wed, 10 Aug 2022 10:07:56 +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 4M2lxS4mVYz3Chg; Wed, 10 Aug 2022 10:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660126076; 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=2KJNDpspS+0Lg76yDHIepZyeLh+Noi9+79V1IF8Q/eM=; b=iFOZ0B/2Yc3/7WitBEZJXytUuUHRyJXG6pS1XnrIxIOtWwKs5Hgfa83tAwxBUyEuIdCznf f3kn9ufemgBPS+dVfEFm18FLK9lXKDggZIfaeT5uxd0vXB5rrTM5N4pNp0esLE3HyXTkBx 65OVxEU3nbrg2A3Ki9pWOQQQloJPDmQISyQbcdbGCZBSq8cmk6PpvDA+YtxNo9wJyCG+F+ 6tqIFLAj9eQUgNj276BbvjnajKzUqnX8u2O6n0eVJNef5dgZcJBr9Vue/NdtnfEKPXOr03 oYF88iB8skajEg5miBGSBNtOZSq2P2Oc9ltFSCSASpNyIvrfxNCQqzHWWULXMA== 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 4M2lxS3nngz16qG; Wed, 10 Aug 2022 10:07:56 +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 27AA7ucZ081084; Wed, 10 Aug 2022 10:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AA7uXB081083; Wed, 10 Aug 2022 10:07:56 GMT (envelope-from git) Date: Wed, 10 Aug 2022 10:07:56 GMT Message-Id: <202208101007.27AA7uXB081083@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 1303528e49c7 - main - lang/mono6.8: Fix build with archivers/brotli 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1303528e49c7fec9160e60090ca0a2e7713f5294 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660126076; 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=2KJNDpspS+0Lg76yDHIepZyeLh+Noi9+79V1IF8Q/eM=; b=GKe3vPxMXrQZcNPoLOM8CBRGvXlAFjoVaBwWT3dMiFivYqb0bNN4Y+EOT5GNkfVBBaYijv Cs8CBvdMDzGRkugunXc18pcaiCKC4/FtFYejlkxi1Du7HEINOJD/xL8TF7hY/uFI6SnuT+ ichKTjMvM+t+xDHAYWAioDHvHFhVwHQcgXCSNUyI/P6GNgpRhvoe12KOMC9kGoGx048TQs JhGX5+zV3A6/hHtHYS8M1oMtoxTHoqWuwoavb6vdwGDqeXiQ0Hw+jw+Y9k8uR/YXzCGdFD XmtvZ4GK+9uYV+Hc6eFk6cghuR0aJ2Du2VNA2HOhFUogEYCpdFxMuH5qjQhxDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660126076; a=rsa-sha256; cv=none; b=c16O0M7TiptyoOyjvirBE9QZJ32BSBRtVQ5Y0btF4ZrVhg78anlBnkgZHFyon1uGLfdK0F 831tjt+AFBe1o44F0uX96NEvgfX4vfW8J3JKeKz0xN6TJhLwKhJAUPodJmGIIkdpmFybTr tK3rBaCnSpu696SfraHHRIMrEfFoRLq7FufRh1XUz73uiTT2y60FR/Jq2bXC8BDeNGhwcW e+rAc27gBJefv7KdLl22ap5S/RaSDtXo78/68i5NQXnEFII4fSl8pNSAMNgx9x/artOfUc 0yOzE5Y3mO0dejQJqIKFNWJp/cfXBRygvU0GzVDhWLaum56QKPWkGz/mc9/YUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1303528e49c7fec9160e60090ca0a2e7713f5294 commit 1303528e49c7fec9160e60090ca0a2e7713f5294 Author: Felix Palmen AuthorDate: 2022-08-09 18:56:11 +0000 Commit: Felix Palmen CommitDate: 2022-08-10 10:07:24 +0000 lang/mono6.8: Fix build with archivers/brotli Add USES=localbase, so in-tree headers are found before headers in LOCALBASE. This fixes the build with archivers/brotli installed. CONFLICTS isn't an option any more, after 478e294ddedbe6444330b00512a09406265bea71, archivers/brotli is an indirect build dependency. PR: 265745 Approved by: portmgr (build fix blanket), tcberner (mentor) --- lang/mono6.8/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/mono6.8/Makefile b/lang/mono6.8/Makefile index 79091a92c5f9..d0d6605cdee3 100644 --- a/lang/mono6.8/Makefile +++ b/lang/mono6.8/Makefile @@ -23,10 +23,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ sqlite3>0:databases/sqlite3 \ zip>=0:archivers/zip -CONFLICTS_BUILD= brotli CONFLICTS_INSTALL= certmgr coin-or-disco disco mono mono[0-9]* -USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ +USES= autoreconf bison compiler:c11 cpe gmake iconv libtool localbase \ pathfix perl5 python:3.6+ shebangfix tar:xz USE_PERL5= build