Index: branches/2020Q4/misc/iio-oscilloscope/Makefile
===================================================================
--- branches/2020Q4/misc/iio-oscilloscope/Makefile	(revision 552897)
+++ branches/2020Q4/misc/iio-oscilloscope/Makefile	(revision 552898)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	iio-oscilloscope
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11
 DISTVERSIONSUFFIX=	-master
 PORTREVISION=	1
 CATEGORIES=	misc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Oscilloscope application for interfacing with various IIO devices
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libad9361.so:misc/libad9361-iio \
 		libcurl.so:ftp/curl \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgtkdatabox.so:x11-toolkits/gtkdatabox \
 		libiio.so:misc/libiio \
 		libjansson.so:devel/jansson \
 		libmatio.so:math/matio
 
-USES=		cmake gnome localbase:ldflags pkgconfig
+USES=		cmake compiler:c11 gnome localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	analogdevicesinc
 USE_GNOME=	atk cairo gdkpixbuf2 gtk20 libxml2 pango
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lm -lexecinfo
 
 .include <bsd.port.mk>
Index: branches/2020Q4/misc/iio-oscilloscope/files/patch-plugins_lidar.c
===================================================================
--- branches/2020Q4/misc/iio-oscilloscope/files/patch-plugins_lidar.c	(revision 552897)
+++ branches/2020Q4/misc/iio-oscilloscope/files/patch-plugins_lidar.c	(nonexistent)
@@ -1,11 +0,0 @@
---- plugins/lidar.c.orig	2019-10-31 18:10:53 UTC
-+++ plugins/lidar.c
-@@ -112,7 +112,7 @@ static void auto_cfg_set_cb(void)
- static void auto_cfg_button_changed_cb(GtkSpinButton *btn)
- {
- 	// Force the buttons value to have a valid permutation of (0, 1, 2, 3)
--	int i, j, idx;
-+	int i, j, idx = 0;
- 	int old_val;
- 	int crt_val = gtk_spin_button_get_value_as_int(btn);
- 

Property changes on: branches/2020Q4/misc/iio-oscilloscope/files/patch-plugins_lidar.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: branches/2020Q4/misc/iio-oscilloscope/files/patch-osc.c
===================================================================
--- branches/2020Q4/misc/iio-oscilloscope/files/patch-osc.c	(revision 552897)
+++ branches/2020Q4/misc/iio-oscilloscope/files/patch-osc.c	(nonexistent)
@@ -1,11 +0,0 @@
---- osc.c.orig	2019-10-31 18:10:02 UTC
-+++ osc.c
-@@ -573,7 +573,7 @@ int plugin_data_capture_of_plot(OscPlot *plot, const c
- 	struct iio_device *dev, *tmp_dev = NULL;
- 	struct extra_dev_info *dev_info;
- 	struct marker_type *markers_copy = NULL;
--	GMutex *markers_lock;
-+	GMutex *markers_lock = NULL;
- 	unsigned int i, j;
- 	bool new = FALSE;
- 	const char *tmp = NULL;

Property changes on: branches/2020Q4/misc/iio-oscilloscope/files/patch-osc.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 552897)
+++ branches/2020Q4	(revision 552898)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r552897