git: c45dd57f7783 - main - sysutils/devd-mount: CONFLICTS -> CONFLICTS_INSTALL

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jason W. Bacon <jwb_at_FreeBSD.org>
Date: Thu, 21 Nov 2024 13:36:34 UTC

The branch main has been updated by jwb:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c45dd57f77834a0f7c64baf7f518d9ee08e1e575

commit c45dd57f77834a0f7c64baf7f518d9ee08e1e575
Author:     Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2024-11-21 13:35:45 +0000
Commit:     Jason W. Bacon <jwb@FreeBSD.org>
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