5 files changed, 30 insertions, 38 deletions

diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index 648dc9df5f74..337687d10235 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -1,21 +1,21 @@
 # Ports collection makefile for:	linux_dri
 # Date created:				Thu Oct 25 18:51:06 PDT 2001
-# Whom:			Eric Anholt <eanholt@gladstone.uoregon.edu>
+# Whom:					Eric Anholt <eta@lclark.edu>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	dri
-PORTVERSION=	4.1.0
+PORTNAME=	linux_dri
+PORTVERSION=	4.2.0
 CATEGORIES=	graphics linux
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.1.0/binaries/Linux-ix86-glibc21/ \
-		http://gladstone.uoregon.edu/~eanholt/dri/
-PKGNAMEPREFIX=	linux_
-DISTFILES=	Xmod.tgz Xbin.tgz linux-libglide.tar.gz \
-		linux-dri-tools.tar.gz
-DIST_SUBDIR=	linux-dri
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc22/:x \
+		http://people.freebsd.org/~anholt/dri/files/:anholt
+DISTFILES=	Xmod.tgz:x Xbin.tgz:x \
+		linux-libglide.tar.gz:anholt \
+		linux-dri-tools.tar.gz:anholt
+DIST_SUBDIR=	linux_dri-${PORTVERSION}
 
-MAINTAINER=	eanholt@gladstone.uoregon.edu
+MAINTAINER=	eta@lclark.edu
 
 WRKSRC=		${WRKDIR}/lib
 NO_BUILD=	yes
@@ -27,21 +27,20 @@ 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
+	${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
 .for i in ${MODULELIST}
-	@${INSTALL_PROGRAM} ${WRKSRC}/modules/dri/${i} \
+	${INSTALL_PROGRAM} ${WRKSRC}/modules/dri/${i} \
 		${PREFIX}/usr/X11R6/lib/modules/dri
 .endfor
-	@${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
-	@${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/libglut.so.3.7.0 ${PREFIX}/usr/X11R6/lib
-	@${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/gears ${PREFIX}/usr/X11R6/bin
-	@${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/glxinfo ${PREFIX}/usr/X11R6/bin
+	${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
+	${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/libglut.so.3.7.0 ${PREFIX}/usr/X11R6/lib
+	${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/gears ${PREFIX}/usr/X11R6/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/linux-dri-tools/glxinfo ${PREFIX}/usr/X11R6/bin
 
 post-install:
 	@${LDCONFIG_LINUX} ${PREFIX}/usr/X11R6/lib
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/graphics/linux_dri/distinfo b/graphics/linux_dri/distinfo
index b56c3625f596..d809c87c7bc6 100644
--- a/graphics/linux_dri/distinfo
+++ b/graphics/linux_dri/distinfo
@@ -1,4 +1,4 @@
-MD5 (linux-dri/Xmod.tgz) = 1601f3337527d3ad06d2b7df4a25477e
-MD5 (linux-dri/Xbin.tgz) = c61f48de2f03298aa79a0b5bb44dd90a
-MD5 (linux-dri/linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
-MD5 (linux-dri/linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
+MD5 (linux_dri-4.2.0/Xmod.tgz) = 6eb4c39cd904485d1aa1dde6fabc5956
+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
diff --git a/graphics/linux_dri/pkg-descr b/graphics/linux_dri/pkg-descr
index 9b8a69ccc97a..0d6b037f7754 100644
--- a/graphics/linux_dri/pkg-descr
+++ b/graphics/linux_dri/pkg-descr
@@ -1,3 +1,3 @@
-linux-dri installs binary linux DRI modules, libraries and basic
-programs for use with drm-kmod to get 3d hardware acceleration of
-linux binaries.
+linux_dri installs binary linux DRI modules, libraries and basic programs to 
+support and test 3d hardware acceleration of linux binaries with the DRI.
+At this time it only works as root, this should be fixed soon.
diff --git a/graphics/linux_dri/pkg-message b/graphics/linux_dri/pkg-message
deleted file mode 100644
index 8a497e62c4b8..000000000000
--- a/graphics/linux_dri/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-
--------------------------------------------------------------------------------
-If you are using a 3dfx Voodoo-based card, you must make a symlink to libglide.
-
-Voodoo3/Banshee:
-ln -sf %%PREFIX%%/usr/X11R6/lib/libglide3-v3.so.0 %%PREFIX%%/usr/X11R6/lib/libglide3.so.3
-
-Voodoo4/5:
-ln -sf %%PREFIX%%/usr/X11R6/lib/libglide3-v5.so.0 %%PREFIX%%/usr/X11R6/lib/libglide3.so.3
--------------------------------------------------------------------------------
-
diff --git a/graphics/linux_dri/pkg-plist b/graphics/linux_dri/pkg-plist
index e9d129fb0a6e..8cf9477e53e4 100644
--- a/graphics/linux_dri/pkg-plist
+++ b/graphics/linux_dri/pkg-plist
@@ -5,6 +5,7 @@ usr/X11R6/lib/libGLU.so.1
 usr/X11R6/lib/libglide3-v3.so.0
 usr/X11R6/lib/libglide3-v5.so.0
 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/mga_dri.so
@@ -12,3 +13,6 @@ 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/tdfx_dri.so
+@exec mkdir -p usr/X11R6/lib/modules/dri
+@dirrm usr/X11R6/lib/modules/dri
+@dirrm usr/X11R6/lib/modules