18 files changed, 129 insertions, 52 deletions

diff --git a/graphics/libEGL/Makefile b/graphics/libEGL/Makefile
index 9819cd90f060..74871e6eff84 100644
--- a/graphics/libEGL/Makefile
+++ b/graphics/libEGL/Makefile
@@ -31,9 +31,9 @@ INSTALL_WRKSRC=	${WRKSRC}/src/egl
 .endif
 
 .if defined(WITH_NEW_MESA)
-LIBEGL_REVISION=	0
+LIBEGL_REVISION=	1
 .else
-LIBEGL_REVISION=	4
+LIBEGL_REVISION=	5
 .endif
 
 .if defined(WITH_NEW_MESA)
@@ -53,4 +53,9 @@ egl-do-install:
 . endfor
 .endif
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
+	@${MV} ${STAGEDIR}${PREFIX}/lib/libEGL* \
+		${STAGEDIR}${PREFIX}/lib/.mesa/
+
 .include <bsd.port.mk>
diff --git a/graphics/libGL/files/pkg-deinstall.in b/graphics/libEGL/pkg-deinstall
index 37d895397fcb..d7f7245aa02a 100644
--- a/graphics/libGL/files/pkg-deinstall.in
+++ b/graphics/libEGL/pkg-deinstall
@@ -7,6 +7,6 @@ PREFIX="${PKG_PREFIX-/usr/local}"
 
 case $2 in
 DEINSTALL)
-	/bin/rm -f ${PREFIX}/lib/libGL.so*
+	/bin/rm -f ${PREFIX}/lib/libEGL.so*
 	;;
 esac
diff --git a/graphics/libEGL/pkg-install b/graphics/libEGL/pkg-install
new file mode 100644
index 000000000000..15787f9e797b
--- /dev/null
+++ b/graphics/libEGL/pkg-install
@@ -0,0 +1,19 @@
+#!/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
diff --git a/graphics/libEGL/pkg-plist b/graphics/libEGL/pkg-plist
index fb478a869f65..795af9daa46b 100644
--- a/graphics/libEGL/pkg-plist
+++ b/graphics/libEGL/pkg-plist
@@ -4,7 +4,7 @@ include/EGL/eglext.h
 include/EGL/eglmesaext.h
 include/EGL/eglplatform.h
 include/KHR/khrplatform.h
-lib/libEGL.so
-lib/libEGL.so.1
-lib/libEGL.so.1.0.0
+lib/.mesa/libEGL.so
+lib/.mesa/libEGL.so.1
+lib/.mesa/libEGL.so.1.0.0
 libdata/pkgconfig/egl.pc
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index e3b49c977239..15dc280efd5f 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -15,15 +15,13 @@ LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
 		presentproto xshmfence
 
-SUB_FILES=	pkg-install pkg-deinstall
-
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLREVISION=	0
+LIBGLREVISION=	1
 .else
-LIBGLREVISION=	3
+LIBGLREVISION=	4
 .endif
 
 .if !(${ARCH} == "amd64" || ${ARCH} == "i386")
@@ -31,8 +29,8 @@ CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.libGL
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
 	@${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \
-		${STAGEDIR}${PREFIX}/lib/.libGL/
+		${STAGEDIR}${PREFIX}/lib/.mesa/
 
 .include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index a15934729564..263850801df7 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -66,6 +66,9 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
 
+PKGINSTALL=	${.CURDIR}/pkg-install
+PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
+
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	ac_cv_prog_LEX=${LOCALBASE}/bin/flex
diff --git a/graphics/libGL/files/pkg-install.in b/graphics/libGL/files/pkg-install.in
deleted file mode 100644
index f94c9f163ccb..000000000000
--- a/graphics/libGL/files/pkg-install.in
+++ /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/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1.2.0 ${PREFIX}/lib/libGL.so.1.2.0
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1
-	fi
-	;;
-esac
diff --git a/graphics/libGL/files-old/pkg-deinstall.in b/graphics/libGL/pkg-deinstall
index 37d895397fcb..37d895397fcb 100644
--- a/graphics/libGL/files-old/pkg-deinstall.in
+++ b/graphics/libGL/pkg-deinstall
diff --git a/graphics/libGL/files-old/pkg-install.in b/graphics/libGL/pkg-install
index 280922c0bbfc..b0f6b7b87e23 100644
--- a/graphics/libGL/files-old/pkg-install.in
+++ b/graphics/libGL/pkg-install
@@ -11,8 +11,9 @@ POST-INSTALL)
 	  /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/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so
-	  /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1
+	  /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
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
index 9a467158be5c..a0e86404f5b9 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -10,9 +10,9 @@ include/GL/glxext.h
 include/GL/osmesa.h
 include/GL/wglext.h
 include/GL/wmesa.h
-lib/.libGL/libGL.so
-lib/.libGL/libGL.so.1
-lib/.libGL/libGL.so.1.2.0
+lib/.mesa/libGL.so
+lib/.mesa/libGL.so.1
+lib/.mesa/libGL.so.1.2.0
 @comment lib/libglapi.so
 @comment lib/libglapi.so.0
 @comment lib/libglapi.so.0.0.0
diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile
index 5f74dbf2144e..d5a66f7187fc 100644
--- a/graphics/libglesv2/Makefile
+++ b/graphics/libglesv2/Makefile
@@ -20,9 +20,9 @@ USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
 .if defined(WITH_NEW_MESA)
-LIBGLES_REVISION=	0
+LIBGLES_REVISION=	1
 .else
-LIBGLES_REVISION=	3
+LIBGLES_REVISION=	4
 .endif
 
 .if defined(WITH_NEW_MESA)
@@ -36,9 +36,13 @@ INSTALL_WRKSRC=	${WRKSRC}/src/mapi/es2api
 .if !defined(WITH_NEW_MESA)
 pre-build:
 	@cd ${WRKSRC}/src/mapi/shared-glapi && ${MAKE_CMD} ${_MAKE_JOBS}
-.else
-post-install:
-	@${RM} ${STAGEDIR}/${PREFIX}/lib/libglapi*
 .endif
 
+post-install:
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
+	@${MV} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so* \
+		${STAGEDIR}${PREFIX}/lib/.mesa/
+
 .include <bsd.port.mk>
diff --git a/graphics/libglesv2/pkg-deinstall b/graphics/libglesv2/pkg-deinstall
new file mode 100644
index 000000000000..1cb83ecaf20a
--- /dev/null
+++ b/graphics/libglesv2/pkg-deinstall
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PREFIX="${PKG_PREFIX-/usr/local}"
+
+case $2 in
+DEINSTALL)
+	/bin/rm -f ${PREFIX}/lib/libGLESv2.so*
+	;;
+esac
diff --git a/graphics/libglesv2/pkg-install b/graphics/libglesv2/pkg-install
new file mode 100644
index 000000000000..d9afcef93160
--- /dev/null
+++ b/graphics/libglesv2/pkg-install
@@ -0,0 +1,19 @@
+#!/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
diff --git a/graphics/libglesv2/pkg-plist b/graphics/libglesv2/pkg-plist
index 3c7cb53d2282..b329d89faba6 100644
--- a/graphics/libglesv2/pkg-plist
+++ b/graphics/libglesv2/pkg-plist
@@ -5,7 +5,10 @@ include/GLES3/gl3.h
 %%NEW%%include/GLES3/gl31.h
 include/GLES3/gl3ext.h
 include/GLES3/gl3platform.h
-lib/libGLESv2.so
-lib/libGLESv2.so.2
-lib/libGLESv2.so.2.0.0
+lib/.mesa/libGLESv2.so
+lib/.mesa/libGLESv2.so.2
+lib/.mesa/libGLESv2.so.2.0.0
+@comment lib/libglapi.so
+@comment lib/libglapi.so.0
+@comment lib/libglapi.so.0.0.0
 libdata/pkgconfig/glesv2.pc
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 0e3cb84c3614..ffba9c36b28e 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -13,7 +13,7 @@
 PORTNAME=	nvidia-driver
 DISTVERSION?=	340.46
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_NVIDIA}
 # MASTER_SITE_SUBDIR has to be set later because it depends on NVVERSION
@@ -241,11 +241,17 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
 .endif
 # Adjust installation paths of some conflicting files (shared also between
-# libGL and xorg-server) to ease package manager work, esp. with pkgng
+# 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
+	${REINPLACE_CMD} -e '/LIBDIR/s:lib:&/.nvidia:' \
+		${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
diff --git a/x11/nvidia-driver/files/pkg-deinstall.in b/x11/nvidia-driver/files/pkg-deinstall.in
index 47f6c1afab2c..1edbadeb694b 100644
--- a/x11/nvidia-driver/files/pkg-deinstall.in
+++ b/x11/nvidia-driver/files/pkg-deinstall.in
@@ -10,9 +10,24 @@ DEINSTALL)
 	/bin/rm -f ${PREFIX}/lib/libGL.so*
 	/bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so*
 
-	/bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so
-	/bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1
+	/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
+	fi
 	;;
 esac
diff --git a/x11/nvidia-driver/files/pkg-install.in b/x11/nvidia-driver/files/pkg-install.in
index 5d972c1f01c9..1db588846038 100644
--- a/x11/nvidia-driver/files/pkg-install.in
+++ b/x11/nvidia-driver/files/pkg-install.in
@@ -7,8 +7,19 @@ PREFIX=${PKG_PREFIX-/usr/local}
 
 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
 	;;
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index fb20d54317f6..4a8b4d5d2a12 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,12 +1,12 @@
 bin/nvidia-bug-report.sh
 lib/.nvidia/libGL.so
 lib/.nvidia/libGL.so.1
-lib/libEGL.so
-lib/libEGL.so.1
+lib/.nvidia/libEGL.so
+lib/.nvidia/libEGL.so.1
 lib/libGLESv1_CM.so
 lib/libGLESv1_CM.so.1
-lib/libGLESv2.so
-lib/libGLESv2.so.2
+lib/.nvidia/libGLESv2.so
+lib/.nvidia/libGLESv2.so.2
 lib/libGLcore.so
 lib/libGLcore.so.1
 lib/libXvMCNVIDIA.a