From nobody Mon Jul 22 07:24:59 2024 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 4WSBcq3xvHz5Q5HL; Mon, 22 Jul 2024 07:24:59 +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 4WSBcq3QvZz4MgX; Mon, 22 Jul 2024 07:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721633099; 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=F5qcX44yQTjpT2Wc/uA7Hu+AqoL1+qRc3v1/A0elA58=; b=YKnWiNbJV71R3puAdulCh43bLtEghqR5J0gugmmKxmxqagK+884LLZXAAvB3ZHf1L7kDLo z/DmBHqLd/r/OR3koJCpGY+R4ozUUzrRYev/s7bKgpa1EWAYV0wkAIGrz+9rNlHtKu1X7F /3NC9kDaXZYNmi2NAzzN4CuAj/jVfkjSFI1yWPv37CaJ/Yo/CylMwF+WKVBETt/NkRxR2E xtZ/+t2AOVTUopebzxPwNS8v2A2RLJYfRErrfHcD2c/+qKBEKmP9GuPzmLZwBwu5c0uYzq /RpOzSC66eZ4CGmDkyGZJpgybDwXliTasYJwtuLPzv8EGM6kfIy3v5KFjeIS+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721633099; a=rsa-sha256; cv=none; b=VWRl1UikD3LMIvxLvZ0OUbQYg75zxc0AbXW+4TKAYsbXi2Ii0qMOcQMa2ZK5rO6RxHsdiH eGh5NMktPGSZSFBSYTt3VTyQ+VYXad/LsJaSWGn1HPJR3qqG8+EUvAP5VV7szc3jl/pFE7 /YXLWRCdBCgkJcYcPLaABsQ+u4Ew8yCOgRSnhz+Hxr7MCNC6oZGnve+1gNUm3VeYN9rTr+ xaYmd2CAptsr79dtokl6KhrouHjmI72qViNAc5YUIp4k423Lo4MqY/vm9L3p5U4ZZgL2MK yVil7nbtgmmgsqu4owIxDSeWacsOL87Oni9pXxZoMQFHfcJa+TXnyPi4hP1rJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721633099; 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=F5qcX44yQTjpT2Wc/uA7Hu+AqoL1+qRc3v1/A0elA58=; b=HUbbcz+dH144CleJVcIMLzsWZxxhFTLMbmgJIPhzpNs2KapSGxEavlrE36cBEsWTMstB1A r8f1e4t9DuyBRxEP+pWekdI8cGzHgRRyZ9aZ/hoxoAPzulqRP6kttkVFHFDVCd+2mjd4lH 6AFQqY2MoPfTSmxH70cnGoF20oYK/YRGsKlgHFKjHfhtBLvOB9HURb+8h+rOCiqKfeXAky qv7J3yPZ37hrILbvL2mf/jdoNCW5nfjWftBgk/SCjv3w9p9QK0L9aGjNu7WHv5N9lFU5I6 /VZ/O/LEckS09hgmJPhbZ/VSfE/sJSxYL4UnJfwv2GxbYaTuwQWCWES/sWxm2g== 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 4WSBcq2wJpzbbQ; Mon, 22 Jul 2024 07:24: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 46M7OxBB070232; Mon, 22 Jul 2024 07:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46M7OxjC070229; Mon, 22 Jul 2024 07:24:59 GMT (envelope-from git) Date: Mon, 22 Jul 2024 07:24:59 GMT Message-Id: <202407220724.46M7OxjC070229@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 94f74fda1f58 - main - devel/py-pyyaml: Remove obsoleted CONFLICTS 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94f74fda1f58a0a4a7564c1c7fa7f8fc74d24ad9 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=94f74fda1f58a0a4a7564c1c7fa7f8fc74d24ad9 commit 94f74fda1f58a0a4a7564c1c7fa7f8fc74d24ad9 Author: Li-Wen Hsu AuthorDate: 2024-07-22 07:23:55 +0000 Commit: Li-Wen Hsu CommitDate: 2024-07-22 07:23:55 +0000 devel/py-pyyaml: Remove obsoleted CONFLICTS --- devel/py-pyyaml/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/devel/py-pyyaml/Makefile b/devel/py-pyyaml/Makefile index eafcac314d7c..1047b7c98e63 100644 --- a/devel/py-pyyaml/Makefile +++ b/devel/py-pyyaml/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python USE_PYTHON= autoplist concurrent cython distutils -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}pyyaml5 - OPTIONS_DEFINE= LIBYAML EXAMPLES OPTIONS_DEFAULT=LIBYAML LIBYAML_DESC= Use textproc/libyaml for faster parsing