Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -147,11 +147,6 @@
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .endif
-.if defined(LIBGLDIR)
-PLIST_SUB+=	LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
-.else
-PLIST_SUB+=	LIBGLDIR="@comment " LIBGLMAP=""
-.endif
 
 # Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
 .if ${NVVERSION} >= 515.04304
@@ -410,22 +405,10 @@
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
 .  endif
-# Configuration of Nvidia as secondary GPU requires preserving libglvnd or mesa
-# libraries as default implementation; a libmap must not override in this case.
-.  if !defined(LIBGLDIR)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
-.  else
-# libgl proxies require a library path containing unrenamed lib*GL*.so
-	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBGLDIR}
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1 \
-		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGL.so.1
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 \
-		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libEGL.so.1
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2 \
-		${STAGEDIR}${PREFIX}/${LIBGLDIR}/libGLESv2.so.2
-.  endif
+
 # Configuration of Nvidia as secondary GPU requires preserving xorg-server's
 # libglx.so and moving Nvidia's glx to where it can be found by a secondary
 # Xorg instance.
Index: x11/nvidia-driver/pkg-plist
===================================================================
--- x11/nvidia-driver/pkg-plist
+++ x11/nvidia-driver/pkg-plist
@@ -1,10 +1,7 @@
 bin/nvidia-bug-report.sh
 bin/nvidia-debugdump
 bin/nvidia-smi
-%%LIBGLMAP%%etc/libmap.d/nvidia.conf
-%%LIBGLDIR%%/libGL.so.1
-%%LIBGLDIR%%/libEGL.so.1
-%%LIBGLDIR%%/libGLESv2.so.2
+etc/libmap.d/nvidia.conf
 lib/libEGL-NVIDIA.so
 lib/libEGL-NVIDIA.so.1
 lib/libEGL_nvidia.so
@@ -17,8 +14,6 @@
 lib/libGLESv2-NVIDIA.so.2
 lib/libGLESv2_nvidia.so
 lib/libGLESv2_nvidia.so.2
-%%LIBGLDIR%%/libGLX.so
-%%LIBGLDIR%%/libGLX.so.0
 @comment lib/libGLX_indirect.so.0
 lib/libGLX_nvidia.so
 lib/libGLX_nvidia.so.0