From owner-dev-commits-ports-all@freebsd.org Mon Jun 28 08:01:14 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2BD6965195A; Mon, 28 Jun 2021 08:01:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GD0RZ0qdNz4Ywf; Mon, 28 Jun 2021 08:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 04B1D21AA1; Mon, 28 Jun 2021 08:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15S81DUk096879; Mon, 28 Jun 2021 08:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15S81DT9096878; Mon, 28 Jun 2021 08:01:13 GMT (envelope-from git) Date: Mon, 28 Jun 2021 08:01:13 GMT Message-Id: <202106280801.15S81DT9096878@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 9399e65be9a9 - main - x11/{lightdm,sddm}: add CONFLICTS MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9399e65be9a94c93365d8f6f059ac9d4e097ce69 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2021 08:01:14 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=9399e65be9a94c93365d8f6f059ac9d4e097ce69 commit 9399e65be9a94c93365d8f6f059ac9d4e097ce69 Author: Adriaan de Groot AuthorDate: 2021-06-28 07:57:38 +0000 Commit: Adriaan de Groot 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@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 \