svn commit: r425274 - in head: Mk astro/google-earth emulators/linux-c6 emulators/linux-c7 games/linux-darwinia-demo games/linux-defcon games/linux-doom3-demo games/linux-enemyterritory games/linux...
Tijl Coosemans
tijl at FreeBSD.org
Thu Nov 3 21:47:49 UTC 2016
Author: tijl
Date: Thu Nov 3 21:47:46 2016
New Revision: 425274
URL: https://svnweb.freebsd.org/changeset/ports/425274
Log:
Remove NVIDIA option from Linux ports now that the nvidia-driver can be
installed later.
Modified:
head/Mk/bsd.options.desc.mk
head/astro/google-earth/Makefile
head/emulators/linux-c6/Makefile
head/emulators/linux-c7/Makefile
head/games/linux-darwinia-demo/Makefile
head/games/linux-defcon/Makefile
head/games/linux-doom3-demo/Makefile
head/games/linux-enemyterritory/Makefile
head/games/linux-nerogame/Makefile
head/games/linux-nwnclient/Makefile
head/games/linux-rtcw/Makefile
head/games/linux-unigine-heaven/Makefile
head/games/linux-unigine-valley/Makefile
head/games/linux-uplink-demo/Makefile
head/games/linux-ut2003-demo/Makefile
head/games/linux-virtual-jay-peak/Makefile
head/games/linux-worldofgoo-demo/Makefile
head/graphics/linux-c6-glx-utils/Makefile
head/graphics/linux-c7-glx-utils/Makefile
head/net-im/skype-devel/Makefile
head/net-im/skype/Makefile
head/net-im/skype4/Makefile
head/x11-toolkits/linux-c6-qt47-x11/Makefile
head/x11-toolkits/linux-c7-qt-x11/Makefile
Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk Thu Nov 3 21:25:19 2016 (r425273)
+++ head/Mk/bsd.options.desc.mk Thu Nov 3 21:47:46 2016 (r425274)
@@ -356,7 +356,6 @@ 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/astro/google-earth/Makefile
==============================================================================
--- head/astro/google-earth/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/astro/google-earth/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -19,6 +19,7 @@ OPTIONS_DEFAULT= LINUX_DRI
OPTIONS_SINGLE= LIBGL
OPTIONS_SINGLE_LIBGL= LINUX_DRI NVIDIA_GL NVIDIA_GL_340 NVIDIA_GL_304
LINUX_DRI_DESC= libGL support via Linux DRI libraries
+NVIDIA_GL_DESC= libGL support via nvidia-driver
NVIDIA_GL_340_DESC= libGL support via nvidia-driver-340
NVIDIA_GL_304_DESC= libGL support via nvidia-driver-304
Modified: head/emulators/linux-c6/Makefile
==============================================================================
--- head/emulators/linux-c6/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/emulators/linux-c6/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,6 +3,7 @@
PORTNAME= linux-c6
PORTVERSION= ${LINUX_DIST_VER}
+PORTREVISION= 1
CATEGORIES= emulators linux
MAINTAINER= emulation at FreeBSD.org
@@ -68,6 +69,7 @@ RUN_DEPENDS= linux-c6-libasyncns>0:dns/l
linux-c6-expat>0:textproc/linux-c6-expat \
linux-c6-aspell>0:textproc/linux-c6-aspell \
linux-c6-libxml2>0:textproc/linux-c6-libxml2 \
+ linux-c6-dri>0:graphics/linux-c6-dri \
linux-c6-sdl_image>0:graphics/linux-c6-sdl_image \
linux-c6-sdl_ttf>0:graphics/linux-c6-sdl_ttf \
linux-c6-png>0:graphics/linux-c6-png \
@@ -79,10 +81,4 @@ RUN_DEPENDS= linux-c6-libasyncns>0:dns/l
USES= linux:c6 metaport
-OPTIONS_DEFINE= NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
- linux-c6-libGLU>0:graphics/linux-c6-libGLU
-NVIDIA_GL_RUN_DEPENDS_OFF= linux-c6-dri>0:graphics/linux-c6-dri
-
.include <bsd.port.mk>
Modified: head/emulators/linux-c7/Makefile
==============================================================================
--- head/emulators/linux-c7/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/emulators/linux-c7/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,6 +3,7 @@
PORTNAME= linux-c7
PORTVERSION= ${LINUX_DIST_VER}
+PORTREVISION= 1
CATEGORIES= emulators linux
MAINTAINER= emulation at FreeBSD.org
@@ -61,6 +62,7 @@ RUN_DEPENDS= linux-c7-libasyncns>0:dns/l
linux-c7-expat>0:textproc/linux-c7-expat \
linux-c7-aspell>0:textproc/linux-c7-aspell \
linux-c7-libxml2>0:textproc/linux-c7-libxml2 \
+ linux-c7-dri>0:graphics/linux-c7-dri \
linux-c7-png>0:graphics/linux-c7-png \
linux-c7-tiff>0:graphics/linux-c7-tiff \
linux-c7-jpeg>0:graphics/linux-c7-jpeg \
@@ -84,10 +86,4 @@ RUN_DEPENDS+= linux-c7-sdl_image>0:graph
linux-c7-qtwebkit>0:www/linux-c7-qtwebkit
.endif
-OPTIONS_DEFINE= NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
- linux-c7-libGLU>0:graphics/linux-c7-libGLU
-NVIDIA_GL_RUN_DEPENDS_OFF= linux-c7-dri>0:graphics/linux-c7-dri
-
.include <bsd.port.post.mk>
Modified: head/games/linux-darwinia-demo/Makefile
==============================================================================
--- head/games/linux-darwinia-demo/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-darwinia-demo/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -2,7 +2,7 @@
PORTNAME= darwinia-demo
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games linux
MASTER_SITES= http://download.introversion.co.uk/mirror/introversion/darwinia/downloads/
PKGNAMEPREFIX= linux-
@@ -14,7 +14,7 @@ COMMENT= Real-time action strategy with
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= sdl12 libogg libvorbis xorglibs
+USE_LINUX= dri libogg libvorbis sdl12 xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
NO_WRKSUBDIR= yes
@@ -22,17 +22,7 @@ NO_WRKSUBDIR= yes
DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
SUB_FILES= darwinia
-OPTIONS_DEFINE= NVIDIA DOCS
-NVIDIA_DESC= Enable nvidia graphics driver support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= libglu
-.else
-USE_LINUX+= dri
-.endif
+OPTIONS_DEFINE= DOCS
do-extract:
@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
Modified: head/games/linux-defcon/Makefile
==============================================================================
--- head/games/linux-defcon/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-defcon/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= defcon
PORTVERSION= 1.42
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games linux
MASTER_SITES= http://download.introversion.co.uk/defcon/linux/
PKGNAMEPREFIX= linux-
@@ -14,24 +14,14 @@ COMMENT= Defcon for Linux
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= sdl12 libogg libvorbis xorglibs
+USE_LINUX= dri libogg libvorbis sdl12 xorglibs
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
DATADIR= ${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
SUB_FILES= defcon
-OPTIONS_DEFINE= NVIDIA DOCS
-NVIDIA_DESC= support for nvidia
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= libglu
-.else
-USE_LINUX+= dri
-.endif
+OPTIONS_DEFINE= DOCS
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
Modified: head/games/linux-doom3-demo/Makefile
==============================================================================
--- head/games/linux-doom3-demo/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-doom3-demo/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= doom3-demo
PORTVERSION= 1.1.1286
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games linux
MASTER_SITES= http://www.hup.hu/~trey/DOOM3/ \
http://darkstar.ist.utl.pt/pub/games/ \
@@ -18,7 +18,7 @@ COMMENT= DOOM III demo for Linux
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= xorglibs
+USE_LINUX= dri xorglibs
NO_CDROM= Redistribution is limited, see license; Requested by id Software
NO_BUILD= yes
NO_WRKSUBDIR= yes
@@ -28,11 +28,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPR
SUB_FILES= doom3-demo
SUB_LIST= DOOMDIR="${DOOMDIR}"
-OPTIONS_DEFINE= DOCS NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE_OFF= LINUX=dri
-
+OPTIONS_DEFINE= DOCS
do-extract:
@${MKDIR} ${WRKSRC}
Modified: head/games/linux-enemyterritory/Makefile
==============================================================================
--- head/games/linux-enemyterritory/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-enemyterritory/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= enemyterritory
PORTVERSION= 2.60b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games linux
MASTER_SITES= IDSOFTWARE/et/:patch \
IDSOFTWARE/et/linux/:full
@@ -16,15 +16,12 @@ COMMENT= Wolfenstein: Enemy Territory (L
ONLY_FOR_ARCHS= i386 amd64
USES= linux zip:infozip
-USE_LINUX= xorglibs
+USE_LINUX= dri xorglibs
NO_CDROM= Redistribution limited
ETDIR= ${PREFIX}/lib/${PORTNAME}
PATCH_260B_DIR= Enemy Territory 2.60b
-OPTIONS_DEFINE= DOCS NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE_OFF= LINUX=dri
+OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
Modified: head/games/linux-nerogame/Makefile
==============================================================================
--- head/games/linux-nerogame/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-nerogame/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= nerogame
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games linux
MASTER_SITES= http://nn.cs.utexas.edu/nero/downloads/
PKGNAMEPREFIX= linux-
@@ -13,7 +13,7 @@ MAINTAINER= craig001 at lerwick.hopto.org
COMMENT= Neuro evolving robotic operatives the game
USES= linux
-USE_LINUX= libvorbis sdl12 libtheora
+USE_LINUX= dri libtheora libvorbis sdl12
NO_BUILD= yes
RESTRICTED= Nero is freeware, but i am not sure of its license
@@ -21,19 +21,6 @@ SUB_FILES= nerogame pkg-message
DATADIR= share/${PKGNAMEPREFIX}${PORTNAME}
WRKSRC= ${WRKDIR}/${DISTNAME}
-OPTIONS_DEFINE= NVIDIA
-NVIDIA_DESC= Nvidia support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNVIDIA}
-. if !exists(${LINUXBASE}/usr/lib/libGL.so.1)
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-. endif
-.else
-USE_LINUX+= dri
-.endif
-
do-install:
${BRANDELF} -t Linux ${WRKSRC}/nero.bin
${INSTALL_PROGRAM} ${WRKSRC}/nero.bin ${STAGEDIR}${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
Modified: head/games/linux-nwnclient/Makefile
==============================================================================
--- head/games/linux-nwnclient/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-nwnclient/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= nwnclient
PORTVERSION= 1.69
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games linux
MASTER_SITES= http://na.llnet.bioware.cdn.ea.com/u/f/eagames/bioware/neverwinternights/updates/linux/${PORTVERSION:S/.//}/:CLIENT \
http://nwdownloads.bioware.com/neverwinternights/linux/129/:ORIG \
@@ -24,21 +24,13 @@ RUN_DEPENDS= ${LOCALBASE}/share/nwndata/
NO_BUILD= yes
RESTRICTED= Distribution not allowed
USES= linux
-USE_LINUX= sdl12 xorglibs
+USE_LINUX= dri sdl12 xorglibs
NWNDATADIR= ${LOCALBASE}/share/nwndata
-.ifdef WITH_NVIDIA_GL
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= libglu
-.else
-USE_LINUX+= dri
-.endif
-
OPTIONS_DEFINE= NWMOVIES
NWMOVIES_DESC= Support for movies using BinkPlayer
.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
# Client detection. Currently, detects only original and Diamond editions.
.if exists(${LOCALBASE}/share/nwndata/xp2.key)
@@ -98,4 +90,4 @@ do-install:
.endif
${INSTALL_SCRIPT} ${WRKDIR}/nwn ${STAGEDIR}${PREFIX}/bin/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/linux-rtcw/Makefile
==============================================================================
--- head/games/linux-rtcw/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-rtcw/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= rtcw
DISTVERSION= 1.41b
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games linux
MASTER_SITES= IDSOFTWARE/wolf/linux
PKGNAMEPREFIX= linux-
@@ -14,7 +14,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Return to Castle Wolfenstein (Linux version)
USES= linux makeself
-USE_LINUX= xorglibs
+USE_LINUX= dri xorglibs
NO_WRKSUBDIR= yes
WRAPPERS= wolf wolfded wolfsp
@@ -24,16 +24,7 @@ PORTSCOUT= skipv:1.41-3
PORTDOCS= *
-OPTIONS_DEFINE= DOCS NVIDIA_GL
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_EXTVER= '__GL_ExtensionStringVersion=18999 '
-.else
-USE_LINUX+= dri
-.endif
+OPTIONS_DEFINE= DOCS
# XXX: should probably be converted to use the LICENSE framework
post-extract:
@@ -43,7 +34,7 @@ do-build:
.for f in ${WRAPPERS}
(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD}; \
${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
- ${ECHO_CMD} '${NVIDIA_GL_EXTVER}exec ./${f} "$$@"') > ${WRKDIR}/${f}
+ ${ECHO_CMD} 'exec ./${f} "$$@"') > ${WRKDIR}/${f}
.endfor
do-install:
Modified: head/games/linux-unigine-heaven/Makefile
==============================================================================
--- head/games/linux-unigine-heaven/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-unigine-heaven/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= unigine-heaven
PORTVERSION= 4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games benchmarks linux
MASTER_SITES= http://de1-dl.techpowerup.com/Benchmarking/ \
http://nl1-dl.techpowerup.com/Benchmarking/ \
@@ -24,15 +24,10 @@ LICENSE_PERMS= no-dist-sell no-pkg-sell
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= xorglibs openal-soft
+USE_LINUX= dri openal-soft xorglibs
USE_LDCONFIG= yes
NO_BUILD= yes
-OPTIONS_DEFINE= NVIDIA_GL
-NVIDIA_GL_DESC= Use GL driver from nvidia-driver
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_VARS_OFF= USE_LINUX+= dri
-
do-extract:
@${MKDIR} ${WRKSRC}
cd ${WRKSRC} && ${TAIL} -n 1098568 ${_DISTDIR}/${DISTFILES} | ${TAR} zxf -
Modified: head/games/linux-unigine-valley/Makefile
==============================================================================
--- head/games/linux-unigine-valley/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-unigine-valley/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= unigine-valley
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games benchmarks linux
MASTER_SITES= http://de1-dl.techpowerup.com/Benchmarking/ \
http://nl1-dl.techpowerup.com/Benchmarking/ \
@@ -24,15 +24,10 @@ LICENSE_PERMS= no-dist-sell no-pkg-sell
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= xorglibs openal-soft
+USE_LINUX= dri openal-soft xorglibs
USE_LDCONFIG= yes
NO_BUILD= yes
-OPTIONS_DEFINE= NVIDIA_GL
-NVIDIA_GL_DESC= Use GL driver from nvidia-driver
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_VARS_OFF= USE_LINUX+= dri
-
do-extract:
@${MKDIR} ${WRKSRC}
cd ${WRKSRC} && ${TAIL} -n 1491255 ${_DISTDIR}/${DISTFILES} | ${TAR} zxf -
Modified: head/games/linux-uplink-demo/Makefile
==============================================================================
--- head/games/linux-uplink-demo/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-uplink-demo/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= uplink-demo
PORTVERSION= 1.55
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games linux
MASTER_SITES= http://www.introversion.co.uk/uplink/downloads/
PKGNAMEPREFIX= linux-
@@ -15,7 +15,7 @@ COMMENT= High tech computer crime and in
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
+USE_LINUX= dri jpeg libvorbis mikmod sdl12 sdlmixer xorglibs
USE_LDCONFIG= yes
NO_CDROM= Redistribution is limited, see license
NO_BUILD= yes
@@ -26,17 +26,7 @@ SUB_FILES= uplink
SUB_LIST= LINUXBASE=${LINUXBASE}
DOCFILES= license.txt mods.txt Readme-UplinkSupport.txt readme.txt
-OPTIONS_DEFINE= NVIDIA DOCS
-NVIDIA_DESC= support for nvidia
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= libglu
-.else
-USE_LINUX+= dri
-.endif
+OPTIONS_DEFINE= DOCS
do-extract:
@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
Modified: head/games/linux-ut2003-demo/Makefile
==============================================================================
--- head/games/linux-ut2003-demo/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-ut2003-demo/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= ut2003-demo
PORTVERSION= 2206
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games linux
MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
@@ -14,7 +14,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Unreal Tournament 2003 demo
USES= linux
-USE_LINUX= sdl12 xorglibs
+USE_LINUX= dri sdl12 xorglibs
RESTRICTED= Redistribution is limited, see license
NO_BUILD= yes
NO_WRKSUBDIR= yes
@@ -35,15 +35,7 @@ PORTDOCS= *
LIBDIRS= Animations Benchmark ForceFeedback KarmaData Maps Music \
Sounds StaticMeshes System Textures Web
-OPTIONS_DEFINE= DOCS NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MNVIDIA_GL}
-USE_LINUX+= dri
-.endif
+OPTIONS_DEFINE= DOCS
do-extract:
@${MKDIR} ${WRKSRC}
Modified: head/games/linux-virtual-jay-peak/Makefile
==============================================================================
--- head/games/linux-virtual-jay-peak/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-virtual-jay-peak/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= virtual-jay-peak
PORTVERSION= 1.1a
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games linux
MASTER_SITES= http://www.soulride.com/products/images/
PKGNAMEPREFIX= linux-
@@ -12,23 +12,17 @@ DISTNAME= virtual_jay_peak_linux_1_1a
MAINTAINER= ports at FreeBSD.org
COMMENT= Simulation of snowboarding at the Jay Peak resort in Vermont
-OPTIONS_DEFINE= DOCS NVIDIA
+OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/soulride
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= xorglibs
+USE_LINUX= dri xorglibs
NO_BUILD= yes
SUB_FILES= virtual-jay-peak
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNVIDIA}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-.else
-USE_LINUX+= dri
-.endif
-
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/virtual-jay-peak ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/soulride-static ${STAGEDIR}${PREFIX}/libexec
Modified: head/games/linux-worldofgoo-demo/Makefile
==============================================================================
--- head/games/linux-worldofgoo-demo/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/games/linux-worldofgoo-demo/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= worldofgoo
PORTVERSION= 1.41
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games linux
MASTER_SITES= http://freebsd.nsu.ru/distfiles/
PKGNAMEPREFIX= linux-
@@ -15,7 +15,7 @@ COMMENT= Demo version of incredible phys
ONLY_FOR_ARCHS= i386 amd64
USES= linux
-USE_LINUX= libvorbis mikmod sdl12 sdlmixer
+USE_LINUX= dri libvorbis mikmod sdl12 sdlmixer
NO_BUILD= yes
WRKSRC= ${WRKDIR}/WorldOfGooDemo
DATADIR= ${PREFIX}/share/WorldOfGoo
@@ -23,14 +23,7 @@ DOCSDIR= ${PREFIX}/share/doc/WorldOfGoo
OPTIONS_DEFINE= DOCS
-.if defined(WITH_NVIDIA_GL)
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= libglu
-.else
-USE_LINUX+= dri
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
TARGET_BIN= WorldOfGoo.bin32
@@ -61,4 +54,4 @@ do-install:
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/linux-c6-glx-utils/Makefile
==============================================================================
--- head/graphics/linux-c6-glx-utils/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/graphics/linux-c6-glx-utils/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,24 +3,18 @@
PORTNAME= glx-utils
PORTVERSION= 11.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
MAINTAINER= emulation at FreeBSD.org
COMMENT= RPM of the GLX utils (Linux CentOS ${LINUX_DIST_VER})
-USES= linux:c6
-USE_LINUX_RPM= nolib
RPMVERSION= 4.el6
+USES= linux:c6
USE_LDCONFIG= yes
+USE_LINUX= dri xorglibs
+USE_LINUX_RPM= nolib
-OPTIONS_DEFINE= NVIDIA_GL
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE= LINUX=libglu
-NVIDIA_GL_USE_OFF= LINUX=dri
-
-.if defined(PACKAGE_BUILDING)
SRC_DISTFILES= mesa-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-.endif
.include <bsd.port.mk>
Modified: head/graphics/linux-c7-glx-utils/Makefile
==============================================================================
--- head/graphics/linux-c7-glx-utils/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/graphics/linux-c7-glx-utils/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= glx-utils
PORTVERSION= 8.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics linux
MAINTAINER= emulation at FreeBSD.org
@@ -14,13 +14,9 @@ CONFLICTS= linux-f10-${PORTNAME}-[0-9]*
RPMVERSION= 2.el7
USES= linux:c7
USE_LDCONFIG= yes
+USE_LINUX= dri xorglibs
USE_LINUX_RPM= nolib
-OPTIONS_DEFINE= NVIDIA_GL
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE= LINUX=libglu
-NVIDIA_GL_USE_OFF= LINUX=dri
-
SRC_DISTFILES= mesa-10.6.5-3.20150824.el7${SRC_SUFX}:SOURCE
.include <bsd.port.mk>
Modified: head/net-im/skype-devel/Makefile
==============================================================================
--- head/net-im/skype-devel/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/net-im/skype-devel/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= skype
PORTVERSION= 2.2.0.35
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-im
MASTER_SITES= http://download.skype.com/linux/
PKGNAMESUFFIX= -devel
@@ -14,18 +14,17 @@ COMMENT= P2P VoIP software, development
CONFLICTS= skype-[0-9]*
-OPTIONS_DEFINE= NVIDIA_GL VIDEO
-OPTIONS_DEFAULT= VIDEO
+OPTIONS_DEFINE= VIDEO
+OPTIONS_DEFAULT=VIDEO
VIDEO_DESC= [broken] Video support
-
CONFLICTS= skype-1* skype-2.0* skype-2.1*
NO_BUILD= yes
USES= cpe linux tar:bzip2
-USE_LINUX= alsalib alsa-plugins-oss expat fontconfig libasyncns \
- libsigcpp20
+USE_LINUX= alsalib alsa-plugins-oss dri expat fontconfig libasyncns \
+ libsigcpp20 xorglibs
RESTRICTED= Redistribution prohibited.
WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}
@@ -37,13 +36,6 @@ SUB_LIST+= SKYPEDIR=${SKYPEDIR}
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= xorglibs
-.else
-USE_LINUX+= dri
-.endif
-
.if ${PORT_OPTIONS:MVIDEO}
RUN_DEPENDS+= webcamd:multimedia/webcamd
USE_LINUX+= libv4l
Modified: head/net-im/skype/Makefile
==============================================================================
--- head/net-im/skype/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/net-im/skype/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= skype
PORTVERSION= 2.1.0.81
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net-im
MASTER_SITES= http://download.skype.com/linux/
@@ -14,14 +14,14 @@ COMMENT= P2P VoIP software
CONFLICTS= skype-devel-[0-9]*
-OPTIONS_DEFINE= NVIDIA_GL VIDEO
-OPTIONS_DEFAULT= VIDEO
+OPTIONS_DEFINE= VIDEO
+OPTIONS_DEFAULT=VIDEO
NO_BUILD= yes
USES= cpe linux tar:bzip2
-USE_LINUX= alsalib alsa-plugins-oss expat fontconfig libasyncns \
- libsigcpp20
+USE_LINUX= alsalib alsa-plugins-oss dri expat fontconfig libasyncns \
+ libsigcpp20 xorglibs
RESTRICTED= Redistribution prohibited.
WRKSRC= ${WRKDIR}/${PORTNAME}_static-${DISTVERSION}
@@ -33,13 +33,6 @@ SUB_LIST+= SKYPEDIR=${SKYPEDIR}
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNVIDIA_GL}
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX+= xorglibs
-.else
-USE_LINUX+= dri
-.endif
-
.if ${PORT_OPTIONS:MVIDEO}
RUN_DEPENDS+= webcamd:multimedia/webcamd
USE_LINUX+= libv4l
Modified: head/net-im/skype4/Makefile
==============================================================================
--- head/net-im/skype4/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/net-im/skype4/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/lib/skype_oss_
CONFLICTS= skype-devel-[0-9]*
OPTIONS_DEFINE= VIDEO
-OPTIONS_DEFAULT= VIDEO
+OPTIONS_DEFAULT=VIDEO
NO_BUILD= yes
@@ -32,10 +32,6 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR}
SUB_FILES= skype.sh
SUB_LIST+= SKYPEDIR=${SKYPEDIR}
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE= LINUX=xorglibs
-NVIDIA_GL_USE_OFF= LINUX=dri
-
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100075 || ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002507)
Modified: head/x11-toolkits/linux-c6-qt47-x11/Makefile
==============================================================================
--- head/x11-toolkits/linux-c6-qt47-x11/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/x11-toolkits/linux-c6-qt47-x11/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,7 +3,7 @@
PORTNAME= qt47-x11
PORTVERSION= 4.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits linux
MASTER_SITES= https://www.mirrorservice.org/sites/dl.atrpms.net/el6-x86_64/atrpms/testing/\
https://www.mirrorservice.org/sites/dl.atrpms.net/el6-i386/atrpms/testing/ \
@@ -18,15 +18,9 @@ SRC_DISTFILES= # unretrievable.
RPMVERSION= 1_18.el6
USES= linux:c6
USE_LDCONFIG= yes
-USE_LINUX= fontconfig png xorglibs png alsalib jpeg tiff qt47 openssl
+USE_LINUX= alsalib dri fontconfig jpeg openssl png qt47 tiff xorglibs
USE_LINUX_RPM= yes
-OPTIONS_DEFINE= NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE= LINUX=libglu
-NVIDIA_GL_USE_OFF= LINUX=dri
-
DESCR= ${.CURDIR}/../../devel/qt4/pkg-descr
post-patch:
Modified: head/x11-toolkits/linux-c7-qt-x11/Makefile
==============================================================================
--- head/x11-toolkits/linux-c7-qt-x11/Makefile Thu Nov 3 21:25:19 2016 (r425273)
+++ head/x11-toolkits/linux-c7-qt-x11/Makefile Thu Nov 3 21:47:46 2016 (r425274)
@@ -3,6 +3,7 @@
PORTNAME= qt-x11
PORTVERSION= 4.8.5
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
SRC_DISTFILES= qt-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
@@ -14,15 +15,9 @@ CONFLICTS= linux-c6-qt47-x11-[0-9]*
RPMVERSION= 11.el7
USES= linux:c7
USE_LDCONFIG= yes
-USE_LINUX= fontconfig png xorglibs alsalib jpeg tiff qt openssl
+USE_LINUX= alsalib dri fontconfig jpeg openssl png qt tiff xorglibs
USE_LINUX_RPM= yes
-OPTIONS_DEFINE= NVIDIA_GL
-
-NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE= LINUX=libglu
-NVIDIA_GL_USE_OFF= LINUX=dri
-
DESCR= ${.CURDIR}/../../devel/qt4/pkg-descr
.include <bsd.port.mk>
More information about the svn-ports-all
mailing list