Update XFree86 ports, including linux_dri, to 4.3.0. Set IGNORE= in dri-devel

for being outdated.  Thank you to all the testers and people who submitted
patches for this update.

Approved by:	portmgr

4 files changed, 19 insertions, 15 deletions

diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index 4eb79561dd2e..de9469f2a8d2 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -25,6 +25,8 @@ RUN_DEPENDS=	XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server
 
 WRKSRC=		${WRKDIR}/xc
 
+IGNORE=		outdated, use updated XFree86 4.3.0 ports
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 MAKE_ENV=	FBSDCFLAGS="${CFLAGS}" FBSDCC="${CC}" FBSDCXX="${CXX}"
diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index 3826ed7517e1..d3a3f53e35eb 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	linux_dri
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	graphics linux
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc22/:x \
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \
 		http://people.freebsd.org/~anholt/dri/files/:anholt
 DISTFILES=	Xbin.tgz:x \
+		Xmod.tgz:x \
 		linux-libglide.tar.gz:anholt \
-		linux-dri-tools.tar.gz:anholt \
-		linux_dri-${PORTVERSION}.tar.gz:anholt
+		linux-dri-tools.tar.gz:anholt
 DIST_SUBDIR=	linux_dri-${PORTVERSION}
 
 MAINTAINER=	anholt@freebsd.org
@@ -26,20 +25,20 @@ USE_LINUX_PREFIX=	yes
 
 ONLY_FOR_ARCHS=	i386
 
-MODULELIST=	gamma_dri.so i810_dri.so mga_dri.so r128_dri.so \
-		radeon_dri.so sis_dri.so tdfx_dri.so
+MODULELIST=	gamma_dri.so i810_dri.so i830_dri.so mga_dri.so r128_dri.so \
+		r200_dri.so radeon_dri.so tdfx_dri.so
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 STRIP=
 
 do-install:
 	${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri
-	${INSTALL_PROGRAM} ${WRKSRC}/libGL.so.1 ${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1 ${PREFIX}/usr/X11R6/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/libGL.so.1.2 ${PREFIX}/usr/X11R6/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1.3 ${PREFIX}/usr/X11R6/lib
 .for i in ${MODULELIST}
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/dri/${i} \
 		${PREFIX}/usr/X11R6/lib/modules/dri
 .endfor
-	#The libglide3 distributed with linux_base is broken and is symlinked poorly, supply our own.
+#	The libglide3 distributed with linux_base is broken and is symlinked poorly, supply our own.
 	${INSTALL_PROGRAM} ${WRKDIR}/linux-libglide/libglide3-v3.so.0 ${PREFIX}/usr/X11R6/lib
 	${INSTALL_PROGRAM} ${WRKDIR}/linux-libglide/libglide3-v5.so.0 ${PREFIX}/usr/X11R6/lib
 	${LN} -sf libglide3-v3.so.0 ${PREFIX}/usr/X11R6/lib/libglide3-v3.so
diff --git a/graphics/linux_dri/distinfo b/graphics/linux_dri/distinfo
index 25a390c570db..47e4fc02c470 100644
--- a/graphics/linux_dri/distinfo
+++ b/graphics/linux_dri/distinfo
@@ -1,4 +1,4 @@
-MD5 (linux_dri-4.2.0/Xbin.tgz) = 91cae2fe84c8e5bf3d06a8c0cd8fd41d
-MD5 (linux_dri-4.2.0/linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
-MD5 (linux_dri-4.2.0/linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
-MD5 (linux_dri-4.2.0/linux_dri-4.2.0.tar.gz) = 601f9cc61e02168723c34bb97d3ac2e9
+MD5 (linux_dri-4.3.0/Xbin.tgz) = d3ed6afd605a10bbbc6dd6a8de88091e
+MD5 (linux_dri-4.3.0/Xmod.tgz) = e229aa71aec95c041c40563231396200
+MD5 (linux_dri-4.3.0/linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
+MD5 (linux_dri-4.3.0/linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
diff --git a/graphics/linux_dri/pkg-plist b/graphics/linux_dri/pkg-plist
index cf3f9ae2ace3..9909b92b253f 100644
--- a/graphics/linux_dri/pkg-plist
+++ b/graphics/linux_dri/pkg-plist
@@ -1,7 +1,9 @@
 usr/X11R6/bin/gears
 usr/X11R6/bin/glxinfo
 usr/X11R6/lib/libGL.so.1
+usr/X11R6/lib/libGL.so.1.2
 usr/X11R6/lib/libGLU.so.1
+usr/X11R6/lib/libGLU.so.1.3
 usr/X11R6/lib/libglide3.so.3
 usr/X11R6/lib/libglide3-v3.so
 usr/X11R6/lib/libglide3-v3.so.0
@@ -11,10 +13,11 @@ usr/X11R6/lib/libglut.so.3.7.0
 usr/X11R6/lib/libglut.so.3
 usr/X11R6/lib/modules/dri/gamma_dri.so
 usr/X11R6/lib/modules/dri/i810_dri.so
+usr/X11R6/lib/modules/dri/i830_dri.so
 usr/X11R6/lib/modules/dri/mga_dri.so
 usr/X11R6/lib/modules/dri/r128_dri.so
 usr/X11R6/lib/modules/dri/radeon_dri.so
-usr/X11R6/lib/modules/dri/sis_dri.so
+usr/X11R6/lib/modules/dri/r200_dri.so
 usr/X11R6/lib/modules/dri/tdfx_dri.so
 @exec mkdir -p usr/X11R6/lib/modules/dri
 @dirrm usr/X11R6/lib/modules/dri