git: 628057b37dd8 - main - filesystems/automount: Add CONFLICTS_INSTALL=devd-mount

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

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

The branch main has been updated by jwb:

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

commit 628057b37dd880ff3e4528129ec13f5abdd40b41
Author:     Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2024-11-21 13:33:41 +0000
Commit:     Jason W. Bacon <jwb@FreeBSD.org>
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