From nobody Tue Oct 01 23:16:59 2024 X-Original-To: dev-commits-ports-all@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 4XJDNX0FhWz5XYZ1; Tue, 01 Oct 2024 23:17:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJDNW6vn6z43bb; Tue, 1 Oct 2024 23:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727824620; 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=rcEjJ9iiq8Yp9i20lQJQb9TPbMfNq5t+NTLw5maMc3c=; b=TGVv1ivz/mNliWBLHKzp5Dlp2md9wCwx9y62CZHRNiFsZ1qnpeYv269bQsthllncRmQmdS cLRq0h7ALP6lI+BEPjCrsfZuNuTY5ncnBezXSOZSxmLgnRIvaj3pTqbEnhiZ9zDuBUL/PB YLAzADIHSLaMzTcoH5tNNus/YoTJ4GikxidcOb+HYtjWjJvtuyknvVaKb8fp4498Dq7nM8 pROwhFyKMMNxky1egx2lggeNvNCL2PyPDjDha4pEaqZwwq0SUo8i0FM1Pq4+N4IydM9+n7 VY/2h9osuV7r3iVfmIQs5cjc9HGJ2gW12dc+3Np2yBYur0wguy5z2/SrNeM5tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727824620; 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=rcEjJ9iiq8Yp9i20lQJQb9TPbMfNq5t+NTLw5maMc3c=; b=fq/axWB54C12ELoqH7yOUsk3y7+N1FNCUikSAeDn54p0MQDceOJXDpyvHUHgPNtgCyH3kr EI/CtB1Br7hwv7T5cEdY5rIo4XuRG5odtWHH4mBzAbZFAEjKVlTdtTJpJQNMlNAS59lCGg ytWEmPCdWuNHlDPCFHfnNTWz4rnedo9Z/JWzHo5xy8sEUdz/i3plcmLp5vBrGZTfFCtb7R FSXeQ89BY4DxeRdC7Ai1UDViJdDTFn6+BPkwpFyF61sNNwDTduyEuss0ilnX+AcuxnwpDh H8e+zvIOom4LmiTdCjo4lOwaJfXcMNZPyYwHil/i9vQFfxoDVgqEozRYd/iojQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727824620; a=rsa-sha256; cv=none; b=eJAGRZLekKoEH6GTMJ5vqvq7ksaueK6Y77gidVlNDaUpBUjqxkhBfH2JBvXqtv6D4x5q1R SRvYCPjnGYHFhbQlodU8YOszTA5LPvVOUTq/rolRKRzwrY3wOBL7Gh2k/eC9uZBLR0Apc4 LYD9EhF/LXlM+InNJpPKIDXyJi+OpmTsYmnE4JtvKVxFV8DbRsBV4RyFT85RPnp+tIegXf sK65wO0OSxv0qQEDLhOTVbtuct5n1H8IMwxPIJIrj4T2ctUOMck+XDI6fbMeZfB8B1lUS7 C2sv9TtOEdwIH5Oiiyc8KDimeMnw9dyJvbojvISnHw2Fe0VUdUj2KFoDNeD64Q== 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 4XJDNW6VLFzxVW; Tue, 1 Oct 2024 23:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491NGxpA055390; Tue, 1 Oct 2024 23:16:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491NGxvx055387; Tue, 1 Oct 2024 23:16:59 GMT (envelope-from git) Date: Tue, 1 Oct 2024 23:16:59 GMT Message-Id: <202410012316.491NGxvx055387@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 7cea690fddbd - main - devel.llvm[12345678]: remove cmark conflict [NFC] List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cea690fddbd4f6bb3ad3360e625754bde7ac4e6 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cea690fddbd4f6bb3ad3360e625754bde7ac4e6 commit 7cea690fddbd4f6bb3ad3360e625754bde7ac4e6 Author: Brooks Davis AuthorDate: 2024-10-01 23:15:29 +0000 Commit: Brooks Davis CommitDate: 2024-10-01 23:16:46 +0000 devel.llvm[12345678]: remove cmark conflict [NFC] The build conflict with cmark is no longer needed. PR: 239636, 274848 --- devel/llvm11/Makefile | 1 - devel/llvm12/Makefile | 1 - devel/llvm13/Makefile | 1 - devel/llvm14/Makefile | 1 - devel/llvm15/Makefile | 1 - devel/llvm16/Makefile | 1 - devel/llvm17/Makefile | 1 - devel/llvm18/Makefile | 1 - 8 files changed, 8 deletions(-) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 5a2587e4d02f..76071eec226a 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -105,7 +105,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 73d1f2e86b2d..2b9ed5eb4cc5 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -115,7 +115,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 414a74af375d..00a6c0dd61e1 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -129,7 +129,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index f59acfb1106d..b8e9bcf4471b 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -135,7 +135,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index b75f500f4fc8..f487da536760 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -153,7 +153,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index d04686f98467..3b4405abf143 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -153,7 +153,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile index cd5e9de25489..818ac251a82a 100644 --- a/devel/llvm17/Makefile +++ b/devel/llvm17/Makefile @@ -157,7 +157,6 @@ COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \ diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index b0e8b0e2a820..2ff7b4aa3c01 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -155,7 +155,6 @@ DOCS_BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} -DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= \ -DLLVM_ENABLE_SPHINX=ON \