diff options
| author | tijl <tijl@FreeBSD.org> | 2016-11-04 05:47:46 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2016-11-04 05:47:46 +0800 |
| commit | 808a2a60e7ce4e240588eba08e4f2ce6983b0e1f (patch) | |
| tree | 217b630c3b537320d8bc0fa8c4a97dc39f4fd98c /net-im | |
| parent | 14073edcb9a2d2648cbfb211f88a8fda5e7972f6 (diff) | |
| download | freebsd-ports-gnome-808a2a60e7ce4e240588eba08e4f2ce6983b0e1f.tar.gz freebsd-ports-gnome-808a2a60e7ce4e240588eba08e4f2ce6983b0e1f.tar.zst freebsd-ports-gnome-808a2a60e7ce4e240588eba08e4f2ce6983b0e1f.zip | |
Remove NVIDIA option from Linux ports now that the nvidia-driver can be
installed later.
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype-devel/Makefile | 18 | ||||
| -rw-r--r-- | net-im/skype/Makefile | 17 | ||||
| -rw-r--r-- | net-im/skype4/Makefile | 6 |
3 files changed, 11 insertions, 30 deletions
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile index fa75d1150f0b..148753855c67 100644 --- a/net-im/skype-devel/Makefile +++ b/net-im/skype-devel/Makefile @@ -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 version 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 diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile index 4b6ac33cd614..26f03995367b 100644 --- a/net-im/skype/Makefile +++ b/net-im/skype/Makefile @@ -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 diff --git a/net-im/skype4/Makefile b/net-im/skype4/Makefile index 560d95907c42..0eff39574b11 100644 --- a/net-im/skype4/Makefile +++ b/net-im/skype4/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${LINUXBASE}/lib/skype_oss_wrapper/libpulse.so.0:audio/linux-skype_ 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) |