Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -602,22 +602,6 @@
 	fi
 }
 
-subst_dep_file() {
-	local dep_file=$1
-	if expr ${dep_file} : "${LOCALBASE}/lib/libGL.so.[0-9]$" > /dev/null; then
-		if [ -f ${LOCALBASE}/lib/.mesa/libGL.so ]; then
-			echo ${LOCALBASE}/lib/.mesa/libGL.so
-			return
-		fi
-	elif expr ${dep_file} : "${LOCALBASE}/lib/libEGL.so.[0-9]$" > /dev/null; then
-		if [ -f ${LOCALBASE}/lib/.mesa/libEGL.so ]; then
-			echo ${LOCALBASE}/lib/.mesa/libEGL.so
-			return
-		fi
-	fi
-	echo ${dep_file}
-}
-
 proxydeps() {
 	local file dep_file dep_file_pkg already rc
 
@@ -631,7 +615,6 @@
 		while read dep_file; do
 			# No results presents a blank line from heredoc.
 			[ -z "${dep_file}" ] && continue
-			dep_file=$(subst_dep_file ${dep_file})
 			# Skip files we already checked.
 			if listcontains ${dep_file} "${already}"; then
 				continue
Index: graphics/libEGL/Makefile
===================================================================
--- graphics/libEGL/Makefile
+++ graphics/libEGL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libEGL
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenEGL library
@@ -28,9 +28,4 @@
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
-	@${MV} ${STAGEDIR}${PREFIX}/lib/libEGL* \
-		${STAGEDIR}${PREFIX}/lib/.mesa/
-
 .include <bsd.port.mk>
Index: graphics/libEGL/pkg-deinstall
===================================================================
--- graphics/libEGL/pkg-deinstall
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-DEINSTALL)
-	/bin/rm -f ${PREFIX}/lib/libEGL.so*
-	;;
-esac
Index: graphics/libEGL/pkg-install
===================================================================
--- graphics/libEGL/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-POST-INSTALL)
-	if [ -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ]; then
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so.1
-	else
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1.0.0
-	fi
-	;;
-esac
Index: graphics/libEGL/pkg-plist
===================================================================
--- graphics/libEGL/pkg-plist
+++ graphics/libEGL/pkg-plist
@@ -4,7 +4,7 @@
 include/EGL/eglmesaext.h
 include/EGL/eglplatform.h
 include/KHR/khrplatform.h
-lib/.mesa/libEGL.so
-lib/.mesa/libEGL.so.1
-lib/.mesa/libEGL.so.1.0.0
+lib/libEGL.so
+lib/libEGL.so.1
+lib/libEGL.so.1.0.0
 libdata/pkgconfig/egl.pc
Index: graphics/libGL/Makefile
===================================================================
--- graphics/libGL/Makefile
+++ graphics/libGL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libGL
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL library that renders using GLX or DRI
@@ -13,7 +13,7 @@
 		libexpat.so:textproc/expat2
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
-		presentproto xshmfence
+		presentproto xshmfence xcb
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/Makefile.common"
@@ -24,9 +24,6 @@
 .include "${.CURDIR}/Makefile.targets"
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
-	@${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \
-		${STAGEDIR}${PREFIX}/lib/.mesa/
 	@cd ${WRKSRC}/src/mesa && ${SETENV} DESTDIR=${STAGEDIR} \
 		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS
 
Index: graphics/libGL/pkg-deinstall
===================================================================
--- graphics/libGL/pkg-deinstall
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-DEINSTALL)
-	/bin/rm -f ${PREFIX}/lib/libGL.so*
-	;;
-esac
Index: graphics/libGL/pkg-install
===================================================================
--- graphics/libGL/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-POST-INSTALL)
-	if [ -f ${PREFIX}/lib/.nvidia/libGL.so.1 ]; then
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1
-	else
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
-	fi
-	;;
-esac
Index: graphics/libGL/pkg-plist
===================================================================
--- graphics/libGL/pkg-plist
+++ graphics/libGL/pkg-plist
@@ -7,7 +7,7 @@
 include/GL/glxext.h
 @comment include/GL/osmesa.h
 include/GL/wglext.h
-lib/.mesa/libGL.so
-lib/.mesa/libGL.so.1
-lib/.mesa/libGL.so.1.2.0
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.2.0
 libdata/pkgconfig/gl.pc
