Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/xorg-server/Makefile,v
retrieving revision 1.36
diff -u -r1.36 Makefile
--- Makefile	3 May 2006 08:12:20 -0000	1.36
+++ Makefile	17 May 2006 00:43:56 -0000
@@ -22,8 +22,7 @@
 .else
 LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
 		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		GL.1:${PORTSDIR}/x11/libGL
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
 		${LIB_PC_DEPENDS}
 RUN_DEPENDS=	${LIB_PC_DEPENDS}
@@ -152,6 +151,12 @@
 PLIST_SUB+=	AMD64_I386="@comment "
 .endif
 
+.if defined(WITH_NVIDIA_DRIVER)
+LIB_DEPENDS+=	GL.1:${PORTSDIR}/x11/nvidia-driver
+.elif defined(WITH_MODULAR)
+LIB_DEPENDS+=	GL.1:${PORTSDIR}/x11/libGL
+.endif
+
 .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
Index: scripts/configure
===================================================================
RCS file: /home/ncvs/ports/x11-servers/xorg-server/scripts/configure,v
retrieving revision 1.9
diff -u -r1.9 configure
--- scripts/configure	31 Jul 2005 23:42:48 -0000	1.9
+++ scripts/configure	16 May 2006 20:27:43 -0000
@@ -20,7 +20,9 @@
 echo "#define ModInstall YES"			>> $LOCALDEF
 echo "#define XF86Server NO"			>> $LOCALDEF
 echo "#define BuildServersOnly YES"		>> $LOCALDEF
+if [ X$WITH_NVIDIA_DRIVER = X ]; then
 echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
+fi
 echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
 echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
 echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF