From nobody Thu Nov 21 13:36:34 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 4XvK5G56wrz5d39h; Thu, 21 Nov 2024 13:36:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvK5G3pqpz4KyJ; Thu, 21 Nov 2024 13:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732196194; 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=yZ5DYOIk48lmbpgYcbjfyhqniwPNEkqKs9ff3i0jKCc=; b=a2WKlTI1UfTqrNF2nf99Uhdj/bNt09glAffK/OuOxg57q2jIYHOmWC0xVnfr8Cb1n2a4Zb P6vPCI43OzrwHjbgRcZzkmB6hfDA3dMFdHp6bhjkukepucnuSuB2jEpJQ6gCmxq+lnGep8 KtcNuFyl7gk3P+EfbY6Ls0AOAMLg7aDpHiIrPzFWHLiysX4Lyg6DQ673jtir7vM+t9VRyW eIkHihwVL7BEeI58Wgopnn7q3GQVLgdrlSlcDAZ+LDmZMAyCo4yKoah+ku7jp9rNZIt4Nf IgswN9RBvUz3eQCdDEutNwEXR0c/xzkS+BSyyDCe/UIGAbg5kk8M8xKMeWMA4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732196194; 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=yZ5DYOIk48lmbpgYcbjfyhqniwPNEkqKs9ff3i0jKCc=; b=dURmRlaPnS+ziYgy9RkskFgeWwCTdwYgDo/NP0F/jbRfg9CyDsgr2bc9wKwyfbmxs8Nalf MFxMiZVS1k7gyOEac0XYv4ZDUv8kf6MPMH7DHDB54LnxKO4mJYUSU3iVA83kyyWbvpRmgi QezDWktpwWVugLcGjuGwuSfTrInVNSfobYGOSbnrnwB6J4zd16/ppCDsfhrhuIJRBGbZh5 wRufyYtmjEorKGxoySsQ/hmh2vLOY89588PDwi1hvO+SMCJlXptUkQTwnVs2/lBRXACwvH hVIsc8goLbcLxomCbbFnvcqeBiajYAbDuROIhUp+aiIsUR44KzcFI7Z/8r5viw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732196194; a=rsa-sha256; cv=none; b=pZfOZ1HUIwpzw59d1Dz2d3aI00M6+d7LFlSxKY84qetH53zADn5xZnf+E8NEbceA01SvXU qopz4IJ0UkP8cYC91wuoP7NpA3GErJ8zOfrHh0Rd1ww1eVU5Kl3OZpr/re14e5CM19xVB1 MTj0j7rSbvDn062ewI+B5jVeReuSZv4rJyvwcNJWdK16RskD/EiNrTaarWUWjBt+36fB6z q4YewrXs6d6vDncXYoGJ7yGxrdFzSLbGlI1sg8qB1xpBvIcICks1sP2JJFhSPG2XCyvDCN n0k21tG2O/VIxVVNOV0oUyRzXrCjqzonadajlZs5BAIbO23WqTP5ri7RwbOirw== 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 4XvK5G3Qf0zh58; Thu, 21 Nov 2024 13:36:34 +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 4ALDaYEJ093719; Thu, 21 Nov 2024 13:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALDaYDp093715; Thu, 21 Nov 2024 13:36:34 GMT (envelope-from git) Date: Thu, 21 Nov 2024 13:36:34 GMT Message-Id: <202411211336.4ALDaYDp093715@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: c45dd57f7783 - main - sysutils/devd-mount: CONFLICTS -> CONFLICTS_INSTALL 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: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c45dd57f77834a0f7c64baf7f518d9ee08e1e575 Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=c45dd57f77834a0f7c64baf7f518d9ee08e1e575 commit c45dd57f77834a0f7c64baf7f518d9ee08e1e575 Author: Jason W. Bacon AuthorDate: 2024-11-21 13:35:45 +0000 Commit: Jason W. Bacon CommitDate: 2024-11-21 13:35:45 +0000 sysutils/devd-mount: CONFLICTS -> CONFLICTS_INSTALL Conflict with filesystems/automount is a runtime issue --- sysutils/devd-mount/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/devd-mount/Makefile b/sysutils/devd-mount/Makefile index 6aafc4679e37..9ecbc97bd3d0 100644 --- a/sysutils/devd-mount/Makefile +++ b/sysutils/devd-mount/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/outpaddling/devd-mount LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= automount # Competing devd rules +CONFLICTS_INSTALL= automount # Competing devd rules USE_GITHUB= yes GH_ACCOUNT= outpaddling