Add NVIDIA_GL description to Mk/bsd.options.desc.mk

- Add NVIDIA_GL description to Mk/bsd.options.desc.mk
- Remove NVIDIA_GL_DESC from all concerned ports
- Use options helpers where adequate.

Differential Revision:	https://reviews.freebsd.org/D1759
Approved by: koobs (mentor)
Approved by: portmgr (bapt)

11 files changed, 17 insertions, 42 deletions

diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index df63406baf6d..10a588ba430b 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -349,6 +349,7 @@ NOTIFY_DESC?=		Desktop notification support
 NSS_DESC?=		SSL/TLS support via NSS
 NTLM_DESC?=		NTLM authentication support
 NUMPY_DESC?=		NumPy mathematical computing support
+NVIDIA_GL_DESC?=	libGL support via nvidia-driver
 OBJC_DESC?=		Objective-C language support
 ODBC_DESC?=		ODBC database backend
 ODF_DESC?=		Open Document Format (ODF) file support
diff --git a/emulators/linux-c6/Makefile b/emulators/linux-c6/Makefile
index 1778041d63da..fb765a1a1694 100644
--- a/emulators/linux-c6/Makefile
+++ b/emulators/linux-c6/Makefile
@@ -85,7 +85,6 @@ RUN_DEPENDS+=	linux-c6-libasyncns>0:${PORTSDIR}/dns/linux-c6-libasyncns \
 		linux-c6-cairo>0:${PORTSDIR}/graphics/linux-c6-cairo
 
 OPTIONS_DEFINE=	NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
 			linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
diff --git a/emulators/linux-f10/Makefile b/emulators/linux-f10/Makefile
index 59f9b444293b..2a5a383d67dc 100644
--- a/emulators/linux-f10/Makefile
+++ b/emulators/linux-f10/Makefile
@@ -91,7 +91,6 @@ RUN_DEPENDS+=	linux-f10-libasyncns>0:${PORTSDIR}/dns/linux-f10-libasyncns \
 # don't pull in graphics/linux-f10-libGLU -- conflicts with graphics/linux-f10-dri
 
 OPTIONS_DEFINE=	NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 NVIDIA_GL_RUN_DEPENDS_OFF=	linux-f10-dri>0:${PORTSDIR}/graphics/linux-f10-dri
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index f083b7ae8f7c..b6d1d8546811 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -29,15 +29,10 @@ SUB_FILES=	doom3-demo
 SUB_LIST=	DOOMDIR="${DOOMDIR}"
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 
-.include <bsd.port.options.mk>
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_USE_OFF=	linux_apps=dri
 
-.if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=dri
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index 5a0097cef30c..a4266b50f706 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -23,15 +23,9 @@ ETDIR=		${PREFIX}/lib/${PORTNAME}
 PATCH_260B_DIR=	Enemy Territory 2.60b
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
-.else
-USE_LINUX_APPS+=	dri
-.endif
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
@@ -60,6 +54,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${ETDIR}/${DIR}
 .endfor
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${RMDIR} ${WRKSRC}/Docs/Help/_private
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index 0fa1130bbb20..55fe0a05fc4b 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -27,7 +27,6 @@ PORTSCOUT=	skipv:1.41-3
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 
 .include <bsd.port.options.mk>
 
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index 1997b5fe1b86..6b15126b0207 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -35,7 +35,6 @@ LIBDIRS=	Animations Benchmark ForceFeedback KarmaData Maps Music \
 		Sounds StaticMeshes System Textures Web
 
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 
diff --git a/graphics/linux-c6-glx-utils/Makefile b/graphics/linux-c6-glx-utils/Makefile
index 0b23003146dd..3a3b3130e8f9 100644
--- a/graphics/linux-c6-glx-utils/Makefile
+++ b/graphics/linux-c6-glx-utils/Makefile
@@ -18,8 +18,9 @@ BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
+			linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
+NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 PLIST_FILES=	usr/bin/glxgears usr/bin/glxinfo \
 		usr/bin/xdriinfo usr/share/man/man1/xdriinfo.1.gz
@@ -28,10 +29,4 @@ PLIST_FILES=	usr/bin/glxgears usr/bin/glxinfo \
 SRC_DISTFILES=	mesa-10.1.2-2.el6.src.rpm
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MNVIDIA_GL}
-USE_LINUX_APPS+=	dri
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index a15aecf8c7ad..a58a7816c1b4 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/skype-devel/Makefile
@@ -14,11 +14,10 @@ COMMENT=	P2P VoIP software, development version
 
 CONFLICTS=	skype-[0-9]*
 
-OPTIONS_DEFINE=	VIDEO NVIDIA_GL
+OPTIONS_DEFINE=	NVIDIA_GL VIDEO
+OPTIONS_DEFAULT=	VIDEO
 VIDEO_DESC=	[broken] Video support
-NVIDIA_GL_DESC=	libGL provided by NVidia binary drivers
 
-OPTIONS_DEFAULT=	VIDEO
 
 CONFLICTS=	skype-1* skype-2.0* skype-2.1*
 
diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile
index 59d3d498dbac..9b7917be95d2 100644
--- a/net-im/skype/Makefile
+++ b/net-im/skype/Makefile
@@ -14,9 +14,7 @@ COMMENT=	P2P VoIP software
 
 CONFLICTS=	skype-devel-[0-9]*
 
-OPTIONS_DEFINE=	VIDEO NVIDIA_GL
-NVIDIA_GL_DESC=	libGL provided by NVidia binary drivers
-
+OPTIONS_DEFINE=	NVIDIA_GL VIDEO
 OPTIONS_DEFAULT=	VIDEO
 
 NO_BUILD=	yes
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index 98d67f52cb42..a5fc2adb164f 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -20,21 +20,16 @@ USE_LDCONFIG=	yes
 LINUX_DIST_VER=	5
 
 OPTIONS_DEFINE=	NVIDIA_GL
-NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
+			linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
+NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 USE_LINUX_APPS=	fontconfig png  xorglibs png alsalib  jpeg tiff qt47
 USE_LINUX_RPM=	yes
 RPMVERSION=	1_18.el5
 LINUX_RPM_ARCH=	i386
 
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MNVIDIA_GL}
-USE_LINUX_APPS+=	dri
-.endif
-
-
 DESCR=	${.CURDIR}/../../devel/qt4/pkg-descr
 
 post-patch: