Index: branches/2021Q1/sysutils/conky/files/patch-src_freebsd.cc
===================================================================
--- branches/2021Q1/sysutils/conky/files/patch-src_freebsd.cc	(nonexistent)
+++ branches/2021Q1/sysutils/conky/files/patch-src_freebsd.cc	(revision 560878)
@@ -0,0 +1,12 @@
+--- src/freebsd.cc.orig	2020-07-27 12:01:52 UTC
++++ src/freebsd.cc
+@@ -49,7 +49,9 @@
+ #include <unistd.h>
+ 
+ #include <dev/acpica/acpiio.h>
++#if 0
+ #include <dev/wi/if_wavelan_ieee.h>
++#endif
+ 
+ #include <mutex>
+ 

Property changes on: branches/2021Q1/sysutils/conky/files/patch-src_freebsd.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 560877)
+++ branches/2021Q1	(revision 560878)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r560876