Index: graphics/libglesv2/Makefile
===================================================================
--- graphics/libglesv2/Makefile
+++ graphics/libglesv2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libglesv2
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL ES v2 library
@@ -24,9 +24,4 @@
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
-	@${MV} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so* \
-		${STAGEDIR}${PREFIX}/lib/.mesa/
-
 .include <bsd.port.mk>
Index: graphics/libglesv2/pkg-deinstall
===================================================================
--- graphics/libglesv2/pkg-deinstall
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-DEINSTALL)
-	/bin/rm -f ${PREFIX}/lib/libGLESv2.so*
-	;;
-esac
Index: graphics/libglesv2/pkg-install
===================================================================
--- graphics/libglesv2/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PREFIX="${PKG_PREFIX-/usr/local}"
-
-case $2 in
-POST-INSTALL)
-	if [ -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ]; then
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ${PREFIX}/lib/libGLESv2.so
-	  /bin/ln -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ${PREFIX}/lib/libGLESv2.so.2
-	else
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so.2
-	  /bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so.2.0.0
-	fi
-	;;
-esac
Index: graphics/libglesv2/pkg-plist
===================================================================
--- graphics/libglesv2/pkg-plist
+++ graphics/libglesv2/pkg-plist
@@ -5,9 +5,9 @@
 include/GLES3/gl31.h
 include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
-lib/.mesa/libGLESv2.so
-lib/.mesa/libGLESv2.so.2
-lib/.mesa/libGLESv2.so.2.0.0
+lib/libGLESv2.so
+lib/libGLESv2.so.2
+lib/libGLESv2.so.2.0.0
 @comment lib/libglapi.so
 @comment lib/libglapi.so.0
 @comment lib/libglapi.so.0.0.0
Index: graphics/linux-c6-dri/Makefile
===================================================================
--- graphics/linux-c6-dri/Makefile
+++ graphics/linux-c6-dri/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	11.0.7
+PORTREVISION=	1
 CATEGORIES=	graphics linux
 LIB_DISTFILES=	mesa-libGL-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
 		mesa-libGLU-${PORTVERSION}-4.el6${EXTRACT_SUFX} \
@@ -24,4 +25,14 @@
 USE_LDCONFIG=	yes
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
+SUB_FILES=	pkg-deinstall pkg-install
+SUB_LIST=	LINUXBASE=${LINUXBASE}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/usr/lib/.linux
+.for file in libGL.so.1 libGL.so.1.2.0
+	@mv ${STAGEDIR}${PREFIX}/usr/lib/${file} \
+		${STAGEDIR}${PREFIX}/usr/lib/.linux/
+.endfor
+
 .include <bsd.port.mk>
Index: graphics/linux-c6-dri/files/pkg-deinstall.in
===================================================================
--- /dev/null
+++ graphics/linux-c6-dri/files/pkg-deinstall.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+LINUXBASE="%%LINUXBASE%%"
+
+case $2 in
+DEINSTALL)
+	/bin/rm -f ${LINUXBASE}/usr/lib/libGL.so*
+	if [ -f ${LINUXBASE}/usr/lib/.nvidia/libGL.so.1 ]; then
+		/bin/rm -f ${LINUXBASE}/usr/lib/libGL.so*
+		/bin/ln -f ${LINUXBASE}/usr/lib/.nvidia/libGL.so.1 ${LINUXBASE}/usr/lib/libGL.so.1
+ 	fi
+	;;
+esac
Index: graphics/linux-c6-dri/files/pkg-install.in
===================================================================
--- /dev/null
+++ graphics/linux-c6-dri/files/pkg-install.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+LINUXBASE="%%LINUXBASE%%"
+
+case $2 in
+POST-INSTALL)
+	/bin/rm -f ${LINUXBASE}/usr/lib/libGL.so*
+	if [ -f ${LINUXBASE}/usr/lib/.nvidia/libGL.so.1 ]; then
+	  /bin/ln -f ${LINUXBASE}/usr/lib/.nvidia/libGL.so.1 ${LINUXBASE}/usr/lib/libGL.so.1
+	else
+	  /bin/ln -f ${LINUXBASE}/usr/lib/.linux/libGL.so.1.2.0 ${LINUXBASE}/usr/lib/libGL.so.1
+	  /bin/ln -f ${LINUXBASE}/usr/lib/.linux/libGL.so.1.2.0 ${LINUXBASE}/usr/lib/libGL.so.1.2.0
+	fi
+	;;
+esac
Index: graphics/linux-c6-dri/pkg-plist.i386
===================================================================
--- graphics/linux-c6-dri/pkg-plist.i386
+++ graphics/linux-c6-dri/pkg-plist.i386
@@ -9,8 +9,8 @@
 usr/lib/dri/radeonsi_dri.so
 usr/lib/dri/swrast_dri.so
 usr/lib/dri/vmwgfx_dri.so
