3 files changed, 19 insertions, 64 deletions

diff --git a/net-im/skype-devel/pkg-message b/net-im/skype-devel/pkg-message
index 0d32f6f9c488..28a087d97b8b 100644
--- a/net-im/skype-devel/pkg-message
+++ b/net-im/skype-devel/pkg-message
@@ -1,22 +1,9 @@
 *******************************************************************************
 In the current version, video doesn't work. The instructions below are left in
-for completness.
+for completeness.
 *******************************************************************************
 
-1. Minimum OS version.
-
-Skype is a Linux binary package that we run on FreeBSD via our Linux compat.
-In order for Skype to work OK, you need your kernel and modules to be:
-- post 2011-05-03 in on HEAD
-- post 2011-05-08 in on 7,8-STABLE
-The port tries to check for this, but there is a smaller or bigger interval for
-which this can't be done automatically. So in case of any trouble please make
-sure you run kernel/modules built from sources after above dates.
-Tests were only done on HEAD and 8-STALBE with linux-fc10, and I don't think it
-can work with fc4.
-
-
-2. Sound
+1. Sound
 
 Since the OSS interface was removed, Skype now uses linux-alsa compat packages.
 By default you get one device corresponding to your default OSS dsp device (so
@@ -46,13 +33,13 @@ ctl.oss1 {
 }
 
 
-3. Video
+2. Video
 
-3.1. Receiving video
+2.1. Receiving video
 Should work out of the box. Please make sure you have
 Options --> Video Devices --> Enable Skype Video checked.
 
-3.2. Sending video
+2.2. Sending video
 Skype uses /dev/videoX (usually /dev/video0). This device node is created by
 the drivers for your webcam (eg. multimedia/webcamd). If you selected the VIDEO
 option (default) multimedia/webcamd will be pulled in.
@@ -68,26 +55,26 @@ To make it permanent you can:
 # echo 'linux_v4l2wrapper_load="YES"' >> /boot/loader.conf
 
 
-4. SMSes
+3. SMSes
 
 You can send SMSes with this version (provided you have Skype credit, of course).
 Check Options --> SMS for details.
 
 
-5. Screen sharing
+4. Screen sharing
 
 You should be able to receive and send.
 Please make sure you have Options --> Video Devices --> Enable Skype Video
 checked to use this feature (yes, even if you don't use video).
 
 
-6. Skype Access
+5. Skype Access
 
 Doesn't work and it is likely not very probable it  will ever work since it
 uses a lot of Linux-specific things.
 
 
-7. Problems and bug reports
+6. Problems and bug reports
 
 First of all, please understand that this is a closed, binary Linux application
 that makes use for some more-or-less cutting edge Linux features/interfaces,
diff --git a/net-im/skype4/pkg-message b/net-im/skype4/pkg-message
index f9f6db4d536f..ac09bc0287dd 100644
--- a/net-im/skype4/pkg-message
+++ b/net-im/skype4/pkg-message
@@ -1,21 +1,4 @@
-1. Minimum OS version.
-======================
-
-Skype is a Linux binary package that we run on FreeBSD via our Linux compat.
-
-In order for Skype to work at all, you need to be running FreeBSD 11.0-CURRENT with
-a Kernel and modules later than 2015-05-24.
-
-The port tries to check for this, and determines your kernel's osversion.
-Chances are, if your kernel isn't new enough, the installation will fail.
-
-So in case of any trouble please make
-sure you run kernel/modules built from sources after above dates.
-Tests were only done on HEAD with linux CentOS 6, and it's certainly broken
-with Fedora 10 (legacy).
-
-
-2. Sound
+1. Sound
 ========
 
 Since the OSS interface was removed, Skype now uses linux-pulseaudio compat packages.
@@ -30,15 +13,15 @@ Chances are, if you want to use Skype 4.3 *and* something that actually
 requires (Linux) PulseAudio, you'll be better off running Linux natively.
 
 
-3. Video
+2. Video
 ========
 
-3.1. Receiving video
+2.1. Receiving video
 --------------------
 Should work out of the box. Please make sure you have
 Options --> Video Devices --> Enable Skype Video  checked.
 
-3.2. Sending video
+2.2. Sending video
 ------------------
 Skype uses /dev/videoX (usually /dev/video0). This device node is created by
 the drivers for your webcam (eg. multimedia/webcamd). If you selected the VIDEO
@@ -56,28 +39,28 @@ To make it permanent you can:
 # echo 'linux_v4l2wrapper_load="YES"' >> /boot/loader.conf
 
 
-4. SMSes
+3. SMSes
 ========
 
 You can send SMSes with this version (provided you have Skype credit, of course).
 Check Options --> SMS for details.
 
 
-5. Screen sharing
+4. Screen sharing
 =================
 
 You should be able to receive and send once you have enabled Skype Video (check
-§3)
+§2)
 
 
-6. Skype Access
+5. Skype Access
 ===============
 
 Doesn't work and it is likely not very probable it  will ever work since it
 uses a lot of Linux-specific things.
 
 
-7. Troubleshooting
+6. Troubleshooting
 ==================
 
 If Skype coredumps after displaying a (grey) About screen, you need to mount
@@ -91,7 +74,7 @@ This should work:
 linprocfs	/compat/linux/proc	linprocfs	rw,late	0	0
 
 
-8. Problems and bug reports
+7. Problems and bug reports
 ===========================
 
 First of all, please understand that this is a closed, binary Linux application
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 103b83d550ec..43be0e3af18c 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -65,21 +65,6 @@ GYP_DEFINES:=	${GYP_DEFINES},TDESKTOP_DISABLE_GTK_INTEGRATION
 
 .include <bsd.port.pre.mk>
 
-# This port needs C++17 libs/compiler.
-# Currently, this is not supported by USES=compiler
-# Using clang does not work: libc++ in base does not support C++17.
-# Using gcc does not work: using both libc++ and libstdc++ causes crashes.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-IGNORE=		need C++17 support in compiler and runtime
-.endif
-
-# Since 1.3.14, the clang compiler provided in 11.1 (4.0.0) gets a segmentation
-# fault.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1102000
-CXXFLAGS+=	-DGSL_USE_STD_BYTE=0
-QMAKE_COMPILER=	clang
-.endif
-
 post-patch:
 	@cd ${WRKSRC} && \
 		(${SED} -e " \