diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile
index 97749d5af364..4edfb208adfd 100644
--- a/graphics/glfw/Makefile
+++ b/graphics/glfw/Makefile
@@ -1,60 +1,62 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 
 PORTNAME=	glfw
 PORTVERSION=	3.3.7
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/glfw/glfw/releases/download/${PORTVERSION}/
 
 MAINTAINER=	eduardo@FreeBSD.org
 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
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 PLIST_SUB=	MAJVER="${PORTVERSION:C|\..*||}" \
 		VERSION=${PORTVERSION:R}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=			DOCS EXAMPLES
 OPTIONS_DEFAULT=		X11
 OPTIONS_SINGLE=			PLATFORM
 OPTIONS_SINGLE_PLATFORM=	WAYLAND X11
 PLATFORM_DESC=			Window creation platform
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_USES=		kde:5 pkgconfig
 WAYLAND_USE=		KDE=ecm
 WAYLAND_CMAKE_BOOL=	GLFW_USE_WAYLAND
 
 X11_USES=	xorg
 X11_USE=	XORG=x11,xcursor,xi,xinerama,xrandr,xxf86vm
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/html/search
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/search/* \
 		${STAGEDIR}${DOCSDIR}/docs/html/search
 	cd ${WRKSRC}/docs/html && ${INSTALL_DATA} *.html *.png *.css *.js \
 		 ${STAGEDIR}${DOCSDIR}/docs/html
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests
 	cd ${WRKSRC}/examples && ${INSTALL_PROGRAM} \
 		boing gears heightmap particles simple splitview wave \
 		${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/tests && ${INSTALL_PROGRAM} \
 		clipboard cursor empty events gamma glfwinfo iconify \
 		joysticks monitors msaa reopen tearing \
 		threads title windows \
 		${STAGEDIR}${EXAMPLESDIR}/tests
 
 .include <bsd.port.mk>
diff --git a/graphics/glfw2/Makefile b/graphics/glfw2/Makefile
index d088fe1d3f8b..224915fc0e3b 100644
--- a/graphics/glfw2/Makefile
+++ b/graphics/glfw2/Makefile
@@ -1,73 +1,75 @@
 # Created by: Igor Pokrovsky <tiamat@comset.net>
 
 PORTNAME=	glfw
 PORTVERSION=	2.7.9
 PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 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
 ALL_TARGET=	x11
 INSTALL_TARGET=	x11-install
 USE_XORG=	xi xrandr
 USE_GL=		glu
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-w
 
 PLIST_FILES=	include/GL/glfw.h lib/libglfw.a lib/libglfw.so \
 		lib/libglfw.so.0 libdata/pkgconfig/libglfw.pc
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limit:^2\..*
 
 post-extract:
 	@${CHMOD} +x ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
 		 /SOFLAGS/s|-soname |-Wl,-soname,|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} \
 		-e 's|lib/pkgconfig|libdata/pkgconfig|g' \
 		${WRKSRC}/lib/x11/Makefile.x11.in
 
 post-install:
 	${INSTALL_LIB} ${WRKSRC}/lib/x11/libglfw.so ${STAGEDIR}${PREFIX}/lib/libglfw.so.0
 	${LN} -sf libglfw.so.0 ${STAGEDIR}${PREFIX}/lib/libglfw.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.pdf *.sty *.tex *.txt ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in boing gears heightmap listmodes mipmaps mtbench mthello pong3d splitview triangle wave
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/examples/*.tga ${STAGEDIR}${EXAMPLESDIR}
 
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests
 .for f in accuracy defaults dynamic events fsaa fsinput iconify joysticks peter reopen tearing version
 	${INSTALL_PROGRAM} ${WRKSRC}/tests/${f} ${STAGEDIR}${EXAMPLESDIR}/tests
 .endfor
 
 .include <bsd.port.mk>