-usr/lib/libGL.so.1
-usr/lib/libGL.so.1.2.0
+usr/lib/.linux/libGL.so.1
+usr/lib/.linux/libGL.so.1.2.0
 usr/lib/libGLU.so.1
 usr/lib/libGLU.so.1.3.1
 usr/lib/libdrm.so.2
Index: graphics/linux-c6-dri/pkg-plist.x86_64
===================================================================
--- graphics/linux-c6-dri/pkg-plist.x86_64
+++ graphics/linux-c6-dri/pkg-plist.x86_64
@@ -9,8 +9,8 @@
 usr/lib/dri/radeonsi_dri.so
 usr/lib/dri/swrast_dri.so
 usr/lib/dri/vmwgfx_dri.so
-usr/lib/libGL.so.1
-usr/lib/libGL.so.1.2.0
+usr/lib/.linux/libGL.so.1
+usr/lib/.linux/libGL.so.1.2.0
 usr/lib/libGLU.so.1
 usr/lib/libGLU.so.1.3.1
 usr/lib/libdrm.so.2
Index: x11/nvidia-driver-304/Makefile
===================================================================
--- x11/nvidia-driver-304/Makefile
+++ x11/nvidia-driver-304/Makefile
@@ -3,7 +3,7 @@
 
 DISTVERSION=	304.131
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-304
Index: x11/nvidia-driver-340/Makefile
===================================================================
--- x11/nvidia-driver-340/Makefile
+++ x11/nvidia-driver-340/Makefile
@@ -3,7 +3,7 @@
 
 DISTVERSION=	340.96
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-340
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -12,7 +12,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	367.44
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -40,7 +40,7 @@
 # hack below to universally set NVIDIA_ROOT.  Also provide X11BASE value
 # since it is still used by legacy drivers.
 MAKE_ENV=	NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE}
-SUB_FILES=	pkg-deinstall pkg-install pkg-message
+SUB_FILES=	pkg-deinstall pkg-install pkg-message nvidia.conf
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 PORTDOCS=	*
@@ -57,6 +57,12 @@
 .  endif
 .endif
 
+.if ${NVVERSION} >= 331.013
+SUB_LIST=	NVGL=""
+.else
+SUB_LIST=	NVGL="# "
+.endif
+
 .if ${NVVERSION} < 355.006
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src-Makefile \
 		${FILESDIR}/extra-patch-src-nv-freebsd.h \
@@ -97,12 +103,15 @@
 .if ${PORT_OPTIONS:MLINUX}
 CONFLICTS_INSTALL=	linux[-_]dri-[0-9]* linux-f10-dri-[0-9]*
 USES+=		linux
+SUB_LIST+=	LINUX=""
 PLIST_SUB+=	LINUX=""
 .else
+SUB_LIST+=	LINUX="# "
 PLIST_SUB+=	LINUX="@comment "
 # Propagate WITHOUT_LINUX variable down to inner Makefiles
 MAKE_ENV+=	WITHOUT_LINUX=yes
 .endif
+SUB_LIST+=	LINUXBASE=${LINUXBASE}
 
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
@@ -159,13 +168,13 @@
 # libGL, libEGL, libGLESv2, and xorg-server) to ease package manager work
 	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
 		${WRKSRC}/x11/extension/Makefile
