Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jun 2022 10:11:22 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 05935ad55333 - main - graphics/glfw{,2}: add mutual CONFLICTS_INSTALL
Message-ID:  <202206201011.25KABMIS095167@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3:

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

commit 05935ad553330a4b3a15116efd1a92deed59f274
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-06-20 10:06:51 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-06-20 10:08:24 +0000

    graphics/glfw{,2}: add mutual CONFLICTS_INSTALL
    
    Approved by:    portmgr blanket
---
 graphics/glfw/Makefile  | 2 ++
 graphics/glfw2/Makefile | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile
index 97749d5af364..4edfb208adfd 100644
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Portable framework for OpenGL development
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
+CONFLICTS_INSTALL=	glfw2
+
 USES=		cmake:insource gl localbase zip
 USE_GL=		glu
 USE_LDCONFIG=	yes
diff --git a/graphics/glfw2/Makefile b/graphics/glfw2/Makefile
index d088fe1d3f8b..224915fc0e3b 100644
--- a/graphics/glfw2/Makefile
+++ b/graphics/glfw2/Makefile
@@ -13,6 +13,8 @@ COMMENT=	Portable framework for OpenGL development
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
+CONFLICTS_INSTALL=	glfw
+
 USES=		gl tar:bzip2 xorg
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	compile.sh



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206201011.25KABMIS095167>