From owner-svn-ports-all@FreeBSD.ORG Sun Apr 5 07:23:54 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB3A5B37; Sun, 5 Apr 2015 07:23:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD588764; Sun, 5 Apr 2015 07:23:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t357NsQL061899; Sun, 5 Apr 2015 07:23:54 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t357NoAU061881; Sun, 5 Apr 2015 07:23:50 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201504050723.t357NoAU061881@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Sun, 5 Apr 2015 07:23:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383259 - in head: Mk emulators/linux-c6 emulators/linux-f10 games/linux-doom3-demo games/linux-enemyterritory games/linux-rtcw games/linux-ut2003-demo graphics/linux-c6-glx-utils net-i... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2015 07:23:55 -0000 Author: xmj Date: Sun Apr 5 07:23:49 2015 New Revision: 383259 URL: https://svnweb.freebsd.org/changeset/ports/383259 Log: 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) Modified: head/Mk/bsd.options.desc.mk head/emulators/linux-c6/Makefile head/emulators/linux-f10/Makefile head/games/linux-doom3-demo/Makefile head/games/linux-enemyterritory/Makefile head/games/linux-rtcw/Makefile head/games/linux-ut2003-demo/Makefile head/graphics/linux-c6-glx-utils/Makefile head/net-im/skype-devel/Makefile head/net-im/skype/Makefile head/x11-toolkits/linux-c6-qt47-x11/Makefile Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Sun Apr 5 07:04:24 2015 (r383258) +++ head/Mk/bsd.options.desc.mk Sun Apr 5 07:23:49 2015 (r383259) @@ -349,6 +349,7 @@ NOTIFY_DESC?= Desktop notification supp 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 Modified: head/emulators/linux-c6/Makefile ============================================================================== --- head/emulators/linux-c6/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/emulators/linux-c6/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -85,7 +85,6 @@ RUN_DEPENDS+= linux-c6-libasyncns>0:${PO 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 Modified: head/emulators/linux-f10/Makefile ============================================================================== --- head/emulators/linux-f10/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/emulators/linux-f10/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -91,7 +91,6 @@ RUN_DEPENDS+= linux-f10-libasyncns>0:${P # 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 Modified: head/games/linux-doom3-demo/Makefile ============================================================================== --- head/games/linux-doom3-demo/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/games/linux-doom3-demo/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -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 +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} Modified: head/games/linux-enemyterritory/Makefile ============================================================================== --- head/games/linux-enemyterritory/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/games/linux-enemyterritory/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -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 - -.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 + .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${RMDIR} ${WRKSRC}/Docs/Help/_private Modified: head/games/linux-rtcw/Makefile ============================================================================== --- head/games/linux-rtcw/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/games/linux-rtcw/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -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 Modified: head/games/linux-ut2003-demo/Makefile ============================================================================== --- head/games/linux-ut2003-demo/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/games/linux-ut2003-demo/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -35,7 +35,6 @@ LIBDIRS= Animations Benchmark ForceFeedb 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 Modified: head/graphics/linux-c6-glx-utils/Makefile ============================================================================== --- head/graphics/linux-c6-glx-utils/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/graphics/linux-c6-glx-utils/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -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/gl SRC_DISTFILES= mesa-10.1.2-2.el6.src.rpm .endif -.include - -.if ! ${PORT_OPTIONS:MNVIDIA_GL} -USE_LINUX_APPS+= dri -.endif - .include Modified: head/net-im/skype-devel/Makefile ============================================================================== --- head/net-im/skype-devel/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/net-im/skype-devel/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -14,11 +14,10 @@ COMMENT= P2P VoIP software, development 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* Modified: head/net-im/skype/Makefile ============================================================================== --- head/net-im/skype/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/net-im/skype/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -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 Modified: head/x11-toolkits/linux-c6-qt47-x11/Makefile ============================================================================== --- head/x11-toolkits/linux-c6-qt47-x11/Makefile Sun Apr 5 07:04:24 2015 (r383258) +++ head/x11-toolkits/linux-c6-qt47-x11/Makefile Sun Apr 5 07:23:49 2015 (r383259) @@ -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 - -.if ! ${PORT_OPTIONS:MNVIDIA_GL} -USE_LINUX_APPS+= dri -.endif - - DESCR= ${.CURDIR}/../../devel/qt4/pkg-descr post-patch: