@@ -, +, @@ 
- Rename glxgears to glxgears_demo and glxinfo to glxinfo_demo
- Switch glxinfo consumers from mesa-demos to glx-utils
---
 emulators/playonbsd/Makefile                  |  4 +--
 games/homura/Makefile                         |  4 +--
 graphics/glx-utils/Makefile                   |  2 --
 graphics/mesa-demos/Makefile                  |  4 +--
 .../files/patch-src_xdemos_Makefile.in        | 33 +++++++++++++++++++
 graphics/mesa-demos/pkg-plist                 |  4 +--
 sysutils/inxi/Makefile                        |  3 +-
 x11-wm/compiz/Makefile                        |  4 +--
 8 files changed, 44 insertions(+), 14 deletions(-)
 create mode 100644 graphics/mesa-demos/files/patch-src_xdemos_Makefile.in
--- b/emulators/playonbsd/Makefile	
+++ b/emulators/playonbsd/Makefile	
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	playonbsd
 PORTVERSION=	4.2.10
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators games
 
 MAINTAINER=	se@FreeBSD.org
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	7z:archivers/p7zip \
 		bash:shells/bash \
-		glxinfo:graphics/mesa-demos \
+		glxinfo:graphics/glx-utils \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		sudo:security/sudo \
--- b/games/homura/Makefile	
+++ b/games/homura/Makefile	
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	homura
 PORTVERSION=	5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	Alexander88207@protonmail.com
@@ -22,7 +22,7 @@ RUN_DEPENDS=	zenity:x11/zenity \
 		webfonts>=0:x11-fonts/webfonts \
 		winetricks:emulators/winetricks \
 		vulkaninfo:devel/vulkan-tools \
-		glxinfo:graphics/mesa-demos
+		glxinfo:graphics/glx-utils
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	Alexander88207
--- b/graphics/glx-utils/Makefile	
+++ b/graphics/glx-utils/Makefile	
@@ -10,8 +10,6 @@ COMMENT=	List GLX capabilities and simple renderer
 
 LICENSE=	MIT
 
-CONFLICTS_INSTALL=	mesa-demos
-
 USES=		gl localbase:ldflags xorg
 USE_CSTD=	c99
 USE_GITLAB=	yes
--- b/graphics/mesa-demos/Makefile	
+++ b/graphics/mesa-demos/Makefile	
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	mesa-demos
 PORTVERSION=	8.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/
 
@@ -14,8 +14,6 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
-CONFLICTS_INSTALL=	glx-utils
-
 USES=		gmake gl localbase pkgconfig tar:bzip2 xorg
 GNU_CONFIGURE=	yes
 USE_GL=		egl gbm gl glesv2 glew glu glut
--- /dev/null	
+++ b/graphics/mesa-demos/files/patch-src_xdemos_Makefile.in	
@@ -0,0 +1,33 @@ 
+--- src/xdemos/Makefile.in.orig	2018-02-23 08:50:30 UTC
++++ src/xdemos/Makefile.in
+@@ -114,10 +114,10 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ @HAVE_X11_TRUE@bin_PROGRAMS = glsync$(EXEEXT) glthreads$(EXEEXT) \
+-@HAVE_X11_TRUE@	glxdemo$(EXEEXT) glxgears$(EXEEXT) \
++@HAVE_X11_TRUE@	glxdemo$(EXEEXT) glxgears_demo$(EXEEXT) \
+ @HAVE_X11_TRUE@	glxgears_fbconfig$(EXEEXT) \
+ @HAVE_X11_TRUE@	glxgears_pixmap$(EXEEXT) glxcontexts$(EXEEXT) \
+-@HAVE_X11_TRUE@	glxheads$(EXEEXT) glxinfo$(EXEEXT) \
++@HAVE_X11_TRUE@	glxheads$(EXEEXT) glxinfo_demo$(EXEEXT) \
+ @HAVE_X11_TRUE@	glxpixmap$(EXEEXT) glxpbdemo$(EXEEXT) \
+ @HAVE_X11_TRUE@	glxsnoop$(EXEEXT) glxswapcontrol$(EXEEXT) \
+ @HAVE_X11_TRUE@	manywin$(EXEEXT) multictx$(EXEEXT) \
+@@ -605,7 +605,7 @@ glxdemo$(EXEEXT): $(glxdemo_OBJECTS) $(glxdemo_DEPENDE
+ 	@rm -f glxdemo$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(glxdemo_OBJECTS) $(glxdemo_LDADD) $(LIBS)
+ 
+-glxgears$(EXEEXT): $(glxgears_OBJECTS) $(glxgears_DEPENDENCIES) $(EXTRA_glxgears_DEPENDENCIES) 
++glxgears_demo$(EXEEXT): $(glxgears_OBJECTS) $(glxgears_DEPENDENCIES) $(EXTRA_glxgears_DEPENDENCIES) 
+ 	@rm -f glxgears$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(glxgears_OBJECTS) $(glxgears_LDADD) $(LIBS)
+ 
+@@ -621,7 +621,7 @@ glxheads$(EXEEXT): $(glxheads_OBJECTS) $(glxheads_DEPE
+ 	@rm -f glxheads$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(glxheads_OBJECTS) $(glxheads_LDADD) $(LIBS)
+ 
+-glxinfo$(EXEEXT): $(glxinfo_OBJECTS) $(glxinfo_DEPENDENCIES) $(EXTRA_glxinfo_DEPENDENCIES) 
++glxinfo_demo$(EXEEXT): $(glxinfo_OBJECTS) $(glxinfo_DEPENDENCIES) $(EXTRA_glxinfo_DEPENDENCIES) 
+ 	@rm -f glxinfo$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(glxinfo_OBJECTS) $(glxinfo_LDADD) $(LIBS)
+ 
--- b/graphics/mesa-demos/pkg-plist	
+++ b/graphics/mesa-demos/pkg-plist	
@@ -83,11 +83,11 @@ bin/gltestperf
 bin/glthreads
 bin/glxcontexts
 bin/glxdemo
-bin/glxgears
+bin/glxgears_demo
 bin/glxgears_fbconfig
 bin/glxgears_pixmap
 bin/glxheads
-bin/glxinfo
+bin/glxinfo_demo
 bin/glxpbdemo
 bin/glxpixmap
 bin/glxsnoop
--- b/sysutils/inxi/Makefile	
+++ b/sysutils/inxi/Makefile	
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	inxi
 DISTVERSION=	3.1.06-1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	vulcan@wired.sh
@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	bind-tools>=0:dns/bind-tools \
 		dmidecode:sysutils/dmidecode \
-		mesa-demos>=0:graphics/mesa-demos \
+		glxinfo:graphics/glx-utils \
 		p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS \
 		p5-HTTP-Tiny>=0:www/p5-HTTP-Tiny \
 		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
--- b/x11-wm/compiz/Makefile	
+++ b/x11-wm/compiz/Makefile	
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	compiz
 PORTVERSION=	0.8.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://BSDforge.com/projects/source/x11-wm/compiz/
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libgtop-2.0.so:devel/libgtop \
 		libpng.so:graphics/png \
 		libstartup-notification-1.so:x11/startup-notification
-RUN_DEPENDS=	glxinfo:graphics/mesa-demos \
+RUN_DEPENDS=	glxinfo:graphics/glx-utils \
 		${RUN_DEPENDS_${ARCH}}
 RUN_DEPENDS_amd64=	nvidia-settings:x11/nvidia-settings
 RUN_DEPENDS_i386=	nvidia-settings:x11/nvidia-settings