From nobody Thu Nov 21 13:34:16 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 4XvK2d0Gjkz5d3Lk; Thu, 21 Nov 2024 13:34:17 +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 4XvK2c6Yvpz4KnY; Thu, 21 Nov 2024 13:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732196056; 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=NdUMfuMdtz7GB6WBYwR7gR4ROfL2Q3CSQrkZIwPmbIk=; b=HiRojdmW3yM9oVESZ9sTWpOCWRuFmwSmDjeVvKihVMpPeVSTsNFfoJFUwXsWjdlxw9jN4a dd25gBb8Y3anjlauGUXA+1hbv2s+93vsHdHqnC7fAKmVS7l/dGokzQff8Owf3KDMImjzun TYiL4obJQhPuHuDRRpbZ1F09tWKtnx0nhqyxMHtIgGZGbn3wx0Tjz6UAM3muDUK9HSvaxq 11xL8SfYExJc4CXIl9DoDg1xio0NGHvrZiMqz0JYhnReZZDQ1sPrEJ9xR1ykuHaQ4eV3h1 HRhz8x8qpH5EIDZEjcY8pWzOmgPZVpf++FU8XFDXU87yvqcVYhdobhJD0WfF4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732196056; 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=NdUMfuMdtz7GB6WBYwR7gR4ROfL2Q3CSQrkZIwPmbIk=; b=L6alhLby7i7SinqxM8e5f3y1GexeG7o/StfWVVRhz7HKvWYOlxrNBz08QSSAMHv8n834R4 Ka3x0/duiWOifxEChaQDNVKzKhtB4hAdwpUDxEuc1fWJE2LOp/tnDlxg4ZzZUG1a/JKUVO bIfqXU2LarKcNPL0INUmNwU9F236+feeeWDEZyqIlc90b2MFq4l1K44qRtfXDXEI/HhPZ/ R+8O7KCwORExGUSQJCv9kst4NEIErMpGu+VdA77RKr7U3hU4UOILo5TZ1ou34tGdnCuMJr kUXCXXSnNYv0pgNHKXeJG4shweymbTZwwScnslh8A/MRNwOlIxMyLcKiNK1q/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732196056; a=rsa-sha256; cv=none; b=l8yDcVVbD0JucSZIcPnHkDhq8tfY8de03b6kB19qj2yo5bJ+ktFZcNOfPVTzRFb4VrsU1U 6jQoQ+FWGqMxlId30x6ttrCtnJP0jjuzLNOv1Xde+gN8oCKUyNVtvftr5yUKwWUWs+dv6S tQR+Ok2TqnblUbgqtXFn70/3pV05NtKUldWUcraI8z4x9nTPUYioHxsXr76jGCgb2RirlR hRX9uzAThJ2bZHZqO2Bu+1DhoTZf7w4nX4G3BpiSq0XsaGUv66BhRXMfSxyUkgLSi9rrem tnEOMPvX1dTonjtDjm1RpVsDy2YAFx7oJSrjOeW4tIqX2e7ytIt+TOsoJnHmAA== 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 4XvK2c69ZGzhSF; Thu, 21 Nov 2024 13:34:16 +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 4ALDYGSB092779; Thu, 21 Nov 2024 13:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALDYG5D092776; Thu, 21 Nov 2024 13:34:16 GMT (envelope-from git) Date: Thu, 21 Nov 2024 13:34:16 GMT Message-Id: <202411211334.4ALDYG5D092776@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: 628057b37dd8 - main - filesystems/automount: Add CONFLICTS_INSTALL=devd-mount 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: 628057b37dd880ff3e4528129ec13f5abdd40b41 Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=628057b37dd880ff3e4528129ec13f5abdd40b41 commit 628057b37dd880ff3e4528129ec13f5abdd40b41 Author: Jason W. Bacon AuthorDate: 2024-11-21 13:33:41 +0000 Commit: Jason W. Bacon CommitDate: 2024-11-21 13:33:41 +0000 filesystems/automount: Add CONFLICTS_INSTALL=devd-mount They install competing devd rules --- filesystems/automount/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/filesystems/automount/Makefile b/filesystems/automount/Makefile index d20e8eafb67e..6600b732f402 100644 --- a/filesystems/automount/Makefile +++ b/filesystems/automount/Makefile @@ -1,5 +1,6 @@ PORTNAME= automount DISTVERSION= 1.7.9 +PORTREVISION= 1 CATEGORIES= filesystems sysutils MASTER_SITES= https://raw.github.com/vermaden/automount/master/ @@ -9,6 +10,8 @@ WWW= https://github.com/vermaden/automount/ LICENSE= BSD2CLAUSE +CONFLICTS_INSTALL= devd-mount # Competing devd rules + PLIST_FILES= sbin/automount etc/devd/automount_devd.conf etc/automount.conf.sample NO_BUILD= yes