4 files changed, 6 insertions, 32 deletions

diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index fa947a219ec4..191dc638d379 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	1.4
-PORTREVISION=	3
+PORTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
@@ -19,6 +18,8 @@ CONFLICTS=	XFree86-dmx-[0-9]*
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+
+USE_GL=		gl
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 70c76c2b2663..0a7c42acf73d 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
-SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
-SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
+SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in b/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in
deleted file mode 100644
index be7571e1aefa..000000000000
--- a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- hw/dmx/Makefile.in.orig	2007-12-12 17:55:26.000000000 +0000
-+++ hw/dmx/Makefile.in	2007-12-12 17:55:56.000000000 +0000
-@@ -476,6 +476,7 @@
- Xdmx_LDADD = $(XORG_CORE_LIBS) \
-              $(XDMX_LIBS) \
-              $(GLX_LIBS) \
-+             $(XSERVER_LIBS) \
-              input/libdmxinput.a \
-              config/libdmxconfig.a \
-              @DMXMODULES_LIBS@
diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c b/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c
deleted file mode 100644
index c860dc10b278..000000000000
--- a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- hw/dmx/dmxinput.c.orig	2007-12-12 17:52:53.000000000 +0000
-+++ hw/dmx/dmxinput.c	2007-12-12 17:53:22.000000000 +0000
-@@ -105,3 +105,14 @@
-         if (!dmxInput->detached && dmxInput->updateWindowInfo)
-             dmxInput->updateWindowInfo(dmxInput, type, pWindow);
- }
-+
-+int
-+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
-+{
-+    return BadValue;
-+}
-+
-+void
-+DeleteInputDeviceRequest(DeviceIntPtr dev)
-+{
-+}