git: 9399e65be9a9 - main - x11/{lightdm,sddm}: add CONFLICTS

[Adriaan de Groot]

The branch main has been updated by adridg:

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

commit 9399e65be9a94c93365d8f6f059ac9d4e097ce69
Author:     Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-06-28 07:57:38 +0000
Commit:     Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-06-28 08:00:24 +0000

    x11/{lightdm,sddm}: add CONFLICTS
    
    Both lightdm and sddm install the DBus file for DisplayManager,
            etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
    It doesn't really make sense to install multiple DMs on one
    machine, but for completeness in the ports framework, mark
    them as conflicting.
    
    PR:             256688 256687
    Reported by:    Graham Perrin
---
 x11/lightdm/Makefile | 4 +++-
 x11/sddm/Makefile    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 4b2646f27016..9fbb9d37eba1 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	lightdm
 PORTVERSION=	1.30.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	https://github.com/CanonicalLtd/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 
@@ -30,6 +30,8 @@ USE_XORG=	x11 xcb xdmcp
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	lightdm
 
+CONFLICTS_INSTALL=	sddm
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tests # PAM errors
 INSTALL_TARGET=	install-strip
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
index 001501c87eb6..7a7271f28433 100644
--- a/x11/sddm/Makefile
+++ b/x11/sddm/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	sddm
 PORTVERSION=	0.19.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	kde at FreeBSD.org
@@ -26,6 +26,8 @@ USE_QT=		core declarative dbus gui network \
 		buildtools_build linguisttools_build qmake_build
 USE_XORG=	xcb
 
+CONFLICTS_INSTALL=	lightdm
+
 CMAKE_ON=	BUILD_MAN_PAGES
 CMAKE_ARGS=	-DUID_MIN=1000 \
 		-DUID_MAX=65000 \