-	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
-		${WRKSRC}/lib/libGL/Makefile
-.if ${NVVERSION} >= 331.013
-	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
-		${WRKSRC}/lib/libEGL/Makefile \
-		${WRKSRC}/lib/libGLESv2/Makefile
-.endif
+#	${REINPLACE_CMD} -e '/LIB=/s:GL:&/GL-NVIDIA:' \
+#		${WRKSRC}/lib/libGL/Makefile
+#.if ${NVVERSION} >= 331.013
+#	${REINPLACE_CMD} -e '/LIB=/s:GL:&/GL-NVIDIA:' \
+#		${WRKSRC}/lib/libEGL/Makefile \
+#		${WRKSRC}/lib/libGLESv2/Makefile
+#.endif
 # Do not execute afterinstall target (prevent automatic module registration
 # and "smart" installation of conflicting files heuristics)
 	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
@@ -249,6 +258,31 @@
 	${REINPLACE_CMD} -E '/\/lib\/libGLESv[12](_CM)?(\.so)?(_nvidia.so(\.[0-9]|\.[0-9]+\.[0-9]+)?)?$$/d ; \
 		/libEGL_nvidia\.so\.${PORTVERSION}/d' ${TMPPLIST}
 .endif
+# rename libGL.so, libEGL.so and libGLESv2.so
+	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so \
+		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so
+	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so.1 \
+		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1
+.if ${NVVERSION} >= 331.013
+	${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so \
+		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so
+	${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \
+		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
+	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so \
+		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
+	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \
+		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
+.endif
+.if ${PORT_OPTIONS:MLINUX}
+	@${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib/.nvidia
+	${MV} -f ${STAGEDIR}${LINUXBASE}/usr/lib/libGL.so.${PORTVERSION} \
+		${STAGEDIR}${LINUXBASE}/usr/lib/.nvidia/
+	${MV} -f ${STAGEDIR}${LINUXBASE}/usr/lib/libGL.so.1 \
+		${STAGEDIR}${LINUXBASE}/usr/lib/.nvidia/
+.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
+	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
+		${STAGEDIR}${PREFIX}/etc/libmap.d/
 
 # Target below can be used instead of standard `makesum' to correctly
 # update distinfo (i.e., keeping other driver version entries intact)
Index: x11/nvidia-driver/files/nvidia.conf.in
===================================================================
--- /dev/null
+++ x11/nvidia-driver/files/nvidia.conf.in
@@ -0,0 +1,11 @@
+# libmap.conf file for nvidia provide libraries
+
+libGL.so	libGL-NVIDIA.so
+libGL.so.1	libGL-NVIDIA.so.1
+
+%%NVGL%%libEGL.so	libEGL-NVIDIA.so
+%%NVGL%%libEGL.so.1	libEGL-NVIDIA.so.1
+
+%%NVGL%%libGLESv2.so	libGLESv2-NVIDIA.so
+%%NVGL%%libGLESv2.so.2	libGLESv2-NVIDIA.so.2
+
Index: x11/nvidia-driver/files/pkg-deinstall.in
===================================================================
--- x11/nvidia-driver/files/pkg-deinstall.in
+++ x11/nvidia-driver/files/pkg-deinstall.in
@@ -4,30 +4,17 @@
 #
 
 PREFIX=${PKG_PREFIX-/usr/local}
+LINUXBASE=%%LINUXBASE%%
 
 case $2 in
 DEINSTALL)
-	/bin/rm -f ${PREFIX}/lib/libGL.so*
 	/bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so*
 
-	/bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so
-	/bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1
-	/bin/ln -f ${PREFIX}/lib/.mesa/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
 	/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \
 		${PREFIX}/lib/xorg/modules/extensions/libglx.so
-
-
-	if [ -f ${PREFIX}/lib/.mesa/libEGL.so.1 ]; then
-		/bin/rm -f ${PREFIX}/lib/libEGL.so*
-		/bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so
-		/bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1
-		/bin/ln -f ${PREFIX}/lib/.mesa/libEGL.so.1.0.0 ${PREFIX}/lib/libEGL.so.1.0.0
-	fi
-	if [ -f ${PREFIX}/lib/.mesa/libGLESv2.so.2 ]; then
-		/bin/rm -f ${PREFIX}/lib/libGLESv2.so*
-		/bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so
-		/bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so.2
-		/bin/ln -f ${PREFIX}/lib/.mesa/libGLESv2.so.2.0.0 ${PREFIX}/lib/libGLESv2.so.2.0.0
+	if [ -f ${LINUXBASE}/usr/lib/.linux/libGL.so.1 ]; then
+		/bin/rm -f ${LINUXBASE}/usr/lib/libGL.so*
+		/bin/ln -f ${LINUXBASE}/usr/lib/.linux/libGL.so.1 ${LINUXBASE}/usr/lib/libGL.so.1
 	fi
 	;;
 esac
Index: x11/nvidia-driver/files/pkg-install.in
===================================================================
--- x11/nvidia-driver/files/pkg-install.in
+++ x11/nvidia-driver/files/pkg-install.in
@@ -4,23 +4,15 @@
 #
 
 PREFIX=${PKG_PREFIX-/usr/local}
+LINUXBASE=%%LINUXBASE%%
 
 case $2 in
 POST-INSTALL)
-	/bin/rm -f ${PREFIX}/lib/libGL.so*
-	/bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so
-	/bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1
-	if [ -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ]; then
-		/bin/rm -f ${PREFIX}/lib/libEGL.so*
-		/bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so
-		/bin/ln -f ${PREFIX}/lib/.nvidia/libEGL.so.1 ${PREFIX}/lib/libEGL.so.1
-	fi
-	if [ -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ]; then
-		/bin/rm -f ${PREFIX}/lib/libGLESv2.so*
-		/bin/ln -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ${PREFIX}/lib/libGLESv2.so
-		/bin/ln -f ${PREFIX}/lib/.nvidia/libGLESv2.so.2 ${PREFIX}/lib/libGLESv2.so.2
-	fi
 	/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 \
 		${PREFIX}/lib/xorg/modules/extensions/libglx.so
+	if [ -f ${LINUXBASE}/usr/lib/.nvidia/libGL.so.1 ]; then
+		/bin/rm -f ${LINUXBASE}/usr/lib/libGL.so*
+		/bin/ln -f ${LINUXBASE}/usr/lib/.nvidia/libGL.so.1 ${LINUXBASE}/usr/lib/libGL.so.1
+	fi
 	;;
 esac
Index: x11/nvidia-driver/pkg-plist
===================================================================
--- x11/nvidia-driver/pkg-plist
+++ x11/nvidia-driver/pkg-plist
@@ -1,14 +1,15 @@
 bin/nvidia-bug-report.sh
 bin/nvidia-debugdump
 bin/nvidia-smi
-lib/.nvidia/libGL.so
-lib/.nvidia/libGL.so.1
-lib/.nvidia/libEGL.so
-lib/.nvidia/libEGL.so.1
+etc/libmap.d/nvidia.conf
+lib/libGL-NVIDIA.so
+lib/libGL-NVIDIA.so.1
+lib/libEGL-NVIDIA.so
+lib/libEGL-NVIDIA.so.1
 lib/libGLESv1_CM.so
 lib/libGLESv1_CM.so.1
-lib/.nvidia/libGLESv2.so
-lib/.nvidia/libGLESv2.so.2
+lib/libGLESv2-NVIDIA.so
+lib/libGLESv2-NVIDIA.so.2
 lib/libXvMCNVIDIA.a
 lib/libXvMCNVIDIA.so
 lib/libXvMCNVIDIA.so.1
@@ -38,8 +39,8 @@
 %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.%%SHLIB_VERSION%%
 %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so.0
 %%LINUX%%%%LINUXBASE%%/usr/lib/libEGL_nvidia.so
-%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.%%SHLIB_VERSION%%
-%%LINUX%%%%LINUXBASE%%/usr/lib/libGL.so.1
+%%LINUX%%%%LINUXBASE%%/usr/lib/.nvidia/libGL.so.%%SHLIB_VERSION%%
+%%LINUX%%%%LINUXBASE%%/usr/lib/.nvidia/libGL.so.1
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.%%SHLIB_VERSION%%
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so.1
 %%LINUX%%%%LINUXBASE%%/usr/lib/libGLESv1_CM.so
@@ -71,6 +72,7 @@
 %%LINUX%%@exec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%
 %%LINUX%%@unexec %%LINUXBASE%%/sbin/ldconfig -r %%LINUXBASE%%
 %%LINUX%%@dir %%LINUXBASE%%/usr/lib/vdpau
+%%LINUX%%@dir %%LINUXBASE%%/usr/lib/.nvidia
 %%LINUX%%@dir %%LINUXBASE%%/usr/lib
 %%LINUX%%@dir %%LINUXBASE%%/usr
 %%LINUX%%@dir %%LINUXBASE%%