5209 files changed, 160361 insertions, 72816 deletions

diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index dad1ab733017..cfe909091a68 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -1,5 +1,4 @@
 # Created by: Daniel Baker <dbaker@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	3dm
 DISTVERSION=	2.11.00.021
diff --git a/sysutils/3dm/files/3dm2.in b/sysutils/3dm/files/3dm2.in
index 93f0f65962dd..e644d6eadf0f 100644
--- a/sysutils/3dm/files/3dm2.in
+++ b/sysutils/3dm/files/3dm2.in
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
 
 # PROVIDE: 3dm2
 # REQUIRE: NETWORKING SERVERS
diff --git a/sysutils/3mux/Makefile b/sysutils/3mux/Makefile
new file mode 100644
index 000000000000..d40d957cd797
--- /dev/null
+++ b/sysutils/3mux/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	3mux
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.0
+PORTREVISION=1
+CATEGORIES=	sysutils
+
+MAINTAINER=	lcook@FreeBSD.org
+COMMENT=	Terminal multiplexer inspired by i3
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+
+GO_MODULE=	github.com/aaronjanse/${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/sysutils/3mux/distinfo b/sysutils/3mux/distinfo
new file mode 100644
index 000000000000..7bb1c57f9bfb
--- /dev/null
+++ b/sysutils/3mux/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1620924825
+SHA256 (go/sysutils_3mux/3mux-v1.1.0/v1.1.0.mod) = 04b6ca37d4a405d267f3c8428b0aa60edc487c52e2b290c305c3b55578e184ea
+SIZE (go/sysutils_3mux/3mux-v1.1.0/v1.1.0.mod) = 534
+SHA256 (go/sysutils_3mux/3mux-v1.1.0/v1.1.0.zip) = a4038713b94e717f9f1d855a2f6c09e1ce64d8a4aaa072d8ee81add16af73d08
+SIZE (go/sysutils_3mux/3mux-v1.1.0/v1.1.0.zip) = 10363867
diff --git a/sysutils/3mux/pkg-descr b/sysutils/3mux/pkg-descr
new file mode 100644
index 000000000000..7c67d179e62e
--- /dev/null
+++ b/sysutils/3mux/pkg-descr
@@ -0,0 +1,5 @@
+Terminal multiplexer with out-of-the-box support for
+search, mouse-controlled scrollback, and i3-like
+keybindings.
+
+WWW: https://github.com/aaronjanse/3mux
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index 4a5c26d8eeff..089ac70bca95 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -1,5 +1,4 @@
 # Created by: Tim van der Hoek <hoek@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	44bsd-more
 PORTVERSION=	${RELDATE}
diff --git a/sysutils/44bsd-more/files/queue.h b/sysutils/44bsd-more/files/queue.h
index d97d794a3757..d04c77e4fd8d 100644
--- a/sysutils/44bsd-more/files/queue.h
+++ b/sysutils/44bsd-more/files/queue.h
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: /tmp/pcvs/ports/sysutils/44bsd-more/files/queue.h,v 1.1 2001-01-06 03:41:36 hoek Exp $
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sysutils/915resolution/Makefile b/sysutils/915resolution/Makefile
index 65aa3c990933..546e7cfeb835 100644
--- a/sysutils/915resolution/Makefile
+++ b/sysutils/915resolution/Makefile
@@ -1,5 +1,4 @@
 # Created by: Remington Lang <MrL0Lz@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	915resolution
 PORTVERSION=	0.5.3
diff --git a/sysutils/915resolution/files/915resolution.in b/sysutils/915resolution/files/915resolution.in
index 4878ebfa6f07..24be6dd00a08 100644
--- a/sysutils/915resolution/files/915resolution.in
+++ b/sysutils/915resolution/files/915resolution.in
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
 
 # PROVIDE: i915resolution
 # REQUIRE: mountcritremote
diff --git a/sysutils/DTraceToolkit/Makefile b/sysutils/DTraceToolkit/Makefile
deleted file mode 100644
index 40e93621fd44..000000000000
--- a/sysutils/DTraceToolkit/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-# Created by: Steven Kreuzer <steven@exit2shell.com>
-# $FreeBSD$
-
-PORTNAME=	dtrace-toolkit
-PORTVERSION=	1.0
-PORTREVISION=	5
-CATEGORIES=	sysutils
-
-MAINTAINER=	dteske@FreeBSD.org
-COMMENT=	Collection of useful scripts for DTrace
-
-LICENSE=	CDDL
-LICENSE_FILE=	${WRKSRC}/Docs/cddl1.txt
-
-USES=		perl5 python shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	opendtrace
-GH_PROJECT=	toolkit
-GH_TAGNAME=	f36d00b
-USE_RUBY=	yes
-SHEBANG_LANG=	sh
-sh_OLD_CMD=	/usr/bin/sh ./sh
-sh_CMD=		${SH}
-perl_OLD_CMD=	\\./perl
-ruby_OLD_CMD=	\\./ruby
-SHEBANG_FILES=	Apps/shellsnoop \
-		Code/Perl/func_abc.pl \
-		Code/Perl/func_malloc.pl \
-		Code/Perl/func_slow.pl \
-		Code/Perl/hello.pl \
-		Code/Perl/hello_strict.pl \
-		Code/Python/func_abc.py \
-		Code/Python/func_slow.py \
-		Code/Ruby/func_abc.rb \
-		Code/Ruby/func_slow.rb \
-		Code/Shell/func_abc.sh \
-		Code/Shell/func_slow.sh \
-		Code/Shell/func_waste.sh \
-		Disk/diskhits \
-		Disk/iopending \
-		FS/vopstat \
-		Include/test.ksh \
-		Kernel/cpudists \
-		Kernel/cputimes \
-		Kernel/dnlcstat \
-		Mem/xvmstat \
-		Net/connections \
-		Net/tcpsnoop \
-		Net/tcpsnoop_snv \
-		Net/tcptop \
-		Net/tcptop_snv \
-		Proc/dappprof \
-		Proc/dapptrace \
-		Proc/fddist \
-		Proc/lastwords \
-		Proc/pfilestat \
-		Proc/sampleproc \
-		Proc/topsysproc \
-		System/topsyscall \
-		Zones/zvmstat \
-		dexplorer \
-		dtruss \
-		dvmstat \
-		errinfo \
-		execsnoop \
-		hotkernel \
-		hotuser \
-		install \
-		iopattern \
-		iosnoop \
-		iotop \
-		opensnoop \
-		procsystime \
-		rwsnoop \
-		rwtop \
-		statsnoop
-
-NO_BUILD=	yes
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1200031
-# lstat calls are no longer available on 12.0+
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-dtruss
-.endif
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${TAR} --exclude '*.orig' -cf - . ) | \
-		(cd ${STAGEDIR}${DATADIR}/ && ${TAR} xvf -)
-	${RLN} ${STAGEDIR}${DATADIR}/dtruss ${STAGEDIR}${PREFIX}/bin/dtruss
-	${RLN} ${STAGEDIR}${DATADIR}/hotkernel ${STAGEDIR}${PREFIX}/bin/hotkernel
-	${RLN} ${STAGEDIR}${DATADIR}/procsystime ${STAGEDIR}${PREFIX}/bin/procsystime
-	${RLN} ${STAGEDIR}${DATADIR}/opensnoop ${STAGEDIR}${PREFIX}/bin/opensnoop
-	${RLN} ${STAGEDIR}${DATADIR}/Apps/shellsnoop ${STAGEDIR}${PREFIX}/bin/shellsnoop
-
-.for MANPAGE in dtruss hotkernel procsystime opensnoop shellsnoop
-	${INSTALL_MAN} ${WRKSRC}/Man/man1m/${MANPAGE}.1m \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/${MANPAGE}.1
-.endfor
-
-.include <bsd.port.mk>
diff --git a/sysutils/DTraceToolkit/distinfo b/sysutils/DTraceToolkit/distinfo
deleted file mode 100644
index 9d0b7a535179..000000000000
--- a/sysutils/DTraceToolkit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1463628205
-SHA256 (opendtrace-toolkit-1.0-f36d00b_GH0.tar.gz) = 28d2ab2c846792286e30eac8e052313d2f1b1335242be85cfa4b6f52b18165c8
-SIZE (opendtrace-toolkit-1.0-f36d00b_GH0.tar.gz) = 438889
diff --git a/sysutils/DTraceToolkit/pkg-message b/sysutils/DTraceToolkit/pkg-message
deleted file mode 100644
index 76c13f83a97a..000000000000
--- a/sysutils/DTraceToolkit/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
- At this point it is prudent to remind you that DTrace
- support in FreeBSD is incomplete and experimental. Many of
- these scripts will not work as they are either too Solaris
- specific or use probes which are unsupported at this time.
-EOM
-}
-]
diff --git a/sysutils/DTraceToolkit/pkg-plist b/sysutils/DTraceToolkit/pkg-plist
deleted file mode 100644
index f18c33616286..000000000000
--- a/sysutils/DTraceToolkit/pkg-plist
+++ /dev/null
@@ -1,1017 +0,0 @@
-bin/dtruss
-bin/hotkernel
-bin/opensnoop
-bin/procsystime
-bin/shellsnoop
-man/man1/dtruss.1.gz
-man/man1/hotkernel.1.gz
-man/man1/opensnoop.1.gz
-man/man1/procsystime.1.gz
-man/man1/shellsnoop.1.gz
-%%DATADIR%%/Apps/Readme
-%%DATADIR%%/Apps/httpdstat.d
-%%DATADIR%%/Apps/nfswizard.d
-%%DATADIR%%/Apps/shellsnoop
-%%DATADIR%%/Apps/weblatency.d
-%%DATADIR%%/Bin/anonpgpid.d
-%%DATADIR%%/Bin/bitesize.d
-%%DATADIR%%/Bin/connections
-%%DATADIR%%/Bin/cpudists
-%%DATADIR%%/Bin/cputimes
-%%DATADIR%%/Bin/cputypes.d
-%%DATADIR%%/Bin/cpuwalk.d
-%%DATADIR%%/Bin/crash.d
-%%DATADIR%%/Bin/creatbyproc.d
-%%DATADIR%%/Bin/cswstat.d
-%%DATADIR%%/Bin/dappprof
-%%DATADIR%%/Bin/dapptrace
-%%DATADIR%%/Bin/dexplorer
-%%DATADIR%%/Bin/diskhits
-%%DATADIR%%/Bin/dispqlen.d
-%%DATADIR%%/Bin/dnlcps.d
-%%DATADIR%%/Bin/dnlcsnoop.d
-%%DATADIR%%/Bin/dnlcstat
-%%DATADIR%%/Bin/dtruss
-%%DATADIR%%/Bin/dvmstat
-%%DATADIR%%/Bin/errinfo
-%%DATADIR%%/Bin/execsnoop
-%%DATADIR%%/Bin/fddist
-%%DATADIR%%/Bin/filebyproc.d
-%%DATADIR%%/Bin/fspaging.d
-%%DATADIR%%/Bin/fsrw.d
-%%DATADIR%%/Bin/guess.d
-%%DATADIR%%/Bin/hotkernel
-%%DATADIR%%/Bin/hotspot.d
-%%DATADIR%%/Bin/hotuser
-%%DATADIR%%/Bin/httpdstat.d
-%%DATADIR%%/Bin/icmpstat.d
-%%DATADIR%%/Bin/intbycpu.d
-%%DATADIR%%/Bin/intoncpu.d
-%%DATADIR%%/Bin/inttimes.d
-%%DATADIR%%/Bin/iofile.d
-%%DATADIR%%/Bin/iofileb.d
-%%DATADIR%%/Bin/iopattern
-%%DATADIR%%/Bin/iopending
-%%DATADIR%%/Bin/iosnoop
-%%DATADIR%%/Bin/iotop
-%%DATADIR%%/Bin/j_calldist.d
-%%DATADIR%%/Bin/j_calls.d
-%%DATADIR%%/Bin/j_calltime.d
-%%DATADIR%%/Bin/j_classflow.d
-%%DATADIR%%/Bin/j_cpudist.d
-%%DATADIR%%/Bin/j_cputime.d
-%%DATADIR%%/Bin/j_events.d
-%%DATADIR%%/Bin/j_flow.d
-%%DATADIR%%/Bin/j_flowtime.d
-%%DATADIR%%/Bin/j_methodcalls.d
-%%DATADIR%%/Bin/j_objnew.d
-%%DATADIR%%/Bin/j_package.d
-%%DATADIR%%/Bin/j_profile.d
-%%DATADIR%%/Bin/j_stat.d
-%%DATADIR%%/Bin/j_syscalls.d
-%%DATADIR%%/Bin/j_syscolors.d
-%%DATADIR%%/Bin/j_thread.d
-%%DATADIR%%/Bin/j_who.d
-%%DATADIR%%/Bin/js_calldist.d
-%%DATADIR%%/Bin/js_calls.d
-%%DATADIR%%/Bin/js_calltime.d
-%%DATADIR%%/Bin/js_cpudist.d
-%%DATADIR%%/Bin/js_cputime.d
-%%DATADIR%%/Bin/js_execs.d
-%%DATADIR%%/Bin/js_flow.d
-%%DATADIR%%/Bin/js_flowinfo.d
-%%DATADIR%%/Bin/js_flowtime.d
-%%DATADIR%%/Bin/js_objcpu.d
-%%DATADIR%%/Bin/js_objgc.d
-%%DATADIR%%/Bin/js_objnew.d
-%%DATADIR%%/Bin/js_stat.d
-%%DATADIR%%/Bin/js_who.d
-%%DATADIR%%/Bin/kill.d
-%%DATADIR%%/Bin/kstat_types.d
-%%DATADIR%%/Bin/lastwords
-%%DATADIR%%/Bin/loads.d
-%%DATADIR%%/Bin/lockbydist.d
-%%DATADIR%%/Bin/lockbyproc.d
-%%DATADIR%%/Bin/minfbypid.d
-%%DATADIR%%/Bin/minfbyproc.d
-%%DATADIR%%/Bin/mmapfiles.d
-%%DATADIR%%/Bin/modcalls.d
-%%DATADIR%%/Bin/newproc.d
-%%DATADIR%%/Bin/nfswizard.d
-%%DATADIR%%/Bin/opensnoop
-%%DATADIR%%/Bin/pathopens.d
-%%DATADIR%%/Bin/pfilestat
-%%DATADIR%%/Bin/pgpginbypid.d
-%%DATADIR%%/Bin/pgpginbyproc.d
-%%DATADIR%%/Bin/php_calldist.d
-%%DATADIR%%/Bin/php_calltime.d
-%%DATADIR%%/Bin/php_cpudist.d
-%%DATADIR%%/Bin/php_cputime.d
-%%DATADIR%%/Bin/php_flow.d
-%%DATADIR%%/Bin/php_flowinfo.d
-%%DATADIR%%/Bin/php_flowtime.d
-%%DATADIR%%/Bin/php_funccalls.d
-%%DATADIR%%/Bin/php_malloc.d
-%%DATADIR%%/Bin/php_syscalls.d
-%%DATADIR%%/Bin/php_syscolors.d
-%%DATADIR%%/Bin/php_who.d
-%%DATADIR%%/Bin/pidpersec.d
-%%DATADIR%%/Bin/pl_calldist.d
-%%DATADIR%%/Bin/pl_calltime.d
-%%DATADIR%%/Bin/pl_cpudist.d
-%%DATADIR%%/Bin/pl_cputime.d
-%%DATADIR%%/Bin/pl_flow.d
-%%DATADIR%%/Bin/pl_flowinfo.d
-%%DATADIR%%/Bin/pl_flowtime.d
-%%DATADIR%%/Bin/pl_malloc.d
-%%DATADIR%%/Bin/pl_subcalls.d
-%%DATADIR%%/Bin/pl_syscalls.d
-%%DATADIR%%/Bin/pl_syscolors.d
-%%DATADIR%%/Bin/pl_who.d
-%%DATADIR%%/Bin/priclass.d
-%%DATADIR%%/Bin/pridist.d
-%%DATADIR%%/Bin/procsystime
-%%DATADIR%%/Bin/putnexts.d
-%%DATADIR%%/Bin/py_calldist.d
-%%DATADIR%%/Bin/py_calltime.d
-%%DATADIR%%/Bin/py_cpudist.d
-%%DATADIR%%/Bin/py_cputime.d
-%%DATADIR%%/Bin/py_flow.d
-%%DATADIR%%/Bin/py_flowinfo.d
-%%DATADIR%%/Bin/py_flowtime.d
-%%DATADIR%%/Bin/py_funccalls.d
-%%DATADIR%%/Bin/py_malloc.d
-%%DATADIR%%/Bin/py_mallocstk.d
-%%DATADIR%%/Bin/py_profile.d
-%%DATADIR%%/Bin/py_syscalls.d
-%%DATADIR%%/Bin/py_syscolors.d
-%%DATADIR%%/Bin/py_who.d
-%%DATADIR%%/Bin/rb_calldist.d
-%%DATADIR%%/Bin/rb_calls.d
-%%DATADIR%%/Bin/rb_calltime.d
-%%DATADIR%%/Bin/rb_cpudist.d
-%%DATADIR%%/Bin/rb_cputime.d
-%%DATADIR%%/Bin/rb_flow.d
-%%DATADIR%%/Bin/rb_flowinfo.d
-%%DATADIR%%/Bin/rb_flowtime.d
-%%DATADIR%%/Bin/rb_funccalls.d
-%%DATADIR%%/Bin/rb_lines.d
-%%DATADIR%%/Bin/rb_malloc.d
-%%DATADIR%%/Bin/rb_objcpu.d
-%%DATADIR%%/Bin/rb_objnew.d
-%%DATADIR%%/Bin/rb_stat.d
-%%DATADIR%%/Bin/rb_syscalls.d
-%%DATADIR%%/Bin/rb_syscolors.d
-%%DATADIR%%/Bin/rb_who.d
-%%DATADIR%%/Bin/readbytes.d
-%%DATADIR%%/Bin/readdist.d
-%%DATADIR%%/Bin/rfileio.d
-%%DATADIR%%/Bin/rfsio.d
-%%DATADIR%%/Bin/runocc.d
-%%DATADIR%%/Bin/rwbbypid.d
-%%DATADIR%%/Bin/rwbypid.d
-%%DATADIR%%/Bin/rwbytype.d
-%%DATADIR%%/Bin/rwsnoop
-%%DATADIR%%/Bin/rwtop
-%%DATADIR%%/Bin/sampleproc
-%%DATADIR%%/Bin/sar-c.d
-%%DATADIR%%/Bin/seeksize.d
-%%DATADIR%%/Bin/setuids.d
-%%DATADIR%%/Bin/sh_calldist.d
-%%DATADIR%%/Bin/sh_calls.d
-%%DATADIR%%/Bin/sh_calltime.d
-%%DATADIR%%/Bin/sh_cpudist.d
-%%DATADIR%%/Bin/sh_cputime.d
-%%DATADIR%%/Bin/sh_flow.d
-%%DATADIR%%/Bin/sh_flowinfo.d
-%%DATADIR%%/Bin/sh_flowtime.d
-%%DATADIR%%/Bin/sh_lines.d
-%%DATADIR%%/Bin/sh_pidcolors.d
-%%DATADIR%%/Bin/sh_stat.d
-%%DATADIR%%/Bin/sh_syscalls.d
-%%DATADIR%%/Bin/sh_syscolors.d
-%%DATADIR%%/Bin/sh_wasted.d
-%%DATADIR%%/Bin/sh_who.d
-%%DATADIR%%/Bin/shellsnoop
-%%DATADIR%%/Bin/shortlived.d
-%%DATADIR%%/Bin/sigdist.d
-%%DATADIR%%/Bin/stacksize.d
-%%DATADIR%%/Bin/statsnoop
-%%DATADIR%%/Bin/swapinfo.d
-%%DATADIR%%/Bin/sysbypid.d
-%%DATADIR%%/Bin/syscallbypid.d
-%%DATADIR%%/Bin/syscallbyproc.d
-%%DATADIR%%/Bin/syscallbysysc.d
-%%DATADIR%%/Bin/tcl_calldist.d
-%%DATADIR%%/Bin/tcl_calls.d
-%%DATADIR%%/Bin/tcl_calltime.d
-%%DATADIR%%/Bin/tcl_cpudist.d
-%%DATADIR%%/Bin/tcl_cputime.d
-%%DATADIR%%/Bin/tcl_flow.d
-%%DATADIR%%/Bin/tcl_flowtime.d
-%%DATADIR%%/Bin/tcl_ins.d
-%%DATADIR%%/Bin/tcl_insflow.d
-%%DATADIR%%/Bin/tcl_proccalls.d
-%%DATADIR%%/Bin/tcl_procflow.d
-%%DATADIR%%/Bin/tcl_stat.d
-%%DATADIR%%/Bin/tcl_syscalls.d
-%%DATADIR%%/Bin/tcl_syscolors.d
-%%DATADIR%%/Bin/tcl_who.d
-%%DATADIR%%/Bin/tcpsnoop
-%%DATADIR%%/Bin/tcpsnoop.d
-%%DATADIR%%/Bin/tcpsnoop_snv
-%%DATADIR%%/Bin/tcpsnoop_snv.d
-%%DATADIR%%/Bin/tcpstat.d
-%%DATADIR%%/Bin/tcptop
-%%DATADIR%%/Bin/tcptop_snv
-%%DATADIR%%/Bin/tcpwdist.d
-%%DATADIR%%/Bin/threaded.d
-%%DATADIR%%/Bin/topsyscall
-%%DATADIR%%/Bin/topsysproc
-%%DATADIR%%/Bin/udpstat.d
-%%DATADIR%%/Bin/uname-a.d
-%%DATADIR%%/Bin/vmbypid.d
-%%DATADIR%%/Bin/vmstat-p.d
-%%DATADIR%%/Bin/vmstat.d
-%%DATADIR%%/Bin/vopstat
-%%DATADIR%%/Bin/weblatency.d
-%%DATADIR%%/Bin/whatexec.d
-%%DATADIR%%/Bin/woof.d
-%%DATADIR%%/Bin/wpm.d
-%%DATADIR%%/Bin/writebytes.d
-%%DATADIR%%/Bin/writedist.d
-%%DATADIR%%/Bin/xcallsbypid.d
-%%DATADIR%%/Bin/xvmstat
-%%DATADIR%%/Bin/zvmstat
-%%DATADIR%%/Code/Java/Func_abc.java
-%%DATADIR%%/Code/Java/Func_loop.java
-%%DATADIR%%/Code/JavaScript/func_clock.html
-%%DATADIR%%/Code/JavaScript/func_slow.html
-%%DATADIR%%/Code/Perl/func_abc.pl
-%%DATADIR%%/Code/Perl/func_malloc.pl
-%%DATADIR%%/Code/Perl/func_slow.pl
-%%DATADIR%%/Code/Perl/hello.pl
-%%DATADIR%%/Code/Perl/hello_strict.pl
-%%DATADIR%%/Code/Php/func_abc.php
-%%DATADIR%%/Code/Python/func_abc.py
-%%DATADIR%%/Code/Python/func_slow.py
-%%DATADIR%%/Code/Readme
-%%DATADIR%%/Code/Ruby/func_abc.rb
-%%DATADIR%%/Code/Ruby/func_slow.rb
-%%DATADIR%%/Code/Shell/func_abc.sh
-%%DATADIR%%/Code/Shell/func_slow.sh
-%%DATADIR%%/Code/Shell/func_waste.sh
-%%DATADIR%%/Code/Tcl/func_abc.tcl
-%%DATADIR%%/Code/Tcl/func_slow.tcl
-%%DATADIR%%/Cpu/Readme
-%%DATADIR%%/Cpu/cputypes.d
-%%DATADIR%%/Cpu/cpuwalk.d
-%%DATADIR%%/Cpu/dispqlen.d
-%%DATADIR%%/Cpu/intbycpu.d
-%%DATADIR%%/Cpu/intoncpu.d
-%%DATADIR%%/Cpu/inttimes.d
-%%DATADIR%%/Cpu/loads.d
-%%DATADIR%%/Cpu/runocc.d
-%%DATADIR%%/Cpu/xcallsbypid.d
-%%DATADIR%%/Disk/Readme
-%%DATADIR%%/Disk/bitesize.d
-%%DATADIR%%/Disk/diskhits
-%%DATADIR%%/Disk/hotspot.d
-%%DATADIR%%/Disk/iofile.d
-%%DATADIR%%/Disk/iofileb.d
-%%DATADIR%%/Disk/iopending
-%%DATADIR%%/Disk/seeksize.d
-%%DATADIR%%/Docs/Contents
-%%DATADIR%%/Docs/Examples
-%%DATADIR%%/Docs/Faq
-%%DATADIR%%/Docs/History
-%%DATADIR%%/Docs/Index
-%%DATADIR%%/Docs/Links
-%%DATADIR%%/Docs/Maintainer
-%%DATADIR%%/Docs/Notes
-%%DATADIR%%/Docs/Readme
-%%DATADIR%%/Docs/ToDo
-%%DATADIR%%/Docs/Who
-%%DATADIR%%/Docs/cddl1.txt
-%%DATADIR%%/Docs/oneliners.txt
-%%DATADIR%%/Examples/Copyright
-%%DATADIR%%/Examples/Readme
-%%DATADIR%%/Examples/anonpgpid_example.txt
-%%DATADIR%%/Examples/bitesize_example.txt
-%%DATADIR%%/Examples/connections_example.txt
-%%DATADIR%%/Examples/cpudists_example.txt
-%%DATADIR%%/Examples/cputimes_example.txt
-%%DATADIR%%/Examples/cputypes_example.txt
-%%DATADIR%%/Examples/cpuwalk_example.txt
-%%DATADIR%%/Examples/crash_example.txt
-%%DATADIR%%/Examples/creatbyproc_example.txt
-%%DATADIR%%/Examples/cswstat_example.txt
-%%DATADIR%%/Examples/dappprof_example.txt
-%%DATADIR%%/Examples/dapptrace_example.txt
-%%DATADIR%%/Examples/dexplorer_example.txt
-%%DATADIR%%/Examples/diskhits_example.txt
-%%DATADIR%%/Examples/dispqlen_example.txt
-%%DATADIR%%/Examples/dnlcps_example.txt
-%%DATADIR%%/Examples/dnlcsnoop_example.txt
-%%DATADIR%%/Examples/dnlcstat_example.txt
-%%DATADIR%%/Examples/dtruss_example.txt
-%%DATADIR%%/Examples/dvmstat_example.txt
-%%DATADIR%%/Examples/errinfo_example.txt
-%%DATADIR%%/Examples/execsnoop_example.txt
-%%DATADIR%%/Examples/fddist_example.txt
-%%DATADIR%%/Examples/filebyproc_example.txt
-%%DATADIR%%/Examples/fspaging_example.txt
-%%DATADIR%%/Examples/fsrw_example.txt
-%%DATADIR%%/Examples/guess_example.txt
-%%DATADIR%%/Examples/hotkernel_example.txt
-%%DATADIR%%/Examples/hotspot_example.txt
-%%DATADIR%%/Examples/hotuser_example.txt
-%%DATADIR%%/Examples/httpdstat_example.txt
-%%DATADIR%%/Examples/icmpstat_example.txt
-%%DATADIR%%/Examples/intbycpu_example.txt
-%%DATADIR%%/Examples/intoncpu_example.txt
-%%DATADIR%%/Examples/inttimes_example.txt
-%%DATADIR%%/Examples/iofile_example.txt
-%%DATADIR%%/Examples/iofileb_example.txt
-%%DATADIR%%/Examples/iopattern_example.txt
-%%DATADIR%%/Examples/iopending_example.txt
-%%DATADIR%%/Examples/iosnoop_example.txt
-%%DATADIR%%/Examples/iotop_example.txt
-%%DATADIR%%/Examples/j_calldist_example.txt
-%%DATADIR%%/Examples/j_calls_example.txt
-%%DATADIR%%/Examples/j_calltime_example.txt
-%%DATADIR%%/Examples/j_classflow_example.txt
-%%DATADIR%%/Examples/j_cpudist_example.txt
-%%DATADIR%%/Examples/j_cputime_example.txt
-%%DATADIR%%/Examples/j_events_example.txt
-%%DATADIR%%/Examples/j_flow_example.txt
-%%DATADIR%%/Examples/j_flowtime_example.txt
-%%DATADIR%%/Examples/j_methodcalls_example.txt
-%%DATADIR%%/Examples/j_objnew_example.txt
-%%DATADIR%%/Examples/j_package_example.txt
-%%DATADIR%%/Examples/j_profile_example.txt
-%%DATADIR%%/Examples/j_stat_example.txt
-%%DATADIR%%/Examples/j_syscalls_example.txt
-%%DATADIR%%/Examples/j_syscolors_example.txt
-%%DATADIR%%/Examples/j_thread_example.txt
-%%DATADIR%%/Examples/j_who_example.txt
-%%DATADIR%%/Examples/js_calldist_example.txt
-%%DATADIR%%/Examples/js_calls_example.txt
-%%DATADIR%%/Examples/js_calltime_example.txt
-%%DATADIR%%/Examples/js_cpudist_example.txt
-%%DATADIR%%/Examples/js_cputime_example.txt
-%%DATADIR%%/Examples/js_execs_example.txt
-%%DATADIR%%/Examples/js_flow_example.txt
-%%DATADIR%%/Examples/js_flowinfo_example.txt
-%%DATADIR%%/Examples/js_flowtime_example.txt
-%%DATADIR%%/Examples/js_objcpu_example.txt
-%%DATADIR%%/Examples/js_objgc_example.txt
-%%DATADIR%%/Examples/js_objnew_example.txt
-%%DATADIR%%/Examples/js_stat_example.txt
-%%DATADIR%%/Examples/js_who_example.txt
-%%DATADIR%%/Examples/kill_example.txt
-%%DATADIR%%/Examples/kstat_types_example.txt
-%%DATADIR%%/Examples/lastwords_example.txt
-%%DATADIR%%/Examples/loads_example.txt
-%%DATADIR%%/Examples/lockbydist_example.txt
-%%DATADIR%%/Examples/lockbyproc_example.txt
-%%DATADIR%%/Examples/minfbypid_example.txt
-%%DATADIR%%/Examples/minfbyproc_example.txt
-%%DATADIR%%/Examples/mmapfiles_example.txt
-%%DATADIR%%/Examples/modcalls_example.txt
-%%DATADIR%%/Examples/newproc_example.txt
-%%DATADIR%%/Examples/nfswizard_example.txt
-%%DATADIR%%/Examples/oneliners_examples.txt
-%%DATADIR%%/Examples/opensnoop_example.txt
-%%DATADIR%%/Examples/pathopens_example.txt
-%%DATADIR%%/Examples/pfilestat_example.txt
-%%DATADIR%%/Examples/pgpginbypid_example.txt
-%%DATADIR%%/Examples/pgpginbyproc_example.txt
-%%DATADIR%%/Examples/php_calldist_example.txt
-%%DATADIR%%/Examples/php_calltime_example.txt
-%%DATADIR%%/Examples/php_cpudist_example.txt
-%%DATADIR%%/Examples/php_cputime_example.txt
-%%DATADIR%%/Examples/php_flow_example.txt
-%%DATADIR%%/Examples/php_flowinfo_example.txt
-%%DATADIR%%/Examples/php_flowtime_example.txt
-%%DATADIR%%/Examples/php_funccalls_example.txt
-%%DATADIR%%/Examples/php_malloc_example.txt
-%%DATADIR%%/Examples/php_syscalls_example.txt
-%%DATADIR%%/Examples/php_syscolors_example.txt
-%%DATADIR%%/Examples/php_who_example.txt
-%%DATADIR%%/Examples/pidpersec_example.txt
-%%DATADIR%%/Examples/pl_calldist_example.txt
-%%DATADIR%%/Examples/pl_calltime_example.txt
-%%DATADIR%%/Examples/pl_cpudist_example.txt
-%%DATADIR%%/Examples/pl_cputime_example.txt
-%%DATADIR%%/Examples/pl_flow_example.txt
-%%DATADIR%%/Examples/pl_flowinfo_example.txt
-%%DATADIR%%/Examples/pl_flowtime_example.txt
-%%DATADIR%%/Examples/pl_malloc_example.txt
-%%DATADIR%%/Examples/pl_subcalls_example.txt
-%%DATADIR%%/Examples/pl_syscalls_example.txt
-%%DATADIR%%/Examples/pl_syscolors_example.txt
-%%DATADIR%%/Examples/pl_who_example.txt
-%%DATADIR%%/Examples/priclass_example.txt
-%%DATADIR%%/Examples/pridist_example.txt
-%%DATADIR%%/Examples/procsystime_example.txt
-%%DATADIR%%/Examples/putnexts_example.txt
-%%DATADIR%%/Examples/py_calldist_example.txt
-%%DATADIR%%/Examples/py_calltime_example.txt
-%%DATADIR%%/Examples/py_cpudist_example.txt
-%%DATADIR%%/Examples/py_cputime_example.txt
-%%DATADIR%%/Examples/py_flow_example.txt
-%%DATADIR%%/Examples/py_flowinfo_example.txt
-%%DATADIR%%/Examples/py_flowtime_example.txt
-%%DATADIR%%/Examples/py_funccalls_example.txt
-%%DATADIR%%/Examples/py_malloc_example.txt
-%%DATADIR%%/Examples/py_mallocstk_example.txt
-%%DATADIR%%/Examples/py_profile_example.txt
-%%DATADIR%%/Examples/py_syscalls_example.txt
-%%DATADIR%%/Examples/py_syscolors_example.txt
-%%DATADIR%%/Examples/py_who_example.txt
-%%DATADIR%%/Examples/rb_calldist_example.txt
-%%DATADIR%%/Examples/rb_calls_example.txt
-%%DATADIR%%/Examples/rb_calltime_example.txt
-%%DATADIR%%/Examples/rb_cpudist_example.txt
-%%DATADIR%%/Examples/rb_cputime_example.txt
-%%DATADIR%%/Examples/rb_flow_example.txt
-%%DATADIR%%/Examples/rb_flowinfo_example.txt
-%%DATADIR%%/Examples/rb_flowtime_example.txt
-%%DATADIR%%/Examples/rb_funccalls_example.txt
-%%DATADIR%%/Examples/rb_lines_example.txt
-%%DATADIR%%/Examples/rb_malloc_example.txt
-%%DATADIR%%/Examples/rb_objcpu_example.txt
-%%DATADIR%%/Examples/rb_objnew_example.txt
-%%DATADIR%%/Examples/rb_stat_example.txt
-%%DATADIR%%/Examples/rb_syscalls_example.txt
-%%DATADIR%%/Examples/rb_syscolors_example.txt
-%%DATADIR%%/Examples/rb_who_example.txt
-%%DATADIR%%/Examples/readbytes_example.txt
-%%DATADIR%%/Examples/readdist_example.txt
-%%DATADIR%%/Examples/rfileio_example.txt
-%%DATADIR%%/Examples/rfsio_example.txt
-%%DATADIR%%/Examples/runocc_example.txt
-%%DATADIR%%/Examples/rwbbypid_example.txt
-%%DATADIR%%/Examples/rwbypid_example.txt
-%%DATADIR%%/Examples/rwbytype_example.txt
-%%DATADIR%%/Examples/rwsnoop_example.txt
-%%DATADIR%%/Examples/rwtop_example.txt
-%%DATADIR%%/Examples/sampleproc_example.txt
-%%DATADIR%%/Examples/sar-c_example.txt
-%%DATADIR%%/Examples/seeksize_example.txt
-%%DATADIR%%/Examples/setuids_example.txt
-%%DATADIR%%/Examples/sh_calldist_example.txt
-%%DATADIR%%/Examples/sh_calls_example.txt
-%%DATADIR%%/Examples/sh_calltime_example.txt
-%%DATADIR%%/Examples/sh_cpudist_example.txt
-%%DATADIR%%/Examples/sh_cputime_example.txt
-%%DATADIR%%/Examples/sh_flow_example.txt
-%%DATADIR%%/Examples/sh_flowinfo_example.txt
-%%DATADIR%%/Examples/sh_flowtime_example.txt
-%%DATADIR%%/Examples/sh_lines_example.txt
-%%DATADIR%%/Examples/sh_pidcolors_example.txt
-%%DATADIR%%/Examples/sh_stat_example.txt
-%%DATADIR%%/Examples/sh_syscalls_example.txt
-%%DATADIR%%/Examples/sh_syscolors_example.txt
-%%DATADIR%%/Examples/sh_wasted_example.txt
-%%DATADIR%%/Examples/sh_who_example.txt
-%%DATADIR%%/Examples/shellsnoop_example.txt
-%%DATADIR%%/Examples/shortlived_example.txt
-%%DATADIR%%/Examples/sigdist_example.txt
-%%DATADIR%%/Examples/stacksize_example.txt
-%%DATADIR%%/Examples/statsnoop_example.txt
-%%DATADIR%%/Examples/swapinfo_example.txt
-%%DATADIR%%/Examples/sysbypid_example.txt
-%%DATADIR%%/Examples/syscallbypid_example.txt
-%%DATADIR%%/Examples/syscallbyproc_example.txt
-%%DATADIR%%/Examples/syscallbysysc_example.txt
-%%DATADIR%%/Examples/tcl_calldist_example.txt
-%%DATADIR%%/Examples/tcl_calls_example.txt
-%%DATADIR%%/Examples/tcl_calltime_example.txt
-%%DATADIR%%/Examples/tcl_cpudist_example.txt
-%%DATADIR%%/Examples/tcl_cputime_example.txt
-%%DATADIR%%/Examples/tcl_flow_example.txt
-%%DATADIR%%/Examples/tcl_flowtime_example.txt
-%%DATADIR%%/Examples/tcl_ins_example.txt
-%%DATADIR%%/Examples/tcl_insflow_example.txt
-%%DATADIR%%/Examples/tcl_proccalls_example.txt
-%%DATADIR%%/Examples/tcl_procflow_example.txt
-%%DATADIR%%/Examples/tcl_stat_example.txt
-%%DATADIR%%/Examples/tcl_syscalls_example.txt
-%%DATADIR%%/Examples/tcl_syscolors_example.txt
-%%DATADIR%%/Examples/tcl_who_example.txt
-%%DATADIR%%/Examples/tcpsnoop_d_example.txt
-%%DATADIR%%/Examples/tcpsnoop_example.txt
-%%DATADIR%%/Examples/tcpsnoop_snv_d_example.txt
-%%DATADIR%%/Examples/tcpsnoop_snv_example.txt
-%%DATADIR%%/Examples/tcpstat_example.txt
-%%DATADIR%%/Examples/tcptop_example.txt
-%%DATADIR%%/Examples/tcptop_snv_example.txt
-%%DATADIR%%/Examples/tcpwdist_example.txt
-%%DATADIR%%/Examples/threaded_example.txt
-%%DATADIR%%/Examples/topsyscall_example.txt
-%%DATADIR%%/Examples/topsysproc_example.txt
-%%DATADIR%%/Examples/udpstat_example.txt
-%%DATADIR%%/Examples/uname-a_example.txt
-%%DATADIR%%/Examples/vmbypid_example.txt
-%%DATADIR%%/Examples/vmstat-p_example.txt
-%%DATADIR%%/Examples/vmstat_example.txt
-%%DATADIR%%/Examples/vopstat_example.txt
-%%DATADIR%%/Examples/weblatency_example.txt
-%%DATADIR%%/Examples/whatexec_example.txt
-%%DATADIR%%/Examples/woof_example.txt
-%%DATADIR%%/Examples/wpm_example.txt
-%%DATADIR%%/Examples/writebytes_example.txt
-%%DATADIR%%/Examples/writedist_example.txt
-%%DATADIR%%/Examples/xcallsbypid_example.txt
-%%DATADIR%%/Examples/xvmstat_example.txt
-%%DATADIR%%/Examples/zvmstat_example.txt
-%%DATADIR%%/FS/Readme
-%%DATADIR%%/FS/fspaging.d
-%%DATADIR%%/FS/fsrw.d
-%%DATADIR%%/FS/rfileio.d
-%%DATADIR%%/FS/rfsio.d
-%%DATADIR%%/FS/vopstat
-%%DATADIR%%/Guide
-%%DATADIR%%/Include/Readme
-%%DATADIR%%/Include/test.ksh
-%%DATADIR%%/Include/time.h
-%%DATADIR%%/Include/tostr.h
-%%DATADIR%%/Java/Readme
-%%DATADIR%%/Java/j_calldist.d
-%%DATADIR%%/Java/j_calls.d
-%%DATADIR%%/Java/j_calltime.d
-%%DATADIR%%/Java/j_classflow.d
-%%DATADIR%%/Java/j_cpudist.d
-%%DATADIR%%/Java/j_cputime.d
-%%DATADIR%%/Java/j_events.d
-%%DATADIR%%/Java/j_flow.d
-%%DATADIR%%/Java/j_flowtime.d
-%%DATADIR%%/Java/j_methodcalls.d
-%%DATADIR%%/Java/j_objnew.d
-%%DATADIR%%/Java/j_package.d
-%%DATADIR%%/Java/j_profile.d
-%%DATADIR%%/Java/j_stat.d
-%%DATADIR%%/Java/j_syscalls.d
-%%DATADIR%%/Java/j_syscolors.d
-%%DATADIR%%/Java/j_thread.d
-%%DATADIR%%/Java/j_who.d
-%%DATADIR%%/JavaScript/Readme
-%%DATADIR%%/JavaScript/js_calldist.d
-%%DATADIR%%/JavaScript/js_calls.d
-%%DATADIR%%/JavaScript/js_calltime.d
-%%DATADIR%%/JavaScript/js_cpudist.d
-%%DATADIR%%/JavaScript/js_cputime.d
-%%DATADIR%%/JavaScript/js_execs.d
-%%DATADIR%%/JavaScript/js_flow.d
-%%DATADIR%%/JavaScript/js_flowinfo.d
-%%DATADIR%%/JavaScript/js_flowtime.d
-%%DATADIR%%/JavaScript/js_objcpu.d
-%%DATADIR%%/JavaScript/js_objgc.d
-%%DATADIR%%/JavaScript/js_objnew.d
-%%DATADIR%%/JavaScript/js_stat.d
-%%DATADIR%%/JavaScript/js_who.d
-%%DATADIR%%/Kernel/Readme
-%%DATADIR%%/Kernel/cpudists
-%%DATADIR%%/Kernel/cputimes
-%%DATADIR%%/Kernel/cswstat.d
-%%DATADIR%%/Kernel/dnlcps.d
-%%DATADIR%%/Kernel/dnlcsnoop.d
-%%DATADIR%%/Kernel/dnlcstat
-%%DATADIR%%/Kernel/kstat_types.d
-%%DATADIR%%/Kernel/modcalls.d
-%%DATADIR%%/Kernel/priclass.d
-%%DATADIR%%/Kernel/pridist.d
-%%DATADIR%%/Kernel/putnexts.d
-%%DATADIR%%/Kernel/whatexec.d
-%%DATADIR%%/Locks/lockbydist.d
-%%DATADIR%%/Locks/lockbyproc.d
-%%DATADIR%%/Man/Readme
-%%DATADIR%%/Man/man1m/anonpgpid.d.1m
-%%DATADIR%%/Man/man1m/bitesize.d.1m
-%%DATADIR%%/Man/man1m/connections.1m
-%%DATADIR%%/Man/man1m/cpudists.1m
-%%DATADIR%%/Man/man1m/cputimes.1m
-%%DATADIR%%/Man/man1m/cputypes.d.1m
-%%DATADIR%%/Man/man1m/cpuwalk.d.1m
-%%DATADIR%%/Man/man1m/crash.d.1m
-%%DATADIR%%/Man/man1m/creatbyproc.d.1m
-%%DATADIR%%/Man/man1m/cswstat.d.1m
-%%DATADIR%%/Man/man1m/dappprof.1m
-%%DATADIR%%/Man/man1m/dapptrace.1m
-%%DATADIR%%/Man/man1m/dexplorer.1m
-%%DATADIR%%/Man/man1m/diskhits.1m
-%%DATADIR%%/Man/man1m/dispqlen.d.1m
-%%DATADIR%%/Man/man1m/dnlcps.d.1m
-%%DATADIR%%/Man/man1m/dnlcsnoop.d.1m
-%%DATADIR%%/Man/man1m/dnlcstat.1m
-%%DATADIR%%/Man/man1m/dtruss.1m
-%%DATADIR%%/Man/man1m/dvmstat.1m
-%%DATADIR%%/Man/man1m/errinfo.1m
-%%DATADIR%%/Man/man1m/execsnoop.1m
-%%DATADIR%%/Man/man1m/fddist.1m
-%%DATADIR%%/Man/man1m/filebyproc.d.1m
-%%DATADIR%%/Man/man1m/fspaging.d.1m
-%%DATADIR%%/Man/man1m/fsrw.d.1m
-%%DATADIR%%/Man/man1m/guess.d.1m
-%%DATADIR%%/Man/man1m/hotkernel.1m
-%%DATADIR%%/Man/man1m/hotspot.d.1m
-%%DATADIR%%/Man/man1m/hotuser.1m
-%%DATADIR%%/Man/man1m/httpdstat.d.1m
-%%DATADIR%%/Man/man1m/icmpstat.d.1m
-%%DATADIR%%/Man/man1m/intbycpu.d.1m
-%%DATADIR%%/Man/man1m/intoncpu.d.1m
-%%DATADIR%%/Man/man1m/inttimes.d.1m
-%%DATADIR%%/Man/man1m/iofile.d.1m
-%%DATADIR%%/Man/man1m/iofileb.d.1m
-%%DATADIR%%/Man/man1m/iopattern.1m
-%%DATADIR%%/Man/man1m/iopending.1m
-%%DATADIR%%/Man/man1m/iosnoop.1m
-%%DATADIR%%/Man/man1m/iotop.1m
-%%DATADIR%%/Man/man1m/j_calldist.d.1m
-%%DATADIR%%/Man/man1m/j_calls.d.1m
-%%DATADIR%%/Man/man1m/j_calltime.d.1m
-%%DATADIR%%/Man/man1m/j_classflow.d.1m
-%%DATADIR%%/Man/man1m/j_cpudist.d.1m
-%%DATADIR%%/Man/man1m/j_cputime.d.1m
-%%DATADIR%%/Man/man1m/j_events.d.1m
-%%DATADIR%%/Man/man1m/j_flow.d.1m
-%%DATADIR%%/Man/man1m/j_flowtime.d.1m
-%%DATADIR%%/Man/man1m/j_methodcalls.d.1m
-%%DATADIR%%/Man/man1m/j_objnew.d.1m
-%%DATADIR%%/Man/man1m/j_package.d.1m
-%%DATADIR%%/Man/man1m/j_profile.d.1m
-%%DATADIR%%/Man/man1m/j_stat.d.1m
-%%DATADIR%%/Man/man1m/j_syscalls.d.1m
-%%DATADIR%%/Man/man1m/j_syscolors.d.1m
-%%DATADIR%%/Man/man1m/j_thread.d.1m
-%%DATADIR%%/Man/man1m/j_who.d.1m
-%%DATADIR%%/Man/man1m/js_calldist.d.1m
-%%DATADIR%%/Man/man1m/js_calls.d.1m
-%%DATADIR%%/Man/man1m/js_calltime.d.1m
-%%DATADIR%%/Man/man1m/js_cpudist.d.1m
-%%DATADIR%%/Man/man1m/js_cputime.d.1m
-%%DATADIR%%/Man/man1m/js_execs.d.1m
-%%DATADIR%%/Man/man1m/js_flow.d.1m
-%%DATADIR%%/Man/man1m/js_flowinfo.d.1m
-%%DATADIR%%/Man/man1m/js_flowtime.d.1m
-%%DATADIR%%/Man/man1m/js_objcpu.d.1m
-%%DATADIR%%/Man/man1m/js_objgc.d.1m
-%%DATADIR%%/Man/man1m/js_objnew.d.1m
-%%DATADIR%%/Man/man1m/js_stat.d.1m
-%%DATADIR%%/Man/man1m/js_who.d.1m
-%%DATADIR%%/Man/man1m/kill.d.1m
-%%DATADIR%%/Man/man1m/kstat_types.d.1m
-%%DATADIR%%/Man/man1m/lastwords.1m
-%%DATADIR%%/Man/man1m/loads.d.1m
-%%DATADIR%%/Man/man1m/lockbydist.d.1m
-%%DATADIR%%/Man/man1m/lockbyproc.d.1m
-%%DATADIR%%/Man/man1m/minfbypid.d.1m
-%%DATADIR%%/Man/man1m/minfbyproc.d.1m
-%%DATADIR%%/Man/man1m/mmapfiles.d.1m
-%%DATADIR%%/Man/man1m/modcalls.d.1m
-%%DATADIR%%/Man/man1m/newproc.d.1m
-%%DATADIR%%/Man/man1m/nfswizard.d.1m
-%%DATADIR%%/Man/man1m/opensnoop.1m
-%%DATADIR%%/Man/man1m/pathopens.d.1m
-%%DATADIR%%/Man/man1m/pfilestat.1m
-%%DATADIR%%/Man/man1m/pgpginbypid.d.1m
-%%DATADIR%%/Man/man1m/pgpginbyproc.d.1m
-%%DATADIR%%/Man/man1m/php_calldist.d.1m
-%%DATADIR%%/Man/man1m/php_calltime.d.1m
-%%DATADIR%%/Man/man1m/php_cpudist.d.1m
-%%DATADIR%%/Man/man1m/php_cputime.d.1m
-%%DATADIR%%/Man/man1m/php_flow.d.1m
-%%DATADIR%%/Man/man1m/php_flowinfo.d.1m
-%%DATADIR%%/Man/man1m/php_flowtime.d.1m
-%%DATADIR%%/Man/man1m/php_funccalls.d.1m
-%%DATADIR%%/Man/man1m/php_malloc.d.1m
-%%DATADIR%%/Man/man1m/php_syscalls.d.1m
-%%DATADIR%%/Man/man1m/php_syscolors.d.1m
-%%DATADIR%%/Man/man1m/php_who.d.1m
-%%DATADIR%%/Man/man1m/pidpersec.d.1m
-%%DATADIR%%/Man/man1m/pl_calldist.d.1m
-%%DATADIR%%/Man/man1m/pl_calltime.d.1m
-%%DATADIR%%/Man/man1m/pl_cpudist.d.1m
-%%DATADIR%%/Man/man1m/pl_cputime.d.1m
-%%DATADIR%%/Man/man1m/pl_flow.d.1m
-%%DATADIR%%/Man/man1m/pl_flowinfo.d.1m
-%%DATADIR%%/Man/man1m/pl_flowtime.d.1m
-%%DATADIR%%/Man/man1m/pl_malloc.d.1m
-%%DATADIR%%/Man/man1m/pl_subcalls.d.1m
-%%DATADIR%%/Man/man1m/pl_syscalls.d.1m
-%%DATADIR%%/Man/man1m/pl_syscolors.d.1m
-%%DATADIR%%/Man/man1m/pl_who.d.1m
-%%DATADIR%%/Man/man1m/priclass.d.1m
-%%DATADIR%%/Man/man1m/pridist.d.1m
-%%DATADIR%%/Man/man1m/procsystime.1m
-%%DATADIR%%/Man/man1m/putnexts.d.1m
-%%DATADIR%%/Man/man1m/py_calldist.d.1m
-%%DATADIR%%/Man/man1m/py_calltime.d.1m
-%%DATADIR%%/Man/man1m/py_cpudist.d.1m
-%%DATADIR%%/Man/man1m/py_cputime.d.1m
-%%DATADIR%%/Man/man1m/py_flow.d.1m
-%%DATADIR%%/Man/man1m/py_flowinfo.d.1m
-%%DATADIR%%/Man/man1m/py_flowtime.d.1m
-%%DATADIR%%/Man/man1m/py_funccalls.d.1m
-%%DATADIR%%/Man/man1m/py_malloc.d.1m
-%%DATADIR%%/Man/man1m/py_mallocstk.d.1m
-%%DATADIR%%/Man/man1m/py_profile.d.1m
-%%DATADIR%%/Man/man1m/py_syscalls.d.1m
-%%DATADIR%%/Man/man1m/py_syscolors.d.1m
-%%DATADIR%%/Man/man1m/py_who.d.1m
-%%DATADIR%%/Man/man1m/rb_calldist.d.1m
-%%DATADIR%%/Man/man1m/rb_calls.d.1m
-%%DATADIR%%/Man/man1m/rb_calltime.d.1m
-%%DATADIR%%/Man/man1m/rb_cpudist.d.1m
-%%DATADIR%%/Man/man1m/rb_cputime.d.1m
-%%DATADIR%%/Man/man1m/rb_flow.d.1m
-%%DATADIR%%/Man/man1m/rb_flowinfo.d.1m
-%%DATADIR%%/Man/man1m/rb_flowtime.d.1m
-%%DATADIR%%/Man/man1m/rb_funccalls.d.1m
-%%DATADIR%%/Man/man1m/rb_lines.d.1m
-%%DATADIR%%/Man/man1m/rb_malloc.d.1m
-%%DATADIR%%/Man/man1m/rb_objcpu.d.1m
-%%DATADIR%%/Man/man1m/rb_objnew.d.1m
-%%DATADIR%%/Man/man1m/rb_stat.d.1m
-%%DATADIR%%/Man/man1m/rb_syscalls.d.1m
-%%DATADIR%%/Man/man1m/rb_syscolors.d.1m
-%%DATADIR%%/Man/man1m/rb_who.d.1m
-%%DATADIR%%/Man/man1m/readbytes.d.1m
-%%DATADIR%%/Man/man1m/readdist.d.1m
-%%DATADIR%%/Man/man1m/rfileio.d.1m
-%%DATADIR%%/Man/man1m/rfsio.d.1m
-%%DATADIR%%/Man/man1m/runocc.d.1m
-%%DATADIR%%/Man/man1m/rwbbypid.d.1m
-%%DATADIR%%/Man/man1m/rwbypid.d.1m
-%%DATADIR%%/Man/man1m/rwbytype.d.1m
-%%DATADIR%%/Man/man1m/rwsnoop.1m
-%%DATADIR%%/Man/man1m/rwtop.1m
-%%DATADIR%%/Man/man1m/sampleproc.1m
-%%DATADIR%%/Man/man1m/sar-c.d.1m
-%%DATADIR%%/Man/man1m/seeksize.d.1m
-%%DATADIR%%/Man/man1m/setuids.d.1m
-%%DATADIR%%/Man/man1m/sh_calldist.d.1m
-%%DATADIR%%/Man/man1m/sh_calls.d.1m
-%%DATADIR%%/Man/man1m/sh_calltime.d.1m
-%%DATADIR%%/Man/man1m/sh_cpudist.d.1m
-%%DATADIR%%/Man/man1m/sh_cputime.d.1m
-%%DATADIR%%/Man/man1m/sh_flow.d.1m
-%%DATADIR%%/Man/man1m/sh_flowinfo.d.1m
-%%DATADIR%%/Man/man1m/sh_flowtime.d.1m
-%%DATADIR%%/Man/man1m/sh_lines.d.1m
-%%DATADIR%%/Man/man1m/sh_pidcolors.d.1m
-%%DATADIR%%/Man/man1m/sh_stat.d.1m
-%%DATADIR%%/Man/man1m/sh_syscalls.d.1m
-%%DATADIR%%/Man/man1m/sh_syscolors.d.1m
-%%DATADIR%%/Man/man1m/sh_wasted.d.1m
-%%DATADIR%%/Man/man1m/sh_who.d.1m
-%%DATADIR%%/Man/man1m/shellsnoop.1m
-%%DATADIR%%/Man/man1m/shortlived.d.1m
-%%DATADIR%%/Man/man1m/sigdist.d.1m
-%%DATADIR%%/Man/man1m/stacksize.d.1m
-%%DATADIR%%/Man/man1m/statsnoop.1m
-%%DATADIR%%/Man/man1m/swapinfo.d.1m
-%%DATADIR%%/Man/man1m/sysbypid.d.1m
-%%DATADIR%%/Man/man1m/syscallbypid.d.1m
-%%DATADIR%%/Man/man1m/syscallbyproc.d.1m
-%%DATADIR%%/Man/man1m/syscallbysysc.d.1m
-%%DATADIR%%/Man/man1m/tcl_calldist.d.1m
-%%DATADIR%%/Man/man1m/tcl_calls.d.1m
-%%DATADIR%%/Man/man1m/tcl_calltime.d.1m
-%%DATADIR%%/Man/man1m/tcl_cpudist.d.1m
-%%DATADIR%%/Man/man1m/tcl_cputime.d.1m
-%%DATADIR%%/Man/man1m/tcl_flow.d.1m
-%%DATADIR%%/Man/man1m/tcl_flowtime.d.1m
-%%DATADIR%%/Man/man1m/tcl_ins.d.1m
-%%DATADIR%%/Man/man1m/tcl_insflow.d.1m
-%%DATADIR%%/Man/man1m/tcl_proccalls.d.1m
-%%DATADIR%%/Man/man1m/tcl_procflow.d.1m
-%%DATADIR%%/Man/man1m/tcl_stat.d.1m
-%%DATADIR%%/Man/man1m/tcl_syscalls.d.1m
-%%DATADIR%%/Man/man1m/tcl_syscolors.d.1m
-%%DATADIR%%/Man/man1m/tcl_who.d.1m
-%%DATADIR%%/Man/man1m/tcpsnoop.1m
-%%DATADIR%%/Man/man1m/tcpsnoop.d.1m
-%%DATADIR%%/Man/man1m/tcpsnoop_snv.1m
-%%DATADIR%%/Man/man1m/tcpsnoop_snv.d.1m
-%%DATADIR%%/Man/man1m/tcpstat.d.1m
-%%DATADIR%%/Man/man1m/tcptop.1m
-%%DATADIR%%/Man/man1m/tcptop_snv.1m
-%%DATADIR%%/Man/man1m/tcpwdist.d.1m
-%%DATADIR%%/Man/man1m/threaded.d.1m
-%%DATADIR%%/Man/man1m/topsyscall.1m
-%%DATADIR%%/Man/man1m/topsysproc.1m
-%%DATADIR%%/Man/man1m/udpstat.d.1m
-%%DATADIR%%/Man/man1m/uname-a.d.1m
-%%DATADIR%%/Man/man1m/vmbypid.d.1m
-%%DATADIR%%/Man/man1m/vmstat-p.d.1m
-%%DATADIR%%/Man/man1m/vmstat.d.1m
-%%DATADIR%%/Man/man1m/vopstat.1m
-%%DATADIR%%/Man/man1m/weblatency.d.1m
-%%DATADIR%%/Man/man1m/whatexec.d.1m
-%%DATADIR%%/Man/man1m/woof.d.1m
-%%DATADIR%%/Man/man1m/wpm.d.1m
-%%DATADIR%%/Man/man1m/writebytes.d.1m
-%%DATADIR%%/Man/man1m/writedist.d.1m
-%%DATADIR%%/Man/man1m/xcallsbypid.d.1m
-%%DATADIR%%/Man/man1m/xvmstat.1m
-%%DATADIR%%/Man/man1m/zvmstat.1m
-%%DATADIR%%/Mem/Readme
-%%DATADIR%%/Mem/anonpgpid.d
-%%DATADIR%%/Mem/minfbypid.d
-%%DATADIR%%/Mem/minfbyproc.d
-%%DATADIR%%/Mem/pgpginbypid.d
-%%DATADIR%%/Mem/pgpginbyproc.d
-%%DATADIR%%/Mem/swapinfo.d
-%%DATADIR%%/Mem/vmbypid.d
-%%DATADIR%%/Mem/vmstat-p.d
-%%DATADIR%%/Mem/vmstat.d
-%%DATADIR%%/Mem/xvmstat
-%%DATADIR%%/Misc/Readme
-%%DATADIR%%/Misc/guess.d
-%%DATADIR%%/Misc/woof.d
-%%DATADIR%%/Misc/wpm.d
-%%DATADIR%%/Net/Readme
-%%DATADIR%%/Net/connections
-%%DATADIR%%/Net/icmpstat.d
-%%DATADIR%%/Net/tcpsnoop
-%%DATADIR%%/Net/tcpsnoop.d
-%%DATADIR%%/Net/tcpsnoop_snv
-%%DATADIR%%/Net/tcpsnoop_snv.d
-%%DATADIR%%/Net/tcpstat.d
-%%DATADIR%%/Net/tcptop
-%%DATADIR%%/Net/tcptop_snv
-%%DATADIR%%/Net/tcpwdist.d
-%%DATADIR%%/Net/udpstat.d
-%%DATADIR%%/Notes/ALLcolors_notes.txt
-%%DATADIR%%/Notes/ALLelapsed_notes.txt
-%%DATADIR%%/Notes/ALLexclusive_notes.txt
-%%DATADIR%%/Notes/ALLfbt_notes.txt
-%%DATADIR%%/Notes/ALLflow_notes.txt
-%%DATADIR%%/Notes/ALLinclusive_notes.txt
-%%DATADIR%%/Notes/ALLjava_notes.txt
-%%DATADIR%%/Notes/ALLoncpu_notes.txt
-%%DATADIR%%/Notes/ALLoverhead.txt
-%%DATADIR%%/Notes/ALLperl_notes.txt
-%%DATADIR%%/Notes/ALLsnoop_notes.txt
-%%DATADIR%%/Notes/Readme
-%%DATADIR%%/Notes/cputimes_notes.txt
-%%DATADIR%%/Notes/dappprof_notes.txt
-%%DATADIR%%/Notes/dapptrace_notes.txt
-%%DATADIR%%/Notes/dtruss_notes.txt
-%%DATADIR%%/Notes/iosnoop_notes.txt
-%%DATADIR%%/Notes/iotop_notes.txt
-%%DATADIR%%/Notes/procsystime_notes.txt
-%%DATADIR%%/Perl/Readme
-%%DATADIR%%/Perl/pl_calldist.d
-%%DATADIR%%/Perl/pl_calltime.d
-%%DATADIR%%/Perl/pl_cpudist.d
-%%DATADIR%%/Perl/pl_cputime.d
-%%DATADIR%%/Perl/pl_flow.d
-%%DATADIR%%/Perl/pl_flowinfo.d
-%%DATADIR%%/Perl/pl_flowtime.d
-%%DATADIR%%/Perl/pl_malloc.d
-%%DATADIR%%/Perl/pl_subcalls.d
-%%DATADIR%%/Perl/pl_syscalls.d
-%%DATADIR%%/Perl/pl_syscolors.d
-%%DATADIR%%/Perl/pl_who.d
-%%DATADIR%%/Php/Readme
-%%DATADIR%%/Php/php_calldist.d
-%%DATADIR%%/Php/php_calltime.d
-%%DATADIR%%/Php/php_cpudist.d
-%%DATADIR%%/Php/php_cputime.d
-%%DATADIR%%/Php/php_flow.d
-%%DATADIR%%/Php/php_flowinfo.d
-%%DATADIR%%/Php/php_flowtime.d
-%%DATADIR%%/Php/php_funccalls.d
-%%DATADIR%%/Php/php_malloc.d
-%%DATADIR%%/Php/php_syscalls.d
-%%DATADIR%%/Php/php_syscolors.d
-%%DATADIR%%/Php/php_who.d
-%%DATADIR%%/Proc/Readme
-%%DATADIR%%/Proc/crash.d
-%%DATADIR%%/Proc/creatbyproc.d
-%%DATADIR%%/Proc/dappprof
-%%DATADIR%%/Proc/dapptrace
-%%DATADIR%%/Proc/fddist
-%%DATADIR%%/Proc/filebyproc.d
-%%DATADIR%%/Proc/kill.d
-%%DATADIR%%/Proc/lastwords
-%%DATADIR%%/Proc/mmapfiles.d
-%%DATADIR%%/Proc/newproc.d
-%%DATADIR%%/Proc/pathopens.d
-%%DATADIR%%/Proc/pfilestat
-%%DATADIR%%/Proc/pidpersec.d
-%%DATADIR%%/Proc/readbytes.d
-%%DATADIR%%/Proc/readdist.d
-%%DATADIR%%/Proc/rwbbypid.d
-%%DATADIR%%/Proc/rwbypid.d
-%%DATADIR%%/Proc/rwbytype.d
-%%DATADIR%%/Proc/sampleproc
-%%DATADIR%%/Proc/shortlived.d
-%%DATADIR%%/Proc/sigdist.d
-%%DATADIR%%/Proc/stacksize.d
-%%DATADIR%%/Proc/sysbypid.d
-%%DATADIR%%/Proc/syscallbypid.d
-%%DATADIR%%/Proc/syscallbyproc.d
-%%DATADIR%%/Proc/threaded.d
-%%DATADIR%%/Proc/topsysproc
-%%DATADIR%%/Proc/writebytes.d
-%%DATADIR%%/Proc/writedist.d
-%%DATADIR%%/Python/Readme
-%%DATADIR%%/Python/py_calldist.d
-%%DATADIR%%/Python/py_calltime.d
-%%DATADIR%%/Python/py_cpudist.d
-%%DATADIR%%/Python/py_cputime.d
-%%DATADIR%%/Python/py_flow.d
-%%DATADIR%%/Python/py_flowinfo.d
-%%DATADIR%%/Python/py_flowtime.d
-%%DATADIR%%/Python/py_funccalls.d
-%%DATADIR%%/Python/py_malloc.d
-%%DATADIR%%/Python/py_mallocstk.d
-%%DATADIR%%/Python/py_profile.d
-%%DATADIR%%/Python/py_syscalls.d
-%%DATADIR%%/Python/py_syscolors.d
-%%DATADIR%%/Python/py_who.d
-%%DATADIR%%/Ruby/Readme
-%%DATADIR%%/Ruby/rb_calldist.d
-%%DATADIR%%/Ruby/rb_calls.d
-%%DATADIR%%/Ruby/rb_calltime.d
-%%DATADIR%%/Ruby/rb_cpudist.d
-%%DATADIR%%/Ruby/rb_cputime.d
-%%DATADIR%%/Ruby/rb_flow.d
-%%DATADIR%%/Ruby/rb_flowinfo.d
-%%DATADIR%%/Ruby/rb_flowtime.d
-%%DATADIR%%/Ruby/rb_funccalls.d
-%%DATADIR%%/Ruby/rb_lines.d
-%%DATADIR%%/Ruby/rb_malloc.d
-%%DATADIR%%/Ruby/rb_objcpu.d
-%%DATADIR%%/Ruby/rb_objnew.d
-%%DATADIR%%/Ruby/rb_stat.d
-%%DATADIR%%/Ruby/rb_syscalls.d
-%%DATADIR%%/Ruby/rb_syscolors.d
-%%DATADIR%%/Ruby/rb_who.d
-%%DATADIR%%/Shell/Readme
-%%DATADIR%%/Shell/sh_calldist.d
-%%DATADIR%%/Shell/sh_calls.d
-%%DATADIR%%/Shell/sh_calltime.d
-%%DATADIR%%/Shell/sh_cpudist.d
-%%DATADIR%%/Shell/sh_cputime.d
-%%DATADIR%%/Shell/sh_flow.d
-%%DATADIR%%/Shell/sh_flowinfo.d
-%%DATADIR%%/Shell/sh_flowtime.d
-%%DATADIR%%/Shell/sh_lines.d
-%%DATADIR%%/Shell/sh_pidcolors.d
-%%DATADIR%%/Shell/sh_stat.d
-%%DATADIR%%/Shell/sh_syscalls.d
-%%DATADIR%%/Shell/sh_syscolors.d
-%%DATADIR%%/Shell/sh_wasted.d
-%%DATADIR%%/Shell/sh_who.d
-%%DATADIR%%/Snippits/Readme
-%%DATADIR%%/Snippits/fd2pathname.txt
-%%DATADIR%%/System/Readme
-%%DATADIR%%/System/sar-c.d
-%%DATADIR%%/System/syscallbysysc.d
-%%DATADIR%%/System/topsyscall
-%%DATADIR%%/System/uname-a.d
-%%DATADIR%%/Tcl/Readme
-%%DATADIR%%/Tcl/tcl_calldist.d
-%%DATADIR%%/Tcl/tcl_calls.d
-%%DATADIR%%/Tcl/tcl_calltime.d
-%%DATADIR%%/Tcl/tcl_cpudist.d
-%%DATADIR%%/Tcl/tcl_cputime.d
-%%DATADIR%%/Tcl/tcl_flow.d
-%%DATADIR%%/Tcl/tcl_flowtime.d
-%%DATADIR%%/Tcl/tcl_ins.d
-%%DATADIR%%/Tcl/tcl_insflow.d
-%%DATADIR%%/Tcl/tcl_proccalls.d
-%%DATADIR%%/Tcl/tcl_procflow.d
-%%DATADIR%%/Tcl/tcl_stat.d
-%%DATADIR%%/Tcl/tcl_syscalls.d
-%%DATADIR%%/Tcl/tcl_syscolors.d
-%%DATADIR%%/Tcl/tcl_who.d
-%%DATADIR%%/User/Readme
-%%DATADIR%%/User/setuids.d
-%%DATADIR%%/Version
-%%DATADIR%%/Zones/Readme
-%%DATADIR%%/Zones/zvmstat
-%%DATADIR%%/dexplorer
-%%DATADIR%%/dtruss
-%%DATADIR%%/dvmstat
-%%DATADIR%%/errinfo
-%%DATADIR%%/execsnoop
-%%DATADIR%%/hotkernel
-%%DATADIR%%/hotuser
-%%DATADIR%%/install
-%%DATADIR%%/iopattern
-%%DATADIR%%/iosnoop
-%%DATADIR%%/iotop
-%%DATADIR%%/opensnoop
-%%DATADIR%%/procsystime
-%%DATADIR%%/rwsnoop
-%%DATADIR%%/rwtop
-%%DATADIR%%/statsnoop
-%%DATADIR%%/CDDL
-%%DATADIR%%/README.md
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 9469eb7b4658..aedb1850b774 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -1,5 +1,4 @@
 # Created by: desmo@bandwidth.org
-# $FreeBSD$
 
 PORTNAME=	LPRng
 PORTVERSION=	3.8.C
@@ -15,9 +14,10 @@ COMMENT=	Enhanced Printer Spooler
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgdbm.so:databases/gdbm
-
 BROKEN_aarch64=	Fails to link: missing sbrk
+BROKEN_riscv64=	Fails to link: missing sbrk
+
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 USES=		gmake ssl
 GNU_CONFIGURE=	yes
@@ -33,6 +33,9 @@ USE_RC_SUBR=	${PORTNAME:tl}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+# Upstream dead, don't expect a proper fix.
+CFLAGS+=	-fcommon
+
 SUB_FILES=	pkg-message
 
 CONFLICTS=	cups-base-1.[2-9]*
diff --git a/sysutils/LPRngTool/Makefile b/sysutils/LPRngTool/Makefile
index 25c02d9cbd62..d504ff36fb1f 100644
--- a/sysutils/LPRngTool/Makefile
+++ b/sysutils/LPRngTool/Makefile
@@ -1,5 +1,4 @@
 # Created by: papowell@lprng.com
-# $FreeBSD$
 
 PORTNAME=	LPRngTool
 PORTVERSION=	1.3.2
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 6931170584a2..e4322474bd12 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,21 +1,23 @@
-# $FreeBSD$
-#
-
     COMMENT = System utilities
 
     SUBDIR += 3dm
+    SUBDIR += 3mux
     SUBDIR += 44bsd-more
     SUBDIR += 915resolution
-    SUBDIR += DTraceToolkit
     SUBDIR += LPRng
     SUBDIR += LPRngTool
+    SUBDIR += R-cran-fs
+    SUBDIR += R-cran-processx
+    SUBDIR += R-cran-ps
+    SUBDIR += R-cran-xopen
     SUBDIR += UEFITool
-    SUBDIR += abck
     SUBDIR += abduco
     SUBDIR += abgx360
-    SUBDIR += abgx360gui
+    SUBDIR += accounts-qml-module
     SUBDIR += accountsservice
     SUBDIR += acerhdf-kmod
+    SUBDIR += acfgfs
+    SUBDIR += acltool
     SUBDIR += acpi_call
     SUBDIR += acpica-tools
     SUBDIR += acts
@@ -27,6 +29,7 @@
     SUBDIR += ah-tty
     SUBDIR += aimage
     SUBDIR += aird
+    SUBDIR += alfio
     SUBDIR += am-utils
     SUBDIR += amazon-ssm-agent
     SUBDIR += amdmsrtweaker
@@ -36,15 +39,17 @@
     SUBDIR += and
     SUBDIR += android-file-transfer
     SUBDIR += android-file-transfer-qt5
+    SUBDIR += angrysearch
     SUBDIR += ansible
-    SUBDIR += ansible1
-    SUBDIR += ansible23
-    SUBDIR += ansible24
-    SUBDIR += ansible25
-    SUBDIR += ansible26
-    SUBDIR += ansible27
+    SUBDIR += ansible-iocage
+    SUBDIR += ansible-kld
+    SUBDIR += ansible-sshjail
+    SUBDIR += ansible-sysrc
+    SUBDIR += ansible2
     SUBDIR += anvil
+    SUBDIR += apache-mesos
     SUBDIR += apachetop
+    SUBDIR += apcctrl
     SUBDIR += apcpwr
     SUBDIR += apcupsd
     SUBDIR += aptly
@@ -60,6 +65,7 @@
     SUBDIR += atf-rk3328
     SUBDIR += atf-rk3399
     SUBDIR += atf-sun50i_a64
+    SUBDIR += atf-sun50i_h6
     SUBDIR += atitvout
     SUBDIR += atop
     SUBDIR += auto-admin
@@ -71,11 +77,14 @@
     SUBDIR += azure-agent
     SUBDIR += b2sum
     SUBDIR += b43-fwcutter
-    SUBDIR += backupchecker
     SUBDIR += backuppc
     SUBDIR += backuppc-devel
     SUBDIR += backuppc4
     SUBDIR += backupuser
+    SUBDIR += bacula11-client
+    SUBDIR += bacula11-client-static
+    SUBDIR += bacula11-docs
+    SUBDIR += bacula11-server
     SUBDIR += bacula9-client
     SUBDIR += bacula9-client-static
     SUBDIR += bacula9-docs
@@ -83,16 +92,19 @@
     SUBDIR += baloo-widgets
     SUBDIR += bamf
     SUBDIR += bareos-client
-    SUBDIR += bareos-docs
     SUBDIR += bareos-server
     SUBDIR += bareos-traymonitor
-    SUBDIR += bareos16-client
-    SUBDIR += bareos16-client-static
-    SUBDIR += bareos16-server
     SUBDIR += bareos17-client
     SUBDIR += bareos17-client-static
     SUBDIR += bareos17-server
+    SUBDIR += bareos18-client
+    SUBDIR += bareos18-server
+    SUBDIR += bareos18-traymonitor
+    SUBDIR += bareos19-client
+    SUBDIR += bareos19-server
+    SUBDIR += bareos19-traymonitor
     SUBDIR += barrier
+    SUBDIR += bashtop
     SUBDIR += bastille
     SUBDIR += batmon
     SUBDIR += battmond
@@ -100,24 +112,26 @@
     SUBDIR += bchunk
     SUBDIR += beadm
     SUBDIR += beadm-devel
-    SUBDIR += beats
+    SUBDIR += beats6
+    SUBDIR += beats7
     SUBDIR += bfs
     SUBDIR += bhyve-firmware
     SUBDIR += bhyve-rc
-    SUBDIR += bibelot
     SUBDIR += biosfont
     SUBDIR += bkpupsd
     SUBDIR += bksh
     SUBDIR += boot-extract
     SUBDIR += boxbackup-devel
+    SUBDIR += bpytop
     SUBDIR += brasero
+    SUBDIR += brename
     SUBDIR += bsd-splash-changer
     SUBDIR += bsdconfig
     SUBDIR += bsdcrashtar
+    SUBDIR += bsdfan
     SUBDIR += bsdhwmon
     SUBDIR += bsdinfo
     SUBDIR += bsdisks
-    SUBDIR += bsdploy
     SUBDIR += bsdstats
     SUBDIR += bstack
     SUBDIR += btsixad
@@ -129,15 +143,14 @@
     SUBDIR += byobu
     SUBDIR += catfish
     SUBDIR += cbsd
+    SUBDIR += cbsd-mq-router
     SUBDIR += ccd2iso
     SUBDIR += cciss_vol_status
     SUBDIR += ccze
     SUBDIR += cdargs
     SUBDIR += cdbkup
     SUBDIR += cdeploy
-    SUBDIR += cdf
     SUBDIR += cdircmp
-    SUBDIR += cdls
     SUBDIR += cdrdao
     SUBDIR += cdrkit
     SUBDIR += cdroot
@@ -149,19 +162,24 @@
     SUBDIR += cfengine-masterfiles-devel
     SUBDIR += cfengine-masterfiles310
     SUBDIR += cfengine-masterfiles311
-    SUBDIR += cfengine-masterfiles312
-    SUBDIR += cfengine-masterfiles313
     SUBDIR += cfengine-masterfiles314
+    SUBDIR += cfengine-masterfiles315
+    SUBDIR += cfengine-masterfiles316
+    SUBDIR += cfengine-masterfiles317
     SUBDIR += cfengine310
     SUBDIR += cfengine311
-    SUBDIR += cfengine312
-    SUBDIR += cfengine313
     SUBDIR += cfengine314
+    SUBDIR += cfengine315
+    SUBDIR += cfengine316
+    SUBDIR += cfengine317
+    SUBDIR += chaoskube
+    SUBDIR += checkrestart
+    SUBDIR += chezmoi
     SUBDIR += chgrep
+    SUBDIR += choria
     SUBDIR += chyves
     SUBDIR += cinnamon-control-center
     SUBDIR += cinnamon-settings-daemon
-    SUBDIR += circonus-agent
     SUBDIR += ciso
     SUBDIR += ciso-maker
     SUBDIR += ck4up
@@ -169,7 +187,6 @@
     SUBDIR += clockspeed
     SUBDIR += clone
     SUBDIR += clonehdd
-    SUBDIR += cloop-utils
     SUBDIR += cloudabi-utils
     SUBDIR += clsync
     SUBDIR += cluster-glue
@@ -179,9 +196,8 @@
     SUBDIR += cmogstored
     SUBDIR += cmospwd
     SUBDIR += colorize
-    SUBDIR += condor
+    SUBDIR += conan
     SUBDIR += confctl
-    SUBDIR += confman
     SUBDIR += conky
     SUBDIR += conky-awesome
     SUBDIR += conman
@@ -192,16 +208,16 @@
     SUBDIR += consul-replicate
     SUBDIR += consul_exporter
     SUBDIR += container-diff
+    SUBDIR += containerd
     SUBDIR += contractor
     SUBDIR += copytape
     SUBDIR += coreos-ct
     SUBDIR += coreutils
-    SUBDIR += cotty
     SUBDIR += cpdup
-    SUBDIR += cpu
     SUBDIR += cpu-x
     SUBDIR += cpuburn
     SUBDIR += cpuid
+    SUBDIR += cpuid2cpuflags
     SUBDIR += cpulimit
     SUBDIR += cpupdate
     SUBDIR += cramfs
@@ -220,6 +236,8 @@
     SUBDIR += daemontools-encore
     SUBDIR += daggy
     SUBDIR += dar
+    SUBDIR += datadog-agent
+    SUBDIR += datadog-integrations
     SUBDIR += dateutils
     SUBDIR += dc3dd
     SUBDIR += dcfldd
@@ -231,7 +249,6 @@
     SUBDIR += deltarpm
     SUBDIR += deltup
     SUBDIR += desktop-installer
-    SUBDIR += detach
     SUBDIR += detox
     SUBDIR += devcpu-data
     SUBDIR += devstat
@@ -241,23 +258,25 @@
     SUBDIR += dim
     SUBDIR += dirdiff
     SUBDIR += direnv
+    SUBDIR += direvent
     SUBDIR += dirvish
+    SUBDIR += discus
     SUBDIR += diskcheckd
     SUBDIR += diskimage-tools
+    SUBDIR += diskonaut
     SUBDIR += diskscrub
-    SUBDIR += disktool
     SUBDIR += disktype
     SUBDIR += dmg2img
     SUBDIR += dmidecode
+    SUBDIR += dnf
     SUBDIR += docker
     SUBDIR += docker-compose
     SUBDIR += docker-credential-pass
-    SUBDIR += docker-freebsd
     SUBDIR += docker-machine
+    SUBDIR += docker-registry
     SUBDIR += doctl
     SUBDIR += doinkd
     SUBDIR += dolly
-    SUBDIR += downtime
     SUBDIR += downtimed
     SUBDIR += dsbbatmon
     SUBDIR += dsbdriverd
@@ -267,10 +286,12 @@
     SUBDIR += dsbmd
     SUBDIR += dsbsu
     SUBDIR += dsbwrtsysctl
-    SUBDIR += dt
     SUBDIR += dtc
     SUBDIR += dtpstree
+    SUBDIR += dtrace-toolkit
     SUBDIR += du2ps
+    SUBDIR += dua-cli
+    SUBDIR += duf
     SUBDIR += duff
     SUBDIR += dunst
     SUBDIR += dupd
@@ -288,9 +309,11 @@
     SUBDIR += dwatch-json
     SUBDIR += dwatch-pwsnoop
     SUBDIR += e2fsprogs
+    SUBDIR += ebsnvme-id
     SUBDIR += ec2-scripts
     SUBDIR += eclat
     SUBDIR += edid-decode
+    SUBDIR += edk2
     SUBDIR += eject
     SUBDIR += eksctl
     SUBDIR += endian
@@ -302,8 +325,9 @@
     SUBDIR += etc_os-release
     SUBDIR += etcmerge
     SUBDIR += etcupdate
-    SUBDIR += eventlog
+    SUBDIR += ethname
     SUBDIR += evhz
+    SUBDIR += evisum
     SUBDIR += evtviewer
     SUBDIR += exa
     SUBDIR += exfat-utils
@@ -312,14 +336,12 @@
     SUBDIR += f3
     SUBDIR += facter
     SUBDIR += fanout
-    SUBDIR += farbot
     SUBDIR += fatback
     SUBDIR += fcode-utils
     SUBDIR += fconfig
     SUBDIR += fcron
     SUBDIR += fd
     SUBDIR += fdupes
-    SUBDIR += feather
     SUBDIR += fetchlog
     SUBDIR += ffs2recov
     SUBDIR += file
@@ -341,6 +363,7 @@
     SUBDIR += flog
     SUBDIR += flowgger
     SUBDIR += fluent-bit
+    SUBDIR += fluxengine
     SUBDIR += fonteditfs
     SUBDIR += foremost
     SUBDIR += fortunelock
@@ -359,26 +382,26 @@
     SUBDIR += fsbackup
     SUBDIR += fsc
     SUBDIR += fsearch
+    SUBDIR += fselect
     SUBDIR += fstyp
     SUBDIR += fswatch-mon
     SUBDIR += ftwin
     SUBDIR += fusefs-afuse
+    SUBDIR += fusefs-bindfs
     SUBDIR += fusefs-chironfs
     SUBDIR += fusefs-cryptofs
     SUBDIR += fusefs-curlftpfs
     SUBDIR += fusefs-encfs
     SUBDIR += fusefs-exfat
     SUBDIR += fusefs-ext2
-    SUBDIR += fusefs-ext4fuse
     SUBDIR += fusefs-funionfs
     SUBDIR += fusefs-fusepak
-    SUBDIR += fusefs-fusexmp_fh
     SUBDIR += fusefs-gitfs
-    SUBDIR += fusefs-gstfs
-    SUBDIR += fusefs-gunzip
     SUBDIR += fusefs-hfsfuse
+    SUBDIR += fusefs-httpdirfs
     SUBDIR += fusefs-httpfs
     SUBDIR += fusefs-ifuse
+    SUBDIR += fusefs-jmtpfs
     SUBDIR += fusefs-libs
     SUBDIR += fusefs-libs3
     SUBDIR += fusefs-lkl
@@ -391,6 +414,7 @@
     SUBDIR += fusefs-s3backer
     SUBDIR += fusefs-s3fs
     SUBDIR += fusefs-sandboxfs
+    SUBDIR += fusefs-securefs
     SUBDIR += fusefs-simple-mtpfs
     SUBDIR += fusefs-smbnetfs
     SUBDIR += fusefs-sqlfs
@@ -398,7 +422,6 @@
     SUBDIR += fusefs-sshfs
     SUBDIR += fusefs-unionfs
     SUBDIR += fusefs-webdavfs
-    SUBDIR += fusefs-wikipediafs
     SUBDIR += fusefs-zip
     SUBDIR += fvcool
     SUBDIR += fwup
@@ -417,31 +440,30 @@
     SUBDIR += geteltorito
     SUBDIR += getssl
     SUBDIR += gigolo
+    SUBDIR += gitwatch
     SUBDIR += gkfreq
     SUBDIR += gkleds2
-    SUBDIR += gkrellfire
     SUBDIR += gkrellflynn
     SUBDIR += gkrellm-trayicons
     SUBDIR += gkrellm2
     SUBDIR += gkrelltop
     SUBDIR += gksu
     SUBDIR += glogg
+    SUBDIR += glow
     SUBDIR += gnome-control-center
-    SUBDIR += gnome-mount
     SUBDIR += gnome-power-manager
-    SUBDIR += gnome-schedule
     SUBDIR += gnome-settings-daemon
     SUBDIR += gnome-system-monitor
     SUBDIR += gnome_subr
+    SUBDIR += go-btfs
     SUBDIR += go-wtf
     SUBDIR += goaccess
     SUBDIR += goawk
+    SUBDIR += gomi
     SUBDIR += gomplate
     SUBDIR += google-compute-engine-oslogin
-    SUBDIR += goss
     SUBDIR += gotop
     SUBDIR += gpart
-    SUBDIR += gpte
     SUBDIR += graffer
     SUBDIR += graid5
     SUBDIR += graveman
@@ -450,36 +472,30 @@
     SUBDIR += gsh
     SUBDIR += gsmartcontrol
     SUBDIR += gstopd
-    SUBDIR += gstreamer-plugins-cdio
-    SUBDIR += gstreamer-plugins-hal
     SUBDIR += gstreamer1-plugins-cdio
     SUBDIR += gtk-imonc
-    SUBDIR += hachoir-metadata
-    SUBDIR += hachoir-subfile
-    SUBDIR += hachoir-urwid
-    SUBDIR += hachoir-wx
-    SUBDIR += hal
-    SUBDIR += hal-info
     SUBDIR += hardlink
     SUBDIR += hare
     SUBDIR += hared
     SUBDIR += hatop
+    SUBDIR += hcloud
     SUBDIR += hdrecover
     SUBDIR += healthd
-    SUBDIR += heartbeat
     SUBDIR += heirloom
     SUBDIR += helm
+    SUBDIR += helmfile
+    SUBDIR += herbe
+    SUBDIR += hexpeek
     SUBDIR += hextools
     SUBDIR += hexyl
-    SUBDIR += hfm
     SUBDIR += hfsexplorer
     SUBDIR += hfsutils
-    SUBDIR += hidesvn
+    SUBDIR += hid-tools
     SUBDIR += highlnk
     SUBDIR += hilite
     SUBDIR += host-setup
+    SUBDIR += hostctl
     SUBDIR += hourglass
-    SUBDIR += hoz
     SUBDIR += hpacucli
     SUBDIR += hploscripts
     SUBDIR += hptcli
@@ -487,10 +503,12 @@
     SUBDIR += hstr
     SUBDIR += htop
     SUBDIR += httplog
+    SUBDIR += hw-probe
     SUBDIR += hwstat
     SUBDIR += i2c-tools
     SUBDIR += i7z
     SUBDIR += iat
+    SUBDIR += iichid
     SUBDIR += immortal
     SUBDIR += incron
     SUBDIR += inotify-tools
@@ -498,13 +516,12 @@
     SUBDIR += intel-nvmupdate
     SUBDIR += intel-pcm
     SUBDIR += intel-pcm-devel
-    SUBDIR += intel-qcu
     SUBDIR += intel-undervolt
+    SUBDIR += inxi
     SUBDIR += ioc
     SUBDIR += iocage
     SUBDIR += iocage-devel
     SUBDIR += iocell
-    SUBDIR += iogen
     SUBDIR += iograph
     SUBDIR += iohyve
     SUBDIR += ioping
@@ -512,17 +529,18 @@
     SUBDIR += ipad_charge
     SUBDIR += ipdbtools
     SUBDIR += ipfs-go
+    SUBDIR += ipfs-go-fs-repo-migrations
+    SUBDIR += ipget
     SUBDIR += ipmitool
     SUBDIR += ipsc
     SUBDIR += isc-cron
     SUBDIR += isomaster
-    SUBDIR += isomd5sum
     SUBDIR += istatserver
     SUBDIR += istio
     SUBDIR += jadm
     SUBDIR += jail-primer
+    SUBDIR += jail_exporter
     SUBDIR += jailadmin
-    SUBDIR += jailctl
     SUBDIR += jaildaemon
     SUBDIR += jailme
     SUBDIR += jailrc
@@ -539,22 +557,23 @@
     SUBDIR += jtop
     SUBDIR += jtopen
     SUBDIR += jvmtop
-    SUBDIR += jx
     SUBDIR += k3b
+    SUBDIR += k4dirstat
     SUBDIR += k8temp
+    SUBDIR += k9s
     SUBDIR += kbackup
     SUBDIR += kcron
     SUBDIR += kdeadmin
     SUBDIR += kdebugsettings
     SUBDIR += kdf
     SUBDIR += kdialog
-    SUBDIR += kdirstat
     SUBDIR += keyboard-daemon
     SUBDIR += kf5-baloo
     SUBDIR += kf5-kwallet
     SUBDIR += kfloppy
     SUBDIR += khelpcenter
     SUBDIR += kiconvtool
+    SUBDIR += kio-fuse
     SUBDIR += kldfind
     SUBDIR += kldpatch
     SUBDIR += kops
@@ -562,6 +581,7 @@
     SUBDIR += kshutdown
     SUBDIR += ksystemlog
     SUBDIR += kubectl
+    SUBDIR += kvmclock-kmod
     SUBDIR += lava
     SUBDIR += lbl-cf
     SUBDIR += lbl-hf
@@ -575,42 +595,46 @@
     SUBDIR += libcdio-paranoia
     SUBDIR += libchk
     SUBDIR += libcpuid
+    SUBDIR += libdnf
     SUBDIR += libfvde
+    SUBDIR += libg15
+    SUBDIR += libg15render
     SUBDIR += libgksu
     SUBDIR += libieee1284
     SUBDIR += libretto-config
     SUBDIR += libsunacl
     SUBDIR += libsysstat
+    SUBDIR += libudisks
     SUBDIR += liburcu
-    SUBDIR += life-preserver
     SUBDIR += lineak-defaultplugin
     SUBDIR += lineak-xosdplugin
     SUBDIR += lineakd
     SUBDIR += linrename
-    SUBDIR += linux-c6-lttng-ust
-    SUBDIR += linux-c6-userspace-rcu
+    SUBDIR += linux-c7-dosfstools
     SUBDIR += linux-c7-lttng-ust
+    SUBDIR += linux-c7-numactl-libs
     SUBDIR += linux-c7-userspace-rcu
-    SUBDIR += linux-crashplan
+    SUBDIR += linux-miniconda-installer
     SUBDIR += linux-rkbin
     SUBDIR += linuxfdisk
-    SUBDIR += livecd
     SUBDIR += lizardfs
     SUBDIR += lmmon
     SUBDIR += lmon
     SUBDIR += lnav
     SUBDIR += lockfile-progs
-    SUBDIR += log_analysis
+    SUBDIR += loganalyzer
     SUBDIR += logrotate
     SUBDIR += logstalgia
     SUBDIR += logstash-forwarder
-    SUBDIR += logstash5
     SUBDIR += logstash6
+    SUBDIR += logstash7
     SUBDIR += logtool
     SUBDIR += logwatch
     SUBDIR += lookat
     SUBDIR += lr
+    SUBDIR += lsblk
     SUBDIR += lscpu
+    SUBDIR += lsd
     SUBDIR += lsof
     SUBDIR += lsop
     SUBDIR += lsyncd
@@ -623,14 +647,15 @@
     SUBDIR += lxqt-admin
     SUBDIR += lxqt-config
     SUBDIR += lxqt-policykit
+    SUBDIR += lxqt-powermanagement
     SUBDIR += lxqt-qtplugin
     SUBDIR += lxsplit
     SUBDIR += lxtask
     SUBDIR += lxterminal
     SUBDIR += mac_nonet
     SUBDIR += mac_rtprio
+    SUBDIR += mackerel-agent
     SUBDIR += magicrescue
-    SUBDIR += makeztxt
     SUBDIR += manck
     SUBDIR += mapchan
     SUBDIR += mapdir
@@ -642,6 +667,7 @@
     SUBDIR += mate-system-monitor
     SUBDIR += mbgtools
     SUBDIR += mcelog
+    SUBDIR += mcfly
     SUBDIR += mcollective
     SUBDIR += mcollective-actionpolicy-auth
     SUBDIR += mcollective-nettest-agent
@@ -673,14 +699,13 @@
     SUBDIR += mgeupsd
     SUBDIR += minikube
     SUBDIR += minimunin
+    SUBDIR += minipot
     SUBDIR += minipro
     SUBDIR += minirsyslogd
     SUBDIR += mixer
     SUBDIR += mkdesktop
-    SUBDIR += mkfile
     SUBDIR += mkfwimage
     SUBDIR += mkntpwd
-    SUBDIR += mksunbootcd
     SUBDIR += mmc-utils
     SUBDIR += mmve
     SUBDIR += mnrpes
@@ -690,7 +715,6 @@
     SUBDIR += monit
     SUBDIR += monitord
     SUBDIR += monitorix
-    SUBDIR += mono-kmod
     SUBDIR += moosefs2-cgi
     SUBDIR += moosefs2-cgiserv
     SUBDIR += moosefs2-chunkserver
@@ -710,12 +734,12 @@
     SUBDIR += moreutils
     SUBDIR += most
     SUBDIR += mountsmb2
-    SUBDIR += mpiexec
     SUBDIR += mping
     SUBDIR += mptd
     SUBDIR += msiklm
     SUBDIR += msktutil
     SUBDIR += mstflint
+    SUBDIR += mstflint-lite
     SUBDIR += msyslog
     SUBDIR += mtm
     SUBDIR += mtpfs
@@ -726,6 +750,7 @@
     SUBDIR += munin-master
     SUBDIR += munin-node
     SUBDIR += muse
+    SUBDIR += mxkill
     SUBDIR += mybashburn
     SUBDIR += myrescue
     SUBDIR += n98-magerun
@@ -737,8 +762,10 @@
     SUBDIR += neofetch
     SUBDIR += netevent
     SUBDIR += nfcutils
-    SUBDIR += nfsping
+    SUBDIR += nfs-over-tls
     SUBDIR += nitrogen
+    SUBDIR += nix
+    SUBDIR += nmrpflash
     SUBDIR += no-login
     SUBDIR += node_exporter
     SUBDIR += nomad
@@ -746,33 +773,49 @@
     SUBDIR += npadmin
     SUBDIR += nq
     SUBDIR += nrg2iso
+    SUBDIR += nss_ndb
     SUBDIR += nsysctl
     SUBDIR += ntfy
     SUBDIR += nut
+    SUBDIR += nut-devel
     SUBDIR += nvclock
+    SUBDIR += nvimpager
     SUBDIR += nvme-cli
     SUBDIR += nvramtool
     SUBDIR += oak
     SUBDIR += obliterate
+    SUBDIR += oc
     SUBDIR += odo
     SUBDIR += ods2
     SUBDIR += ohmu
     SUBDIR += omnibackup
+    SUBDIR += onefetch
+    SUBDIR += opa
     SUBDIR += open
+    SUBDIR += opencorsairlink
+    SUBDIR += opendircolors
     SUBDIR += openipmi
+    SUBDIR += opensbi
+    SUBDIR += openseachest
+    SUBDIR += openshift-install-devel
+    SUBDIR += openshift-install45
+    SUBDIR += openshift-install46
     SUBDIR += openupsd
     SUBDIR += openzfs
     SUBDIR += openzfs-kmod
-    SUBDIR += ori
     SUBDIR += osinfo-db-tools
-    SUBDIR += osquery
+    SUBDIR += p5-App-Regather
     SUBDIR += p5-App-RunCron
+    SUBDIR += p5-App-ZFSCurses
     SUBDIR += p5-BSD-Jail-Object
     SUBDIR += p5-BSD-Process
     SUBDIR += p5-BSD-Sysctl
+    SUBDIR += p5-BSD-getloadavg
     SUBDIR += p5-BackupPC-XS
     SUBDIR += p5-Brackup
     SUBDIR += p5-Dir-Purge
+    SUBDIR += p5-File-BackupCopy
+    SUBDIR += p5-File-Cmp
     SUBDIR += p5-File-DirCompare
     SUBDIR += p5-File-Listing
     SUBDIR += p5-File-Log
@@ -789,6 +832,8 @@
     SUBDIR += p5-Filesys-DiskSpace
     SUBDIR += p5-Filesys-DiskUsage
     SUBDIR += p5-Filesys-Statvfs
+    SUBDIR += p5-Filesys-ZFS
+    SUBDIR += p5-Filesys-ZFS-Stat
     SUBDIR += p5-Fuse
     SUBDIR += p5-Fuse-Simple
     SUBDIR += p5-Giovanni
@@ -808,6 +853,9 @@
     SUBDIR += p5-Probe-Perl
     SUBDIR += p5-Proc-PidUtil
     SUBDIR += p5-Proc-ProcessTable-Colorizer
+    SUBDIR += p5-Proc-ProcessTable-InfoString
+    SUBDIR += p5-Proc-ProcessTable-Match
+    SUBDIR += p5-Proc-ProcessTable-ncps
     SUBDIR += p5-Proclet
     SUBDIR += p5-Quota
     SUBDIR += p5-Rex
@@ -843,27 +891,25 @@
     SUBDIR += p5-arclog
     SUBDIR += p5-reslog
     SUBDIR += packer
+    SUBDIR += packmule
     SUBDIR += pacman
     SUBDIR += paicc
     SUBDIR += paladin
     SUBDIR += pam_mount
+    SUBDIR += pam_xdg
     SUBDIR += panicmail
     SUBDIR += parafly
     SUBDIR += parallel
+    SUBDIR += parkverbot
     SUBDIR += pass-otp
+    SUBDIR += pass-update
     SUBDIR += password-store
     SUBDIR += passwordsafe
     SUBDIR += patchelf
     SUBDIR += pax-utils
-    SUBDIR += pbi-manager
     SUBDIR += pbimaker
     SUBDIR += pc-networkmanager
     SUBDIR += pcapfix
-    SUBDIR += pcbsd-appweb
-    SUBDIR += pcbsd-libsh
-    SUBDIR += pcbsd-syscache
-    SUBDIR += pcbsd-utils
-    SUBDIR += pcbsd-utils-qt5
     SUBDIR += pciutils
     SUBDIR += pcpustat
     SUBDIR += pdixtract
@@ -881,25 +927,24 @@
     SUBDIR += pear-Translation2
     SUBDIR += pecl-proctitle
     SUBDIR += pefs-kmod
+    SUBDIR += perp
     SUBDIR += personality
     SUBDIR += pesign
+    SUBDIR += pfetch
     SUBDIR += pflogx
     SUBDIR += pfstat
     SUBDIR += pftables
     SUBDIR += pftop
-    SUBDIR += phantom
-    SUBDIR += php71-fileinfo
-    SUBDIR += php71-posix
-    SUBDIR += php72-fileinfo
-    SUBDIR += php72-posix
     SUBDIR += php73-fileinfo
     SUBDIR += php73-posix
     SUBDIR += php74-fileinfo
     SUBDIR += php74-posix
-    SUBDIR += phpfpm_exporter
+    SUBDIR += php80-fileinfo
+    SUBDIR += php80-posix
     SUBDIR += phybs
     SUBDIR += pick
     SUBDIR += pidof
+    SUBDIR += pies
     SUBDIR += pipemeter
     SUBDIR += plasma-pass
     SUBDIR += plasma5-discover
@@ -909,14 +954,14 @@
     SUBDIR += plasma5-kmenuedit
     SUBDIR += plasma5-ksysguard
     SUBDIR += plasma5-libksysguard
+    SUBDIR += plasma5-plasma-disks
+    SUBDIR += plasma5-plasma-systemmonitor
     SUBDIR += plasma5-polkit-kde-agent-1
     SUBDIR += plasma5-powerdevil
     SUBDIR += plasma5-systemsettings
-    SUBDIR += plasma5-user-manager
     SUBDIR += plconfig
     SUBDIR += pmt
-    SUBDIR += policykit
-    SUBDIR += policykit-gnome
+    SUBDIR += pnscan
     SUBDIR += polkit
     SUBDIR += polkit-gnome
     SUBDIR += polkit-qt
@@ -927,7 +972,6 @@
     SUBDIR += powermon
     SUBDIR += pp
     SUBDIR += pprotectd
-    SUBDIR += prelink
     SUBDIR += prips
     SUBDIR += procenv
     SUBDIR += procmap
@@ -937,85 +981,35 @@
     SUBDIR += pstack
     SUBDIR += pstacku
     SUBDIR += pstree
-    SUBDIR += ptools
     SUBDIR += puppet-lint
     SUBDIR += puppet-mode.el
     SUBDIR += puppet5
     SUBDIR += puppet6
+    SUBDIR += puppet7
     SUBDIR += puppetserver5
     SUBDIR += puppetserver6
+    SUBDIR += puppetserver7
     SUBDIR += pv
     SUBDIR += pwd_unmkdb
     SUBDIR += pwgen
+    SUBDIR += pwol
     SUBDIR += pwsafe
     SUBDIR += pxattr
-    SUBDIR += py-XenAPI
-    SUBDIR += py-analyzemft
+    SUBDIR += pxp-agent
+    SUBDIR += py-ansible-base
+    SUBDIR += py-ansible-core
     SUBDIR += py-ansible-lint
     SUBDIR += py-ansible-runner
     SUBDIR += py-azure-cli
     SUBDIR += py-azure-cli-acr
-    SUBDIR += py-azure-cli-acs
-    SUBDIR += py-azure-cli-advisor
-    SUBDIR += py-azure-cli-ams
-    SUBDIR += py-azure-cli-appservice
-    SUBDIR += py-azure-cli-backup
     SUBDIR += py-azure-cli-base
-    SUBDIR += py-azure-cli-batch
-    SUBDIR += py-azure-cli-batchai
-    SUBDIR += py-azure-cli-billing
-    SUBDIR += py-azure-cli-botservice
-    SUBDIR += py-azure-cli-cdn
-    SUBDIR += py-azure-cli-cloud
-    SUBDIR += py-azure-cli-cognitiveservices
-    SUBDIR += py-azure-cli-configure
-    SUBDIR += py-azure-cli-consumption
-    SUBDIR += py-azure-cli-container
     SUBDIR += py-azure-cli-core
-    SUBDIR += py-azure-cli-cosmosdb
-    SUBDIR += py-azure-cli-dla
-    SUBDIR += py-azure-cli-dls
-    SUBDIR += py-azure-cli-dms
-    SUBDIR += py-azure-cli-eventgrid
-    SUBDIR += py-azure-cli-eventhubs
-    SUBDIR += py-azure-cli-extension
-    SUBDIR += py-azure-cli-feedback
-    SUBDIR += py-azure-cli-find
-    SUBDIR += py-azure-cli-hdinsight
-    SUBDIR += py-azure-cli-interactive
-    SUBDIR += py-azure-cli-iot
-    SUBDIR += py-azure-cli-iotcentral
-    SUBDIR += py-azure-cli-keyvault
-    SUBDIR += py-azure-cli-kusto
-    SUBDIR += py-azure-cli-lab
-    SUBDIR += py-azure-cli-maps
-    SUBDIR += py-azure-cli-monitor
-    SUBDIR += py-azure-cli-network
-    SUBDIR += py-azure-cli-policyinsights
-    SUBDIR += py-azure-cli-profile
-    SUBDIR += py-azure-cli-rdbms
-    SUBDIR += py-azure-cli-redis
-    SUBDIR += py-azure-cli-relay
-    SUBDIR += py-azure-cli-reservations
-    SUBDIR += py-azure-cli-resource
-    SUBDIR += py-azure-cli-role
-    SUBDIR += py-azure-cli-search
-    SUBDIR += py-azure-cli-security
-    SUBDIR += py-azure-cli-servicebus
-    SUBDIR += py-azure-cli-servicefabric
-    SUBDIR += py-azure-cli-signalr
-    SUBDIR += py-azure-cli-sql
-    SUBDIR += py-azure-cli-sqlvm
-    SUBDIR += py-azure-cli-storage
     SUBDIR += py-azure-cli-telemetry
-    SUBDIR += py-azure-cli-vm
-    SUBDIR += py-bcfg2
     SUBDIR += py-bitrot
     SUBDIR += py-borgmatic
-    SUBDIR += py-cdmi
-    SUBDIR += py-cpuinfo
+    SUBDIR += py-cron-descriptor
     SUBDIR += py-croniter
-    SUBDIR += py-crontab
+    SUBDIR += py-dict-toolbox
     SUBDIR += py-diffoscope
     SUBDIR += py-dirsync
     SUBDIR += py-distro
@@ -1023,64 +1017,70 @@
     SUBDIR += py-docker
     SUBDIR += py-drmaa
     SUBDIR += py-execnet
-    SUBDIR += py-ezjailremote
     SUBDIR += py-filelike
     SUBDIR += py-filelock
-    SUBDIR += py-freenas.cli
+    SUBDIR += py-focker
     SUBDIR += py-glances
-    SUBDIR += py-gmailfs-fuse
     SUBDIR += py-google-compute-engine
-    SUBDIR += py-halite
     SUBDIR += py-hared
     SUBDIR += py-hcloud
     SUBDIR += py-honcho
     SUBDIR += py-hpilo
     SUBDIR += py-iowait
+    SUBDIR += py-jailconf
     SUBDIR += py-leviathan
+    SUBDIR += py-liquidctl
     SUBDIR += py-mitogen
     SUBDIR += py-mqttwarn
     SUBDIR += py-nagiosplugin
     SUBDIR += py-packet-python
     SUBDIR += py-pkginfo
     SUBDIR += py-ploy
-    SUBDIR += py-ploy_ansible
-    SUBDIR += py-ploy_ec2
     SUBDIR += py-ploy_ezjail
-    SUBDIR += py-ploy_fabric
     SUBDIR += py-plumbum
     SUBDIR += py-power
     SUBDIR += py-psutil
     SUBDIR += py-psutil121
     SUBDIR += py-ptyprocess
+    SUBDIR += py-py-cpuinfo
     SUBDIR += py-python-consul
+    SUBDIR += py-python-consul2
+    SUBDIR += py-python-crontab
     SUBDIR += py-python-nomad
     SUBDIR += py-pytsk
     SUBDIR += py-pywatchman
     SUBDIR += py-pyznap
+    SUBDIR += py-qmk
     SUBDIR += py-queuelib
     SUBDIR += py-ranger
+    SUBDIR += py-rdiff-backup
+    SUBDIR += py-resolve-march-native
     SUBDIR += py-salt
     SUBDIR += py-scandir
     SUBDIR += py-scarab
-    SUBDIR += py-scriptine
-    SUBDIR += py-shutilwhich
-    SUBDIR += py-stdiff
-    SUBDIR += py-superlance
     SUBDIR += py-supervisor
     SUBDIR += py-tarsnapper
     SUBDIR += py-tmuxp
+    SUBDIR += py-upt
+    SUBDIR += py-upt-cpan
+    SUBDIR += py-upt-freebsd
+    SUBDIR += py-upt-pypi
+    SUBDIR += py-upt-rubygems
     SUBDIR += py-uptime
     SUBDIR += py-zdaemon
+    SUBDIR += py-zfs-autobackup
     SUBDIR += pydf
     SUBDIR += qchroot
     SUBDIR += qdirstat
     SUBDIR += qjail
+    SUBDIR += qjail54
     SUBDIR += qlogtools
     SUBDIR += qsudo
     SUBDIR += qt5-qtdiag
     SUBDIR += qt5-qtpaths
     SUBDIR += qt5-qtplugininfo
     SUBDIR += qtpass
+    SUBDIR += quickjail
     SUBDIR += quicksynergy
     SUBDIR += racktables
     SUBDIR += radeontool
@@ -1092,11 +1092,8 @@
     SUBDIR += rclean
     SUBDIR += rcm
     SUBDIR += rdate
-    SUBDIR += rdiff-backup
-    SUBDIR += rdiff-backup-devel
     SUBDIR += rdup
     SUBDIR += read-edid
-    SUBDIR += realsync
     SUBDIR += recoverdm
     SUBDIR += reed
     SUBDIR += reggae
@@ -1111,20 +1108,22 @@
     SUBDIR += restic
     SUBDIR += retail
     SUBDIR += rex
-    SUBDIR += rfstool
     SUBDIR += rhc
     SUBDIR += riak-cs
     SUBDIR += rinse
-    SUBDIR += rmonitor
+    SUBDIR += rmlint
     SUBDIR += rocr
     SUBDIR += roct
-    SUBDIR += roottail
     SUBDIR += rovclock
     SUBDIR += rpi-firmware
+    SUBDIR += rset
+    SUBDIR += rsfetch
+    SUBDIR += rshim-user-space
     SUBDIR += rsnapshot
     SUBDIR += rsyncbackup
     SUBDIR += rsyncrypto
     SUBDIR += rsyslog8
+    SUBDIR += rtsx-kmod
     SUBDIR += rtty
     SUBDIR += rubygem-backup
     SUBDIR += rubygem-bolt
@@ -1137,12 +1136,17 @@
     SUBDIR += rubygem-capistrano-harrow
     SUBDIR += rubygem-chef
     SUBDIR += rubygem-chef-api
+    SUBDIR += rubygem-chef-bin
     SUBDIR += rubygem-chef-config
-    SUBDIR += rubygem-chef-config12
+    SUBDIR += rubygem-chef-config15
     SUBDIR += rubygem-chef-dk
+    SUBDIR += rubygem-chef-telemetry
+    SUBDIR += rubygem-chef-utils
+    SUBDIR += rubygem-chef-utils15
+    SUBDIR += rubygem-chef-vault
     SUBDIR += rubygem-chef-zero
-    SUBDIR += rubygem-chef-zero5
-    SUBDIR += rubygem-chef12
+    SUBDIR += rubygem-chef15
+    SUBDIR += rubygem-choria-mcorpc-support
     SUBDIR += rubygem-facter
     SUBDIR += rubygem-fluent-mixin-plaintextformatter
     SUBDIR += rubygem-fluent-plugin-config-expander
@@ -1154,6 +1158,7 @@
     SUBDIR += rubygem-god
     SUBDIR += rubygem-guard
     SUBDIR += rubygem-guard-compat
+    SUBDIR += rubygem-guard-cucumber
     SUBDIR += rubygem-guard-livereload
     SUBDIR += rubygem-guard-minitest
     SUBDIR += rubygem-guard-rspec
@@ -1169,15 +1174,17 @@
     SUBDIR += rubygem-httplog
     SUBDIR += rubygem-itamae
     SUBDIR += rubygem-librarian-puppet
+    SUBDIR += rubygem-license-acceptance
     SUBDIR += rubygem-log4r
     SUBDIR += rubygem-logify
     SUBDIR += rubygem-mogilefs-client
     SUBDIR += rubygem-mothra
     SUBDIR += rubygem-murder
     SUBDIR += rubygem-ohai
-    SUBDIR += rubygem-ohai8
+    SUBDIR += rubygem-ohai15
     SUBDIR += rubygem-parallel
     SUBDIR += rubygem-puppet_forge
+    SUBDIR += rubygem-puppetfile-resolver
     SUBDIR += rubygem-puppetserver-ca
     SUBDIR += rubygem-r10k
     SUBDIR += rubygem-rubyipmi
@@ -1210,10 +1217,13 @@
     SUBDIR += rubygem-winrm-elevated
     SUBDIR += rubygem-winrm-fs
     SUBDIR += rubygem-yell
-    SUBDIR += rundeck
+    SUBDIR += rundeck2
+    SUBDIR += rundeck3
     SUBDIR += runit
     SUBDIR += runit-faster
+    SUBDIR += runj
     SUBDIR += runwhen
+    SUBDIR += rush
     SUBDIR += rw
     SUBDIR += s-tui
     SUBDIR += s6
@@ -1221,17 +1231,19 @@
     SUBDIR += safe-rm
     SUBDIR += safecat
     SUBDIR += safecopy
+    SUBDIR += samdruckerclientshell
     SUBDIR += samefile
     SUBDIR += samesame
     SUBDIR += sample
+    SUBDIR += sanoid
+    SUBDIR += sanoid-devel
     SUBDIR += sas2ircu
     SUBDIR += sas3ircu
     SUBDIR += savelogs
-    SUBDIR += sb16config
-    SUBDIR += sbase
     SUBDIR += scalpel
     SUBDIR += scan_ffs
     SUBDIR += scanbuttond
+    SUBDIR += scanmem
     SUBDIR += scct
     SUBDIR += schedutils
     SUBDIR += screen
@@ -1241,12 +1253,12 @@
     SUBDIR += scterc
     SUBDIR += sd-agent
     SUBDIR += sdparm
+    SUBDIR += seatd
     SUBDIR += seatools
     SUBDIR += sec
     SUBDIR += sensu-go
     SUBDIR += serf
     SUBDIR += setcdboot
-    SUBDIR += setquota
     SUBDIR += sformat
     SUBDIR += sg3_utils
     SUBDIR += shim
@@ -1259,10 +1271,8 @@
     SUBDIR += signon-plugin-oauth2
     SUBDIR += signon-qt5
     SUBDIR += signon-ui
-    SUBDIR += skill
     SUBDIR += slack
     SUBDIR += sleuthkit
-    SUBDIR += sloth
     SUBDIR += slst
     SUBDIR += slurm-wlm
     SUBDIR += smart
@@ -1272,12 +1282,11 @@
     SUBDIR += snap
     SUBDIR += snmp_exporter
     SUBDIR += snooze
-    SUBDIR += snowlog
     SUBDIR += sockaddr
     SUBDIR += socket
     SUBDIR += socklog
     SUBDIR += solaar
-    SUBDIR += sortu
+    SUBDIR += spcm
     SUBDIR += spindown
     SUBDIR += spinner
     SUBDIR += spiped
@@ -1289,11 +1298,11 @@
     SUBDIR += stalepid
     SUBDIR += stanchion
     SUBDIR += stepsync
-    SUBDIR += stmpclean
     SUBDIR += storcli
     SUBDIR += stow
     SUBDIR += stowES
     SUBDIR += stress
+    SUBDIR += stressdisk
     SUBDIR += superiotool
     SUBDIR += swapd
     SUBDIR += swapexd
@@ -1303,26 +1312,14 @@
     SUBDIR += symlinks
     SUBDIR += symon
     SUBDIR += synergy
-    SUBDIR += synergy-1
-    SUBDIR += sysadm
-    SUBDIR += sysadm-client
+    SUBDIR += sysctlbyname-improved-kmod
     SUBDIR += sysctlinfo-kmod
     SUBDIR += sysgather
     SUBDIR += sysinfo
     SUBDIR += syslinux
     SUBDIR += syslog-ng
-    SUBDIR += syslog-ng311
-    SUBDIR += syslog-ng315
-    SUBDIR += syslog-ng317
-    SUBDIR += syslog-ng318
-    SUBDIR += syslog-ng319
-    SUBDIR += syslog-ng320
-    SUBDIR += syslog-ng321
-    SUBDIR += syslog-ng322
-    SUBDIR += syslog-ng323
     SUBDIR += syslogger
     SUBDIR += sysrc
-    SUBDIR += system-tools-backends
     SUBDIR += sysvbanner
     SUBDIR += tai64nfrac
     SUBDIR += tarsnap
@@ -1333,20 +1330,26 @@
     SUBDIR += tclsyslog
     SUBDIR += tcplist
     SUBDIR += tdir
+    SUBDIR += tealdeer
     SUBDIR += tenshi
-    SUBDIR += tentakel
     SUBDIR += terraform
+    SUBDIR += terraform-docs
+    SUBDIR += terraform-provider-gridscale
     SUBDIR += terraform-provider-vultr
+    SUBDIR += terraform-switcher
+    SUBDIR += terragrunt
     SUBDIR += testdisk
+    SUBDIR += tflint
     SUBDIR += thefish
     SUBDIR += timelimit
     SUBDIR += timemon
+    SUBDIR += tiramisu
     SUBDIR += titlefix
     SUBDIR += tkdvd
     SUBDIR += tlsdate
     SUBDIR += tm
     SUBDIR += tmate
-    SUBDIR += tmate-slave
+    SUBDIR += tmate-ssh-server
     SUBDIR += tmpreaper
     SUBDIR += tmpwatch
     SUBDIR += tmux
@@ -1355,13 +1358,13 @@
     SUBDIR += topless
     SUBDIR += torque
     SUBDIR += toshctl
+    SUBDIR += toybox
     SUBDIR += tracker
     SUBDIR += tracker-miners
     SUBDIR += tree
-    SUBDIR += tren
+    SUBDIR += triton
     SUBDIR += trueos-libqt5
     SUBDIR += ts
-    SUBDIR += tss
     SUBDIR += tty-clock
     SUBDIR += ttyd
     SUBDIR += ttyload
@@ -1400,25 +1403,35 @@
     SUBDIR += u-boot-orangepi-plus-2e
     SUBDIR += u-boot-orangepi-r1
     SUBDIR += u-boot-orangepi-zero
+    SUBDIR += u-boot-orangepi-zero-plus
     SUBDIR += u-boot-pandaboard
     SUBDIR += u-boot-pcduino3
+    SUBDIR += u-boot-pine-h64
     SUBDIR += u-boot-pine64
     SUBDIR += u-boot-pine64-lts
     SUBDIR += u-boot-pinebook
+    SUBDIR += u-boot-pinebookpro
+    SUBDIR += u-boot-qemu-arm
+    SUBDIR += u-boot-qemu-arm64
+    SUBDIR += u-boot-qemu-riscv64
     SUBDIR += u-boot-riotboard
+    SUBDIR += u-boot-rock-pi-4
     SUBDIR += u-boot-rock64
     SUBDIR += u-boot-rockpro64
     SUBDIR += u-boot-rpi
     SUBDIR += u-boot-rpi-0-w
+    SUBDIR += u-boot-rpi-arm64
     SUBDIR += u-boot-rpi2
     SUBDIR += u-boot-rpi3
+    SUBDIR += u-boot-rpi3-32
+    SUBDIR += u-boot-rpi4
+    SUBDIR += u-boot-sifive-fu540
     SUBDIR += u-boot-sinovoip-bpi-m3
     SUBDIR += u-boot-sopine
+    SUBDIR += u-boot-sopine-spi
     SUBDIR += u-boot-tools
     SUBDIR += u-boot-utilite
     SUBDIR += u-boot-wandboard
-    SUBDIR += u-boot-zedboard
-    SUBDIR += u-boot-zybo
     SUBDIR += ua
     SUBDIR += ucspi-ipc
     SUBDIR += ucspi-proxy
@@ -1428,7 +1441,6 @@
     SUBDIR += udfclient
     SUBDIR += uefi-edk2-bhyve
     SUBDIR += uefi-edk2-bhyve-csm
-    SUBDIR += uefi-edk2-bhyve-devel
     SUBDIR += uefi-edk2-qemu
     SUBDIR += ufetch
     SUBDIR += ufs_copy
@@ -1460,11 +1472,14 @@
     SUBDIR += vbetool
     SUBDIR += vchanger
     SUBDIR += vcp
+    SUBDIR += vector
     SUBDIR += videogen
     SUBDIR += vii
     SUBDIR += vils
     SUBDIR += vimpager
+    SUBDIR += virt-what
     SUBDIR += virtualmin
+    SUBDIR += vivid
     SUBDIR += vm-bhyve
     SUBDIR += vmdktool
     SUBDIR += vmtouch
@@ -1472,12 +1487,9 @@
     SUBDIR += volman
     SUBDIR += vordog
     SUBDIR += vpnc-scripts
-    SUBDIR += vstrip
     SUBDIR += vttest
     SUBDIR += vzvol
     SUBDIR += wait_on
-    SUBDIR += warden
-    SUBDIR += watchdog
     SUBDIR += watchfolder
     SUBDIR += watchman
     SUBDIR += watchmen
@@ -1492,17 +1504,15 @@
     SUBDIR += wmapmload
     SUBDIR += wmbluecpu
     SUBDIR += wmbsdbatt
-    SUBDIR += wmcpuload
     SUBDIR += wmcube
     SUBDIR += wmdiskmon
-    SUBDIR += wmfire
     SUBDIR += wmflame
     SUBDIR += wmmemfree
     SUBDIR += wmmemload
+    SUBDIR += wmscript
     SUBDIR += wmtop
     SUBDIR += wmupmon
     SUBDIR += worldtools
-    SUBDIR += wtail
     SUBDIR += wuzzah
     SUBDIR += x86info
     SUBDIR += xbatt
@@ -1521,7 +1531,6 @@
     SUBDIR += xfce4-diskperf-plugin
     SUBDIR += xfce4-fsguard-plugin
     SUBDIR += xfce4-genmon-plugin
-    SUBDIR += xfce4-kbdleds-plugin
     SUBDIR += xfce4-mount-plugin
     SUBDIR += xfce4-netload-plugin
     SUBDIR += xfce4-places-plugin
@@ -1536,6 +1545,7 @@
     SUBDIR += xmbmon
     SUBDIR += xorriso
     SUBDIR += xosview
+    SUBDIR += xpipe
     SUBDIR += xstow
     SUBDIR += xsysstats
     SUBDIR += xvidcap
@@ -1545,8 +1555,10 @@
     SUBDIR += zap
     SUBDIR += zbackup
     SUBDIR += zeitgeist
+    SUBDIR += zellij
     SUBDIR += zeroer
     SUBDIR += zetaback
+    SUBDIR += zetaback-devel
     SUBDIR += zfs-periodic
     SUBDIR += zfs-replicate
     SUBDIR += zfs-snap-diff
@@ -1561,6 +1573,7 @@
     SUBDIR += zisofs-tools
     SUBDIR += znapzend
     SUBDIR += zogftw
+    SUBDIR += zoxide
     SUBDIR += zrep
     SUBDIR += zrepl
     SUBDIR += zsd
diff --git a/sysutils/R-cran-fs/Makefile b/sysutils/R-cran-fs/Makefile
new file mode 100644
index 000000000000..315ff7aa3a82
--- /dev/null
+++ b/sysutils/R-cran-fs/Makefile
@@ -0,0 +1,26 @@
+# Created by: Guangyuan Yang <ygy@FreeBSD.org>
+
+PORTNAME=	fs
+DISTVERSION=	1.5.0
+CATEGORIES=	sysutils
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	ygy@FreeBSD.org
+COMMENT=	Cross-Platform File System Operations Based on 'libuv'
+
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	R-cran-knitr>0:print/R-cran-knitr
+TEST_DEPENDS=	R-cran-covr>0:devel/R-cran-covr \
+		R-cran-crayon>0:devel/R-cran-crayon \
+		R-cran-pillar>=1.0.0:devel/R-cran-pillar \
+		R-cran-testthat>0:devel/R-cran-testthat \
+		R-cran-tibble>=1.1.0:devel/R-cran-tibble \
+		R-cran-vctrs>=0.3.0:devel/R-cran-vctrs \
+		R-cran-withr>0:devel/R-cran-withr \
+		R-cran-knitr>0:print/R-cran-knitr \
+		R-cran-rmarkdown>0:textproc/R-cran-rmarkdown
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/sysutils/R-cran-fs/distinfo b/sysutils/R-cran-fs/distinfo
new file mode 100644
index 000000000000..ffdf417c5716
--- /dev/null
+++ b/sysutils/R-cran-fs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1609808106
+SHA256 (fs_1.5.0.tar.gz) = 36df1653571de3c628a4f769c4627f6ac53d0f9e4106d9d476afb22ae9603897
+SIZE (fs_1.5.0.tar.gz) = 796244
diff --git a/sysutils/R-cran-fs/pkg-descr b/sysutils/R-cran-fs/pkg-descr
new file mode 100644
index 000000000000..f38a1d78eae5
--- /dev/null
+++ b/sysutils/R-cran-fs/pkg-descr
@@ -0,0 +1,4 @@
+A cross-platform interface to file system operations, built on top of the
+'libuv' C library.
+
+WWW: http://fs.r-lib.org
diff --git a/sysutils/R-cran-processx/Makefile b/sysutils/R-cran-processx/Makefile
new file mode 100644
index 000000000000..606e0264a7c5
--- /dev/null
+++ b/sysutils/R-cran-processx/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	processx
+DISTVERSION=	3.5.2
+CATEGORIES=	sysutils
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	ygy@FreeBSD.org
+COMMENT=	Execute and Control System Processes
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
+		R-cran-ps>=1.2.0:sysutils/R-cran-ps
+TEST_DEPENDS=	R-cran-callr>=3.2.0:devel/R-cran-callr \
+		R-cran-cli>0:devel/R-cran-cli \
+		R-cran-covr>0:devel/R-cran-covr \
+		R-cran-testthat>0:devel/R-cran-testthat \
+		R-cran-withr>0:devel/R-cran-withr \
+		R-cran-curl>0:ftp/R-cran-curl
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/sysutils/R-cran-processx/distinfo b/sysutils/R-cran-processx/distinfo
new file mode 100644
index 000000000000..051ca11d1afa
--- /dev/null
+++ b/sysutils/R-cran-processx/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1620101366
+SHA256 (processx_3.5.2.tar.gz) = ed6f2d1047461c6061e6ed58fb6de65a289b56009867892abad76c6bba46fc2b
+SIZE (processx_3.5.2.tar.gz) = 141424
diff --git a/sysutils/R-cran-processx/files/patch-src_unix_processx.c b/sysutils/R-cran-processx/files/patch-src_unix_processx.c
new file mode 100644
index 000000000000..8102eb1e5cd7
--- /dev/null
+++ b/sysutils/R-cran-processx/files/patch-src_unix_processx.c
@@ -0,0 +1,11 @@
+--- src/unix/processx.c.orig	2021-04-21 01:17:03 UTC
++++ src/unix/processx.c
+@@ -30,6 +30,8 @@ void processx__create_connections(processx_handle_t *h
+ #ifdef WORDS_BIGENDIAN
+ #if (defined(__sun) && defined(__SVR4))
+ #include <sys/byteorder.h>
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
+ #elif (defined(__APPLE__) && defined(__ppc__) || defined(__ppc64__))
+ #include <libkern/OSByteOrder.h>
+ #define BSWAP_32 OSSwapInt32
diff --git a/sysutils/R-cran-processx/pkg-descr b/sysutils/R-cran-processx/pkg-descr
new file mode 100644
index 000000000000..0f3f8f92eaed
--- /dev/null
+++ b/sysutils/R-cran-processx/pkg-descr
@@ -0,0 +1,8 @@
+Tools to run system processes in the background. It can check if a background
+process is running; wait on a background process to finish; get the exit status
+of finished processes; kill background processes. It can read the standard
+output and error of the processes, using non-blocking connections. 'processx'
+can poll a process for standard output or error, with a timeout. It can also
+poll several processes at once.
+
+WWW: https://processx.r-lib.org
diff --git a/sysutils/R-cran-ps/Makefile b/sysutils/R-cran-ps/Makefile
new file mode 100644
index 000000000000..acd12c855fa5
--- /dev/null
+++ b/sysutils/R-cran-ps/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	ps
+DISTVERSION=	1.6.0
+CATEGORIES=	sysutils
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	ygy@FreeBSD.org
+COMMENT=	List, Query, Manipulate System Processes
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
+		R-cran-callr>0:devel/R-cran-callr \
+		R-cran-covr>0:devel/R-cran-covr \
+		R-cran-rlang>0:devel/R-cran-rlang \
+		R-cran-testthat>0:devel/R-cran-testthat \
+		R-cran-tibble>0:devel/R-cran-tibble \
+		R-cran-curl>0:ftp/R-cran-curl \
+		R-cran-processx>=3.1.0:sysutils/R-cran-processx
+
+USES=		cran:auto-plist,compiles
+
+.include <bsd.port.mk>
diff --git a/sysutils/R-cran-ps/distinfo b/sysutils/R-cran-ps/distinfo
new file mode 100644
index 000000000000..ea4a7b358c62
--- /dev/null
+++ b/sysutils/R-cran-ps/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1615084795
+SHA256 (ps_1.6.0.tar.gz) = 89ad7ddc5e0818bccacfd0673ddf2da0892ac2a3b4d3a821e40884ab1e96bf31
+SIZE (ps_1.6.0.tar.gz) = 119670
diff --git a/sysutils/R-cran-ps/pkg-descr b/sysutils/R-cran-ps/pkg-descr
new file mode 100644
index 000000000000..7d194817df5a
--- /dev/null
+++ b/sysutils/R-cran-ps/pkg-descr
@@ -0,0 +1,4 @@
+List, query and manipulate all system processes, on 'Windows', 'Linux' and
+'macOS'.
+
+WWW: https://github.com/r-lib/ps#readme
diff --git a/sysutils/R-cran-xopen/Makefile b/sysutils/R-cran-xopen/Makefile
new file mode 100644
index 000000000000..bfa14b89a111
--- /dev/null
+++ b/sysutils/R-cran-xopen/Makefile
@@ -0,0 +1,20 @@
+# Created by: Guangyuan Yang <ygy@FreeBSD.org>
+
+PORTNAME=	xopen
+DISTVERSION=	1.0.0
+CATEGORIES=	sysutils
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	ygy@FreeBSD.org
+COMMENT=	Open System Files, 'URLs', Anything
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	R-cran-processx>0:sysutils/R-cran-processx
+TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat \
+		R-cran-ps>0:sysutils/R-cran-ps
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/sysutils/R-cran-xopen/distinfo b/sysutils/R-cran-xopen/distinfo
new file mode 100644
index 000000000000..440ecc2d4878
--- /dev/null
+++ b/sysutils/R-cran-xopen/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1609807718
+SHA256 (xopen_1.0.0.tar.gz) = e207603844d69c226142be95281ba2f4a056b9d8cbfae7791ba60535637b3bef
+SIZE (xopen_1.0.0.tar.gz) = 11221
diff --git a/sysutils/R-cran-xopen/pkg-descr b/sysutils/R-cran-xopen/pkg-descr
new file mode 100644
index 000000000000..d76ed6143596
--- /dev/null
+++ b/sysutils/R-cran-xopen/pkg-descr
@@ -0,0 +1,4 @@
+Cross platform solution to open files, directories or 'URLs' with their
+associated programs.
+
+WWW: https://github.com/r-lib/xopen#readme
diff --git a/sysutils/UEFITool/Makefile b/sysutils/UEFITool/Makefile
index 0d034054c9df..7edf11c5c605 100644
--- a/sysutils/UEFITool/Makefile
+++ b/sysutils/UEFITool/Makefile
@@ -1,13 +1,11 @@
-# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
-# $FreeBSD$
+# Created by: Piotr Kubaj <pkubaj@FreeBSD.org>
 
 PORTNAME=	UEFITool
 DISTVERSIONPREFIX=	A
-DISTVERSION=	55
-PORTREVISION=	1
+DISTVERSION=	58
 CATEGORIES=	sysutils
 
-MAINTAINER=	pkubaj@anongoth.pl
+MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	UEFI images parser
 
 LICENSE=	MIT
diff --git a/sysutils/UEFITool/distinfo b/sysutils/UEFITool/distinfo
index 86dca6fcdf71..346df536f1dc 100644
--- a/sysutils/UEFITool/distinfo
+++ b/sysutils/UEFITool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549890302
-SHA256 (LongSoft-UEFITool-A55_GH0.tar.gz) = 2b8f7643585aee80497789430b18196e8480c0d0af8632dec8bc06492fbc16d9
-SIZE (LongSoft-UEFITool-A55_GH0.tar.gz) = 620240
+TIMESTAMP = 1605038431
+SHA256 (LongSoft-UEFITool-A58_GH0.tar.gz) = d25cf225aee910b7e46100ec6fb5c8670438ac580139953a1f311b4f076f9662
+SIZE (LongSoft-UEFITool-A58_GH0.tar.gz) = 639403
diff --git a/sysutils/abck/Makefile b/sysutils/abck/Makefile
deleted file mode 100644
index c2b2e8e57403..000000000000
--- a/sysutils/abck/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: tundra
-# $FreeBSD$
-
-PORTNAME=	abck
-PORTVERSION=	2.2
-PORTREVISION=	2
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.tundraware.com/Software/abck/
-
-MAINTAINER=	tundra@tundraware.com
-COMMENT=	Manage intrusion attempts recorded in the system log
-
-LICENSE=	TundraWare
-LICENSE_NAME=	TundraWare license
-LICENSE_FILE=	${WRKSRC}/abck-License.txt
-LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell no-auto-accept
-
-USES=		python:2.7,run shebangfix
-SHEBANG_FILES=	abck
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/sysutils/abck/distinfo b/sysutils/abck/distinfo
deleted file mode 100644
index 88fc86c47624..000000000000
--- a/sysutils/abck/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (abck-2.2.tar.gz) = d4254aef03feb3d450d93dce6339b19429fe4a6e0b65d548ef4fb2519ed75f95
-SIZE (abck-2.2.tar.gz) = 12103
diff --git a/sysutils/abck/files/patch-Makefile b/sysutils/abck/files/patch-Makefile
deleted file mode 100644
index 08deda506c92..000000000000
--- a/sysutils/abck/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	2002-09-04 21:55:45 UTC
-+++ Makefile
-@@ -4,7 +4,5 @@
- all:	# Do nothing - this is a python script that needs no build
- 
- install:
--	install -c -o root -g wheel -m 700 ./abck ${PREFIX}/bin
--	mkdir ${PREFIX}/share/doc/abck
--	install -c -o root -g wheel -m 644 ./abck.1.gz ${PREFIX}/man/man1
--	install -c -o root -g wheel -m 644 ./abck-License.txt ${PREFIX}/share/doc/abck
-+	${BSD_INSTALL_SCRIPT} ./abck ${DESTDIR}${PREFIX}/bin
-+	${BSD_INSTALL_MAN} ./abck.1.gz ${DESTDIR}${PREFIX}/man/man1
diff --git a/sysutils/abck/pkg-descr b/sysutils/abck/pkg-descr
deleted file mode 100644
index 95dd24844ba5..000000000000
--- a/sysutils/abck/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-'abck' is an interactive tool to examine intrusion attempts and decide
-what, if anything, to do about them.  It reads through
-/var/log/messages looking for evidence of an intrusion attempt. Upon
-finding such a record, 'abck' qualifies it against information
-supplied by the user on the command line to determine if the record is
-to be processed.  As packaged, 'abck' handles several common types of
-intrusion attempt records, but it can easily be expanded to handle
-others.
-
-You need a reasonably current copy of Python to run the main script.
diff --git a/sysutils/abck/pkg-plist b/sysutils/abck/pkg-plist
deleted file mode 100644
index a379f6c8e620..000000000000
--- a/sysutils/abck/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/abck
-man/man1/abck.1.gz
diff --git a/sysutils/abduco/Makefile b/sysutils/abduco/Makefile
index ec7d52e4f686..eed2cc4a45cf 100644
--- a/sysutils/abduco/Makefile
+++ b/sysutils/abduco/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	abduco
 PORTVERSION=	0.6
 CATEGORIES=	sysutils
diff --git a/sysutils/abgx360/Makefile b/sysutils/abgx360/Makefile
index 250f69630911..f82ba02b306f 100644
--- a/sysutils/abgx360/Makefile
+++ b/sysutils/abgx360/Makefile
@@ -1,5 +1,4 @@
 # Created by: okeeblow <root@cooltrainer.org>
-# $FreeBSD$
 
 PORTNAME=	abgx360
 PORTVERSION=	1.0.6
diff --git a/sysutils/abgx360gui/Makefile b/sysutils/abgx360gui/Makefile
deleted file mode 100644
index bb6e9653c952..000000000000
--- a/sysutils/abgx360gui/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: okeeblow <root@cooltrainer.org>
-# $FreeBSD$
-
-PORTNAME=	abgx360gui
-PORTVERSION=	1.0.2
-PORTREVISION=	9
-CATEGORIES=	sysutils
-MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
-		http://update.cooltrainer.org/abgx360/:png \
-		http://abgx360.xecuter.com/dl/ \
-		http://dl.dropbox.com/u/59058148/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} abgx360-256.png:png
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	root@cooltrainer.org
-COMMENT=	wxWidgets frontend for abgx360
-
-LICENSE=	NONE
-
-RUN_DEPENDS=	abgx360:sysutils/abgx360 \
-		xterm:x11/xterm
-
-PLIST_FILES=	bin/abgx360gui \
-		share/pixmaps/abgx360-256.png
-
-GNU_CONFIGURE=	yes
-USES=		compiler:c++11-lang
-USE_WX=		2.8
-WX_COMPS=	wx
-CONFIGURE_ARGS=	--with-wx=${LOCALBASE} \
-		--with-wx-config=${WX_CONFIG:T}
-
-DESKTOP_ENTRIES=	"abgx360" \
-			"Verify and repair Xbox 360 backup images" \
-			"${PREFIX}/share/pixmaps/abgx360-256.png" \
-			"abgx360gui" \
-			"Utility;" \
-			false
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/abgx360gui ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/abgx360-256.png ${STAGEDIR}${PREFIX}/share/pixmaps
-
-.include <bsd.port.mk>
diff --git a/sysutils/abgx360gui/distinfo b/sysutils/abgx360gui/distinfo
deleted file mode 100644
index 68a51ae772a7..000000000000
--- a/sysutils/abgx360gui/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (abgx360gui-1.0.2.tar.gz) = 949fdcb871d038b1c8aed658e3d3d0fe6c44c73fbea8defc46ce37b0abf91303
-SIZE (abgx360gui-1.0.2.tar.gz) = 155604
-SHA256 (abgx360-256.png) = fb76dbd05663f46ca8cb77d271580548b9cb5d12f2cc99a4c5ff0f3a83e1cd6c
-SIZE (abgx360-256.png) = 39849
diff --git a/sysutils/abgx360gui/files/patch-src_abgx360gui.cpp b/sysutils/abgx360gui/files/patch-src_abgx360gui.cpp
deleted file mode 100644
index 5ce69dd68aed..000000000000
--- a/sysutils/abgx360gui/files/patch-src_abgx360gui.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-src/abgx360gui.cpp:2459:66: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
-            str = wxT("Your StealthFiles folder is located here:"NEWLINE);
-                                                                 ^
-
---- src/abgx360gui.cpp.orig	2018-08-01 13:21:47 UTC
-+++ src/abgx360gui.cpp
-@@ -1007,7 +1007,7 @@ void abgx360gui::OnClose(wxCloseEvent& WXUNUSED(event)
- void abgx360gui::MnuSaveSettingsClick(wxCommandEvent& WXUNUSED(event))
- {
-     wxString name = wxT("/Settings/");
--	name += wxGetTextFromUser(wxT("Enter a name for these settings. Saving them as \"Default\" will"NEWLINE"cause them to be loaded every time abgx360 GUI is launched."), wxT("Save Settings"), wxT("Default"));
-+	name += wxGetTextFromUser(wxT("Enter a name for these settings. Saving them as \"Default\" will" NEWLINE "cause them to be loaded every time abgx360 GUI is launched."), wxT("Save Settings"), wxT("Default"));
- 	
- 	if (name.Cmp(wxT("/Settings/")) == 0) return;
- 	
-@@ -1908,7 +1908,7 @@ void abgx360gui::OpenButtonClick(wxCommandEvent& WXUNU
-             //m_fileHistory->AddFileToHistory(openfilename);
-             count = arrayStringFor_OpenFileDialog.GetCount();
-             if (count > 100) {
--                wxMessageBox(wxT("You have selected over 100 files!"NEWLINE"This will probably exceed maximum command line length limits so try using directory input instead."), wxT("Doh!"), wxICON_EXCLAMATION);
-+                wxMessageBox(wxT("You have selected over 100 files!" NEWLINE "This will probably exceed maximum command line length limits so try using directory input instead."), wxT("Doh!"), wxICON_EXCLAMATION);
-               return;
-             }
-             if (count) {
-@@ -2456,7 +2456,7 @@ void abgx360gui::WhereStealthFilesClick(wxCommandEvent
-         homedir += wxT("\\abgx360\\");
-     #else
-         if (wxGetEnv(wxT("ABGX360_DIR"), &homedir) || wxGetEnv(wxT("HOME"), &homedir)) {
--            str = wxT("Your StealthFiles folder is located here:"NEWLINE);
-+            str = wxT("Your StealthFiles folder is located here:" NEWLINE);
-         }
-         else {
-             wxMessageBox(wxT("ERROR: Unable to find your StealthFiles folder!"), wxT("Where is my StealthFiles folder?"), wxOK);
-@@ -2503,7 +2503,7 @@ void abgx360gui::WhereImagesClick(wxCommandEvent& even
-         homedir += wxT("\\abgx360\\");
-     #else
-         if (wxGetEnv(wxT("ABGX360_DIR"), &homedir) || wxGetEnv(wxT("HOME"), &homedir)) {
--            str = wxT("Your Images folder is located here:"NEWLINE);
-+            str = wxT("Your Images folder is located here:" NEWLINE);
-         }
-         else {
-             wxMessageBox(wxT("ERROR: Unable to find your Images folder!"), wxT("Where is my Images folder?"), wxOK);
-@@ -2567,7 +2567,7 @@ bool DnDInput::OnDropFiles(wxCoord, wxCoord, const wxA
-                 if (realcount) {
-                     dndeditbox->AppendText(wxT(" "));
-                     if (realcount >= 100) {
--                        wxMessageBox(wxT("You have selected over 100 files!"NEWLINE"This will probably exceed maximum command line length limits so try using directory input instead."), wxT("Doh!"), wxICON_EXCLAMATION);
-+                        wxMessageBox(wxT("You have selected over 100 files!" NEWLINE "This will probably exceed maximum command line length limits so try using directory input instead."), wxT("Doh!"), wxICON_EXCLAMATION);
-                         dndeditbox->Clear();
-                       return false;
-                     }
diff --git a/sysutils/abgx360gui/pkg-descr b/sysutils/abgx360gui/pkg-descr
deleted file mode 100644
index e89bbbd39856..000000000000
--- a/sysutils/abgx360gui/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-abgx360gui is a frontend for the command-line application
-sysutils/abgx360. It allows the user to easily select abgx360 options.
-It can output an abgx360 log to a new xterm window, a text file,
-or an HTML file.
-
-WWW: https://abgx360.xecuter.com/
diff --git a/sysutils/accounts-qml-module/Makefile b/sysutils/accounts-qml-module/Makefile
new file mode 100644
index 000000000000..e061a4dc3036
--- /dev/null
+++ b/sysutils/accounts-qml-module/Makefile
@@ -0,0 +1,33 @@
+PORTNAME=	accounts-qml-module
+DISTVERSION=	0.7
+PORTREVISION=	1
+CATEGORIES=	sysutils kde
+DIST_SUBDIR=	KDE/${GL_ACCOUNT}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Expose the Online Accounts API to QML applications
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt5 \
+		libsignon-qt5.so:sysutils/signon-qt5
+
+USES=		compiler:c++11-lang gl pkgconfig qmake qt:5 tar:bz2
+USE_GL=		gl
+USE_QT=		core declarative gui network testlib xml \
+		buildtools_build qdoc_build qmake_build
+# gitlab variables
+USE_GITLAB=	yes
+GL_ACCOUNT=	accounts-sso
+GL_COMMIT=	cfadea7ba8ba4011ae20d771696eb74deb87201e
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH:Mpowerpc64*}
+PLIST_SUB=	PPC64="@comment "
+.else
+PLIST_SUB=	PPC64=""
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/accounts-qml-module/distinfo b/sysutils/accounts-qml-module/distinfo
new file mode 100644
index 000000000000..f7c836fb8159
--- /dev/null
+++ b/sysutils/accounts-qml-module/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1617892301
+SHA256 (KDE/accounts-sso/accounts-sso-accounts-qml-module-cfadea7ba8ba4011ae20d771696eb74deb87201e_GL0.tar.gz) = 1d0039c047f1f0fba9191edfe3295a22b0d71533b7ac99e9bf28d1f068e97e98
+SIZE (KDE/accounts-sso/accounts-sso-accounts-qml-module-cfadea7ba8ba4011ae20d771696eb74deb87201e_GL0.tar.gz) = 62041
diff --git a/sysutils/accounts-qml-module/files/patch-common-project-config.pri b/sysutils/accounts-qml-module/files/patch-common-project-config.pri
new file mode 100644
index 000000000000..da1103f137d8
--- /dev/null
+++ b/sysutils/accounts-qml-module/files/patch-common-project-config.pri
@@ -0,0 +1,11 @@
+--- common-project-config.pri.orig	2020-04-25 09:29:07 UTC
++++ common-project-config.pri
+@@ -3,7 +3,7 @@
+ #-----------------------------------------------------------------------------
+ 
+ # we don't like warnings...
+-QMAKE_CXXFLAGS += -Werror -Wno-write-strings
++QMAKE_CXXFLAGS += -Wno-write-strings
+ # Disable RTTI
+ QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
+ # Use C++11
diff --git a/sysutils/accounts-qml-module/pkg-descr b/sysutils/accounts-qml-module/pkg-descr
new file mode 100644
index 000000000000..715533261440
--- /dev/null
+++ b/sysutils/accounts-qml-module/pkg-descr
@@ -0,0 +1,6 @@
+This QML module provides an API to manage the user's online accounts and get
+their authentication data.
+
+It's a tiny wrapper around the Qt-based APIs of libaccounts-qt and libsignon-qt.
+
+WWW: https://gitlab.com/groups/accounts-sso
diff --git a/sysutils/accounts-qml-module/pkg-plist b/sysutils/accounts-qml-module/pkg-plist
new file mode 100644
index 000000000000..1b2137552b93
--- /dev/null
+++ b/sysutils/accounts-qml-module/pkg-plist
@@ -0,0 +1,25 @@
+bin/tst_plugin
+%%QT_QMLDIR%%/Ubuntu/OnlineAccounts/libAccounts.so
+%%QT_QMLDIR%%/Ubuntu/OnlineAccounts/plugin.qmltypes
+%%QT_QMLDIR%%/Ubuntu/OnlineAccounts/qmldir
+%%DATADIR%%/doc/html/.gitignore
+%%DATADIR%%/doc/html/onlineaccounts-qml-api.index
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-account-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-account.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservice-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservice.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservicemodel-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-accountservicemodel.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-application-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-application.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-applicationmodel-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-applicationmodel.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-credentials-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-credentials.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-manager-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-manager.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-providermodel-members.html
+%%PPC64%%%%DATADIR%%/doc/html/qml-ubuntu-onlineaccounts-providermodel.html
+%%DATADIR%%/doc/html/style/qtquick.css
+%%PPC64%%%%DATADIR%%/doc/html/ubuntu-onlineaccounts-qmlmodule.html
+@dir %%DATADIR%%/doc/html/images
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 28a760318bf7..70e6c3b40850 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,8 +1,7 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	accountsservice
-PORTVERSION=	0.6.42
+PORTVERSION=	0.6.55
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
@@ -12,27 +11,17 @@ COMMENT=	D-Bus interface for user account query and manipulation
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
-		libpolkit-gobject-1.so:sysutils/polkit
+BUILD_DEPENDS=	dbus>0:devel/dbus
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
-USE_GNOME=	glib20 intlhack introspection:build libxslt
-USES=		cpe gettext gmake libtool localbase:ldflags pathfix pkgconfig tar:xz
+USES=		cpe gettext gnome localbase:ldflags meson pkgconfig tar:xz
 CPE_VENDOR=	ray_stode
-GNU_CONFIGURE=	yes
+USE_GNOME=	glib20 intltool libxslt introspection:build
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-systemd --localstatedir=/var/
-INSTALL_TARGET=	install-strip
-
-# XXX HACK! this file isn't present on the pristine jails of the builders
-# and configure breaks without it. Beter solutions welcome.
-.if defined(PACKAGE_BUILDING)
-CONFIGURE_ENV+=	ac_cv_file__var_log_utx_log=yes
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/gdm/custom.conf|${LOCALBASE}/etc/gdm/custom.conf|g' \
-		${WRKSRC}/src/daemon.c
-	@${REINPLACE_CMD} -e 's|/lib/AccountsService|/db/AccountsService|g' \
-		${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in
+MESON_ARGS=	-Delogind=false \
+		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
+		-Dlocalstatedir=/var \
+		-Dsystemd=false \
+		-Dsystemdsystemunitdir=no
 
 .include <bsd.port.mk>
diff --git a/sysutils/accountsservice/distinfo b/sysutils/accountsservice/distinfo
index c933d57be71f..71694a1bde05 100644
--- a/sysutils/accountsservice/distinfo
+++ b/sysutils/accountsservice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468052689
-SHA256 (accountsservice-0.6.42.tar.xz) = e56494c2f18627900b57234e5628923cc16a37bf8fd16b06c46118d6ae9c007e
-SIZE (accountsservice-0.6.42.tar.xz) = 380500
+TIMESTAMP = 1600462353
+SHA256 (accountsservice-0.6.55.tar.xz) = ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
+SIZE (accountsservice-0.6.55.tar.xz) = 97972
diff --git a/sysutils/accountsservice/files/patch-configure b/sysutils/accountsservice/files/patch-configure
deleted file mode 100644
index cbf3790afc2b..000000000000
--- a/sysutils/accountsservice/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	2014-03-15 15:02:28.000000000 +0100
-+++ configure	2014-03-15 15:03:01.000000000 +0100
-@@ -14527,6 +14527,18 @@
- done
- 
- 
-+for ac_func in fgetpwent
-+do :
-+  ac_fn_c_check_func "$LINENO" "fgetpwent" "ac_cv_func_fgetpwent"
-+if test "x$ac_cv_func_fgetpwent" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_FGETPWENT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
- 
- 
- 
diff --git a/sysutils/accountsservice/files/patch-meson.build b/sysutils/accountsservice/files/patch-meson.build
new file mode 100644
index 000000000000..13ecb2d1e712
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-meson.build
@@ -0,0 +1,16 @@
+--- meson.build.orig	2018-09-29 12:54:53 UTC
++++ meson.build
+@@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p
+ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
+   config_h.set('PATH_WTMP', '_PATH_WTMPX')
+ else
+-  assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
+-  config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
++  # Ugly hack for jails builders!
++  _system = host_machine.system().to_lower()
++  if _system.contains('freebsd')
++    config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
++  endif
+ endif
+ 
+ # compiler flags
diff --git a/sysutils/accountsservice/files/patch-meson__post__install.py b/sysutils/accountsservice/files/patch-meson__post__install.py
new file mode 100644
index 000000000000..e0d71f5e7c41
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-meson__post__install.py
@@ -0,0 +1,13 @@
+--- meson_post_install.py.orig	2019-04-23 15:16:09 UTC
++++ meson_post_install.py
+@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sy
+ # FIXME: meson will not track the creation of these directories
+ #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
+ dst_dirs = [
+-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
+-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
++  (os.path.join(localstatedir, 'db', 'AccountsService', 'icons'), 0o775),
++  (os.path.join(localstatedir, 'db', 'AccountsService', 'users'), 0o700),
+ ]
+ 
+ for (dst_dir, dst_dir_mode) in dst_dirs:
diff --git a/sysutils/accountsservice/files/patch-src_daemon.c b/sysutils/accountsservice/files/patch-src_daemon.c
index 29226ddd111f..3a7131000a89 100644
--- a/sysutils/accountsservice/files/patch-src_daemon.c
+++ b/sysutils/accountsservice/files/patch-src_daemon.c
@@ -1,15 +1,227 @@
---- src/daemon.c.orig	2014-03-23 09:36:37.194365289 +0000
-+++ src/daemon.c	2014-03-23 09:36:39.836364714 +0000
-@@ -48,7 +48,7 @@
- #define PATH_PASSWD "/etc/passwd"
- #define PATH_SHADOW "/etc/shadow"
- #define PATH_GROUP "/etc/group"
--#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
-+#define PATH_GDM_CUSTOM "/usr/local/etc/gdm/custom.conf"
- 
- enum {
-         PROP_0,
-@@ -892,20 +892,18 @@
+--- src/daemon.c.orig	2018-09-26 13:20:49 UTC
++++ src/daemon.c
+@@ -79,7 +79,11 @@ typedef struct {
+         GHashTable *extension_ifaces;
+ } DaemonPrivate;
+ 
++#ifdef HAVE_SHADOW_H
+ typedef struct passwd * (* EntryGeneratorFunc) (Daemon *, GHashTable *, gpointer *, struct spwd **shadow_entry);
++#else
++typedef struct passwd * (* EntryGeneratorFunc) (Daemon *, GHashTable *, gpointer *);
++#endif
+ 
+ static void daemon_accounts_accounts_iface_init (AccountsAccountsIface *iface);
+ 
+@@ -154,17 +158,25 @@ remove_cache_files (const gchar *user_name)
+ }
+ 
+ static struct passwd *
++#ifdef HAVE_SHADOW_H
+ entry_generator_fgetpwent (Daemon       *daemon,
+                            GHashTable   *users,
+                            gpointer     *state,
+                            struct spwd **spent)
++#else
++entry_generator_fgetpwent (Daemon       *daemon,
++                           GHashTable   *users,
++                           gpointer     *state)
++#endif
+ {
+         struct passwd *pwent;
+ 
++#ifdef HAVE_SHADOW_H
+         struct {
+                 struct spwd spbuf;
+                 char buf[1024];
+         } *shadow_entry_buffers;
++#endif
+ 
+         struct {
+                 FILE *fp;
+@@ -175,6 +187,7 @@ entry_generator_fgetpwent (Daemon       *daemon,
+         if (*state == NULL) {
+                 GHashTable *shadow_users = NULL;
+                 FILE *fp;
++#ifdef HAVE_SHADOW_H
+                 struct spwd *shadow_entry;
+ 
+                 fp = fopen (PATH_SHADOW, "r");
+@@ -208,6 +221,7 @@ entry_generator_fgetpwent (Daemon       *daemon,
+                         g_clear_pointer (&shadow_users, g_hash_table_unref);
+                         return NULL;
+                 }
++#endif
+ 
+                 fp = fopen (PATH_PASSWD, "r");
+                 if (fp == NULL) {
+@@ -229,12 +243,17 @@ entry_generator_fgetpwent (Daemon       *daemon,
+         if (g_hash_table_size (users) < MAX_LOCAL_USERS) {
+                 pwent = fgetpwent (generator_state->fp);
+                 if (pwent != NULL) {
++#ifdef HAVE_SHADOW_H
+                         shadow_entry_buffers = g_hash_table_lookup (generator_state->users, pwent->pw_name);
+ 
+                         if (shadow_entry_buffers != NULL) {
+                             *spent = &shadow_entry_buffers->spbuf;
+                         }
+                         return pwent;
++#else
++                        if (!generator_state->users || g_hash_table_lookup (generator_state->users, pwent->pw_name))
++                            return pwent;
++#endif
+                 }
+         }
+ 
+@@ -248,10 +267,16 @@ entry_generator_fgetpwent (Daemon       *daemon,
+ }
+ 
+ static struct passwd *
++#ifdef HAVE_SHADOW_H
+ entry_generator_cachedir (Daemon       *daemon,
+                           GHashTable   *users,
+                           gpointer     *state,
+                           struct spwd **shadow_entry)
++#else
++entry_generator_cachedir (Daemon       *daemon,
++                          GHashTable   *users,
++                          gpointer     *state)
++#endif
+ {
+         struct passwd *pwent;
+         g_autoptr(GError) error = NULL;
+@@ -293,7 +318,9 @@ entry_generator_cachedir (Daemon       *daemon,
+                         errno = 0;
+                         pwent = getpwnam (name);
+                         if (pwent != NULL) {
++#ifdef HAVE_SHADOW_H
+                                 *shadow_entry = getspnam (pwent->pw_name);
++#endif
+ 
+                                 return pwent;
+                         } else if (errno == 0) {
+@@ -329,10 +356,16 @@ entry_generator_cachedir (Daemon       *daemon,
+ }
+ 
+ static struct passwd *
++#ifdef HAVE_SHADOW_H
+ entry_generator_requested_users (Daemon       *daemon,
+                                  GHashTable   *users,
+                                  gpointer     *state,
+                                  struct spwd **shadow_entry)
++#else
++entry_generator_requested_users (Daemon       *daemon,
++                                 GHashTable   *users,
++                                 gpointer     *state)
++#endif
+ {
+         DaemonPrivate *priv = daemon_get_instance_private (daemon);
+         struct passwd *pwent;
+@@ -360,7 +393,9 @@ entry_generator_requested_users (Daemon       *daemon,
+                                 if (pwent == NULL) {
+                                         g_debug ("user '%s' requested previously but not present on system", name);
+                                 } else {
++#ifdef HAVE_SHADOW_H
+                                         *shadow_entry = getspnam (pwent->pw_name);
++#endif
+ 
+                                         return pwent;
+                                 }
+@@ -383,19 +418,29 @@ load_entries (Daemon             *daemon,
+         DaemonPrivate *priv = daemon_get_instance_private (daemon);
+         gpointer generator_state = NULL;
+         struct passwd *pwent;
++#ifdef HAVE_SHADOW_H
+         struct spwd *spent = NULL;
++#endif
+         User *user = NULL;
+ 
+         g_assert (entry_generator != NULL);
+ 
+         for (;;) {
++#ifdef HAVE_SHADOW_H
+                 spent = NULL;
+                 pwent = entry_generator (daemon, users, &generator_state, &spent);
++#else
++                pwent = entry_generator (daemon, users, &generator_state);
++#endif
+                 if (pwent == NULL)
+                         break;
+ 
+                 /* Skip system users... */
++#ifdef HAVE_SHADOW_H
+                 if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
++#else
++                if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, NULL)) {
++#endif
+                         g_debug ("skipping user: %s", pwent->pw_name);
+                         continue;
+                 }
+@@ -417,7 +462,11 @@ load_entries (Daemon             *daemon,
+ 
+                         /* freeze & update users not already in the new list */
+                         g_object_freeze_notify (G_OBJECT (user));
++#ifdef HAVE_SHADOW_H
+                         user_update_from_pwent (user, pwent, spent);
++#else
++                        user_update_from_pwent (user, pwent);
++#endif
+ 
+                         g_hash_table_insert (users, g_strdup (user_get_user_name (user)), user);
+                         g_debug ("loaded user: %s", user_get_user_name (user));
+@@ -823,15 +872,24 @@ throw_error (GDBusMethodInvocation *context,
+ }
+ 
+ static User *
++#ifdef HAVE_SHADOW_H
+ add_new_user_for_pwent (Daemon        *daemon,
+                         struct passwd *pwent,
+                         struct spwd   *spent)
++#else
++add_new_user_for_pwent (Daemon        *daemon,
++                        struct passwd *pwent)
++#endif
+ {
+         DaemonPrivate *priv = daemon_get_instance_private (daemon);
+         User *user;
+ 
+         user = user_new (daemon, pwent->pw_uid);
++#ifdef HAVE_SHADOW_H
+         user_update_from_pwent (user, pwent, spent);
++#else
++        user_update_from_pwent (user, pwent);
++#endif
+         user_register (user);
+ 
+         g_hash_table_insert (priv->users,
+@@ -860,9 +918,13 @@ daemon_local_find_user_by_id (Daemon *daemon,
+         user = g_hash_table_lookup (priv->users, pwent->pw_name);
+ 
+         if (user == NULL) {
++#ifdef HAVE_SHADOW_H
+                 struct spwd *spent;
+                 spent = getspnam (pwent->pw_name);
+                 user = add_new_user_for_pwent (daemon, pwent, spent);
++#else
++                user = add_new_user_for_pwent (daemon, pwent);
++#endif
+ 
+                 priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users,
+                                                                   g_strdup (pwent->pw_name));
+@@ -888,9 +950,13 @@ daemon_local_find_user_by_name (Daemon      *daemon,
+         user = g_hash_table_lookup (priv->users, pwent->pw_name);
+ 
+         if (user == NULL) {
++#ifdef HAVE_SHADOW_H
+                 struct spwd *spent;
+                 spent = getspnam (pwent->pw_name);
+                 user = add_new_user_for_pwent (daemon, pwent, spent);
++#else
++                user = add_new_user_for_pwent (daemon, pwent);
++#endif
+ 
+                 priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users,
+                                                                   g_strdup (pwent->pw_name));
+@@ -1095,10 +1161,12 @@ daemon_create_user_authorized_cb (Daemon              
  
          sys_log (context, "create user '%s'", cd->user_name);
  
@@ -24,12 +236,18 @@
 +        argv[4] = "-c";
 +        argv[5] = cd->real_name;
          if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) {
+                 if (EXTRA_ADMIN_GROUPS != NULL && EXTRA_ADMIN_GROUPS[0] != '\0')
+                         admin_groups = g_strconcat (ADMIN_GROUP, ",",
+@@ -1106,15 +1174,11 @@ daemon_create_user_authorized_cb (Daemon              
+                 else
+                         admin_groups = g_strdup (ADMIN_GROUP);
+ 
 -                argv[4] = "-G";
--                argv[5] = ADMIN_GROUP;
+-                argv[5] = admin_groups;
 -                argv[6] = "--";
 -                argv[7] = cd->user_name;
 +                argv[6] = "-G";
-+                argv[7] = ADMIN_GROUP;
++                argv[7] = admin_groups;
                  argv[8] = NULL;
          }
          else if (cd->account_type == ACCOUNT_TYPE_STANDARD) {
@@ -38,3 +256,39 @@
                  argv[6] = NULL;
          }
          else {
+@@ -1281,7 +1345,7 @@ daemon_delete_user_authorized_cb (Daemon              
+         DeleteUserData *ud = data;
+         g_autoptr(GError) error = NULL;
+         struct passwd *pwent;
+-        const gchar *argv[6];
++        const gchar *argv[5];
+         User *user;
+ 
+         pwent = getpwuid (ud->uid);
+@@ -1307,19 +1371,16 @@ daemon_delete_user_authorized_cb (Daemon              
+ 
+         user_set_saved (user, FALSE);
+ 
+-        argv[0] = "/usr/sbin/userdel";
++        argv[0] = "/usr/sbin/pw";
++        argv[1] = "userdel";
+         if (ud->remove_files) {
+-                argv[1] = "-f";
+-                argv[2] = "-r";
+-                argv[3] = "--";
+-                argv[4] = pwent->pw_name;
+-                argv[5] = NULL;
++                argv[2] = pwent->pw_name;
++                argv[3] = "-r";
++                argv[4] = NULL;
+         }
+         else {
+-                argv[1] = "-f";
+-                argv[2] = "--";
+-                argv[3] = pwent->pw_name;
+-                argv[4] = NULL;
++                argv[2] = pwent->pw_name;
++                argv[3] = NULL;
+         }
+ 
+         if (!spawn_with_login_uid (context, argv, &error)) {
diff --git a/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user.c b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user.c
new file mode 100644
index 000000000000..f8b4dfae0ce7
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-src_libaccountsservice_act-user.c
@@ -0,0 +1,11 @@
+--- src/libaccountsservice/act-user.c.orig	2018-04-04 13:59:42 UTC
++++ src/libaccountsservice/act-user.c
+@@ -26,8 +26,6 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+-#include <crypt.h>
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
diff --git a/sysutils/accountsservice/files/patch-src_meson.build b/sysutils/accountsservice/files/patch-src_meson.build
new file mode 100644
index 000000000000..9687666febae
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-src_meson.build
@@ -0,0 +1,13 @@
+--- src/meson.build.orig	2018-09-29 12:54:53 UTC
++++ src/meson.build
+@@ -26,8 +26,8 @@ deps = [
+ cflags = [
+   '-DLOCALSTATEDIR="@0@"'.format(act_localstatedir),
+   '-DDATADIR="@0@"'.format(act_datadir),
+-  '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'icons')),
+-  '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'users')),
++  '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'icons')),
++  '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'users')),
+ ]
+ 
+ libaccounts_generated = static_library(
diff --git a/sysutils/accountsservice/files/patch-src_user.c b/sysutils/accountsservice/files/patch-src_user.c
index 9a5dd9a588af..bf8b2708e969 100644
--- a/sysutils/accountsservice/files/patch-src_user.c
+++ b/sysutils/accountsservice/files/patch-src_user.c
@@ -1,93 +1,155 @@
---- src/user.c.orig	2014-03-15 15:16:49.000000000 +0100
-+++ src/user.c	2014-03-15 15:31:57.000000000 +0100
-@@ -873,11 +873,11 @@
-                          "change real name of user '%s' (%d) to '%s'",
-                          user->user_name, user->uid, name);
+--- src/user.c.orig	2018-04-20 20:52:07 UTC
++++ src/user.c
+@@ -138,9 +138,14 @@ user_reset_icon_file (User *user)
+ }
+ 
+ void
++#ifdef HAVE_SHADOW_H
+ user_update_from_pwent (User          *user,
+                         struct passwd *pwent,
+                         struct spwd   *spent)
++#else
++user_update_from_pwent (User          *user,
++                        struct passwd *pwent)
++#endif
+ {
+         g_autofree gchar *real_name = NULL;
+         gboolean is_system_account;
+@@ -199,8 +204,10 @@ user_update_from_pwent (User          *user,
+         accounts_user_set_shell (ACCOUNTS_USER (user), pwent->pw_shell);
+ 
+         passwd = NULL;
++#ifdef HAVE_SHADOW_H
+         if (spent)
+                 passwd = spent->sp_pwdp;
++#endif
+ 
+         if (passwd && passwd[0] == '!') {
+                 locked = TRUE;
+@@ -218,6 +225,7 @@ user_update_from_pwent (User          *user,
+                 mode = PASSWORD_MODE_NONE;
+         }
+ 
++#ifdef HAVE_SHADOW_H
+         if (spent) {
+                 if (spent->sp_lstchg == 0) {
+                         mode = PASSWORD_MODE_SET_AT_LOGIN;
+@@ -231,6 +239,9 @@ user_update_from_pwent (User          *user,
+                 user->days_after_expiration_until_lock = spent->sp_inact;
+                 user->account_expiration_policy_known = TRUE;
+         }
++#else
++        user->expiration_time = pwent->pw_expire;
++#endif
+ 
+         accounts_user_set_password_mode (ACCOUNTS_USER (user), mode);
+         is_system_account = !user_classify_is_human (accounts_user_get_uid (ACCOUNTS_USER (user)),
+@@ -813,11 +824,11 @@ user_change_real_name_authorized_cb (Daemon           
+                          accounts_user_get_uid (ACCOUNTS_USER (user)),
+                          name);
  
 -                argv[0] = "/usr/sbin/usermod";
 -                argv[1] = "-c";
 -                argv[2] = name;
 -                argv[3] = "--";
--                argv[4] = user->user_name;
+-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[0] = "/usr/sbin/pw";
 +                argv[1] = "usermod";
-+                argv[2] = user->user_name;
++                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[3] = "-c";
 +                argv[4] = name;
                  argv[5] = NULL;
  
-                 error = NULL;
-@@ -947,11 +947,11 @@
-                          "change name of user '%s' (%d) to '%s'",
-                          old_name, user->uid, name);
+                 if (!spawn_with_login_uid (context, argv, &error)) {
+@@ -882,11 +893,11 @@ user_change_user_name_authorized_cb (Daemon           
+                          accounts_user_get_uid (ACCOUNTS_USER (user)),
+                          name);
  
 -                argv[0] = "/usr/sbin/usermod";
 -                argv[1] = "-l";
 -                argv[2] = name;
 -                argv[3] = "--";
--                argv[4] = user->user_name;
+-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[0] = "/usr/sbin/pw";
 +                argv[1] = "usermod";
-+                argv[2] = user->user_name;
++                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[3] = "-n";
 +                argv[4] = name;
                  argv[5] = NULL;
  
-                 error = NULL;
-@@ -1229,13 +1229,12 @@
-                          "change home directory of user '%s' (%d) to '%s'",
-                          user->user_name, user->uid, home_dir);
+                 if (!spawn_with_login_uid (context, argv, &error)) {
+@@ -1183,7 +1194,7 @@ user_change_home_dir_authorized_cb (Daemon            
+ {
+         gchar *home_dir = data;
+         g_autoptr(GError) error = NULL;
+-        const gchar *argv[7];
++        const gchar *argv[6];
+ 
+         if (g_strcmp0 (accounts_user_get_home_directory (ACCOUNTS_USER (user)), home_dir) != 0) {
+                 sys_log (context,
+@@ -1192,13 +1203,12 @@ user_change_home_dir_authorized_cb (Daemon            
+                          accounts_user_get_uid (ACCOUNTS_USER (user)),
+                          home_dir);
  
 -                argv[0] = "/usr/sbin/usermod";
 -                argv[1] = "-m";
 -                argv[2] = "-d";
 -                argv[3] = home_dir;
 -                argv[4] = "--";
--                argv[5] = user->user_name;
+-                argv[5] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 -                argv[6] = NULL;
 +                argv[0] = "/usr/sbin/pw";
 +                argv[1] = "-d";
 +                argv[2] = home_dir;
 +                argv[3] = "-n";
-+                argv[4] = user->user_name;
++                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[5] = NULL;
  
-                 error = NULL;
                  if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1291,11 +1290,11 @@
-                          "change shell of user '%s' (%d) to '%s'",
-                          user->user_name, user->uid, shell);
+                         throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
+@@ -1249,11 +1259,11 @@ user_change_shell_authorized_cb (Daemon               
+                          accounts_user_get_uid (ACCOUNTS_USER (user)),
+                          shell);
  
 -                argv[0] = "/usr/sbin/usermod";
 -                argv[1] = "-s";
 -                argv[2] = shell;
 -                argv[3] = "--";
--                argv[4] = user->user_name;
+-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[0] = "/usr/sbin/pw";
 +                argv[1] = "usermod";
-+                argv[2] = user->user_name;
++                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[3] = "-s";
 +                argv[4] = shell;
                  argv[5] = NULL;
  
-                 error = NULL;
-@@ -1551,11 +1550,10 @@
+                 if (!spawn_with_login_uid (context, argv, &error)) {
+@@ -1456,7 +1466,7 @@ user_change_locked_authorized_cb (Daemon              
+ {
+         gboolean locked = GPOINTER_TO_INT (data);
+         g_autoptr(GError) error = NULL;
+-        const gchar *argv[5];
++        const gchar *argv[4];
+ 
+         if (accounts_user_get_locked (ACCOUNTS_USER (user)) != locked) {
                  sys_log (context,
-                          "%s account of user '%s' (%d)",
-                          locked ? "locking" : "unlocking", user->user_name, user->uid);
+@@ -1464,11 +1474,10 @@ user_change_locked_authorized_cb (Daemon              
+                          locked ? "locking" : "unlocking",
+                          accounts_user_get_user_name (ACCOUNTS_USER (user)),
+                          accounts_user_get_uid (ACCOUNTS_USER (user)));
 -                argv[0] = "/usr/sbin/usermod";
 -                argv[1] = locked ? "-L" : "-U";
 -                argv[2] = "--";
--                argv[3] = user->user_name;
+-                argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 -                argv[4] = NULL;
 +                argv[0] = "/usr/sbin/pw";
 +                argv[1] = locked ? "lock" : "unlock";
-+                argv[2] = user->user_name;
++                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[3] = NULL;
  
-                 error = NULL;
                  if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1664,11 +1662,11 @@
+                         throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
+@@ -1589,11 +1598,11 @@ user_change_account_type_authorized_cb (Daemon        
  
                  g_free (groups);
  
@@ -95,29 +157,38 @@
 -                argv[1] = "-G";
 -                argv[2] = str->str;
 -                argv[3] = "--";
--                argv[4] = user->user_name;
+-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[0] = "/usr/sbin/pw";
 +                argv[1] = "usermod";
-+                argv[2] = user->user_name;
++                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                argv[3] = "-G";
 +                argv[4] = str->str;
                  argv[5] = NULL;
  
-                 g_string_free (str, FALSE);
-@@ -1735,10 +1733,8 @@
+                 if (!spawn_with_login_uid (context, argv, &error)) {
+@@ -1643,7 +1652,7 @@ user_change_password_mode_authorized_cb (Daemon       
+ {
+         PasswordMode mode = GPOINTER_TO_INT (data);
+         g_autoptr(GError) error = NULL;
+-        const gchar *argv[6];
++        const gchar *argv[5];
+ 
+         if (((PasswordMode) accounts_user_get_password_mode (ACCOUNTS_USER (user))) != mode) {
+                 sys_log (context,
+@@ -1658,10 +1667,8 @@ user_change_password_mode_authorized_cb (Daemon       
                      mode == PASSWORD_MODE_NONE) {
  
                          argv[0] = "/usr/bin/passwd";
 -                        argv[1] = "-d";
 -                        argv[2] = "--";
--                        argv[3] = user->user_name;
+-                        argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 -                        argv[4] = NULL;
-+                        argv[1] = user->user_name;
++                        argv[1] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                        argv[2] = NULL;
  
-                         error = NULL;
                          if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1748,12 +1744,11 @@
+                                 throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
+@@ -1669,12 +1676,11 @@ user_change_password_mode_authorized_cb (Daemon       
                          }
  
                          if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
@@ -127,42 +198,51 @@
 +                                argv[1] = "-e";
                                  argv[2] = "0";
 -                                argv[3] = "--";
--                                argv[4] = user->user_name;
+-                                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 -                                argv[5] = NULL;
-+                                argv[3] = user->user_name;
++                                argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                                argv[4] = NULL;
  
-                                 error = NULL;
                                  if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1777,11 +1772,10 @@
-                         }
+                                         throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
+@@ -1690,11 +1696,10 @@ user_change_password_mode_authorized_cb (Daemon       
+                         accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
                  }
-                 else if (user->locked) {
+                 else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
 -                        argv[0] = "/usr/sbin/usermod";
 -                        argv[1] = "-U";
 -                        argv[2] = "--";
--                        argv[3] = user->user_name;
+-                        argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 -                        argv[4] = NULL;
 +                        argv[0] = "/usr/sbin/pw";
 +                        argv[1] = "unlock";
-+                        argv[2] = user->user_name;
++                        argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +                        argv[3] = NULL;
  
-                         error = NULL;
                          if (!spawn_with_login_uid (context, argv, &error)) {
-@@ -1852,12 +1846,11 @@
+                                 throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
+@@ -1759,7 +1764,7 @@ user_change_password_authorized_cb (Daemon            
+ {
+         gchar **strings = data;
+         g_autoptr(GError) error = NULL;
+-        const gchar *argv[6];
++        const gchar *argv[5];
+ 
+         sys_log (context,
+                  "set password and hint of user '%s' (%d)",
+@@ -1768,12 +1773,11 @@ user_change_password_authorized_cb (Daemon            
  
          g_object_freeze_notify (G_OBJECT (user));
  
 -        argv[0] = "/usr/sbin/usermod";
-+        argv[0] = "/usr/bin/chpass";
++        argv[0] = "/usr/sbin/chpass";
          argv[1] = "-p";
          argv[2] = strings[0];
 -        argv[3] = "--";
--        argv[4] = user->user_name;
+-        argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 -        argv[5] = NULL;
-+        argv[3] = user->user_name;
++        argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 +        argv[4] = NULL;
  
-         error = NULL;
          if (!spawn_with_login_uid (context, argv, &error)) {
+                 throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
diff --git a/sysutils/accountsservice/files/patch-src_user.h b/sysutils/accountsservice/files/patch-src_user.h
new file mode 100644
index 000000000000..fa8454f7518c
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-src_user.h
@@ -0,0 +1,27 @@
+--- src/user.h.orig	2016-09-06 17:31:50 UTC
++++ src/user.h
+@@ -22,7 +22,9 @@
+ 
+ #include <sys/types.h>
+ #include <pwd.h>
++#ifdef HAVE_SHADOW_H
+ #include <shadow.h>
++#endif
+ 
+ #include <glib.h>
+ #include <gio/gio.h>
+@@ -54,9 +56,14 @@ GType          user_get_type                (void) G_G
+ User *         user_new                     (Daemon        *daemon,
+                                              uid_t          uid);
+ 
++#ifdef HAVE_SHADOW_H
+ void           user_update_from_pwent       (User          *user,
+                                              struct passwd *pwent,
+                                              struct spwd   *spent);
++#else
++void           user_update_from_pwent       (User          *user,
++                                             struct passwd *pwent);
++#endif
+ void           user_update_from_keyfile     (User          *user,
+                                              GKeyFile      *keyfile);
+ void           user_update_local_account_property (User          *user,
diff --git a/sysutils/accountsservice/files/patch-src_wtmp-helper.h b/sysutils/accountsservice/files/patch-src_wtmp-helper.h
new file mode 100644
index 000000000000..ab14253510ac
--- /dev/null
+++ b/sysutils/accountsservice/files/patch-src_wtmp-helper.h
@@ -0,0 +1,10 @@
+--- src/wtmp-helper.h.orig	2016-09-06 19:48:50 UTC
++++ src/wtmp-helper.h
+@@ -23,7 +23,6 @@
+ 
+ #include <glib.h>
+ #include <pwd.h>
+-#include <shadow.h>
+ 
+ const gchar *           wtmp_helper_get_path_for_monitor                (void);
+ void                    wtmp_helper_update_login_frequencies            (GHashTable *users);
diff --git a/sysutils/accountsservice/pkg-descr b/sysutils/accountsservice/pkg-descr
index afd9fd7e3dac..f18aadd89c52 100644
--- a/sysutils/accountsservice/pkg-descr
+++ b/sysutils/accountsservice/pkg-descr
@@ -3,7 +3,7 @@ The AccountsService project provides
  o  A set of D-Bus interfaces for querying and manipulating
     user account information.
 
- o  An implementation of these interfaces based on the usermod(8),
-    useradd(8) and userdel(8) commands.
+ o  An implementation of these interfaces based on the pw(8)
+    command.
 
-WWW: https://cgit.freedesktop.org/accountsservice/
+WWW: https://gitlab.freedesktop.org/accountsservice/accountsservice
diff --git a/sysutils/accountsservice/pkg-install b/sysutils/accountsservice/pkg-install
deleted file mode 100644
index 65319d21350f..000000000000
--- a/sysutils/accountsservice/pkg-install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	/bin/mkdir -p /var/db/AccountsService/users/
-	/bin/mkdir -p /var/db/AccountsService/icons/
-	exit 0
-	;;
-esac
diff --git a/sysutils/accountsservice/pkg-plist b/sysutils/accountsservice/pkg-plist
index cb362dad0f43..c9b64a57e942 100644
--- a/sysutils/accountsservice/pkg-plist
+++ b/sysutils/accountsservice/pkg-plist
@@ -4,7 +4,6 @@ include/accountsservice-1.0/act/act-user-manager.h
 include/accountsservice-1.0/act/act-user.h
 include/accountsservice-1.0/act/act.h
 lib/girepository-1.0/AccountsService-1.0.typelib
-lib/libaccountsservice.a
 lib/libaccountsservice.so
 lib/libaccountsservice.so.0
 lib/libaccountsservice.so.0.0.0
@@ -14,40 +13,38 @@ share/dbus-1/interfaces/org.freedesktop.Accounts.User.xml
 share/dbus-1/interfaces/org.freedesktop.Accounts.xml
 share/dbus-1/system-services/org.freedesktop.Accounts.service
 share/gir-1.0/AccountsService-1.0.gir
-share/gtk-doc/html/libaccountsservice/ActUser.html
-share/gtk-doc/html/libaccountsservice/ActUserManager.html
-share/gtk-doc/html/libaccountsservice/annotation-glossary.html
-share/gtk-doc/html/libaccountsservice/api-index-full.html
-share/gtk-doc/html/libaccountsservice/ch01.html
-share/gtk-doc/html/libaccountsservice/home.png
-share/gtk-doc/html/libaccountsservice/index.html
-share/gtk-doc/html/libaccountsservice/left-insensitive.png
-share/gtk-doc/html/libaccountsservice/left.png
-share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2
-share/gtk-doc/html/libaccountsservice/right-insensitive.png
-share/gtk-doc/html/libaccountsservice/right.png
-share/gtk-doc/html/libaccountsservice/style.css
-share/gtk-doc/html/libaccountsservice/up-insensitive.png
-share/gtk-doc/html/libaccountsservice/up.png
+share/locale/af/LC_MESSAGES/accounts-service.mo
 share/locale/ar/LC_MESSAGES/accounts-service.mo
-share/locale/bg_BG/LC_MESSAGES/accounts-service.mo
+share/locale/as/LC_MESSAGES/accounts-service.mo
+share/locale/ast/LC_MESSAGES/accounts-service.mo
+share/locale/az/LC_MESSAGES/accounts-service.mo
+share/locale/be/LC_MESSAGES/accounts-service.mo
+share/locale/bg/LC_MESSAGES/accounts-service.mo
 share/locale/bn_IN/LC_MESSAGES/accounts-service.mo
 share/locale/ca/LC_MESSAGES/accounts-service.mo
 share/locale/ca@valencia/LC_MESSAGES/accounts-service.mo
 share/locale/cs/LC_MESSAGES/accounts-service.mo
+share/locale/cy/LC_MESSAGES/accounts-service.mo
 share/locale/da/LC_MESSAGES/accounts-service.mo
 share/locale/de/LC_MESSAGES/accounts-service.mo
 share/locale/el/LC_MESSAGES/accounts-service.mo
+share/locale/en/LC_MESSAGES/accounts-service.mo
 share/locale/en_GB/LC_MESSAGES/accounts-service.mo
 share/locale/eo/LC_MESSAGES/accounts-service.mo
 share/locale/es/LC_MESSAGES/accounts-service.mo
-share/locale/fa_IR/LC_MESSAGES/accounts-service.mo
+share/locale/et/LC_MESSAGES/accounts-service.mo
+share/locale/eu/LC_MESSAGES/accounts-service.mo
+share/locale/fa/LC_MESSAGES/accounts-service.mo
 share/locale/fi/LC_MESSAGES/accounts-service.mo
+share/locale/fo/LC_MESSAGES/accounts-service.mo
 share/locale/fr/LC_MESSAGES/accounts-service.mo
+share/locale/fur/LC_MESSAGES/accounts-service.mo
 share/locale/ga/LC_MESSAGES/accounts-service.mo
 share/locale/gl/LC_MESSAGES/accounts-service.mo
+share/locale/gu/LC_MESSAGES/accounts-service.mo
 share/locale/he/LC_MESSAGES/accounts-service.mo
 share/locale/hi/LC_MESSAGES/accounts-service.mo
+share/locale/hr/LC_MESSAGES/accounts-service.mo
 share/locale/hu/LC_MESSAGES/accounts-service.mo
 share/locale/ia/LC_MESSAGES/accounts-service.mo
 share/locale/id/LC_MESSAGES/accounts-service.mo
@@ -55,28 +52,42 @@ share/locale/it/LC_MESSAGES/accounts-service.mo
 share/locale/ja/LC_MESSAGES/accounts-service.mo
 share/locale/ka/LC_MESSAGES/accounts-service.mo
 share/locale/kk/LC_MESSAGES/accounts-service.mo
+share/locale/kn/LC_MESSAGES/accounts-service.mo
 share/locale/ko/LC_MESSAGES/accounts-service.mo
+share/locale/ky/LC_MESSAGES/accounts-service.mo
 share/locale/lt/LC_MESSAGES/accounts-service.mo
 share/locale/lv/LC_MESSAGES/accounts-service.mo
+share/locale/ml/LC_MESSAGES/accounts-service.mo
+share/locale/mr/LC_MESSAGES/accounts-service.mo
+share/locale/ms/LC_MESSAGES/accounts-service.mo
+share/locale/nb/LC_MESSAGES/accounts-service.mo
 share/locale/nl/LC_MESSAGES/accounts-service.mo
+share/locale/nn/LC_MESSAGES/accounts-service.mo
+share/locale/oc/LC_MESSAGES/accounts-service.mo
+share/locale/or/LC_MESSAGES/accounts-service.mo
 share/locale/pa/LC_MESSAGES/accounts-service.mo
 share/locale/pl/LC_MESSAGES/accounts-service.mo
+share/locale/pt/LC_MESSAGES/accounts-service.mo
 share/locale/pt_BR/LC_MESSAGES/accounts-service.mo
 share/locale/ro/LC_MESSAGES/accounts-service.mo
 share/locale/ru/LC_MESSAGES/accounts-service.mo
 share/locale/sk/LC_MESSAGES/accounts-service.mo
 share/locale/sl/LC_MESSAGES/accounts-service.mo
+share/locale/sq/LC_MESSAGES/accounts-service.mo
 share/locale/sr/LC_MESSAGES/accounts-service.mo
 share/locale/sr@latin/LC_MESSAGES/accounts-service.mo
 share/locale/sv/LC_MESSAGES/accounts-service.mo
+share/locale/ta/LC_MESSAGES/accounts-service.mo
 share/locale/te/LC_MESSAGES/accounts-service.mo
+share/locale/th/LC_MESSAGES/accounts-service.mo
 share/locale/tr/LC_MESSAGES/accounts-service.mo
 share/locale/uk/LC_MESSAGES/accounts-service.mo
 share/locale/vi/LC_MESSAGES/accounts-service.mo
 share/locale/wa/LC_MESSAGES/accounts-service.mo
 share/locale/zh_CN/LC_MESSAGES/accounts-service.mo
+share/locale/zh_HK/LC_MESSAGES/accounts-service.mo
 share/locale/zh_TW/LC_MESSAGES/accounts-service.mo
 share/polkit-1/actions/org.freedesktop.accounts.policy
-@dir /var/db/AccountsService/icons
-@dir /var/db/AccountsService/users
+@dir(,,0775) /var/db/AccountsService/icons
+@dir(,,0700) /var/db/AccountsService/users
 @dir /var/db/AccountsService
diff --git a/sysutils/acerhdf-kmod/Makefile b/sysutils/acerhdf-kmod/Makefile
index f3098ee6af9c..816702fd65b0 100644
--- a/sysutils/acerhdf-kmod/Makefile
+++ b/sysutils/acerhdf-kmod/Makefile
@@ -1,28 +1,22 @@
-# Created by: Tobias Kortkamp <tobias.kortkamp@gmail.com>
-# $FreeBSD$
-
 PORTNAME=	acerhdf-kmod
-PORTVERSION=	0.1.2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.3
 CATEGORIES=	sysutils
 
-MAINTAINER=	tobik@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Acer Aspire One fan control
 
 LICENSE=	GPLv2
 
-USES=		kmod uidfix
-KMODNAME=	acerhdf
-MANDIR=		${PREFIX}/man/man4
+ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS_REASON=	specific to one machine
 
+USES=		kmod uidfix
 USE_GITHUB=	yes
-GH_PROJECT=	kmod-acerhdf
 GH_ACCOUNT=	t6
-
-ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	specific to one machine
+GH_PROJECT=	kmod-acerhdf
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/${KMODNAME}.4 ${STAGEDIR}${MANDIR}
+	${INSTALL_MAN} ${WRKSRC}/acerhdf.4 ${STAGEDIR}${PREFIX}/man/man4
 
 .include <bsd.port.mk>
diff --git a/sysutils/acerhdf-kmod/distinfo b/sysutils/acerhdf-kmod/distinfo
index 7d182de5a8e8..45de7beac5ff 100644
--- a/sysutils/acerhdf-kmod/distinfo
+++ b/sysutils/acerhdf-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482387804
-SHA256 (t6-kmod-acerhdf-v0.1.2_GH0.tar.gz) = 35dbe9192ca4e2292a35ec63b1b64e1fcf8f0116cc987e0cd6074b41431aa9d4
-SIZE (t6-kmod-acerhdf-v0.1.2_GH0.tar.gz) = 8596
+TIMESTAMP = 1570257585
+SHA256 (t6-kmod-acerhdf-v0.1.3_GH0.tar.gz) = e8dc8ec6bf4fe706a45eaca92cb93cede328af1c86a11e666c188d4c66b6eb76
+SIZE (t6-kmod-acerhdf-v0.1.3_GH0.tar.gz) = 8610
diff --git a/sysutils/acfgfs/Makefile b/sysutils/acfgfs/Makefile
new file mode 100644
index 000000000000..0074be378473
--- /dev/null
+++ b/sysutils/acfgfs/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	acfgfs
+DISTVERSION=	0.6.0.1
+CATEGORIES=	sysutils
+
+MAINTAINER=	jbeich@FreeBSD.org
+COMMENT=	FUSE file system driver for Arcan window managers
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC:H:H:H}/data/distr/LICENSE.BSD
+
+LIB_DEPENDS=	libarcan_shmif_ext.so:multimedia/arcan
+
+USES=		cmake compiler:c11 fuse:3 pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	letoram
+GH_PROJECT=	arcan
+WRKSRC_SUBDIR=	src/tools/${PORTNAME}
+PLIST_FILES=	bin/arcan_cfgfs \
+		man/man1/arcan_cfgfs.1.gz
+
+.include <bsd.port.mk>
diff --git a/sysutils/acfgfs/distinfo b/sysutils/acfgfs/distinfo
new file mode 100644
index 000000000000..7199c6fdbd5a
--- /dev/null
+++ b/sysutils/acfgfs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1608068926
+SHA256 (letoram-arcan-0.6.0.1_GH0.tar.gz) = 7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+SIZE (letoram-arcan-0.6.0.1_GH0.tar.gz) = 11223434
diff --git a/sysutils/acfgfs/pkg-descr b/sysutils/acfgfs/pkg-descr
new file mode 100644
index 000000000000..97953404f9ab
--- /dev/null
+++ b/sysutils/acfgfs/pkg-descr
@@ -0,0 +1,4 @@
+Acfgfs is a tool that lets you mount certain arcan applications as a FUSE
+file-system. The application has to explicitly support it (e.g., Durden).
+
+WWW: https://arcan-fe.com/
diff --git a/sysutils/acltool/Makefile b/sysutils/acltool/Makefile
new file mode 100644
index 000000000000..60593e2584a1
--- /dev/null
+++ b/sysutils/acltool/Makefile
@@ -0,0 +1,37 @@
+PORTNAME=		acltool
+DISTVERSIONPREFIX=	v
+DISTVERSION=		1.16.2
+CATEGORIES=		sysutils security
+
+MAINTAINER=		pen@lysator.liu.se
+COMMENT=		ACL manipulation tool
+
+LICENSE=		BSD3CLAUSE
+LICENSE_FILE=		${WRKSRC}/LICENSE
+
+OPTIONS_DEFINE=		SAMBA
+
+OPTIONS_RADIO=		LINE_EDITOR
+OPTIONS_RADIO_LINE_EDITOR=	READLINE LIBEDIT
+OPTIONS_DEFAULT=	READLINE
+
+SAMBA_USES=		samba
+SAMBA_DESC=		Build with Samba (libsmbclient) for SMB support
+
+READLINE_USES=		readline
+READLINE_DESC=		Build with GNU Readline for interactive editing
+
+LIBEDIT_USES=		libedit
+LIBEDIT_DESC=		Build with BSD Libedit for interactive editing
+
+SAMBA_CONFIGURE_WITH=	libsmbclient
+READLINE_CONFIGURE_WITH=	readline
+LIBEDIT_CONFIGURE_WITH=	libedit
+
+USE_GITHUB=		yes
+GH_ACCOUNT=		ptrrkssn
+
+GNU_CONFIGURE=		yes
+INSTALL_TARGET=		install-strip
+
+.include <bsd.port.mk>
diff --git a/sysutils/acltool/distinfo b/sysutils/acltool/distinfo
new file mode 100644
index 000000000000..2620bd1eadf2
--- /dev/null
+++ b/sysutils/acltool/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1592575611
+SHA256 (ptrrkssn-acltool-v1.16.2_GH0.tar.gz) = d54011efb3d5cc24aedad88e3684d1c9dea218515bb1f18d9caac33f8bbae501
+SIZE (ptrrkssn-acltool-v1.16.2_GH0.tar.gz) = 146485
diff --git a/sysutils/acltool/pkg-descr b/sysutils/acltool/pkg-descr
new file mode 100644
index 000000000000..dd1e905899c2
--- /dev/null
+++ b/sysutils/acltool/pkg-descr
@@ -0,0 +1,10 @@
+This is a port of acltool, an NFSv4/ZFS ACL utiltity.
+
+This is a tool to manage NFSv4/ZFS (also known as Extended on MacOS) ACLs.
+That is listing, creating, editing, searching, stripping, sorting and
+removing redundant entries and more.
+
+WWW: https://github.com/ptrrkssn/acltool
+
+- Peter Eriksson
+pen@lysator.liu.se
diff --git a/sysutils/acltool/pkg-plist b/sysutils/acltool/pkg-plist
new file mode 100644
index 000000000000..325a922853c9
--- /dev/null
+++ b/sysutils/acltool/pkg-plist
@@ -0,0 +1,8 @@
+bin/acltool
+bin/edac
+bin/lac
+bin/sac
+man/man1/acltool.1.gz
+man/man1/edac.1.gz
+man/man1/lac.1.gz
+man/man1/sac.1.gz
diff --git a/sysutils/acpi_call/Makefile b/sysutils/acpi_call/Makefile
index 478f1b521ddd..104071b60f67 100644
--- a/sysutils/acpi_call/Makefile
+++ b/sysutils/acpi_call/Makefile
@@ -1,5 +1,4 @@
 # Created by: Maxim Ignatenko <gelraen.ua@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	acpi_call
 PORTVERSION=	1.0.1
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 2ba035be1ea8..63fe4429ff34 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,8 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	acpica
-PORTVERSION=	20190816
-PORTREVISION=	1
+PORTVERSION=	20210331
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
@@ -15,19 +12,20 @@ COMMENT=	Tools from the ACPI Component Architecture (ACPICA) project
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
-BROKEN_powerpc64=	fails to compile: comparison is always true due to limited range of data type
+BROKEN_FreeBSD_11_powerpc64=	fails to compile on powerpc64 elfv1: comparison is always true due to limited range of data type
+BROKEN_FreeBSD_12_powerpc64=	fails to compile on powerpc64 elfv1: comparison is always true due to limited range of data type
 
-USES=		bison gmake
+USES=		gmake
 
 BUILD_WRKSRC=	${WRKSRC}/generate/unix
 
-ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpinames acpisrc
+ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpisrc
 ACPICA_TOOLS+=	acpixtract iasl
 
 PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 
 MAKE_ARGS=	HOST=_FreeBSD PROGS="${ACPICA_TOOLS}"
-MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${LOCALBASE}/bin/bison"
+MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
 
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index e2aa35dc3b85..db15912ba43c 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565969994
-SHA256 (acpica-unix-20190816.tar.gz) = 7aec4dc88a3ba148eecd898e59fb5378573eb6a94585e5538e0b396840d0fc5c
-SIZE (acpica-unix-20190816.tar.gz) = 1856681
+TIMESTAMP = 1617327278
+SHA256 (acpica-unix-20210331.tar.gz) = b49237a2c3df58b57310612ec3a6ebee69e1a525b5efeec7152faf32a03b7068
+SIZE (acpica-unix-20210331.tar.gz) = 1872642
diff --git a/sysutils/acpica-tools/files/patch-source_common_dmtables.c b/sysutils/acpica-tools/files/patch-source_common_dmtables.c
deleted file mode 100644
index 58ec0a75042e..000000000000
--- a/sysutils/acpica-tools/files/patch-source_common_dmtables.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/common/dmtables.c.orig	2019-08-16 15:01:10 UTC
-+++ source/common/dmtables.c
-@@ -327,7 +327,7 @@ AdCreateTableHeader (
-      * makes it easier to rename the disassembled ASL file if needed.
-      */
-     AcpiOsPrintf (
--        "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-+        "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-         Table->Signature, Table->Revision,
-         Table->OemId, Table->OemTableId, Table->OemRevision);
- }
diff --git a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c b/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
deleted file mode 100644
index adc056b30213..000000000000
--- a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- source/components/namespace/nsdump.c.orig	2019-08-16 15:01:13 UTC
-+++ source/components/namespace/nsdump.c
-@@ -478,7 +478,7 @@ AcpiNsDumpOneObject (
-                     AcpiOsPrintf (" =");
-                     for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++)
-                     {
--                        AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]);
-+                        AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
-                     }
-                 }
-                 AcpiOsPrintf ("\n");
-@@ -575,7 +575,7 @@ AcpiNsDumpOneObject (
-         case ACPI_TYPE_LOCAL_BANK_FIELD:
-         case ACPI_TYPE_LOCAL_INDEX_FIELD:
- 
--            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n",
-+            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n",
-                 (ObjDesc->CommonField.BaseByteOffset * 8)
-                     + ObjDesc->CommonField.StartFieldBitOffset,
-                 ObjDesc->CommonField.BitLength,
diff --git a/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c b/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
deleted file mode 100644
index e576e27d7be1..000000000000
--- a/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/components/utilities/uttrack.c.orig	2019-08-16 15:01:14 UTC
-+++ source/components/utilities/uttrack.c
-@@ -864,7 +864,7 @@ AcpiUtDumpAllocations (
- 
-                     case ACPI_DESC_TYPE_PARSER:
- 
--                        AcpiOsPrintf ("AmlOpcode 0x%04hX\n",
-+                        AcpiOsPrintf ("AmlOpcode 0x%04X\n",
-                             Descriptor->Op.Asl.AmlOpcode);
-                         break;
- 
diff --git a/sysutils/acts/Makefile b/sysutils/acts/Makefile
index bbdb0f0728c0..25de2d362f99 100644
--- a/sysutils/acts/Makefile
+++ b/sysutils/acts/Makefile
@@ -1,8 +1,7 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	acts
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils archivers
 
diff --git a/sysutils/acts/distinfo b/sysutils/acts/distinfo
index e00fa106fd5a..5457d67d3ae6 100644
--- a/sysutils/acts/distinfo
+++ b/sysutils/acts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566756076
-SHA256 (alexjurkiewicz-acts-v1.4.1_GH0.tar.gz) = 0c557a84ce2adecee96e3888f037ee2279a9546ee7f41bb87924c42f0ad8133c
-SIZE (alexjurkiewicz-acts-v1.4.1_GH0.tar.gz) = 8291
+TIMESTAMP = 1612287743
+SHA256 (alexjurkiewicz-acts-v1.4.2_GH0.tar.gz) = b0c3f4a02eb290bbf4fd7724daf81ed05f3d051a35da0f76a0761911811c19f9
+SIZE (alexjurkiewicz-acts-v1.4.2_GH0.tar.gz) = 8642
diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index 14c362ca4a1a..b9aedd47d0f6 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -1,5 +1,4 @@
 # Created by: joseph@randomnetworks.com
-# $FreeBSD$
 
 PORTNAME=	adtool
 PORTVERSION=	1.3.3
diff --git a/sysutils/adtool/files/patch-src_lib_active__directory.h b/sysutils/adtool/files/patch-src_lib_active__directory.h
new file mode 100644
index 000000000000..dee46a283e2b
--- /dev/null
+++ b/sysutils/adtool/files/patch-src_lib_active__directory.h
@@ -0,0 +1,19 @@
+--- src/lib/active_directory.h.orig	2020-08-27 17:21:27 UTC
++++ src/lib/active_directory.h
+@@ -28,11 +28,11 @@ searchbase ou=users,dc=example,dc=com
+ | if there is a problem reading the config file, or
+ |	AD_SERVER_CONNECT_FAILURE if a connection can't be made.
+ */
+-char *system_config_file;
+-char *uri;
+-char *binddn;
+-char *bindpw;
+-char *search_base;
++extern char *system_config_file;
++extern char *uri;
++extern char *binddn;
++extern char *bindpw;
++extern char *search_base;
+ 
+ /* ad_get_error() returns a pointer to a string containing an
+ | explanation of the last error that occured.
diff --git a/sysutils/afbinit/Makefile b/sysutils/afbinit/Makefile
index 69b90490be46..04af7384e94e 100644
--- a/sysutils/afbinit/Makefile
+++ b/sysutils/afbinit/Makefile
@@ -1,5 +1,4 @@
 # Created by: marius@alchemy.franken.de
-# $FreeBSD$
 
 PORTNAME=		afbinit
 PORTVERSION=		1.0
diff --git a/sysutils/afbinit/files/afbinit.in b/sysutils/afbinit/files/afbinit.in
index 6e23c9799813..8207b9f7e9cb 100644
--- a/sysutils/afbinit/files/afbinit.in
+++ b/sysutils/afbinit/files/afbinit.in
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
 
 # PROVIDE: afbinit
 # REQUIRE: devfs
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index da73d55aa05e..27bf83322bac 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -1,5 +1,4 @@
 # Created by: Chris Calvey <chris@securityforensics.co.uk>
-# $FreeBSD$
 
 PORTNAME=	afflib
 PORTVERSION=	3.7.16
diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index b5e54c64e6e4..f789b3e2aedb 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -1,5 +1,4 @@
 # Created by: Juergen Lock <nox@jelal.hb.north.de>
-# $FreeBSD$
 
 PORTNAME=	afio
 PORTVERSION=	2.5.2
diff --git a/sysutils/agedu/Makefile b/sysutils/agedu/Makefile
index f045fd3a7431..e7172fe20657 100644
--- a/sysutils/agedu/Makefile
+++ b/sysutils/agedu/Makefile
@@ -1,9 +1,7 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	agedu
-PORTVERSION=	20190630
-DISTVERSIONSUFFIX=	.66cb14d
+PORTVERSION=	20200705.2a7d4a2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.chiark.greenend.org.uk/~sgtatham/agedu/ \
 		LOCAL/sunpoet
@@ -19,7 +17,4 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/agedu \
 		man/man1/agedu.1.gz
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|HOST_NAME_MAX|_POSIX_&|' ${WRKSRC}/httpd.c
-
 .include <bsd.port.mk>
diff --git a/sysutils/agedu/distinfo b/sysutils/agedu/distinfo
index f4b2bacc6955..15430e7c2763 100644
--- a/sysutils/agedu/distinfo
+++ b/sysutils/agedu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563385281
-SHA256 (agedu-20190630.66cb14d.tar.gz) = 717ee909bb9f737089857765713e39462db6169b99abd7587192e65b7554d5bb
-SIZE (agedu-20190630.66cb14d.tar.gz) = 180129
+TIMESTAMP = 1594457442
+SHA256 (agedu-20200705.2a7d4a2.tar.gz) = 432dd9602df326088956b3e4f5efe656ad09777873d38695e0d68810899941c2
+SIZE (agedu-20200705.2a7d4a2.tar.gz) = 181809
diff --git a/sysutils/agedu/files/patch-httpd.c b/sysutils/agedu/files/patch-httpd.c
new file mode 100644
index 000000000000..6c9b7c50a3c6
--- /dev/null
+++ b/sysutils/agedu/files/patch-httpd.c
@@ -0,0 +1,11 @@
+--- httpd.c.orig	2020-07-05 01:20:14 UTC
++++ httpd.c
+@@ -570,7 +570,7 @@ static int make_listening_sockets(struct listenfds *fd
+         portstr = NULL;                /* normalise NULL and empty string */
+ 
+     if (!address) {
+-        char hostname[HOST_NAME_MAX];
++        char hostname[_POSIX_HOST_NAME_MAX];
+         if (gethostname(hostname, sizeof(hostname)) < 0) {
+             perror("hostname");
+             return -1;
diff --git a/sysutils/ah-tty/Makefile b/sysutils/ah-tty/Makefile
index c573b22e5c5b..2be479e840aa 100644
--- a/sysutils/ah-tty/Makefile
+++ b/sysutils/ah-tty/Makefile
@@ -1,14 +1,13 @@
 # Created by: Michael L. Hostbaek <mich@freebsdcluster.org>
-# $FreeBSD$
 
 PORTNAME=	ah-tty
 PORTVERSION=	0.3.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	mich@FreeBSD.org
-COMMENT=	Ah-tty is an automatic helper for command prompts and shells
+COMMENT=	Automatic helper for command prompts and shells
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
diff --git a/sysutils/aimage/Makefile b/sysutils/aimage/Makefile
index 6650ab8abafd..33564e2c9aa5 100644
--- a/sysutils/aimage/Makefile
+++ b/sysutils/aimage/Makefile
@@ -1,5 +1,4 @@
 # Created by: Chris Calvey <chris@securityforensics.co.uk>
-# $FreeBSD$
 
 PORTNAME=	aimage
 PORTVERSION=	3.2.5
@@ -15,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libafflib.so:sysutils/afflib
 
-USES=		gmake readline ssl
+USES=		gmake readline ssl ncurses
 GNU_CONFIGURE=	yes
 # Pretend ssl3_new exists for LibreSSL.  It's never really used but
 # configure checks for it.
@@ -23,11 +22,4 @@ CONFIGURE_ARGS=	ac_cv_lib_ssl_ssl3_new=yes
 
 PLIST_FILES=	bin/aimage
 
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	error: field has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st')
-BROKEN_FreeBSD_13=	error: field has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st')
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/aimage/files/patch-src_hash__t.h b/sysutils/aimage/files/patch-src_hash__t.h
new file mode 100644
index 000000000000..4770a4a8e571
--- /dev/null
+++ b/sysutils/aimage/files/patch-src_hash__t.h
@@ -0,0 +1,47 @@
+--- src/hash_t.h.orig	2011-08-17 23:33:08 UTC
++++ src/hash_t.h
+@@ -160,7 +160,7 @@ typedef hash__<sha512_> sha512_t;
+ template<typename T> 
+ class hash_generator__:T { 			/* generates the hash */
+     const EVP_MD *md;
+-    EVP_MD_CTX mdctx;	     /* the context for computing the value */
++    EVP_MD_CTX *mdctx;	     /* the context for computing the value */
+     bool initialized;	       /* has the context been initialized? */
+     bool finalized;
+     /* Static function to determine if something is zero */
+@@ -189,8 +189,8 @@ class hash_generator__:T { 			/* generates the hash */
+     }
+     void init(){
+ 	if(initialized==false){
+-	    EVP_MD_CTX_init(&mdctx);
+-	    EVP_DigestInit_ex(&mdctx, md, NULL);
++	    mdctx = EVP_MD_CTX_create();
++	    EVP_DigestInit_ex(mdctx, md, NULL);
+ 	    initialized = true;
+ 	    finalized = false;
+ 	    hashed_bytes = 0;
+@@ -202,12 +202,13 @@ class hash_generator__:T { 			/* generates the hash */
+ 	    std::cerr << "hashgen_t::update called after finalized\n";
+ 	    exit(1);
+ 	}
+-	EVP_DigestUpdate(&mdctx,buf,bufsize);
++	EVP_DigestUpdate(mdctx,buf,bufsize);
+ 	hashed_bytes += bufsize;
+     }
+     void release(){			/* free allocated memory */
+ 	if(initialized){
+-	    EVP_MD_CTX_cleanup(&mdctx);
++	    EVP_MD_CTX_destroy(mdctx);
++	    mdctx = NULL;
+ 	    initialized = false;
+ 	    hashed_bytes = 0;
+ 	}
+@@ -223,7 +224,7 @@ class hash_generator__:T { 			/* generates the hash */
+ 	}
+ 	hash__<T> val;
+ 	unsigned int len = sizeof(val.digest);
+-	EVP_DigestFinal(&mdctx,val.digest,&len);
++	EVP_DigestFinal(mdctx,val.digest,&len);
+ 	finalized = true;
+ 	return val;
+     }
diff --git a/sysutils/aird/Makefile b/sysutils/aird/Makefile
index 42d6ca8a2b30..d8bb331c165e 100644
--- a/sysutils/aird/Makefile
+++ b/sysutils/aird/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	aird
 PORTVERSION=	1.0
 CATEGORIES=	sysutils
diff --git a/sysutils/aird/files/aird.in b/sysutils/aird/files/aird.in
index ecd1aa7455bd..9c6ed34779ce 100644
--- a/sysutils/aird/files/aird.in
+++ b/sysutils/aird/files/aird.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: aird
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/alfio/Makefile b/sysutils/alfio/Makefile
new file mode 100644
index 000000000000..8d5830a419ba
--- /dev/null
+++ b/sysutils/alfio/Makefile
@@ -0,0 +1,29 @@
+PORTNAME=	alfio
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.3
+CATEGORIES=	sysutils
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Services manager to choose which services start at boot time
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	lsalvadore
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+PLIST_FILES=	etc/rc.d/alfio \
+		man/man8/alfio.8.gz
+
+do-patch:
+	${REINPLACE_CMD} s,%%LOCALBASE%%,${LOCALBASE},g ${WRKSRC}/alfio
+	${REINPLACE_CMD} s,%%LOCALBASE%%,${LOCALBASE},g ${WRKSRC}/alfio.8
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/alfio ${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_MAN}	${WRKSRC}/alfio.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+
+.include <bsd.port.mk>
diff --git a/sysutils/alfio/distinfo b/sysutils/alfio/distinfo
new file mode 100644
index 000000000000..90d1deac98ee
--- /dev/null
+++ b/sysutils/alfio/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1579542527
+SHA256 (lsalvadore-alfio-v0.3_GH0.tar.gz) = 4ac6ded119c70ab82b5553e6a88c83eba0716f042f5cd98ac700c360e5fff512
+SIZE (lsalvadore-alfio-v0.3_GH0.tar.gz) = 3290
diff --git a/sysutils/alfio/pkg-descr b/sysutils/alfio/pkg-descr
new file mode 100644
index 000000000000..f19a1463df14
--- /dev/null
+++ b/sysutils/alfio/pkg-descr
@@ -0,0 +1,16 @@
+Alfio is a service that lets you choose which services start at boot
+time by using profiles.
+
+For example, if you have a laptop, you might be interested in creating
+a profile for when you have access to an internet connection and one
+for when you don't. You also might need less services when you boot
+your laptop on battery, then decide to save power.
+In some situation you might like to connect through DHCP while in
+others you need a static IP.
+Or you might want to test on your machine how different services
+interact with each other without messing with your safe
+configuration.
+
+Read the man page (man alfio) to learn how to use it.
+
+WWW: https://github.com/lsalvadore/alfio
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 1a43f34c2fa7..4eabeeffcb55 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -1,9 +1,8 @@
 # Created by: Jon Wilson <jon@phuq.co.uk>
-# $FreeBSD$
 
 PORTNAME=	am-utils
 PORTVERSION=	6.2
-PORTREVISION=	4
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
@@ -34,25 +33,24 @@ MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 
 INFO=		am-utils
-DOCS=		AUTHORS BUGS FAQ NEWS README.attrcache
+PORTDOCS=	AUTHORS BUGS FAQ NEWS README.attrcache
 
+OPENLDAP_USES=			localbase:ldflags
 OPENLDAP_USE=			OPENLDAP=yes
 OPENLDAP_CONFIGURE_WITH=	ldap
-OPENLDAP_CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
-				CPPFLAGS="-I${LOCALBASE}/include"
-OPENLDAP_VARS=			DOCS+="README.ldap ldap-id.txt ldap.schema"
+OPENLDAP_PORTDOCS=		README.ldap ldap-id.txt ldap.schema
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+.if !exists(/etc/rc.d/amd)
+USE_RC_SUBR=	amd
+.endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/am-utils/files/amd.in b/sysutils/am-utils/files/amd.in
new file mode 100644
index 000000000000..025aa012eed8
--- /dev/null
+++ b/sysutils/am-utils/files/amd.in
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Obtained from: FreeBSD: head/libexec/rc/rc.d/amd 298514 2016-04-23 16:10:54Z lme
+
+# PROVIDE: amd
+# REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig
+# BEFORE: DAEMON
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="amd"
+desc="Automatically mount filesystems"
+rcvar="amd_enable"
+command=%%PREFIX%%/sbin/${name}
+start_precmd="amd_precmd"
+command_args="&"
+extra_commands="reload"
+
+amd_precmd()
+{
+	force_depend nfsclient nfs_client || return 1
+	force_depend rpcbind || return 1
+
+	case ${amd_map_program} in
+	[Nn][Oo] | '')
+		;;
+	*)
+		rc_flags="${rc_flags} `echo $(eval ${amd_map_program})`"
+		;;
+	esac
+
+	case "${amd_flags}" in
+	'')
+		if [ ! -r /etc/amd.conf ]; then
+			warn 'amd will not load without arguments'
+			return 1
+		fi
+		;;
+	*)
+		rc_flags="-p ${rc_flags}"
+		command_args="> /var/run/amd.pid 2> /dev/null"
+		;;
+	esac
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/sysutils/am-utils/pkg-plist b/sysutils/am-utils/pkg-plist
index d24a60ed622e..944ee5b38dfd 100644
--- a/sysutils/am-utils/pkg-plist
+++ b/sysutils/am-utils/pkg-plist
@@ -35,11 +35,3 @@ sbin/sun2amd
 sbin/wait4amd
 sbin/wait4amd2die
 sbin/wire-test
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README.attrcache
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema
diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile
index 7395eaaee04d..703a5ba153ad 100644
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	amazon-ssm-agent
-PORTVERSION=	2.3.612.0
+PORTVERSION=	2.3.1205.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	cperciva@FreeBSD.org
@@ -18,6 +16,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 GH_SUBDIR=	src/github.com/aws/amazon-ssm-agent
 
+GO_BUILDFLAGS=	-ldflags "-s -w"
+GO_TARGET=	./agent:${PREFIX}/sbin/amazon-ssm-agent \
+		./agent/framework/processor/executer/outofproc/worker:${PREFIX}/sbin/ssm-document-worker \
+		./agent/framework/processor/executer/outofproc/sessionworker:${PREFIX}/sbin/ssm-session-worker \
+		./agent/session/logging:${PREFIX}/sbin/ssm-session-logger \
+		./agent/cli-main:${PREFIX}/sbin/ssm-cli
+
 PLIST_FILES=	etc/amazon/ssm/amazon-ssm-agent.json.template	\
 		etc/amazon/ssm/seelog_unix.xml.template		\
 		sbin/amazon-ssm-agent				\
@@ -28,33 +33,15 @@ PLIST_FILES=	etc/amazon/ssm/amazon-ssm-agent.json.template	\
 
 USE_RC_SUBR=	amazon-ssm-agent
 
-do-build:
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o amazon-ssm-agent -v 				\
-		agent/agent.go agent/agent_unix.go agent/agent_parser.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-document-worker -v				\
-		agent/framework/processor/executer/outofproc/worker/main.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-session-worker -v				\
-		agent/framework/processor/executer/outofproc/sessionworker/main.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-session-logger -v				\
-		agent/session/logging/main.go
-	@cd ${WRKSRC};							\
-	    ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0	\
-	    go build -ldflags "-s -w" -o ssm-cli -v agent/cli-main/cli-main.go
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/amazon-ssm-agent ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-document-worker ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-worker ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-session-logger ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/ssm-cli ${STAGEDIR}${PREFIX}/sbin
+post-patch:
+	${LN} -s ${WRKSRC}/vendor/src/* ${WRKSRC}/vendor/
+
+pre-build:
+# set package version
+	cd ${GO_WRKSRC} && BRAZIL_PACKAGE_VERSION=${PORTVERSION} \
+	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ./agent/version/versiongenerator/version-gen.go
+
+post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template
diff --git a/sysutils/amazon-ssm-agent/distinfo b/sysutils/amazon-ssm-agent/distinfo
index 6a927b5f41e6..0c818fa6562e 100644
--- a/sysutils/amazon-ssm-agent/distinfo
+++ b/sysutils/amazon-ssm-agent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557465201
-SHA256 (aws-amazon-ssm-agent-2.3.612.0_GH0.tar.gz) = 297937404da04e52adbe92a767f2aa11ae03b4fd61c112a6fac793a5fae40ff4
-SIZE (aws-amazon-ssm-agent-2.3.612.0_GH0.tar.gz) = 16975913
+TIMESTAMP = 1589747277
+SHA256 (aws-amazon-ssm-agent-2.3.1205.0_GH0.tar.gz) = 3a2424c6cd669486581ccf09cd57cbaecd69ef5731a62a50a826eb4b9515face
+SIZE (aws-amazon-ssm-agent-2.3.1205.0_GH0.tar.gz) = 22202960
diff --git a/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in b/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in
index b8c9ebbf5b7a..b0b8fc96185e 100644
--- a/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in
+++ b/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: amazon-ssm-agent
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/amazon-ssm-agent/files/patch-agent_plugins_inventory_gatherers_application_dataProvider.go b/sysutils/amazon-ssm-agent/files/patch-agent_plugins_inventory_gatherers_application_dataProvider.go
new file mode 100644
index 000000000000..ba93cdd13826
--- /dev/null
+++ b/sysutils/amazon-ssm-agent/files/patch-agent_plugins_inventory_gatherers_application_dataProvider.go
@@ -0,0 +1,10 @@
+--- agent/plugins/inventory/gatherers/application/dataProvider.go.orig	2020-05-07 19:53:12 UTC
++++ agent/plugins/inventory/gatherers/application/dataProvider.go
+@@ -7,7 +7,6 @@ import (
+ 	"fmt"
+ 
+ 	"github.com/aws/amazon-ssm-agent/agent/context"
+-	"github.com/aws/amazon-ssm-agent/agent/plugins/configurepackage/localpackages"
+ 	"github.com/aws/amazon-ssm-agent/agent/plugins/inventory/model"
+ )
+ 
diff --git a/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go b/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go
deleted file mode 100644
index fdb507fe22c0..000000000000
--- a/sysutils/amazon-ssm-agent/files/patch-agent_session_utility_utility__unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/session/utility/utility_unix.go.orig	2019-05-15 22:56:33 UTC
-+++ agent/session/utility/utility_unix.go
-@@ -65,7 +65,7 @@ func (u *SessionUtil) CreateLocalAdminUser(log log.T) 
- 		}
- 	}
- 
--	err = u.createSudoersFileIfNotPresent(log)
-+	err = nil
- 	return
- }
- 
diff --git a/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go b/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go
deleted file mode 100644
index dde9a34057ac..000000000000
--- a/sysutils/amazon-ssm-agent/files/patch-agent_version_version.go
+++ /dev/null
@@ -1,8 +0,0 @@
---- agent/version/version.go.orig	2019-05-08 20:19:03 UTC
-+++ agent/version/version.go
-@@ -19,4 +19,4 @@
- package version
- 
- // Version is the version of the Agent
--const Version = "2.3.0.0"
-+const Version = "2.3.612.0"
diff --git a/sysutils/amdmsrtweaker/Makefile b/sysutils/amdmsrtweaker/Makefile
index 73d228bd8fa8..4b2ad0b15ce7 100644
--- a/sysutils/amdmsrtweaker/Makefile
+++ b/sysutils/amdmsrtweaker/Makefile
@@ -1,5 +1,4 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	amdmsrtweaker
 PORTVERSION=	1.1
diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index 4dd4f8de33b5..6a64fe7abe73 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -1,5 +1,4 @@
 # Created by: Bjoern A. Zeeb <bzeeb+freebsd+ports@zabbadoz.net>
-# $FreeBSD$
 
 PORTNAME=	amrstat
 PORTVERSION=	20070216
diff --git a/sysutils/amrstat/files/407.status-amr-raid.in b/sysutils/amrstat/files/407.status-amr-raid.in
index 2ffb10f92f9d..af1a5d1e9c22 100644
--- a/sysutils/amrstat/files/407.status-amr-raid.in
+++ b/sysutils/amrstat/files/407.status-amr-raid.in
@@ -1,9 +1,6 @@
 #!/bin/sh
 #
 # Show status of LSI Logic's MegaRAID RAID controllers.
-#
-# $FreeBSD$
-#
 
 # If there is a global system configuration file, suck it in.
 #
diff --git a/sysutils/amtc/Makefile b/sysutils/amtc/Makefile
index 66e19497d39a..61731243d3a7 100644
--- a/sysutils/amtc/Makefile
+++ b/sysutils/amtc/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	amtc
 PORTVERSION=	0.8.5
 CATEGORIES=	sysutils
diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index 1aad0f22672c..795bcf61a49d 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -1,9 +1,8 @@
 # Created by: Derik van Zuetphen <dz@426.ch>
-# $FreeBSD$
 
 PORTNAME=	anacron
 PORTVERSION=	2.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -14,20 +13,22 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
-USE_RC_SUBR=	anacron
+USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
+PLIST_SUB=	PORTNAME=${PORTNAME}
+SUB_LIST+=	PORTNAME=${PORTNAME} COMMENT="${COMMENT}"
 
 post-patch:
-.for f in Makefile anacron.8 anacrontab.5
-	@${REINPLACE_CMD} -e 's|\(/etc/anacrontab\)|${PREFIX}\1|' ${WRKSRC}/${f}
+.for f in Makefile ${PORTNAME}.8 ${PORTNAME}tab.5
+	@${REINPLACE_CMD} -e 's|\(/etc/${PORTNAME}tab\)|${PREFIX}\1|' ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} -e 's|^CFLAGS = .*||' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/anacron ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/anacron.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/anacrontab.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
-	${INSTALL_DATA} ${FILESDIR}/anacrontab.sample ${STAGEDIR}${PREFIX}/etc
-	@${MKDIR} ${STAGEDIR}/var/spool/anacron
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}tab.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}tab.sample ${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}/var/spool/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/anacron/files/anacron.in b/sysutils/anacron/files/anacron.in
index 8dc39a53faa3..9e32e4420335 100644
--- a/sysutils/anacron/files/anacron.in
+++ b/sysutils/anacron/files/anacron.in
@@ -1,24 +1,36 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
 
-# PROVIDE: anacron
+# PROVIDE: %%PORTNAME%%
 # REQUIRE: LOGIN
+# KEYWORD: resume
 
 #
-# Add the following line to /etc/rc.conf to enable anacron:
+# Execute one of the following commands as root to enable %%PORTNAME%%:
 #
-# anacron_enable="YES"
+#    service %%PORTNAME%% enable
+#    sysrc %%PORTNAME%%_enable=YES
 #
 
 . /etc/rc.subr
 
-name=anacron
-rcvar=anacron_enable
+name=%%PORTNAME%%
+command="%%PREFIX%%/sbin/%%PORTNAME%%"
+desc="%%COMMENT%%"
+extra_commands=resume
+rcvar=%%PORTNAME%%_enable
+required_vars=syslogd_enable
 
 load_rc_config $name
-: ${anacron_enable:=NO}
-command="%%PREFIX%%/sbin/anacron"
+: ${%%PORTNAME%%_enable:=NO}
+
+if [ $# -gt 0 -a $1 = "resume" ]; then
+   arg=start
+   if checkyesno $rcvar; then
+       info "starting ${name} after resume"
+   fi
+else
+   arg=$1
+fi
+debug "$name: \$1 = $1, arg = $arg"
 
-run_rc_command "$1"
+run_rc_command "$arg"
diff --git a/sysutils/anacron/files/patch-log.c b/sysutils/anacron/files/patch-log.c
new file mode 100644
index 000000000000..320a83d8c606
--- /dev/null
+++ b/sysutils/anacron/files/patch-log.c
@@ -0,0 +1,10 @@
+--- log.c.orig	2000-06-22 22:55:13 UTC
++++ log.c
+@@ -37,6 +37,7 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <signal.h>
diff --git a/sysutils/anacron/files/patch-main.c b/sysutils/anacron/files/patch-main.c
new file mode 100644
index 000000000000..12dafcab98f3
--- /dev/null
+++ b/sysutils/anacron/files/patch-main.c
@@ -0,0 +1,10 @@
+--- main.c.orig	2000-06-22 22:58:07 UTC
++++ main.c
+@@ -24,6 +24,7 @@
+ 
+ #include <time.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <signal.h>
+ #include <fcntl.h>
diff --git a/sysutils/anacron/files/patch-matchrx.c b/sysutils/anacron/files/patch-matchrx.c
index a8a5d456fbdd..ffba9b6baa56 100644
--- a/sysutils/anacron/files/patch-matchrx.c
+++ b/sysutils/anacron/files/patch-matchrx.c
@@ -1,6 +1,6 @@
 --- matchrx.c.orig	2000-06-20 23:12:18 UTC
 +++ matchrx.c
-@@ -23,6 +23,7 @@
+@@ -23,9 +23,11 @@
  
  
  #include <stdio.h>
@@ -8,3 +8,7 @@
  #include <regex.h>
  #include <stdarg.h>
  #include <stdlib.h>
++#include <string.h>
+ #include "matchrx.h"
+ 
+ int
diff --git a/sysutils/anacron/files/patch-runjob.c b/sysutils/anacron/files/patch-runjob.c
index a984d32ce1bb..781ea1693057 100644
--- a/sysutils/anacron/files/patch-runjob.c
+++ b/sysutils/anacron/files/patch-runjob.c
@@ -9,8 +9,6 @@
 -    int fd, i;
 +    int fd;
 +    char name[] = "/tmp/anacron.XXXXXX";
-+
-+    fd = mkstemp(name);
  
 -    i = 0;
 -    name = NULL;
@@ -25,6 +23,8 @@
 -	/* I'm not sure we actually need to be so persistent here */
 -    } while (fd == -1 && errno == EEXIST && i < max_retries);
 -    
++    fd = mkstemp(name);
++
      if (fd == -1) die_e("Can't open temporary file");
      if (unlink(name)) die_e("Can't unlink temporary file");
 -    free(name);
@@ -32,3 +32,12 @@
      fcntl(fd, F_SETFD, 1);    /* set close-on-exec flag */
      return fd;
  }
+@@ -84,7 +72,7 @@ username()
+ }
+ 
+ static void
+-xputenv(const char *s)
++xputenv(char *s)
+ {
+     if (putenv(s)) die_e("Can't set the environment");
+ }
diff --git a/sysutils/anacron/files/pkg-message.in b/sysutils/anacron/files/pkg-message.in
index 77c5d61d0db1..64d2be3ba0d6 100644
--- a/sysutils/anacron/files/pkg-message.in
+++ b/sysutils/anacron/files/pkg-message.in
@@ -2,12 +2,17 @@
 { type: install
   message: <<EOM
 Configuration hints:
-- Edit %%PREFIX%%/etc/anacrontab
+- Edit %%PREFIX%%/etc/%%PORTNAME%%tab
 - Deactivate the 'periodic' commands in /etc/crontab
-- Add a call to anacron to /etc/crontab, like
-  0  0  *  *  *    root    %%PREFIX%%/sbin/anacron
-- Add anacron_enable="YES" to /etc/rc.conf
-- Read anacron(8) and anacrontab(5)
+- Add a call to %%PORTNAME%% to /etc/crontab, like
+  0  0  *  *  *    root    %%PREFIX%%/sbin/%%PORTNAME%%
+- Add %%PORTNAME%%_enable="YES" to /etc/rc.conf
+  or execute one of the following commands as root:
+    service %%PORTNAME%% enable
+    sysrc %%PORTNAME%%_enable=YES
+- Read %%PORTNAME%%(8) and %%PORTNAME%%tab(5)
+- To avoid overlapping periodic(8) jobs, you may want to serialize jobs:
+    sysrc %%PORTNAME%%_flags+=" -s"
 EOM
 }
 ]
diff --git a/sysutils/anacron/pkg-plist b/sysutils/anacron/pkg-plist
index 7b449b2790e2..4206a632fe24 100644
--- a/sysutils/anacron/pkg-plist
+++ b/sysutils/anacron/pkg-plist
@@ -1,5 +1,7 @@
-sbin/anacron
-@sample etc/anacrontab.sample
-@unexec rmdir /var/spool/anacron 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/spool/anacron'."
-man/man8/anacron.8.gz
-man/man5/anacrontab.5.gz
+sbin/%%PORTNAME%%
+@sample etc/%%PORTNAME%%tab.sample
+@postexec mkdir -p /var/spool/%%PORTNAME%% 2>/dev/null
+@postunexec rmdir /var/spool/%%PORTNAME%% 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/spool/%%PORTNAME%%'."
+man/man8/%%PORTNAME%%.8.gz
+man/man5/%%PORTNAME%%tab.5.gz
+@dir /var/spool/%%PORTNAME%%
diff --git a/sysutils/and/Makefile b/sysutils/and/Makefile
index 08c4a55186f9..1245b85e6d91 100644
--- a/sysutils/and/Makefile
+++ b/sysutils/and/Makefile
@@ -1,5 +1,4 @@
 # Created by: ijliao
-# $FreeBSD$
 
 PORTNAME=	and
 PORTVERSION=	1.2.2
diff --git a/sysutils/android-file-transfer-qt5/Makefile b/sysutils/android-file-transfer-qt5/Makefile
index 8158b13b6517..ecfb0a3d01ae 100644
--- a/sysutils/android-file-transfer-qt5/Makefile
+++ b/sysutils/android-file-transfer-qt5/Makefile
@@ -1,11 +1,9 @@
-# $FreeBSD$
-
 PORTREVISION=	0
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../android-file-transfer
 
 OPTIONS_SLAVE=	QT5
-OPTIONS_EXCLUDE=CLI FUSE
+OPTIONS_EXCLUDE=CLI FUSE PYTHON
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
index e3d03a8af197..481cd9b9aa1c 100644
--- a/sysutils/android-file-transfer/Makefile
+++ b/sysutils/android-file-transfer/Makefile
@@ -1,12 +1,10 @@
-# $FreeBSD$
-
 PORTNAME=	android-file-transfer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.9
-PORTREVISION?=	1
+DISTVERSION=	4.2
+PORTREVISION?=	0
 CATEGORIES=	sysutils
 
-MAINTAINER=	jbeich@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Android MTP client with minimalistic UI
 
 LICENSE=	GPLv3+
@@ -15,15 +13,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	whoozle
 GH_PROJECT=	${PORTNAME}-linux
 
-USES=		cmake compiler:c++11-lib localbase:ldflags pkgconfig
+USES=		cmake compiler:c++11-lib pkgconfig
 CMAKE_ON=	USB_BACKEND_LIBUSB
 PLIST_FILES=	"@comment lib/libmtp-ng-static.a"
 
-OPTIONS_DEFINE=	CLI FUSE QT5
-OPTIONS_DEFAULT=CLI FUSE QT5
+OPTIONS_DEFINE=	CLI FUSE OPENSSL PYTHON QT5 TAGLIB
+OPTIONS_DEFAULT=CLI FUSE OPENSSL PYTHON QT5 TAGLIB
 OPTIONS_EXCLUDE?=	QT5 # enslaved until subpackaging
-# XXX http://lists.dragonflybsd.org/pipermail/users/2016-September/313064.html
-OPTIONS_EXCLUDE_DragonFly=	FUSE
 
 CLI_DESC=	CLI (Command-Line Interface) support
 CLI_USES=	readline
@@ -33,8 +29,16 @@ FUSE_USES=	fuse
 FUSE_CMAKE_BOOL=BUILD_FUSE
 FUSE_PLIST_FILES=bin/aft-mtp-mount
 
+OPENSSL_USES=		ssl
+OPENSSL_CMAKE_BOOL=	BUILD_MTPZ
+
+PYTHON_BUILD_DEPENDS=	pybind11>0:devel/pybind11
+PYTHON_USES=		python
+PYTHON_CMAKE_BOOL=	BUILD_PYTHON
+PYTHON_PLIST_FILES=	%%PYTHON_SITELIBDIR%%/aftl%%PYTHON_EXT_SUFFIX%%.so
+
 QT5_USES=	qt:5
-QT5_USE=	QT=qmake_build,buildtools_build,core,gui,widgets
+QT5_USE=	QT=qmake_build,buildtools_build,linguisttools_build,core,gui,network,widgets
 QT5_CMAKE_BOOL=	BUILD_QT_UI
 QT5_CMAKE_ON=	-DDESIRED_QT_VERSION:STRING=5
 QT5_PLIST_FILES=	bin/android-file-transfer \
@@ -42,6 +46,10 @@ QT5_PLIST_FILES=	bin/android-file-transfer \
 		share/icons/hicolor/512x512/apps/android-file-transfer.png \
 		share/metainfo/android-file-transfer.appdata.xml
 
+TAGLIB_DESC=		Reading audio metadata via taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
+TAGLIB_CMAKE_BOOL=	BUILD_TAGLIB
+
 post-patch:
 	@${REINPLACE_CMD} '/set.*AFT_VERSION/s/".*"/"${DISTVERSIONFULL}"/' \
 		${WRKSRC}/CMakeLists.txt
@@ -49,4 +57,9 @@ post-patch:
 post-patch-CLI-off:
 	@${REINPLACE_CMD} '/subdirectory(cli)/d' ${WRKSRC}/CMakeLists.txt
 
+post-install-PYTHON-on:
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+	${INSTALL_LIB} ${BUILD_WRKSRC}/python/aftl${PYTHON_EXT_SUFFIX}.so \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
 .include <bsd.port.mk>
diff --git a/sysutils/android-file-transfer/distinfo b/sysutils/android-file-transfer/distinfo
index fb5f8eb176f3..050eff6461ac 100644
--- a/sysutils/android-file-transfer/distinfo
+++ b/sysutils/android-file-transfer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558697121
-SHA256 (whoozle-android-file-transfer-linux-v3.9_GH0.tar.gz) = 26aa21683ae34aceaf83747fec693a15b996017a857014931ef3c5b50115971a
-SIZE (whoozle-android-file-transfer-linux-v3.9_GH0.tar.gz) = 781268
+TIMESTAMP = 1609258228
+SHA256 (whoozle-android-file-transfer-linux-v4.2_GH0.tar.gz) = cc607d68e8a18273c9b56975a70a0e68fbdf9d5b903b2727a345a605ff48a19f
+SIZE (whoozle-android-file-transfer-linux-v4.2_GH0.tar.gz) = 823609
diff --git a/sysutils/angrysearch/Makefile b/sysutils/angrysearch/Makefile
new file mode 100644
index 000000000000..0c27d878ed88
--- /dev/null
+++ b/sysutils/angrysearch/Makefile
@@ -0,0 +1,32 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+
+PORTNAME=	angrysearch
+PORTVERSION=	1.0.2 # untagged, but specified in the setup.py
+PORTREVISION=	5
+CATEGORIES=	sysutils python
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Quick search GUI tool for Unix-like systems
+
+LICENSE=	GPLv2
+
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	DoTheEvo
+GH_PROJECT=	ANGRYsearch
+GH_TAGNAME=	6f8fccc
+
+USES=		python pyqt:5
+USE_PYTHON=	autoplist distutils noflavors
+USE_PYQT=	core_run gui_run widgets_run
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,Linux,${OPSYS}, ; s,linux,${OPSYS:tl}, \
+		; s,/usr/share,${PREFIX}/share,' ${WRKSRC}/setup.py \
+		${WRKSRC}/angrysearch.desktop
+
+.include <bsd.port.mk>
+
+PATCH_ARGS+=	-l
diff --git a/sysutils/angrysearch/distinfo b/sysutils/angrysearch/distinfo
new file mode 100644
index 000000000000..7537f73aabe1
--- /dev/null
+++ b/sysutils/angrysearch/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1532808758
+SHA256 (DoTheEvo-ANGRYsearch-1.0.2-6f8fccc_GH0.tar.gz) = cff66028d346e86c70a6911608fba1ee03e48dc5062c65313564df38b75acf95
+SIZE (DoTheEvo-ANGRYsearch-1.0.2-6f8fccc_GH0.tar.gz) = 504698
diff --git a/sysutils/angrysearch/files/patch-scandir.py b/sysutils/angrysearch/files/patch-scandir.py
new file mode 100644
index 000000000000..cb34d046649d
--- /dev/null
+++ b/sysutils/angrysearch/files/patch-scandir.py
@@ -0,0 +1,20 @@
+--- scandir.py.orig	2018-07-28 20:12:38 UTC
++++ scandir.py
+@@ -428,6 +428,17 @@ elif sys.platform.startswith(('linux', 'darwin')) or '
+                 ('d_type', ctypes.c_byte),
+                 ('d_name', ctypes.c_char * 256),
+             )
++        elif sys.platform.startswith('freebsd') and int(sys.platform[7:]) > 11:
++            _fields_ = (
++                ('d_ino', ctypes.c_uint64),
++                ('d_off', ctypes.c_uint64),
++                ('d_reclen', ctypes.c_ushort),
++                ('d_type', ctypes.c_byte),
++                ('d_pad0', ctypes.c_byte),
++                ('d_namlen', ctypes.c_ushort),
++                ('d_pad1', ctypes.c_ushort),
++                ('d_name', ctypes.c_char * 256),
++            )
+         else:
+             _fields_ = (
+                 ('d_ino', ctypes.c_uint32),  # must be uint32, not ulong
diff --git a/sysutils/angrysearch/pkg-descr b/sysutils/angrysearch/pkg-descr
new file mode 100644
index 000000000000..a86ce568c7b3
--- /dev/null
+++ b/sysutils/angrysearch/pkg-descr
@@ -0,0 +1,9 @@
+Clone of the David Carpenter's "Everything" search engine, which locates
+files and folders by their name instantly, for Unix-like systems.
+
+This simple file search crawls available disks creating a database that
+can be searched using quick and responsive graphical interface.
+Notable difference is that by default, the entire paths are searched,
+not just file and folder names.
+
+WWW: https://github.com/DoTheEvo/ANGRYsearch
diff --git a/sysutils/ansible-iocage/Makefile b/sysutils/ansible-iocage/Makefile
new file mode 100644
index 000000000000..28b26faf38ee
--- /dev/null
+++ b/sysutils/ansible-iocage/Makefile
@@ -0,0 +1,37 @@
+PORTNAME=	ansible-iocage
+DISTVERSION=	g20200327
+PORTEPOCH=	1
+CATEGORIES=	sysutils
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	lcook@FreeBSD.org
+COMMENT=	Ansible module for iocage
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		ansible:module python shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	fractalcells
+GH_TAGNAME=	0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d
+SHEBANG_FILES=	iocage
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+PLIST_FILES=	${ANSIBLE_MODULESDIR}/iocage
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${MKDIR} ${STAGEDIR}${ANSIBLE_MODULESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/iocage \
+		${STAGEDIR}${ANSIBLE_MODULESDIR}/iocage
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \
+		${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/sysutils/ansible-iocage/distinfo b/sysutils/ansible-iocage/distinfo
new file mode 100644
index 000000000000..8376a3cbfb63
--- /dev/null
+++ b/sysutils/ansible-iocage/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1616943495
+SHA256 (fractalcells-ansible-iocage-g20200327-0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d_GH0.tar.gz) = 65a91355bf9105901ac90ea6a456e13cfd6d2b90d9922d09dd4cb463c3163e75
+SIZE (fractalcells-ansible-iocage-g20200327-0f0b5e6e5df45b653ed8c512207cb4cc2f58f82d_GH0.tar.gz) = 7932
diff --git a/sysutils/ansible-iocage/pkg-descr b/sysutils/ansible-iocage/pkg-descr
new file mode 100644
index 000000000000..65edb6d8565f
--- /dev/null
+++ b/sysutils/ansible-iocage/pkg-descr
@@ -0,0 +1,4 @@
+Ansible module for the iocage utility: convenient, lightweight
+and easy jail management.
+
+WWW: https://github.com/fractalcells/ansible-iocage
diff --git a/sysutils/ansible-kld/Makefile b/sysutils/ansible-kld/Makefile
new file mode 100644
index 000000000000..e458b6bcba47
--- /dev/null
+++ b/sysutils/ansible-kld/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	ansible
+DISTVERSION=	g20200803
+PORTREVISION?=	0
+PORTEPOCH=	1
+CATEGORIES=	sysutils
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-${_LIBRARY}
+
+MAINTAINER=	lcook@FreeBSD.org
+COMMENT?=	Ansible module to load kernel modules or update /boot/loader.conf
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		ansible:module python shebangfix
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	dlundgren
+GH_PROJECT=	ansible-freebsd-modules
+GH_TAGNAME=	537984b53018e36c2511132c3c66ac762f8b36dd
+SHEBANG_FILES=	library/${_LIBRARY}
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+_LIBRARY?=	kld
+
+PLIST_FILES=	${ANSIBLE_MODULESDIR}/${_LIBRARY}
+
+do-install:
+	${MKDIR} ${STAGEDIR}${ANSIBLE_MODULESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/library/${_LIBRARY} \
+		${STAGEDIR}${ANSIBLE_MODULESDIR}/${_LIBRARY}
+
+.include <bsd.port.mk>
diff --git a/sysutils/ansible-kld/distinfo b/sysutils/ansible-kld/distinfo
new file mode 100644
index 000000000000..4e11f15c1f2c
--- /dev/null
+++ b/sysutils/ansible-kld/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1618563565
+SHA256 (dlundgren-ansible-freebsd-modules-g20200803-537984b53018e36c2511132c3c66ac762f8b36dd_GH0.tar.gz) = 84c808ce8d90e93446c9320369afd3a362e8f4c363c9be9c734e6b1b92f6f53b
+SIZE (dlundgren-ansible-freebsd-modules-g20200803-537984b53018e36c2511132c3c66ac762f8b36dd_GH0.tar.gz) = 9341
diff --git a/sysutils/ansible-kld/pkg-descr b/sysutils/ansible-kld/pkg-descr
new file mode 100644
index 000000000000..2801e8c9d753
--- /dev/null
+++ b/sysutils/ansible-kld/pkg-descr
@@ -0,0 +1,4 @@
+Ansible module to load kernel modules and manipulate
+/boot/loader.conf on a FreeBSD system.
+
+WWW: https://github.com/dlundgren/ansible-freebsd-modules/
diff --git a/sysutils/ansible-sshjail/Makefile b/sysutils/ansible-sshjail/Makefile
new file mode 100644
index 000000000000..b40cf6d8eb7c
--- /dev/null
+++ b/sysutils/ansible-sshjail/Makefile
@@ -0,0 +1,29 @@
+PORTNAME=	ansible-sshjail
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.0-30
+PORTREVISION=	1
+DISTVERSIONSUFFIX=	-g981674f
+CATEGORIES=	sysutils
+
+MAINTAINER=	madpilot@FreeBSD.org
+COMMENT=	Ansible connector for remote jails
+
+LICENSE=	MIT
+
+USES=		ansible:plugin python
+ANSIBLE_PLUGIN_TYPE=	connection
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	austinhyde
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+PLIST_FILES=	${ANSIBLE_PLUGINSDIR}/sshjail.py
+
+do-install:
+	${MKDIR} ${STAGEDIR}/${ANSIBLE_PLUGINSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/sshjail.py \
+		${STAGEDIR}/${ANSIBLE_PLUGINSDIR}/sshjail.py
+
+.include <bsd.port.mk>
diff --git a/sysutils/ansible-sshjail/distinfo b/sysutils/ansible-sshjail/distinfo
new file mode 100644
index 000000000000..678df5f2bb31
--- /dev/null
+++ b/sysutils/ansible-sshjail/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1618521706
+SHA256 (austinhyde-ansible-sshjail-v1.1.0-30-g981674f_GH0.tar.gz) = 357f212cf1b34c03cee436e963b09003be73ef69db216907b93722881b0a9781
+SIZE (austinhyde-ansible-sshjail-v1.1.0-30-g981674f_GH0.tar.gz) = 10702
diff --git a/sysutils/ansible-sshjail/files/patch-sshjail.py b/sysutils/ansible-sshjail/files/patch-sshjail.py
new file mode 100644
index 000000000000..f2b5b7d9d0c8
--- /dev/null
+++ b/sysutils/ansible-sshjail/files/patch-sshjail.py
@@ -0,0 +1,76 @@
+From bcb0a961df77a0d7a3b2e7e58fac3e283b5ef8c4 Mon Sep 17 00:00:00 2001
+From: Mohamad Safadieh <self@mhmd.sh>
+Date: Wed, 5 May 2021 12:38:26 -0400
+Subject: [PATCH] added sshpass_prompt, ssh_transfer_method, timeout
+
+---
+ sshjail.py | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/sshjail.py b/sshjail.py
+index 5973380..0e26c68 100644
+--- sshjail.py
++++ sshjail.py
+@@ -49,6 +49,17 @@
+           vars:
+               - name: ansible_password
+               - name: ansible_ssh_pass
++      sshpass_prompt:
++          description: Password prompt that sshpass should search for. Supported by sshpass 1.06 and up
++          default: ''
++          ini:
++              - section: 'ssh_connection'
++                key: 'sshpass_prompt'
++          env:
++              - name: ANSIBLE_SSHPASS_PROMPT
++          vars:
++              - name: ansible_sshpass_prompt
++          version_added: '2.10'
+       ssh_args:
+           description: Arguments to pass to all ssh cli tools
+           default: '-C -o ControlMaster=auto -o ControlPersist=60s'
+@@ -247,6 +258,16 @@
+         vars:
+           - name: ansible_sftp_batch_mode
+             version_added: '2.7'
++      ssh_transfer_method:
++        default: smart
++        description:
++            - "Preferred method to use when transferring files over ssh"
++            - Setting to 'smart' (default) will try them in order, until one succeeds or they all fail
++            - Using 'piped' creates an ssh pipe with ``dd`` on either side to copy the data
++        choices: ['sftp', 'scp', 'piped', 'smart']
++        env: [{name: ANSIBLE_SSH_TRANSFER_METHOD}]
++        ini:
++            - {key: transfer_method, section: ssh_connection}
+       scp_if_ssh:
+         default: smart
+         description:
+@@ -270,6 +291,27 @@
+         vars:
+           - name: ansible_ssh_use_tty
+             version_added: '2.7'
++      timeout:
++        default: 10
++        description:
++            - This is the default ammount of time we will wait while establishing an ssh connection
++            - It also controls how long we can wait to access reading the connection once established (select on the socket)
++        env:
++            - name: ANSIBLE_TIMEOUT
++            - name: ANSIBLE_SSH_TIMEOUT
++              version_added: '2.11'
++        ini:
++            - key: timeout
++              section: defaults
++            - key: timeout
++              section: ssh_connection
++              version_added: '2.11'
++        vars:
++            - name: ansible_ssh_timeout
++              version_added: '2.11'
++        cli:
++            - name: timeout
++        type: integer
+ '''
+ 
+ try:
diff --git a/sysutils/ansible-sshjail/pkg-descr b/sysutils/ansible-sshjail/pkg-descr
new file mode 100644
index 000000000000..96340a31545e
--- /dev/null
+++ b/sysutils/ansible-sshjail/pkg-descr
@@ -0,0 +1,4 @@
+An Ansible connection plugin for remotely provisioning FreeBSD jails
+separately from their jailhost.
+
+WWW: https://github.com/austinhyde/ansible-sshjail
diff --git a/sysutils/ansible-sysrc/Makefile b/sysutils/ansible-sysrc/Makefile
new file mode 100644
index 000000000000..5ebf09ce5959
--- /dev/null
+++ b/sysutils/ansible-sysrc/Makefile
@@ -0,0 +1,8 @@
+PORTREVISION=	1
+
+COMMENT=	Ansible module to set sysvars in rc.conf
+
+MASTERDIR=	${.CURDIR}/../ansible-kld
+_LIBRARY=	sysrc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible-sysrc/pkg-descr b/sysutils/ansible-sysrc/pkg-descr
new file mode 100644
index 000000000000..08223d2a637b
--- /dev/null
+++ b/sysutils/ansible-sysrc/pkg-descr
@@ -0,0 +1,5 @@
+Ansible module to manipulate rc.conf on a FreeBSD system
+via sysrc. The current states available are: append,
+absent, present and subtract.
+
+WWW: https://github.com/dlundgren/ansible-freebsd-modules/
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 33f8f68646ef..53c57f052835 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,90 +1,50 @@
-# $FreeBSD$
-
 PORTNAME=	ansible
-PORTVERSION?=	2.8.5
-PORTREVISION?=	0
+DISTVERSION=	4.0.0
 CATEGORIES=	sysutils python
-MASTER_SITES=	http://releases.ansible.com/ansible/
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	lifanov@FreeBSD.org
+MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Radically simple IT automation
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
-
-CONFLICTS?=	ansible1-* \
-		ansible23-* \
-		ansible24-* \
-		ansible25-* \
-		ansible27-* \
-		ansible26-* \
-		ansible27-*
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-core>0:sysutils/py-ansible-core@${PY_FLAVOR}
 
-EXTRA_PATCHES?=
+USES=		ansible:env cpe python:3.6+ shebangfix
+CPE_VENDOR=	redhat
+USE_PYTHON=	autoplist concurrent distutils
 
-NO_ARCH=	yes
-USES?=		cpe python
-USE_PYTHON=	distutils autoplist concurrent
-CPE_VENDOR=	ansibleworks
+SHEBANG_FILES=	ansible_collections/community/zabbix/roles/zabbix_proxy/files/install_semodule.bsx \
+		ansible_collections/community/zabbix/roles/zabbix_server/files/install_semodule.bsx \
+		ansible_collections/cyberark/conjur/ci/build_release \
+		ansible_collections/cyberark/conjur/ci/publish_to_galaxy \
+		ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr
+SHEBANG_GLOB=	*.py *.sh
 
-SUB_FILES=	pkg-message
-SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
+CONFLICTS_INSTALL=	${_ANSIBLE_PACKAGES:N${PKGBASE}-*}
 
-PLIST_FILES?=	man/man1/ansible-config.1.gz \
-		man/man1/ansible-console.1.gz \
-		man/man1/ansible-doc.1.gz \
-		man/man1/ansible-galaxy.1.gz \
-		man/man1/ansible-inventory.1.gz \
-		man/man1/ansible-playbook.1.gz \
-		man/man1/ansible-pull.1.gz \
-		man/man1/ansible-vault.1.gz \
-		man/man1/ansible.1.gz
+NO_ARCH=	yes
 
-PORTEXAMPLES=	ansible.cfg hosts
+DO_MAKE_TEST=	ansible -m ping
+TEST_TARGET=	localhost
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+_ANSIBLE_VERSIONS=	1 2 23 24 25 26 27 28
+_ANSIBLE_PACKAGES=	${PYTHON_PKGNAMEPREFIX}ansible-*
+.for version in ${_ANSIBLE_VERSIONS}
+_ANSIBLE_PACKAGES+=	${PYTHON_PKGNAMEPREFIX}ansible${version}-*
+.endfor
 
 post-patch:
-	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-		-e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \
+	${FIND} ${WRKSRC} -type f -exec ${GREP} --null -El '(/etc/ansible|/usr/share/ansible)' {} + | ${XARGS} -n 500 -0 ${REINPLACE_CMD} \
+		-e 's|/etc/ansible|${ETCDIR}|g' \
 		-e 's|/usr/share/ansible|${DATADIR}|g'
 	${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR}
-
-post-stage:
-	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
-		-execdir ${RLN} ansible-${PYTHON_VER} {} \;
-
-TEST_WRKSRC=${WRKSRC}/test
-
-do-test:
-#	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v
-	${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose
-	${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v
-
 .include <bsd.port.mk>
+
+# Make sure that we override the unique DATADIR and ETCDIR set
+# by the implicit USES=uniquefiles.
+DATADIR=	${ANSIBLE_DATADIR}
+ETCDIR=		${ANSIBLE_ETCDIR}
diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo
index 51cce6c0cbc3..013aa0c9f9d7 100644
--- a/sysutils/ansible/distinfo
+++ b/sysutils/ansible/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568567194
-SHA256 (ansible-2.8.5.tar.gz) = 8e9403e755ce8ef27b6066cdd7a4c567aa80ebe2fd90d0ff8efa0a725d246986
-SIZE (ansible-2.8.5.tar.gz) = 14352036
+TIMESTAMP = 1621414029
+SHA256 (ansible-4.0.0.tar.gz) = 6f67ca5c634e4721d1f8e206dc71d60d1a114d147945355bfc902bd37eb07080
+SIZE (ansible-4.0.0.tar.gz) = 33344580
diff --git a/sysutils/ansible/files/pkg-message.in b/sysutils/ansible/files/pkg-message.in
deleted file mode 100644
index 4d08a68eda59..000000000000
--- a/sysutils/ansible/files/pkg-message.in
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-{
-message: <<EOD
-To use Ansible, you need at least a host database.
-If you installed examples, you will have a sample
-host database and a sample configuration file:
-
-  %%EXAMPLESDIR%%/hosts
-  %%EXAMPLESDIR%%/ansible.cfg
-
-EOD
-type: install
-}
-{
-message: <<EOD
-Ansible has been updated to 2.8. Please follow the porting guide
-to update the rulesets:
-
-https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.8.html
-
-If you wish to stay with 2.7 version, you can switch
-to new sysutils/ansible27 port, which tracks stable 2.7 branch:
-
-# pkg set -n ansible:ansible27
-
-EOD
-maximum_version: "2.8"
-type: upgrade
-}
-]
diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile
deleted file mode 100644
index dc0fd521b31c..000000000000
--- a/sysutils/ansible1/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $FreeBSD$
-
-PKGNAMESUFFIX=	1
-PORTVERSION=	1.9.6
-PORTREVISION=	5
-
-CONFLICTS=	ansible-* \
-		ansible23-* \
-		ansible24-* \
-		ansible25-* \
-		ansible26-* \
-		ansible27-*
-
-MASTERDIR=	${.CURDIR}/../ansible
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
-
-USES=	cpe python:2.7 shebangfix
-
-PLIST_FILES=	man/man1/ansible-doc.1.gz \
-		man/man1/ansible-galaxy.1.gz \
-		man/man1/ansible-playbook.1.gz \
-		man/man1/ansible-pull.1.gz \
-		man/man1/ansible-vault.1.gz \
-		man/man1/ansible.1.gz
-
-SHEBANG_FILES=	lib/ansible/runner/action_plugins/synchronize.py
-
-EXTRA_PATCHES=
-
-DEPRECATED=		please upgrade to sysutils/ansible
-EXPIRATION_DATE=	2017-10-01
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible1/distinfo b/sysutils/ansible1/distinfo
deleted file mode 100644
index 5710515f7176..000000000000
--- a/sysutils/ansible1/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ansible-1.9.6.tar.gz) = 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d
-SIZE (ansible-1.9.6.tar.gz) = 941457
diff --git a/sysutils/ansible2/Makefile b/sysutils/ansible2/Makefile
new file mode 100644
index 000000000000..3e2222c36eef
--- /dev/null
+++ b/sysutils/ansible2/Makefile
@@ -0,0 +1,96 @@
+PORTNAME=	ansible
+PORTVERSION?=	2.9.22
+PORTREVISION?=	0
+CATEGORIES=	sysutils python
+MASTER_SITES=	http://releases.ansible.com/ansible/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX?=	2
+
+MAINTAINER=	0mp@FreeBSD.org
+COMMENT=	Radically simple IT automation
+
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+
+USES?=		cpe gmake python:3.6+ shebangfix
+CPE_VENDOR=	redhat
+USE_PYTHON=	autoplist concurrent distutils
+
+SHEBANG_REGEX?=	[.]/test/.*[.]py
+
+TEST_ARGS=	VERSION=${PORTVERSION} \
+		PYTHON=${PYTHON_CMD} \
+		DATE=
+TEST_ENV=	PYTHON_VERSION=${PYTHON_VER}
+TEST_TARGET=	tests
+
+CONFLICTS_INSTALL=	${_ANSIBLE_PACKAGES:N${PKGBASE}-*}
+
+EXTRA_PATCHES?=
+NO_ARCH=	yes
+SUB_FILES=	pkg-message
+SUB_LIST=	MAJMINVER=${PORTVERSION:R} \
+		PYTHON_PKGNAMEPREFIX=${PYTHON_PKGNAMEPREFIX} \
+		PKGBASE=${PKGBASE}
+
+PLIST_FILES?=	man/man1/ansible-config.1.gz \
+		man/man1/ansible-console.1.gz \
+		man/man1/ansible-doc.1.gz \
+		man/man1/ansible-galaxy.1.gz \
+		man/man1/ansible-inventory.1.gz \
+		man/man1/ansible-playbook.1.gz \
+		man/man1/ansible-pull.1.gz \
+		man/man1/ansible-vault.1.gz \
+		man/man1/ansible.1.gz
+PORTEXAMPLES=	ansible.cfg hosts
+
+_ANSIBLE_VERSIONS=	1 2 23 24 25 26 27 28
+_ANSIBLE_PACKAGES=	${PYTHON_PKGNAMEPREFIX}ansible-*
+.for version in ${_ANSIBLE_VERSIONS}
+_ANSIBLE_PACKAGES+=	${PYTHON_PKGNAMEPREFIX}ansible${version}-*
+.endfor
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+post-patch:
+	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
+		-e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \
+		-e 's|/usr/share/ansible|${DATADIR}|g'
+	${FIND} ${WRKSRC} -type f -name "*.bak" -delete
+
+	${REINPLACE_CMD} 's|"/etc"|"${PREFIX}/etc/"|g' ${WRKSRC}/test/units/playbook/test_helpers.py
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR}
+
+post-stage:
+	${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \
+		-execdir ${RLN} ansible-${PYTHON_VER} {} \;
+# python autoplist doesn't add this file in plist
+	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory
+
+.include <bsd.port.mk>
diff --git a/sysutils/ansible2/distinfo b/sysutils/ansible2/distinfo
new file mode 100644
index 000000000000..a2d51e265092
--- /dev/null
+++ b/sysutils/ansible2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1621933367
+SHA256 (ansible-2.9.22.tar.gz) = 49a4139a4315282c0588f1691b450ebc8309772c149f6cf342d2039bc3a48b6f
+SIZE (ansible-2.9.22.tar.gz) = 14278328
diff --git a/sysutils/ansible2/files/extra-patch-27 b/sysutils/ansible2/files/extra-patch-27
new file mode 100644
index 000000000000..bd077f558e36
--- /dev/null
+++ b/sysutils/ansible2/files/extra-patch-27
@@ -0,0 +1,84 @@
+--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig	2020-04-17 14:07:09 UTC
++++ lib/ansible/module_utils/facts/virtual/freebsd.py
+@@ -19,9 +19,11 @@ __metaclass__ = type
+ import os
+ 
+ from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector
++# Rudimentary detection of the virtual platforms, more through version is coming. Catches VMWare at minimum.
++from ansible.module_utils.facts.virtual.sysctl import VirtualSysctlDetectionMixin
+ 
+ 
+-class FreeBSDVirtual(Virtual):
++class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin):
+     """
+     This is a FreeBSD-specific subclass of Virtual.  It defines
+     - virtualization_type
+@@ -34,6 +36,9 @@ class FreeBSDVirtual(Virtual):
+         # Set empty values as default
+         virtual_facts['virtualization_type'] = ''
+         virtual_facts['virtualization_role'] = ''
++
++        virtual_product_facts = self.detect_virt_product('hw.hv_vendor')
++        virtual_facts.update(virtual_product_facts)
+ 
+         if os.path.exists('/dev/xen/xenstore'):
+             virtual_facts['virtualization_type'] = 'xen'
+--- lib/ansible/modules/packaging/os/pkgng.py.orig	2020-04-17 14:07:10 UTC
++++ lib/ansible/modules/packaging/os/pkgng.py
+@@ -201,13 +201,17 @@ def install_packages(module, pkgng_path, packages, cac
+ 
+     # This environment variable skips mid-install prompts,
+     # setting them to their default values.
+-    batch_var = 'env BATCH=yes'
++    # There is at least one case, when upgrading from 11.1 to 11.2 when pkg asks extra 
++    # question about OS version mismatch in the repository. As this isn't handled, playbook
++    # hangs forever. Adding ASSUME_ALWAYS_YES to the environment addresses that, and
++    # possibly other potential issues.
++    batch_var = 'env BATCH=yes ASSUME_ALWAYS_YES=yes'
+ 
+     if not module.check_mode and not cached:
+         if old_pkgng:
+-            rc, out, err = module.run_command("%s %s update" % (pkgsite, pkgng_path))
++            rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgsite, pkgng_path))
+         else:
+-            rc, out, err = module.run_command("%s %s update" % (pkgng_path, dir_arg))
++            rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgng_path, dir_arg))
+         if rc != 0:
+             module.fail_json(msg="Could not update catalogue")
+ 
+--- lib/ansible/modules/storage/zfs/zfs.py.orig	2020-04-17 14:07:11 UTC
++++ lib/ansible/modules/storage/zfs/zfs.py
+@@ -102,7 +102,15 @@ class Zfs(object):
+         self.changed = False
+         self.zfs_cmd = module.get_bin_path('zfs', True)
+         self.zpool_cmd = module.get_bin_path('zpool', True)
+-        self.pool = name.split('/')[0]
++        # - name: Create a new file system by cloning a snapshot
++        # zfs:
++        #   name: rpool/cloned_fs
++        #   state: present
++        #   origin: rpool@mysnapshot
++        #
++        # doesn't work properly, as code assumes that there is at least one level of hierarchy
++        # in zpool. But that's not always the case - pool may be dataset as well and have a snapshot.
++        self.pool = name.split('@')[0].split('/')[0]
+         self.is_solaris = os.uname()[0] == 'SunOS'
+         self.is_openzfs = self.check_openzfs()
+         self.enhanced_sharing = self.check_enhanced_sharing()
+--- lib/ansible/playbook/play_context.py.orig	2020-04-17 14:07:10 UTC
++++ lib/ansible/playbook/play_context.py
+@@ -528,8 +528,13 @@ class PlayContext(Base):
+                 becomecmd = cmd
+ 
+             elif self.become_method == 'doas':
++                # `doas` support in ansible is broken ATM, doesn't handle password
++                # authentication properly, cause assumes only challenge-respond auth.
++                # This patch should handle both ways properly.
++                def detect_doas_prompt(b_data):
++                    return re.match(b"[Pp]assword:", b_data)
+ 
+-                prompt = 'doas (%s@' % self.remote_user
++                prompt = detect_doas_prompt
+                 exe = self.become_exe or 'doas'
+ 
+                 if not self.become_pass:
diff --git a/sysutils/ansible/files/extra-patch-sesu b/sysutils/ansible2/files/extra-patch-sesu
index 845594ee16bc..845594ee16bc 100644
--- a/sysutils/ansible/files/extra-patch-sesu
+++ b/sysutils/ansible2/files/extra-patch-sesu
diff --git a/sysutils/ansible2/files/pkg-message.in b/sysutils/ansible2/files/pkg-message.in
new file mode 100644
index 000000000000..e8606df34687
--- /dev/null
+++ b/sysutils/ansible2/files/pkg-message.in
@@ -0,0 +1,30 @@
+[
+{
+message: <<EOD
+To use Ansible, you need at least a host database.
+If you installed examples, you will have a sample
+inventory and a sample configuration file:
+
+  %%EXAMPLESDIR%%/hosts
+  %%EXAMPLESDIR%%/ansible.cfg
+
+EOD
+type: install
+}
+{
+message: <<EOD
+Ansible has been updated to %%MAJMINVER%%. Please follow the porting guide
+to update the rulesets:
+
+  https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_%%MAJMINVER%%.html
+
+In order to stay with an older version instead, e.g., 2.7, use pkg-set(8).
+For example:
+
+  # pkg set -n %%PKGBASE%%:%%PYTHON_PKGNAMEPREFIX%%ansible27
+
+EOD
+maximum_version: "%%MAJMINVER%%"
+type: upgrade
+}
+]
diff --git a/sysutils/ansible2/pkg-descr b/sysutils/ansible2/pkg-descr
new file mode 100644
index 000000000000..1ecc93bba0cf
--- /dev/null
+++ b/sysutils/ansible2/pkg-descr
@@ -0,0 +1,4 @@
+Ansible is a radically simple configuration-management, deployment,
+task-execution, and multinode orchestration framework.
+
+WWW: https://www.ansible.com/
diff --git a/sysutils/ansible23/Makefile b/sysutils/ansible23/Makefile
deleted file mode 100644
index 3beb34d6ebf3..000000000000
--- a/sysutils/ansible23/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-PORTVERSION=	2.3.3.0
-PORTREVISION=	4
-PKGNAMESUFFIX=	23
-
-CONFLICTS=	ansible-* \
-		ansible1-* \
-		ansible24-* \
-		ansible25-* \
-		ansible26-* \
-		ansible27-*
-
-MASTERDIR=	${.CURDIR}/../ansible
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-
-PLIST_FILES=	man/man1/ansible-console.1.gz \
-		man/man1/ansible-doc.1.gz \
-		man/man1/ansible-galaxy.1.gz \
-		man/man1/ansible-playbook.1.gz \
-		man/man1/ansible-pull.1.gz \
-		man/man1/ansible-vault.1.gz \
-		man/man1/ansible.1.gz
-
-EXTRA_PATCHES=
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible23/distinfo b/sysutils/ansible23/distinfo
deleted file mode 100644
index 29099d00b2d9..000000000000
--- a/sysutils/ansible23/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1525366516
-SHA256 (ansible-2.3.3.0.tar.gz) = da2a715f6ca14a76001cc0f4bd1e44024328b3c2dad2c946dc9c7ed2d7c30afa
-SIZE (ansible-2.3.3.0.tar.gz) = 4190380
diff --git a/sysutils/ansible24/Makefile b/sysutils/ansible24/Makefile
deleted file mode 100644
index e808b80396a7..000000000000
--- a/sysutils/ansible24/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTVERSION=	2.4.6.0
-PORTREVISION=	3
-PKGNAMESUFFIX=	24
-
-CONFLICTS=	ansible-* \
-		ansible1-* \
-		ansible23-* \
-		ansible25-* \
-		ansible26-* \
-		ansible27-*
-
-MASTERDIR=	${.CURDIR}/../ansible
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-EXTRA_PATCHES=
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible24/distinfo b/sysutils/ansible24/distinfo
deleted file mode 100644
index de7162606ccd..000000000000
--- a/sysutils/ansible24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1534725323
-SHA256 (ansible-2.4.6.0.tar.gz) = f8cb44f76710faf88fc7dc0c703a3f39fe8a3bb1b98eb70506ef2cddf7e3e0c0
-SIZE (ansible-2.4.6.0.tar.gz) = 6516642
diff --git a/sysutils/ansible25/Makefile b/sysutils/ansible25/Makefile
deleted file mode 100644
index d0d5a502c6c7..000000000000
--- a/sysutils/ansible25/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTVERSION=	2.5.15
-PORTREVISION=	2
-PKGNAMESUFFIX=	25
-
-CONFLICTS=	ansible-* \
-		ansible1-* \
-		ansible23-* \
-		ansible24-* \
-		ansible26-* \
-		ansible27-*
-
-MASTERDIR=	${.CURDIR}/../ansible
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-EXTRA_PATCHES=
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible25/distinfo b/sysutils/ansible25/distinfo
deleted file mode 100644
index 896655107f7a..000000000000
--- a/sysutils/ansible25/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1551669220
-SHA256 (ansible-2.5.15.tar.gz) = ffbc2b093290c72a0a79be457ba47c57ecce7f32d65418fadc064ba1c3763cf1
-SIZE (ansible-2.5.15.tar.gz) = 10124651
diff --git a/sysutils/ansible26/Makefile b/sysutils/ansible26/Makefile
deleted file mode 100644
index 9a903c29e4af..000000000000
--- a/sysutils/ansible26/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTVERSION=	2.6.18
-PKGNAMESUFFIX=	26
-
-CONFLICTS=	ansible-* \
-		ansible1-* \
-		ansible23-* \
-		ansible24-* \
-		ansible25-* \
-		ansible27-*
-
-MASTERDIR=	${.CURDIR}/../ansible
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible26/distinfo b/sysutils/ansible26/distinfo
deleted file mode 100644
index 8087f1a3fa25..000000000000
--- a/sysutils/ansible26/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1562454313
-SHA256 (ansible-2.6.18.tar.gz) = 588e4d85ec21cddf959a66cbe62bbfcff6236a1cd44b1264b14a19d34b8dffdf
-SIZE (ansible-2.6.18.tar.gz) = 10749075
diff --git a/sysutils/ansible27/Makefile b/sysutils/ansible27/Makefile
deleted file mode 100644
index daa715ae6094..000000000000
--- a/sysutils/ansible27/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTVERSION=	2.7.13
-PKGNAMESUFFIX=	27
-
-CONFLICTS=	ansible-* \
-		ansible1-* \
-		ansible23-* \
-		ansible24-* \
-		ansible25-* \
-		ansible26-*
-
-MASTERDIR=	${.CURDIR}/../ansible
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible27/distinfo b/sysutils/ansible27/distinfo
deleted file mode 100644
index 099c3b4dc2ae..000000000000
--- a/sysutils/ansible27/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1568567150
-SHA256 (ansible-2.7.13.tar.gz) = 339c87a1bf9e8555ce1e1c1a9452d8ed1df240944ec1a3fc2e813e6c7d70aeae
-SIZE (ansible-2.7.13.tar.gz) = 11861862
diff --git a/sysutils/anvil/Makefile b/sysutils/anvil/Makefile
index 434f72da3a05..da668468d9bd 100644
--- a/sysutils/anvil/Makefile
+++ b/sysutils/anvil/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	anvil
-PORTVERSION=	0.0.17
+PORTVERSION=	0.0.18
 CATEGORIES=	sysutils
 
 MAINTAINER=	dvl@FreeBSD.org
diff --git a/sysutils/anvil/distinfo b/sysutils/anvil/distinfo
index 8bbfa10159e8..35da909e767e 100644
--- a/sysutils/anvil/distinfo
+++ b/sysutils/anvil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566825251
-SHA256 (dlangille-anvil-0.0.17_GH0.tar.gz) = dd2a7c9db34bacfead786cca523ad702f02a5d90b7e0df317ae7d0f59f1f75f8
-SIZE (dlangille-anvil-0.0.17_GH0.tar.gz) = 80052
+TIMESTAMP = 1605016477
+SHA256 (dlangille-anvil-0.0.18_GH0.tar.gz) = ad6c4240f8d31a594c7024f4af29ad753656f4e28e159f7797ee9d9bd8fe6a8c
+SIZE (dlangille-anvil-0.0.18_GH0.tar.gz) = 80259
diff --git a/sysutils/anvil/files/pkg-install.in b/sysutils/anvil/files/pkg-install.in
index 9c15eb8fc418..2cafe5c6f292 100644
--- a/sysutils/anvil/files/pkg-install.in
+++ b/sysutils/anvil/files/pkg-install.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-
 if [ "$2" == "POST-INSTALL" ]; then
 	/usr/sbin/chown -R anvil:anvil /var/db/anvil
 fi
diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile
new file mode 100644
index 000000000000..98085c8096b4
--- /dev/null
+++ b/sysutils/apache-mesos/Makefile
@@ -0,0 +1,108 @@
+PORTNAME=	mesos
+PORTVERSION=	1.11.0
+PORTREVISION=	1
+CATEGORIES=	sysutils
+MASTER_SITES=	APACHE/mesos/${PORTVERSION}:mesos
+PKGNAMEPREFIX=	apache-
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:mesos
+DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+
+MAINTAINER=	james.wright@digital-chaos.com
+COMMENT=	Cluster manager providing resource isolation and sharing
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+IGNORE_FreeBSD_11=	does not build
+
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
+		elfio>0:devel/elfio \
+		http-parser>0:www/http-parser \
+		leveldb>0:databases/leveldb \
+		picojson>0:devel/picojson \
+		protobuf>0:devel/protobuf \
+		rapidjson>0:devel/rapidjson \
+		libzookeeper>0:devel/libzookeeper
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+		libcurl.so:ftp/curl \
+		libgpr.so:devel/grpc \
+		libglog.so:devel/glog \
+		libhttp_parser.so:www/http-parser \
+		libev.so:devel/libev \
+		libleveldb.so:databases/leveldb \
+		libprotobuf.so:devel/protobuf \
+		libsasl2.so:security/cyrus-sasl2 \
+		libsvn_delta-1.so:devel/subversion \
+		libsvn_subr-1.so:devel/subversion \
+		libzookeeper_mt.so:devel/libzookeeper
+
+USES=		gmake libarchive libtool python:run shebangfix
+USE_LDCONFIG=	yes
+SHEBANG_FILES=	src/cli/mesos-cat \
+		src/cli/mesos-ps \
+		src/cli/mesos-scp \
+		src/cli/mesos-tail
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-java \
+		--disable-python \
+		--disable-werror \
+		--with-apr=${LOCALBASE} \
+		--with-boost=${LOCALBASE} \
+		--with-elfio=${LOCALBASE} \
+		--with-glog=${LOCALBASE} \
+		--with-grpc=${LOCALBASE} \
+		--with-http_parser=${LOCALBASE} \
+		--with-leveldb=${LOCALBASE} \
+		--with-libarchive=${LOCALBASE} \
+		--with-libev=${LOCALBASE} \
+		--with-protobuf=${LOCALBASE} \
+		--with-picojson=${LOCALBASE} \
+		--with-rapidjson=${LOCALBASE} \
+		--with-sasl=${LOCALBASE} \
+		--with-svn=${LOCALBASE} \
+		--with-zookeeper=${LOCALBASE}
+
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFINE=	DEPLOY JAVA
+OPTIONS_SUB=	yes
+
+DEPLOY_DESC=	Install deploy scripts
+JAVA_DESC=	Enable Java bindings
+
+JAVA_CONFIGURE_ENABLE=	java
+JAVA_USE=		java=yes
+JAVA_BUILD_DEPENDS=	mvn:devel/maven
+JAVA_FETCH_DEPENDS=	mvn:devel/maven
+JAVA_CONFIGURE_ENV=	PROTOBUF_JAR="${MAVEN_REPO}/com/google/protobuf/protobuf-java/${PROTOBUF_VERSION}/protobuf-java-${PROTOBUF_VERSION}.jar"
+JAVA_MAKE_ENV=		MAVEN_OPTS="${MAVEN_OPTS}"
+JAVA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_java_mesos.pom.in
+
+# REVIEW: Can we figure out the current Protobuf version in ports instead of hardcoding???
+PROTOBUF_VERSION=	3.14.0
+
+MAVEN_CMD=		mvn
+MAVEN_REPO=		${WRKDIR}/mesos-maven-deps-${PORTVERSION}
+MAVEN_OPTS=		-Dmaven.repo.local=${MAVEN_REPO}
+MAVEN_ENV=		PROTOBUF_VERSION="${PROTOBUF_VERSION}" MAVEN_OPTS="${MAVEN_OPTS}"
+MAVEN_POM=		${FILESDIR}/maven-deps.pom
+
+DEV_BUILD_MODE=		no
+
+.if (${DEV_BUILD_MODE} == "yes")
+# Fetch Maven build dependencies upfront into local Maven Repo
+# Needs to be after extract (as WRKDIR gets wiped) but before Configure
+post-extract-JAVA-on:
+	@${SETENV} ${MAVEN_ENV} \
+	${MAVEN_CMD} -f ${MAVEN_POM} dependency:go-offline
+.else
+MASTER_SITES+=	https://github.com/Digital-Chaos/mesos-maven-deps/archive/${DISTVERSION}/:maven
+DISTFILES+=	mesos-maven-deps-${DISTVERSION}${EXTRACT_SUFX}:maven
+.endif
+
+# Replace Protobuf version in src/java/mesos.pom.in
+do-patch-JAVA-on:
+	@${REINPLACE_CMD} -e 's|@PROTOBUF_VERSION@|${PROTOBUF_VERSION}|g' ${WRKSRC}/src/java/mesos.pom.in
+
+.include <bsd.port.mk>
diff --git a/sysutils/apache-mesos/distinfo b/sysutils/apache-mesos/distinfo
new file mode 100644
index 000000000000..81c8c97caed9
--- /dev/null
+++ b/sysutils/apache-mesos/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1615762466
+SHA256 (apache-mesos/mesos-1.11.0.tar.gz) = ce08cb648a21502a4a0c45d240a596d9ac860fcaf717f9a3dc986da9d406fe34
+SIZE (apache-mesos/mesos-1.11.0.tar.gz) = 72210031
+SHA256 (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 98acd50b2d22018f5c79127ea14245e863c4c1bd0092c65c85ef9a147d488def
+SIZE (apache-mesos/mesos-maven-deps-1.11.0.tar.gz) = 36003620
diff --git a/sysutils/apache-mesos/files/extra-patch-src_java_mesos.pom.in b/sysutils/apache-mesos/files/extra-patch-src_java_mesos.pom.in
new file mode 100644
index 000000000000..b674ea07205b
--- /dev/null
+++ b/sysutils/apache-mesos/files/extra-patch-src_java_mesos.pom.in
@@ -0,0 +1,20 @@
+--- src/java/mesos.pom.in.orig	2020-06-16 03:05:20 UTC
++++ src/java/mesos.pom.in
+@@ -36,7 +36,7 @@
+     <dependency>
+       <artifactId>protobuf-java</artifactId>
+       <groupId>com.google.protobuf</groupId>
+-      <version>3.5.0</version>
++      <version>@PROTOBUF_VERSION@</version>
+     </dependency>
+   </dependencies>
+   <build>
+@@ -168,7 +168,7 @@
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-dependency-plugin</artifactId>
+-        <version>2.8</version>
++        <version>3.1.2</version>
+         <executions>
+           <execution>
+             <id>copy-dependencies</id>
diff --git a/sysutils/apache-mesos/files/maven-deps.pom b/sysutils/apache-mesos/files/maven-deps.pom
new file mode 100644
index 000000000000..eba73b330d63
--- /dev/null
+++ b/sysutils/apache-mesos/files/maven-deps.pom
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.mesos</groupId>
+  <artifactId>mesos</artifactId>
+  <name>mesos</name>
+  <version>1.11.0</version>
+  <description>The Apache Mesos Java API jar.</description>
+  <url>http://mesos.apache.org</url>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>11</version>
+  </parent>
+  <dependencies>
+    <dependency>
+      <artifactId>protobuf-java</artifactId>
+      <groupId>com.google.protobuf</groupId>
+      <version>${env.PROTOBUF_VERSION}</version>
+    </dependency>
+    <dependency>
+      <artifactId>apache-jar-resource-bundle</artifactId>
+      <groupId>org.apache</groupId>
+      <version>1.4</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+	<version>3.1.2</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-gpg-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
+
diff --git a/sysutils/apache-mesos/pkg-descr b/sysutils/apache-mesos/pkg-descr
new file mode 100644
index 000000000000..82d96d17ff08
--- /dev/null
+++ b/sysutils/apache-mesos/pkg-descr
@@ -0,0 +1,5 @@
+Apache Mesos abstracts CPU, memory, storage, and other compute resources away
+from machines (physical or virtual), enabling fault-tolerant and elastic
+distributed systems to easily be built and run effectively.
+
+WWW: http://mesos.apache.org/
diff --git a/sysutils/apache-mesos/pkg-plist b/sysutils/apache-mesos/pkg-plist
new file mode 100644
index 000000000000..f9d1a88a96bb
--- /dev/null
+++ b/sysutils/apache-mesos/pkg-plist
@@ -0,0 +1,573 @@
+bin/mesos
+bin/mesos-cat
+bin/mesos-execute
+bin/mesos-local
+bin/mesos-log
+bin/mesos-ps
+bin/mesos-resolve
+bin/mesos-scp
+bin/mesos-tail
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-agent-env.sh.template %%ETCDIR%%/mesos-agent-env.sh
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-deploy-env.sh.template %%ETCDIR%%/mesos-deploy-env.sh
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-master-env.sh.template %%ETCDIR%%/mesos-master-env.sh
+%%DEPLOY%%@sample %%ETCDIR%%/mesos-slave-env.sh.template %%ETCDIR%%/mesos-slave-env.sh
+include/concurrentqueue.h
+include/csi/v0/csi.grpc.pb.h
+include/csi/v0/csi.pb.h
+include/csi/v0/csi.proto
+include/csi/v1/csi.grpc.pb.h
+include/csi/v1/csi.pb.h
+include/csi/v1/csi.proto
+include/mesos/agent/agent.hpp
+include/mesos/agent/agent.pb.h
+include/mesos/agent/agent.proto
+include/mesos/agent/container_logger.hpp
+include/mesos/agent/containerizer.hpp
+include/mesos/agent/containerizer.pb.h
+include/mesos/agent/isolator.hpp
+include/mesos/agent/oversubscription.hpp
+include/mesos/agent/oversubscription.pb.h
+include/mesos/agent/oversubscription.proto
+include/mesos/agent/qos_controller.hpp
+include/mesos/agent/resource_estimator.hpp
+include/mesos/allocator/allocator.hpp
+include/mesos/allocator/allocator.pb.h
+include/mesos/allocator/allocator.proto
+include/mesos/appc/spec.hpp
+include/mesos/appc/spec.pb.h
+include/mesos/appc/spec.proto
+include/mesos/attributes.hpp
+include/mesos/authentication/authenticatee.hpp
+include/mesos/authentication/authentication.hpp
+include/mesos/authentication/authentication.pb.h
+include/mesos/authentication/authentication.proto
+include/mesos/authentication/authenticator.hpp
+include/mesos/authentication/http/authenticatee.hpp
+include/mesos/authentication/http/basic_authenticator_factory.hpp
+include/mesos/authentication/http/combined_authenticator.hpp
+include/mesos/authentication/secret_generator.hpp
+include/mesos/authorizer/acls.hpp
+include/mesos/authorizer/acls.pb.h
+include/mesos/authorizer/acls.proto
+include/mesos/authorizer/authorizer.hpp
+include/mesos/authorizer/authorizer.pb.h
+include/mesos/authorizer/authorizer.proto
+include/mesos/csi/v0.hpp
+include/mesos/csi/v1.hpp
+include/mesos/docker/spec.hpp
+include/mesos/docker/spec.pb.h
+include/mesos/docker/spec.proto
+include/mesos/docker/v1.hpp
+include/mesos/docker/v1.pb.h
+include/mesos/docker/v1.proto
+include/mesos/docker/v2.hpp
+include/mesos/docker/v2.pb.h
+include/mesos/docker/v2.proto
+include/mesos/docker/v2_2.hpp
+include/mesos/docker/v2_2.pb.h
+include/mesos/docker/v2_2.proto
+include/mesos/executor.hpp
+include/mesos/executor/executor.hpp
+include/mesos/executor/executor.pb.h
+include/mesos/executor/executor.proto
+include/mesos/fetcher/fetcher.hpp
+include/mesos/fetcher/fetcher.pb.h
+include/mesos/fetcher/fetcher.proto
+include/mesos/hook.hpp
+include/mesos/http.hpp
+include/mesos/log/log.hpp
+include/mesos/maintenance/maintenance.hpp
+include/mesos/maintenance/maintenance.pb.h
+include/mesos/maintenance/maintenance.proto
+include/mesos/master/contender.hpp
+include/mesos/master/detector.hpp
+include/mesos/master/master.hpp
+include/mesos/master/master.pb.h
+include/mesos/master/master.proto
+include/mesos/mesos.hpp
+include/mesos/mesos.pb.h
+include/mesos/mesos.proto
+include/mesos/module.hpp
+include/mesos/module/allocator.hpp
+include/mesos/module/anonymous.hpp
+include/mesos/module/authenticatee.hpp
+include/mesos/module/authenticator.hpp
+include/mesos/module/authorizer.hpp
+include/mesos/module/container_logger.hpp
+include/mesos/module/contender.hpp
+include/mesos/module/detector.hpp
+include/mesos/module/disk_profile_adaptor.hpp
+include/mesos/module/hook.hpp
+include/mesos/module/hook.pb.h
+include/mesos/module/hook.proto
+include/mesos/module/http_authenticatee.hpp
+include/mesos/module/http_authenticator.hpp
+include/mesos/module/isolator.hpp
+include/mesos/module/module.hpp
+include/mesos/module/module.pb.h
+include/mesos/module/module.proto
+include/mesos/module/qos_controller.hpp
+include/mesos/module/resource_estimator.hpp
+include/mesos/module/secret_generator.hpp
+include/mesos/module/secret_resolver.hpp
+include/mesos/oci/spec.hpp
+include/mesos/oci/spec.pb.h
+include/mesos/oci/spec.proto
+include/mesos/quota/quota.hpp
+include/mesos/quota/quota.pb.h
+include/mesos/quota/quota.proto
+include/mesos/resource_provider/resource_provider.hpp
+include/mesos/resource_provider/resource_provider.pb.h
+include/mesos/resource_provider/resource_provider.proto
+include/mesos/resource_provider/storage/disk_profile_adaptor.hpp
+include/mesos/resource_quantities.hpp
+include/mesos/resources.hpp
+include/mesos/roles.hpp
+include/mesos/scheduler.hpp
+include/mesos/scheduler/scheduler.hpp
+include/mesos/scheduler/scheduler.pb.h
+include/mesos/scheduler/scheduler.proto
+include/mesos/seccomp/seccomp.hpp
+include/mesos/seccomp/seccomp.pb.h
+include/mesos/seccomp/seccomp.proto
+include/mesos/secret/resolver.hpp
+include/mesos/slave
+include/mesos/state/in_memory.hpp
+include/mesos/state/leveldb.hpp
+include/mesos/state/log.hpp
+include/mesos/state/protobuf.hpp
+include/mesos/state/state.hpp
+include/mesos/state/state.pb.h
+include/mesos/state/state.proto
+include/mesos/state/storage.hpp
+include/mesos/state/zookeeper.hpp
+include/mesos/type_utils.hpp
+include/mesos/uri/fetcher.hpp
+include/mesos/uri/uri.hpp
+include/mesos/uri/uri.pb.h
+include/mesos/uri/uri.proto
+include/mesos/v1/agent/agent.hpp
+include/mesos/v1/agent/agent.pb.h
+include/mesos/v1/agent/agent.proto
+include/mesos/v1/allocator/allocator.pb.h
+include/mesos/v1/allocator/allocator.proto
+include/mesos/v1/attributes.hpp
+include/mesos/v1/executor.hpp
+include/mesos/v1/executor/executor.hpp
+include/mesos/v1/executor/executor.pb.h
+include/mesos/v1/executor/executor.proto
+include/mesos/v1/maintenance/maintenance.hpp
+include/mesos/v1/maintenance/maintenance.pb.h
+include/mesos/v1/maintenance/maintenance.proto
+include/mesos/v1/master/master.hpp
+include/mesos/v1/master/master.pb.h
+include/mesos/v1/master/master.proto
+include/mesos/v1/mesos.hpp
+include/mesos/v1/mesos.pb.h
+include/mesos/v1/mesos.proto
+include/mesos/v1/quota/quota.pb.h
+include/mesos/v1/quota/quota.proto
+include/mesos/v1/resource_provider.hpp
+include/mesos/v1/resource_provider/resource_provider.hpp
+include/mesos/v1/resource_provider/resource_provider.pb.h
+include/mesos/v1/resource_provider/resource_provider.proto
+include/mesos/v1/resources.hpp
+include/mesos/v1/scheduler.hpp
+include/mesos/v1/scheduler/scheduler.hpp
+include/mesos/v1/scheduler/scheduler.pb.h
+include/mesos/v1/scheduler/scheduler.proto
+include/mesos/v1/values.hpp
+include/mesos/values.hpp
+include/mesos/version.hpp
+include/mesos/zookeeper/authentication.hpp
+include/mesos/zookeeper/contender.hpp
+include/mesos/zookeeper/detector.hpp
+include/mesos/zookeeper/group.hpp
+include/mesos/zookeeper/url.hpp
+include/mesos/zookeeper/watcher.hpp
+include/mesos/zookeeper/zookeeper.hpp
+include/process/address.hpp
+include/process/after.hpp
+include/process/async.hpp
+include/process/authenticator.hpp
+include/process/check.hpp
+include/process/clock.hpp
+include/process/collect.hpp
+include/process/count_down_latch.hpp
+include/process/defer.hpp
+include/process/deferred.hpp
+include/process/delay.hpp
+include/process/dispatch.hpp
+include/process/event.hpp
+include/process/executor.hpp
+include/process/filter.hpp
+include/process/firewall.hpp
+include/process/future.hpp
+include/process/gmock.hpp
+include/process/grpc.hpp
+include/process/gtest.hpp
+include/process/gtest_constants.hpp
+include/process/help.hpp
+include/process/http.hpp
+include/process/id.hpp
+include/process/io.hpp
+include/process/jwt.hpp
+include/process/latch.hpp
+include/process/limiter.hpp
+include/process/logging.hpp
+include/process/loop.hpp
+include/process/message.hpp
+include/process/metrics/counter.hpp
+include/process/metrics/metric.hpp
+include/process/metrics/metrics.hpp
+include/process/metrics/pull_gauge.hpp
+include/process/metrics/push_gauge.hpp
+include/process/metrics/timer.hpp
+include/process/mime.hpp
+include/process/mutex.hpp
+include/process/network.hpp
+include/process/once.hpp
+include/process/owned.hpp
+include/process/pid.hpp
+include/process/process.hpp
+include/process/profiler.hpp
+include/process/protobuf.hpp
+include/process/queue.hpp
+include/process/reap.hpp
+include/process/run.hpp
+include/process/rwlock.hpp
+include/process/sequence.hpp
+include/process/shared.hpp
+include/process/socket.hpp
+include/process/ssl/flags.hpp
+include/process/ssl/gtest.hpp
+include/process/ssl/tls_config.hpp
+include/process/ssl/utilities.hpp
+include/process/state_machine.hpp
+include/process/statistics.hpp
+include/process/subprocess.hpp
+include/process/system.hpp
+include/process/time.hpp
+include/process/timeout.hpp
+include/process/timer.hpp
+include/process/timeseries.hpp
+include/stout/abort.hpp
+include/stout/adaptor.hpp
+include/stout/archiver.hpp
+include/stout/assert.hpp
+include/stout/attributes.hpp
+include/stout/base64.hpp
+include/stout/bits.hpp
+include/stout/boundedhashmap.hpp
+include/stout/bytes.hpp
+include/stout/cache.hpp
+include/stout/check.hpp
+include/stout/circular_buffer.hpp
+include/stout/cpp14.hpp
+include/stout/cpp17.hpp
+include/stout/duration.hpp
+include/stout/dynamiclibrary.hpp
+include/stout/elf.hpp
+include/stout/error.hpp
+include/stout/errorbase.hpp
+include/stout/exit.hpp
+include/stout/flags.hpp
+include/stout/flags/fetch.hpp
+include/stout/flags/flag.hpp
+include/stout/flags/flags.hpp
+include/stout/flags/parse.hpp
+include/stout/foreach.hpp
+include/stout/format.hpp
+include/stout/fs.hpp
+include/stout/gtest.hpp
+include/stout/gzip.hpp
+include/stout/hashmap.hpp
+include/stout/hashset.hpp
+include/stout/internal/windows/attributes.hpp
+include/stout/internal/windows/grp.hpp
+include/stout/internal/windows/longpath.hpp
+include/stout/internal/windows/overlapped.hpp
+include/stout/internal/windows/pwd.hpp
+include/stout/internal/windows/reparsepoint.hpp
+include/stout/internal/windows/symlink.hpp
+include/stout/interval.hpp
+include/stout/ip.hpp
+include/stout/json.hpp
+include/stout/jsonify.hpp
+include/stout/lambda.hpp
+include/stout/linkedhashmap.hpp
+include/stout/mac.hpp
+include/stout/multihashmap.hpp
+include/stout/multimap.hpp
+include/stout/net.hpp
+include/stout/none.hpp
+include/stout/nothing.hpp
+include/stout/numify.hpp
+include/stout/option.hpp
+include/stout/os.hpp
+include/stout/os/access.hpp
+include/stout/os/bootid.hpp
+include/stout/os/chdir.hpp
+include/stout/os/chroot.hpp
+include/stout/os/close.hpp
+include/stout/os/constants.hpp
+include/stout/os/copyfile.hpp
+include/stout/os/dup.hpp
+include/stout/os/environment.hpp
+include/stout/os/exec.hpp
+include/stout/os/exists.hpp
+include/stout/os/fcntl.hpp
+include/stout/os/find.hpp
+include/stout/os/fork.hpp
+include/stout/os/freebsd.hpp
+include/stout/os/fsync.hpp
+include/stout/os/ftruncate.hpp
+include/stout/os/getcwd.hpp
+include/stout/os/getenv.hpp
+include/stout/os/int_fd.hpp
+include/stout/os/kill.hpp
+include/stout/os/killtree.hpp
+include/stout/os/linux.hpp
+include/stout/os/ls.hpp
+include/stout/os/lseek.hpp
+include/stout/os/lsof.hpp
+include/stout/os/mkdir.hpp
+include/stout/os/mkdtemp.hpp
+include/stout/os/mktemp.hpp
+include/stout/os/open.hpp
+include/stout/os/os.hpp
+include/stout/os/osx.hpp
+include/stout/os/pagesize.hpp
+include/stout/os/permissions.hpp
+include/stout/os/pipe.hpp
+include/stout/os/posix/bootid.hpp
+include/stout/os/posix/chdir.hpp
+include/stout/os/posix/chown.hpp
+include/stout/os/posix/chroot.hpp
+include/stout/os/posix/close.hpp
+include/stout/os/posix/copyfile.hpp
+include/stout/os/posix/dup.hpp
+include/stout/os/posix/environment.hpp
+include/stout/os/posix/exec.hpp
+include/stout/os/posix/exists.hpp
+include/stout/os/posix/fcntl.hpp
+include/stout/os/posix/fork.hpp
+include/stout/os/posix/fsync.hpp
+include/stout/os/posix/ftruncate.hpp
+include/stout/os/posix/getcwd.hpp
+include/stout/os/posix/getenv.hpp
+include/stout/os/posix/kill.hpp
+include/stout/os/posix/killtree.hpp
+include/stout/os/posix/ls.hpp
+include/stout/os/posix/lseek.hpp
+include/stout/os/posix/lsof.hpp
+include/stout/os/posix/mkdir.hpp
+include/stout/os/posix/mkdtemp.hpp
+include/stout/os/posix/mktemp.hpp
+include/stout/os/posix/open.hpp
+include/stout/os/posix/pagesize.hpp
+include/stout/os/posix/pipe.hpp
+include/stout/os/posix/read.hpp
+include/stout/os/posix/realpath.hpp
+include/stout/os/posix/rename.hpp
+include/stout/os/posix/rm.hpp
+include/stout/os/posix/rmdir.hpp
+include/stout/os/posix/sendfile.hpp
+include/stout/os/posix/shell.hpp
+include/stout/os/posix/signals.hpp
+include/stout/os/posix/socket.hpp
+include/stout/os/posix/stat.hpp
+include/stout/os/posix/su.hpp
+include/stout/os/posix/temp.hpp
+include/stout/os/posix/which.hpp
+include/stout/os/posix/write.hpp
+include/stout/os/posix/xattr.hpp
+include/stout/os/process.hpp
+include/stout/os/pstree.hpp
+include/stout/os/raw/argv.hpp
+include/stout/os/raw/environment.hpp
+include/stout/os/read.hpp
+include/stout/os/realpath.hpp
+include/stout/os/rename.hpp
+include/stout/os/rm.hpp
+include/stout/os/rmdir.hpp
+include/stout/os/sendfile.hpp
+include/stout/os/shell.hpp
+include/stout/os/signals.hpp
+include/stout/os/socket.hpp
+include/stout/os/stat.hpp
+include/stout/os/strerror.hpp
+include/stout/os/su.hpp
+include/stout/os/sysctl.hpp
+include/stout/os/temp.hpp
+include/stout/os/touch.hpp
+include/stout/os/utime.hpp
+include/stout/os/wait.hpp
+include/stout/os/which.hpp
+include/stout/os/windows/bootid.hpp
+include/stout/os/windows/chdir.hpp
+include/stout/os/windows/chroot.hpp
+include/stout/os/windows/close.hpp
+include/stout/os/windows/copyfile.hpp
+include/stout/os/windows/dup.hpp
+include/stout/os/windows/environment.hpp
+include/stout/os/windows/exec.hpp
+include/stout/os/windows/exists.hpp
+include/stout/os/windows/fcntl.hpp
+include/stout/os/windows/fd.hpp
+include/stout/os/windows/fork.hpp
+include/stout/os/windows/fsync.hpp
+include/stout/os/windows/ftruncate.hpp
+include/stout/os/windows/getcwd.hpp
+include/stout/os/windows/getenv.hpp
+include/stout/os/windows/jobobject.hpp
+include/stout/os/windows/kill.hpp
+include/stout/os/windows/killtree.hpp
+include/stout/os/windows/ls.hpp
+include/stout/os/windows/lseek.hpp
+include/stout/os/windows/lsof.hpp
+include/stout/os/windows/mkdir.hpp
+include/stout/os/windows/mkdtemp.hpp
+include/stout/os/windows/mktemp.hpp
+include/stout/os/windows/open.hpp
+include/stout/os/windows/pagesize.hpp
+include/stout/os/windows/pipe.hpp
+include/stout/os/windows/read.hpp
+include/stout/os/windows/realpath.hpp
+include/stout/os/windows/rename.hpp
+include/stout/os/windows/rm.hpp
+include/stout/os/windows/rmdir.hpp
+include/stout/os/windows/sendfile.hpp
+include/stout/os/windows/shell.hpp
+include/stout/os/windows/socket.hpp
+include/stout/os/windows/stat.hpp
+include/stout/os/windows/su.hpp
+include/stout/os/windows/temp.hpp
+include/stout/os/windows/which.hpp
+include/stout/os/windows/write.hpp
+include/stout/os/windows/xattr.hpp
+include/stout/os/write.hpp
+include/stout/os/xattr.hpp
+include/stout/overload.hpp
+include/stout/path.hpp
+include/stout/posix/dynamiclibrary.hpp
+include/stout/posix/fs.hpp
+include/stout/posix/ip.hpp
+include/stout/posix/mac.hpp
+include/stout/posix/net.hpp
+include/stout/posix/os.hpp
+include/stout/preprocessor.hpp
+include/stout/proc.hpp
+include/stout/protobuf.hpp
+include/stout/recordio.hpp
+include/stout/representation.hpp
+include/stout/result.hpp
+include/stout/result_of.hpp
+include/stout/set.hpp
+include/stout/some.hpp
+include/stout/stopwatch.hpp
+include/stout/stringify.hpp
+include/stout/strings.hpp
+include/stout/subcommand.hpp
+include/stout/svn.hpp
+include/stout/synchronized.hpp
+include/stout/tests/environment.hpp
+include/stout/tests/utils.hpp
+include/stout/traits.hpp
+include/stout/try.hpp
+include/stout/unimplemented.hpp
+include/stout/unreachable.hpp
+include/stout/uri.hpp
+include/stout/utils.hpp
+include/stout/uuid.hpp
+include/stout/variant.hpp
+include/stout/version.hpp
+include/stout/windows.hpp
+include/stout/windows/dynamiclibrary.hpp
+include/stout/windows/error.hpp
+include/stout/windows/format.hpp
+include/stout/windows/fs.hpp
+include/stout/windows/ip.hpp
+include/stout/windows/mac.hpp
+include/stout/windows/net.hpp
+include/stout/windows/os.hpp
+lib/libfixed_resource_estimator-1.11.0.so
+lib/libfixed_resource_estimator.so
+lib/libload_qos_controller-1.11.0.so
+lib/libload_qos_controller.so
+lib/liblogrotate_container_logger-1.11.0.so
+lib/liblogrotate_container_logger.so
+lib/libmesos-1.11.0.so
+lib/libmesos.so
+lib/mesos/modules/libfixed_resource_estimator-1.11.0.so
+lib/mesos/modules/libfixed_resource_estimator.so
+lib/mesos/modules/libload_qos_controller-1.11.0.so
+lib/mesos/modules/libload_qos_controller.so
+lib/mesos/modules/liblogrotate_container_logger-1.11.0.so
+lib/mesos/modules/liblogrotate_container_logger.so
+lib/mesos/modules/liburi_disk_profile_adaptor-1.11.0.so
+lib/mesos/modules/liburi_disk_profile_adaptor.so
+libdata/pkgconfig/mesos.pc
+libexec/mesos/mesos-containerizer
+libexec/mesos/mesos-default-executor
+libexec/mesos/mesos-docker-executor
+libexec/mesos/mesos-executor
+libexec/mesos/mesos-fetcher
+libexec/mesos/mesos-io-switchboard
+libexec/mesos/mesos-logrotate-logger
+libexec/mesos/mesos-tcp-connect
+libexec/mesos/mesos-usage
+sbin/mesos-agent
+%%DEPLOY%%sbin/mesos-daemon.sh
+sbin/mesos-master
+sbin/mesos-slave
+%%DEPLOY%%sbin/mesos-start-agents.sh
+%%DEPLOY%%sbin/mesos-start-cluster.sh
+%%DEPLOY%%sbin/mesos-start-masters.sh
+%%DEPLOY%%sbin/mesos-start-slaves.sh
+%%DEPLOY%%sbin/mesos-stop-agents.sh
+%%DEPLOY%%sbin/mesos-stop-cluster.sh
+%%DEPLOY%%sbin/mesos-stop-masters.sh
+%%DEPLOY%%sbin/mesos-stop-slaves.sh
+%%DATADIR%%/webui/app/agents/agent-browse.html
+%%DATADIR%%/webui/app/agents/agent-executor.html
+%%DATADIR%%/webui/app/agents/agent-framework.html
+%%DATADIR%%/webui/app/agents/agent.html
+%%DATADIR%%/webui/app/agents/agents.html
+%%DATADIR%%/webui/app/app.js
+%%DATADIR%%/webui/app/controllers.js
+%%DATADIR%%/webui/app/frameworks/framework.html
+%%DATADIR%%/webui/app/frameworks/frameworks.html
+%%DATADIR%%/webui/app/frameworks/roles-tree-root.html
+%%DATADIR%%/webui/app/frameworks/roles-tree.html
+%%DATADIR%%/webui/app/frameworks/roles.html
+%%DATADIR%%/webui/app/home.html
+%%DATADIR%%/webui/app/maintenance/maintenance.html
+%%DATADIR%%/webui/app/offers/offers.html
+%%DATADIR%%/webui/app/roles/roles.html
+%%DATADIR%%/webui/app/services.js
+%%DATADIR%%/webui/app/shared/pagination.html
+%%DATADIR%%/webui/app/shared/pailer.html
+%%DATADIR%%/webui/app/shared/table-header.html
+%%DATADIR%%/webui/app/shared/timestamp.html
+%%DATADIR%%/webui/assets/css/bootstrap-3.3.6.min.css
+%%DATADIR%%/webui/assets/css/bootstrap-table-1.11.1.min.css
+%%DATADIR%%/webui/assets/css/mesos.css
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.eot
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.svg
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.ttf
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.woff
+%%DATADIR%%/webui/assets/fonts/glyphicons-halflings-regular.woff2
+%%DATADIR%%/webui/assets/ico/favicon.ico
+%%DATADIR%%/webui/assets/img/loading.gif
+%%DATADIR%%/webui/assets/img/mesos-logo.png
+%%DATADIR%%/webui/assets/libs/angular-1.2.32.min.js
+%%DATADIR%%/webui/assets/libs/angular-route-1.2.32.min.js
+%%DATADIR%%/webui/assets/libs/bootstrap-table-1.11.1.min.js
+%%DATADIR%%/webui/assets/libs/clipboard-1.5.16.min.js
+%%DATADIR%%/webui/assets/libs/jquery-3.2.1.min.js
+%%DATADIR%%/webui/assets/libs/jquery.pailer.js
+%%DATADIR%%/webui/assets/libs/relative-date.js
+%%DATADIR%%/webui/assets/libs/ui-bootstrap-tpls-0.9.0.min.js
+%%DATADIR%%/webui/assets/libs/underscore-1.4.3.min.js
+%%DATADIR%%/webui/index.html
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index 3d829bdfc660..17a2419233d2 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -1,5 +1,4 @@
 # Created by: Sebastian Yepes F. <esn@x123.info>
-# $FreeBSD$
 
 PORTNAME=	apachetop
 PORTVERSION=	0.18.4
diff --git a/sysutils/apcctrl/Makefile b/sysutils/apcctrl/Makefile
new file mode 100644
index 000000000000..97b767c389c6
--- /dev/null
+++ b/sysutils/apcctrl/Makefile
@@ -0,0 +1,79 @@
+# Created by: Lars Köller <Lars.Koeller@Uni-Bielefeld.DE>
+
+PORTNAME=	apcctrl
+PORTVERSION=	0.8.21
+PORTREVISION=	1
+CATEGORIES=	sysutils
+MASTER_SITES=	SF/${PORTNAME}
+
+MAINTAINER=	lobo@bsd.com.br
+COMMENT=	Fork of apcupsd 3.14.x with support for Brazilian APC nobreaks
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gmake
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
+		--with-nologin=/var/run \
+		--disable-install-distdir \
+		--sysconfdir=${ETCDIR}
+
+CONFIGURE_ENV+=	LD="${CXX}" \
+		ac_cv_path_SHUTDOWN="/sbin/shutdown"
+
+USE_RC_SUBR=	apcctrl
+SUB_FILES=	pkg-message
+
+CONFLICTS_INSTALL=	apcupsd
+
+OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV BRAZIL_DRV CGI GAPCMON MODBUS \
+		MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \
+		TCP_WRAPPERS TEST_DRV USB_DRV
+OPTIONS_DEFAULT=	BRAZIL_DRV
+OPTIONS_SUB=	yes
+
+APCDUMB_DRV_DESC=	Dumb UPS driver support
+APCSMART_DRV_DESC=	APC SmartUPS serial driver support
+BRAZIL_DRV_DESC=	Brazilian APC-Microsol support
+CGI_DESC=		Build CGI programs to show status
+GAPCMON_DESC=		Build GTK GUI front-end
+MODBUS_DESC=		MODBUS driver support
+MODBUS_USB_DESC=	MODBUS USB driver support
+PCNET_DRV_DESC=		PowerChute Network Shutdown driver support
+SHUTDOWN_POWEROFF_DESC=	Shutdown behavior with Halt and Power off
+SNMP_DRV_DESC=		SNMP driver support
+SNMP_DRV_OLD_DESC=	Old SNMP driver support
+TCP_WRAPPERS_DESC=	${LIBWRAP_DESC}
+TEST_DRV_DESC=		Test driver support
+USB_DRV_DESC=		USB driver support
+
+APCDUMB_DRV_CONFIGURE_ENABLE=	dumb
+APCSMART_DRV_CONFIGURE_ENABLE=	apcsmart
+BRAZIL_DRV_CONFIGURE_ENABLE=	brazil
+CGI_CONFIGURE_ENABLE=		cgi
+CGI_CONFIGURE_ON=		--with-cgi-bin=${ETCDIR}/cgi
+CGI_LIB_DEPENDS=		libgd.so:graphics/gd
+GAPCMON_CONFIGURE_ENABLE=	gapcmon
+GAPCMON_USES=			gnome pkgconfig xorg
+GAPCMON_USE=			GNOME=cairo,gconf2,gdkpixbuf2 XORG=x11,xext
+GAPCMON_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2
+GAPCMON_CONFLICTS=		gapcmon
+MODBUS_CONFIGURE_ENABLE=	modbus
+MODBUS_USB_CONFIGURE_ENABLE=	modbus-usb
+PCNET_DRV_CONFIGURE_ENABLE=	pcnet
+SNMP_DRV_CONFIGURE_ENABLE=	snmp
+SNMP_DRV_OLD_CONFIGURE_ENABLE=	net-snmp
+SNMP_DRV_OLD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+TCP_WRAPPERS_CONFIGURE_WITH=	libwrap=yes
+TEST_DRV_CONFIGURE_ENABLE=	test
+USB_DRV_CONFIGURE_ENABLE=	usb
+
+.include <bsd.port.options.mk>
+
+post-patch-SHUTDOWN_POWEROFF-on:
+	${REINPLACE_CMD} -e 's|-h now|-p now|' \
+		${WRKSRC}/platforms/freebsd/apccontrol.in
+
+.include <bsd.port.mk>
diff --git a/sysutils/apcctrl/distinfo b/sysutils/apcctrl/distinfo
new file mode 100644
index 000000000000..fc2e99d48e8a
--- /dev/null
+++ b/sysutils/apcctrl/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1572562006
+SHA256 (apcctrl-0.8.21.tar.gz) = ad3bc43de922f25e98db6e97390034600d094b257458b25ee8677b1c63b0f1bf
+SIZE (apcctrl-0.8.21.tar.gz) = 3531048
diff --git a/sysutils/apcctrl/files/apcctrl.in b/sysutils/apcctrl/files/apcctrl.in
new file mode 100644
index 000000000000..2d0170aaa9e2
--- /dev/null
+++ b/sysutils/apcctrl/files/apcctrl.in
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# PROVIDE: apcctrl
+# REQUIRE: SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable apcctrl
+#
+# apcctrl_enable (bool):	Set to "NO" by default.
+#				Set it to "YES" to enable apcctrl.
+# apcctrl_flags (str):		Custom additional arguments to be passed
+#				to apcctrl (default --kill-on-powerfail).
+# apcctrl_configs (str):	A list of configs to run multiple instances.
+#
+
+. /etc/rc.subr
+
+name=apcctrl
+rcvar=apcctrl_enable
+
+load_rc_config $name
+
+: ${apcctrl_enable="NO"}
+: ${apcctrl_flags="--kill-on-powerfail"}
+
+pidfile=/var/run/${name}.pid
+required_files="${apcctrl_configs:-%%ETCDIR%%/apcctrl.conf}"
+command=%%PREFIX%%/sbin/${name}
+restart_cmd=${name}_restart_cmd
+
+apcctrl_precmd()
+{
+	config=$1
+
+	dn="`/usr/bin/dirname ${pidfile}`"
+	if [ -n "${config}" ]; then
+		# Specific config
+		base="`/usr/bin/basename ${config} .conf`"
+		pidfile="${dn}/${base}.pid"
+		command_args="-f ${config} -P ${pidfile}"
+	else
+		# Default config
+		command_args=""
+	fi
+}
+
+apcctrl_restart_cmd()
+{
+	if [ -n "${apcctrl_configs}" ]; then
+		# One or more named configs
+		for config in ${apcctrl_configs}; do
+			apcctrl_precmd ${config}
+			run_rc_command stop
+		done
+		for config in ${apcctrl_configs}; do
+			apcctrl_precmd ${config}
+			run_rc_command start
+		done
+	else
+		# Default config
+		apcctrl_precmd
+		run_rc_command stop
+		run_rc_command start
+	fi
+}
+
+if [ "$1" = restart ]; then
+	apcctrl_precmd
+	run_rc_command $1
+elif [ -n "${apcctrl_configs}" ]; then
+	# One or more named configs
+	for config in ${apcctrl_configs}; do
+		apcctrl_precmd ${config}
+		run_rc_command $1
+	done
+else
+	# Default config
+	apcctrl_precmd
+	run_rc_command $1
+fi
diff --git a/sysutils/apcctrl/files/patch-configure b/sysutils/apcctrl/files/patch-configure
new file mode 100644
index 000000000000..f85b164c2cb2
--- /dev/null
+++ b/sysutils/apcctrl/files/patch-configure
@@ -0,0 +1,76 @@
+--- configure.orig	2016-04-18 20:26:31 UTC
++++ configure
+@@ -7470,7 +7470,7 @@
+ $as_echo_n "checking for libwrap... " >&6; }
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+- #include <tcpd.h>
++ #include "tcpd.h"
+               int deny_severity = 0;
+               int allow_severity = 0;
+               struct request_info *req;
+@@ -7493,7 +7493,7 @@
+    LIBS="$saved_LIBS -lwrap -lnsl"
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+- #include <tcpd.h>
++ ##include "tcpd.h"
+                    int deny_severity = 0;
+                    int allow_severity = 0;
+                    struct request_info *req;
+@@ -8548,55 +8548,6 @@
+    ;;
+ esac
+ 
+-if test -n "$GCC"; then
+-   # Starting with GCC 3.0, you must link C++ programs against either
+-   # libstdc++ (shared by default), or libsupc++ (always static).  If
+-   # you care about binary portability between Linux distributions,
+-   # you need to either 1) build your own GCC with static C++ libraries
+-   # or 2) link using gcc and libsupc++.  We choose the latter since
+-   # CUPS doesn't (currently) use any of the stdc++ library.
+-   #
+-   # Previous versions of GCC do not have the reliance on the stdc++
+-   # or g++ libraries, so the extra supc++ library is not needed.
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libsupc++ is required" >&5
+-$as_echo_n "checking if libsupc++ is required... " >&6; }
+-
+-   SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
+-   case "$SUPC" in
+-   libsupc++.a*)
+-      # Library not found, so this is an older GCC...
+-      LD="$CXX"
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-      ;;
+-   *)
+-      # This is gcc 3.x, and it knows of libsupc++, so we need it
+-      LIBS="$LIBS -lsupc++"
+-      LD="$CC"
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-      # See if this system has a broken libsupc++ that requires
+-      # a workaround (FreeBSD 5.x, 6.x)
+-      case $host in
+-         *-*-freebsd*)
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libsupc++ is missing __terminate_handler" >&5
+-$as_echo_n "checking if libsupc++ is missing __terminate_handler... " >&6; }
+-            nm -C --defined-only "$SUPC" 2>/dev/null | grep __terminate_handler > /dev/null
+-            if test $? -eq 0 ; then
+-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-            else
+-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes -- will attempt workaround" >&5
+-$as_echo "yes -- will attempt workaround" >&6; }
+-               LIBEXTRAOBJ="$LIBEXTRAOBJ libsupc++fix.cpp"
+-            fi
+-            ;;
+-      esac
+-      ;;
+-   esac
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-exceptions" >&5
+ $as_echo_n "checking whether C compiler accepts -fno-exceptions... " >&6; }
+ if ${ax_cv_check_cflags___fno_exceptions+:} false; then :
diff --git a/sysutils/apcctrl/files/patch-include_tcpd.h b/sysutils/apcctrl/files/patch-include_tcpd.h
new file mode 100644
index 000000000000..f10f683e157a
--- /dev/null
+++ b/sysutils/apcctrl/files/patch-include_tcpd.h
@@ -0,0 +1,238 @@
+--- include/tcpd.h.orig	2016-06-15 10:03:22 UTC
++++ include/tcpd.h
+@@ -0,0 +1,235 @@
++ /*
++  * @(#) tcpd.h 1.5 96/03/19 16:22:24
++  * 
++  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
++  */
++
++/* 
++ * This version of the file has been hacked over by 
++ *   Kern Sibbald to make it compatible with C++ for 
++ *   the few functions that Bacula uses.  19 April 2002
++ *  It now compiles with C++ but remains untested.
++ *  A correct fix would require significantly more work.
++ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* Structure to describe one communications endpoint. */
++
++#define STRING_LENGTH   128             /* hosts, users, processes */
++
++struct host_info {
++    char    name[STRING_LENGTH];        /* access via eval_hostname(host) */
++    char    addr[STRING_LENGTH];        /* access via eval_hostaddr(host) */
++    struct sockaddr_in *sin;            /* socket address or 0 */
++    struct t_unitdata *unit;            /* TLI transport address or 0 */
++    struct request_info *request;       /* for shared information */
++};
++
++/* Structure to describe what we know about a service request. */
++
++struct request_info {
++    int     fd;                         /* socket handle */
++    char    user[STRING_LENGTH];        /* access via eval_user(request) */
++    char    daemon[STRING_LENGTH];      /* access via eval_daemon(request) */
++    char    pid[10];                    /* access via eval_pid(request) */
++    struct host_info client[1];         /* client endpoint info */
++    struct host_info server[1];         /* server endpoint info */
++    void  (*sink) (void);               /* datagram sink function or 0 */
++    void  (*hostname) (void);           /* address to printable hostname */
++    void  (*hostaddr) (void);           /* address to printable address */
++    void  (*cleanup) (void);            /* cleanup function or 0 */
++    struct netconfig *config;           /* netdir handle */
++};
++
++/* Common string operations. Less clutter should be more readable. */
++
++#define STRN_CPY(d,s,l) { strncpy((d),(s),(l)); (d)[(l)-1] = 0; }
++
++#define STRN_EQ(x,y,l)  (strncasecmp((x),(y),(l)) == 0)
++#define STRN_NE(x,y,l)  (strncasecmp((x),(y),(l)) != 0)
++#define STR_EQ(x,y)     (strcasecmp((x),(y)) == 0)
++#define STR_NE(x,y)     (strcasecmp((x),(y)) != 0)
++
++ /*
++  * Initially, all above strings have the empty value. Information that
++  * cannot be determined at runtime is set to "unknown", so that we can
++  * distinguish between `unavailable' and `not yet looked up'. A hostname
++  * that we do not believe in is set to "paranoid".
++  */
++
++#define STRING_UNKNOWN  "unknown"       /* lookup failed */
++#define STRING_PARANOID "paranoid"      /* hostname conflict */
++
++extern char unknown[];
++extern char paranoid[];
++
++#define HOSTNAME_KNOWN(s) (STR_NE((s),unknown) && STR_NE((s),paranoid))
++
++#define NOT_INADDR(s) (s[strspn(s,"01234567890./")] != 0)
++
++/* Global functions. */
++
++#if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
++extern void fromhost();                 /* get/validate client host info */
++#else
++#define fromhost sock_host              /* no TLI support needed */
++#endif
++
++extern int hosts_access(struct request_info *); /* access control */
++extern void shell_cmd(void);            /* execute shell command */
++extern char *percent_x(void);               /* do %<char> expansion */
++extern void rfc931(void);                   /* client name from RFC 931 daemon */
++extern void clean_exit(void);               /* clean up and exit */
++extern void refuse(void);                   /* clean up and exit */
++extern char *xgets(void);                   /* fgets() on steroids */
++extern char *split_at(void);                /* strchr() and split */
++extern unsigned long dot_quad_addr(void);   /* restricted inet_addr() */
++
++/* Global variables. */
++
++extern int allow_severity;              /* for connection logging */
++extern int deny_severity;               /* for connection logging */
++extern char *hosts_allow_table;         /* for verification mode redirection */
++extern char *hosts_deny_table;          /* for verification mode redirection */
++extern int hosts_access_verbose;        /* for verbose matching mode */
++extern int rfc931_timeout;              /* user lookup timeout */
++extern int resident;                    /* > 0 if resident process */
++
++ /*
++  * Routines for controlled initialization and update of request structure
++  * attributes. Each attribute has its own key.
++  */
++
++#ifdef __STDC__
++extern struct request_info *request_init(struct request_info *,...);
++extern struct request_info *request_set(struct request_info *,...);
++#else
++extern struct request_info *request_init();     /* initialize request */
++extern struct request_info *request_set();      /* update request structure */
++#endif
++
++#define RQ_FILE         1               /* file descriptor */
++#define RQ_DAEMON       2               /* server process (argv[0]) */
++#define RQ_USER         3               /* client user name */
++#define RQ_CLIENT_NAME  4               /* client host name */
++#define RQ_CLIENT_ADDR  5               /* client host address */
++#define RQ_CLIENT_SIN   6               /* client endpoint (internal) */
++#define RQ_SERVER_NAME  7               /* server host name */
++#define RQ_SERVER_ADDR  8               /* server host address */
++#define RQ_SERVER_SIN   9               /* server endpoint (internal) */
++
++ /*
++  * Routines for delayed evaluation of request attributes. Each attribute
++  * type has its own access method. The trivial ones are implemented by
++  * macros. The other ones are wrappers around the transport-specific host
++  * name, address, and client user lookup methods. The request_info and
++  * host_info structures serve as caches for the lookup results.
++  */
++
++extern char *eval_user(void);               /* client user */
++extern char *eval_hostname(void);           /* printable hostname */
++extern char *eval_hostaddr(void);           /* printable host address */
++extern char *eval_hostinfo(void);           /* host name or address */
++extern char *eval_client(struct request_info *); /* whatever is available */
++extern char *eval_server(void);             /* whatever is available */
++#define eval_daemon(r)  ((r)->daemon)   /* daemon process name */
++#define eval_pid(r)     ((r)->pid)      /* process id */
++
++/* Socket-specific methods, including DNS hostname lookups. */
++
++extern void sock_host(struct request_info *); 
++extern void sock_hostname(void);            /* translate address to hostname */
++extern void sock_hostaddr(void);            /* address to printable address */
++#define sock_methods(r) \
++        { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
++
++/* The System V Transport-Level Interface (TLI) interface. */
++
++#if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
++extern void tli_host();                 /* look up endpoint addresses etc. */
++#endif
++
++ /*
++  * Problem reporting interface. Additional file/line context is reported
++  * when available. The jump buffer (tcpd_buf) is not declared here, or
++  * everyone would have to include <setjmp.h>.
++  */
++
++#ifdef __STDC__
++extern void tcpd_warn(char *, ...);     /* report problem and proceed */
++extern void tcpd_jump(char *, ...);     /* report problem and jump */
++#else
++extern void tcpd_warn();
++extern void tcpd_jump();
++#endif
++
++struct tcpd_context {
++    char   *file;                       /* current file */
++    int     line;                       /* current line */
++};
++extern struct tcpd_context tcpd_context;
++
++ /*
++  * While processing access control rules, error conditions are handled by
++  * jumping back into the hosts_access() routine. This is cleaner than
++  * checking the return value of each and every silly little function. The
++  * (-1) returns are here because zero is already taken by longjmp().
++  */
++
++#define AC_PERMIT       1               /* permit access */
++#define AC_DENY         (-1)            /* deny_access */
++#define AC_ERROR        AC_DENY         /* XXX */
++
++ /*
++  * In verification mode an option function should just say what it would do,
++  * instead of really doing it. An option function that would not return
++  * should clear the dry_run flag to inform the caller of this unusual
++  * behavior.
++  */
++
++extern void process_options(void);          /* execute options */
++extern int dry_run;                     /* verification flag */
++
++/* Bug workarounds. */
++
++#ifdef INET_ADDR_BUG                    /* inet_addr() returns struct */
++#define inet_addr fix_inet_addr
++extern long fix_inet_addr(void);
++#endif
++
++#ifdef BROKEN_FGETS                     /* partial reads from sockets */
++#define fgets fix_fgets
++extern char *fix_fgets(void);
++#endif
++
++#ifdef RECVFROM_BUG                     /* no address family info */
++#define recvfrom fix_recvfrom
++extern int fix_recvfrom(void);
++#endif
++
++#ifdef GETPEERNAME_BUG                  /* claims success with UDP */
++#define getpeername fix_getpeername
++extern int fix_getpeername(void);
++#endif
++
++#ifdef SOLARIS_24_GETHOSTBYNAME_BUG     /* lists addresses as aliases */
++#define gethostbyname fix_gethostbyname
++extern struct hostent *fix_gethostbyname(void);
++#endif
++
++#ifdef USE_STRSEP                       /* libc calls strtok(void) */
++#define strtok  fix_strtok
++extern char *fix_strtok(void);
++#endif
++
++#ifdef LIBC_CALLS_STRTOK                /* libc calls strtok() */
++#define strtok  my_strtok
++extern char *my_strtok(void);
++#endif
++
++#ifdef __cplusplus
++}
++#endif
diff --git a/sysutils/apcctrl/files/patch-platforms_etc_Makefile b/sysutils/apcctrl/files/patch-platforms_etc_Makefile
new file mode 100644
index 000000000000..5ce0d6cd4e26
--- /dev/null
+++ b/sysutils/apcctrl/files/patch-platforms_etc_Makefile
@@ -0,0 +1,21 @@
+--- platforms/etc/Makefile.orig	2014-04-09 22:15:34 UTC
++++ platforms/etc/Makefile
+@@ -8,12 +8,12 @@ all-uninstall: uninstall-etc
+ 
+ install-etc:
+ 	$(call MKDIR,$(sysconfdir))
+-	$(call INSTNEW,644,apcctrl.conf,$(sysconfdir))
+-	$(call INSTORIG,744,changeme,$(sysconfdir))
+-	$(call INSTORIG,744,commfailure,$(sysconfdir))
+-	$(call INSTORIG,744,commok,$(sysconfdir))
+-	$(call INSTORIG,744,offbattery,$(sysconfdir))
+-	$(call INSTORIG,744,onbattery,$(sysconfdir))
++	$(call INSTDATA,644,apcctrl.conf,$(sysconfdir)/apcctrl.conf.sample)
++	$(call INSTDATA,744,changeme,$(sysconfdir)/changeme.sample)
++	$(call INSTDATA,744,commfailure,$(sysconfdir)/commfailure.sample)
++	$(call INSTDATA,744,commok,$(sysconfdir)/commok.sample)
++	$(call INSTDATA,744,offbattery,$(sysconfdir)/offbattery.sample)
++	$(call INSTDATA,744,onbattery,$(sysconfdir)/onbattery.sample)
+ 
+ uninstall-etc:
+ 
diff --git a/sysutils/apcctrl/files/patch-src_cgi_Makefile b/sysutils/apcctrl/files/patch-src_cgi_Makefile
new file mode 100644
index 000000000000..d27a7f4cf4d2
--- /dev/null
+++ b/sysutils/apcctrl/files/patch-src_cgi_Makefile
@@ -0,0 +1,15 @@
+--- src/cgi/Makefile.orig	2014-11-04 19:17:43 UTC
++++ src/cgi/Makefile
+@@ -43,9 +43,9 @@ install-cgi:
+ 	$(call INSTPROG,755,upsfstats.cgi,$(cgibin))
+ 	$(call INSTPROG,755,upsimage.cgi,$(cgibin))
+ 	$(call MKDIR,$(sysconfdir))
+-	$(call INSTNEW,644,apcctrl.css,$(sysconfdir))
+-	$(call INSTNEW,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir))
+-	$(call INSTNEW,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir))
++	$(call INSTDATA,644,apcctrl.css,$(sysconfdir)/apcctrl.css.sample)
++	$(call INSTDATA,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir)/hosts.conf.sample)
++	$(call INSTDATA,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir)/multimon.conf.sample)
+ 
+ uninstall-cgi:
+ 	$(call UNINST,$(cgibin)/multimon.cgi)
diff --git a/sysutils/apcctrl/files/pkg-message.in b/sysutils/apcctrl/files/pkg-message.in
new file mode 100644
index 000000000000..1c627be5ba81
--- /dev/null
+++ b/sysutils/apcctrl/files/pkg-message.in
@@ -0,0 +1,32 @@
+[
+{ type: install
+  message: <<EOM
+
+Sample files and scripts are installed in %%ETCDIR%%.
+
+Some examples of devices:
+ /dev/ttyU0    /dev/ttyUSB.nobreak
+ /dev/ttyUSB0  /dev/ttyUSB1  /dev/ttyUSB2
+ /dev/ttyACM0  /dev/ttyACM1  /dev/ttyACM2
+
+Add apcctrl_enable=YES to your /etc/rc.conf[.local] to have apcctrl
+starting up at boot time.
+
+For default, apcctrl starts with `--kill-on-powerfail` parameter.
+Please, read its man page, and if this is not the intended behavior you want,
+change it accordingly.
+
+In some systems where the shutdown can take a while (like in bhyve environment),
+you may want to change this behavior as follows:
+
+Set apcctrl_flags="--term-on-powerfail" on your /etc/rc.conf[.local].
+
+Add this to /etc/rc.shutdown, after the "Insert other shutdown procedures here"
+line:
+  test -f /var/run/powerfail && /usr/local/sbin/apcctrl --hibernate
+  or
+  test -f /var/run/powerfail && /usr/local/sbin/apcctrl --power-off
+
+EOM
+}
+]
diff --git a/sysutils/apcctrl/pkg-descr b/sysutils/apcctrl/pkg-descr
new file mode 100644
index 000000000000..d6310595e940
--- /dev/null
+++ b/sysutils/apcctrl/pkg-descr
@@ -0,0 +1,15 @@
+ApcCtrl is an unofficial branch from apcupsd 3.14.x. It can be
+used for controlling Brazilian APC UPS models (herited from Microsol).
+
+Models supported or in tests:
+  - BACK-UPS BR 1200VA (BZ1200BI-BR)
+  - BACK-UPS BR 1500VA (BZ1500PBI-BR)
+  - BACK-UPS BR 2200VA (BZ2200BI-BR and BZ2200I-BR)
+  - SMART-UPS BR 1000VA (SUA1000BI-BR and SOLIS1000BI)
+  - SMART-UPS BR 1500VA (SUA1500BI-BR and SOLIS1500BI)
+  - SMART-UPS BR 2000VA (SUA2000BI-BR)
+  - SMART-UPS BR 3000VA (SUA3000BI-BR)
+  - STAY 800 (PS800)
+  - STAY 700 (PS700)
+
+WWW: http://www.apcctrl.com.br
diff --git a/sysutils/apcctrl/pkg-plist b/sysutils/apcctrl/pkg-plist
new file mode 100644
index 000000000000..73c895c891ef
--- /dev/null
+++ b/sysutils/apcctrl/pkg-plist
@@ -0,0 +1,30 @@
+sbin/apcctrl
+sbin/apcaccess
+sbin/apctest
+@sample %%ETCDIR%%/apcctrl.conf.sample
+%%ETCDIR%%/apccontrol
+@sample %%ETCDIR%%/changeme.sample
+@sample %%ETCDIR%%/commfailure.sample
+@sample %%ETCDIR%%/commok.sample
+@sample %%ETCDIR%%/onbattery.sample
+@sample %%ETCDIR%%/offbattery.sample
+%%CGI%%@sample %%ETCDIR%%/apcctrl.css.sample
+%%CGI%%@sample %%ETCDIR%%/hosts.conf.sample
+%%CGI%%@sample %%ETCDIR%%/multimon.conf.sample
+%%CGI%%%%ETCDIR%%/cgi/multimon.cgi
+%%CGI%%%%ETCDIR%%/cgi/upsfstats.cgi
+%%CGI%%%%ETCDIR%%/cgi/upsimage.cgi
+%%CGI%%%%ETCDIR%%/cgi/upsstats.cgi
+%%GAPCMON%%bin/gapcmon
+%%GAPCMON%%share/applications/gapcmon.desktop
+%%GAPCMON%%share/pixmaps/apcctrl.png
+%%GAPCMON%%share/pixmaps/charging.png
+%%GAPCMON%%share/pixmaps/gapc_prefs.png
+%%GAPCMON%%share/pixmaps/onbatt.png
+%%GAPCMON%%share/pixmaps/online.png
+%%GAPCMON%%share/pixmaps/unplugged.png
+man/man5/apcctrl.conf.5.gz
+man/man8/apcaccess.8.gz
+man/man8/apccontrol.8.gz
+man/man8/apctest.8.gz
+man/man8/apcctrl.8.gz
diff --git a/sysutils/apcpwr/Makefile b/sysutils/apcpwr/Makefile
index f38a83d51e0e..0ea6e9e89114 100644
--- a/sysutils/apcpwr/Makefile
+++ b/sysutils/apcpwr/Makefile
@@ -1,5 +1,4 @@
 # Created by: jwd
-# $FreeBSD$
 
 PORTNAME=		apcpwr
 PORTVERSION=		1.3
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 6fba358ca225..ddca5dc0d546 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,9 +1,8 @@
 # Created by: Lars Köller <Lars.Koeller@Uni-Bielefeld.DE>
-# $FreeBSD$
 
 PORTNAME=	apcupsd
 PORTVERSION=	3.14.14
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
 
@@ -27,9 +26,11 @@ CONFIGURE_ENV+=	LD="${CXX}" \
 USE_RC_SUBR=	apcupsd
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY DOCS GAPCMON MODBUS \
+CONFLICTS_INSTALL=	apcctrl
+
+OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY GAPCMON MODBUS \
 		MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \
-		TCP_WRAPPERS TEST_DRV USB_DRV
+		TCP_WRAPPERS TEST_DRV USB_DRV USB_REPORTING
 OPTIONS_DEFAULT=	APCDUMB_DRV APCSMART_DRV MODBUS MODBUS_USB PCNET_DRV \
 		SNMP_DRV TCP_WRAPPERS USB_DRV
 OPTIONS_SUB=	yes
@@ -48,6 +49,7 @@ SNMP_DRV_OLD_DESC=	Old SNMP driver support
 TCP_WRAPPERS_DESC=	${LIBWRAP_DESC}
 TEST_DRV_DESC=		Test driver support
 USB_DRV_DESC=		USB driver support
+USB_REPORTING_DESC=	Experimental patch for faulty USB reporting
 
 APCDUMB_DRV_CONFIGURE_ENABLE=	dumb
 APCSMART_DRV_CONFIGURE_ENABLE=	apcsmart
@@ -58,9 +60,11 @@ CLIENT_ONLY_CONFIGURE_ON=	--enable-net \
 				--disable-apcsmart --disable-dumb --disable-usb \
 				--disable-snmp --disable-test --disable-pcnet
 GAPCMON_CONFIGURE_ENABLE=	gapcmon
-GAPCMON_USES=			pkgconfig
-GAPCMON_USE=			GNOME=gconf2
-GAPCMON_CONFLICTS=		gapcmon-[0-9]*
+GAPCMON_USES=			gnome pkgconfig xorg
+GAPCMON_USE=			GNOME=cairo,gconf2,gdkpixbuf2 XORG=x11,xext
+GAPCMON_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2
+GAPCMON_CONFLICTS=		gapcmon
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_USB_CONFIGURE_ENABLE=	modbus-usb
 PCNET_DRV_CONFIGURE_ENABLE=	pcnet
@@ -71,6 +75,8 @@ TCP_WRAPPERS_CONFIGURE_WITH=	libwrap=yes
 TEST_DRV_CONFIGURE_ENABLE=	test
 USB_DRV_CONFIGURE_ENABLE=	usb
 
+USB_REPORTING_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-usb-reporting
+
 .include <bsd.port.options.mk>
 
 post-patch-SHUTDOWN_POWEROFF-on:
diff --git a/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample b/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample
deleted file mode 100644
index 5913eef01a8c..000000000000
--- a/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-## apcupsd.conf v1.1 ##
-#
-#  apcupsd 3.10.X
-#
-# "apcupsd" netslave file
-#
-UPSCABLE ether
-UPSTYPE net
-DEVICE usv.koellers.net:3551
-LOCKFILE /var/spool/lock
-EVENTSFILE /var/log/apcupsd.events
-UPSCLASS standalone
-UPSMODE disable
-NISPORT		3551
-#
-# Use this to control the poll time.
-# the default is 60 or 1 minute
-NETTIME 30
diff --git a/sysutils/apcupsd/files/apcupsd.in b/sysutils/apcupsd/files/apcupsd.in
index 5894592bac53..2902525243be 100644
--- a/sysutils/apcupsd/files/apcupsd.in
+++ b/sysutils/apcupsd/files/apcupsd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: apcupsd
 # REQUIRE: SERVERS
 # BEFORE: DAEMON
diff --git a/sysutils/apcupsd/files/extra-patch-usb-reporting b/sysutils/apcupsd/files/extra-patch-usb-reporting
new file mode 100644
index 000000000000..b926c5b10db9
--- /dev/null
+++ b/sysutils/apcupsd/files/extra-patch-usb-reporting
@@ -0,0 +1,51 @@
+--- include/HidUps.h.orig	2015-02-08 18:00:05 UTC
++++ include/HidUps.h
+@@ -107,6 +107,7 @@ class HidUps (private)
+    /* Fetch a descriptor from an interface (as opposed to from the device) */
+    int GetIntfDescr(
+       unsigned char type, unsigned char index, void *buf, int size);
++   int GetIntfDescrLength(unsigned char index);
+ 
+    bool init_device(struct usb_device *dev, const char *serno);
+ 
+--- src/libusbhid/HidUps.cpp.orig	2015-02-08 18:00:05 UTC
++++ src/libusbhid/HidUps.cpp
+@@ -244,6 +244,26 @@ int HidUps::GetIntfDescr(
+                          (type << 8) + index, 0, (char*)buf, size, 1000);
+ }
+ 
++/* Get the interface descriptor's length */
++int HidUps::GetIntfDescrLength(unsigned char index)
++{
++   /* usb_hid_descriptor  */
++   char buf[9];
++   memset(buf, 0, sizeof(buf));
++   int ret = usb_control_msg(_fd, USB_ENDPOINT_IN | USB_RECIP_INTERFACE,
++                            USB_REQ_GET_DESCRIPTOR,
++                            (USB_DT_HID << 8) + index, 0, (char*)buf, sizeof(buf), 1000);
++   
++   int len = MAX_SANE_DESCRIPTOR_LEN;
++   if (ret >= 0) {
++      /* wDescriptorLength */
++      int desclen = buf[7] | (buf[8] << 8);
++      if (desclen > 0)
++         len = desclen;
++   }
++   return len;
++}
++
+ /*
+  * Fetch the report descriptor from the device given an _fd for the
+  * device's control endpoint. Descriptor length is written to the
+@@ -255,8 +275,9 @@ unsigned char *HidUps::FetchReportDescr(int *rlen)
+    unsigned char *ptr;
+    int rdesclen;
+ 
+-   ptr = (unsigned char*)malloc(MAX_SANE_DESCRIPTOR_LEN);
+-   rdesclen = GetIntfDescr(USB_DT_REPORT, 0, ptr, MAX_SANE_DESCRIPTOR_LEN);
++   int desclen = GetIntfDescrLength(0);
++   ptr = (unsigned char*)malloc(desclen);
++   rdesclen = GetIntfDescr(USB_DT_REPORT, 0, ptr, desclen);
+    if (rdesclen <= 0) {
+       Dmsg(100, "Unable to get REPORT descriptor (%d).\n", rdesclen);
+       free(ptr);
diff --git a/sysutils/apcupsd/files/pkg-message.in b/sysutils/apcupsd/files/pkg-message.in
index 6af80aada141..a9ce5b4d036e 100644
--- a/sysutils/apcupsd/files/pkg-message.in
+++ b/sysutils/apcupsd/files/pkg-message.in
@@ -18,6 +18,10 @@ For default, apcupsd starts with `--kill-on-powerfail` parameter.
 Please, read its man page, and if this is not the intended behavior you want,
 change it accordingly.
 
+If connected via USB and apcaccess reports incomplete data consider enabling
+the USB_REPORTING options via 'make config'.  This contains an experimental
+patch that may fix some USB attach APC UPS. PR #249041
+
 In some systems where the shutdown can take a while (like in bhyve environment),
 you may want to change this behavior as follows:
 
diff --git a/sysutils/aptly/Makefile b/sysutils/aptly/Makefile
index 49fe1a8c11e3..55dea2d08df7 100644
--- a/sysutils/aptly/Makefile
+++ b/sysutils/aptly/Makefile
@@ -1,8 +1,7 @@
-# $FreeBSD$
-
 PORTNAME=	aptly
 PORTVERSION=	1.4.0
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	romain@FreeBSD.org
diff --git a/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s
new file mode 100644
index 000000000000..7da534fd3715
--- /dev/null
+++ b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_asm__freebsd__arm64.s
@@ -0,0 +1,32 @@
+--- vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s.orig	2020-06-10 07:45:07 UTC
++++ vendor/golang.org/x/sys/unix/asm_freebsd_arm64.s
+@@ -0,0 +1,29 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++// +build !gccgo
++
++#include "textflag.h"
++
++//
++// System call support for ARM64, FreeBSD
++//
++
++// Just jump to package syscall's implementation for all these functions.
++// The runtime may know about them.
++
++TEXT	·Syscall(SB),NOSPLIT,$0-56
++	JMP	syscall·Syscall(SB)
++
++TEXT	·Syscall6(SB),NOSPLIT,$0-80
++	JMP	syscall·Syscall6(SB)
++
++TEXT	·Syscall9(SB),NOSPLIT,$0-104
++	JMP	syscall·Syscall9(SB)
++
++TEXT ·RawSyscall(SB),NOSPLIT,$0-56
++	JMP	syscall·RawSyscall(SB)
++
++TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
++	JMP	syscall·RawSyscall6(SB)
diff --git a/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go
new file mode 100644
index 000000000000..036859eac9fd
--- /dev/null
+++ b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_syscall__freebsd__arm64.go
@@ -0,0 +1,55 @@
+--- vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go.orig	2020-06-10 07:45:07 UTC
++++ vendor/golang.org/x/sys/unix/syscall_freebsd_arm64.go
+@@ -0,0 +1,52 @@
++// Copyright 2018 The Go Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style
++// license that can be found in the LICENSE file.
++
++// +build arm64,freebsd
++
++package unix
++
++import (
++	"syscall"
++	"unsafe"
++)
++
++func setTimespec(sec, nsec int64) Timespec {
++	return Timespec{Sec: sec, Nsec: nsec}
++}
++
++func setTimeval(sec, usec int64) Timeval {
++	return Timeval{Sec: sec, Usec: usec}
++}
++
++func SetKevent(k *Kevent_t, fd, mode, flags int) {
++	k.Ident = uint64(fd)
++	k.Filter = int16(mode)
++	k.Flags = uint16(flags)
++}
++
++func (iov *Iovec) SetLen(length int) {
++	iov.Len = uint64(length)
++}
++
++func (msghdr *Msghdr) SetControllen(length int) {
++	msghdr.Controllen = uint32(length)
++}
++
++func (cmsg *Cmsghdr) SetLen(length int) {
++	cmsg.Len = uint32(length)
++}
++
++func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
++	var writtenOut uint64 = 0
++	_, _, e1 := Syscall9(SYS_SENDFILE, uintptr(infd), uintptr(outfd), uintptr(*offset), uintptr(count), 0, uintptr(unsafe.Pointer(&writtenOut)), 0, 0, 0)
++
++	written = int(writtenOut)
++
++	if e1 != 0 {
++		err = e1
++	}
++	return
++}
++
++func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
diff --git a/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go
new file mode 100644
index 000000000000..f39062b633b0
--- /dev/null
+++ b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zerrors__freebsd__arm64.go
@@ -0,0 +1,1797 @@
+--- vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go.orig	2020-06-10 07:45:07 UTC
++++ vendor/golang.org/x/sys/unix/zerrors_freebsd_arm64.go
+@@ -0,0 +1,1794 @@
++// mkerrors.sh -m64
++// Code generated by the command above; see README.md. DO NOT EDIT.
++
++// +build arm64,freebsd
++
++// Created by cgo -godefs - DO NOT EDIT
++// cgo -godefs -- -m64 _const.go
++
++package unix
++
++import "syscall"
++
++const (
++	AF_APPLETALK                   = 0x10
++	AF_ARP                         = 0x23
++	AF_ATM                         = 0x1e
++	AF_BLUETOOTH                   = 0x24
++	AF_CCITT                       = 0xa
++	AF_CHAOS                       = 0x5
++	AF_CNT                         = 0x15
++	AF_COIP                        = 0x14
++	AF_DATAKIT                     = 0x9
++	AF_DECnet                      = 0xc
++	AF_DLI                         = 0xd
++	AF_E164                        = 0x1a
++	AF_ECMA                        = 0x8
++	AF_HYLINK                      = 0xf
++	AF_IEEE80211                   = 0x25
++	AF_IMPLINK                     = 0x3
++	AF_INET                        = 0x2
++	AF_INET6                       = 0x1c
++	AF_INET6_SDP                   = 0x2a
++	AF_INET_SDP                    = 0x28
++	AF_IPX                         = 0x17
++	AF_ISDN                        = 0x1a
++	AF_ISO                         = 0x7
++	AF_LAT                         = 0xe
++	AF_LINK                        = 0x12
++	AF_LOCAL                       = 0x1
++	AF_MAX                         = 0x2a
++	AF_NATM                        = 0x1d
++	AF_NETBIOS                     = 0x6
++	AF_NETGRAPH                    = 0x20
++	AF_OSI                         = 0x7
++	AF_PUP                         = 0x4
++	AF_ROUTE                       = 0x11
++	AF_SCLUSTER                    = 0x22
++	AF_SIP                         = 0x18
++	AF_SLOW                        = 0x21
++	AF_SNA                         = 0xb
++	AF_UNIX                        = 0x1
++	AF_UNSPEC                      = 0x0
++	AF_VENDOR00                    = 0x27
++	AF_VENDOR01                    = 0x29
++	AF_VENDOR02                    = 0x2b
++	AF_VENDOR03                    = 0x2d
++	AF_VENDOR04                    = 0x2f
++	AF_VENDOR05                    = 0x31
++	AF_VENDOR06                    = 0x33
++	AF_VENDOR07                    = 0x35
++	AF_VENDOR08                    = 0x37
++	AF_VENDOR09                    = 0x39
++	AF_VENDOR10                    = 0x3b
++	AF_VENDOR11                    = 0x3d
++	AF_VENDOR12                    = 0x3f
++	AF_VENDOR13                    = 0x41
++	AF_VENDOR14                    = 0x43
++	AF_VENDOR15                    = 0x45
++	AF_VENDOR16                    = 0x47
++	AF_VENDOR17                    = 0x49
++	AF_VENDOR18                    = 0x4b
++	AF_VENDOR19                    = 0x4d
++	AF_VENDOR20                    = 0x4f
++	AF_VENDOR21                    = 0x51
++	AF_VENDOR22                    = 0x53
++	AF_VENDOR23                    = 0x55
++	AF_VENDOR24                    = 0x57
++	AF_VENDOR25                    = 0x59
++	AF_VENDOR26                    = 0x5b
++	AF_VENDOR27                    = 0x5d
++	AF_VENDOR28                    = 0x5f
++	AF_VENDOR29                    = 0x61
++	AF_VENDOR30                    = 0x63
++	AF_VENDOR31                    = 0x65
++	AF_VENDOR32                    = 0x67
++	AF_VENDOR33                    = 0x69
++	AF_VENDOR34                    = 0x6b
++	AF_VENDOR35                    = 0x6d
++	AF_VENDOR36                    = 0x6f
++	AF_VENDOR37                    = 0x71
++	AF_VENDOR38                    = 0x73
++	AF_VENDOR39                    = 0x75
++	AF_VENDOR40                    = 0x77
++	AF_VENDOR41                    = 0x79
++	AF_VENDOR42                    = 0x7b
++	AF_VENDOR43                    = 0x7d
++	AF_VENDOR44                    = 0x7f
++	AF_VENDOR45                    = 0x81
++	AF_VENDOR46                    = 0x83
++	AF_VENDOR47                    = 0x85
++	ALTWERASE                      = 0x200
++	B0                             = 0x0
++	B110                           = 0x6e
++	B115200                        = 0x1c200
++	B1200                          = 0x4b0
++	B134                           = 0x86
++	B14400                         = 0x3840
++	B150                           = 0x96
++	B1800                          = 0x708
++	B19200                         = 0x4b00
++	B200                           = 0xc8
++	B230400                        = 0x38400
++	B2400                          = 0x960
++	B28800                         = 0x7080
++	B300                           = 0x12c
++	B38400                         = 0x9600
++	B460800                        = 0x70800
++	B4800                          = 0x12c0
++	B50                            = 0x32
++	B57600                         = 0xe100
++	B600                           = 0x258
++	B7200                          = 0x1c20
++	B75                            = 0x4b
++	B76800                         = 0x12c00
++	B921600                        = 0xe1000
++	B9600                          = 0x2580
++	BIOCFEEDBACK                   = 0x8004427c
++	BIOCFLUSH                      = 0x20004268
++	BIOCGBLEN                      = 0x40044266
++	BIOCGDIRECTION                 = 0x40044276
++	BIOCGDLT                       = 0x4004426a
++	BIOCGDLTLIST                   = 0xc0104279
++	BIOCGETBUFMODE                 = 0x4004427d
++	BIOCGETIF                      = 0x4020426b
++	BIOCGETZMAX                    = 0x4008427f
++	BIOCGHDRCMPLT                  = 0x40044274
++	BIOCGRSIG                      = 0x40044272
++	BIOCGRTIMEOUT                  = 0x4010426e
++	BIOCGSEESENT                   = 0x40044276
++	BIOCGSTATS                     = 0x4008426f
++	BIOCGTSTAMP                    = 0x40044283
++	BIOCIMMEDIATE                  = 0x80044270
++	BIOCLOCK                       = 0x2000427a
++	BIOCPROMISC                    = 0x20004269
++	BIOCROTZBUF                    = 0x40184280
++	BIOCSBLEN                      = 0xc0044266
++	BIOCSDIRECTION                 = 0x80044277
++	BIOCSDLT                       = 0x80044278
++	BIOCSETBUFMODE                 = 0x8004427e
++	BIOCSETF                       = 0x80104267
++	BIOCSETFNR                     = 0x80104282
++	BIOCSETIF                      = 0x8020426c
++	BIOCSETWF                      = 0x8010427b
++	BIOCSETZBUF                    = 0x80184281
++	BIOCSHDRCMPLT                  = 0x80044275
++	BIOCSRSIG                      = 0x80044273
++	BIOCSRTIMEOUT                  = 0x8010426d
++	BIOCSSEESENT                   = 0x80044277
++	BIOCSTSTAMP                    = 0x80044284
++	BIOCVERSION                    = 0x40044271
++	BPF_A                          = 0x10
++	BPF_ABS                        = 0x20
++	BPF_ADD                        = 0x0
++	BPF_ALIGNMENT                  = 0x8
++	BPF_ALU                        = 0x4
++	BPF_AND                        = 0x50
++	BPF_B                          = 0x10
++	BPF_BUFMODE_BUFFER             = 0x1
++	BPF_BUFMODE_ZBUF               = 0x2
++	BPF_DIV                        = 0x30
++	BPF_H                          = 0x8
++	BPF_IMM                        = 0x0
++	BPF_IND                        = 0x40
++	BPF_JA                         = 0x0
++	BPF_JEQ                        = 0x10
++	BPF_JGE                        = 0x30
++	BPF_JGT                        = 0x20
++	BPF_JMP                        = 0x5
++	BPF_JSET                       = 0x40
++	BPF_K                          = 0x0
++	BPF_LD                         = 0x0
++	BPF_LDX                        = 0x1
++	BPF_LEN                        = 0x80
++	BPF_LSH                        = 0x60
++	BPF_MAJOR_VERSION              = 0x1
++	BPF_MAXBUFSIZE                 = 0x80000
++	BPF_MAXINSNS                   = 0x200
++	BPF_MEM                        = 0x60
++	BPF_MEMWORDS                   = 0x10
++	BPF_MINBUFSIZE                 = 0x20
++	BPF_MINOR_VERSION              = 0x1
++	BPF_MISC                       = 0x7
++	BPF_MOD                        = 0x90
++	BPF_MSH                        = 0xa0
++	BPF_MUL                        = 0x20
++	BPF_NEG                        = 0x80
++	BPF_OR                         = 0x40
++	BPF_RELEASE                    = 0x30bb6
++	BPF_RET                        = 0x6
++	BPF_RSH                        = 0x70
++	BPF_ST                         = 0x2
++	BPF_STX                        = 0x3
++	BPF_SUB                        = 0x10
++	BPF_TAX                        = 0x0
++	BPF_TXA                        = 0x80
++	BPF_T_BINTIME                  = 0x2
++	BPF_T_BINTIME_FAST             = 0x102
++	BPF_T_BINTIME_MONOTONIC        = 0x202
++	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
++	BPF_T_FAST                     = 0x100
++	BPF_T_FLAG_MASK                = 0x300
++	BPF_T_FORMAT_MASK              = 0x3
++	BPF_T_MICROTIME                = 0x0
++	BPF_T_MICROTIME_FAST           = 0x100
++	BPF_T_MICROTIME_MONOTONIC      = 0x200
++	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
++	BPF_T_MONOTONIC                = 0x200
++	BPF_T_MONOTONIC_FAST           = 0x300
++	BPF_T_NANOTIME                 = 0x1
++	BPF_T_NANOTIME_FAST            = 0x101
++	BPF_T_NANOTIME_MONOTONIC       = 0x201
++	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
++	BPF_T_NONE                     = 0x3
++	BPF_T_NORMAL                   = 0x0
++	BPF_W                          = 0x0
++	BPF_X                          = 0x8
++	BPF_XOR                        = 0xa0
++	BRKINT                         = 0x2
++	CAP_ACCEPT                     = 0x200000020000000
++	CAP_ACL_CHECK                  = 0x400000000010000
++	CAP_ACL_DELETE                 = 0x400000000020000
++	CAP_ACL_GET                    = 0x400000000040000
++	CAP_ACL_SET                    = 0x400000000080000
++	CAP_ALL0                       = 0x20007ffffffffff
++	CAP_ALL1                       = 0x4000000001fffff
++	CAP_BIND                       = 0x200000040000000
++	CAP_BINDAT                     = 0x200008000000400
++	CAP_CHFLAGSAT                  = 0x200000000001400
++	CAP_CONNECT                    = 0x200000080000000
++	CAP_CONNECTAT                  = 0x200010000000400
++	CAP_CREATE                     = 0x200000000000040
++	CAP_EVENT                      = 0x400000000000020
++	CAP_EXTATTR_DELETE             = 0x400000000001000
++	CAP_EXTATTR_GET                = 0x400000000002000
++	CAP_EXTATTR_LIST               = 0x400000000004000
++	CAP_EXTATTR_SET                = 0x400000000008000
++	CAP_FCHDIR                     = 0x200000000000800
++	CAP_FCHFLAGS                   = 0x200000000001000
++	CAP_FCHMOD                     = 0x200000000002000
++	CAP_FCHMODAT                   = 0x200000000002400
++	CAP_FCHOWN                     = 0x200000000004000
++	CAP_FCHOWNAT                   = 0x200000000004400
++	CAP_FCNTL                      = 0x200000000008000
++	CAP_FCNTL_ALL                  = 0x78
++	CAP_FCNTL_GETFL                = 0x8
++	CAP_FCNTL_GETOWN               = 0x20
++	CAP_FCNTL_SETFL                = 0x10
++	CAP_FCNTL_SETOWN               = 0x40
++	CAP_FEXECVE                    = 0x200000000000080
++	CAP_FLOCK                      = 0x200000000010000
++	CAP_FPATHCONF                  = 0x200000000020000
++	CAP_FSCK                       = 0x200000000040000
++	CAP_FSTAT                      = 0x200000000080000
++	CAP_FSTATAT                    = 0x200000000080400
++	CAP_FSTATFS                    = 0x200000000100000
++	CAP_FSYNC                      = 0x200000000000100
++	CAP_FTRUNCATE                  = 0x200000000000200
++	CAP_FUTIMES                    = 0x200000000200000
++	CAP_FUTIMESAT                  = 0x200000000200400
++	CAP_GETPEERNAME                = 0x200000100000000
++	CAP_GETSOCKNAME                = 0x200000200000000
++	CAP_GETSOCKOPT                 = 0x200000400000000
++	CAP_IOCTL                      = 0x400000000000080
++	CAP_IOCTLS_ALL                 = 0x7fffffffffffffff
++	CAP_KQUEUE                     = 0x400000000100040
++	CAP_KQUEUE_CHANGE              = 0x400000000100000
++	CAP_KQUEUE_EVENT               = 0x400000000000040
++	CAP_LINKAT_SOURCE              = 0x200020000000400
++	CAP_LINKAT_TARGET              = 0x200000000400400
++	CAP_LISTEN                     = 0x200000800000000
++	CAP_LOOKUP                     = 0x200000000000400
++	CAP_MAC_GET                    = 0x400000000000001
++	CAP_MAC_SET                    = 0x400000000000002
++	CAP_MKDIRAT                    = 0x200000000800400
++	CAP_MKFIFOAT                   = 0x200000001000400
++	CAP_MKNODAT                    = 0x200000002000400
++	CAP_MMAP                       = 0x200000000000010
++	CAP_MMAP_R                     = 0x20000000000001d
++	CAP_MMAP_RW                    = 0x20000000000001f
++	CAP_MMAP_RWX                   = 0x20000000000003f
++	CAP_MMAP_RX                    = 0x20000000000003d
++	CAP_MMAP_W                     = 0x20000000000001e
++	CAP_MMAP_WX                    = 0x20000000000003e
++	CAP_MMAP_X                     = 0x20000000000003c
++	CAP_PDGETPID                   = 0x400000000000200
++	CAP_PDKILL                     = 0x400000000000800
++	CAP_PDWAIT                     = 0x400000000000400
++	CAP_PEELOFF                    = 0x200001000000000
++	CAP_POLL_EVENT                 = 0x400000000000020
++	CAP_PREAD                      = 0x20000000000000d
++	CAP_PWRITE                     = 0x20000000000000e
++	CAP_READ                       = 0x200000000000001
++	CAP_RECV                       = 0x200000000000001
++	CAP_RENAMEAT_SOURCE            = 0x200000004000400
++	CAP_RENAMEAT_TARGET            = 0x200040000000400
++	CAP_RIGHTS_VERSION             = 0x0
++	CAP_RIGHTS_VERSION_00          = 0x0
++	CAP_SEEK                       = 0x20000000000000c
++	CAP_SEEK_TELL                  = 0x200000000000004
++	CAP_SEM_GETVALUE               = 0x400000000000004
++	CAP_SEM_POST                   = 0x400000000000008
++	CAP_SEM_WAIT                   = 0x400000000000010
++	CAP_SEND                       = 0x200000000000002
++	CAP_SETSOCKOPT                 = 0x200002000000000
++	CAP_SHUTDOWN                   = 0x200004000000000
++	CAP_SOCK_CLIENT                = 0x200007780000003
++	CAP_SOCK_SERVER                = 0x200007f60000003
++	CAP_SYMLINKAT                  = 0x200000008000400
++	CAP_TTYHOOK                    = 0x400000000000100
++	CAP_UNLINKAT                   = 0x200000010000400
++	CAP_UNUSED0_44                 = 0x200080000000000
++	CAP_UNUSED0_57                 = 0x300000000000000
++	CAP_UNUSED1_22                 = 0x400000000200000
++	CAP_UNUSED1_57                 = 0x500000000000000
++	CAP_WRITE                      = 0x200000000000002
++	CFLUSH                         = 0xf
++	CLOCAL                         = 0x8000
++	CLOCK_MONOTONIC                = 0x4
++	CLOCK_MONOTONIC_FAST           = 0xc
++	CLOCK_MONOTONIC_PRECISE        = 0xb
++	CLOCK_PROCESS_CPUTIME_ID       = 0xf
++	CLOCK_PROF                     = 0x2
++	CLOCK_REALTIME                 = 0x0
++	CLOCK_REALTIME_FAST            = 0xa
++	CLOCK_REALTIME_PRECISE         = 0x9
++	CLOCK_SECOND                   = 0xd
++	CLOCK_THREAD_CPUTIME_ID        = 0xe
++	CLOCK_UPTIME                   = 0x5
++	CLOCK_UPTIME_FAST              = 0x8
++	CLOCK_UPTIME_PRECISE           = 0x7
++	CLOCK_VIRTUAL                  = 0x1
++	CREAD                          = 0x800
++	CRTSCTS                        = 0x30000
++	CS5                            = 0x0
++	CS6                            = 0x100
++	CS7                            = 0x200
++	CS8                            = 0x300
++	CSIZE                          = 0x300
++	CSTART                         = 0x11
++	CSTATUS                        = 0x14
++	CSTOP                          = 0x13
++	CSTOPB                         = 0x400
++	CSUSP                          = 0x1a
++	CTL_HW                         = 0x6
++	CTL_KERN                       = 0x1
++	CTL_MAXNAME                    = 0x18
++	CTL_NET                        = 0x4
++	DLT_A429                       = 0xb8
++	DLT_A653_ICM                   = 0xb9
++	DLT_AIRONET_HEADER             = 0x78
++	DLT_AOS                        = 0xde
++	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
++	DLT_ARCNET                     = 0x7
++	DLT_ARCNET_LINUX               = 0x81
++	DLT_ATM_CLIP                   = 0x13
++	DLT_ATM_RFC1483                = 0xb
++	DLT_AURORA                     = 0x7e
++	DLT_AX25                       = 0x3
++	DLT_AX25_KISS                  = 0xca
++	DLT_BACNET_MS_TP               = 0xa5
++	DLT_BLUETOOTH_BREDR_BB         = 0xff
++	DLT_BLUETOOTH_HCI_H4           = 0xbb
++	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
++	DLT_BLUETOOTH_LE_LL            = 0xfb
++	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
++	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
++	DLT_CAN20B                     = 0xbe
++	DLT_CAN_SOCKETCAN              = 0xe3
++	DLT_CHAOS                      = 0x5
++	DLT_CHDLC                      = 0x68
++	DLT_CISCO_IOS                  = 0x76
++	DLT_C_HDLC                     = 0x68
++	DLT_C_HDLC_WITH_DIR            = 0xcd
++	DLT_DBUS                       = 0xe7
++	DLT_DECT                       = 0xdd
++	DLT_DOCSIS                     = 0x8f
++	DLT_DVB_CI                     = 0xeb
++	DLT_ECONET                     = 0x73
++	DLT_EN10MB                     = 0x1
++	DLT_EN3MB                      = 0x2
++	DLT_ENC                        = 0x6d
++	DLT_EPON                       = 0x103
++	DLT_ERF                        = 0xc5
++	DLT_ERF_ETH                    = 0xaf
++	DLT_ERF_POS                    = 0xb0
++	DLT_FC_2                       = 0xe0
++	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
++	DLT_FDDI                       = 0xa
++	DLT_FLEXRAY                    = 0xd2
++	DLT_FRELAY                     = 0x6b
++	DLT_FRELAY_WITH_DIR            = 0xce
++	DLT_GCOM_SERIAL                = 0xad
++	DLT_GCOM_T1E1                  = 0xac
++	DLT_GPF_F                      = 0xab
++	DLT_GPF_T                      = 0xaa
++	DLT_GPRS_LLC                   = 0xa9
++	DLT_GSMTAP_ABIS                = 0xda
++	DLT_GSMTAP_UM                  = 0xd9
++	DLT_HHDLC                      = 0x79
++	DLT_IBM_SN                     = 0x92
++	DLT_IBM_SP                     = 0x91
++	DLT_IEEE802                    = 0x6
++	DLT_IEEE802_11                 = 0x69
++	DLT_IEEE802_11_RADIO           = 0x7f
++	DLT_IEEE802_11_RADIO_AVS       = 0xa3
++	DLT_IEEE802_15_4               = 0xc3
++	DLT_IEEE802_15_4_LINUX         = 0xbf
++	DLT_IEEE802_15_4_NOFCS         = 0xe6
++	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
++	DLT_IEEE802_16_MAC_CPS         = 0xbc
++	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
++	DLT_INFINIBAND                 = 0xf7
++	DLT_IPFILTER                   = 0x74
++	DLT_IPMB                       = 0xc7
++	DLT_IPMB_LINUX                 = 0xd1
++	DLT_IPMI_HPM_2                 = 0x104
++	DLT_IPNET                      = 0xe2
++	DLT_IPOIB                      = 0xf2
++	DLT_IPV4                       = 0xe4
++	DLT_IPV6                       = 0xe5
++	DLT_IP_OVER_FC                 = 0x7a
++	DLT_JUNIPER_ATM1               = 0x89
++	DLT_JUNIPER_ATM2               = 0x87
++	DLT_JUNIPER_ATM_CEMIC          = 0xee
++	DLT_JUNIPER_CHDLC              = 0xb5
++	DLT_JUNIPER_ES                 = 0x84
++	DLT_JUNIPER_ETHER              = 0xb2
++	DLT_JUNIPER_FIBRECHANNEL       = 0xea
++	DLT_JUNIPER_FRELAY             = 0xb4
++	DLT_JUNIPER_GGSN               = 0x85
++	DLT_JUNIPER_ISM                = 0xc2
++	DLT_JUNIPER_MFR                = 0x86
++	DLT_JUNIPER_MLFR               = 0x83
++	DLT_JUNIPER_MLPPP              = 0x82
++	DLT_JUNIPER_MONITOR            = 0xa4
++	DLT_JUNIPER_PIC_PEER           = 0xae
++	DLT_JUNIPER_PPP                = 0xb3
++	DLT_JUNIPER_PPPOE              = 0xa7
++	DLT_JUNIPER_PPPOE_ATM          = 0xa8
++	DLT_JUNIPER_SERVICES           = 0x88
++	DLT_JUNIPER_SRX_E2E            = 0xe9
++	DLT_JUNIPER_ST                 = 0xc8
++	DLT_JUNIPER_VP                 = 0xb7
++	DLT_JUNIPER_VS                 = 0xe8
++	DLT_LAPB_WITH_DIR              = 0xcf
++	DLT_LAPD                       = 0xcb
++	DLT_LIN                        = 0xd4
++	DLT_LINUX_EVDEV                = 0xd8
++	DLT_LINUX_IRDA                 = 0x90
++	DLT_LINUX_LAPD                 = 0xb1
++	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
++	DLT_LINUX_SLL                  = 0x71
++	DLT_LOOP                       = 0x6c
++	DLT_LTALK                      = 0x72
++	DLT_MATCHING_MAX               = 0x104
++	DLT_MATCHING_MIN               = 0x68
++	DLT_MFR                        = 0xb6
++	DLT_MOST                       = 0xd3
++	DLT_MPEG_2_TS                  = 0xf3
++	DLT_MPLS                       = 0xdb
++	DLT_MTP2                       = 0x8c
++	DLT_MTP2_WITH_PHDR             = 0x8b
++	DLT_MTP3                       = 0x8d
++	DLT_MUX27010                   = 0xec
++	DLT_NETANALYZER                = 0xf0
++	DLT_NETANALYZER_TRANSPARENT    = 0xf1
++	DLT_NETLINK                    = 0xfd
++	DLT_NFC_LLCP                   = 0xf5
++	DLT_NFLOG                      = 0xef
++	DLT_NG40                       = 0xf4
++	DLT_NULL                       = 0x0
++	DLT_PCI_EXP                    = 0x7d
++	DLT_PFLOG                      = 0x75
++	DLT_PFSYNC                     = 0x79
++	DLT_PKTAP                      = 0x102
++	DLT_PPI                        = 0xc0
++	DLT_PPP                        = 0x9
++	DLT_PPP_BSDOS                  = 0x10
++	DLT_PPP_ETHER                  = 0x33
++	DLT_PPP_PPPD                   = 0xa6
++	DLT_PPP_SERIAL                 = 0x32
++	DLT_PPP_WITH_DIR               = 0xcc
++	DLT_PPP_WITH_DIRECTION         = 0xa6
++	DLT_PRISM_HEADER               = 0x77
++	DLT_PROFIBUS_DL                = 0x101
++	DLT_PRONET                     = 0x4
++	DLT_RAIF1                      = 0xc6
++	DLT_RAW                        = 0xc
++	DLT_RIO                        = 0x7c
++	DLT_RTAC_SERIAL                = 0xfa
++	DLT_SCCP                       = 0x8e
++	DLT_SCTP                       = 0xf8
++	DLT_SITA                       = 0xc4
++	DLT_SLIP                       = 0x8
++	DLT_SLIP_BSDOS                 = 0xf
++	DLT_STANAG_5066_D_PDU          = 0xed
++	DLT_SUNATM                     = 0x7b
++	DLT_SYMANTEC_FIREWALL          = 0x63
++	DLT_TZSP                       = 0x80
++	DLT_USB                        = 0xba
++	DLT_USBPCAP                    = 0xf9
++	DLT_USB_LINUX                  = 0xbd
++	DLT_USB_LINUX_MMAPPED          = 0xdc
++	DLT_USER0                      = 0x93
++	DLT_USER1                      = 0x94
++	DLT_USER10                     = 0x9d
++	DLT_USER11                     = 0x9e
++	DLT_USER12                     = 0x9f
++	DLT_USER13                     = 0xa0
++	DLT_USER14                     = 0xa1
++	DLT_USER15                     = 0xa2
++	DLT_USER2                      = 0x95
++	DLT_USER3                      = 0x96
++	DLT_USER4                      = 0x97
++	DLT_USER5                      = 0x98
++	DLT_USER6                      = 0x99
++	DLT_USER7                      = 0x9a
++	DLT_USER8                      = 0x9b
++	DLT_USER9                      = 0x9c
++	DLT_WIHART                     = 0xdf
++	DLT_WIRESHARK_UPPER_PDU        = 0xfc
++	DLT_X2E_SERIAL                 = 0xd5
++	DLT_X2E_XORAYA                 = 0xd6
++	DT_BLK                         = 0x6
++	DT_CHR                         = 0x2
++	DT_DIR                         = 0x4
++	DT_FIFO                        = 0x1
++	DT_LNK                         = 0xa
++	DT_REG                         = 0x8
++	DT_SOCK                        = 0xc
++	DT_UNKNOWN                     = 0x0
++	DT_WHT                         = 0xe
++	ECHO                           = 0x8
++	ECHOCTL                        = 0x40
++	ECHOE                          = 0x2
++	ECHOK                          = 0x4
++	ECHOKE                         = 0x1
++	ECHONL                         = 0x10
++	ECHOPRT                        = 0x20
++	EVFILT_AIO                     = -0x3
++	EVFILT_FS                      = -0x9
++	EVFILT_LIO                     = -0xa
++	EVFILT_PROC                    = -0x5
++	EVFILT_PROCDESC                = -0x8
++	EVFILT_READ                    = -0x1
++	EVFILT_SENDFILE                = -0xc
++	EVFILT_SIGNAL                  = -0x6
++	EVFILT_SYSCOUNT                = 0xc
++	EVFILT_TIMER                   = -0x7
++	EVFILT_USER                    = -0xb
++	EVFILT_VNODE                   = -0x4
++	EVFILT_WRITE                   = -0x2
++	EV_ADD                         = 0x1
++	EV_CLEAR                       = 0x20
++	EV_DELETE                      = 0x2
++	EV_DISABLE                     = 0x8
++	EV_DISPATCH                    = 0x80
++	EV_DROP                        = 0x1000
++	EV_ENABLE                      = 0x4
++	EV_EOF                         = 0x8000
++	EV_ERROR                       = 0x4000
++	EV_FLAG1                       = 0x2000
++	EV_FLAG2                       = 0x4000
++	EV_FORCEONESHOT                = 0x100
++	EV_ONESHOT                     = 0x10
++	EV_RECEIPT                     = 0x40
++	EV_SYSFLAGS                    = 0xf000
++	EXTA                           = 0x4b00
++	EXTATTR_NAMESPACE_EMPTY        = 0x0
++	EXTATTR_NAMESPACE_SYSTEM       = 0x2
++	EXTATTR_NAMESPACE_USER         = 0x1
++	EXTB                           = 0x9600
++	EXTPROC                        = 0x800
++	FD_CLOEXEC                     = 0x1
++	FD_SETSIZE                     = 0x400
++	FLUSHO                         = 0x800000
++	F_CANCEL                       = 0x5
++	F_DUP2FD                       = 0xa
++	F_DUP2FD_CLOEXEC               = 0x12
++	F_DUPFD                        = 0x0
++	F_DUPFD_CLOEXEC                = 0x11
++	F_GETFD                        = 0x1
++	F_GETFL                        = 0x3
++	F_GETLK                        = 0xb
++	F_GETOWN                       = 0x5
++	F_OGETLK                       = 0x7
++	F_OK                           = 0x0
++	F_OSETLK                       = 0x8
++	F_OSETLKW                      = 0x9
++	F_RDAHEAD                      = 0x10
++	F_RDLCK                        = 0x1
++	F_READAHEAD                    = 0xf
++	F_SETFD                        = 0x2
++	F_SETFL                        = 0x4
++	F_SETLK                        = 0xc
++	F_SETLKW                       = 0xd
++	F_SETLK_REMOTE                 = 0xe
++	F_SETOWN                       = 0x6
++	F_UNLCK                        = 0x2
++	F_UNLCKSYS                     = 0x4
++	F_WRLCK                        = 0x3
++	HUPCL                          = 0x4000
++	HW_MACHINE                     = 0x1
++	ICANON                         = 0x100
++	ICMP6_FILTER                   = 0x12
++	ICRNL                          = 0x100
++	IEXTEN                         = 0x400
++	IFAN_ARRIVAL                   = 0x0
++	IFAN_DEPARTURE                 = 0x1
++	IFF_ALLMULTI                   = 0x200
++	IFF_ALTPHYS                    = 0x4000
++	IFF_BROADCAST                  = 0x2
++	IFF_CANTCHANGE                 = 0x218f52
++	IFF_CANTCONFIG                 = 0x10000
++	IFF_DEBUG                      = 0x4
++	IFF_DRV_OACTIVE                = 0x400
++	IFF_DRV_RUNNING                = 0x40
++	IFF_DYING                      = 0x200000
++	IFF_LINK0                      = 0x1000
++	IFF_LINK1                      = 0x2000
++	IFF_LINK2                      = 0x4000
++	IFF_LOOPBACK                   = 0x8
++	IFF_MONITOR                    = 0x40000
++	IFF_MULTICAST                  = 0x8000
++	IFF_NOARP                      = 0x80
++	IFF_OACTIVE                    = 0x400
++	IFF_POINTOPOINT                = 0x10
++	IFF_PPROMISC                   = 0x20000
++	IFF_PROMISC                    = 0x100
++	IFF_RENAMING                   = 0x400000
++	IFF_RUNNING                    = 0x40
++	IFF_SIMPLEX                    = 0x800
++	IFF_STATICARP                  = 0x80000
++	IFF_UP                         = 0x1
++	IFNAMSIZ                       = 0x10
++	IFT_BRIDGE                     = 0xd1
++	IFT_CARP                       = 0xf8
++	IFT_IEEE1394                   = 0x90
++	IFT_INFINIBAND                 = 0xc7
++	IFT_L2VLAN                     = 0x87
++	IFT_L3IPVLAN                   = 0x88
++	IFT_PPP                        = 0x17
++	IFT_PROPVIRTUAL                = 0x35
++	IGNBRK                         = 0x1
++	IGNCR                          = 0x80
++	IGNPAR                         = 0x4
++	IMAXBEL                        = 0x2000
++	INLCR                          = 0x40
++	INPCK                          = 0x10
++	IN_CLASSA_HOST                 = 0xffffff
++	IN_CLASSA_MAX                  = 0x80
++	IN_CLASSA_NET                  = 0xff000000
++	IN_CLASSA_NSHIFT               = 0x18
++	IN_CLASSB_HOST                 = 0xffff
++	IN_CLASSB_MAX                  = 0x10000
++	IN_CLASSB_NET                  = 0xffff0000
++	IN_CLASSB_NSHIFT               = 0x10
++	IN_CLASSC_HOST                 = 0xff
++	IN_CLASSC_NET                  = 0xffffff00
++	IN_CLASSC_NSHIFT               = 0x8
++	IN_CLASSD_HOST                 = 0xfffffff
++	IN_CLASSD_NET                  = 0xf0000000
++	IN_CLASSD_NSHIFT               = 0x1c
++	IN_LOOPBACKNET                 = 0x7f
++	IN_RFC3021_MASK                = 0xfffffffe
++	IPPROTO_3PC                    = 0x22
++	IPPROTO_ADFS                   = 0x44
++	IPPROTO_AH                     = 0x33
++	IPPROTO_AHIP                   = 0x3d
++	IPPROTO_APES                   = 0x63
++	IPPROTO_ARGUS                  = 0xd
++	IPPROTO_AX25                   = 0x5d
++	IPPROTO_BHA                    = 0x31
++	IPPROTO_BLT                    = 0x1e
++	IPPROTO_BRSATMON               = 0x4c
++	IPPROTO_CARP                   = 0x70
++	IPPROTO_CFTP                   = 0x3e
++	IPPROTO_CHAOS                  = 0x10
++	IPPROTO_CMTP                   = 0x26
++	IPPROTO_CPHB                   = 0x49
++	IPPROTO_CPNX                   = 0x48
++	IPPROTO_DDP                    = 0x25
++	IPPROTO_DGP                    = 0x56
++	IPPROTO_DIVERT                 = 0x102
++	IPPROTO_DONE                   = 0x101
++	IPPROTO_DSTOPTS                = 0x3c
++	IPPROTO_EGP                    = 0x8
++	IPPROTO_EMCON                  = 0xe
++	IPPROTO_ENCAP                  = 0x62
++	IPPROTO_EON                    = 0x50
++	IPPROTO_ESP                    = 0x32
++	IPPROTO_ETHERIP                = 0x61
++	IPPROTO_FRAGMENT               = 0x2c
++	IPPROTO_GGP                    = 0x3
++	IPPROTO_GMTP                   = 0x64
++	IPPROTO_GRE                    = 0x2f
++	IPPROTO_HELLO                  = 0x3f
++	IPPROTO_HIP                    = 0x8b
++	IPPROTO_HMP                    = 0x14
++	IPPROTO_HOPOPTS                = 0x0
++	IPPROTO_ICMP                   = 0x1
++	IPPROTO_ICMPV6                 = 0x3a
++	IPPROTO_IDP                    = 0x16
++	IPPROTO_IDPR                   = 0x23
++	IPPROTO_IDRP                   = 0x2d
++	IPPROTO_IGMP                   = 0x2
++	IPPROTO_IGP                    = 0x55
++	IPPROTO_IGRP                   = 0x58
++	IPPROTO_IL                     = 0x28
++	IPPROTO_INLSP                  = 0x34
++	IPPROTO_INP                    = 0x20
++	IPPROTO_IP                     = 0x0
++	IPPROTO_IPCOMP                 = 0x6c
++	IPPROTO_IPCV                   = 0x47
++	IPPROTO_IPEIP                  = 0x5e
++	IPPROTO_IPIP                   = 0x4
++	IPPROTO_IPPC                   = 0x43
++	IPPROTO_IPV4                   = 0x4
++	IPPROTO_IPV6                   = 0x29
++	IPPROTO_IRTP                   = 0x1c
++	IPPROTO_KRYPTOLAN              = 0x41
++	IPPROTO_LARP                   = 0x5b
++	IPPROTO_LEAF1                  = 0x19
++	IPPROTO_LEAF2                  = 0x1a
++	IPPROTO_MAX                    = 0x100
++	IPPROTO_MEAS                   = 0x13
++	IPPROTO_MH                     = 0x87
++	IPPROTO_MHRP                   = 0x30
++	IPPROTO_MICP                   = 0x5f
++	IPPROTO_MOBILE                 = 0x37
++	IPPROTO_MPLS                   = 0x89
++	IPPROTO_MTP                    = 0x5c
++	IPPROTO_MUX                    = 0x12
++	IPPROTO_ND                     = 0x4d
++	IPPROTO_NHRP                   = 0x36
++	IPPROTO_NONE                   = 0x3b
++	IPPROTO_NSP                    = 0x1f
++	IPPROTO_NVPII                  = 0xb
++	IPPROTO_OLD_DIVERT             = 0xfe
++	IPPROTO_OSPFIGP                = 0x59
++	IPPROTO_PFSYNC                 = 0xf0
++	IPPROTO_PGM                    = 0x71
++	IPPROTO_PIGP                   = 0x9
++	IPPROTO_PIM                    = 0x67
++	IPPROTO_PRM                    = 0x15
++	IPPROTO_PUP                    = 0xc
++	IPPROTO_PVP                    = 0x4b
++	IPPROTO_RAW                    = 0xff
++	IPPROTO_RCCMON                 = 0xa
++	IPPROTO_RDP                    = 0x1b
++	IPPROTO_RESERVED_253           = 0xfd
++	IPPROTO_RESERVED_254           = 0xfe
++	IPPROTO_ROUTING                = 0x2b
++	IPPROTO_RSVP                   = 0x2e
++	IPPROTO_RVD                    = 0x42
++	IPPROTO_SATEXPAK               = 0x40
++	IPPROTO_SATMON                 = 0x45
++	IPPROTO_SCCSP                  = 0x60
++	IPPROTO_SCTP                   = 0x84
++	IPPROTO_SDRP                   = 0x2a
++	IPPROTO_SEND                   = 0x103
++	IPPROTO_SEP                    = 0x21
++	IPPROTO_SHIM6                  = 0x8c
++	IPPROTO_SKIP                   = 0x39
++	IPPROTO_SPACER                 = 0x7fff
++	IPPROTO_SRPC                   = 0x5a
++	IPPROTO_ST                     = 0x7
++	IPPROTO_SVMTP                  = 0x52
++	IPPROTO_SWIPE                  = 0x35
++	IPPROTO_TCF                    = 0x57
++	IPPROTO_TCP                    = 0x6
++	IPPROTO_TLSP                   = 0x38
++	IPPROTO_TP                     = 0x1d
++	IPPROTO_TPXX                   = 0x27
++	IPPROTO_TRUNK1                 = 0x17
++	IPPROTO_TRUNK2                 = 0x18
++	IPPROTO_TTP                    = 0x54
++	IPPROTO_UDP                    = 0x11
++	IPPROTO_UDPLITE                = 0x88
++	IPPROTO_VINES                  = 0x53
++	IPPROTO_VISA                   = 0x46
++	IPPROTO_VMTP                   = 0x51
++	IPPROTO_WBEXPAK                = 0x4f
++	IPPROTO_WBMON                  = 0x4e
++	IPPROTO_WSN                    = 0x4a
++	IPPROTO_XNET                   = 0xf
++	IPPROTO_XTP                    = 0x24
++	IPV6_AUTOFLOWLABEL             = 0x3b
++	IPV6_BINDANY                   = 0x40
++	IPV6_BINDMULTI                 = 0x41
++	IPV6_BINDV6ONLY                = 0x1b
++	IPV6_CHECKSUM                  = 0x1a
++	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
++	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
++	IPV6_DEFHLIM                   = 0x40
++	IPV6_DONTFRAG                  = 0x3e
++	IPV6_DSTOPTS                   = 0x32
++	IPV6_FLOWID                    = 0x43
++	IPV6_FLOWINFO_MASK             = 0xffffff0f
++	IPV6_FLOWLABEL_MASK            = 0xffff0f00
++	IPV6_FLOWTYPE                  = 0x44
++	IPV6_FRAGTTL                   = 0x78
++	IPV6_FW_ADD                    = 0x1e
++	IPV6_FW_DEL                    = 0x1f
++	IPV6_FW_FLUSH                  = 0x20
++	IPV6_FW_GET                    = 0x22
++	IPV6_FW_ZERO                   = 0x21
++	IPV6_HLIMDEC                   = 0x1
++	IPV6_HOPLIMIT                  = 0x2f
++	IPV6_HOPOPTS                   = 0x31
++	IPV6_IPSEC_POLICY              = 0x1c
++	IPV6_JOIN_GROUP                = 0xc
++	IPV6_LEAVE_GROUP               = 0xd
++	IPV6_MAXHLIM                   = 0xff
++	IPV6_MAXOPTHDR                 = 0x800
++	IPV6_MAXPACKET                 = 0xffff
++	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
++	IPV6_MAX_MEMBERSHIPS           = 0xfff
++	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
++	IPV6_MIN_MEMBERSHIPS           = 0x1f
++	IPV6_MMTU                      = 0x500
++	IPV6_MSFILTER                  = 0x4a
++	IPV6_MULTICAST_HOPS            = 0xa
++	IPV6_MULTICAST_IF              = 0x9
++	IPV6_MULTICAST_LOOP            = 0xb
++	IPV6_NEXTHOP                   = 0x30
++	IPV6_PATHMTU                   = 0x2c
++	IPV6_PKTINFO                   = 0x2e
++	IPV6_PORTRANGE                 = 0xe
++	IPV6_PORTRANGE_DEFAULT         = 0x0
++	IPV6_PORTRANGE_HIGH            = 0x1
++	IPV6_PORTRANGE_LOW             = 0x2
++	IPV6_PREFER_TEMPADDR           = 0x3f
++	IPV6_RECVDSTOPTS               = 0x28
++	IPV6_RECVFLOWID                = 0x46
++	IPV6_RECVHOPLIMIT              = 0x25
++	IPV6_RECVHOPOPTS               = 0x27
++	IPV6_RECVPATHMTU               = 0x2b
++	IPV6_RECVPKTINFO               = 0x24
++	IPV6_RECVRSSBUCKETID           = 0x47
++	IPV6_RECVRTHDR                 = 0x26
++	IPV6_RECVTCLASS                = 0x39
++	IPV6_RSSBUCKETID               = 0x45
++	IPV6_RSS_LISTEN_BUCKET         = 0x42
++	IPV6_RTHDR                     = 0x33
++	IPV6_RTHDRDSTOPTS              = 0x23
++	IPV6_RTHDR_LOOSE               = 0x0
++	IPV6_RTHDR_STRICT              = 0x1
++	IPV6_RTHDR_TYPE_0              = 0x0
++	IPV6_SOCKOPT_RESERVED1         = 0x3
++	IPV6_TCLASS                    = 0x3d
++	IPV6_UNICAST_HOPS              = 0x4
++	IPV6_USE_MIN_MTU               = 0x2a
++	IPV6_V6ONLY                    = 0x1b
++	IPV6_VERSION                   = 0x60
++	IPV6_VERSION_MASK              = 0xf0
++	IP_ADD_MEMBERSHIP              = 0xc
++	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
++	IP_BINDANY                     = 0x18
++	IP_BINDMULTI                   = 0x19
++	IP_BLOCK_SOURCE                = 0x48
++	IP_DEFAULT_MULTICAST_LOOP      = 0x1
++	IP_DEFAULT_MULTICAST_TTL       = 0x1
++	IP_DF                          = 0x4000
++	IP_DONTFRAG                    = 0x43
++	IP_DROP_MEMBERSHIP             = 0xd
++	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
++	IP_DUMMYNET3                   = 0x31
++	IP_DUMMYNET_CONFIGURE          = 0x3c
++	IP_DUMMYNET_DEL                = 0x3d
++	IP_DUMMYNET_FLUSH              = 0x3e
++	IP_DUMMYNET_GET                = 0x40
++	IP_FLOWID                      = 0x5a
++	IP_FLOWTYPE                    = 0x5b
++	IP_FW3                         = 0x30
++	IP_FW_ADD                      = 0x32
++	IP_FW_DEL                      = 0x33
++	IP_FW_FLUSH                    = 0x34
++	IP_FW_GET                      = 0x36
++	IP_FW_NAT_CFG                  = 0x38
++	IP_FW_NAT_DEL                  = 0x39
++	IP_FW_NAT_GET_CONFIG           = 0x3a
++	IP_FW_NAT_GET_LOG              = 0x3b
++	IP_FW_RESETLOG                 = 0x37
++	IP_FW_TABLE_ADD                = 0x28
++	IP_FW_TABLE_DEL                = 0x29
++	IP_FW_TABLE_FLUSH              = 0x2a
++	IP_FW_TABLE_GETSIZE            = 0x2b
++	IP_FW_TABLE_LIST               = 0x2c
++	IP_FW_ZERO                     = 0x35
++	IP_HDRINCL                     = 0x2
++	IP_IPSEC_POLICY                = 0x15
++	IP_MAXPACKET                   = 0xffff
++	IP_MAX_GROUP_SRC_FILTER        = 0x200
++	IP_MAX_MEMBERSHIPS             = 0xfff
++	IP_MAX_SOCK_MUTE_FILTER        = 0x80
++	IP_MAX_SOCK_SRC_FILTER         = 0x80
++	IP_MAX_SOURCE_FILTER           = 0x400
++	IP_MF                          = 0x2000
++	IP_MINTTL                      = 0x42
++	IP_MIN_MEMBERSHIPS             = 0x1f
++	IP_MSFILTER                    = 0x4a
++	IP_MSS                         = 0x240
++	IP_MULTICAST_IF                = 0x9
++	IP_MULTICAST_LOOP              = 0xb
++	IP_MULTICAST_TTL               = 0xa
++	IP_MULTICAST_VIF               = 0xe
++	IP_OFFMASK                     = 0x1fff
++	IP_ONESBCAST                   = 0x17
++	IP_OPTIONS                     = 0x1
++	IP_PORTRANGE                   = 0x13
++	IP_PORTRANGE_DEFAULT           = 0x0
++	IP_PORTRANGE_HIGH              = 0x1
++	IP_PORTRANGE_LOW               = 0x2
++	IP_RECVDSTADDR                 = 0x7
++	IP_RECVFLOWID                  = 0x5d
++	IP_RECVIF                      = 0x14
++	IP_RECVOPTS                    = 0x5
++	IP_RECVRETOPTS                 = 0x6
++	IP_RECVRSSBUCKETID             = 0x5e
++	IP_RECVTOS                     = 0x44
++	IP_RECVTTL                     = 0x41
++	IP_RETOPTS                     = 0x8
++	IP_RF                          = 0x8000
++	IP_RSSBUCKETID                 = 0x5c
++	IP_RSS_LISTEN_BUCKET           = 0x1a
++	IP_RSVP_OFF                    = 0x10
++	IP_RSVP_ON                     = 0xf
++	IP_RSVP_VIF_OFF                = 0x12
++	IP_RSVP_VIF_ON                 = 0x11
++	IP_SENDSRCADDR                 = 0x7
++	IP_TOS                         = 0x3
++	IP_TTL                         = 0x4
++	IP_UNBLOCK_SOURCE              = 0x49
++	ISIG                           = 0x80
++	ISTRIP                         = 0x20
++	IXANY                          = 0x800
++	IXOFF                          = 0x400
++	IXON                           = 0x200
++	KERN_HOSTNAME                  = 0xa
++	KERN_OSRELEASE                 = 0x2
++	KERN_OSTYPE                    = 0x1
++	KERN_VERSION                   = 0x4
++	LOCK_EX                        = 0x2
++	LOCK_NB                        = 0x4
++	LOCK_SH                        = 0x1
++	LOCK_UN                        = 0x8
++	MADV_AUTOSYNC                  = 0x7
++	MADV_CORE                      = 0x9
++	MADV_DONTNEED                  = 0x4
++	MADV_FREE                      = 0x5
++	MADV_NOCORE                    = 0x8
++	MADV_NORMAL                    = 0x0
++	MADV_NOSYNC                    = 0x6
++	MADV_PROTECT                   = 0xa
++	MADV_RANDOM                    = 0x1
++	MADV_SEQUENTIAL                = 0x2
++	MADV_WILLNEED                  = 0x3
++	MAP_32BIT                      = 0x80000
++	MAP_ALIGNED_SUPER              = 0x1000000
++	MAP_ALIGNMENT_MASK             = -0x1000000
++	MAP_ALIGNMENT_SHIFT            = 0x18
++	MAP_ANON                       = 0x1000
++	MAP_ANONYMOUS                  = 0x1000
++	MAP_COPY                       = 0x2
++	MAP_EXCL                       = 0x4000
++	MAP_FILE                       = 0x0
++	MAP_FIXED                      = 0x10
++	MAP_HASSEMAPHORE               = 0x200
++	MAP_NOCORE                     = 0x20000
++	MAP_NOSYNC                     = 0x800
++	MAP_PREFAULT_READ              = 0x40000
++	MAP_PRIVATE                    = 0x2
++	MAP_RESERVED0020               = 0x20
++	MAP_RESERVED0040               = 0x40
++	MAP_RESERVED0080               = 0x80
++	MAP_RESERVED0100               = 0x100
++	MAP_SHARED                     = 0x1
++	MAP_STACK                      = 0x400
++	MCL_CURRENT                    = 0x1
++	MCL_FUTURE                     = 0x2
++	MNT_ACLS                       = 0x8000000
++	MNT_ASYNC                      = 0x40
++	MNT_AUTOMOUNTED                = 0x200000000
++	MNT_BYFSID                     = 0x8000000
++	MNT_CMDFLAGS                   = 0xd0f0000
++	MNT_DEFEXPORTED                = 0x200
++	MNT_DELEXPORT                  = 0x20000
++	MNT_EXKERB                     = 0x800
++	MNT_EXPORTANON                 = 0x400
++	MNT_EXPORTED                   = 0x100
++	MNT_EXPUBLIC                   = 0x20000000
++	MNT_EXRDONLY                   = 0x80
++	MNT_FORCE                      = 0x80000
++	MNT_GJOURNAL                   = 0x2000000
++	MNT_IGNORE                     = 0x800000
++	MNT_LAZY                       = 0x3
++	MNT_LOCAL                      = 0x1000
++	MNT_MULTILABEL                 = 0x4000000
++	MNT_NFS4ACLS                   = 0x10
++	MNT_NOATIME                    = 0x10000000
++	MNT_NOCLUSTERR                 = 0x40000000
++	MNT_NOCLUSTERW                 = 0x80000000
++	MNT_NOEXEC                     = 0x4
++	MNT_NONBUSY                    = 0x4000000
++	MNT_NOSUID                     = 0x8
++	MNT_NOSYMFOLLOW                = 0x400000
++	MNT_NOWAIT                     = 0x2
++	MNT_QUOTA                      = 0x2000
++	MNT_RDONLY                     = 0x1
++	MNT_RELOAD                     = 0x40000
++	MNT_ROOTFS                     = 0x4000
++	MNT_SNAPSHOT                   = 0x1000000
++	MNT_SOFTDEP                    = 0x200000
++	MNT_SUIDDIR                    = 0x100000
++	MNT_SUJ                        = 0x100000000
++	MNT_SUSPEND                    = 0x4
++	MNT_SYNCHRONOUS                = 0x2
++	MNT_UNION                      = 0x20
++	MNT_UPDATE                     = 0x10000
++	MNT_UPDATEMASK                 = 0x2d8d0807e
++	MNT_USER                       = 0x8000
++	MNT_VISFLAGMASK                = 0x3fef0ffff
++	MNT_WAIT                       = 0x1
++	MSG_CMSG_CLOEXEC               = 0x40000
++	MSG_COMPAT                     = 0x8000
++	MSG_CTRUNC                     = 0x20
++	MSG_DONTROUTE                  = 0x4
++	MSG_DONTWAIT                   = 0x80
++	MSG_EOF                        = 0x100
++	MSG_EOR                        = 0x8
++	MSG_NBIO                       = 0x4000
++	MSG_NOSIGNAL                   = 0x20000
++	MSG_NOTIFICATION               = 0x2000
++	MSG_OOB                        = 0x1
++	MSG_PEEK                       = 0x2
++	MSG_TRUNC                      = 0x10
++	MSG_WAITALL                    = 0x40
++	MSG_WAITFORONE                 = 0x80000
++	MS_ASYNC                       = 0x1
++	MS_INVALIDATE                  = 0x2
++	MS_SYNC                        = 0x0
++	NAME_MAX                       = 0xff
++	NET_RT_DUMP                    = 0x1
++	NET_RT_FLAGS                   = 0x2
++	NET_RT_IFLIST                  = 0x3
++	NET_RT_IFLISTL                 = 0x5
++	NET_RT_IFMALIST                = 0x4
++	NOFLSH                         = 0x80000000
++	NOKERNINFO                     = 0x2000000
++	NOTE_ATTRIB                    = 0x8
++	NOTE_CHILD                     = 0x4
++	NOTE_CLOSE                     = 0x100
++	NOTE_CLOSE_WRITE               = 0x200
++	NOTE_DELETE                    = 0x1
++	NOTE_EXEC                      = 0x20000000
++	NOTE_EXIT                      = 0x80000000
++	NOTE_EXTEND                    = 0x4
++	NOTE_FFAND                     = 0x40000000
++	NOTE_FFCOPY                    = 0xc0000000
++	NOTE_FFCTRLMASK                = 0xc0000000
++	NOTE_FFLAGSMASK                = 0xffffff
++	NOTE_FFNOP                     = 0x0
++	NOTE_FFOR                      = 0x80000000
++	NOTE_FILE_POLL                 = 0x2
++	NOTE_FORK                      = 0x40000000
++	NOTE_LINK                      = 0x10
++	NOTE_LOWAT                     = 0x1
++	NOTE_MSECONDS                  = 0x2
++	NOTE_NSECONDS                  = 0x8
++	NOTE_OPEN                      = 0x80
++	NOTE_PCTRLMASK                 = 0xf0000000
++	NOTE_PDATAMASK                 = 0xfffff
++	NOTE_READ                      = 0x400
++	NOTE_RENAME                    = 0x20
++	NOTE_REVOKE                    = 0x40
++	NOTE_SECONDS                   = 0x1
++	NOTE_TRACK                     = 0x1
++	NOTE_TRACKERR                  = 0x2
++	NOTE_TRIGGER                   = 0x1000000
++	NOTE_USECONDS                  = 0x4
++	NOTE_WRITE                     = 0x2
++	OCRNL                          = 0x10
++	ONLCR                          = 0x2
++	ONLRET                         = 0x40
++	ONOCR                          = 0x20
++	ONOEOT                         = 0x8
++	OPOST                          = 0x1
++	OXTABS                         = 0x4
++	O_ACCMODE                      = 0x3
++	O_APPEND                       = 0x8
++	O_ASYNC                        = 0x40
++	O_CLOEXEC                      = 0x100000
++	O_CREAT                        = 0x200
++	O_DIRECT                       = 0x10000
++	O_DIRECTORY                    = 0x20000
++	O_EXCL                         = 0x800
++	O_EXEC                         = 0x40000
++	O_EXLOCK                       = 0x20
++	O_FSYNC                        = 0x80
++	O_NDELAY                       = 0x4
++	O_NOCTTY                       = 0x8000
++	O_NOFOLLOW                     = 0x100
++	O_NONBLOCK                     = 0x4
++	O_RDONLY                       = 0x0
++	O_RDWR                         = 0x2
++	O_SHLOCK                       = 0x10
++	O_SYNC                         = 0x80
++	O_TRUNC                        = 0x400
++	O_TTY_INIT                     = 0x80000
++	O_VERIFY                       = 0x200000
++	O_WRONLY                       = 0x1
++	PARENB                         = 0x1000
++	PARMRK                         = 0x8
++	PARODD                         = 0x2000
++	PENDIN                         = 0x20000000
++	PRIO_PGRP                      = 0x1
++	PRIO_PROCESS                   = 0x0
++	PRIO_USER                      = 0x2
++	PROT_EXEC                      = 0x4
++	PROT_NONE                      = 0x0
++	PROT_READ                      = 0x1
++	PROT_WRITE                     = 0x2
++	RLIMIT_AS                      = 0xa
++	RLIMIT_CORE                    = 0x4
++	RLIMIT_CPU                     = 0x0
++	RLIMIT_DATA                    = 0x2
++	RLIMIT_FSIZE                   = 0x1
++	RLIMIT_MEMLOCK                 = 0x6
++	RLIMIT_NOFILE                  = 0x8
++	RLIMIT_NPROC                   = 0x7
++	RLIMIT_RSS                     = 0x5
++	RLIMIT_STACK                   = 0x3
++	RLIM_INFINITY                  = 0x7fffffffffffffff
++	RTAX_AUTHOR                    = 0x6
++	RTAX_BRD                       = 0x7
++	RTAX_DST                       = 0x0
++	RTAX_GATEWAY                   = 0x1
++	RTAX_GENMASK                   = 0x3
++	RTAX_IFA                       = 0x5
++	RTAX_IFP                       = 0x4
++	RTAX_MAX                       = 0x8
++	RTAX_NETMASK                   = 0x2
++	RTA_AUTHOR                     = 0x40
++	RTA_BRD                        = 0x80
++	RTA_DST                        = 0x1
++	RTA_GATEWAY                    = 0x2
++	RTA_GENMASK                    = 0x8
++	RTA_IFA                        = 0x20
++	RTA_IFP                        = 0x10
++	RTA_NETMASK                    = 0x4
++	RTF_BLACKHOLE                  = 0x1000
++	RTF_BROADCAST                  = 0x400000
++	RTF_DONE                       = 0x40
++	RTF_DYNAMIC                    = 0x10
++	RTF_FIXEDMTU                   = 0x80000
++	RTF_FMASK                      = 0x1004d808
++	RTF_GATEWAY                    = 0x2
++	RTF_GWFLAG_COMPAT              = 0x80000000
++	RTF_HOST                       = 0x4
++	RTF_LLDATA                     = 0x400
++	RTF_LLINFO                     = 0x400
++	RTF_LOCAL                      = 0x200000
++	RTF_MODIFIED                   = 0x20
++	RTF_MULTICAST                  = 0x800000
++	RTF_PINNED                     = 0x100000
++	RTF_PROTO1                     = 0x8000
++	RTF_PROTO2                     = 0x4000
++	RTF_PROTO3                     = 0x40000
++	RTF_REJECT                     = 0x8
++	RTF_RNH_LOCKED                 = 0x40000000
++	RTF_STATIC                     = 0x800
++	RTF_STICKY                     = 0x10000000
++	RTF_UP                         = 0x1
++	RTF_XRESOLVE                   = 0x200
++	RTM_ADD                        = 0x1
++	RTM_CHANGE                     = 0x3
++	RTM_DELADDR                    = 0xd
++	RTM_DELETE                     = 0x2
++	RTM_DELMADDR                   = 0x10
++	RTM_GET                        = 0x4
++	RTM_IEEE80211                  = 0x12
++	RTM_IFANNOUNCE                 = 0x11
++	RTM_IFINFO                     = 0xe
++	RTM_LOCK                       = 0x8
++	RTM_LOSING                     = 0x5
++	RTM_MISS                       = 0x7
++	RTM_NEWADDR                    = 0xc
++	RTM_NEWMADDR                   = 0xf
++	RTM_REDIRECT                   = 0x6
++	RTM_RESOLVE                    = 0xb
++	RTM_RTTUNIT                    = 0xf4240
++	RTM_VERSION                    = 0x5
++	RTV_EXPIRE                     = 0x4
++	RTV_HOPCOUNT                   = 0x2
++	RTV_MTU                        = 0x1
++	RTV_RPIPE                      = 0x8
++	RTV_RTT                        = 0x40
++	RTV_RTTVAR                     = 0x80
++	RTV_SPIPE                      = 0x10
++	RTV_SSTHRESH                   = 0x20
++	RTV_WEIGHT                     = 0x100
++	RT_ALL_FIBS                    = -0x1
++	RT_BLACKHOLE                   = 0x40
++	RT_CACHING_CONTEXT             = 0x1
++	RT_DEFAULT_FIB                 = 0x0
++	RT_HAS_GW                      = 0x80
++	RT_HAS_HEADER                  = 0x10
++	RT_HAS_HEADER_BIT              = 0x4
++	RT_L2_ME                       = 0x4
++	RT_L2_ME_BIT                   = 0x2
++	RT_LLE_CACHE                   = 0x100
++	RT_MAY_LOOP                    = 0x8
++	RT_MAY_LOOP_BIT                = 0x3
++	RT_NORTREF                     = 0x2
++	RT_REJECT                      = 0x20
++	RUSAGE_CHILDREN                = -0x1
++	RUSAGE_SELF                    = 0x0
++	RUSAGE_THREAD                  = 0x1
++	SCM_BINTIME                    = 0x4
++	SCM_CREDS                      = 0x3
++	SCM_RIGHTS                     = 0x1
++	SCM_TIMESTAMP                  = 0x2
++	SHUT_RD                        = 0x0
++	SHUT_RDWR                      = 0x2
++	SHUT_WR                        = 0x1
++	SIOCADDMULTI                   = 0x80206931
++	SIOCAIFADDR                    = 0x8040691a
++	SIOCAIFGROUP                   = 0x80286987
++	SIOCATMARK                     = 0x40047307
++	SIOCDELMULTI                   = 0x80206932
++	SIOCDIFADDR                    = 0x80206919
++	SIOCDIFGROUP                   = 0x80286989
++	SIOCDIFPHYADDR                 = 0x80206949
++	SIOCGDRVSPEC                   = 0xc028697b
++	SIOCGETSGCNT                   = 0xc0207210
++	SIOCGETVIFCNT                  = 0xc028720f
++	SIOCGHIWAT                     = 0x40047301
++	SIOCGI2C                       = 0xc020693d
++	SIOCGIFADDR                    = 0xc0206921
++	SIOCGIFBRDADDR                 = 0xc0206923
++	SIOCGIFCAP                     = 0xc020691f
++	SIOCGIFCONF                    = 0xc0106924
++	SIOCGIFDESCR                   = 0xc020692a
++	SIOCGIFDSTADDR                 = 0xc0206922
++	SIOCGIFFIB                     = 0xc020695c
++	SIOCGIFFLAGS                   = 0xc0206911
++	SIOCGIFGENERIC                 = 0xc020693a
++	SIOCGIFGMEMB                   = 0xc028698a
++	SIOCGIFGROUP                   = 0xc0286988
++	SIOCGIFINDEX                   = 0xc0206920
++	SIOCGIFMAC                     = 0xc0206926
++	SIOCGIFMEDIA                   = 0xc0306938
++	SIOCGIFMETRIC                  = 0xc0206917
++	SIOCGIFMTU                     = 0xc0206933
++	SIOCGIFNETMASK                 = 0xc0206925
++	SIOCGIFPDSTADDR                = 0xc0206948
++	SIOCGIFPHYS                    = 0xc0206935
++	SIOCGIFPSRCADDR                = 0xc0206947
++	SIOCGIFSTATUS                  = 0xc331693b
++	SIOCGIFXMEDIA                  = 0xc030698b
++	SIOCGLOWAT                     = 0x40047303
++	SIOCGPGRP                      = 0x40047309
++	SIOCGPRIVATE_0                 = 0xc0206950
++	SIOCGPRIVATE_1                 = 0xc0206951
++	SIOCGTUNFIB                    = 0xc020695e
++	SIOCIFCREATE                   = 0xc020697a
++	SIOCIFCREATE2                  = 0xc020697c
++	SIOCIFDESTROY                  = 0x80206979
++	SIOCIFGCLONERS                 = 0xc0106978
++	SIOCSDRVSPEC                   = 0x8028697b
++	SIOCSHIWAT                     = 0x80047300
++	SIOCSIFADDR                    = 0x8020690c
++	SIOCSIFBRDADDR                 = 0x80206913
++	SIOCSIFCAP                     = 0x8020691e
++	SIOCSIFDESCR                   = 0x80206929
++	SIOCSIFDSTADDR                 = 0x8020690e
++	SIOCSIFFIB                     = 0x8020695d
++	SIOCSIFFLAGS                   = 0x80206910
++	SIOCSIFGENERIC                 = 0x80206939
++	SIOCSIFLLADDR                  = 0x8020693c
++	SIOCSIFMAC                     = 0x80206927
++	SIOCSIFMEDIA                   = 0xc0206937
++	SIOCSIFMETRIC                  = 0x80206918
++	SIOCSIFMTU                     = 0x80206934
++	SIOCSIFNAME                    = 0x80206928
++	SIOCSIFNETMASK                 = 0x80206916
++	SIOCSIFPHYADDR                 = 0x80406946
++	SIOCSIFPHYS                    = 0x80206936
++	SIOCSIFRVNET                   = 0xc020695b
++	SIOCSIFVNET                    = 0xc020695a
++	SIOCSLOWAT                     = 0x80047302
++	SIOCSPGRP                      = 0x80047308
++	SIOCSTUNFIB                    = 0x8020695f
++	SOCK_CLOEXEC                   = 0x10000000
++	SOCK_DGRAM                     = 0x2
++	SOCK_MAXADDRLEN                = 0xff
++	SOCK_NONBLOCK                  = 0x20000000
++	SOCK_RAW                       = 0x3
++	SOCK_RDM                       = 0x4
++	SOCK_SEQPACKET                 = 0x5
++	SOCK_STREAM                    = 0x1
++	SOL_SOCKET                     = 0xffff
++	SOMAXCONN                      = 0x80
++	SO_ACCEPTCONN                  = 0x2
++	SO_ACCEPTFILTER                = 0x1000
++	SO_BINTIME                     = 0x2000
++	SO_BROADCAST                   = 0x20
++	SO_DEBUG                       = 0x1
++	SO_DONTROUTE                   = 0x10
++	SO_ERROR                       = 0x1007
++	SO_KEEPALIVE                   = 0x8
++	SO_LABEL                       = 0x1009
++	SO_LINGER                      = 0x80
++	SO_LISTENINCQLEN               = 0x1013
++	SO_LISTENQLEN                  = 0x1012
++	SO_LISTENQLIMIT                = 0x1011
++	SO_NOSIGPIPE                   = 0x800
++	SO_NO_DDP                      = 0x8000
++	SO_NO_OFFLOAD                  = 0x4000
++	SO_OOBINLINE                   = 0x100
++	SO_PEERLABEL                   = 0x1010
++	SO_PROTOCOL                    = 0x1016
++	SO_PROTOTYPE                   = 0x1016
++	SO_RCVBUF                      = 0x1002
++	SO_RCVLOWAT                    = 0x1004
++	SO_RCVTIMEO                    = 0x1006
++	SO_REUSEADDR                   = 0x4
++	SO_REUSEPORT                   = 0x200
++	SO_SETFIB                      = 0x1014
++	SO_SNDBUF                      = 0x1001
++	SO_SNDLOWAT                    = 0x1003
++	SO_SNDTIMEO                    = 0x1005
++	SO_TIMESTAMP                   = 0x400
++	SO_TYPE                        = 0x1008
++	SO_USELOOPBACK                 = 0x40
++	SO_USER_COOKIE                 = 0x1015
++	SO_VENDOR                      = 0x80000000
++	S_BLKSIZE                      = 0x200
++	S_IEXEC                        = 0x40
++	S_IFBLK                        = 0x6000
++	S_IFCHR                        = 0x2000
++	S_IFDIR                        = 0x4000
++	S_IFIFO                        = 0x1000
++	S_IFLNK                        = 0xa000
++	S_IFMT                         = 0xf000
++	S_IFREG                        = 0x8000
++	S_IFSOCK                       = 0xc000
++	S_IFWHT                        = 0xe000
++	S_IREAD                        = 0x100
++	S_IRGRP                        = 0x20
++	S_IROTH                        = 0x4
++	S_IRUSR                        = 0x100
++	S_IRWXG                        = 0x38
++	S_IRWXO                        = 0x7
++	S_IRWXU                        = 0x1c0
++	S_ISGID                        = 0x400
++	S_ISTXT                        = 0x200
++	S_ISUID                        = 0x800
++	S_ISVTX                        = 0x200
++	S_IWGRP                        = 0x10
++	S_IWOTH                        = 0x2
++	S_IWRITE                       = 0x80
++	S_IWUSR                        = 0x80
++	S_IXGRP                        = 0x8
++	S_IXOTH                        = 0x1
++	S_IXUSR                        = 0x40
++	TAB0                           = 0x0
++	TAB3                           = 0x4
++	TABDLY                         = 0x4
++	TCIFLUSH                       = 0x1
++	TCIOFF                         = 0x3
++	TCIOFLUSH                      = 0x3
++	TCION                          = 0x4
++	TCOFLUSH                       = 0x2
++	TCOOFF                         = 0x1
++	TCOON                          = 0x2
++	TCP_CA_NAME_MAX                = 0x10
++	TCP_CCALGOOPT                  = 0x41
++	TCP_CONGESTION                 = 0x40
++	TCP_FASTOPEN                   = 0x401
++	TCP_FUNCTION_BLK               = 0x2000
++	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
++	TCP_INFO                       = 0x20
++	TCP_KEEPCNT                    = 0x400
++	TCP_KEEPIDLE                   = 0x100
++	TCP_KEEPINIT                   = 0x80
++	TCP_KEEPINTVL                  = 0x200
++	TCP_MAXBURST                   = 0x4
++	TCP_MAXHLEN                    = 0x3c
++	TCP_MAXOLEN                    = 0x28
++	TCP_MAXSEG                     = 0x2
++	TCP_MAXWIN                     = 0xffff
++	TCP_MAX_SACK                   = 0x4
++	TCP_MAX_WINSHIFT               = 0xe
++	TCP_MD5SIG                     = 0x10
++	TCP_MINMSS                     = 0xd8
++	TCP_MSS                        = 0x218
++	TCP_NODELAY                    = 0x1
++	TCP_NOOPT                      = 0x8
++	TCP_NOPUSH                     = 0x4
++	TCP_PCAP_IN                    = 0x1000
++	TCP_PCAP_OUT                   = 0x800
++	TCP_VENDOR                     = 0x80000000
++	TCSAFLUSH                      = 0x2
++	TIOCCBRK                       = 0x2000747a
++	TIOCCDTR                       = 0x20007478
++	TIOCCONS                       = 0x80047462
++	TIOCDRAIN                      = 0x2000745e
++	TIOCEXCL                       = 0x2000740d
++	TIOCEXT                        = 0x80047460
++	TIOCFLUSH                      = 0x80047410
++	TIOCGDRAINWAIT                 = 0x40047456
++	TIOCGETA                       = 0x402c7413
++	TIOCGETD                       = 0x4004741a
++	TIOCGPGRP                      = 0x40047477
++	TIOCGPTN                       = 0x4004740f
++	TIOCGSID                       = 0x40047463
++	TIOCGWINSZ                     = 0x40087468
++	TIOCMBIC                       = 0x8004746b
++	TIOCMBIS                       = 0x8004746c
++	TIOCMGDTRWAIT                  = 0x4004745a
++	TIOCMGET                       = 0x4004746a
++	TIOCMSDTRWAIT                  = 0x8004745b
++	TIOCMSET                       = 0x8004746d
++	TIOCM_CAR                      = 0x40
++	TIOCM_CD                       = 0x40
++	TIOCM_CTS                      = 0x20
++	TIOCM_DCD                      = 0x40
++	TIOCM_DSR                      = 0x100
++	TIOCM_DTR                      = 0x2
++	TIOCM_LE                       = 0x1
++	TIOCM_RI                       = 0x80
++	TIOCM_RNG                      = 0x80
++	TIOCM_RTS                      = 0x4
++	TIOCM_SR                       = 0x10
++	TIOCM_ST                       = 0x8
++	TIOCNOTTY                      = 0x20007471
++	TIOCNXCL                       = 0x2000740e
++	TIOCOUTQ                       = 0x40047473
++	TIOCPKT                        = 0x80047470
++	TIOCPKT_DATA                   = 0x0
++	TIOCPKT_DOSTOP                 = 0x20
++	TIOCPKT_FLUSHREAD              = 0x1
++	TIOCPKT_FLUSHWRITE             = 0x2
++	TIOCPKT_IOCTL                  = 0x40
++	TIOCPKT_NOSTOP                 = 0x10
++	TIOCPKT_START                  = 0x8
++	TIOCPKT_STOP                   = 0x4
++	TIOCPTMASTER                   = 0x2000741c
++	TIOCSBRK                       = 0x2000747b
++	TIOCSCTTY                      = 0x20007461
++	TIOCSDRAINWAIT                 = 0x80047457
++	TIOCSDTR                       = 0x20007479
++	TIOCSETA                       = 0x802c7414
++	TIOCSETAF                      = 0x802c7416
++	TIOCSETAW                      = 0x802c7415
++	TIOCSETD                       = 0x8004741b
++	TIOCSIG                        = 0x2004745f
++	TIOCSPGRP                      = 0x80047476
++	TIOCSTART                      = 0x2000746e
++	TIOCSTAT                       = 0x20007465
++	TIOCSTI                        = 0x80017472
++	TIOCSTOP                       = 0x2000746f
++	TIOCSWINSZ                     = 0x80087467
++	TIOCTIMESTAMP                  = 0x40107459
++	TIOCUCNTL                      = 0x80047466
++	TOSTOP                         = 0x400000
++	VDISCARD                       = 0xf
++	VDSUSP                         = 0xb
++	VEOF                           = 0x0
++	VEOL                           = 0x1
++	VEOL2                          = 0x2
++	VERASE                         = 0x3
++	VERASE2                        = 0x7
++	VINTR                          = 0x8
++	VKILL                          = 0x5
++	VLNEXT                         = 0xe
++	VMIN                           = 0x10
++	VQUIT                          = 0x9
++	VREPRINT                       = 0x6
++	VSTART                         = 0xc
++	VSTATUS                        = 0x12
++	VSTOP                          = 0xd
++	VSUSP                          = 0xa
++	VTIME                          = 0x11
++	VWERASE                        = 0x4
++	WCONTINUED                     = 0x4
++	WCOREFLAG                      = 0x80
++	WEXITED                        = 0x10
++	WLINUXCLONE                    = 0x80000000
++	WNOHANG                        = 0x1
++	WNOWAIT                        = 0x8
++	WSTOPPED                       = 0x2
++	WTRAPPED                       = 0x20
++	WUNTRACED                      = 0x2
++)
++
++// Errors
++const (
++	E2BIG           = syscall.Errno(0x7)
++	EACCES          = syscall.Errno(0xd)
++	EADDRINUSE      = syscall.Errno(0x30)
++	EADDRNOTAVAIL   = syscall.Errno(0x31)
++	EAFNOSUPPORT    = syscall.Errno(0x2f)
++	EAGAIN          = syscall.Errno(0x23)
++	EALREADY        = syscall.Errno(0x25)
++	EAUTH           = syscall.Errno(0x50)
++	EBADF           = syscall.Errno(0x9)
++	EBADMSG         = syscall.Errno(0x59)
++	EBADRPC         = syscall.Errno(0x48)
++	EBUSY           = syscall.Errno(0x10)
++	ECANCELED       = syscall.Errno(0x55)
++	ECAPMODE        = syscall.Errno(0x5e)
++	ECHILD          = syscall.Errno(0xa)
++	ECONNABORTED    = syscall.Errno(0x35)
++	ECONNREFUSED    = syscall.Errno(0x3d)
++	ECONNRESET      = syscall.Errno(0x36)
++	EDEADLK         = syscall.Errno(0xb)
++	EDESTADDRREQ    = syscall.Errno(0x27)
++	EDOM            = syscall.Errno(0x21)
++	EDOOFUS         = syscall.Errno(0x58)
++	EDQUOT          = syscall.Errno(0x45)
++	EEXIST          = syscall.Errno(0x11)
++	EFAULT          = syscall.Errno(0xe)
++	EFBIG           = syscall.Errno(0x1b)
++	EFTYPE          = syscall.Errno(0x4f)
++	EHOSTDOWN       = syscall.Errno(0x40)
++	EHOSTUNREACH    = syscall.Errno(0x41)
++	EIDRM           = syscall.Errno(0x52)
++	EILSEQ          = syscall.Errno(0x56)
++	EINPROGRESS     = syscall.Errno(0x24)
++	EINTR           = syscall.Errno(0x4)
++	EINVAL          = syscall.Errno(0x16)
++	EIO             = syscall.Errno(0x5)
++	EISCONN         = syscall.Errno(0x38)
++	EISDIR          = syscall.Errno(0x15)
++	ELAST           = syscall.Errno(0x60)
++	ELOOP           = syscall.Errno(0x3e)
++	EMFILE          = syscall.Errno(0x18)
++	EMLINK          = syscall.Errno(0x1f)
++	EMSGSIZE        = syscall.Errno(0x28)
++	EMULTIHOP       = syscall.Errno(0x5a)
++	ENAMETOOLONG    = syscall.Errno(0x3f)
++	ENEEDAUTH       = syscall.Errno(0x51)
++	ENETDOWN        = syscall.Errno(0x32)
++	ENETRESET       = syscall.Errno(0x34)
++	ENETUNREACH     = syscall.Errno(0x33)
++	ENFILE          = syscall.Errno(0x17)
++	ENOATTR         = syscall.Errno(0x57)
++	ENOBUFS         = syscall.Errno(0x37)
++	ENODEV          = syscall.Errno(0x13)
++	ENOENT          = syscall.Errno(0x2)
++	ENOEXEC         = syscall.Errno(0x8)
++	ENOLCK          = syscall.Errno(0x4d)
++	ENOLINK         = syscall.Errno(0x5b)
++	ENOMEM          = syscall.Errno(0xc)
++	ENOMSG          = syscall.Errno(0x53)
++	ENOPROTOOPT     = syscall.Errno(0x2a)
++	ENOSPC          = syscall.Errno(0x1c)
++	ENOSYS          = syscall.Errno(0x4e)
++	ENOTBLK         = syscall.Errno(0xf)
++	ENOTCAPABLE     = syscall.Errno(0x5d)
++	ENOTCONN        = syscall.Errno(0x39)
++	ENOTDIR         = syscall.Errno(0x14)
++	ENOTEMPTY       = syscall.Errno(0x42)
++	ENOTRECOVERABLE = syscall.Errno(0x5f)
++	ENOTSOCK        = syscall.Errno(0x26)
++	ENOTSUP         = syscall.Errno(0x2d)
++	ENOTTY          = syscall.Errno(0x19)
++	ENXIO           = syscall.Errno(0x6)
++	EOPNOTSUPP      = syscall.Errno(0x2d)
++	EOVERFLOW       = syscall.Errno(0x54)
++	EOWNERDEAD      = syscall.Errno(0x60)
++	EPERM           = syscall.Errno(0x1)
++	EPFNOSUPPORT    = syscall.Errno(0x2e)
++	EPIPE           = syscall.Errno(0x20)
++	EPROCLIM        = syscall.Errno(0x43)
++	EPROCUNAVAIL    = syscall.Errno(0x4c)
++	EPROGMISMATCH   = syscall.Errno(0x4b)
++	EPROGUNAVAIL    = syscall.Errno(0x4a)
++	EPROTO          = syscall.Errno(0x5c)
++	EPROTONOSUPPORT = syscall.Errno(0x2b)
++	EPROTOTYPE      = syscall.Errno(0x29)
++	ERANGE          = syscall.Errno(0x22)
++	EREMOTE         = syscall.Errno(0x47)
++	EROFS           = syscall.Errno(0x1e)
++	ERPCMISMATCH    = syscall.Errno(0x49)
++	ESHUTDOWN       = syscall.Errno(0x3a)
++	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
++	ESPIPE          = syscall.Errno(0x1d)
++	ESRCH           = syscall.Errno(0x3)
++	ESTALE          = syscall.Errno(0x46)
++	ETIMEDOUT       = syscall.Errno(0x3c)
++	ETOOMANYREFS    = syscall.Errno(0x3b)
++	ETXTBSY         = syscall.Errno(0x1a)
++	EUSERS          = syscall.Errno(0x44)
++	EWOULDBLOCK     = syscall.Errno(0x23)
++	EXDEV           = syscall.Errno(0x12)
++)
++
++// Signals
++const (
++	SIGABRT   = syscall.Signal(0x6)
++	SIGALRM   = syscall.Signal(0xe)
++	SIGBUS    = syscall.Signal(0xa)
++	SIGCHLD   = syscall.Signal(0x14)
++	SIGCONT   = syscall.Signal(0x13)
++	SIGEMT    = syscall.Signal(0x7)
++	SIGFPE    = syscall.Signal(0x8)
++	SIGHUP    = syscall.Signal(0x1)
++	SIGILL    = syscall.Signal(0x4)
++	SIGINFO   = syscall.Signal(0x1d)
++	SIGINT    = syscall.Signal(0x2)
++	SIGIO     = syscall.Signal(0x17)
++	SIGIOT    = syscall.Signal(0x6)
++	SIGKILL   = syscall.Signal(0x9)
++	SIGLIBRT  = syscall.Signal(0x21)
++	SIGLWP    = syscall.Signal(0x20)
++	SIGPIPE   = syscall.Signal(0xd)
++	SIGPROF   = syscall.Signal(0x1b)
++	SIGQUIT   = syscall.Signal(0x3)
++	SIGSEGV   = syscall.Signal(0xb)
++	SIGSTOP   = syscall.Signal(0x11)
++	SIGSYS    = syscall.Signal(0xc)
++	SIGTERM   = syscall.Signal(0xf)
++	SIGTHR    = syscall.Signal(0x20)
++	SIGTRAP   = syscall.Signal(0x5)
++	SIGTSTP   = syscall.Signal(0x12)
++	SIGTTIN   = syscall.Signal(0x15)
++	SIGTTOU   = syscall.Signal(0x16)
++	SIGURG    = syscall.Signal(0x10)
++	SIGUSR1   = syscall.Signal(0x1e)
++	SIGUSR2   = syscall.Signal(0x1f)
++	SIGVTALRM = syscall.Signal(0x1a)
++	SIGWINCH  = syscall.Signal(0x1c)
++	SIGXCPU   = syscall.Signal(0x18)
++	SIGXFSZ   = syscall.Signal(0x19)
++)
++
++// Error table
++var errorList = [...]struct {
++	num  syscall.Errno
++	name string
++	desc string
++}{
++	{1, "EPERM", "operation not permitted"},
++	{2, "ENOENT", "no such file or directory"},
++	{3, "ESRCH", "no such process"},
++	{4, "EINTR", "interrupted system call"},
++	{5, "EIO", "input/output error"},
++	{6, "ENXIO", "device not configured"},
++	{7, "E2BIG", "argument list too long"},
++	{8, "ENOEXEC", "exec format error"},
++	{9, "EBADF", "bad file descriptor"},
++	{10, "ECHILD", "no child processes"},
++	{11, "EDEADLK", "resource deadlock avoided"},
++	{12, "ENOMEM", "cannot allocate memory"},
++	{13, "EACCES", "permission denied"},
++	{14, "EFAULT", "bad address"},
++	{15, "ENOTBLK", "block device required"},
++	{16, "EBUSY", "device busy"},
++	{17, "EEXIST", "file exists"},
++	{18, "EXDEV", "cross-device link"},
++	{19, "ENODEV", "operation not supported by device"},
++	{20, "ENOTDIR", "not a directory"},
++	{21, "EISDIR", "is a directory"},
++	{22, "EINVAL", "invalid argument"},
++	{23, "ENFILE", "too many open files in system"},
++	{24, "EMFILE", "too many open files"},
++	{25, "ENOTTY", "inappropriate ioctl for device"},
++	{26, "ETXTBSY", "text file busy"},
++	{27, "EFBIG", "file too large"},
++	{28, "ENOSPC", "no space left on device"},
++	{29, "ESPIPE", "illegal seek"},
++	{30, "EROFS", "read-only file system"},
++	{31, "EMLINK", "too many links"},
++	{32, "EPIPE", "broken pipe"},
++	{33, "EDOM", "numerical argument out of domain"},
++	{34, "ERANGE", "result too large"},
++	{35, "EAGAIN", "resource temporarily unavailable"},
++	{36, "EINPROGRESS", "operation now in progress"},
++	{37, "EALREADY", "operation already in progress"},
++	{38, "ENOTSOCK", "socket operation on non-socket"},
++	{39, "EDESTADDRREQ", "destination address required"},
++	{40, "EMSGSIZE", "message too long"},
++	{41, "EPROTOTYPE", "protocol wrong type for socket"},
++	{42, "ENOPROTOOPT", "protocol not available"},
++	{43, "EPROTONOSUPPORT", "protocol not supported"},
++	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
++	{45, "EOPNOTSUPP", "operation not supported"},
++	{46, "EPFNOSUPPORT", "protocol family not supported"},
++	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
++	{48, "EADDRINUSE", "address already in use"},
++	{49, "EADDRNOTAVAIL", "can't assign requested address"},
++	{50, "ENETDOWN", "network is down"},
++	{51, "ENETUNREACH", "network is unreachable"},
++	{52, "ENETRESET", "network dropped connection on reset"},
++	{53, "ECONNABORTED", "software caused connection abort"},
++	{54, "ECONNRESET", "connection reset by peer"},
++	{55, "ENOBUFS", "no buffer space available"},
++	{56, "EISCONN", "socket is already connected"},
++	{57, "ENOTCONN", "socket is not connected"},
++	{58, "ESHUTDOWN", "can't send after socket shutdown"},
++	{59, "ETOOMANYREFS", "too many references: can't splice"},
++	{60, "ETIMEDOUT", "operation timed out"},
++	{61, "ECONNREFUSED", "connection refused"},
++	{62, "ELOOP", "too many levels of symbolic links"},
++	{63, "ENAMETOOLONG", "file name too long"},
++	{64, "EHOSTDOWN", "host is down"},
++	{65, "EHOSTUNREACH", "no route to host"},
++	{66, "ENOTEMPTY", "directory not empty"},
++	{67, "EPROCLIM", "too many processes"},
++	{68, "EUSERS", "too many users"},
++	{69, "EDQUOT", "disc quota exceeded"},
++	{70, "ESTALE", "stale NFS file handle"},
++	{71, "EREMOTE", "too many levels of remote in path"},
++	{72, "EBADRPC", "RPC struct is bad"},
++	{73, "ERPCMISMATCH", "RPC version wrong"},
++	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
++	{75, "EPROGMISMATCH", "program version wrong"},
++	{76, "EPROCUNAVAIL", "bad procedure for program"},
++	{77, "ENOLCK", "no locks available"},
++	{78, "ENOSYS", "function not implemented"},
++	{79, "EFTYPE", "inappropriate file type or format"},
++	{80, "EAUTH", "authentication error"},
++	{81, "ENEEDAUTH", "need authenticator"},
++	{82, "EIDRM", "identifier removed"},
++	{83, "ENOMSG", "no message of desired type"},
++	{84, "EOVERFLOW", "value too large to be stored in data type"},
++	{85, "ECANCELED", "operation canceled"},
++	{86, "EILSEQ", "illegal byte sequence"},
++	{87, "ENOATTR", "attribute not found"},
++	{88, "EDOOFUS", "programming error"},
++	{89, "EBADMSG", "bad message"},
++	{90, "EMULTIHOP", "multihop attempted"},
++	{91, "ENOLINK", "link has been severed"},
++	{92, "EPROTO", "protocol error"},
++	{93, "ENOTCAPABLE", "capabilities insufficient"},
++	{94, "ECAPMODE", "not permitted in capability mode"},
++	{95, "ENOTRECOVERABLE", "state not recoverable"},
++	{96, "EOWNERDEAD", "previous owner died"},
++}
++
++// Signal table
++var signalList = [...]struct {
++	num  syscall.Signal
++	name string
++	desc string
++}{
++	{1, "SIGHUP", "hangup"},
++	{2, "SIGINT", "interrupt"},
++	{3, "SIGQUIT", "quit"},
++	{4, "SIGILL", "illegal instruction"},
++	{5, "SIGTRAP", "trace/BPT trap"},
++	{6, "SIGIOT", "abort trap"},
++	{7, "SIGEMT", "EMT trap"},
++	{8, "SIGFPE", "floating point exception"},
++	{9, "SIGKILL", "killed"},
++	{10, "SIGBUS", "bus error"},
++	{11, "SIGSEGV", "segmentation fault"},
++	{12, "SIGSYS", "bad system call"},
++	{13, "SIGPIPE", "broken pipe"},
++	{14, "SIGALRM", "alarm clock"},
++	{15, "SIGTERM", "terminated"},
++	{16, "SIGURG", "urgent I/O condition"},
++	{17, "SIGSTOP", "suspended (signal)"},
++	{18, "SIGTSTP", "suspended"},
++	{19, "SIGCONT", "continued"},
++	{20, "SIGCHLD", "child exited"},
++	{21, "SIGTTIN", "stopped (tty input)"},
++	{22, "SIGTTOU", "stopped (tty output)"},
++	{23, "SIGIO", "I/O possible"},
++	{24, "SIGXCPU", "cputime limit exceeded"},
++	{25, "SIGXFSZ", "filesize limit exceeded"},
++	{26, "SIGVTALRM", "virtual timer expired"},
++	{27, "SIGPROF", "profiling timer expired"},
++	{28, "SIGWINCH", "window size changes"},
++	{29, "SIGINFO", "information request"},
++	{30, "SIGUSR1", "user defined signal 1"},
++	{31, "SIGUSR2", "user defined signal 2"},
++	{32, "SIGTHR", "unknown signal"},
++	{33, "SIGLIBRT", "unknown signal"},
++}
diff --git a/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zsyscall__freebsd__arm64.go b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zsyscall__freebsd__arm64.go
new file mode 100644
index 000000000000..ba803f7bac6a
--- /dev/null
+++ b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zsyscall__freebsd__arm64.go
@@ -0,0 +1,1940 @@
+--- vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go.orig	2020-06-10 07:45:07 UTC
++++ vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm64.go
+@@ -0,0 +1,1937 @@
++// go run mksyscall.go -tags freebsd,arm64 -- syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm64.go
++// Code generated by the command above; see README.md. DO NOT EDIT.
++
++// +build freebsd,arm64
++
++package unix
++
++import (
++	"syscall"
++	"unsafe"
++)
++
++var _ syscall.Errno
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
++	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func setgroups(ngid int, gid *_Gid_t) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
++	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
++	wpid = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
++	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
++	fd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
++	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
++	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func socket(domain int, typ int, proto int) (fd int, err error) {
++	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
++	fd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
++	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
++	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
++	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
++	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Shutdown(s int, how int) (err error) {
++	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
++	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(p) > 0 {
++		_p0 = unsafe.Pointer(&p[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
++	var _p0 unsafe.Pointer
++	if len(buf) > 0 {
++		_p0 = unsafe.Pointer(&buf[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
++	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
++	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
++	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
++	var _p0 unsafe.Pointer
++	if len(mib) > 0 {
++		_p0 = unsafe.Pointer(&mib[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func utimes(path string, timeval *[2]Timeval) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func futimes(fd int, timeval *[2]Timeval) (err error) {
++	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func fcntl(fd int, cmd int, arg int) (val int, err error) {
++	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
++	val = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
++	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Madvise(b []byte, behav int) (err error) {
++	var _p0 unsafe.Pointer
++	if len(b) > 0 {
++		_p0 = unsafe.Pointer(&b[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mlock(b []byte) (err error) {
++	var _p0 unsafe.Pointer
++	if len(b) > 0 {
++		_p0 = unsafe.Pointer(&b[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mlockall(flags int) (err error) {
++	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mprotect(b []byte, prot int) (err error) {
++	var _p0 unsafe.Pointer
++	if len(b) > 0 {
++		_p0 = unsafe.Pointer(&b[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Msync(b []byte, flags int) (err error) {
++	var _p0 unsafe.Pointer
++	if len(b) > 0 {
++		_p0 = unsafe.Pointer(&b[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Munlock(b []byte) (err error) {
++	var _p0 unsafe.Pointer
++	if len(b) > 0 {
++		_p0 = unsafe.Pointer(&b[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Munlockall() (err error) {
++	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func pipe() (r int, w int, err error) {
++	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
++	r = int(r0)
++	w = int(r1)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getcwd(buf []byte) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(buf) > 0 {
++		_p0 = unsafe.Pointer(&buf[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ioctl(fd int, req uint, arg uintptr) (err error) {
++	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Access(path string, mode uint32) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
++	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func CapEnter() (err error) {
++	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
++	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func capRightsLimit(fd int, rightsp *CapRights) (err error) {
++	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Chdir(path string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Chflags(path string, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Chmod(path string, mode uint32) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Chown(path string, uid int, gid int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Chroot(path string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Close(fd int) (err error) {
++	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Dup(fd int) (nfd int, err error) {
++	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
++	nfd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Dup2(from int, to int) (err error) {
++	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Exit(code int) {
++	Syscall(SYS_EXIT, uintptr(code), 0, 0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrGetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrSetFd(fd int, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)), uintptr(data), uintptr(nbytes), 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrDeleteFd(fd int, attrnamespace int, attrname string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FD, uintptr(fd), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p0)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrListFd(fd int, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
++	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FD, uintptr(fd), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrGetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(file)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrSetFile(file string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(file)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrDeleteFile(file string, attrnamespace int, attrname string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(file)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrListFile(file string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(file)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_FILE, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrGetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_GET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrSetLink(link string, attrnamespace int, attrname string, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_SET_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)), uintptr(data), uintptr(nbytes), 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(attrname)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_EXTATTR_DELETE_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(unsafe.Pointer(_p1)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_EXTATTR_LIST_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(attrnamespace), uintptr(data), uintptr(nbytes), 0, 0)
++	ret = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
++	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fchdir(fd int) (err error) {
++	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fchflags(fd int, flags int) (err error) {
++	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fchmod(fd int, mode uint32) (err error) {
++	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fchown(fd int, uid int, gid int) (err error) {
++	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Flock(fd int, how int) (err error) {
++	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fpathconf(fd int, name int) (val int, err error) {
++	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
++	val = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fstat(fd int, stat *Stat_t) (err error) {
++	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fstatfs(fd int, stat *Statfs_t) (err error) {
++	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Fsync(fd int) (err error) {
++	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Ftruncate(fd int, length int64) (err error) {
++	_, _, e1 := Syscall(SYS_FTRUNCATE, uintptr(fd), uintptr(length), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getdents(fd int, buf []byte) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(buf) > 0 {
++		_p0 = unsafe.Pointer(&buf[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(buf) > 0 {
++		_p0 = unsafe.Pointer(&buf[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall6(SYS_GETDIRENTRIES, uintptr(fd), uintptr(_p0), uintptr(len(buf)), uintptr(unsafe.Pointer(basep)), 0, 0)
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getdtablesize() (size int) {
++	r0, _, _ := Syscall(SYS_GETDTABLESIZE, 0, 0, 0)
++	size = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getegid() (egid int) {
++	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
++	egid = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Geteuid() (uid int) {
++	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
++	uid = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getgid() (gid int) {
++	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
++	gid = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getpgid(pid int) (pgid int, err error) {
++	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
++	pgid = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getpgrp() (pgrp int) {
++	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
++	pgrp = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getpid() (pid int) {
++	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
++	pid = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getppid() (ppid int) {
++	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
++	ppid = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getpriority(which int, who int) (prio int, err error) {
++	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
++	prio = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getrlimit(which int, lim *Rlimit) (err error) {
++	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getrusage(who int, rusage *Rusage) (err error) {
++	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getsid(pid int) (sid int, err error) {
++	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
++	sid = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Gettimeofday(tv *Timeval) (err error) {
++	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Getuid() (uid int) {
++	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
++	uid = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Issetugid() (tainted bool) {
++	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
++	tainted = bool(r0 != 0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Kill(pid int, signum syscall.Signal) (err error) {
++	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Kqueue() (fd int, err error) {
++	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
++	fd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Lchown(path string, uid int, gid int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Link(path string, link string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Listen(s int, backlog int) (err error) {
++	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Lstat(path string, stat *Stat_t) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mkdir(path string, mode uint32) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mkdirat(dirfd int, path string, mode uint32) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mkfifo(path string, mode uint32) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Mknod(path string, mode uint32, dev int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
++	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Open(path string, mode int, perm uint32) (fd int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
++	fd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
++	fd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Pathconf(path string, name int) (val int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
++	val = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Pread(fd int, p []byte, offset int64) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(p) > 0 {
++		_p0 = unsafe.Pointer(&p[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(p) > 0 {
++		_p0 = unsafe.Pointer(&p[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), 0, 0)
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func read(fd int, p []byte) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(p) > 0 {
++		_p0 = unsafe.Pointer(&p[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Readlink(path string, buf []byte) (n int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	var _p1 unsafe.Pointer
++	if len(buf) > 0 {
++		_p1 = unsafe.Pointer(&buf[0])
++	} else {
++		_p1 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	var _p1 unsafe.Pointer
++	if len(buf) > 0 {
++		_p1 = unsafe.Pointer(&buf[0])
++	} else {
++		_p1 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Rename(from string, to string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(from)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(to)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Renameat(fromfd int, from string, tofd int, to string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(from)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(to)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Revoke(path string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Rmdir(path string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
++	r0, _, e1 := Syscall(SYS_LSEEK, uintptr(fd), uintptr(offset), uintptr(whence))
++	newoffset = int64(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
++	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setegid(egid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Seteuid(euid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setgid(gid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setlogin(name string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(name)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setpgid(pid int, pgid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setpriority(which int, who int, prio int) (err error) {
++	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setregid(rgid int, egid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setreuid(ruid int, euid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setresgid(rgid int, egid int, sgid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setresuid(ruid int, euid int, suid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setrlimit(which int, lim *Rlimit) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setsid() (pid int, err error) {
++	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
++	pid = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Settimeofday(tp *Timeval) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Setuid(uid int) (err error) {
++	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Stat(path string, stat *Stat_t) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Statfs(path string, stat *Statfs_t) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Symlink(path string, link string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(link)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(oldpath)
++	if err != nil {
++		return
++	}
++	var _p1 *byte
++	_p1, err = BytePtrFromString(newpath)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Sync() (err error) {
++	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Truncate(path string, length int64) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), uintptr(length), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Umask(newmask int) (oldmask int) {
++	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
++	oldmask = int(r0)
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Undelete(path string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_UNDELETE, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Unlink(path string) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Unlinkat(dirfd int, path string, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func Unmount(path string, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func write(fd int, p []byte) (n int, err error) {
++	var _p0 unsafe.Pointer
++	if len(p) > 0 {
++		_p0 = unsafe.Pointer(&p[0])
++	} else {
++		_p0 = unsafe.Pointer(&_zero)
++	}
++	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
++	r0, _, e1 := Syscall6(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), uintptr(pos))
++	ret = uintptr(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func munmap(addr uintptr, length uintptr) (err error) {
++	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
++	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
++	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
++	n = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
++	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
++	nfd = int(r0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
++
++// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
++
++func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
++	var _p0 *byte
++	_p0, err = BytePtrFromString(path)
++	if err != nil {
++		return
++	}
++	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
++	if e1 != 0 {
++		err = errnoErr(e1)
++	}
++	return
++}
diff --git a/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zsysnum__freebsd__arm64.go b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zsysnum__freebsd__arm64.go
new file mode 100644
index 000000000000..0eddde2643fd
--- /dev/null
+++ b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_zsysnum__freebsd__arm64.go
@@ -0,0 +1,399 @@
+--- vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go.orig	2020-06-10 07:45:07 UTC
++++ vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm64.go
+@@ -0,0 +1,396 @@
++// mksysnum_freebsd.pl
++// Code generated by the command above; see README.md. DO NOT EDIT.
++
++// +build arm64,freebsd
++
++package unix
++
++const (
++	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
++	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
++	SYS_FORK                     = 2   // { int fork(void); }
++	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
++	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
++	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
++	SYS_CLOSE                    = 6   // { int close(int fd); }
++	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
++	SYS_LINK                     = 9   // { int link(char *path, char *link); }
++	SYS_UNLINK                   = 10  // { int unlink(char *path); }
++	SYS_CHDIR                    = 12  // { int chdir(char *path); }
++	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
++	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
++	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
++	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
++	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
++	SYS_GETPID                   = 20  // { pid_t getpid(void); }
++	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
++	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
++	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
++	SYS_GETUID                   = 24  // { uid_t getuid(void); }
++	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
++	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
++	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
++	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
++	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
++	SYS_ACCEPT                   = 30  // { int accept(int s, \
++	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
++	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
++	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
++	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
++	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
++	SYS_SYNC                     = 36  // { int sync(void); }
++	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
++	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
++	SYS_DUP                      = 41  // { int dup(u_int fd); }
++	SYS_PIPE                     = 42  // { int pipe(void); }
++	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
++	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
++	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
++	SYS_GETGID                   = 47  // { gid_t getgid(void); }
++	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
++	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
++	SYS_ACCT                     = 51  // { int acct(char *path); }
++	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
++	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
++	SYS_REBOOT                   = 55  // { int reboot(int opt); }
++	SYS_REVOKE                   = 56  // { int revoke(char *path); }
++	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
++	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
++	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
++	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
++	SYS_CHROOT                   = 61  // { int chroot(char *path); }
++	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
++	SYS_VFORK                    = 66  // { int vfork(void); }
++	SYS_SBRK                     = 69  // { int sbrk(int incr); }
++	SYS_SSTK                     = 70  // { int sstk(int incr); }
++	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
++	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
++	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
++	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
++	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
++	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
++	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
++	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
++	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
++	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
++	SYS_SWAPON                   = 85  // { int swapon(char *name); }
++	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
++	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
++	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
++	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
++	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
++	SYS_FSYNC                    = 95  // { int fsync(int fd); }
++	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
++	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
++	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
++	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
++	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
++	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
++	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
++	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
++	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
++	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
++	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
++	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
++	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
++	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
++	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
++	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
++	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
++	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
++	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
++	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
++	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
++	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
++	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
++	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
++	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
++	SYS_UTIMES                   = 138 // { int utimes(char *path, \
++	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
++	SYS_SETSID                   = 147 // { int setsid(void); }
++	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
++	SYS_NLM_SYSCALL              = 154 // { int nlm_syscall(int debug_level, int grace_period, int addr_count, char **addrs); }
++	SYS_NFSSVC                   = 155 // { int nfssvc(int flag, caddr_t argp); }
++	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
++	SYS_GETFH                    = 161 // { int getfh(char *fname, \
++	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
++	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
++	SYS_SEMSYS                   = 169 // { int semsys(int which, int a2, int a3, \
++	SYS_MSGSYS                   = 170 // { int msgsys(int which, int a2, int a3, \
++	SYS_SHMSYS                   = 171 // { int shmsys(int which, int a2, int a3, \
++	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
++	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
++	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
++	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
++	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
++	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
++	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
++	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
++	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
++	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
++	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
++	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
++	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
++	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
++	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
++	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
++	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
++	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
++	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
++	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
++	SYS_SEMGET                   = 221 // { int semget(key_t key, int nsems, \
++	SYS_SEMOP                    = 222 // { int semop(int semid, struct sembuf *sops, \
++	SYS_MSGGET                   = 225 // { int msgget(key_t key, int msgflg); }
++	SYS_MSGSND                   = 226 // { int msgsnd(int msqid, const void *msgp, \
++	SYS_MSGRCV                   = 227 // { int msgrcv(int msqid, void *msgp, \
++	SYS_SHMAT                    = 228 // { int shmat(int shmid, const void *shmaddr, \
++	SYS_SHMDT                    = 230 // { int shmdt(const void *shmaddr); }
++	SYS_SHMGET                   = 231 // { int shmget(key_t key, size_t size, \
++	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
++	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
++	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
++	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
++	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
++	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
++	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
++	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
++	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
++	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
++	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
++	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
++	SYS_CLOCK_NANOSLEEP          = 244 // { int clock_nanosleep(clockid_t clock_id, \
++	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
++	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
++	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
++	SYS_RFORK                    = 251 // { int rfork(int flags); }
++	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
++	SYS_ISSETUGID                = 253 // { int issetugid(void); }
++	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
++	SYS_AIO_READ                 = 255 // { int aio_read(struct aiocb *aiocbp); }
++	SYS_AIO_WRITE                = 256 // { int aio_write(struct aiocb *aiocbp); }
++	SYS_LIO_LISTIO               = 257 // { int lio_listio(int mode, \
++	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
++	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
++	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
++	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
++	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
++	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
++	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
++	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
++	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
++	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
++	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
++	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
++	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
++	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
++	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
++	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
++	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
++	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
++	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
++	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
++	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
++	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
++	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
++	SYS_AIO_RETURN               = 314 // { ssize_t aio_return(struct aiocb *aiocbp); }
++	SYS_AIO_SUSPEND              = 315 // { int aio_suspend( \
++	SYS_AIO_CANCEL               = 316 // { int aio_cancel(int fd, \
++	SYS_AIO_ERROR                = 317 // { int aio_error(struct aiocb *aiocbp); }
++	SYS_YIELD                    = 321 // { int yield(void); }
++	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
++	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
++	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
++	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
++	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
++	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
++	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
++	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
++	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
++	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
++	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
++	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
++	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
++	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
++	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
++	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
++	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
++	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
++	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
++	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
++	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
++	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
++	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
++	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
++	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
++	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
++	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
++	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
++	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
++	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
++	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
++	SYS_AIO_WAITCOMPLETE         = 359 // { ssize_t aio_waitcomplete( \
++	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
++	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
++	SYS_KQUEUE                   = 362 // { int kqueue(void); }
++	SYS_KEVENT                   = 363 // { int kevent(int fd, \
++	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
++	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
++	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
++	SYS___SETUGID                = 374 // { int __setugid(int flag); }
++	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
++	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
++	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
++	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
++	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
++	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
++	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
++	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
++	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
++	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
++	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
++	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
++	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
++	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
++	SYS_STATFS                   = 396 // { int statfs(char *path, \
++	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
++	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
++	SYS_KSEM_CLOSE               = 400 // { int ksem_close(semid_t id); }
++	SYS_KSEM_POST                = 401 // { int ksem_post(semid_t id); }
++	SYS_KSEM_WAIT                = 402 // { int ksem_wait(semid_t id); }
++	SYS_KSEM_TRYWAIT             = 403 // { int ksem_trywait(semid_t id); }
++	SYS_KSEM_INIT                = 404 // { int ksem_init(semid_t *idp, \
++	SYS_KSEM_OPEN                = 405 // { int ksem_open(semid_t *idp, \
++	SYS_KSEM_UNLINK              = 406 // { int ksem_unlink(const char *name); }
++	SYS_KSEM_GETVALUE            = 407 // { int ksem_getvalue(semid_t id, int *val); }
++	SYS_KSEM_DESTROY             = 408 // { int ksem_destroy(semid_t id); }
++	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
++	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
++	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
++	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
++	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
++	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
++	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
++	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
++	SYS_SIGRETURN                = 417 // { int sigreturn( \
++	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
++	SYS_SETCONTEXT               = 422 // { int setcontext( \
++	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
++	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
++	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
++	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
++	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
++	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
++	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
++	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
++	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
++	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
++	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
++	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
++	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
++	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
++	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
++	SYS_KSEM_TIMEDWAIT           = 441 // { int ksem_timedwait(semid_t id, \
++	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
++	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
++	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
++	SYS_AUDIT                    = 445 // { int audit(const void *record, \
++	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
++	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
++	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
++	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
++	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
++	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
++	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
++	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
++	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
++	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
++	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
++	SYS_KMQ_OPEN                 = 457 // { int kmq_open(const char *path, int flags, \
++	SYS_KMQ_SETATTR              = 458 // { int kmq_setattr(int mqd,		\
++	SYS_KMQ_TIMEDRECEIVE         = 459 // { int kmq_timedreceive(int mqd,	\
++	SYS_KMQ_TIMEDSEND            = 460 // { int kmq_timedsend(int mqd,		\
++	SYS_KMQ_NOTIFY               = 461 // { int kmq_notify(int mqd,		\
++	SYS_KMQ_UNLINK               = 462 // { int kmq_unlink(const char *path); }
++	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
++	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
++	SYS_AIO_FSYNC                = 465 // { int aio_fsync(int op, struct aiocb *aiocbp); }
++	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
++	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
++	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
++	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
++	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
++	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
++	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
++	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
++	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
++	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
++	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
++	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
++	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
++	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
++	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
++	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
++	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
++	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
++	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
++	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
++	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
++	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
++	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
++	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
++	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
++	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
++	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
++	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
++	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
++	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
++	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
++	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
++	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
++	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
++	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
++	SYS_GSSD_SYSCALL             = 505 // { int gssd_syscall(char *path); }
++	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
++	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
++	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
++	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
++	SYS___SEMCTL                 = 510 // { int __semctl(int semid, int semnum, \
++	SYS_MSGCTL                   = 511 // { int msgctl(int msqid, int cmd, \
++	SYS_SHMCTL                   = 512 // { int shmctl(int shmid, int cmd, \
++	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
++	SYS___CAP_RIGHTS_GET         = 515 // { int __cap_rights_get(int version, \
++	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
++	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
++	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
++	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
++	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
++	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
++	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
++	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
++	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
++	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
++	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
++	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
++	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
++	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
++	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
++	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
++	SYS_CAP_RIGHTS_LIMIT         = 533 // { int cap_rights_limit(int fd, \
++	SYS_CAP_IOCTLS_LIMIT         = 534 // { int cap_ioctls_limit(int fd, \
++	SYS_CAP_IOCTLS_GET           = 535 // { ssize_t cap_ioctls_get(int fd, \
++	SYS_CAP_FCNTLS_LIMIT         = 536 // { int cap_fcntls_limit(int fd, \
++	SYS_CAP_FCNTLS_GET           = 537 // { int cap_fcntls_get(int fd, \
++	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
++	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
++	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
++	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
++	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
++	SYS_AIO_MLOCK                = 543 // { int aio_mlock(struct aiocb *aiocbp); }
++	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
++	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
++	SYS_FUTIMENS                 = 546 // { int futimens(int fd, \
++	SYS_UTIMENSAT                = 547 // { int utimensat(int fd, \
++	SYS_NUMA_GETAFFINITY         = 548 // { int numa_getaffinity(cpuwhich_t which, \
++	SYS_NUMA_SETAFFINITY         = 549 // { int numa_setaffinity(cpuwhich_t which, \
++	SYS_FDATASYNC                = 550 // { int fdatasync(int fd); }
++)
diff --git a/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
new file mode 100644
index 000000000000..eee7800b056c
--- /dev/null
+++ b/sysutils/aptly/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
@@ -0,0 +1,605 @@
+--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2020-06-10 07:45:07 UTC
++++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
+@@ -0,0 +1,602 @@
++// cgo -godefs types_freebsd.go | go run mkpost.go
++// Code generated by the command above; see README.md. DO NOT EDIT.
++
++// +build arm64,freebsd
++
++package unix
++
++const (
++	sizeofPtr      = 0x8
++	sizeofShort    = 0x2
++	sizeofInt      = 0x4
++	sizeofLong     = 0x8
++	sizeofLongLong = 0x8
++)
++
++type (
++	_C_short     int16
++	_C_int       int32
++	_C_long      int64
++	_C_long_long int64
++)
++
++type Timespec struct {
++	Sec  int64
++	Nsec int64
++}
++
++type Timeval struct {
++	Sec  int64
++	Usec int64
++}
++
++type Rusage struct {
++	Utime    Timeval
++	Stime    Timeval
++	Maxrss   int64
++	Ixrss    int64
++	Idrss    int64
++	Isrss    int64
++	Minflt   int64
++	Majflt   int64
++	Nswap    int64
++	Inblock  int64
++	Oublock  int64
++	Msgsnd   int64
++	Msgrcv   int64
++	Nsignals int64
++	Nvcsw    int64
++	Nivcsw   int64
++}
++
++type Rlimit struct {
++	Cur int64
++	Max int64
++}
++
++type _Gid_t uint32
++
++const (
++	_statfsVersion = 0x20140518
++	_dirblksiz     = 0x400
++)
++
++type Stat_t struct {
++	Dev      uint64
++	Ino      uint64
++	Nlink    uint64
++	Mode     uint16
++	_0       int16
++	Uid      uint32
++	Gid      uint32
++	_1       int32
++	Rdev     uint64
++	Atim     Timespec
++	Mtim     Timespec
++	Ctim     Timespec
++	Birthtim Timespec
++	Size     int64
++	Blocks   int64
++	Blksize  int32
++	Flags    uint32
++	Gen      uint64
++	Spare    [10]uint64
++}
++
++type stat_freebsd11_t struct {
++	Dev      uint32
++	Ino      uint32
++	Mode     uint16
++	Nlink    uint16
++	Uid      uint32
++	Gid      uint32
++	Rdev     uint32
++	Atim     Timespec
++	Mtim     Timespec
++	Ctim     Timespec
++	Size     int64
++	Blocks   int64
++	Blksize  int32
++	Flags    uint32
++	Gen      uint32
++	Lspare   int32
++	Birthtim Timespec
++}
++
++type Statfs_t struct {
++	Version     uint32
++	Type        uint32
++	Flags       uint64
++	Bsize       uint64
++	Iosize      uint64
++	Blocks      uint64
++	Bfree       uint64
++	Bavail      int64
++	Files       uint64
++	Ffree       int64
++	Syncwrites  uint64
++	Asyncwrites uint64
++	Syncreads   uint64
++	Asyncreads  uint64
++	Spare       [10]uint64
++	Namemax     uint32
++	Owner       uint32
++	Fsid        Fsid
++	Charspare   [80]int8
++	Fstypename  [16]int8
++	Mntfromname [1024]int8
++	Mntonname   [1024]int8
++}
++
++type statfs_freebsd11_t struct {
++	Version     uint32
++	Type        uint32
++	Flags       uint64
++	Bsize       uint64
++	Iosize      uint64
++	Blocks      uint64
++	Bfree       uint64
++	Bavail      int64
++	Files       uint64
++	Ffree       int64
++	Syncwrites  uint64
++	Asyncwrites uint64
++	Syncreads   uint64
++	Asyncreads  uint64
++	Spare       [10]uint64
++	Namemax     uint32
++	Owner       uint32
++	Fsid        Fsid
++	Charspare   [80]int8
++	Fstypename  [16]int8
++	Mntfromname [88]int8
++	Mntonname   [88]int8
++}
++
++type Flock_t struct {
++	Start  int64
++	Len    int64
++	Pid    int32
++	Type   int16
++	Whence int16
++	Sysid  int32
++	_      [4]byte
++}
++
++type Dirent struct {
++	Fileno uint64
++	Off    int64
++	Reclen uint16
++	Type   uint8
++	Pad0   uint8
++	Namlen uint16
++	Pad1   uint16
++	Name   [256]int8
++}
++
++type dirent_freebsd11 struct {
++	Fileno uint32
++	Reclen uint16
++	Type   uint8
++	Namlen uint8
++	Name   [256]int8
++}
++
++type Fsid struct {
++	Val [2]int32
++}
++
++const (
++	PathMax = 0x400
++)
++
++const (
++	FADV_NORMAL     = 0x0
++	FADV_RANDOM     = 0x1
++	FADV_SEQUENTIAL = 0x2
++	FADV_WILLNEED   = 0x3
++	FADV_DONTNEED   = 0x4
++	FADV_NOREUSE    = 0x5
++)
++
++type RawSockaddrInet4 struct {
++	Len    uint8
++	Family uint8
++	Port   uint16
++	Addr   [4]byte /* in_addr */
++	Zero   [8]int8
++}
++
++type RawSockaddrInet6 struct {
++	Len      uint8
++	Family   uint8
++	Port     uint16
++	Flowinfo uint32
++	Addr     [16]byte /* in6_addr */
++	Scope_id uint32
++}
++
++type RawSockaddrUnix struct {
++	Len    uint8
++	Family uint8
++	Path   [104]int8
++}
++
++type RawSockaddrDatalink struct {
++	Len    uint8
++	Family uint8
++	Index  uint16
++	Type   uint8
++	Nlen   uint8
++	Alen   uint8
++	Slen   uint8
++	Data   [46]int8
++}
++
++type RawSockaddr struct {
++	Len    uint8
++	Family uint8
++	Data   [14]int8
++}
++
++type RawSockaddrAny struct {
++	Addr RawSockaddr
++	Pad  [92]int8
++}
++
++type _Socklen uint32
++
++type Linger struct {
++	Onoff  int32
++	Linger int32
++}
++
++type Iovec struct {
++	Base *byte
++	Len  uint64
++}
++
++type IPMreq struct {
++	Multiaddr [4]byte /* in_addr */
++	Interface [4]byte /* in_addr */
++}
++
++type IPMreqn struct {
++	Multiaddr [4]byte /* in_addr */
++	Address   [4]byte /* in_addr */
++	Ifindex   int32
++}
++
++type IPv6Mreq struct {
++	Multiaddr [16]byte /* in6_addr */
++	Interface uint32
++}
++
++type Msghdr struct {
++	Name       *byte
++	Namelen    uint32
++	_          [4]byte
++	Iov        *Iovec
++	Iovlen     int32
++	_          [4]byte
++	Control    *byte
++	Controllen uint32
++	Flags      int32
++}
++
++type Cmsghdr struct {
++	Len   uint32
++	Level int32
++	Type  int32
++}
++
++type Inet6Pktinfo struct {
++	Addr    [16]byte /* in6_addr */
++	Ifindex uint32
++}
++
++type IPv6MTUInfo struct {
++	Addr RawSockaddrInet6
++	Mtu  uint32
++}
++
++type ICMPv6Filter struct {
++	Filt [8]uint32
++}
++
++const (
++	SizeofSockaddrInet4    = 0x10
++	SizeofSockaddrInet6    = 0x1c
++	SizeofSockaddrAny      = 0x6c
++	SizeofSockaddrUnix     = 0x6a
++	SizeofSockaddrDatalink = 0x36
++	SizeofLinger           = 0x8
++	SizeofIPMreq           = 0x8
++	SizeofIPMreqn          = 0xc
++	SizeofIPv6Mreq         = 0x14
++	SizeofMsghdr           = 0x30
++	SizeofCmsghdr          = 0xc
++	SizeofInet6Pktinfo     = 0x14
++	SizeofIPv6MTUInfo      = 0x20
++	SizeofICMPv6Filter     = 0x20
++)
++
++const (
++	PTRACE_TRACEME = 0x0
++	PTRACE_CONT    = 0x7
++	PTRACE_KILL    = 0x8
++)
++
++type Kevent_t struct {
++	Ident  uint64
++	Filter int16
++	Flags  uint16
++	Fflags uint32
++	Data   int64
++	Udata  *byte
++}
++
++type FdSet struct {
++	Bits [16]uint64
++}
++
++const (
++	sizeofIfMsghdr         = 0xa8
++	SizeofIfMsghdr         = 0xa8
++	sizeofIfData           = 0x98
++	SizeofIfData           = 0x98
++	SizeofIfaMsghdr        = 0x14
++	SizeofIfmaMsghdr       = 0x10
++	SizeofIfAnnounceMsghdr = 0x18
++	SizeofRtMsghdr         = 0x98
++	SizeofRtMetrics        = 0x70
++)
++
++type ifMsghdr struct {
++	Msglen  uint16
++	Version uint8
++	Type    uint8
++	Addrs   int32
++	Flags   int32
++	Index   uint16
++	_       [2]byte
++	Data    ifData
++}
++
++type IfMsghdr struct {
++	Msglen  uint16
++	Version uint8
++	Type    uint8
++	Addrs   int32
++	Flags   int32
++	Index   uint16
++	_       [2]byte
++	Data    IfData
++}
++
++type ifData struct {
++	Type       uint8
++	Physical   uint8
++	Addrlen    uint8
++	Hdrlen     uint8
++	Link_state uint8
++	Vhid       uint8
++	Datalen    uint16
++	Mtu        uint32
++	Metric     uint32
++	Baudrate   uint64
++	Ipackets   uint64
++	Ierrors    uint64
++	Opackets   uint64
++	Oerrors    uint64
++	Collisions uint64
++	Ibytes     uint64
++	Obytes     uint64
++	Imcasts    uint64
++	Omcasts    uint64
++	Iqdrops    uint64
++	Oqdrops    uint64
++	Noproto    uint64
++	Hwassist   uint64
++	_          [8]byte
++	_          [16]byte
++}
++
++type IfData struct {
++	Type        uint8
++	Physical    uint8
++	Addrlen     uint8
++	Hdrlen      uint8
++	Link_state  uint8
++	Spare_char1 uint8
++	Spare_char2 uint8
++	Datalen     uint8
++	Mtu         uint64
++	Metric      uint64
++	Baudrate    uint64
++	Ipackets    uint64
++	Ierrors     uint64
++	Opackets    uint64
++	Oerrors     uint64
++	Collisions  uint64
++	Ibytes      uint64
++	Obytes      uint64
++	Imcasts     uint64
++	Omcasts     uint64
++	Iqdrops     uint64
++	Noproto     uint64
++	Hwassist    uint64
++	Epoch       int64
++	Lastchange  Timeval
++}
++
++type IfaMsghdr struct {
++	Msglen  uint16
++	Version uint8
++	Type    uint8
++	Addrs   int32
++	Flags   int32
++	Index   uint16
++	_       [2]byte
++	Metric  int32
++}
++
++type IfmaMsghdr struct {
++	Msglen  uint16
++	Version uint8
++	Type    uint8
++	Addrs   int32
++	Flags   int32
++	Index   uint16
++	_       [2]byte
++}
++
++type IfAnnounceMsghdr struct {
++	Msglen  uint16
++	Version uint8
++	Type    uint8
++	Index   uint16
++	Name    [16]int8
++	What    uint16
++}
++
++type RtMsghdr struct {
++	Msglen  uint16
++	Version uint8
++	Type    uint8
++	Index   uint16
++	_       [2]byte
++	Flags   int32
++	Addrs   int32
++	Pid     int32
++	Seq     int32
++	Errno   int32
++	Fmask   int32
++	Inits   uint64
++	Rmx     RtMetrics
++}
++
++type RtMetrics struct {
++	Locks    uint64
++	Mtu      uint64
++	Hopcount uint64
++	Expire   uint64
++	Recvpipe uint64
++	Sendpipe uint64
++	Ssthresh uint64
++	Rtt      uint64
++	Rttvar   uint64
++	Pksent   uint64
++	Weight   uint64
++	Filler   [3]uint64
++}
++
++const (
++	SizeofBpfVersion    = 0x4
++	SizeofBpfStat       = 0x8
++	SizeofBpfZbuf       = 0x18
++	SizeofBpfProgram    = 0x10
++	SizeofBpfInsn       = 0x8
++	SizeofBpfHdr        = 0x20
++	SizeofBpfZbufHeader = 0x20
++)
++
++type BpfVersion struct {
++	Major uint16
++	Minor uint16
++}
++
++type BpfStat struct {
++	Recv uint32
++	Drop uint32
++}
++
++type BpfZbuf struct {
++	Bufa   *byte
++	Bufb   *byte
++	Buflen uint64
++}
++
++type BpfProgram struct {
++	Len   uint32
++	_     [4]byte
++	Insns *BpfInsn
++}
++
++type BpfInsn struct {
++	Code uint16
++	Jt   uint8
++	Jf   uint8
++	K    uint32
++}
++
++type BpfHdr struct {
++	Tstamp  Timeval
++	Caplen  uint32
++	Datalen uint32
++	Hdrlen  uint16
++	_       [6]byte
++}
++
++type BpfZbufHeader struct {
++	Kernel_gen uint32
++	Kernel_len uint32
++	User_gen   uint32
++	_          [5]uint32
++}
++
++type Termios struct {
++	Iflag  uint32
++	Oflag  uint32
++	Cflag  uint32
++	Lflag  uint32
++	Cc     [20]uint8
++	Ispeed uint32
++	Ospeed uint32
++}
++
++type Winsize struct {
++	Row    uint16
++	Col    uint16
++	Xpixel uint16
++	Ypixel uint16
++}
++
++const (
++	AT_FDCWD            = -0x64
++	AT_REMOVEDIR        = 0x800
++	AT_SYMLINK_FOLLOW   = 0x400
++	AT_SYMLINK_NOFOLLOW = 0x200
++)
++
++type PollFd struct {
++	Fd      int32
++	Events  int16
++	Revents int16
++}
++
++const (
++	POLLERR      = 0x8
++	POLLHUP      = 0x10
++	POLLIN       = 0x1
++	POLLINIGNEOF = 0x2000
++	POLLNVAL     = 0x20
++	POLLOUT      = 0x4
++	POLLPRI      = 0x2
++	POLLRDBAND   = 0x80
++	POLLRDNORM   = 0x40
++	POLLWRBAND   = 0x100
++	POLLWRNORM   = 0x4
++)
++
++type CapRights struct {
++	Rights [2]uint64
++}
++
++type Utsname struct {
++	Sysname  [256]byte
++	Nodename [256]byte
++	Release  [256]byte
++	Version  [256]byte
++	Machine  [256]byte
++}
diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile
index 91b59b67ac4c..4a7c5167ab6d 100644
--- a/sysutils/arcconf/Makefile
+++ b/sysutils/arcconf/Makefile
@@ -1,9 +1,8 @@
 # Created by: michael@fuckner.net
-# $FreeBSD$
 
 PORTNAME=	arcconf
 DISTVERSION=	3_01_23531
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.adaptec.com/raid/storage_manager/
@@ -12,24 +11,29 @@ DISTNAME=	arcconf_v${DISTVERSION}
 MAINTAINER=	michael@fuckner.net
 COMMENT=	Adaptec SCSI/SAS RAID administration tool
 
-ONLY_FOR_ARCHS=	amd64
-LIB_DEPENDS=	libstdc++.so.6:lang/gcc${GCC_DEFAULT}
+LICENSE=	Microsemi
+LICENSE_NAME=	Microsemi License
+LICENSE_FILE=	${WRKSRC}/freebsd${DIST_TYPE}/cmdline/License.txt
+LICENSE_PERMS=	no-pkg-sell no-dist-sell no-dist-mirror auto-accept
 
+ONLY_FOR_ARCHS=	amd64
 USES=		zip
+LIB_DEPENDS=	libstdc++.so.6:lang/gcc${GCC_DEFAULT}
+USE_GCC=	yes
 
 PERIODICSCRIPT=	410.status-aac-raid
 
 SUB_FILES+=	${PERIODICSCRIPT}
 
-RESTRICTED=	May not be redistributed in binary form
-NO_CDROM=	May not be redistributed in binary form
-
 .include <bsd.port.pre.mk>
 DIST_TYPE=	11_x64
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+PLIST_FILES=	etc/periodic/daily/410.status-aac-raid \
+		sbin/arcconf
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/freebsd${DIST_TYPE}/cmdline/arcconf ${STAGEDIR}${PREFIX}/sbin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
diff --git a/sysutils/arcconf/pkg-plist b/sysutils/arcconf/pkg-plist
deleted file mode 100644
index 74e985b95fc2..000000000000
--- a/sysutils/arcconf/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-etc/periodic/daily/410.status-aac-raid
-sbin/arcconf
diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index 4bf5be18a3fc..f7e07fb9c19e 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -1,5 +1,4 @@
 # Created by: Evgeny Zhirnov <jirnov@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	archivemount
 DISTVERSION=	0.8.12
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 0943277d3e77..a86311c32f98 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -1,5 +1,4 @@
 # Created by: Dima Sivachenko <dima@chg.ru>
-# $FreeBSD$
 
 PORTNAME=	ascpu
 PORTVERSION=	1.11
@@ -10,7 +9,7 @@ MASTER_SITES=	http://www.tigr.net/afterstep/download/ascpu/
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	CPU statistics monitor utility for XFree86
 
-USES=		jpeg
+USES=		jpeg xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index 08ad0a2f2917..863ea613f27e 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -1,5 +1,4 @@
 # Created by: jack
-# $FreeBSD$
 
 PORTNAME=	asfsm
 DISTVERSION=	1.0pre15
@@ -12,6 +11,7 @@ COMMENT=	File-system monitor for the AfterStep window manager
 
 LICENSE=	GPLv2
 
+USES=		xorg
 USE_XORG=	ice sm x11 xaw xext xpm xt
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/asmctl/Makefile b/sysutils/asmctl/Makefile
index f97673f60724..54abf19ec6bf 100644
--- a/sysutils/asmctl/Makefile
+++ b/sysutils/asmctl/Makefile
@@ -1,8 +1,7 @@
 # Created by: Yuichiro NAITO <naito.yuichiro@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	asmctl
-PORTVERSION=	1.7
+PORTVERSION=	1.9
 CATEGORIES=	sysutils
 
 MAINTAINER=	naito.yuichiro@gmail.com
diff --git a/sysutils/asmctl/distinfo b/sysutils/asmctl/distinfo
index b65a889bea8e..4973ac4fbb7e 100644
--- a/sysutils/asmctl/distinfo
+++ b/sysutils/asmctl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1545356418
-SHA256 (yuichiro-naito-asmctl-1.7_GH0.tar.gz) = 5cec13f397f8436e58accd3760f3ff6e2330e2d352904c292dd4b9573c5675bd
-SIZE (yuichiro-naito-asmctl-1.7_GH0.tar.gz) = 48948
+TIMESTAMP = 1621675025
+SHA256 (yuichiro-naito-asmctl-1.9_GH0.tar.gz) = e606f19f55b88a2c5998c599cecbe55b82612e330fb616528bfa5bc1ad5b3ba7
+SIZE (yuichiro-naito-asmctl-1.9_GH0.tar.gz) = 49268
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index 61717fb7031f..5b303ebd3d5d 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -1,5 +1,4 @@
 # Created by: jack
-# $FreeBSD$
 
 PORTNAME=	asmem
 PORTVERSION=	1.12
@@ -13,6 +12,7 @@ COMMENT=	AfterStep look-n-feel memory utilization monitor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		xorg
 USE_XORG=	x11 ice sm x11 xext xpm
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/asmem/files/patch-read_mem.c b/sysutils/asmem/files/patch-read_mem.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/asmem/files/patch-read_mem.c
+++ /dev/null
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index fae7fbd11d8e..21027ea4a52c 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -1,5 +1,4 @@
 # Created by: jack
-# $FreeBSD$
 
 PORTNAME=	asmon
 PORTVERSION=	0.61
@@ -14,12 +13,13 @@ LICENSE=	GPLv2
 
 BROKEN_FreeBSD_12=	fails to compile: read_mem.c: invalid use of undefined type 'struct vmmeter'
 BROKEN_FreeBSD_13=	fails to compile: read_mem.c: invalid use of undefined type 'struct vmmeter'
+BROKEN_FreeBSD_14=	fails to compile: read_mem.c: invalid use of undefined type 'struct vmmeter'
 BROKEN_mips=		fails to compile: asmon.c: storage size of 'sum' isn't known
 BROKEN_mips64=		fails to compile: asmon.c: storage size of 'sum' isn't known
 
 BUILD_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon
 CFLAGS+=	-I${LOCALBASE}/include
-USES=		gmake
+USES=		gmake xorg
 USE_CSTD=	gnu89
 USE_XORG=	xpm x11
 ALL_TARGET=	asmon
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index 84c385f8642b..0b88be42fce1 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	asusoled
 PORTVERSION=	0.10
 PORTREVISION=	10
@@ -13,6 +11,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${FONTDIR}/TTF/luxisr.ttf:x11-fonts/font-bh-ttf
 
+USES=		sdl
 USE_SDL=	image sdl ttf
 USE_RC_SUBR=	asusoled oled_clock
 
diff --git a/sysutils/asusoled/files/asusoled.in b/sysutils/asusoled/files/asusoled.in
index b43223339368..690bd5743bde 100644
--- a/sysutils/asusoled/files/asusoled.in
+++ b/sysutils/asusoled/files/asusoled.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: asusoled
 # REQUIRE: DAEMON
 # KEYWORD: nojail shutdown
diff --git a/sysutils/asusoled/files/oled_clock.in b/sysutils/asusoled/files/oled_clock.in
index d47d669f0eca..30a972e0dcec 100644
--- a/sysutils/asusoled/files/oled_clock.in
+++ b/sysutils/asusoled/files/oled_clock.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: oled_clock
 # REQUIRE: DAEMON
 # KEYWORD: nojail shutdown
diff --git a/sysutils/atf-master/Makefile b/sysutils/atf-master/Makefile
index 67b7f0624351..5135d9ea7bb1 100644
--- a/sysutils/atf-master/Makefile
+++ b/sysutils/atf-master/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	atf
 PORTVERSION?=	${ATF_VERSION}
 CATEGORIES=	sysutils
@@ -21,10 +19,10 @@ GH_TAGNAME=	${ATF_VERSION}
 
 SSP_UNSAFE=	yes
 MAKE_ENV+=	CROSS_COMPILE="aarch64-none-elf-"
-ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 bl31
+ALL_TARGET=	ARCH="aarch64" PLAT=${PLAT} V=1 CFLAGS= bl31
 
 # Default to the latest release
-ATF_VERSION?=	v2.1
+ATF_VERSION?=	v2.4
 
 PLIST_FILES?=	${PREFIX}/share/${PORTNAME}-${PLAT}/${BL31:T}
 
diff --git a/sysutils/atf-master/distinfo b/sysutils/atf-master/distinfo
index d73041eff464..d1acd15798f3 100644
--- a/sysutils/atf-master/distinfo
+++ b/sysutils/atf-master/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555532999
-SHA256 (ARM-software-arm-trusted-firmware-v2.1_GH0.tar.gz) = 7c4c00a4f28d3cfbb235fd1a1fb28c4d2fc1d657c9301686e7d8824ef575d059
-SIZE (ARM-software-arm-trusted-firmware-v2.1_GH0.tar.gz) = 3670018
+TIMESTAMP = 1606065143
+SHA256 (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d
+SIZE (ARM-software-arm-trusted-firmware-v2.4_GH0.tar.gz) = 4593582
diff --git a/sysutils/atf-rk3328/Makefile b/sysutils/atf-rk3328/Makefile
index f8a25c863979..4c7bc0baa454 100644
--- a/sysutils/atf-rk3328/Makefile
+++ b/sysutils/atf-rk3328/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 MASTERDIR=	${.CURDIR}/../atf-master
 
 PLAT=	rk3328
diff --git a/sysutils/atf-rk3399/Makefile b/sysutils/atf-rk3399/Makefile
index 77b5e2105a6a..eb760c912766 100644
--- a/sysutils/atf-rk3399/Makefile
+++ b/sysutils/atf-rk3399/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 MASTERDIR=	${.CURDIR}/../atf-master
 
 PLAT=	rk3399
diff --git a/sysutils/atf-sun50i_a64/Makefile b/sysutils/atf-sun50i_a64/Makefile
index 5a4e4c1cc787..d4f3af91fe0e 100644
--- a/sysutils/atf-sun50i_a64/Makefile
+++ b/sysutils/atf-sun50i_a64/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 MASTERDIR=	${.CURDIR}/../atf-master
 
 PLAT=	sun50i_a64
diff --git a/sysutils/atf-sun50i_h6/Makefile b/sysutils/atf-sun50i_h6/Makefile
new file mode 100644
index 000000000000..8382a586ca49
--- /dev/null
+++ b/sysutils/atf-sun50i_h6/Makefile
@@ -0,0 +1,6 @@
+MASTERDIR=	${.CURDIR}/../atf-master
+
+PLAT=	sun50i_h6
+BL31=	bl31.bin
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/atf-sun50i_h6/pkg-descr b/sysutils/atf-sun50i_h6/pkg-descr
new file mode 100644
index 000000000000..3cdbb29ce6ad
--- /dev/null
+++ b/sysutils/atf-sun50i_h6/pkg-descr
@@ -0,0 +1,7 @@
+Arm Trusted Framework for Allwinner H6 SoCs
+
+Trusted Firmware-A (TF-A) provides a reference implementation of secure world
+software for Armv7-A and Armv8-A, including a Secure Monitor executing at
+Exception Level 3 (EL3).
+
+WWW: https://github.com/ARM-software/arm-trusted-firmware
diff --git a/sysutils/atitvout/Makefile b/sysutils/atitvout/Makefile
index 0e39258ff1d5..5644309c266d 100644
--- a/sysutils/atitvout/Makefile
+++ b/sysutils/atitvout/Makefile
@@ -1,5 +1,4 @@
 # Created by: Anish Mistry <amistry@am-productions.biz>
-# $FreeBSD$
 
 PORTNAME=	atitvout
 PORTVERSION=	0.4
diff --git a/sysutils/atop/Makefile b/sysutils/atop/Makefile
index aa991aa0f008..84a6fca7bff1 100644
--- a/sysutils/atop/Makefile
+++ b/sysutils/atop/Makefile
@@ -1,22 +1,22 @@
-# Created by: Alex Samorukov <samm@os2.kiev.ua>
-# $FreeBSD$
+# Created by: Alex Samorukov <samm@freebsd.org>
 
 PORTNAME=	atop
 PORTVERSION=	2.0.2.b3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@FreeBSD.org
 COMMENT=	ASCII Monitor for system resources and process activity
 
 LICENSE=	GPLv2
 
+USES=		ncurses
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	samm-git
 GH_PROJECT=	atop-freebsd
 GH_TAGNAME=	${PORTNAME}-${PORTVERSION:C|b|fbsd.beta|}
 
-USES=		ncurses
 MAKEFILE=	BSDmakefile
 LOGDIR?=	/var/log/atop
 PLIST_SUB+=	LOGDIR="${LOGDIR}"
diff --git a/sysutils/atop/files/atop.in b/sysutils/atop/files/atop.in
index c51ed96c6dae..957d1b67d063 100644
--- a/sysutils/atop/files/atop.in
+++ b/sysutils/atop/files/atop.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: atop
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/atop/files/patch-atop.c b/sysutils/atop/files/patch-atop.c
new file mode 100644
index 000000000000..3d736de7d626
--- /dev/null
+++ b/sysutils/atop/files/patch-atop.c
@@ -0,0 +1,12 @@
+--- atopsar.c.orig	2014-01-16 00:05:34 UTC
++++ atopsar.c
+@@ -600,7 +600,8 @@
+ 		*/
+ 		printf("%s  ", convtime(curtime, timebuf));
+ 	
+-		if ( !(rv = (pridef[i].priline)(ss, (struct tstat *)0, 0,
++		if ( !(rv = (pridef[i].priline)(ss, (struct tstat *)0,
++					(struct tstat **)0, 0,
+ 					numsecs, numsecs*hertz, hertz,
+ 					osvers, osrel, ossub, 
+ 		                        stampalways ? timebuf : "        ",
diff --git a/sysutils/auto-admin/Makefile b/sysutils/auto-admin/Makefile
index 3fe66bbca54e..0e77cd4e0393 100644
--- a/sysutils/auto-admin/Makefile
+++ b/sysutils/auto-admin/Makefile
@@ -1,25 +1,23 @@
-# $FreeBSD$
-
 PORTNAME=	auto-admin
-DISTVERSION=	0.4.8
+DISTVERSION=	0.7.4
 CATEGORIES=	sysutils
-MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
-		http://outpaddling.mooo.com/~bacon/Acadix/Ports/distfiles/
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Portable tools for automating systems management
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USE_GITHUB=	yes
 
-USES=		tar:xz
+GH_ACCOUNT=	outpaddling
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/sbin ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/Common/Scripts/* ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/FreeBSD/Scripts/* ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/Scripts/* ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/Data/* ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/Doc/auto-admin.man \
 		${STAGEDIR}${MANPREFIX}/man/man1/auto-admin.1
diff --git a/sysutils/auto-admin/distinfo b/sysutils/auto-admin/distinfo
index c29e7bc50df8..99aeacdd4276 100644
--- a/sysutils/auto-admin/distinfo
+++ b/sysutils/auto-admin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564080152
-SHA256 (auto-admin-0.4.8.tar.xz) = ebb308d860ff74c294db449c3c4473e8ed1b53cc60804a9b84d30d2c19276e95
-SIZE (auto-admin-0.4.8.tar.xz) = 67272
+TIMESTAMP = 1622239518
+SHA256 (outpaddling-auto-admin-0.7.4_GH0.tar.gz) = beaf3e1a7c3b29df6062548c5715cb28f716f161175297107c08a1bac83b36b0
+SIZE (outpaddling-auto-admin-0.7.4_GH0.tar.gz) = 105351
diff --git a/sysutils/auto-admin/pkg-plist b/sysutils/auto-admin/pkg-plist
index 3800675c6486..b5c9a6e60834 100644
--- a/sysutils/auto-admin/pkg-plist
+++ b/sysutils/auto-admin/pkg-plist
@@ -2,14 +2,18 @@ man/man1/auto-admin.1.gz
 sbin/auto-ad-adduser
 sbin/auto-add-fdesc-mount
 sbin/auto-add-group
+sbin/auto-add-hosts-entry
 sbin/auto-add-proc-mount
 sbin/auto-add-to-group
 sbin/auto-adduser
 sbin/auto-admin
+sbin/auto-admin-banner
 sbin/auto-amend-fstab
 sbin/auto-append-line
 sbin/auto-ask
+sbin/auto-autofs-media-setup
 sbin/auto-autofs-nfs-setup
+sbin/auto-automount-setup
 sbin/auto-backup-file
 sbin/auto-binary-pkgsrc-setup
 sbin/auto-change-group-gid
@@ -18,17 +22,18 @@ sbin/auto-change-nfsd-count
 sbin/auto-change-ownership
 sbin/auto-change-primary-group
 sbin/auto-change-uid
+sbin/auto-check-ports-branch
 sbin/auto-clean-disk
 sbin/auto-clean-pkgsrc
 sbin/auto-clean-ports
 sbin/auto-clean-tmp
-sbin/auto-config-snd-driver
-sbin/auto-db-dir
+sbin/auto-cuda-install
 sbin/auto-denyhosts-remove-ip
 sbin/auto-denyhosts-setup
-sbin/auto-detect-gpu
 sbin/auto-detect-laptops
+sbin/auto-disable-file-transfers
 sbin/auto-disable-host-key-prompt
+sbin/auto-disable-hyperthreading
 sbin/auto-disable-service
 sbin/auto-disable-tcp-timestamps
 sbin/auto-enable-autologout
@@ -40,38 +45,69 @@ sbin/auto-enable-service
 sbin/auto-fastest-mirror
 sbin/auto-fetch-install-media
 sbin/auto-file-secure
+sbin/auto-firewall-setup
+sbin/auto-fix-date
+sbin/auto-freebsd-wip-checkout
+sbin/auto-fusefs-install
+sbin/auto-get-ip
+sbin/auto-get-netmask
+sbin/auto-get-netmask-bits
+sbin/auto-get-network
+sbin/auto-gpu-setup
+sbin/auto-group-check
 sbin/auto-harden
+sbin/auto-hex-to-octet
+sbin/auto-idrac-config
 sbin/auto-idrac-passwd
 sbin/auto-insert-line
 sbin/auto-install-infiniband-modules
-sbin/auto-install-linux-flash
 sbin/auto-install-linux_base
 sbin/auto-install-media-distname
 sbin/auto-install-packages
+sbin/auto-install-pkgsrc-tree
 sbin/auto-ipfw-gateway-setup
 sbin/auto-ipmi-install
+sbin/auto-ipmi-remote-access
+sbin/auto-ipmi-remote-power
+sbin/auto-ipmi-remote-status
 sbin/auto-krb-auth-setup
 sbin/auto-ldap-adduser
 sbin/auto-ldap-client-setup
 sbin/auto-lock-local-pw
 sbin/auto-lock-user
+sbin/auto-mark-install-from-source
+sbin/auto-mark-package-critical
+sbin/auto-media-format
 sbin/auto-mount-any
+sbin/auto-mount-noautos
+sbin/auto-network-restart
+sbin/auto-nfs-add-share
+sbin/auto-nfs-client-setup
 sbin/auto-nfs-restart
+sbin/auto-nfs-server-setup
+sbin/auto-octet-to-hex
 sbin/auto-os-release
 sbin/auto-ostype
 sbin/auto-package-installed
 sbin/auto-passwd-user-expiration
 sbin/auto-password-status
+sbin/auto-pkg-branch
 sbin/auto-pkg-latest
+sbin/auto-pkgsrc-branch
+sbin/auto-pkgsrc-delete-all
 sbin/auto-pkgsrc-dir
 sbin/auto-pkgsrc-prefix
 sbin/auto-pkgsrc-remote-x11
 sbin/auto-pkgsrc-setup
+sbin/auto-pkgsrc-wip-checkout
+sbin/auto-ports-branch
 sbin/auto-ports-checkout
 sbin/auto-ports-setup
 sbin/auto-print-make-variable
+sbin/auto-print-timezone
 sbin/auto-pxe-installer-setup
 sbin/auto-pxe-node-discover
+sbin/auto-remove-from-group
 sbin/auto-remove-user
 sbin/auto-replace-file
 sbin/auto-restore-ownership
@@ -80,22 +116,27 @@ sbin/auto-restore-user
 sbin/auto-root-check
 sbin/auto-secure-directory
 sbin/auto-service-enabled
+sbin/auto-set-conf-var
 sbin/auto-set-hostname
 sbin/auto-set-lid-switch-mode
+sbin/auto-set-memory-limits
 sbin/auto-set-sysctl
 sbin/auto-set-umask
+sbin/auto-software-manager
+sbin/auto-sound-driver-setup
 sbin/auto-ssh-authorize
 sbin/auto-ssh-reverse-authorize
+sbin/auto-su+j-toggle
 sbin/auto-transfer-pw
 sbin/auto-unlock-local-pw
 sbin/auto-unlock-user
 sbin/auto-update-infiniband-modules
-sbin/auto-update-port-framework
+sbin/auto-update-pkgsrc
 sbin/auto-update-system
-sbin/auto-update-xorg.conf
 sbin/auto-user-admin
 sbin/auto-useradd
 sbin/auto-using-pkgsrc
 sbin/auto-wifi-failover
+sbin/auto-write-cache-toggle
 sbin/auto-xdm-toggle
 %%DATADIR%%/ipfw-rules.sh
diff --git a/sysutils/autojump/Makefile b/sysutils/autojump/Makefile
index ceb88e0ef8a4..9ddd18d3230a 100644
--- a/sysutils/autojump/Makefile
+++ b/sysutils/autojump/Makefile
@@ -1,40 +1,32 @@
-# Created by: Neeraj Verma <neeraj.verma.ports@vermatech.com>
-# $FreeBSD$
-
 PORTNAME=	autojump
-PORTVERSION=	13
+PORTVERSION=	22.5.3
 PORTREVISION=	1
+DISTVERSIONPREFIX=	release-v
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.vermatech.com/distfiles/
-DISTNAME=	autojump_v${PORTVERSION}
 
-MAINTAINER=	neeraj.verma.ports@vermatech.com
-COMMENT=	Tool that acts as a complement to cd
+MAINTAINER=	michel@boaventura.dev
+COMMENT=	Faster way to navigate your filesystem
 
 LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:shells/bash
+USES=	python:run shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	wting
+USE_PYTHON=	concurrent autoplist
+SHEBANG_FILES=	bin/autojump
 
-USES=		python:run shebangfix
 NO_BUILD=	yes
-SHEBANG_FILES=	autojump jumpapplet
-SUB_FILES=	pkg-install
 NO_ARCH=	yes
 
-PLIST_FILES=	bin/autojump \
-		bin/jumpapplet \
-		man/man1/autojump.1.gz \
-		share/autojump/autojump.bash \
-		share/autojump/autojump.zsh \
-		share/autojump/icon.png \
-		share/zsh/site-functions/_j
-
 do-install:
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${SH} ./install.sh \
-		--prefix ${STAGEDIR}${PREFIX})
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/_j \
-		${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/autojump
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/bin/autojump ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/*.py ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/autojump.bash ${STAGEDIR}${PREFIX}/share/autojump
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/autojump.zsh ${STAGEDIR}${PREFIX}/share/autojump
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/autojump.fish ${STAGEDIR}${PREFIX}/share/autojump
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/bin/_j ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 
 .include <bsd.port.mk>
diff --git a/sysutils/autojump/distinfo b/sysutils/autojump/distinfo
index 6f72e3e9c785..e06e1844eacd 100644
--- a/sysutils/autojump/distinfo
+++ b/sysutils/autojump/distinfo
@@ -1,2 +1,3 @@
-SHA256 (autojump_v13.tar.gz) = 020ef781b30f8cbe4f183f2ccadac720e3f747e82924aaa4b95da01d76cc2153
-SIZE (autojump_v13.tar.gz) = 22723
+TIMESTAMP = 1596643397
+SHA256 (wting-autojump-release-v22.5.3_GH0.tar.gz) = 00daf3698e17ac3ac788d529877c03ee80c3790472a85d0ed063ac3a354c37b1
+SIZE (wting-autojump-release-v22.5.3_GH0.tar.gz) = 55429
diff --git a/sysutils/autojump/files/patch-install.sh b/sysutils/autojump/files/patch-install.sh
deleted file mode 100644
index 5e3b68e60b94..000000000000
--- a/sysutils/autojump/files/patch-install.sh
+++ /dev/null
@@ -1,77 +0,0 @@
---- ./install.sh.orig	2010-10-01 10:49:18.000000000 -0400
-+++ ./install.sh	2011-12-03 23:04:22.000000000 -0500
-@@ -15,7 +15,7 @@
- #You should have received a copy of the GNU General Public License
- #along with autojump.  If not, see <http://www.gnu.org/licenses/>.
- 
--function show_help {
-+show_help() {
-         echo "sudo ./install.sh [--prefix /usr/local]"
- }
- 
-@@ -41,56 +41,12 @@ done
- echo "Installing to ${prefix} ..."
- 
- # INSTALL AUTOJUMP
--sudo mkdir -p ${prefix}/share/autojump/
--sudo mkdir -p ${prefix}/bin/
--sudo mkdir -p ${prefix}/share/man/man1/
--sudo cp icon.png ${prefix}/share/autojump/
--sudo cp jumpapplet ${prefix}/bin/
--sudo cp autojump ${prefix}/bin/
--sudo cp autojump.1 ${prefix}/share/man/man1/
--
--if [ -d "/etc/profile.d" ]; then
--    sudo cp autojump.bash /etc/profile.d/
--    sudo cp autojump.sh /etc/profile.d/
--
--    # Make sure that the code we just copied has been sourced.
--    # check if .bashrc has sourced /etc/profile or /etc/profile.d/autojump.bash
--    if [ `grep -c "^[[:space:]]*source\|\. /etc/profile(\.d/autojump\.bash)[[:space:]]*$" ~/.bashrc` -eq 0 ]; then
--        echo "Your .bashrc doesn't seem to source /etc/profile or /etc/profile.d/autojump.bash"
--        echo "Adding the /etc/profile.d/autojump.bash to your .bashrc"
--        echo "" >> ~/.bashrc
--        echo "# Added by autojump install.sh" >> ~/.bashrc
--        echo "source /etc/profile.d/autojump.bash" >> ~/.bashrc
--    fi
--    echo "Done!"
--    echo
--    echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump."
--else
--    echo "Your distribution does not have a /etc/profile.d directory, the default that we install one of the scripts to. Would you like us to copy it into your ~/.bashrc file to make it work? (If you have done this once before, delete the old version before doing it again.) [y/n]"
--    read ans
--    if [ ${#ans} -gt 0 ]; then
--	     if [ $ans = "y" -o $ans = "Y" -o $ans = "yes" -o $ans = "Yes" ]; then
--
--                # Answered yes. Go ahead and add the autojump code
--	        echo "" >> ~/.bashrc
--	        echo "#autojump" >> ~/.bashrc
--	        cat autojump.bash | grep -v "^#" >> ~/.bashrc
--
--                # Since OSX uses .bash_profile, we need to make sure that .bashrc is properly sourced.
--                # Makes the assumption that if they have a line: source ~/.bashrc or . ~/.bashrc, that
--                # .bashrc has been properly sourced and you don't need to add it.
--                OS=`uname`
--                if [ $OS == 'Darwin' -a `grep -c "^[[:space:]]*source\|\. ~/\.bashrc[[:space:]]*$" ~/.bash_profile` -eq 0 ]; then
--                    echo "You are using OSX and your .bash_profile doesn't seem to be sourcing .bashrc"
--                    echo "Adding source ~/.bashrc to your bashrc"
--                    echo -e "\n# Get the aliases and functions" >> ~/.bash_profile
--                    echo -e "if [ -f ~/.bashrc ]; then\n  . ~/.bashrc\nfi" >> ~/.bash_profile
--                fi
--                echo "You need to source your ~/.bashrc (source ~/.bashrc) before you can start using autojump."
--	     else
--	         echo "Then you need to put autojump.sh, or the code from it, somewhere where it will get read. Good luck!"
--	     fi
--    else
--        echo "Then you need to put autojump.sh, or the code from it, somewhere where it will get read. Good luck!"
--    fi
--fi
-+mkdir -p ${prefix}/share/autojump/
-+mkdir -p ${prefix}/bin/
-+mkdir -p ${prefix}/man/man1/
-+cp icon.png ${prefix}/share/autojump/
-+cp autojump.bash ${prefix}/share/autojump/
-+cp autojump.zsh ${prefix}/share/autojump/
-+cp jumpapplet ${prefix}/bin/
-+cp autojump ${prefix}/bin/
-+cp autojump.1 ${prefix}/man/man1/
diff --git a/sysutils/autojump/files/pkg-install.in b/sysutils/autojump/files/pkg-install.in
deleted file mode 100644
index 0945d3f9bb5e..000000000000
--- a/sysutils/autojump/files/pkg-install.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	if [ -e /etc/profile ]; then \
-		cp %%PREFIX%%/share/autojump/autojump.bash /etc/profile.autojump
-		echo ". /etc/profile.autojump" >> /etc/profile
-	fi
-	if [ -e /etc/zshrc ]; then \
-		cp  %%PREFIX%%/share/autojump/autojump.zsh /etc/zshrc.autojump
-		echo ". /etc/zshrc.autojump" >> /etc/zshrc
-	fi
-	;;
-esac
diff --git a/sysutils/autojump/pkg-deinstall b/sysutils/autojump/pkg-deinstall
deleted file mode 100644
index 03d9c8fafad8..000000000000
--- a/sysutils/autojump/pkg-deinstall
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-DEINSTALL)
-	rm -f /etc/profile.autojump
-	rm -f /etc/zshrc.autojump
-	# delete the source (.) line from the /etc/profile and /etc/zshrc
-	if [ -f /etc/profile ] ; then
-		sed -i '' -e '/profile.autojump/d' /etc/profile
-	fi
-	if [ -f /etc/zshrc ] ; then
-		sed -i '' -e '/zshrc.autojump/d' /etc/zshrc
-	fi
-	;;
-esac
diff --git a/sysutils/autojump/pkg-descr b/sysutils/autojump/pkg-descr
index f1507269f03b..3a0ff1d27912 100644
--- a/sysutils/autojump/pkg-descr
+++ b/sysutils/autojump/pkg-descr
@@ -1,7 +1,6 @@
-Autojump is a tool that acts as a complement to cd: it makes navigating your
-filesystem a lot faster. It works by automagically maintaining a database of
-the directories you use the most from the command line, and allows you to jump
-back and forth between them, by typing just a few letters of the name of the
-directory you want to jump to.
+Autojump is a faster way to navigate your filesystem. It works by maintaining a
+database of the directories you use the most from the command line.
 
-WWW: https://github.com/joelthelion/autojump/wiki
+Directories must be visited first before they can be jumped to.
+
+WWW: https://github.com/wting/autojump
diff --git a/sysutils/autojump/pkg-message b/sysutils/autojump/pkg-message
deleted file mode 100644
index 1da40217e040..000000000000
--- a/sysutils/autojump/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
- AutoJump installed
-
- Note: Your /etc/profile was changed for this installation.
- changes will be reverted when you un-install the package.
-EOM
-}
-]
diff --git a/sysutils/autojump/pkg-plist b/sysutils/autojump/pkg-plist
new file mode 100644
index 000000000000..462e75ddfd2a
--- /dev/null
+++ b/sysutils/autojump/pkg-plist
@@ -0,0 +1,9 @@
+bin/autojump
+bin/autojump_argparse.py
+bin/autojump_data.py
+bin/autojump_match.py
+bin/autojump_utils.py
+share/autojump/autojump.bash
+share/autojump/autojump.fish
+share/autojump/autojump.zsh
+share/zsh/site-functions/_j
diff --git a/sysutils/automount/Makefile b/sysutils/automount/Makefile
index 7d5e74decfde..1e9bfe0669bc 100644
--- a/sysutils/automount/Makefile
+++ b/sysutils/automount/Makefile
@@ -1,11 +1,9 @@
 # Created by: Slawomir Wojciech Wojtczak <vermaden@interia.pl>
-# $FreeBSD$
 
 PORTNAME=	automount
-PORTVERSION=	1.5.8
+DISTVERSION=	1.7.2
 CATEGORIES=	sysutils
-MASTER_SITES=	https://raw.github.com/vermaden/automount/master/ \
-		LOCAL/madpilot/${PORTNAME}/
+MASTER_SITES=	https://raw.github.com/vermaden/automount/master/
 
 MAINTAINER=	vermaden@interia.pl
 COMMENT=	FreeBSD's devd(8) based automount solution
@@ -14,7 +12,6 @@ LICENSE=	BSD2CLAUSE
 
 PLIST_FILES=	sbin/automount etc/devd/automount_devd.conf etc/automount.conf.sample
 
-SUB_FILES=	pkg-install
 NO_BUILD=	yes
 NO_ARCH=	yes
 
@@ -22,14 +19,17 @@ OPTIONS_DEFINE=		NTFS3G EXT4 EXFAT
 OPTIONS_DEFAULT=	NTFS3G EXT4
 NTFS3G_DESC=		Enable NTFS write support with ntfs-3g over FUSE
 NTFS3G_RUN_DEPENDS=	fusefs-ntfs>=0:sysutils/fusefs-ntfs
-EXT4_DESC=		Support EXT4 filesystem
-EXT4_RUN_DEPENDS=	fusefs-ext4fuse>=0:sysutils/fusefs-ext4fuse
+EXT4_DESC=		Support EXT2/3/4 filesystem
+EXT4_RUN_DEPENDS=	fusefs-ext2>=0:sysutils/fusefs-ext2
 EXFAT_DESC=		Support Microsoft exFAT filesystem
-EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:sysutils/fusefs-exfat
+EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:sysutils/fusefs-exfat \
+			exfat-utils>=0:sysutils/exfat-utils
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/automount             ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA}   ${WRKSRC}/automount_devd.conf   ${STAGEDIR}${PREFIX}/etc/devd/automount_devd.conf
-	${INSTALL_DATA}   ${WRKSRC}/automount.conf.sample ${STAGEDIR}${PREFIX}/etc/automount.conf.sample
+	${INSTALL_SCRIPT} ${WRKDIR}/automount ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKDIR}/automount_devd.conf \
+		${STAGEDIR}${PREFIX}/etc/devd
+	${INSTALL_DATA} ${WRKDIR}/automount.conf \
+		${STAGEDIR}${PREFIX}/etc/automount.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/automount/distinfo b/sysutils/automount/distinfo
index e0d3914c2df7..178bae731428 100644
--- a/sysutils/automount/distinfo
+++ b/sysutils/automount/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530394666
-SHA256 (automount-1.5.8.tar.gz) = de344c6a0791da6f2be7724760dcb271ddb50088d790bf47111442275a1ed95e
-SIZE (automount-1.5.8.tar.gz) = 5421
+TIMESTAMP = 1588193474
+SHA256 (automount-1.7.2.tar.gz) = 99b424086016639dfc92a77a719e7f30aa04fabd2664cae77c486bdade91ec85
+SIZE (automount-1.7.2.tar.gz) = 6670
diff --git a/sysutils/automount/files/pkg-install.in b/sysutils/automount/files/pkg-install.in
deleted file mode 100644
index d8b2f9b9ae51..000000000000
--- a/sysutils/automount/files/pkg-install.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case ${2} in
-  (POST-INSTALL)
-    service devd restart
-    echo
-    echo
-    echo "Check %%PREFIX%%/bin/automount --help for available options."
-    echo
-    echo
-    ;;
-  (PRE-INSTALL)
-    :
-    ;;
-esac
diff --git a/sysutils/automount/pkg-descr b/sysutils/automount/pkg-descr
index 36c1f3921e6c..159bccbaadb3 100644
--- a/sysutils/automount/pkg-descr
+++ b/sysutils/automount/pkg-descr
@@ -1,6 +1,6 @@
 automount is a devd(8) based automounter for FreeBSD.
 
 It supports most popular file systems:
-NTFS/MSDOS/exFAT/EXT2/EXT3/EXT4/UFS
+NTFS/FAT/exFAT/EXT2/EXT3/EXT4/UFS/HFS/XFS/ISO9660
 
 WWW: https://github.com/vermaden/automount/
diff --git a/sysutils/automount/pkg-message b/sysutils/automount/pkg-message
new file mode 100644
index 000000000000..79de4b6fe739
--- /dev/null
+++ b/sysutils/automount/pkg-message
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+
+You must run
+
+    service devd restart
+
+to activate the new automount.
+EOM
+}
+]
diff --git a/sysutils/automounter/Makefile b/sysutils/automounter/Makefile
index c16749a8b333..780abc552aa7 100644
--- a/sysutils/automounter/Makefile
+++ b/sysutils/automounter/Makefile
@@ -1,5 +1,4 @@
 # Created by: Dominic Fandrey <kamikaze@bsdforen.de>
-# $FreeBSD$
 
 PORTNAME=	automounter
 PORTVERSION=	1.5.1
diff --git a/sysutils/autopsy/Makefile b/sysutils/autopsy/Makefile
index 76e5991c38f5..efaf2c22c171 100644
--- a/sysutils/autopsy/Makefile
+++ b/sysutils/autopsy/Makefile
@@ -1,5 +1,4 @@
 # Created by: Pieter Danhieux <opr@bsdaemon.be>
-# $FreeBSD$
 
 PORTNAME=	autopsy
 PORTVERSION=	2.24
diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index 42844896486b..05dc1b201227 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -1,8 +1,7 @@
 # Created by: Evgeny Zhirnov <jirnov@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	avfs
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/avf/${PORTNAME}/${PORTVERSION}
 
@@ -24,10 +23,22 @@ CONFIGURE_ENV=	PERL="${PERL}"
 
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	DEBUG FUSE
+OPTIONS_DEFINE=	DAV DEBUG FUSE ZSTD
 OPTIONS_SUB=	yes
+
+DAV_DESC=	Build the DAV module (requires libneon)
+DAV_LIB_DEPENDS=	libneon.so:www/neon
+DAV_CONFIGURE_ENABLE=	dav
+
 DEBUG_CONFIGURE_ENABLE=	debug
+
 FUSE_CONFIGURE_ENABLE=	fuse
 FUSE_USES=	fuse
 
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+ZSTD_CONFIGURE_WITH=	zstd
+
+post-patch:
+	@${REINPLACE_CMD} -e '/#include/s,neon/,,' ${WRKSRC}/modules/dav*.?
+
 .include <bsd.port.mk>
diff --git a/sysutils/avfs/distinfo b/sysutils/avfs/distinfo
index 13b90f100bb3..e9a34b56e85d 100644
--- a/sysutils/avfs/distinfo
+++ b/sysutils/avfs/distinfo
@@ -1,3 +1,2 @@
-TIMESTAMP = 1564234064
-SHA256 (avfs-1.1.0.tar.bz2) = a7f3734f5be1a76aab710fb49a004b60bb802ccbd32394a731b18ed6011333a7
-SIZE (avfs-1.1.0.tar.bz2) = 605637
+SHA256 (avfs-1.1.4.tar.bz2) = 3a7981af8557f864ae10d4b204c29969588fdb526e117456e8efd54bf8faa12b
+SIZE (avfs-1.1.4.tar.bz2) = 614657
diff --git a/sysutils/avfs/pkg-plist b/sysutils/avfs/pkg-plist
index 9470b8a70649..77e9a9d3032b 100644
--- a/sysutils/avfs/pkg-plist
+++ b/sysutils/avfs/pkg-plist
@@ -48,3 +48,4 @@ lib/libavfs.a
 lib/libavfs.so
 lib/libavfs.so.0
 lib/libavfs.so.0.0.2
+libdata/pkgconfig/avfs.pc
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index db8cf7e65d72..8c4b2919ca9a 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -1,32 +1,30 @@
-# $FreeBSD$
-
 PORTNAME=	azure-agent
-PORTVERSION=	2.2.14
+PORTVERSION=	2.2.54.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	sysutils
 
-MAINTAINER=	honzhan@microsoft.com
+PATCH_SITES=	https://github.com/Azure/WALinuxAgent/commit/
+
+MAINTAINER=	weh@microsoft.com
 COMMENT=	Microsoft Azure Linux Agent
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	sudo:security/sudo \
 		bash:shells/bash \
-		base64:converters/base64 \
 		dmidecode:sysutils/dmidecode \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+		ca_root_nss>0:security/ca_root_nss
 
 NO_BUILD=	yes
-USES=		python:2.7 shebangfix
+USES=		python shebangfix
 
 SHEBANG_FILES=	bin/waagent bin/waagent2.0
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Azure
 GH_PROJECT=	WALinuxAgent
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils noflavors
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
@@ -38,7 +36,7 @@ post-patch:
 			 -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \
 		${WRKSRC}/bin/waagent2.0
 	${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \
-			 -e "s,python,${PYTHON_VERSION},g" \
+			 -e "s,python,${PYTHON_CMD},g" \
 		${WRKSRC}/init/freebsd/waagent
 	${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent
diff --git a/sysutils/azure-agent/distinfo b/sysutils/azure-agent/distinfo
index c70eda0786b5..686bcb239916 100644
--- a/sysutils/azure-agent/distinfo
+++ b/sysutils/azure-agent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497364262
-SHA256 (Azure-WALinuxAgent-v2.2.14_GH0.tar.gz) = d76c1db57ac7a019ac2262f9665b56fbce7bb4cdaeb0d30810d892fbb1ec856e
-SIZE (Azure-WALinuxAgent-v2.2.14_GH0.tar.gz) = 692532
+TIMESTAMP = 1621586743
+SHA256 (Azure-WALinuxAgent-v2.2.54.2_GH0.tar.gz) = 2c047d262ca55718268a0921c7bd04b6c1ab1032bd885e3e0949107f493e7b7c
+SIZE (Azure-WALinuxAgent-v2.2.54.2_GH0.tar.gz) = 1814212
diff --git a/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py b/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py
new file mode 100644
index 000000000000..347ba8ab5641
--- /dev/null
+++ b/sysutils/azure-agent/files/patch-azurelinuxagent_daemon_resourcedisk_freebsd.py
@@ -0,0 +1,341 @@
+--- azurelinuxagent/daemon/resourcedisk/freebsd.py.orig	2021-05-18 18:30:52 UTC
++++ azurelinuxagent/daemon/resourcedisk/freebsd.py
+@@ -1,6 +1,7 @@
+ # Microsoft Azure Linux Agent
+ #
+ # Copyright 2018 Microsoft Corporation
++# Copyright 2020-2021 The FreeBSD Foundation
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+@@ -24,6 +25,8 @@ import azurelinuxagent.common.conf as conf
+ from azurelinuxagent.common.exception import ResourceDiskError
+ from azurelinuxagent.daemon.resourcedisk.default import ResourceDiskHandler
+ 
++# Keeping 1GB sapce if configured swap size is larger than the disk size
++MINIMAL_RESOURCE_PARTITION_SIZE = 1024 ** 3
+ 
+ class FreeBSDResourceDiskHandler(ResourceDiskHandler):
+     """
+@@ -32,37 +35,45 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler):
+     The resource disk locates at following slot:
+     scbus2 on blkvsc1 bus 0:
+     <Msft Virtual Disk 1.0>            at scbus2 target 1 lun 0 (da1,pass2)
+-
+-    There are 2 variations based on partition table type:
+-    1. MBR: The resource disk partition is /dev/da1s1
+-    2. GPT: The resource disk partition is /dev/da1p2, /dev/da1p1 is for reserved usage.
+     """
+ 
+     def __init__(self):  # pylint: disable=W0235
+         super(FreeBSDResourceDiskHandler, self).__init__()
+ 
+     @staticmethod
+-    def parse_gpart_list(data):
++    def parse_gpart_show(data):
+         dic = {}
+         for line in data.split('\n'):
+-            if line.find("Geom name: ") != -1:
+-                geom_name = line[11:]
+-            elif line.find("scheme: ") != -1:
+-                dic[geom_name] = line[8:]
++            if line:
++                l = line.split()
++                dic[l[3]] = l[4]
+         return dic
+ 
++    @staticmethod
++    def parse_mount_list(data):
++        dic = {}
++        for line in data.split('\n'):
++            if line:
++                l = line.split()
++                dic[l[2]] = l[0]
++        return dic
++
++    @staticmethod
++    def get_next_partition(x):
++        return x[:-1] + str(int(x[-1]) + 1)
++
+     def mount_resource_disk(self, mount_point):
+         fs = self.fs
+         if fs != 'ufs':
+-            raise ResourceDiskError(
+-                "Unsupported filesystem type:{0}, only ufs is supported.".format(fs))
++            raise ResourceDiskError("Unsupported filesystem type: "
++                                    "{0}, only ufs is supported.".format(fs))
+ 
+         # 1. Detect device
+-        err, output = shellutil.run_get_output('gpart list')
++        err, output = shellutil.run_get_output("gpart show | grep '=>'")
+         if err:
+             raise ResourceDiskError(
+                 "Unable to detect resource disk device:{0}".format(output))
+-        disks = self.parse_gpart_list(output)
++        disks = self.parse_gpart_show(output)
+ 
+         device = self.osutil.device_for_ide_port(1)
+         if device is None or device not in disks:
+@@ -90,94 +101,195 @@ class FreeBSDResourceDiskHandler(ResourceDiskHandler):
+             raise ResourceDiskError("Unable to detect resource disk device.")
+         logger.info('Resource disk device {0} found.', device)
+ 
+-        # 2. Detect partition
+-        partition_table_type = disks[device]
++        # 2. Detect/create partition
+ 
+-        if partition_table_type == 'MBR':
+-            provider_name = device + 's1'
+-        elif partition_table_type == 'GPT':
+-            provider_name = device + 'p2'
+-        else:
+-            raise ResourceDiskError(
+-                "Unsupported partition table type:{0}".format(output))
++        # count the target size of each partition
++        err, output = shellutil.run_get_output("diskinfo {0}".format(device))
++        if err:
++            raise ResourceDiskError("Cannot get resource disk size.")
++        disk_info = output.split()
++        block_size = int(disk_info[1])
+ 
++        err, output = shellutil.run_get_output("gpart show {0} | grep '=>'".format(device))
++        if err:
++            raise ResourceDiskError("Cannot get resource disk partition information.")
++        disk_info = output.split()
++        partition_size = int(disk_info[2]) * block_size
++
++        swap_size = 0
++        if conf.get_resourcedisk_enable_swap():
++            swap_size_mb = conf.get_resourcedisk_swap_size_mb()
++            swap_size = swap_size_mb * 1024 * 1024
++        resource_size = partition_size - swap_size
++        if resource_size < MINIMAL_RESOURCE_PARTITION_SIZE:
++            resource_size = MINIMAL_RESOURCE_PARTITION_SIZE
++            swap_size = partition_size - resource_size
++
++        # get size of the current swap partition
++        current_swap_size = 0
+         err, output = shellutil.run_get_output(
+-            'gpart show -p {0}'.format(device))
+-        if err or output.find(provider_name) == -1:
+-            raise ResourceDiskError("Resource disk partition not found.")
++            "gpart show {0} 2>/dev/null | grep freebsd-swap".format(device),
++            chk_err=False)
++        if output:
++            current_swap_size = int(output.split()[1]) * block_size
+ 
+-        partition = '/dev/' + provider_name
+-        logger.info('Resource disk partition {0} found.', partition)
++        partition_table_type = disks.get(device)
+ 
+-        # 3. Mount partition
+-        mount_list = shellutil.run_get_output("mount")[1]
+-        existing = self.osutil.get_mount_point(mount_list, partition)
++        resource_provider_name = device + 'p1'
++        swap_provider_name = device + 'p2'
+ 
++        # re-partition if needed
++        if partition_table_type != 'GPT' or current_swap_size != swap_size:
++            # unmount and swapoff if needed
++            mount_list = shellutil.run_get_output("mount")[1]
++            existing = self.osutil.get_mount_point(mount_list,
++                                                   resource_provider_name)
++            if existing:
++                err, output = shellutil.run_get_output(
++                    "umount {0}".format(mount_point), chk_err=False)
++
++            swap_info = shellutil.run_get_output("swapctl -l")[1].split('\n')
++            swap_device = None
++            if len(swap_info) > 2:
++                swap_device = swap_info[1].split()[0]
++            if swap_device:
++                err, output = shellutil.run_get_output(
++                    "swapoff {0}".format(swap_device), chk_err=False)
++                if swap_device.endswith('.eli'):
++                    err, output = shellutil.run_get_output(
++                        "geli detach {0}".format(swap_device), chk_err=False)
++
++            if partition_table_type is not None:
++                gaprt_destroy_cmd = "gpart destroy -F {0}".format(device)
++                err, output = shellutil.run_get_output(gaprt_destroy_cmd,
++                                                       chk_err=False)
++                if err:
++                    raise ResourceDiskError("Failed to destroy the "
++                                            "partitioning scheme on {0}, "
++                                            "error: {1}".format(device, output))
++            gaprt_create_cmd = "gpart create -s GPT {0}".format(device)
++            err, output = shellutil.run_get_output(gaprt_create_cmd,
++                                                   chk_err=False)
++            if err:
++                raise ResourceDiskError("Failed to create new GPT on {0}, "
++                                        "error: {1}".format(device, output))
++
++        mount_list = shellutil.run_get_output("mount")[1]
++        existing = self.osutil.get_mount_point(mount_list,
++                                               resource_provider_name)
+         if existing:
+-            logger.info("Resource disk {0} is already mounted", partition)
++            logger.info("Resource disk {0} is already mounted".format(
++                resource_provider_name))
+             return existing
+ 
++        # create resource partition
++        if not os.path.exists("/dev/{0}".format(resource_provider_name)):
++            if swap_size > 0:
++                err, output = shellutil.run_get_output(
++                    'gpart add -t freebsd-ufs -s {0}b {1}'.format(resource_size,
++                                                                  device))
++            else:
++                err, output = shellutil.run_get_output(
++                    'gpart add -t freebsd-ufs {0}'.format(device))
++            if err:
++                raise ResourceDiskError(
++                    "Failed to add new freebsd-ufs partition to {0}, "
++                    "error: {1}" .format(device, output))
++
++            # create swap partition, just use all the space left
++            if swap_size > 0:
++                err, output = shellutil.run_get_output(
++                    'gpart add -t freebsd-swap {0}'.format(device))
++                if err:
++                    raise ResourceDiskError(
++                        "Failed to add new freebsd-swap partition to {0}, "
++                        "error: {1}" .format(device, output))
++
++        # 3. Mount partition
+         fileutil.mkdir(mount_point, mode=0o755)
+-        mount_cmd = 'mount -t {0} {1} {2}'.format(fs, partition, mount_point)
+-        err = shellutil.run(mount_cmd, chk_err=False)
+-        if err:
+-            logger.info(
+-                'Creating {0} filesystem on partition {1}'.format(
+-                    fs, partition))
++
++        need_newfs = True
++        if current_swap_size == swap_size:
++            # swap size is not adjusted,
++            # i.e., the resource partition is not changed
++            # check if a fs already exists
++            fstyp_cmd = 'fstyp /dev/{0}'.format(resource_provider_name)
++            err, output = shellutil.run_get_output(fstyp_cmd, chk_err=False)
++            if not err and output == fs:
++                need_newfs = False
++                logger.info(
++                    "Resource disk partition {0} is found at {1} "
++                    "with fstype {2}".format(
++                        resource_provider_name, mount_point, fs))
++        elif swap_size < current_swap_size:
++            # resource partition size is increased, try to growfs first
+             err, output = shellutil.run_get_output(
+-                'newfs -U {0}'.format(partition))
++                'growfs -y {0}'.format(resource_provider_name), chk_err=False)
++            if not err:
++                need_newfs = False
++                logger.info(
++                    "Resource disk partition {0} is found and enlarged at {1} "
++                    "with fstype {2}".format(
++                        resource_provider_name, mount_point, fs))
++        # else
++            # resource partition is shrunk and newfs is needed
++
++        if need_newfs:
++            logger.info('Creating {0} filesystem on partition {1}'.format(
++                    fs, resource_provider_name))
++            err, output = shellutil.run_get_output(
++                'newfs -U {0}'.format(resource_provider_name))
+             if err:
+                 raise ResourceDiskError(
+-                    "Failed to create new filesystem on partition {0}, error:{1}" .format(
+-                        partition, output))
+-            err, output = shellutil.run_get_output(mount_cmd, chk_err=False)
+-            if err:
+-                raise ResourceDiskError(
+-                    "Failed to mount partition {0}, error {1}".format(
+-                        partition, output))
++                    "Failed to create new filesystem on partition {0}, "
++                    "error: {1}" .format(resource_provider_name, output))
+ 
++        mount_cmd = 'mount -t {0} /dev/{1} {2}'.format(
++            fs, resource_provider_name, mount_point)
++        err, output = shellutil.run_get_output(mount_cmd, chk_err=False)
++        if err:
++            raise ResourceDiskError(
++                "Failed to mount partition {0}, error {1}".format(
++                    resource_provider_name, output))
++
+         logger.info(
+-            "Resource disk partition {0} is mounted at {1} with fstype {2}",
+-            partition,
+-            mount_point,
+-            fs)
++            "Resource disk partition {0} is mounted at {1} "
++            "with fstype {2}".format(
++                resource_provider_name, mount_point, fs))
+         return mount_point
+ 
+     def create_swap_space(self, mount_point, size_mb):
+-        size_kb = size_mb * 1024
+-        size = size_kb * 1024
+-        swapfile = os.path.join(mount_point, 'swapfile')
+-        swaplist = shellutil.run_get_output("swapctl -l")[1]
++        # done in mount_resource_disk()
++        pass
+ 
+-        if self.check_existing_swap_file(swapfile, swaplist, size):
++    def enable_swap(self, mount_point):
++        if conf.get_resourcedisk_swap_size_mb() <=0:
+             return
+ 
+-        if os.path.isfile(swapfile) and os.path.getsize(swapfile) != size:
+-            logger.info("Remove old swap file")
+-            shellutil.run("swapoff {0}".format(swapfile), chk_err=False)
+-            os.remove(swapfile)
++        # get swap partition (geom provider)
++        err, output = shellutil.run_get_output('mount')
++        if err:
++            raise ResourceDiskError("Unable to get mount information.")
++        devices = self.parse_mount_list(output)
++        resource_provider_name = devices[mount_point]
++        swap_provider_name = self.get_next_partition(resource_provider_name)
+ 
+-        if not os.path.isfile(swapfile):
+-            logger.info("Create swap file")
+-            self.mkfile(swapfile, size_kb * 1024)
++        if conf.get_resourcedisk_enable_swap_encryption():
++            shellutil.run("kldload -n aesni")
++            shellutil.run("kldload -n cryptodev")
++            shellutil.run("kldload -n geom_eli")
++            shellutil.run("geli onetime -e AES-XTS -l 256"
++                          " -d {0}".format(swap_provider_name))
++            swap_provider_name += ".eli"
++            shellutil.run("chmod 0600 {0}".format(swap_provider_name))
+ 
+-        mddevice = shellutil.run_get_output(
+-            "mdconfig -a -t vnode -f {0}".format(swapfile))[1].rstrip()
+-        shellutil.run("chmod 0600 /dev/{0}".format(mddevice))
++        err, output = shellutil.run_get_output(
++			"swapctl -l | grep {0}".format(swap_provider_name))
++        if not output:
++            if shellutil.run("swapon {0}".format(swap_provider_name)):
++                raise ResourceDiskError(swap_provider_name)
+ 
+-        if conf.get_resourcedisk_enable_swap_encryption():
+-            shellutil.run("kldload aesni")
+-            shellutil.run("kldload cryptodev")
+-            shellutil.run("kldload geom_eli")
+-            shellutil.run(
+-                "geli onetime -e AES-XTS -l 256 -d /dev/{0}".format(mddevice))
+-            shellutil.run("chmod 0600 /dev/{0}.eli".format(mddevice))
+-            if shellutil.run("swapon /dev/{0}.eli".format(mddevice)):
+-                raise ResourceDiskError("/dev/{0}.eli".format(mddevice))
+-            logger.info(
+-                "Enabled {0}KB of swap at /dev/{1}.eli ({2})".format(size_kb, mddevice, swapfile))
+-        else:
+-            if shellutil.run("swapon /dev/{0}".format(mddevice)):
+-                raise ResourceDiskError("/dev/{0}".format(mddevice))
+-            logger.info(
+-                "Enabled {0}KB of swap at /dev/{1} ({2})".format(size_kb, mddevice, swapfile))
++        size_mb = shellutil.run_get_output(
++            "swapctl -lm | grep {0}".format(swap_provider_name))[1].split()[1]
++        logger.info(
++            "Enabled {0}MB of swap at {1}".format(size_mb, swap_provider_name))
diff --git a/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf b/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf
new file mode 100644
index 000000000000..9dd22728d4b4
--- /dev/null
+++ b/sysutils/azure-agent/files/patch-config_freebsd_waagent.conf
@@ -0,0 +1,11 @@
+--- config/freebsd/waagent.conf.orig	2021-05-21 08:58:28 UTC
++++ config/freebsd/waagent.conf
+@@ -49,7 +49,7 @@ ResourceDisk.MountPoint=/mnt/resource
+ ResourceDisk.EnableSwap=y
+ 
+ # Size of the swapfile.
+-ResourceDisk.SwapSizeMB=16384
++ResourceDisk.SwapSizeMB=2048
+ 
+ # Comma-separated list of mount options. See mount(8) for valid options.
+ ResourceDisk.MountOptions=None
diff --git a/sysutils/azure-agent/pkg-descr b/sysutils/azure-agent/pkg-descr
index fd72839e99f7..f358ecc0ffbf 100644
--- a/sysutils/azure-agent/pkg-descr
+++ b/sysutils/azure-agent/pkg-descr
@@ -2,4 +2,4 @@ The Microsoft Azure Linux Agent
 
 LICENSE: APACHE20
 
-WWW: http://azure.microsoft.com/
+WWW: https://github.com/Azure/WALinuxAgent/
diff --git a/sysutils/b2sum/Makefile b/sysutils/b2sum/Makefile
index d7626d321f24..2c31a692ea7b 100644
--- a/sysutils/b2sum/Makefile
+++ b/sysutils/b2sum/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	b2sum
-PORTVERSION=	0.0.20160619
+PORTVERSION=	20190724
 CATEGORIES=	sysutils security
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -20,7 +18,6 @@ PLIST_FILES=	bin/b2sum
 USE_GITHUB=	yes
 GH_ACCOUNT=	BLAKE2
 GH_PROJECT=	BLAKE2
-GH_TAGNAME=	${PORTVERSION:E}
 
 OPTIONS_DEFINE=	OPENMP OPTIMIZED_CFLAGS SSE
 OPTIONS_DEFAULT_amd64=	SSE
@@ -46,6 +43,6 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-makefile
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/b2sum ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/b2sum/distinfo b/sysutils/b2sum/distinfo
index 94aa9ba2b170..940649e34dcb 100644
--- a/sysutils/b2sum/distinfo
+++ b/sysutils/b2sum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549358972
-SHA256 (BLAKE2-BLAKE2-0.0.20160619-20160619_GH0.tar.gz) = cbac833ccae56b5c6173dbeaf871aa99b32745cf7a994c7451d4533ecda55633
-SIZE (BLAKE2-BLAKE2-0.0.20160619-20160619_GH0.tar.gz) = 462704
+TIMESTAMP = 1593061786
+SHA256 (BLAKE2-BLAKE2-20190724_GH0.tar.gz) = 7f2c72859d462d604ab3c9b568c03e97b50a4052092205ad18733d254070ddc2
+SIZE (BLAKE2-BLAKE2-20190724_GH0.tar.gz) = 895556
diff --git a/sysutils/b2sum/files/extra-patch-makefile b/sysutils/b2sum/files/extra-patch-makefile
index 5eedc709cda3..228169584ad9 100644
--- a/sysutils/b2sum/files/extra-patch-makefile
+++ b/sysutils/b2sum/files/extra-patch-makefile
@@ -1,13 +1,13 @@
---- makefile.orig	2016-06-19 16:55:55 UTC
+--- makefile.orig	2019-07-23 20:13:49 UTC
 +++ makefile
-@@ -9,8 +9,8 @@ CFLAGS?=-O3 -march=native -Werror=declar
- CFLAGS+=-std=c99 -I../sse
+@@ -9,8 +9,8 @@ CFLAGS?=-O3 -march=native
+ CFLAGS+=-std=c89 -Wall -Wextra -pedantic -Wno-long-long -I../sse
  CFLAGS+=$(NO_OPENMP_$(NO_OPENMP))
  LIBS=
--#FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
--FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
-+FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c 
-+#FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c 
+-#FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c
+-FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c
++FILES=b2sum.c ../ref/blake2b-ref.c ../ref/blake2s-ref.c ../ref/blake2bp-ref.c ../ref/blake2sp-ref.c
++#FILES=b2sum.c ../sse/blake2b.c ../sse/blake2s.c ../sse/blake2bp.c ../sse/blake2sp.c
  all: $(FILES)
  	$(CC) $(FILES) $(CFLAGS) $(LIBS) -o $(PROG)
  
diff --git a/sysutils/b43-fwcutter/Makefile b/sysutils/b43-fwcutter/Makefile
index 16c8ec923b83..ba77f62d2803 100644
--- a/sysutils/b43-fwcutter/Makefile
+++ b/sysutils/b43-fwcutter/Makefile
@@ -1,5 +1,4 @@
 # Created by: Scot Hetzel <swhetzel@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	b43-fwcutter
 PORTVERSION=	019
diff --git a/sysutils/backupchecker/Makefile b/sysutils/backupchecker/Makefile
deleted file mode 100644
index 77ace41585df..000000000000
--- a/sysutils/backupchecker/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: Ganael Laplanche <ganael.laplanche@martymac.org>
-# $FreeBSD$
-
-PORTNAME=	backupchecker
-PORTVERSION=	1.9
-CATEGORIES=	sysutils archivers
-PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
-
-MAINTAINER=	martymac@FreeBSD.org
-COMMENT=	Fully automated backup checker
-
-LICENSE=	GPLv3
-
-NO_ARCH=	yes
-
-USES=		python:3.3+
-USE_GITHUB=	yes
-USE_PYTHON=	autoplist distutils
-
-PORTDOCS=	README.md
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${REINPLACE_CMD} "s|'share','man'|'${MANPREFIX}/man'|" ${WRKSRC}/setup.py
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/backupchecker/distinfo b/sysutils/backupchecker/distinfo
deleted file mode 100644
index e53bf0ddc147..000000000000
--- a/sysutils/backupchecker/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1492201657
-SHA256 (backupchecker-backupchecker-1.9_GH0.tar.gz) = ea000bb9ff9ea7ca00911953309f4c902507137005d5b51e054fb5663da6824a
-SIZE (backupchecker-backupchecker-1.9_GH0.tar.gz) = 282631
diff --git a/sysutils/backupchecker/pkg-descr b/sysutils/backupchecker/pkg-descr
deleted file mode 100644
index 699bbe247518..000000000000
--- a/sysutils/backupchecker/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Backupchecker is a fully automated backup checker that compares archives and
-file trees' contents against description files to detect errors.
-
-WWW: https://github.com/backupchecker/backupchecker
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index c947ebfca9a6..78164b0a110e 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -1,9 +1,7 @@
 # Created by: Alexander Moisseev <moiseev@mezonplus.ru>
-# $FreeBSD$
 
 PORTNAME=	backuppc
-DISTVERSION=	4.1.6.20180212
-PORTREVISION=	2
+DISTVERSION=	4.3.3.20200531
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 
@@ -13,7 +11,7 @@ COMMENT=	Multi-platform backup to disk-based storage
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-EXTRACT_DEPENDS=	p5-BackupPC-XS>=0.57:sysutils/p5-BackupPC-XS
+EXTRACT_DEPENDS=	p5-BackupPC-XS>=0.60:sysutils/p5-BackupPC-XS
 RUN_DEPENDS=	p5-CGI>0:www/p5-CGI \
 		p5-File-Listing>=0:sysutils/p5-File-Listing \
 		p5-BackupPC-XS>=0.57:sysutils/p5-BackupPC-XS
@@ -27,7 +25,7 @@ BROKEN=		fails to build under qemu: uncaught target signal 11 (Segmetation fault
 CONFLICTS_INSTALL=	backuppc backuppc4
 
 USE_GITHUB=	yes
-GH_TAGNAME=	3990160
+GH_TAGNAME=	cae051c
 USE_PERL5=	extract
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/sysutils/backuppc-devel/distinfo b/sysutils/backuppc-devel/distinfo
index 9495d2170f7a..e1b982e41712 100644
--- a/sysutils/backuppc-devel/distinfo
+++ b/sysutils/backuppc-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518419044
-SHA256 (backuppc-backuppc-4.1.6.20180212-3990160_GH0.tar.gz) = 953f30420da99dc646c168dc620f54169050ef4eaa5d1fb8977af59f8fd4fca1
-SIZE (backuppc-backuppc-4.1.6.20180212-3990160_GH0.tar.gz) = 548269
+TIMESTAMP = 1590909160
+SHA256 (backuppc-backuppc-4.3.3.20200531-cae051c_GH0.tar.gz) = 97d9831883002dc7e3dc3c8fecafd9aad34c342aea28b0f64e6b2cb446600a45
+SIZE (backuppc-backuppc-4.3.3.20200531-cae051c_GH0.tar.gz) = 561317
diff --git a/sysutils/backuppc-devel/pkg-plist b/sysutils/backuppc-devel/pkg-plist
index 4f6e378e1a4e..502dcef92ba5 100644
--- a/sysutils/backuppc-devel/pkg-plist
+++ b/sysutils/backuppc-devel/pkg-plist
@@ -119,13 +119,16 @@ man/man1/backuppc.1.gz
 %%WWWDIR%%/BackupPC_stnd.css
 %%WWWDIR%%/BackupPC_retro_v2.css
 %%WWWDIR%%/BackupPC_retro_v3.css
+%%WWWDIR%%/apple-touch-icon.png
+%%WWWDIR%%/favicon-16x16.png
+%%WWWDIR%%/favicon-32x32.png
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/icon-dir.png
 %%WWWDIR%%/icon-file.png
 %%WWWDIR%%/icon-hardlink.png
 %%WWWDIR%%/icon-symlink.png
-%%WWWDIR%%/logo.gif
 %%WWWDIR%%/logo320.png
+%%WWWDIR%%/safari-pinned-tab.svg
 %%WWWDIR%%/sorttable.js
 @owner backuppc
 @group backuppc
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index 9bf3fda9cc99..e2d841b9990c 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -1,5 +1,4 @@
 # Created by: Alexander Moisseev <moiseev@mezonplus.ru>
-# $FreeBSD$
 
 PORTNAME=	backuppc
 PORTVERSION=	3.3.2
diff --git a/sysutils/backuppc4/Makefile b/sysutils/backuppc4/Makefile
index 264bcbc12b77..98bc73038e09 100644
--- a/sysutils/backuppc4/Makefile
+++ b/sysutils/backuppc4/Makefile
@@ -1,8 +1,7 @@
 # Created by: Alexander Moisseev <moiseev@mezonplus.ru>
-# $FreeBSD$
 
 PORTNAME=	backuppc
-PORTVERSION=	4.3.1
+PORTVERSION=	4.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/backuppc/backuppc/releases/download/${PORTVERSION}/ \
 		SF
@@ -17,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-CGI>0:www/p5-CGI \
 		p5-File-Listing>=0:sysutils/p5-File-Listing \
-		p5-BackupPC-XS>=0.57:sysutils/p5-BackupPC-XS
+		p5-BackupPC-XS>=0.62:sysutils/p5-BackupPC-XS
 
 USES=		perl5
 
@@ -53,7 +52,7 @@ SMB_DESC=		Install Samba (for "smb" transfer and NetBIOS lookup)
 XML_RSS_DESC=		Install Perl extension to manage RSS files
 
 ARCHIVE_ZIP_RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip
-RSYNC_BPC_RUN_DEPENDS=		rsync-bpc>=3.0.9.6:net/rsync-bpc
+RSYNC_BPC_RUN_DEPENDS=		rsync-bpc>=3.0.9.15:net/rsync-bpc
 RRDTOOL_RUN_DEPENDS=		rrdtool:databases/rrdtool
 SMB_USES=			samba:run # nmblookup, smbclient
 XML_RSS_RUN_DEPENDS=		p5-XML-RSS>=0:textproc/p5-XML-RSS
diff --git a/sysutils/backuppc4/distinfo b/sysutils/backuppc4/distinfo
index e436d3ffde27..55da97b6b545 100644
--- a/sysutils/backuppc4/distinfo
+++ b/sysutils/backuppc4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563191648
-SHA256 (BackupPC-4.3.1.tar.gz) = 588115770398d1a28a21de94c2804af40c778593134990780f7369e80445ab7f
-SIZE (BackupPC-4.3.1.tar.gz) = 638366
+TIMESTAMP = 1592723602
+SHA256 (BackupPC-4.4.0.tar.gz) = 8bc04cd513d47629508bd2fd6f455ced38316974913638e971f44e37786c6365
+SIZE (BackupPC-4.4.0.tar.gz) = 657309
diff --git a/sysutils/backuppc4/pkg-plist b/sysutils/backuppc4/pkg-plist
index 4f6e378e1a4e..9033a672c67e 100644
--- a/sysutils/backuppc4/pkg-plist
+++ b/sysutils/backuppc4/pkg-plist
@@ -36,8 +36,8 @@ lib/BackupPC/CGI/GeneralInfo.pm
 lib/BackupPC/CGI/HostInfo.pm
 lib/BackupPC/CGI/LOGlist.pm
 lib/BackupPC/CGI/Lib.pm
+lib/BackupPC/CGI/Metrics.pm
 lib/BackupPC/CGI/Queue.pm
-lib/BackupPC/CGI/RSS.pm
 lib/BackupPC/CGI/ReloadServer.pm
 lib/BackupPC/CGI/Restore.pm
 lib/BackupPC/CGI/RestoreFile.pm
@@ -119,13 +119,16 @@ man/man1/backuppc.1.gz
 %%WWWDIR%%/BackupPC_stnd.css
 %%WWWDIR%%/BackupPC_retro_v2.css
 %%WWWDIR%%/BackupPC_retro_v3.css
+%%WWWDIR%%/apple-touch-icon.png
+%%WWWDIR%%/favicon-16x16.png
+%%WWWDIR%%/favicon-32x32.png
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/icon-dir.png
 %%WWWDIR%%/icon-file.png
 %%WWWDIR%%/icon-hardlink.png
 %%WWWDIR%%/icon-symlink.png
-%%WWWDIR%%/logo.gif
 %%WWWDIR%%/logo320.png
+%%WWWDIR%%/safari-pinned-tab.svg
 %%WWWDIR%%/sorttable.js
 @owner backuppc
 @group backuppc
diff --git a/sysutils/backupuser/Makefile b/sysutils/backupuser/Makefile
index d9730bbbec52..61f33d65e01a 100644
--- a/sysutils/backupuser/Makefile
+++ b/sysutils/backupuser/Makefile
@@ -1,27 +1,38 @@
-# $FreeBSD$
-
 PORTNAME=	backupuser
-PORTVERSION=	1.0
+DISTVERSION=	1.1.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.olivermahmoudi.com/files/
+MASTER_SITES=	https://www.olivermahmoudi.com/files/
 
 MAINTAINER=	fbsd@olivermahmoudi.com
 COMMENT=	User Backup Utility
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+
 PLIST_FILES=	bin/backupuser \
 		bin/bu_check_files \
 		man/man1/backupuser.1.gz \
 		man/man1/bu_check_files.1.gz
-WRKSRC=		${WRKDIR}/${PORTNAME}
+
+post-patch:
+	@${REINPLACE_CMD} '74,93d;101,103d' ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} 's|dpkg -l|pkg info|' ${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's|/bin/sh|${LOCALBASE}/bin/bash|' \
+		-e 's|sha256sum|sha256|g' \
+		${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's|/bin/sh|${LOCALBASE}/bin/bash|' \
+		-e 's|sha256sum|sha256|g' \
+		${WRKSRC}/bu_check_files
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME} bu_check_files \
-		${STAGEDIR}${PREFIX}/bin
-	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.1 bu_check_files.1 \
-		${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bu_check_files ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/bu_check_files.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/backupuser/distinfo b/sysutils/backupuser/distinfo
index 4bfd79e5d4d1..2490e0e705b0 100644
--- a/sysutils/backupuser/distinfo
+++ b/sysutils/backupuser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514653592
-SHA256 (backupuser-1.0.tar.gz) = f33fdc33fd5e98e5fd2fbc517bfeddd83e1851d9f4e0348827c69de98ee07f53
-SIZE (backupuser-1.0.tar.gz) = 5338
+TIMESTAMP = 1605645722
+SHA256 (backupuser-1.1.1.tar.gz) = afd15f9f2e0bac3b26394c0136be309cf41adf624de85f31b5d3e49127f82aaf
+SIZE (backupuser-1.1.1.tar.gz) = 7959
diff --git a/sysutils/bacula11-client-static/Makefile b/sysutils/bacula11-client-static/Makefile
new file mode 100644
index 000000000000..d71509f1df6a
--- /dev/null
+++ b/sysutils/bacula11-client-static/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	bacula
+PKGNAMESUFFIX=	11-client-static
+
+COMMENT=	Network backup solution (static client)
+
+BROKEN_aarch64=		Fails to link: missing sbrk
+BROKEN_riscv64=		Fails to link: missing sbrk
+BROKEN_SSL=	libressl
+
+WITH_CLIENT_ONLY=yes
+PLIST=		${.CURDIR}/pkg-plist
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula11-server
+
+PLIST_FILES=	sbin/bacula-fd-static \
+		sbin/bconsole-static
+
+OPTIONS_DEFINE=	NLS OPENSSL
+OPTIONS_DEFAULT=OPENSSL
+
+CONFIGURE_ARGS+=	--enable-client-only \
+			--enable-static-fd \
+			--enable-static-cons \
+			--disable-libtool \
+			--disable-build-dird \
+			--disable-build-stored
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula11-client/Makefile b/sysutils/bacula11-client/Makefile
new file mode 100644
index 000000000000..db2c57bb741d
--- /dev/null
+++ b/sysutils/bacula11-client/Makefile
@@ -0,0 +1,17 @@
+PORTNAME=	bacula
+PKGNAMESUFFIX=	11-client
+
+COMMENT=	Network backup solution (client)
+
+BROKEN_aarch64=		Fails to link: missing sbrk
+BROKEN_riscv64=		Fails to link: missing sbrk
+
+WITH_CLIENT_ONLY=yes
+USE_RC_SUBR=	bacula-fd
+
+PLIST=		${PKGDIR}/pkg-plist.client
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula11-server
+
+OPTIONS_DEFINE=	NLS PYTHON IPV6
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula11-docs/Makefile b/sysutils/bacula11-docs/Makefile
new file mode 100644
index 000000000000..07706ace74f5
--- /dev/null
+++ b/sysutils/bacula11-docs/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	bacula
+PORTVERSION=	11.0.3
+CATEGORIES=	sysutils
+MASTER_SITES=	SF
+PKGNAMESUFFIX=	11-docs
+DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
+
+CONFLICTS=	bacula9-*
+
+MAINTAINER=	dvl@FreeBSD.org
+COMMENT=	Bacula document set
+
+USES=		tar:bz2
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+PORTDOCS=	*.pdf
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${FIND} ${WRKSRC}/manuals/en \
+		-name "*.pdf" -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/ \;
+
+.include <bsd.port.mk>
diff --git a/sysutils/bacula11-docs/distinfo b/sysutils/bacula11-docs/distinfo
new file mode 100644
index 000000000000..25b668479f9b
--- /dev/null
+++ b/sysutils/bacula11-docs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1622056882
+SHA256 (bacula-docs-11.0.3.tar.bz2) = 018957722a4c21b324cee953a72d51db2e7a35c99669c03c10dca6ee7e306a61
+SIZE (bacula-docs-11.0.3.tar.bz2) = 67501957
diff --git a/sysutils/bacula11-docs/pkg-descr b/sysutils/bacula11-docs/pkg-descr
new file mode 100644
index 000000000000..cabed863dd96
--- /dev/null
+++ b/sysutils/bacula11-docs/pkg-descr
@@ -0,0 +1,13 @@
+Bacula is a set of computer programs that permit you (or the system
+administrator) to manage backup, recovery, and verification of
+computer data across a network of computers of different kinds.
+In technical terms, it is a network Client/Server based backup program.
+Bacula is relatively easy to use and efficient, while offering many
+advanced storage management features that make it easy to find and
+recover lost or damaged files. Due to its modular design, Bacula is
+scalable from small single computer systems to systems consisting of
+hundreds of computers located over a large network.
+
+This port installs the latest documentation for Bacula.
+
+WWW: https://www.bacula.org/
diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile
new file mode 100644
index 000000000000..952f94ae5cb1
--- /dev/null
+++ b/sysutils/bacula11-server/Makefile
@@ -0,0 +1,201 @@
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
+
+PORTNAME=	bacula
+PORTVERSION=	11.0.3
+CATEGORIES?=	sysutils
+MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
+PKGNAMEPREFIX?=	#
+PKGNAMESUFFIX?=	11-server
+
+MAINTAINER=	dvl@FreeBSD.org
+COMMENT?=	Network backup solution (server)
+
+LICENSE=	AGPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES+=		libtool readline shebangfix ssl
+SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in
+
+CONFLICTS?=	bacula9-server-* bacula5-server-* bacula-server-*
+
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
+
+USERS=		bacula
+GROUPS=		${USERS}
+
+PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+OPTIONS_DEFINE?=	MTX NLS IPV6
+MTX_DESC=		Install mtx for control of autochanger devices
+
+.if ${PKGNAMESUFFIX} == "11-server"
+OPTIONS_MULTI=		BACKEND
+OPTIONS_MULTI_BACKEND=	SQLITE3 MYSQL PGSQL
+OPTIONS_DEFAULT+=	PGSQL
+.endif
+
+OPTIONS_SUB=		yes
+
+.if ${PKGNAMESUFFIX} == "11-client" || ${PKGNAMESUFFIX} == "11-server"  #Till end of the file
+
+.if !defined(WITH_CLIENT_ONLY)
+LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula11-client
+USE_RC_SUBR?=	bacula-dir bacula-sd
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
+.else
+SUB_FILES+=	pkg-message.server
+.endif
+
+CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
+		--enable-smartalloc \
+		--sysconfdir=${ETCDIR} \
+		--with-working-dir=${BACULA_DIR} \
+		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
+		--disable-conio \
+		--enable-batch-insert \
+		--with-plugindir=${PREFIX}/lib \
+		--with-dump-email=root@localhost \
+		--with-job-email=root@localhost \
+		--with-db-name=bacula \
+		--with-sbin-perm=755 \
+		--with-db-user=bacula \
+		--with-logdir=/var/log \
+		--with-baseport=9101
+
+.if defined(WITH_CLIENT_ONLY)
+CONFIGURE_ARGS+=--with-fd-user=root \
+		--with-fd-group=wheel
+.else
+CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \
+		--with-dir-group=${BACULA_GROUP} \
+		--with-sd-user=${BACULA_USER} \
+		--with-sd-group=operator
+.endif
+
+# The user/group IDs below are registered, see
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#users-and-groups
+#
+BACULA_USER?=	bacula
+BACULA_GROUP?=	${BACULA_USER}
+BACULA_UID?=	bacula
+BACULA_GID?=	${BACULA_UID}
+BACULA_DIR?=	/var/db/bacula
+
+PLIST_SUB+=	BACULA_DIR=${BACULA_DIR}
+
+SUB_LIST=	BACULA_USER=${BACULA_USER} \
+		BACULA_GROUP=${BACULA_GROUP} \
+		BACULA_UID=${BACULA_UID} \
+		BACULA_GID=${BACULA_GID} \
+		BACULA_DIR=${BACULA_DIR}
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+# Client only or full server version
+.if defined(WITH_CLIENT_ONLY)
+CONFFILES=	fd
+CONFIGURE_ARGS+=	--enable-client-only
+
+PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
+PKGINSTALL=	${FILESDIR}/pkg-install.client
+.else
+# Server only Options
+CONFFILES=		sd dir
+# Server default database
+
+MYSQL_CONFIGURE_ON=	--with-mysql=yes
+MYSQL_USES=		mysql
+SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
+SQLITE3_USES=		sqlite:3
+PGSQL_CONFIGURE_ON=	--with-postgresql=yes
+PGSQL_USES=		pgsql
+
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
+
+.endif
+
+.include <bsd.port.pre.mk>
+
+# if IPv6 is not in the kernel, it generates many errors
+.if ! ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
+
+.if defined(WITH_CLIENT_ONLY)
+MP8+=	bacula.8 bacula-fd.8 bconsole.8
+.else
+MP8+=	bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
+	btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
+MP1+=	bsmtp.1 bacula-tray-monitor.1
+.endif
+
+MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
+
+post-patch:
+	# This port does not install docs.  See bacula-docs for that
+	@${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
+	# Change $(ECHO) to echo in some Makefile.in files
+	@${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g'  \
+		${WRKSRC}/src/filed/Makefile.in   \
+		${WRKSRC}/src/console/Makefile.in \
+		${WRKSRC}/src/cats/Makefile.in    \
+		${WRKSRC}/src/dird/Makefile.in    \
+		${WRKSRC}/src/stored/Makefile.in  \
+		${WRKSRC}/src/tools/Makefile.in
+
+	# Default bconsole.conf is in ${ETCDIR}
+	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
+	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
+.if defined(WITH_CLIENT_ONLY)
+	# In client port only install startup script out of script dir (see below post-install)
+	# Dont mkdir ${PREFIX}/share/bacula cause it's empty
+	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
+.else
+	# In server port don't install filed
+	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
+		${WRKSRC}/Makefile.in
+.endif
+
+.if !target(post-install)
+post-install:
+.if defined(WITH_CLIENT_ONLY)
+	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
+.else
+	${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
+	# bacula-dir attempts to install query.sql as bpart of bacula-server, but that should only installed by bacula-client.
+	${RM} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql
+
+	#the following are installed by the -CLIENT port, and I (ler@lerctr.org)
+	#don't know how to remove them from being built for the -SERVER port.
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac-${PORTVERSION}.so
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac.so
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg-${PORTVERSION}.so
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg.so
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind-${PORTVERSION}.so
+	${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind.so
+.endif
+	for na in ${CONFFILES}; do \
+		${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
+	done
+.endif
+.else
+.include "${MASTERDIR}/Makefile.common"
+.endif # 11-client and 11-server are defined
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/bacula11-server/Makefile.common b/sysutils/bacula11-server/Makefile.common
new file mode 100644
index 000000000000..a31a5a47640e
--- /dev/null
+++ b/sysutils/bacula11-server/Makefile.common
@@ -0,0 +1,24 @@
+.include <bsd.port.pre.mk>
+
+post-build:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula
+.endif
+
+do-install:
+.if ${PKGNAMESUFFIX} == "11-bat"
+# Install config files and preserve existing ones
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
+	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
+.endif
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
+	${STAGEDIR}${PREFIX}/libexec/nagios
+.endif
+.if ${PKGNAMESUFFIX} == "11-client-static"
+	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static
+	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
+.endif
diff --git a/sysutils/bacula11-server/distinfo b/sysutils/bacula11-server/distinfo
new file mode 100644
index 000000000000..61a84aab79ca
--- /dev/null
+++ b/sysutils/bacula11-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1622055885
+SHA256 (bacula-11.0.3.tar.gz) = 01587734f7490fcb7737801b2e1fe1b1f94707bb3fb0b71b36713c7aab03923c
+SIZE (bacula-11.0.3.tar.gz) = 5982505
diff --git a/sysutils/bacula11-server/files/bacula-barcodes b/sysutils/bacula11-server/files/bacula-barcodes
new file mode 100644
index 000000000000..0a0b2dc28f24
--- /dev/null
+++ b/sysutils/bacula11-server/files/bacula-barcodes
@@ -0,0 +1,51 @@
+#
+# Bacula barcode simulation file
+# used by ${PREFIX}/sbin/chio-bacula (FreeBSD)
+#
+# The volumenames are returned by the "changer list" command
+# labeling in the console is done by "label barcodes"
+# (then all volumes belog to the default pool).
+# All Lines with an "#" at the bedinning are ignored
+#
+# !!!! If you export an tape and reinsert another one,
+# !!!! don't forget to change the volume name in this file!
+#
+1:Volume1-100
+2:Volume1-101
+3:Volume1-102
+4:Volume1-103
+5:Volume1-104
+6:Volume1-105
+7:Volume1-106
+8:Volume1-107
+9:Volume1-108
+10:Volume1-109
+11:Volume1-110
+12:Volume1-111
+#
+# Further volumes exported from the changer
+#
+# 36GB AIT2 tapes
+#Volume1-100
+#Volume1-101
+#Volume1-102
+#Volume1-103
+#Volume1-104
+#Volume1-105
+#Volume1-106
+#Volume1-107
+#Volume1-108
+#Volume1-109
+#Volume1-110
+#Volume1-111
+#Volume1-112
+#Volume1-113
+#Volume1-114
+#Volume1-115
+#
+# 50GB AIT2 tapes
+#Volume2-200
+#Volume2-201
+#Volume2-202
+#Volume2-203
+#Volume2-204
diff --git a/sysutils/bacula11-server/files/bacula-dir.in b/sysutils/bacula11-server/files/bacula-dir.in
new file mode 100644
index 000000000000..1825c924306e
--- /dev/null
+++ b/sysutils/bacula11-server/files/bacula-dir.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# PROVIDE: bacula_dir
+# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bacula_dir_enable  (bool):   Set to NO by default.
+#                Set it to YES to enable bacula_dir.
+# bacula_dir_flags (params):   Set params used to start bacula_dir.
+#
+
+. /etc/rc.subr
+
+name="bacula_dir"
+rcvar=${name}_enable
+command=%%PREFIX%%/sbin/bacula-dir
+
+load_rc_config $name
+
+: ${bacula_dir_enable="NO"}
+: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
+: ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
+
+pidfile="${bacula_dir_pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/bacula11-server/files/bacula-fd.in b/sysutils/bacula11-server/files/bacula-fd.in
new file mode 100644
index 000000000000..d011131d8790
--- /dev/null
+++ b/sysutils/bacula11-server/files/bacula-fd.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# PROVIDE: bacula_fd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bacula_fd_enable  (bool):  Set to NO by default.
+#               Set it to YES to enable bacula_fd.
+# bacula_fd_flags (params):  Set params used to start bacula_fd.
+#
+
+. /etc/rc.subr
+
+name="bacula_fd"
+rcvar=${name}_enable
+command=%%PREFIX%%/sbin/bacula-fd
+
+load_rc_config $name
+
+: ${bacula_fd_enable="NO"}
+: ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
+: ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+
+pidfile="${bacula_fd_pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/bacula11-server/files/bacula-sd.in b/sysutils/bacula11-server/files/bacula-sd.in
new file mode 100644
index 000000000000..2020f846f1c7
--- /dev/null
+++ b/sysutils/bacula11-server/files/bacula-sd.in
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# PROVIDE: bacula_sd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bacula_sd_enable  (bool):  Set to NO by default.
+#               Set it to YES to enable bacula_sd.
+# bacula_sd_flags (params):  Set params used to start bacula_sd.
+#
+
+. /etc/rc.subr
+
+name="bacula_sd"
+rcvar=${name}_enable
+command=%%PREFIX%%/sbin/bacula-sd
+
+load_rc_config $name
+
+: ${bacula_sd_enable="NO"}
+: ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
+: ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
+
+pidfile="${bacula_sd_pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/bacula11-server/files/chio-bacula b/sysutils/bacula11-server/files/chio-bacula
new file mode 100644
index 000000000000..6650426857dc
--- /dev/null
+++ b/sysutils/bacula11-server/files/chio-bacula
@@ -0,0 +1,200 @@
+#!/bin/sh
+#
+# Bacula interface to FreeBSD chio autoloader command with
+# multiple drive support
+# (By Lars Köller, lars+bacula@koellers.net, 2004)
+#
+#  If you set in your Device resource
+#
+#  Changer Command = "path-to-this-script/chio-bacula" %c %o %S %a
+#    you will have the following input to this script:
+#
+#  chio-bacula "changer-device" "command" "slot" "archive-device" "drive-index"
+#                  $1              $2       $3        $4               $5
+#  for example:
+#
+#  chio-bacula /dev/sg0 load 1 /dev/nst0 0     (on a FreeBSD system)
+#
+#  If you need to to an offline, refer to the drive as $4
+#    e.g.   mt -f $f offline
+#
+#  Many changers need an offline after the unload. Also many
+#   changers need a sleep 60 after the mtx load.
+#
+#  N.B. If you change the script, take care to return either
+#   the mtx exit code or a 0. If the script exits with a non-zero
+#   exit code, Bacula will assume the request failed.
+#
+me=$(basename $0)
+
+# Debug output, take care this file is writeable for user bacula!
+#LOG=/var/db/bacula/chio-bacula.log
+#exec 2>>$LOG
+#echo "------------------------- $(date) Start $(basename $0) -------------------------" >> $LOG
+#set -x
+
+# Debug
+logger -p user.err "$me $@"
+
+# This simulates a barcode reader in the changer.
+# The labes of the virtual barcode reader are located in the BARCODE_FILE
+SIMULATE_BARCODE=true
+BARCODE_FILE=/usr/local/etc/bacula/bacula-barcodes
+MTX=/bin/chio
+# Set default values (see case statement below for
+# free mapping of drive index and tape device
+# We have a double drive Qualstar where drive 1 is the default bacula drive
+#TAPE=/dev/bacula-tape
+TAPE=/dev/nrsa0
+DRIVE=0
+# Time to wait for (un)loading
+SLEEP=20
+
+usage()
+{
+  echo ""
+  echo "The $me script for bacula"
+  echo "--------------------------------------"
+  echo ""
+  echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive] [drive index]"
+  echo ""
+  echo "Valid commands:"
+  echo ""
+  echo "unload          Unloads a tape into the slot"
+  echo "                from where it was loaded."
+  echo "load <slot>     Loads a tape from the slot <slot>"
+  echo "                (slot-base is calculated to 1 as first slot)"
+  echo "list            Lists full storage slots"
+  echo "loaded          Gives slot from where the tape was loaded."
+  echo "                0 means the tape drive is empty."
+  echo "slots           Gives Number of aviable slots."
+  echo ""
+  echo "Example:"
+  echo "  $me /dev/changer load 1   loads a tape from slot 1"
+  echo ""
+  exit 2
+}
+
+# The changer device
+if [ -z "$1" ] ; then
+    usage;
+else
+    CHANGER=$1
+fi
+# The command
+if [ -z "$2" ] ; then
+    usage;
+else
+    COMMAND=$2
+fi
+# The slot number
+if [ ! -z "$3" ]; then
+    SLOT=$3
+    # btape fill says "... slot 1 drive 0" :-(
+    if [ "$SLOT" = "slot" ]; then
+	shift
+	SLOT=$3
+    fi
+fi
+# Set tape device
+if [ ! -z "$4" ]; then
+    TAPE=$4
+fi
+
+# Here you can map bacula drive number to any tape device
+# DRIVE is the chio drive number used below by chio!
+case $5 in
+    0)
+	# First Drive in Changer is Bacula drive
+	DRIVE=0
+	#TAPE=/dev/bacula-tape
+	TAPE=/dev/nrsa0
+	;;
+    1)
+	DRIVE=1
+	#TAPE=/dev/bacula-tape2
+	TAPE=/dev/nrsa1
+	;;
+esac
+
+#
+# Main
+#
+case ${COMMAND} in
+    unload)
+	# enable the following line if you need to eject the cartridge
+	mt -f ${TAPE} off
+	sleep 2
+	# if we have a slot, try it
+	if [ ! -z "$SLOT" ]; then
+	    ${MTX} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT}-1))
+	    exit $?
+	fi
+	# Try other way (works if source element information is valid for drive)
+	${MTX} -f ${CHANGER} return drive ${DRIVE}
+	# If the changer is power cycled with a tape loaded in a drive
+	# we can compute the slot in case of a complete filled magazine, with
+	# one slot free.
+	if [ "$?" != "0" ]; then
+	    free_slot=`${MTX} -f ${CHANGER} stat | grep "^slot " | grep -v "FULL" | awk '{print $2}'`
+	    free_slot=${free_slot%:}
+	    ${MTX} -f ${CHANGER} move drive ${DRIVE} slot $free_slot
+	fi
+	;;
+
+    load)
+	${MTX} -f ${CHANGER} move slot $((${SLOT}-1)) drive ${DRIVE}
+	rtn=$?
+	# Increase the sleep time if you have a slow device
+	sleep $SLEEP
+	exit $rtn
+	;;
+
+    list)
+	if [ "${SIMULATE_BARCODE}" = "true" ]; then
+	    if [ -f "$BARCODE_FILE" ]; then
+		cat $BARCODE_FILE | grep -v -e "^#" -e "^$"
+		exit 0
+	    else
+		echo "Barcode file $BARCODE_FILE missing ... exiting!"
+		exit 1
+	    fi
+	else
+	    ${MTX} -f ${CHANGER} status | grep "^slot .*: .*FULL>" | awk '{print $2}' | awk -F: '{print $1+1" "}' | tr -d "[\r\n]"
+	fi
+      ;;
+
+    loaded)
+	# echo "Request loaded"
+	${MTX} -f ${CHANGER} status -S > /tmp/mtx.$$
+	rtn=$?
+	# Try to get chio slot source from drive entry
+	SLOT=$(cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: <FULL> .*slot" | awk '{print $6+1}' | tr -d ">")
+	if [ -z "$SLOT" ]; then
+	    # This handles the case a source slot is not available (power on
+	    # of the changer with a drive loaded) and all other slots are
+	    # occupied with a tape!
+	    SLOT=$(cat /tmp/mtx.$$ | grep "^slot .*: <ACCESS>" | awk '{print $2+1}')
+	    if [ -z "$SLOT" ]; then
+		echo 0
+	    else
+		echo $SLOT
+	    fi
+	else
+	    echo $SLOT
+	fi
+	# All tapes are in the slots
+	#cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: .* source: <>" | awk "{print 0}"
+	rm -f /tmp/mtx.$$
+	exit $rtn
+	;;
+
+    slots)
+	# echo "Request slots"
+	${MTX} -f ${CHANGER} status | grep "^slot " | tail -1 | awk '{print $2+1}' | tr -d ":"
+	;;
+
+    *)
+	usage
+      ;;
+esac
diff --git a/sysutils/bacula11-server/files/patch-scripts_baculabackupreport.in b/sysutils/bacula11-server/files/patch-scripts_baculabackupreport.in
new file mode 100644
index 000000000000..b0c81a37b5f1
--- /dev/null
+++ b/sysutils/bacula11-server/files/patch-scripts_baculabackupreport.in
@@ -0,0 +1,8 @@
+--- scripts/baculabackupreport.in.orig	2021-03-29 18:24:27 UTC
++++ scripts/baculabackupreport.in
+@@ -1,4 +1,4 @@
+-#!/bin/dash
++#!/bin/sh
+ #
+ # baculabackupreport.sh
+ #
diff --git a/sysutils/bacula11-server/files/patch-src_baconfig.h b/sysutils/bacula11-server/files/patch-src_baconfig.h
new file mode 100644
index 000000000000..4cb8939db35c
--- /dev/null
+++ b/sysutils/bacula11-server/files/patch-src_baconfig.h
@@ -0,0 +1,13 @@
+--- src/baconfig.h.orig	2021-02-05 21:23:44 UTC
++++ src/baconfig.h
+@@ -45,6 +45,10 @@
+  #define tls_psk_default 0
+ #endif
+ 
++#ifndef ENODATA
++#define ENODATA EPIPE
++#endif
++
+ #ifndef ETIME
+ #define ETIME ETIMEDOUT
+ #endif
diff --git a/sysutils/bacula11-server/files/patch-src_console_Makefile.in b/sysutils/bacula11-server/files/patch-src_console_Makefile.in
new file mode 100644
index 000000000000..156449eedfef
--- /dev/null
+++ b/sysutils/bacula11-server/files/patch-src_console_Makefile.in
@@ -0,0 +1,11 @@
+--- src/console/Makefile.in.orig	2021-02-05 21:23:44 UTC
++++ src/console/Makefile.in
+@@ -128,7 +128,7 @@ uninstall:
+ depend:
+ 	@$(MV) Makefile Makefile.bak
+ 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@if test -f Makefile ; then \
+ 	    $(RMF) Makefile.bak; \
diff --git a/sysutils/bacula11-server/files/patch-src_dird_Makefile.in b/sysutils/bacula11-server/files/patch-src_dird_Makefile.in
new file mode 100644
index 000000000000..6bc7b8f72f22
--- /dev/null
+++ b/sysutils/bacula11-server/files/patch-src_dird_Makefile.in
@@ -0,0 +1,11 @@
+--- src/dird/Makefile.in.orig	2021-02-05 21:23:44 UTC
++++ src/dird/Makefile.in
+@@ -150,7 +150,7 @@ uninstall:
+ depend:
+ 	@$(MV) Makefile Makefile.bak
+ 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@if test -f Makefile ; then \
+ 	    $(RMF) Makefile.bak; \
diff --git a/sysutils/bacula11-server/files/patch-src_filed_Makefile.in b/sysutils/bacula11-server/files/patch-src_filed_Makefile.in
new file mode 100644
index 000000000000..1fec2120ece4
--- /dev/null
+++ b/sysutils/bacula11-server/files/patch-src_filed_Makefile.in
@@ -0,0 +1,11 @@
+--- src/filed/Makefile.in.orig	2021-02-24 01:52:05 UTC
++++ src/filed/Makefile.in
+@@ -193,7 +193,7 @@ uninstall:
+ depend:
+ 	@$(MV) Makefile Makefile.bak
+ 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+-	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++	@echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ 	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(LZO_INC) $(AFS_CFLAGS) $(GPFS_CFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ 	@if test -f Makefile ; then \
+ 	    $(RMF) Makefile.bak; \
diff --git a/sysutils/bacula11-server/files/patch-src_qt-console_bat.pro.in b/sysutils/bacula11-server/files/patch-src_qt-console_bat.pro.in
new file mode 100644
index 000000000000..1bca6f6d819b
--- /dev/null
+++ b/sysutils/bacula11-server/files/patch-src_qt-console_bat.pro.in
@@ -0,0 +1,11 @@
+--- src/qt-console/bat.pro.in.orig	2015-08-13 13:52:24 UTC
++++ src/qt-console/bat.pro.in
+@@ -19,7 +19,7 @@ TEMPLATE     = app
+ TARGET       = bat
+ DEPENDPATH  += .
+ INCLUDEPATH += .. . ./console ./restore ./select
+-LIBS        += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
++LIBS        += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@ -lintl
+ LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
+ LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
+ QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
diff --git a/sysutils/bacula11-server/files/pkg-deinstall.client.in b/sysutils/bacula11-server/files/pkg-deinstall.client.in
new file mode 100644
index 000000000000..27590d301e06
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-deinstall.client.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bacula port start/,/# Bacula port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BACULA_DIR} ]; then
+	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+	fi
+
+	if pw groupshow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac
diff --git a/sysutils/bacula11-server/files/pkg-deinstall.server.in b/sysutils/bacula11-server/files/pkg-deinstall.server.in
new file mode 100644
index 000000000000..05da0eb6a7f6
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-deinstall.server.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bacula port start/,/# Bacula port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BACULA_DIR} ]; then
+	    rmdir ${BACULA_DIR};
+	fi
+	if [ -d ${BACULA_DIR} ]; then
+	    echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+	fi
+
+	if pw usershow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
+	    echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac
diff --git a/sysutils/bacula11-server/files/pkg-install.client.in b/sysutils/bacula11-server/files/pkg-install.client.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-install.client.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bacula port start
+bacula-dir      9101/tcp   #Bacula director daemon
+bacula-fd       9102/tcp   #Bacula file daemon
+bacula-sd       9103/tcp   #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/bacula11-server/files/pkg-install.server.in b/sysutils/bacula11-server/files/pkg-install.server.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-install.server.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bacula port start
+bacula-dir      9101/tcp   #Bacula director daemon
+bacula-fd       9102/tcp   #Bacula file daemon
+bacula-sd       9103/tcp   #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/bacula11-server/files/pkg-message.client.in b/sysutils/bacula11-server/files/pkg-message.client.in
new file mode 100644
index 000000000000..cf425148025f
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-message.client.in
@@ -0,0 +1,10 @@
+[
+{ type: install
+  message: <<EOM
+NOTE:
+Sample files are installed in %%PREFIX%%/etc/bacula:
+
+  bconsole.conf.sample, bacula-fd.conf.sample
+EOM
+}
+]
diff --git a/sysutils/bacula11-server/files/pkg-message.server.in b/sysutils/bacula11-server/files/pkg-message.server.in
new file mode 100644
index 000000000000..fe6259186583
--- /dev/null
+++ b/sysutils/bacula11-server/files/pkg-message.server.in
@@ -0,0 +1,59 @@
+[
+{ type: install
+  message: <<EOM
+bacula server was installed
+
+A database upgrade is required if upgrading from Bacula < 9.0.
+See %%DATADIR%%/update_bacula_tables
+
+An auto-changer manipulation script based on FreeBSDs
+chio command is included and installed at
+
+  %%PREFIX%%/sbin/chio-bacula
+
+Please have a look at it if you want to use an
+autochanger. You have to configure the usage in
+
+  %%PREFIX%%/etc/bacula/bacula-dir.conf
+
+Take care of correct permissions for changer and
+tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
+they must be accessible by user bacula.
+
+Due to lack of some features in the FreeBSD tape driver
+implementation you MUST add some OS dependent options to
+the bacula-sd.conf file:
+
+  Hardware End of Medium = no;
+  Backward Space Record  = no;
+  Backward Space File    = no;
+
+With 2 filemarks at EOT (see man mt):
+  Fast Forward Space File = no;
+  BSF at EOM = yes;
+  TWO EOF    = yes;
+
+With 1 filemarks at EOT (see man mt):
+  Fast Forward Space File = yes;
+  BSF at EOM = no;
+  TWO EOF   = no;
+
+NOTE: YOU CAN SWITCH EOT model ONLY when starting
+      from scratch with EMPTY tapes.
+
+It is also important that all the scripts accessed
+by RunBeforeJob and RunAfterJob will be executed by
+the user bacula.  Check your permissions.
+
+For USB support read the bacula manual. It could be necessary
+to configure/compile a new kernel.
+
+Look at %%PREFIX%%/share/bacula/update_bacula_tables for
+database update procedure. Details can be found in the
+ReleaseNotes
+
+If you are using sqlite you need to run the make_sqlite_tables script as
+the bacula user. Do this using 'sudo su -m bacula'.
+EOM
+}
+]
diff --git a/sysutils/bacula11-server/pkg-descr b/sysutils/bacula11-server/pkg-descr
new file mode 100644
index 000000000000..20aa3c67feda
--- /dev/null
+++ b/sysutils/bacula11-server/pkg-descr
@@ -0,0 +1,11 @@
+Bacula is a set of computer programs that permit you (or the system
+administrator) to manage backup, recovery, and verification of
+computer data across a network of computers of different kinds.
+In technical terms, it is a network Client/Server based backup program.
+Bacula is relatively easy to use and efficient, while offering many
+advanced storage management features that make it easy to find and
+recover lost or damaged files. Due to its modular design, Bacula is
+scalable from small single computer systems to systems consisting of
+hundreds of computers located over a large network.
+
+WWW: https://www.bacula.org/
diff --git a/sysutils/bacula11-server/pkg-plist b/sysutils/bacula11-server/pkg-plist
new file mode 100644
index 000000000000..363305c0b7b1
--- /dev/null
+++ b/sysutils/bacula11-server/pkg-plist
@@ -0,0 +1,92 @@
+@sample(,bacula,640) %%ETCDIR%%/bacula-barcodes.sample
+@sample(,bacula,) %%ETCDIR%%/bacula-dir.conf.sample
+@sample(,bacula,) %%ETCDIR%%/bacula-sd.conf.sample
+lib/libbaccats-%%LIB_VERSION%%.so
+lib/libbaccats.so
+%%MYSQL%%lib/libbaccats-mysql-%%LIB_VERSION%%.so
+%%PGSQL%%lib/libbaccats-postgresql-%%LIB_VERSION%%.so
+%%SQLITE3%%lib/libbaccats-sqlite3-%%LIB_VERSION%%.so
+%%MYSQL%%lib/libbaccats-mysql.so
+%%PGSQL%%lib/libbaccats-postgresql.so
+%%SQLITE3%%lib/libbaccats-sqlite3.so
+lib/libbacsd-%%LIB_VERSION%%.so
+lib/libbacsd.so
+lib/libbacsql-%%LIB_VERSION%%.so
+lib/libbacsql.so
+sbin/bacula
+sbin/bacula-dir
+sbin/bacula-sd
+sbin/bcopy
+sbin/bdirjson
+sbin/bsdjson
+sbin/bextract
+sbin/bls
+sbin/bregex
+sbin/bscan
+sbin/bsmtp
+sbin/btape
+sbin/btraceback
+sbin/bwild
+sbin/chio-bacula
+sbin/dbcheck
+@owner bacula
+@group bacula
+%%DATADIR%%/bacula
+%%DATADIR%%/bacula-ctl-dir
+%%DATADIR%%/bacula-ctl-fd
+%%DATADIR%%/bacula-ctl-sd
+%%DATADIR%%/bacula-tray-monitor.desktop
+%%DATADIR%%/baculabackupreport
+%%DATADIR%%/bacula_config
+%%DATADIR%%/bconsole
+%%DATADIR%%/btraceback.dbx
+%%DATADIR%%/btraceback.gdb
+%%DATADIR%%/btraceback.mdb
+%%DATADIR%%/create_bacula_database
+%%DATADIR%%/isworm
+%%DATADIR%%/tapealert
+%%MYSQL%%%%DATADIR%%/create_mysql_database
+%%PGSQL%%%%DATADIR%%/create_postgresql_database
+%%SQLITE3%%%%DATADIR%%/create_sqlite3_database
+%%DATADIR%%/delete_catalog_backup
+%%DATADIR%%/disk-changer
+%%DATADIR%%/drop_bacula_database
+%%DATADIR%%/drop_bacula_tables
+%%MYSQL%%%%DATADIR%%/drop_mysql_database
+%%PGSQL%%%%DATADIR%%/drop_postgresql_database
+%%SQLITE3%%%%DATADIR%%/drop_sqlite3_database
+%%MYSQL%%%%DATADIR%%/drop_mysql_tables
+%%PGSQL%%%%DATADIR%%/drop_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/drop_sqlite3_tables
+%%DATADIR%%/grant_bacula_privileges
+%%MYSQL%%%%DATADIR%%/grant_mysql_privileges
+%%PGSQL%%%%DATADIR%%/grant_postgresql_privileges
+%%SQLITE3%%%%DATADIR%%/grant_sqlite3_privileges
+%%DATADIR%%/make_bacula_tables
+%%DATADIR%%/make_catalog_backup
+%%DATADIR%%/make_catalog_backup.pl
+%%MYSQL%%%%DATADIR%%/make_mysql_tables
+%%PGSQL%%%%DATADIR%%/make_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/make_sqlite3_tables
+%%DATADIR%%/mtx-changer
+%%DATADIR%%/mtx-changer.conf
+%%DATADIR%%/update_bacula_tables
+%%MYSQL%%%%DATADIR%%/update_mysql_tables
+%%PGSQL%%%%DATADIR%%/update_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/update_sqlite3_tables
+@owner
+@group
+man/man1/bsmtp.1.gz
+man/man1/bacula-tray-monitor.1.gz
+man/man8/bacula-dir.8.gz
+man/man8/bacula-sd.8.gz
+man/man8/bcopy.8.gz
+man/man8/bextract.8.gz
+man/man8/bls.8.gz
+man/man8/bregex.8.gz
+man/man8/bscan.8.gz
+man/man8/btape.8.gz
+man/man8/btraceback.8.gz
+man/man8/bwild.8.gz
+man/man8/dbcheck.8.gz
+@dir(bacula,bacula,)  %%BACULA_DIR%%
diff --git a/sysutils/bacula11-server/pkg-plist.client b/sysutils/bacula11-server/pkg-plist.client
new file mode 100644
index 000000000000..e32392a52f5c
--- /dev/null
+++ b/sysutils/bacula11-server/pkg-plist.client
@@ -0,0 +1,20 @@
+@sample(,bacula,640) %%ETCDIR%%/bacula-fd.conf.sample
+@sample(,bacula,640) %%ETCDIR%%/bconsole.conf.sample
+lib/libbac-%%LIB_VERSION%%.so
+lib/libbac.so
+lib/libbaccfg-%%LIB_VERSION%%.so
+lib/libbaccfg.so
+lib/libbacfind-%%LIB_VERSION%%.so
+lib/libbacfind.so
+lib/bpipe-fd.so
+man/man8/bacula.8.gz
+man/man8/bacula-fd.8.gz
+man/man8/bconsole.8.gz
+sbin/bacula-fd
+sbin/bbconsjson
+sbin/bfdjson
+@(,bacula,750) sbin/bconsole
+@dir(bacula,bacula,)  %%BACULA_DIR%%
+@dir share/bacula
+@dir(,bacula,) %%ETCDIR%%
+@sample(,bacula,644) share/bacula/query.sql.sample
diff --git a/sysutils/bacula9-client-static/Makefile b/sysutils/bacula9-client-static/Makefile
index 763fa8f13e7b..c1372e56682a 100644
--- a/sysutils/bacula9-client-static/Makefile
+++ b/sysutils/bacula9-client-static/Makefile
@@ -1,10 +1,12 @@
-# $FreeBSD$
-
 PORTNAME=	bacula
 PKGNAMESUFFIX=	9-client-static
 
 COMMENT=	Network backup solution (static client)
 
+BROKEN_aarch64=		Fails to link: missing sbrk
+BROKEN_riscv64=		Fails to link: missing sbrk
+BROKEN_SSL=	libressl
+
 WITH_CLIENT_ONLY=yes
 PLIST=		${.CURDIR}/pkg-plist
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server
@@ -22,8 +24,4 @@ CONFIGURE_ARGS+=	--enable-client-only \
 			--disable-build-dird \
 			--disable-build-stored
 
-BROKEN_aarch64=		Fails to link: missing sbrk
-
-BROKEN_SSL=	libressl
-
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula9-client/Makefile b/sysutils/bacula9-client/Makefile
index 7a709d2cef6b..57ae8f72a757 100644
--- a/sysutils/bacula9-client/Makefile
+++ b/sysutils/bacula9-client/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
-
 PORTNAME=	bacula
 PKGNAMESUFFIX=	9-client
 
 COMMENT=	Network backup solution (client)
 
+BROKEN_aarch64=		Fails to link: missing sbrk
+BROKEN_riscv64=		Fails to link: missing sbrk
+
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bacula-fd
 
@@ -13,6 +14,4 @@ MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server
 
 OPTIONS_DEFINE=	NLS PYTHON IPV6
 
-BROKEN_aarch64=		Fails to link: missing sbrk
-
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile
index e459d24e0206..3e6619834c9b 100644
--- a/sysutils/bacula9-docs/Makefile
+++ b/sysutils/bacula9-docs/Makefile
@@ -1,14 +1,14 @@
 # Created by: Dan Langille <dan@langille.org>
-# $FreeBSD$
 
 PORTNAME=	bacula
-PORTVERSION=	9.4.3
+PORTVERSION=	9.6.7
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	9-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula-* bacula5-*
+CONFLICTS=	bacula-* bacula5-* bacula11-*
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Bacula document set
diff --git a/sysutils/bacula9-docs/distinfo b/sysutils/bacula9-docs/distinfo
index f7e63e0f625e..21b30b616053 100644
--- a/sysutils/bacula9-docs/distinfo
+++ b/sysutils/bacula9-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558727998
-SHA256 (bacula-docs-9.4.3.tar.bz2) = 3838ec47e8f399e7daa46a746f263cab2e58e77f489eb60cb626a0ae4e8f30f1
-SIZE (bacula-docs-9.4.3.tar.bz2) = 57124459
+TIMESTAMP = 1607966527
+SHA256 (bacula-docs-9.6.7.tar.bz2) = d5b7e6adfde83b7b47e21184baa695819cab0699570b9426289ac9e87977f919
+SIZE (bacula-docs-9.6.7.tar.bz2) = 58633475
diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile
index 7da2a7ffc682..638c31ad864d 100644
--- a/sysutils/bacula9-server/Makefile
+++ b/sysutils/bacula9-server/Makefile
@@ -1,8 +1,7 @@
 # Created by: Dmitry Sivachenko <demon@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	bacula
-PORTVERSION=	9.4.3
+PORTVERSION=	9.6.7
 PORTREVISION=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
@@ -17,9 +16,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES+=		libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in
-python_OLD_CMD=	@PYTHON@
 
-CONFLICTS?=	bacula5-server-* bacula-server-*
+CONFLICTS?=	bacula11-server-* bacula5-server-* bacula-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 
@@ -31,10 +29,10 @@ PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	MTX PYTHON NLS IPV6
+OPTIONS_DEFINE?=	MTX NLS IPV6
 MTX_DESC=		Install mtx for control of autochanger devices
 
 .if ${PKGNAMESUFFIX} == "9-server"
@@ -47,10 +45,6 @@ OPTIONS_SUB=		yes
 
 .if ${PKGNAMESUFFIX} == "9-client" || ${PKGNAMESUFFIX} == "9-server"  #Till end of the file
 
-PYTHON_USES=		python
-PYTHON_CONFIGURE_ON=	--with-python=yes
-PYTHON_BROKEN=	Does not package
-
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbac-${PORTVERSION}.so:sysutils/bacula9-client
 USE_RC_SUBR?=	bacula-dir bacula-sd
@@ -133,18 +127,12 @@ MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.pre.mk>
 
-.if ${readline_ARGS} == "port"
-readline_CONFIGURE=	${LOCALBASE}
-.else
-readline_CONFIGURE=	yes
-.endif
-
 # if IPv6 is not in the kernel, it generates many errors
 .if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-CONFIGURE_ARGS+=	--with-readline=${readline_CONFIGURE}
+CONFIGURE_ARGS+=	--with-readline=${LOCALBASE}
 
 .if defined(WITH_CLIENT_ONLY)
 MP8+=	bacula.8 bacula-fd.8 bconsole.8
@@ -184,9 +172,6 @@ post-patch:
 
 .if !target(post-install)
 post-install:
-.if ! ${PORT_OPTIONS:MPYTHON}
-	${RM} ${STAGEDIR}${DATADIR}/dvd-handler
-.endif
 .if defined(WITH_CLIENT_ONLY)
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
diff --git a/sysutils/bacula9-server/distinfo b/sysutils/bacula9-server/distinfo
index 52733e33a55d..987744bde86c 100644
--- a/sysutils/bacula9-server/distinfo
+++ b/sysutils/bacula9-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558725751
-SHA256 (bacula-9.4.3.tar.gz) = 4fb41cc460dcaa3674d2ceba2ef0de0fbd8bb56e413857a1c9fe60c2dca54b1d
-SIZE (bacula-9.4.3.tar.gz) = 4167892
+TIMESTAMP = 1607965673
+SHA256 (bacula-9.6.7.tar.gz) = df0f8525ecdba380e74b537ca71adf3b7596593f02189b59ab0ebffc85ccc8de
+SIZE (bacula-9.6.7.tar.gz) = 4168102
diff --git a/sysutils/bacula9-server/files/bacula-dir.in b/sysutils/bacula9-server/files/bacula-dir.in
index 49086897bd68..1825c924306e 100644
--- a/sysutils/bacula9-server/files/bacula-dir.in
+++ b/sysutils/bacula9-server/files/bacula-dir.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: bacula_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
diff --git a/sysutils/bacula9-server/files/bacula-fd.in b/sysutils/bacula9-server/files/bacula-fd.in
index 70add50a1915..d011131d8790 100644
--- a/sysutils/bacula9-server/files/bacula-fd.in
+++ b/sysutils/bacula9-server/files/bacula-fd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: bacula_fd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/bacula9-server/files/bacula-sd.in b/sysutils/bacula9-server/files/bacula-sd.in
index 1c37c68fd6d5..2020f846f1c7 100644
--- a/sysutils/bacula9-server/files/bacula-sd.in
+++ b/sysutils/bacula9-server/files/bacula-sd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: bacula_sd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/bacula9-server/pkg-plist b/sysutils/bacula9-server/pkg-plist
index e493bbfefd7d..363305c0b7b1 100644
--- a/sysutils/bacula9-server/pkg-plist
+++ b/sysutils/bacula9-server/pkg-plist
@@ -58,7 +58,6 @@ sbin/dbcheck
 %%MYSQL%%%%DATADIR%%/drop_mysql_tables
 %%PGSQL%%%%DATADIR%%/drop_postgresql_tables
 %%SQLITE3%%%%DATADIR%%/drop_sqlite3_tables
-%%PYTHON%%%%DATADIR%%/dvd-handler
 %%DATADIR%%/grant_bacula_privileges
 %%MYSQL%%%%DATADIR%%/grant_mysql_privileges
 %%PGSQL%%%%DATADIR%%/grant_postgresql_privileges
diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
index 83e4f4b7f059..ae97fa9d036d 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	baloo-widgets
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
 CATEGORIES=	sysutils kde kde-applications
@@ -15,6 +13,7 @@ USE_QT=		concurrent core dbus gui network testlib widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS
+# Override shared library version
+KDE_APPLICATIONS_SHLIB_VER=	21.4.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/baloo-widgets/distinfo b/sysutils/baloo-widgets/distinfo
index 1ceb1da74f3f..7df67593d182 100644
--- a/sysutils/baloo-widgets/distinfo
+++ b/sysutils/baloo-widgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567537361
-SHA256 (KDE/applications/19.08.1/baloo-widgets-19.08.1.tar.xz) = 83429a70de735edc4714dc1b6f1a5a8c7d3d68a93165e98d2cadeecafa82af7b
-SIZE (KDE/applications/19.08.1/baloo-widgets-19.08.1.tar.xz) = 262056
+TIMESTAMP = 1620741558
+SHA256 (KDE/release-service/21.04.1/baloo-widgets-21.04.1.tar.xz) = ea3247575b8825237b61009c9764f788e80324783f8f13cf20a5bcfabdcdd72e
+SIZE (KDE/release-service/21.04.1/baloo-widgets-21.04.1.tar.xz) = 262260
diff --git a/sysutils/baloo-widgets/pkg-plist b/sysutils/baloo-widgets/pkg-plist
index 534ab53df335..fcc9485ffdec 100644
--- a/sysutils/baloo-widgets/pkg-plist
+++ b/sysutils/baloo-widgets/pkg-plist
@@ -12,7 +12,7 @@ lib/cmake/KF5BalooWidgets/KF5BalooWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KF5BalooWidgets/KF5BalooWidgetsTargets.cmake
 lib/libKF5BalooWidgets.so
 lib/libKF5BalooWidgets.so.5
-lib/libKF5BalooWidgets.so.19.8.1
+lib/libKF5BalooWidgets.so.%%KDE_APPLICATIONS_SHLIB_VER%%
 %%QT_PLUGINDIR%%/baloofilepropertiesplugin.so
 %%QT_PLUGINDIR%%/kf5/kfileitemaction/tagsfileitemaction.so
 share/kservices5/baloofilepropertiesplugin.desktop
@@ -64,3 +64,4 @@ share/locale/ug/LC_MESSAGES/baloowidgets5.mo
 share/locale/uk/LC_MESSAGES/baloowidgets5.mo
 share/locale/zh_CN/LC_MESSAGES/baloowidgets5.mo
 share/locale/zh_TW/LC_MESSAGES/baloowidgets5.mo
+share/qlogging-categories5/baloo-widgets.categories
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index 3be57053ed40..9753bcb76c26 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -1,27 +1,24 @@
 # Created by: Olivier Duchateau
-# $FreeBSD$
 
 PORTNAME=	bamf
-PORTVERSION=	0.5.3
-PORTREVISION=	2
+PORTVERSION=	0.5.4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpadlibrarian.net/280921055/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	duchateau.olivier@gmail.com
 COMMENT=	BAMF Application Matching Framework
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
 BUILD_DEPENDS=	vapigen:lang/vala \
-	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \
-	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR}
+	${PYTHON_PKGNAMEPREFIX}lxml>=4.4.2:devel/py-lxml@${PY_FLAVOR}
 LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
-	libdbus-glib-1.so:devel/dbus-glib \
 	libstartup-notification-1.so:x11/startup-notification
 
-USES=		gettext-runtime gmake libtool pathfix pkgconfig python:2.7
+USES=		compiler:c11 gettext-runtime gmake gnome libtool pathfix \
+		pkgconfig python:3.5+,build xorg
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
 USE_XORG=	x11
@@ -29,11 +26,14 @@ INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=--disable-headless-tests \
 	--disable-gtktest \
+	--disable-gcov \
 	--disable-gtk-doc-html \
-	--without-html-dir
+	--without-html-dir \
+	--enable-export-actions-menu=no \
+	--enable-introspection=yes
 
 post-patch:
-	${FIND} ${WRKSRC} -type f -name 'Makefile.in' \
-		| ${XARGS} ${REINPLACE_CMD} -e 's| -Wl,-Bsymbolic-functions||'
+	${REINPLACE_CMD} -e 's| -Wl,-Bsymbolic-functions||' \
+		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/bamf/distinfo b/sysutils/bamf/distinfo
index 26c942801091..dd62829c8271 100644
--- a/sysutils/bamf/distinfo
+++ b/sysutils/bamf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472504601
-SHA256 (bamf-0.5.3.tar.gz) = 340d7b5a463afcd33135ae73a7e4cf6a93a4daaf6f72b70abc09dc66d18a3b14
-SIZE (bamf-0.5.3.tar.gz) = 633666
+TIMESTAMP = 1579354448
+SHA256 (bamf-0.5.4.tar.gz) = 5bb87a5bf46ab1fc9a229a851c0ee4f610d943716a7c83d318f6a8f50d76beb3
+SIZE (bamf-0.5.4.tar.gz) = 638756
diff --git a/sysutils/bamf/files/patch-configure b/sysutils/bamf/files/patch-configure
index ce89b2311b6f..eaea4dd11aec 100644
--- a/sysutils/bamf/files/patch-configure
+++ b/sysutils/bamf/files/patch-configure
@@ -1,11 +1,24 @@
---- configure.orig	2016-08-25 15:18:48 UTC
+--- configure.orig	2018-11-07 22:39:51 UTC
 +++ configure
-@@ -15233,7 +15233,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -14653,10 +14653,10 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtester2xunit dependencies" >&5
+ $as_echo_n "checking for gtester2xunit dependencies... " >&6; }
+-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
++if !($PYTHON -c "import lxml" 2> /dev/null); then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-  as_fn_error $? "You need to install python-libxslt1 and python-libxml2" "$LINENO" 5;
++  as_fn_error $? "You need to install python-lxml" "$LINENO" 5;
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -15374,7 +15374,7 @@ rm -f core conftest.err conftest.$ac_objext \
    rm -f conf.gtktest
  
  
--CFLAGS="$CFLAGS -Wall -Werror -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
-+CFLAGS="$CFLAGS -Wall -Wformat-security -Winit-self -Wimplicit-function-declaration"
+-CFLAGS="$CFLAGS -Wall -Werror -Wno-error=deprecated-declarations -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wimplicit-function-declaration -lm"
++CFLAGS="$CFLAGS -Wall -Winit-self -Warray-bounds -Wimplicit-function-declaration"
  
  
  
diff --git a/sysutils/bamf/files/patch-tests_gtester2xunit.py b/sysutils/bamf/files/patch-tests_gtester2xunit.py
new file mode 100644
index 000000000000..585123a4e699
--- /dev/null
+++ b/sysutils/bamf/files/patch-tests_gtester2xunit.py
@@ -0,0 +1,27 @@
+--- tests/gtester2xunit.py.orig	2018-11-07 22:39:11 UTC
++++ tests/gtester2xunit.py
+@@ -1,18 +1,17 @@
+ #! /usr/bin/python
+ from argparse import ArgumentParser
+-import libxslt
+-import libxml2
+ import sys
+ import os
++from lxml import etree
+ 
+ XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
+ 
+ def transform_file(input_filename, output_filename, xsl_file):
+-    gtester = libxml2.parseFile(xsl_file)
+-    style = libxslt.parseStylesheetDoc(gtester)
+-    doc = libxml2.parseFile(input_filename)
+-    result = style.applyStylesheet(doc, None)
+-    result.saveFormatFile(filename=output_filename, format=True)
++    gtester = etree.parse(xsl_file)
++    style = etree.XSLT(gtester)
++    doc = etree.parse(input_filename)
++    result = style(doc)
++    result.write(filename=output_filename, format=True)
+ 
+ 
+ def get_output_filename(input_filename):
diff --git a/sysutils/bareos-client-static/Makefile b/sysutils/bareos-client-static/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-client-static/Makefile
+++ /dev/null
diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile
index c08da710ea5c..d7ac284bf18c 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -1,13 +1,9 @@
-# $FreeBSD$
-
 PORTNAME=	bareos
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-
-CONFLICTS=	bareos16-client-* bareos17-client-*
+CONFLICTS=	bareos19-client-* bareos18-client-* bareos17-client-*
 
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bareos-fd
@@ -15,7 +11,12 @@ USE_RC_SUBR=	bareos-fd
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 
-OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
-LMDB_DESC=	Enable build of LMDB support
+OPTIONS_GROUP=	PLUGINS
+OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
+OPTIONS_DEFINE=	NLS PYTHON SCSICRYPTO
+
+CEPHFS_DESC=	CEPHFS fd plugin support
+GFAPI_DESC=	GFAPI fd plugin support
+RADOS_DESC=	RADOS fd plugin support
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos-docs/Makefile b/sysutils/bareos-docs/Makefile
deleted file mode 100644
index ea28a8df4ee4..000000000000
--- a/sysutils/bareos-docs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	bareos
-PORTVERSION=	18.2.6
-CATEGORIES=	sysutils
-MASTER_SITES=	http://doc.bareos.org/master/
-PKGNAMESUFFIX=	-docs
-DISTFILES=	${PORTNAME}-manual-main-reference.pdf
-
-MAINTAINER=	acm@FreeBSD.org
-COMMENT=	Bareos document set (PDF)
-
-NO_BUILD=	yes
-
-PORTDOCS=	*.pdf
-
-OPTIONS_DEFINE=	DOCS
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-	${CP} ${DISTDIR}/${PORTNAME}-manual-main-reference.pdf ${WRKSRC}
-
-do-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-manual-main-reference.pdf ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/bareos-docs/distinfo b/sysutils/bareos-docs/distinfo
deleted file mode 100644
index 1b13a1d5dfb1..000000000000
--- a/sysutils/bareos-docs/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1557378994
-SHA256 (bareos-manual-main-reference.pdf) = 442525744a64da2281bfa732909434bfc2f8dadabea1b2925136b122a8ce19a4
-SIZE (bareos-manual-main-reference.pdf) = 3943162
diff --git a/sysutils/bareos-docs/pkg-descr b/sysutils/bareos-docs/pkg-descr
deleted file mode 100644
index 9e9da86f358f..000000000000
--- a/sysutils/bareos-docs/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
-software to backup, archive and restore files from all major operating systems.
-The fork was founded 2010 out of the bacula.org project. The fork has been
-actively developed and many new features have been added.
-
-This port installs the latest documentation for Bareos.
-
-WWW: http://www.bareos.org/
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index 4843210595f8..77f41f1f89b5 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,9 +1,7 @@
-# $FreeBSD$
-
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	18.2.6
-PORTREVISION?=	1
+DISTVERSION=	20.0.0
+PORTREVISION?=	3
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
@@ -14,14 +12,15 @@ COMMENT?=	Backup archiving recovery open sourced (server)
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
-CONFLICTS?=	bacula17*-server-* bareos16-server-*
+CONFLICTS?=	bacula19*-server bacula18*-server-* bareos17-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
-USES+=		cmake:insource compiler:c++11-lang pkgconfig readline:port \
+USES+=		cmake compiler:c++11-lang localbase perl5 pkgconfig readline \
 		shebangfix
 USE_GITHUB=	yes
+USE_PERL5=	run
 
 USERS=		bareos
 GROUPS=		${USERS}
@@ -45,11 +44,18 @@ NDMP_DESC=		Enable build of NDMP support
 SCSICRYPTO_DESC=	Build LTO AME crypto plugin
 
 .if ${PKGNAMESUFFIX} == "-server"
-OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
-OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
+OPTIONS_GROUP=  BACKENDS
+OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
+OPTIONS_DEFINE=		MTX PYTHON LMDB NDMP NLS SCSICRYPTO
+OPTIONS_DEFAULT+=	LMDB PGSQL SCSICRYPTO
 OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
 OPTIONS_SINGLE+=		DATABASE
+BACKENDS_DESC= 		Storage backends
 DATABASE_DESC=		Database support
+CEPHFS_DESC=	CEPHFS backend support
+GFAPI_DESC=	GFAPI backend support
+LMDB_DESC=	Enable faster accurate backup support
+RADOS_DESC=	RADOS backend support
 
 NDMP_CMAKE_ON=	-Dndmp=ON
 NDMP_CMAKE_OFF=	-Dndmp=OFF
@@ -66,7 +72,7 @@ SCSICRYPTO_CMAKE_ON=	-Dscsi-crypto=ON
 SCSICRYPTO_CMAKE_OFF=	-Dscsi-crypto=OFF
 
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
-PYTHON_USES=		python:2.7
+PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-Dpython=ON
 PYTHON_CMAKE_OFF=	-Dpython=OFF
 PYTHON_PLUGIN=		yes
@@ -104,21 +110,23 @@ CMAKE_ARGS+=	-Dtcp-wrappers=ON \
 		-Dsbin-perm=755 \
 		-Ddb_user=bareos \
 		-Dbaseport=9101 \
-		-Dpiddir=/var/run/bareos \
+		-Dpiddir=/var/run/bareos
 
 .if defined(WITH_CLIENT_ONLY)
+CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
+
+CMAKE_ARGS+=	-Dfd-user=root \
+		-Dfd-group=wheel \
+		-Dlmdb=ON
+.else
 LMDB_CMAKE_ON=	-Dlmdb=ON
 LMDB_CMAKE_OFF=	-Dlmdb=OFF
 LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
-CMAKE_ARGS+=	-Dfd-user=root \
-		-Dfd-group=wheel
-.else
 CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
 		-Ddir-group=${BAREOS_GROUP} \
 		-Dsd-user=${BAREOS_USER} \
-		-Dsd-group=operator \
-		-Dlmdb=OFF
+		-Dsd-group=operator
 .endif
 
 # The user/group IDs below are registered, see
@@ -140,6 +148,12 @@ SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
 
 NLS_USES=		gettext
 NLS_CMAKE_ON=		-Dnls=ON
+CEPHFS_CMAKE_ON=	-Dcephfs=ON
+CEPHFS_LIB_DEPENDS=	libcephfs.so:net/ceph14
+GFAPI_CMAKE_ON=		-Dgfapi=ON
+GFAPI_LIB_DEPENDS=	libglusterfs.so:net/glusterfs
+RADOS_CMAKE_ON=		-Drados=ON -Dcephfs=ON
+RADOS_LIB_DEPENDS=	librados.so:net/ceph14
 
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
@@ -157,7 +171,7 @@ CMAKE_ARGS+=	-Dbuild-dird=ON \
 # Server default database
 
 MYSQL_CMAKE_ON=		-Dmysql=ON
-MYSQL_USE=	MYSQL=yes
+MYSQL_USES=	mysql
 SQLITE3_CMAKE_ON=	-Dsqlite3=ON
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CMAKE_ON=		-Dpostgresql=ON
@@ -192,9 +206,9 @@ MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
-	@${REINPLACE_CMD}  '21d' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD}  '76,79d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "-server"
-	@${REINPLACE_CMD}  '25d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
+	@${REINPLACE_CMD}  '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
 .endif
 
 post-extract:
diff --git a/sysutils/bareos-server/Makefile.common b/sysutils/bareos-server/Makefile.common
index f2719024d8ef..7bad4fc0eb8d 100644
--- a/sysutils/bareos-server/Makefile.common
+++ b/sysutils/bareos-server/Makefile.common
@@ -1,5 +1,6 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
-# $FreeBSD$
+post-patch:
+	@${REINPLACE_CMD}  '76,79d' ${WRKSRC}/CMakeLists.txt
 
 post-build:
 .if ${PKGNAMEPREFIX} == "nagios-check_"
@@ -29,7 +30,7 @@ do-install:
 .for d in client director monitor storage
 	${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
 .endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/core/src/images/bareos_1.png ${STAGEDIR}${PREFIX}/share/pixmaps/bareos-tray-monitor.png
 	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
 .endif
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index a276c7153dc6..cb4c03d02b24 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556169589
-SHA256 (bareos-bareos-Release-18.2.6_GH0.tar.gz) = 43ff0546d4d5486bc70db90ccb7fb1f6a3ac3f9b7293de010d2c300b548056d8
-SIZE (bareos-bareos-Release-18.2.6_GH0.tar.gz) = 9991951
+TIMESTAMP = 1608160006
+SHA256 (bareos-bareos-Release-20.0.0_GH0.tar.gz) = c66914a19dbd75c214f559b55830ab8bf468d02f50fd85694fe190153fd5695d
+SIZE (bareos-bareos-Release-20.0.0_GH0.tar.gz) = 13325939
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in
index 1d92025ae9a1..86b62370cbb7 100644
--- a/sysutils/bareos-server/files/bareos-dir.in
+++ b/sysutils/bareos-server/files/bareos-dir.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/bareos-server/files/bareos-dir.in 323275 2013-07-19 09:44:58Z rm $
-#
+
 # PROVIDE: bareos_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
diff --git a/sysutils/bareos-server/files/bareos-fd.in b/sysutils/bareos-server/files/bareos-fd.in
index 2a45ee7dfb47..54647786b12c 100644
--- a/sysutils/bareos-server/files/bareos-fd.in
+++ b/sysutils/bareos-server/files/bareos-fd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/bacula5-server/files/bacula-fd.in 323275 2013-07-19 09:44:58Z rm $
-#
+
 # PROVIDE: bareos_fd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/bareos-server/files/bareos-sd.in b/sysutils/bareos-server/files/bareos-sd.in
index 9c9df6de204b..a5efe78e80f7 100644
--- a/sysutils/bareos-server/files/bareos-sd.in
+++ b/sysutils/bareos-server/files/bareos-sd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/bacula5-server/files/bacula-sd.in 323486 2013-07-22 17:51:39Z rm $
-#
+
 # PROVIDE: bareos_sd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/bareos-server/files/patch-autoconf_Make.common.in b/sysutils/bareos-server/files/patch-autoconf_Make.common.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-autoconf_Make.common.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-configure b/sysutils/bareos-server/files/patch-configure
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-configure
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-core-CMakeLists.txt b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
index 0d938478efac..7adbdb29fefa 100644
--- a/sysutils/bareos-server/files/patch-core-CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
@@ -1,32 +1,43 @@
---- core/CMakeLists.txt	2019-02-13 09:25:55.000000000 -0500
-+++ core/CMakeLists.txt	2019-05-10 14:14:16.122670000 -0500
-@@ -116,7 +116,9 @@
-    set(PSCMD "ps -ax -o pid,command")
-    include_directories(/usr/local/include)
-    link_directories(/usr/local/lib)
--   link_libraries(intl)
-+   IF(nls)
-+     link_libraries(intl)
-+   ENDIF()
+--- core/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
++++ core/CMakeLists.txt	2020-12-26 21:28:44.141734000 -0500
+@@ -256,7 +256,9 @@
+   set(PSCMD "ps -ax -o pid,command")
+   include_directories(/usr/local/include)
+   link_directories(/usr/local/lib)
+-  link_libraries(intl)
++  IF(nls)
++    link_libraries(intl)
++  ENDIF()
  endif()
  
- IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-@@ -173,7 +175,9 @@
-    add_definitions("-D_FILE_OFFSET_BITS=64")
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -323,8 +325,11 @@
+   add_definitions("-D_FILE_OFFSET_BITS=64")
  endif()
  
--INCLUDE(FindIntl)
+-include(FindIntl)
+ 
 +IF(nls)
 +  INCLUDE(FindIntl)
 +ENDIF()
- 
- IF(developer)
-    add_definitions("-DDEVELOPER=1")
-@@ -576,7 +580,6 @@
++
+ if(developer)
+   add_definitions("-DDEVELOPER=1")
+ endif()
+@@ -347,7 +352,7 @@
+ if(NOT client-only)
+   # droplet does not build on solaris because of sys/cdefs.h: No such file or
+   # directory
+-  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS|FreeBSD")
+     if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/droplet/CMakeLists.txt)
+       message(
+         FATAL_ERROR
+@@ -771,7 +776,6 @@
  
  add_subdirectory(scripts)
  add_subdirectory(manpages)
 -add_subdirectory(platforms)
  add_subdirectory(src)
  
- STRING(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S")
+ include(BareosLocalBuildDefinitions OPTIONAL
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake
new file mode 100644
index 000000000000..e439a0254191
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake
@@ -0,0 +1,39 @@
+--- core/cmake/BareosCheckIncludes.cmake	2020-12-16 02:46:16.000000000 -0500
++++ core/cmake/BareosCheckIncludes.cmake	2020-12-23 22:25:00.323963000 -0500
+@@ -60,19 +60,25 @@
+ check_include_files(sys/proplist.h HAVE_SYS_PROPLIST_H)
+ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H)
+ 
+-include(CheckSymbolExists)
+-include(CMakePushCheckState)
+-cmake_push_check_state()
+-set(CMAKE_REQUIRED_LIBRARIES cephfs)
+-check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX)
+-cmake_pop_check_state()
++if(cephfs)
++  include(CheckSymbolExists)
++  include(CMakePushCheckState)
++  cmake_push_check_state()
++  set(CMAKE_REQUIRED_LIBRARIES cephfs)
++  check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX)
++  cmake_pop_check_state()
++endif()
+ 
+-check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H)
+-check_include_files(
+-  radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H
+-)
++if(rados)
++  check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H)
++  check_include_files(
++    radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H
++  )
++endif()
+ 
+-check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
++if(gfapi)
++  check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
++endif()
+ 
+ check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H)
+ 
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
index 8ad6bb9c6882..ee5398a6018d 100644
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
@@ -1,24 +1,93 @@
---- core/cmake/BareosFindAllLibraries.cmake	2019-05-10 00:27:21.421777000 -0500
-+++ core/cmake/BareosFindAllLibraries.cmake	2019-05-10 00:28:47.016424000 -0500
-@@ -25,13 +25,15 @@
+--- core/cmake/BareosFindAllLibraries.cmake	2020-12-16 02:46:16.000000000 -0500
++++ core/cmake/BareosFindAllLibraries.cmake	2020-12-27 00:31:34.725219000 -0500
+@@ -37,46 +37,30 @@
+   set(Python3_FOUND 0)
  
+ else()
+-  find_package(Python2 COMPONENTS Interpreter Development)
+-  find_package(Python3 COMPONENTS Interpreter Development)
++  if(python)
++    find_package(Python3 COMPONENTS Interpreter Development)
  
- if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--   # make sure we get python 2 not 3
--   set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9)
--   find_package(PythonInterp)
--   INCLUDE(FindPythonLibs)
-+   if (python)
-+     # make sure we get python 2 not 3
-+     set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9)
-+     find_package(PythonInterp)
-+     INCLUDE(FindPythonLibs)
+-  if(${Python2_FOUND} OR ${Python3_FOUND})
+-    set(HAVE_PYTHON 1)
+-  endif()
++    if(${Python3_FOUND})
++      set(HAVE_PYTHON 1)
++    endif()
  
--   if (${PYTHONLIBS_FOUND})
--      SET(HAVE_PYTHON 1)
-+     if (${PYTHONLIBS_FOUND})
-+        SET(HAVE_PYTHON 1)
-+     endif()
-    endif()
+-  if(${Python2_FOUND})
+-    set(PYTHON_EXECUTABLE
+-        ${Python2_EXECUTABLE}
+-        PARENT_SCOPE
+-    )
+-    set(Python2_EXECUTABLE
+-        ${Python2_EXECUTABLE}
+-        PARENT_SCOPE
+-    )
+-    execute_process(
+-      COMMAND ${Python2_EXECUTABLE}
+-              ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
+-      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
+-    )
+-    include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
++    if(${Python3_FOUND})
++      set(PYTHON_EXECUTABLE
++          ${Python3_EXECUTABLE}
++          PARENT_SCOPE
++      )
++      set(Python3_EXECUTABLE
++          ${Python3_EXECUTABLE}
++          PARENT_SCOPE
++      )
++      execute_process(
++        COMMAND ${Python3_EXECUTABLE}
++                ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
++        OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
++      )
++      include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
++    endif()
+   endif()
+-
+-  if(${Python3_FOUND})
+-    set(PYTHON_EXECUTABLE
+-        ${Python3_EXECUTABLE}
+-        PARENT_SCOPE
+-    )
+-    set(Python3_EXECUTABLE
+-        ${Python3_EXECUTABLE}
+-        PARENT_SCOPE
+-    )
+-    execute_process(
+-      COMMAND ${Python3_EXECUTABLE}
+-              ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py
+-      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake
+-    )
+-    include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake)
+-  endif()
+ endif()
+ 
+ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+@@ -154,12 +138,18 @@
+ endif()
+ 
+ bareosfindlibraryandheaders("jansson" "jansson.h" "")
+-bareosfindlibraryandheaders("rados" "rados/librados.h" "")
+-bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
+-bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
++if(rados)
++  bareosfindlibraryandheaders("rados" "rados/librados.h" "")
++  bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
++endif()
++if(cephfs)
++  bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
++endif()
+ bareosfindlibraryandheaders("pthread" "pthread.h" "")
+ bareosfindlibraryandheaders("cap" "sys/capability.h" "")
+-bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
++if(gfapi)
++  bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
++endif()
+ 
+ bareosfindlibraryandheaders("pam" "security/pam_appl.h" "")
  
-    INCLUDE(FindPostgreSQL)
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
index 2cafd3ea706f..63a6f9eec824 100644
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
@@ -1,72 +1,112 @@
---- core/cmake/BareosInstallConfigFiles.cmake	2019-02-13 09:25:55.000000000 -0500
-+++ core/cmake/BareosInstallConfigFiles.cmake	2019-05-08 22:47:21.128268000 -0500
-@@ -43,18 +43,9 @@
-    get_filename_component(resname ${resdir} NAME)
-    foreach(configfile ${configfiles})
+--- core/cmake/BareosInstallConfigFiles.cmake	2020-12-16 02:46:16.000000000 -0500
++++ core/cmake/BareosInstallConfigFiles.cmake	2020-12-23 22:41:21.832081000 -0500
+@@ -55,20 +55,12 @@
+     get_filename_component(resname ${resdir} NAME)
+     foreach(configfile ${configfiles})
        get_filename_component(fname ${configfile} NAME)
--      if (EXISTS ${DESTCONFDIR}/${resname}/${fname})
--         MESSAGE(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
--         MESSAGE(STATUS "rename ${configfile} to ${configfile}.new")
--         FILE (RENAME "${configfile}" "${configfile}.new")
+-      if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
+-        message(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
+-        message(STATUS "rename ${configfile} to ${configfile}.new")
+-        file(RENAME "${configfile}" "${configfile}.new")
 -
--         MESSAGE(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
--         FILE (INSTALL "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
--         FILE (RENAME "${configfile}.new" "${configfile}")
+-        message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
+-        file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
+-        file(RENAME "${configfile}.new" "${configfile}")
 -      else()
--         MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)")
--         FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+-        message(
+-          STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)"
+-        )
+-        file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
 -      endif()
-+      MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
-+      FILE (RENAME "${configfile}" "${configfile}.sample")
-+      FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}")
-    endforeach()
- endforeach()
++      message(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
++      file(RENAME "${configfile}" "${configfile}.sample")
++      file(
++       COPY "${configfile}.sample"
++       DESTINATION "${DESTCONFDIR}/${resname}"
++      )
+     endforeach()
+   endforeach()
  
-@@ -82,15 +73,9 @@
-       get_filename_component(dir   ${configfile} DIRECTORY)
+@@ -104,23 +96,12 @@
+       get_filename_component(dir ${configfile} DIRECTORY)
        get_filename_component(fname ${configfile} NAME)
  
--      if (EXISTS ${DESTCONFDIR}/${configfile})
--         MESSAGE(STATUS "${configfile} as ${configfile}.new (keep existing)")
--         FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.new")
--         FILE(COPY   "${BackendConfigSrcDir}/${configfile}.new" DESTINATION "${DESTCONFDIR}/${dir}")
--         FILE(RENAME "${BackendConfigSrcDir}/${configfile}.new" "${BackendConfigSrcDir}/${configfile}")
+-      if(EXISTS ${DESTCONFDIR}/${configfile})
+-        message(STATUS "${configfile} as ${configfile}.new (keep existing)")
+-        file(RENAME "${BackendConfigSrcDir}/${configfile}"
+-             "${BackendConfigSrcDir}/${configfile}.new"
+-        )
+-        file(COPY "${BackendConfigSrcDir}/${configfile}.new"
+-             DESTINATION "${DESTCONFDIR}/${dir}"
+-        )
+-        file(RENAME "${BackendConfigSrcDir}/${configfile}.new"
+-             "${BackendConfigSrcDir}/${configfile}"
+-        )
 -      else()
--         MESSAGE(STATUS "${configfile} as ${configfile}")
--         FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}")
+-        message(STATUS "${configfile} as ${configfile}")
+-        file(COPY "${BackendConfigSrcDir}/${configfile}"
+-             DESTINATION "${DESTCONFDIR}/${dir}"
+-        )
 -      endif()
-+      MESSAGE(STATUS "${configfile} as ${configfile}")
-+      FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
-+      FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}")
-    endforeach()
++      message(STATUS "${configfile} as ${configfile}")
++      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
++      file(
++       COPY "${BackendConfigSrcDir}/${configfile}.sample"
++       DESTINATION "${DESTCONFDIR}/${dir}"
++      )
+     endforeach()
  
-    file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example")
-@@ -104,7 +89,8 @@
-          MESSAGE(STATUS "${configfile} as ${configfile}")
+     file(
+@@ -130,7 +111,8 @@
+     )
+     foreach(configfile ${configfiles})
+       get_filename_component(dir ${configfile} DIRECTORY)
+-      # get_filename_component(fname ${configfile} NAME)
++      get_filename_component(fname ${configfile} NAME)
++      get_filename_component(fsname ${configfile} NAME_WE)
+ 
+       if(EXISTS ${DESTCONFDIR}/${configfile})
+         message(STATUS "overwriting ${configfile}")
+@@ -138,9 +120,11 @@
+         message(STATUS "${configfile} as ${configfile}")
        endif()
  
--      FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}")
-+      FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
-+      FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}")
-    endforeach()
+-      file(COPY "${BackendConfigSrcDir}/${configfile}"
+-           DESTINATION "${DESTCONFDIR}/${dir}"
+-      )
++      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample")
++       file(
++       COPY "${BackendConfigSrcDir}/${fsname}.conf.sample"
++       DESTINATION "${DESTCONFDIR}/${dir}"
++       )
+     endforeach()
  
- ENDFOREACH()
-@@ -122,15 +108,9 @@
-          STRING(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
-          if (NOT "${IS_INFILE}" STREQUAL ".in")
-             get_filename_component(fname ${configfile} NAME)
--            if (EXISTS ${DESTCONFDIR}/${resname}/${fname})
--               MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.new (keep existing)")
--               FILE (RENAME "${configfile}" "${configfile}.new")
--               FILE (COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
--               FILE (RENAME "${configfile}.new" "${configfile}")
--            else()
--               MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}")
--               FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
--            endif()
-+            MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}")
-+            FILE (RENAME "${configfile}" "${configfile}.sample")
-+            FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}")
-          else()
-             MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
-          endif()
+   endforeach()
+@@ -167,20 +151,13 @@
+         string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
+         if(NOT "${IS_INFILE}" STREQUAL ".in")
+           get_filename_component(fname ${configfile} NAME)
+-          if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
+-            message(
+-              STATUS
+-                "${resname}/${fname} as ${resname}/${fname}.new (keep existing)"
+-            )
+-            file(RENAME "${configfile}" "${configfile}.new")
+-            file(COPY "${configfile}.new"
+-                 DESTINATION "${DESTCONFDIR}/${resname}"
+-            )
+-            file(RENAME "${configfile}.new" "${configfile}")
+-          else()
+-            message(STATUS "${resname}/${fname} as ${resname}/${fname}")
+-            file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+-          endif()
++          get_filename_component(fsname ${configfile} NAME_WE)
++          message(STATUS "${resname}/${fname} as ${resname}/${fname}")
++          file(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample")
++          file(
++            COPY "${resdir}/${fsname}.conf.sample"
++            DESTINATION "${DESTCONFDIR}/${resname}"
++          )
+         else()
+           message(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
+         endif()
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
index ce294505c385..935c5a5b3177 100644
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
@@ -1,15 +1,15 @@
---- core/cmake/BareosSetVariableDefaults.cmake	2019-05-10 11:53:19.620402000 -0500
-+++ core/cmake/BareosSetVariableDefaults.cmake	2019-05-10 12:13:55.910452000 -0500
-@@ -669,7 +669,11 @@
- SET(PACKAGE_URL "\"\"")
- SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
+--- core/cmake/BareosSetVariableDefaults.cmake	2020-01-31 16:21:15.864122000 -0500
++++ core/cmake/BareosSetVariableDefaults.cmake	2020-01-31 16:23:58.960984000 -0500
+@@ -641,7 +641,11 @@
+ set(PACKAGE_URL "\"\"")
+ set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
  
 -set(ENABLE_NLS 1)
-+IF(DEFINED nls)
++if(nls)
 +  SET(ENABLE_NLS 1)
-+ELSE()
++else()
 +  SET(ENABLE_NLS 0)
-+ENDIF()
++endif()
  
+ if(HAVE_WIN32)
  
- IF(HAVE_WIN32)
diff --git a/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt
index ab5442b9a2ba..1a78d64effb1 100644
--- a/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt
@@ -1,19 +1,14 @@
---- core/manpages/CMakeLists.txt	2019-05-08 21:16:29.369799000 -0500
-+++ core/manpages/CMakeLists.txt	2019-05-08 21:17:28.526607000 -0500
-@@ -17,6 +17,7 @@
+--- core/manpages/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/manpages/CMakeLists.txt	2020-01-31 15:33:19.205416000 -0500
+@@ -17,9 +17,11 @@
  #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  #   02110-1301, USA.
  
-+IF(client-only)
- set (MAN1
-    bconsole.1
-    )
-@@ -25,7 +26,7 @@
-    bareos-fd.8
-    bareos.8
-    )
--
-+ENDIF()
++if(client-only)
+ set(MAN1 bconsole.1)
  
- IF(NOT client-only)
- set ( MAN1-server
+ set(MAN8 bareos-fd.8 bareos.8)
++endif()
+ 
+ if(NOT client-only)
+   set(MAN1-server
diff --git a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
index 2c8b87d9b309..ae7fd0295cdf 100644
--- a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
@@ -1,60 +1,59 @@
---- core/scripts/CMakeLists.txt	2019-05-08 19:49:45.595270000 -0500
-+++ core/scripts/CMakeLists.txt	2019-05-08 19:51:39.443730000 -0500
-@@ -17,28 +17,29 @@
+--- core/scripts/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/scripts/CMakeLists.txt	2020-01-31 15:37:16.832224000 -0500
+@@ -17,33 +17,35 @@
  #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  #   02110-1301, USA.
  
-+IF(client-only)
-+   INSTALL(FILES
-+            btraceback
-+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-+                                    GROUP_READ GROUP_EXECUTE
-+                                    WORLD_READ WORLD_EXECUTE
-+            DESTINATION "${sbindir}")
+-install(
+-  FILES bareos btraceback
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+-              WORLD_READ WORLD_EXECUTE
+-  DESTINATION "${sbindir}"
+-)
++if(client-only)
++   install(
++     FILES bareos btraceback
++     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++                 WORLD_READ WORLD_EXECUTE
++     DESTINATION "${sbindir}"
++   )
  
--INSTALL(FILES
--         bareos btraceback
--         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
--                                 GROUP_READ GROUP_EXECUTE
--                                 WORLD_READ WORLD_EXECUTE
--         DESTINATION "${sbindir}")
-+   INSTALL(FILES
-+            bareos
-+            btraceback.gdb
-+            btraceback.dbx
-+            btraceback.mdb
-+            bareos-config
-+            bareos-config-lib.sh
-+            bareos-ctl-fd
-+            bareos-ctl-funcs
-+            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-+                        GROUP_READ GROUP_EXECUTE
-+                        WORLD_READ WORLD_EXECUTE
-+            DESTINATION "${scriptdir}")
-+ENDIF()
+-install(
+-  FILES bareos-ctl-fd
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+-              WORLD_READ WORLD_EXECUTE
+-  DESTINATION "${scriptdir}"
+-  COMPONENT filedaemon
+-)
++   install(
++     FILES bareos-ctl-fd
++     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++                 WORLD_READ WORLD_EXECUTE
++     DESTINATION "${scriptdir}"
++     COMPONENT filedaemon
++   )
  
--INSTALL(FILES
--         bareos
--         btraceback.gdb
--         btraceback.dbx
--         btraceback.mdb
--         bareos-config
--         bareos-config-lib.sh
--         bareos-ctl-fd
--         bareos-ctl-funcs
--         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
--                     GROUP_READ GROUP_EXECUTE
--                     WORLD_READ WORLD_EXECUTE
--         DESTINATION "${scriptdir}")
--
- IF(NOT client-only)
-    INSTALL(FILES
-          mtx-changer
-@@ -47,7 +48,6 @@
-          bareos-glusterfind-wrapper
-          bareos-ctl-dir
-          bareos-ctl-sd
--         bareos-ctl-funcs
-          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-                      GROUP_READ GROUP_EXECUTE
-                      WORLD_READ WORLD_EXECUTE
+-install(
+-  FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
+-        bareos-config-lib.sh bareos-ctl-funcs
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+-              WORLD_READ WORLD_EXECUTE
+-  DESTINATION "${scriptdir}"
+-)
++   install(
++     FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
++           bareos-config-lib.sh bareos-ctl-funcs
++     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++                 WORLD_READ WORLD_EXECUTE
++     DESTINATION "${scriptdir}"
++   )
++endif()
+ 
+ if(NOT client-only)
+   install(
+     FILES mtx-changer disk-changer bareos-explorer bareos-glusterfind-wrapper
+-          bareos-ctl-dir bareos-ctl-sd bareos-ctl-funcs
++          bareos-ctl-dir bareos-ctl-sd
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+                 WORLD_READ WORLD_EXECUTE
+     DESTINATION "${scriptdir}"
diff --git a/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt
new file mode 100644
index 000000000000..1c8609187951
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- core/src/dird/dbcopy/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
++++ core/src/dird/dbcopy/CMakeLists.txt	2020-12-23 22:44:13.161935000 -0500
+@@ -33,7 +33,8 @@
+   )
+   target_link_libraries(
+     bareos-dbcopy bareos dird_objects bareosfind bareoscats bareossql
+-    $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> ${LMDB_LIBS}
++    $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> ${LMDB_LIBS} 
++    ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}
+   )
+ 
+   install(TARGETS bareos-dbcopy DESTINATION "${sbindir}")
diff --git a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
index 11570458e8e4..a41310367062 100644
--- a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
@@ -1,18 +1,18 @@
---- core/src/dird/CMakeLists.txt	2019-05-08 21:45:45.893113000 -0500
-+++ core/src/dird/CMakeLists.txt	2019-05-08 21:47:00.616203000 -0500
-@@ -77,6 +77,9 @@
-    bareosfind
-    ${LMDB_LIBS}
-    ${NDMP_LIBS}
-+   ${OPENSSL_LIBRARIES}
-+   ${PTHREAD_LIBRARIES}
-+   ${JANSSON_LIBRARIES}
+--- core/src/dird/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/src/dird/CMakeLists.txt	2020-01-31 15:41:53.134935000 -0500
+@@ -148,7 +148,8 @@
+ add_executable(bareos-dir ${DIRDSRCS})
+ 
+ set(BAREOS_DIR_LIBRARIES dird_objects bareos bareoscats bareossql bareosfind
+-                         ${LMDB_LIBS} ${NDMP_LIBS}
++                         ${LMDB_LIBS} ${NDMP_LIBS} ${OPENSSL_LIBRARIES} 
++			 ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}
  )
  
- IF(HAVE_WIN32)
-@@ -92,7 +95,7 @@
+ if(HAVE_WIN32)
+@@ -166,7 +167,7 @@
  add_executable(bareos-dbcheck ${DBCHKSRCS})
- SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
+ set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
  
 -target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES})
 +target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES})
diff --git a/sysutils/bareos-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos-server/files/patch-core-src-include_baconfig.h
index 4a9a9b5e839f..21afd978730d 100644
--- a/sysutils/bareos-server/files/patch-core-src-include_baconfig.h
+++ b/sysutils/bareos-server/files/patch-core-src-include_baconfig.h
@@ -1,25 +1,25 @@
---- core/src/include/baconfig.h	2019-05-10 14:32:06.160940000 -0500
-+++ core/src/include/baconfig.h	2019-05-10 14:32:32.142847000 -0500
-@@ -120,11 +120,11 @@
-       #define N_(s) (s)
-    #endif /* N_ */
- #else /* !ENABLE_NLS */
-+   #include <locale.h>
-    #undef _
-    #undef N_
-    #undef textdomain
-    #undef bindtextdomain
--   #undef setlocale
+--- core/src/include/baconfig.h	2020-12-16 02:46:16.000000000 -0500
++++ core/src/include/baconfig.h	2020-12-23 22:47:40.992698000 -0500
+@@ -103,11 +103,11 @@
+ #    define N_(s) (s)
+ #  endif /* N_ */
+ #else    /* !ENABLE_NLS */
++#  include <locale.h>
+ #  undef _
+ #  undef N_
+ #  undef textdomain
+ #  undef bindtextdomain
+-#  undef setlocale
  
-    #ifndef _
-       #define _(s) (s)
-@@ -137,9 +137,6 @@
-    #endif
-    #ifndef bindtextdomain
-       #define bindtextdomain(p, d)
--   #endif
--   #ifndef setlocale
--      #define setlocale(p, d)
-    #endif
+ #  ifndef _
+ #    define _(s) (s)
+@@ -120,9 +120,6 @@
+ #  endif
+ #  ifndef bindtextdomain
+ #    define bindtextdomain(p, d)
+-#  endif
+-#  ifndef setlocale
+-#    define setlocale(p, d)
+ #  endif
  #endif /* ENABLE_NLS */
  
diff --git a/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt
index 455f2fd3cdc4..ccb41fb15e8c 100644
--- a/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt
@@ -1,35 +1,13 @@
---- core/src/plugins/filed/CMakeLists.txt	2019-05-10 13:49:40.521620000 -0500
-+++ core/src/plugins/filed/CMakeLists.txt	2019-05-10 13:50:25.954964000 -0500
-@@ -99,18 +99,18 @@
-    INSTALL(TARGETS test-plugin-fd DESTINATION ${plugindir})
- endif()
+--- core/src/plugins/filed/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
++++ core/src/plugins/filed/CMakeLists.txt	2020-12-23 22:56:13.843714000 -0500
+@@ -41,7 +41,9 @@
  
--set (PYFILES
--    bareos-fd.py.template
--    bareos-fd-local-fileset.py
--    bareos-fd-mock-test.py
--    BareosFdPluginBaseclass.py
--    BareosFdPluginLocalFileset.py
--    BareosFdWrapper.py
--    bareos_fd_consts.py
--    bareos-fd-ldap.py
--    BareosFdPluginLDAP.py
--    )
-+if (python)
-+  set (PYFILES
-+      bareos-fd.py.template
-+      bareos-fd-local-fileset.py
-+      bareos-fd-mock-test.py
-+      BareosFdPluginBaseclass.py
-+      BareosFdPluginLocalFileset.py
-+      BareosFdWrapper.py
-+      bareos_fd_consts.py
-+      bareos-fd-ldap.py
-+      BareosFdPluginLDAP.py
-+      )
+ include_directories(${OPENSSL_INCLUDE_DIR})
  
--INSTALL(FILES ${PYFILES} DESTINATION ${plugindir})
--
--
-+  INSTALL(FILES ${PYFILES} DESTINATION ${plugindir})
+-add_subdirectory(python)
++if(python)
++  add_subdirectory(python)
 +endif()
+ 
+ add_library(bpipe-fd MODULE bpipe/bpipe-fd.cc)
+ set_target_properties(bpipe-fd PROPERTIES PREFIX "")
diff --git a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt
new file mode 100644
index 000000000000..3dc59542df60
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- core/src/plugins/stored/CMakeLists.txt	2020-02-01 12:41:50.658146000 -0500
++++ core/src/plugins/stored/CMakeLists.txt	2020-02-01 12:43:09.372433000 -0500
+@@ -27,6 +27,10 @@
+     ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}
+   )
+   add_definitions(-DMS_WIN${WINDOWS_BITS})
++else()
++  include_directories(
++    ${PROJECT_SOURCE_DIR}/src/fastlz/include
++  )
+ endif()
+ 
+ add_library(autoxflate-sd MODULE autoxflate-sd.cc)
diff --git a/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt
index 0e21b3a7a44c..74eae67e2482 100644
--- a/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt
@@ -1,44 +1,32 @@
---- core/src/stored/CMakeLists.txt	2019-02-13 09:25:55.000000000 -0500
-+++ core/src/stored/CMakeLists.txt	2019-05-10 14:55:03.636098000 -0500
-@@ -192,6 +192,8 @@
- target_link_libraries(bareos-sd
-    stored_objects
-    ${BAREOS_SD_LIBRARIES}
-+   ${JANSSON_LIBRARIES}
-+   ${PTHREAD_LIBRARIES}
-    )
+--- core/src/stored/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
++++ core/src/stored/CMakeLists.txt	2021-02-19 16:15:32.925944000 -0500
+@@ -226,23 +226,23 @@
+   list(APPEND BAREOS_SD_LIBRARIES comctl32)
+ endif()
+ 
+-target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES})
++target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bls ${BLSSRCS})
-@@ -202,6 +204,7 @@
+-target_link_libraries(bls bareos bareossd bareosfind)
++target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES})
+ 
  add_executable(bextract ${BEXTRACTSRS})
- target_link_libraries(bextract
-    bareossd bareosfind bareos 
-+   ${PTHREAD_LIBRARIES}
-     )
+-target_link_libraries(bextract bareossd bareosfind bareos)
++target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bscan ${BSCANSRCS})
-@@ -212,6 +215,7 @@
+-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
++target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES})
+ 
  add_executable(btape ${BTAPESRCS})
- target_link_libraries(btape
-    bareossd bareos 
-+   ${PTHREAD_LIBRARIES}
-     )
+-target_link_libraries(btape bareossd bareos)
++target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
  add_executable(bcopy ${BCOPYSRCS})
-@@ -219,6 +223,7 @@
- 
- target_link_libraries(bcopy
-    bareossd bareos 
-+   ${PTHREAD_LIBRARIES}
-     )
  
- INSTALL(TARGETS bareossd DESTINATION ${libdir})
-@@ -231,7 +236,7 @@
- install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
- install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
+-target_link_libraries(bcopy bareossd bareos)
++target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
  
--INSTALL(DIRECTORY DESTINATION "../${archivedir}")
-+INSTALL(DIRECTORY DESTINATION "${archivedir}")
+ install(TARGETS bareossd DESTINATION ${libdir})
  
- IF(${HAVE_DYNAMIC_SD_BACKENDS})
- add_subdirectory(backends)
diff --git a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
index 135d70a4df4c..cc7934fbe920 100644
--- a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
@@ -1,25 +1,38 @@
---- core/src/CMakeLists.txt	2019-05-08 21:29:08.173605000 -0500
-+++ core/src/CMakeLists.txt	2019-05-08 21:42:27.597876000 -0500
-@@ -30,13 +30,16 @@
-    add_subdirectory(stored)
- ENDIF()
+--- core/src/CMakeLists.txt	2020-12-16 02:46:16.000000000 -0500
++++ core/src/CMakeLists.txt	2020-12-27 00:51:12.356192000 -0500
+@@ -18,7 +18,9 @@
+ #   02110-1301, USA.
+ message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+-add_subdirectory(filed)
++if(client-only)
++  add_subdirectory(filed)
++endif()
+ 
+ if(NOT client-only)
+   add_subdirectory(tools)
+@@ -43,14 +45,18 @@
+   add_subdirectory(tests)
+ endif()
  
 -add_subdirectory(console)
--IF(${HAVE_LMDB})
--add_subdirectory(lmdb)
-+IF(client-only)
-+   add_subdirectory(console)
-+   IF(${HAVE_LMDB})
-+      add_subdirectory(lmdb)
-+   ENDIF()
-+   add_subdirectory(lib)
-+   add_subdirectory(findlib)
-+   add_subdirectory(filed)
- ENDIF()
+-if(${HAVE_LMDB})
+-  add_subdirectory(lmdb)
++if(client-only)
++  add_subdirectory(console)
++  if(${HAVE_LMDB})
++    add_subdirectory(lmdb)
++  endif()
++  add_subdirectory(lib)
++  add_subdirectory(findlib)
++  add_subdirectory(fastlz)
+ endif()
 -add_subdirectory(lib)
 -add_subdirectory(findlib)
--add_subdirectory(filed)
 +
  add_subdirectory(plugins)
- 
- if (${traymonitor})
+-add_subdirectory(fastlz)
++
+ if(${traymonitor})
+   add_subdirectory(qt-tray-monitor)
+ endif()
diff --git a/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
new file mode 100644
index 000000000000..bf079968d9d4
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
@@ -0,0 +1,36 @@
+--- core/cmake/bareos-symlink-default-db-backend.cmake.orig	2020-12-11 13:44:43 UTC
++++ core/cmake/bareos-symlink-default-db-backend.cmake
+@@ -16,13 +16,31 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
++
++# The ${libdir} and ${backenddir} are absolute, so figure out
++# a relative path (${backenddir} lives under ${libdir}) instead.
++# Make the link relative, placing the libbareoscats.so in ${libdir}.
++# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see
++# core/src/cats/CMakeLists.txt).
+ message(
+   STATUS
+     "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ )
++file(
++  RELATIVE_PATH 
++    _rel 
++    ${libdir} 
++    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
++)
++message(
++  STATUS 
++    ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}"
++)
++
+ execute_process(
+   COMMAND
+     ${CMAKE_COMMAND} -E create_symlink
+-    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
+-    ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
++    ${_rel}
++    libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
++    WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT
+ )
diff --git a/sysutils/bareos-server/files/patch-src-console-Makefile.in b/sysutils/bareos-server/files/patch-src-console-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-console-Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-src-dird-Makefile.in b/sysutils/bareos-server/files/patch-src-dird-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-dird-Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-src-filed-Makefile.in b/sysutils/bareos-server/files/patch-src-filed-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-filed-Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in b/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-plugins-filed_Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in b/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-plugins-stored-Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-src-stored-Makefile.in b/sysutils/bareos-server/files/patch-src-stored-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-stored-Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/files/patch-src-tools_Makefile.in b/sysutils/bareos-server/files/patch-src-tools_Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/bareos-server/files/patch-src-tools_Makefile.in
+++ /dev/null
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index c509bb863eb6..e15c9f45c642 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -1,7 +1,6 @@
 bin/bregex
 bin/bsmtp
 bin/bwild
-bin/timelimit
 @sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
@@ -11,12 +10,23 @@ bin/timelimit
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.example.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.example.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.example.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
@@ -28,13 +38,17 @@ bin/timelimit
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.example.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.example.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Rados.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.example.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.example.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.example.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/RadosStorage.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
@@ -42,8 +56,11 @@ bin/timelimit
 %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
 etc/logrotate.d/bareos-dir
 lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
+%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so
 lib/bareos/backends/libbareossd-fifo.so
 lib/bareos/backends/libbareossd-gentape.so
+%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
+%%RADOS%%lib/bareos/backends/libbareossd-rados.so
 lib/bareos/backends/libbareossd-tape.so
 %%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py
 %%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py
@@ -51,13 +68,9 @@ lib/bareos/backends/libbareossd-tape.so
 %%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py
 lib/bareos/plugins/autoxflate-sd.so
 %%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py
-%%PYTHON%%lib/bareos/plugins/bareos-dir.py.template
 %%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
-%%PYTHON%%lib/bareos/plugins/bareos-sd.py.template
-%%PYTHON%%lib/bareos/plugins/bareos_dir_consts.py
-%%PYTHON%%lib/bareos/plugins/bareos_sd_consts.py
-%%PYTHON%%lib/bareos/plugins/python-dir.so
-%%PYTHON%%lib/bareos/plugins/python-sd.so
+%%PYTHON%%lib/bareos/plugins/python3-dir.so
+%%PYTHON%%lib/bareos/plugins/python3-sd.so
 %%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
 %%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
 lib/bareos/scripts/bareos-ctl-dir
@@ -82,6 +95,7 @@ lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
 lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
 lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
 lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql
 %%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
 lib/bareos/scripts/ddl/versions.map
 lib/bareos/scripts/delete_catalog_backup
@@ -96,20 +110,23 @@ lib/bareos/scripts/mtx-changer
 lib/bareos/scripts/query.sql
 lib/bareos/scripts/update_bareos_tables
 lib/libbareoscats.so
-lib/libbareoscats.so.18
+lib/libbareoscats.so.20
 lib/libbareoscats.so.%%LIB_VERSION%%
 %%NDMP%%lib/libbareosndmp.so
-%%NDMP%%lib/libbareosndmp.so.18
+%%NDMP%%lib/libbareosndmp.so.20
 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
 lib/libbareossd.so
 lib/libbareossql.so
-lib/libbareossql.so.18
+lib/libbareossql.so.20
 lib/libbareossql.so.%%LIB_VERSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd.so
 man/man1/bareos-tray-monitor.1.gz
 man/man1/bregex.1.gz
 man/man1/bsmtp.1.gz
 man/man1/bwild.1.gz
 man/man8/bareos-dbcheck.8.gz
+man/man8/bareos-dbcopy.8.gz
 man/man8/bareos-dir.8.gz
 man/man8/bareos-sd.8.gz
 man/man8/bcopy.8.gz
@@ -121,6 +138,7 @@ man/man8/bscrypto.8.gz
 man/man8/btape.8.gz
 man/man8/btraceback.8.gz
 sbin/bareos-dbcheck
+sbin/bareos-dbcopy
 sbin/bareos-dir
 sbin/bareos-sd
 sbin/bcopy
@@ -135,7 +153,6 @@ sbin/btape
 sbin/btestls
 sbin/bwild
 sbin/chio-bareos
-sbin/timelimit
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
@@ -150,15 +167,9 @@ sbin/timelimit
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages
 @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage
 @dir(bareos,bareos,) %%BAREOS_DIR%%
 @dir(bareos,bareos,) %%BAREOS_DIR%%/storage
 @dir(bareos,bareos,) /var/log/bareos
diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client
index 101eb52e8b67..497636da3d06 100644
--- a/sysutils/bareos-server/pkg-plist.client
+++ b/sysutils/bareos-server/pkg-plist.client
@@ -9,26 +9,38 @@ bin/bconsole
 @group bareos
 @sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
 @group bareos
-lib/libbareos.so
-lib/libbareos.so.18
-lib/libbareos.so.%%LIB_VERSION%%
-lib/libbareosfind.so
-lib/libbareosfind.so.18
-lib/libbareosfind.so.%%LIB_VERSION%%
-%%LMDB%%lib/libbareoslmdb.so
-%%LMDB%%lib/libbareoslmdb.so.18
-%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginLibcloud.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginOvirt.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginPostgres.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginVMware.py
 %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
+%%PYTHON%%lib/bareos/plugins/BareosLibcloudApi.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-libcloud.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
-%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-postgres.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-vmware.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/__init__.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/debug.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/mtime.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/process_base.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/queue_message.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/utils.py
+%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/worker.py
 lib/bareos/plugins/bpipe-fd.so
-%%PYTHON%%lib/bareos/plugins/python-fd.so
+%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
+%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
+%%PYTHON%%lib/bareos/plugins/python3-fd.so
+%%RADOS%%lib/bareos/plugins/rados-fd.so
 lib/bareos/scripts/bareos
 lib/bareos/scripts/bareos-config
 lib/bareos/scripts/bareos-config-lib.sh
@@ -37,18 +49,34 @@ lib/bareos/scripts/bareos-ctl-funcs
 lib/bareos/scripts/btraceback.dbx
 lib/bareos/scripts/btraceback.gdb
 lib/bareos/scripts/btraceback.mdb
+lib/libbareos.so
+lib/libbareos.so.20
+lib/libbareos.so.%%LIB_VERSION%%
+lib/libbareosfastlz.so
+lib/libbareosfastlz.so.20
+lib/libbareosfastlz.so.%%LIB_VERSION%%
+lib/libbareosfind.so
+lib/libbareosfind.so.20
+lib/libbareosfind.so.%%LIB_VERSION%%
+lib/libbareoslmdb.so
+lib/libbareoslmdb.so.20
+lib/libbareoslmdb.so.%%LIB_VERSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so
 man/man1/bconsole.1.gz
 man/man8/bareos-fd.8.gz
 man/man8/bareos.8.gz
 @group bareos
+sbin/bareos
+@group bareos
 sbin/bareos-fd
 @group bareos
 sbin/bconsole
 @group wheel
 sbin/btraceback
 @group bareos
-%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
-%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
+@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
+@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
+@group bareos
 @dir(bareos,bareos,)  %%BAREOS_DIR%%
 @dir(bareos,bareos,) /var/log/bareos
 @dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile
index 911e571f0ac3..9006ce05bb3e 100644
--- a/sysutils/bareos-traymonitor/Makefile
+++ b/sysutils/bareos-traymonitor/Makefile
@@ -1,7 +1,4 @@
-# $FreeBSD$
-
 PORTNAME=	bareos
-PORTREVISION=	1
 PKGNAMESUFFIX=	-traymonitor
 
 COMMENT=	Backup archiving recovery open sourced (traymonitor)
@@ -9,9 +6,9 @@ COMMENT=	Backup archiving recovery open sourced (traymonitor)
 LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
 		libbareos.so:sysutils/bareos-client
 
-CONFLICTS=	bacula*-bat-* bareos16-traymonitor-*
+CONFLICTS=	bareos17-traymonitor-* bareos18-traymonitor-* bareos19-traymonitor-*
 
-USES=		pkgconfig gettext-runtime desktop-file-utils qt:5
+USES=		desktop-file-utils gettext-runtime pkgconfig qt:5
 USE_QT=		buildtools_build qmake_build uitools_build gui core
 WITH_BAT=	yes
 
@@ -23,6 +20,7 @@ MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
 CMAKE_ARGS+=		-Dtraymonitor=yes \
 			-Dbuild-dird=no \
 			-Dbuild-stored=no \
-			-Dclient-only=yes
+			-Dclient-only=yes \
+			-Dnls=ON
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos-traymonitor/pkg-plist b/sysutils/bareos-traymonitor/pkg-plist
index add26cb88d6d..1a71281bcaaf 100644
--- a/sysutils/bareos-traymonitor/pkg-plist
+++ b/sysutils/bareos-traymonitor/pkg-plist
@@ -4,4 +4,4 @@ bin/bareos-tray-monitor
 @sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample
 @sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample
 share/applications/bareos-tray-monitor.desktop
-share/pixmaps/bareos-tray-monitor.xpm
+share/pixmaps/bareos-tray-monitor.png
diff --git a/sysutils/bareos16-client-static/Makefile b/sysutils/bareos16-client-static/Makefile
deleted file mode 100644
index aa44827fcc39..000000000000
--- a/sysutils/bareos16-client-static/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	bareos16
-PKGNAMESUFFIX=	-client-static
-
-COMMENT=	Backup archiving recovery open sourced (static client)
-
-CONFLICTS=	bareos-client-static-*
-
-PLIST=		${.CURDIR}/pkg-plist
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos16-server
-
-PLIST_FILES=	sbin/bareos-fd-static \
-		sbin/bconsole-static
-
-OPTIONS_DEFINE=	NLS LMDB
-LMDB_DESC=	Enable build of LMDB support
-
-CONFIGURE_ARGS+=	--enable-client-only \
-			--enable-static-fd \
-			--enable-static-cons \
-			--disable-libtool \
-			--disable-build-dird \
-			--disable-build-stored \
-			--with-jansson=${LOCALBASE}
-
-BROKEN_aarch64=	Fails to link: missing sbrk
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos16-client/Makefile b/sysutils/bareos16-client/Makefile
deleted file mode 100644
index a2135f59c70c..000000000000
--- a/sysutils/bareos16-client/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	bareos16
-PKGNAMESUFFIX=	-client
-
-COMMENT=	Backup archiving recovery open sourced (client)
-
-BROKEN_aarch64=	Fails to link: missing sbrk
-
-CONFLICTS=	bareos-client-*
-
-WITH_CLIENT_ONLY=yes
-USE_RC_SUBR=	bareos-fd
-
-PLIST=		${PKGDIR}/pkg-plist.client
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos16-server
-
-OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
-LMDB_DESC=	Enable build of LMDB support
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos16-server/Makefile b/sysutils/bareos16-server/Makefile
deleted file mode 100644
index c913fd0a1dd7..000000000000
--- a/sysutils/bareos16-server/Makefile
+++ /dev/null
@@ -1,238 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	bareos16
-DISTVERSIONPREFIX=	Release/
-DISTVERSION=	16.2.8
-PORTREVISION?=	3
-CATEGORIES?=	sysutils
-PKGNAMEPREFIX?=	#
-PKGNAMESUFFIX?=	-server
-
-MAINTAINER=	acm@FreeBSD.org
-COMMENT?=	Backup archiving recovery open sourced (server)
-
-LICENSE=	AGPLv3 LGPL3
-LICENSE_COMB=	multi
-
-LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
-		libjansson.so:devel/jansson
-
-USES+=		libtool:keepla pkgconfig readline:port shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME:S/16//}
-GH_PROJECT=	${PORTNAME:S/16//}
-
-CONFLICTS?=	bacula*-server-* bareos-server-*
-
-USERS=		bareos
-GROUPS=		${USERS}
-
-PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
-
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-SHEBANG_LANG=	perl
-SHEBANG_FILES=	${WRKSRC}/src/cats/make_catalog_backup.pl.in
-
-CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-ETCDIR=		${PREFIX}/etc/${PORTNAME:S/16//}
-
-OPTIONS_DEFAULT=	OPENSSL
-OPTIONS_SINGLE=		CRYPTO
-OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
-OPTIONS_SUB=		yes
-CRYPTO_DESC=		Cryptographic library
-MTX_DESC=		Install mtx for control of autochanger devices
-NDMP_DESC=		Enable build of NDMP support
-SCSICRYPTO_DESC=	Build LTO AME crypto plugin
-
-.if ${PKGNAMESUFFIX} == "-server"
-OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
-OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
-OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
-OPTIONS_SINGLE+=	DATABASE
-DATABASE_DESC=		Database support
-
-NDMP_CONFIGURE_ON=	--enable-ndmp=yes
-NDMP_CONFIGURE_OFF=	--enable-ndmp=no
-.endif
-
-GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
-
-OPENSSL_USES=		ssl
-OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
-OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
-
-SCSICRYPTO_CONFIGURE_ON=	--enable-scsi-crypto=yes
-SCSICRYPTO_CONFIGURE_OFF=	--enable-scsi-crypto=no
-
-.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
-PYTHON_USES=		  python
-PYTHON_CONFIGURE_ON=	--with-python=yes
-PYTHON_CONFIGURE_OFF=	--with-python=no
-PYTHON_PLUGIN=		yes
-
-.if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+=	libbareos.so:sysutils/bareos16-client
-USE_RC_SUBR?=	bareos-dir bareos-sd
-.endif
-
-.if defined(WITH_CLIENT_ONLY)
-SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
-.else
-SUB_FILES+=	pkg-message.server
-.endif
-
-CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
-		--enable-libtool \
-		--enable-smartalloc \
-		--sysconfdir=${PREFIX}/etc \
-		--with-working-dir=${BAREOS_DIR} \
-		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
-		--with-logdir=/var/log/bareos \
-		--with-readline=${LOCALBASE} \
-		--disable-conio \
-		--enable-batch-insert \
-		--with-plugindir=${PREFIX}/lib/bareos/plugins \
-		--with-scriptdir=${PREFIX}/lib/bareos/scripts \
-		--with-dump-email=root@localhost \
-		--with-job-email=root@localhost \
-		--with-db-name=bareos \
-		--with-sbin-perm=755 \
-		--with-db-user=bareos \
-		--with-baseport=9101 \
-		--with-pid-dir=/var/run/bareos \
-		--with-jansson=${LOCALBASE}
-
-.if defined(WITH_CLIENT_ONLY)
-LMDB_CONFIGURE_ON=	--enable-lmdb=yes
-LMDB_CONFIGURE_OFF=	--enable-lmdb=no
-LMDB_CFLAGS=		-DMDB_DSYNC=O_SYNC
-
-CONFIGURE_ARGS+=--with-fd-user=root \
-		--with-fd-group=wheel
-.else
-CONFIGURE_ARGS+=--with-dir-user=${BAREOS_USER} \
-		--with-dir-group=${BAREOS_GROUP} \
-		--with-sd-user=${BAREOS_USER} \
-		--with-sd-group=operator
-.endif
-
-# The user/group IDs below are registered, see
-# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
-#
-BAREOS_USER?=	bareos
-BAREOS_GROUP?=	${BAREOS_USER}
-BAREOS_UID?=	997
-BAREOS_GID?=	${BAREOS_UID}
-BAREOS_DIR?=	/var/db/bareos
-
-PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
-
-SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
-		BAREOS_GROUP=${BAREOS_GROUP} \
-		BAREOS_UID=${BAREOS_UID} \
-		BAREOS_GID=${BAREOS_GID} \
-		BAREOS_DIR=${BAREOS_DIR}
-
-NLS_USES=		gettext
-NLS_CONFIGURE_ENABLE=	nls
-
-# Client only or full server version
-.if defined(WITH_CLIENT_ONLY)
-CONFFILES=	fd
-CONFIGURE_ARGS+=	--enable-client-only
-
-PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
-PKGINSTALL=	${FILESDIR}/pkg-install.client
-.else
-# Server only Options
-CONFFILES=		sd dir
-# Server default database
-
-MYSQL_CONFIGURE_ON=	--with-mysql=yes
-MYSQL_USE=	MYSQL=yes
-SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
-PGSQL_CONFIGURE_ON=	--with-postgresql=yes
-PGSQL_USES=	pgsql
-
-MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-DBTYPE=			mysql
-SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
-.elif ${PORT_OPTIONS:MSQLITE3}
-DBTYPE=			sqlite3
-.else
-DBTYPE=			postgresql
-SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
-.endif
-PLIST_SUB+=		DBTYPE=${DBTYPE}
-
-.endif
-
-.if defined(WITH_CLIENT_ONLY)
-MP1+=	bconsole.1
-MP8+=	bareos-fd.8
-.else
-MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
-	btape.8 btraceback.8 bareos-dbcheck.8
-MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
-.endif
-
-MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
-
-post-patch:
-#	This port does not install docs.  See bareos-docs for that
-	${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
-#	Default bconsole.conf is in ${ETCDIR}
-	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
-	@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
-.if defined(WITH_CLIENT_ONLY)
-	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
-.else
-#	In server port don't install filed
-	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
-		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
-		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in
-	@${REINPLACE_CMD} -e 's|../../lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in
-	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
-		${WRKSRC}/src/tools/bpluginfo.c
-	@${REINPLACE_CMD} -e 's|perl|$(LOCALBASE)/bin/perl|g' ${WRKSRC}/scripts/mtx-changer.in
-.endif
-
-post-extract:
-.if defined(WITH_CLIENT_ONLY)
-.	if defined(PYTHON_PLUGIN)
-		@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/fileset
-		@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/job
-.	endif
-.endif
-	@${MV} ${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
-		${WRKSRC}/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
-
-.if !target(post-install)
-post-install:
-.if defined(WITH_CLIENT_ONLY)
-	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
-	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
-.else
-	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
-	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
-	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
-.endif
-	@${MKDIR} ${STAGEDIR}/var/run/bareos
-.endif
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif # -client and -server are defined
-.include <bsd.port.mk>
diff --git a/sysutils/bareos16-server/Makefile.common b/sysutils/bareos16-server/Makefile.common
deleted file mode 100644
index 4025c122962b..000000000000
--- a/sysutils/bareos16-server/Makefile.common
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: Alonso Cardenas <acm@FreeBSD.org>
-# $FreeBSD$
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
-	@${REINPLACE_CMD} -e 's|-lbareoscfg|@JANSSON_LIBS@ @LIBINTL@ -lbareoscfg|g' ${WRKSRC}/src/qt-tray-monitor/tray-monitor.pro.in
-	@${REINPLACE_CMD} -e 's|@bindir@/bat|@bindir@/${PORTNAME:S/16//}-bat|g' ${WRKSRC}/src/qt-console/bat.desktop.in
-
-post-build:
-.if ${PKGNAMEPREFIX} == "nagios-check_"
-	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
-.endif
-
-pre-install:
-.if ${PKGNAMESUFFIX} == "-traymonitor"
-.	for d in client director monitor storage
-		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
-		${FIND} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
-.	endfor
-.endif
-.if ${PKGNAMESUFFIX} == "-bat"
-	@${MV} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1
-	@${MV} ${WRKSRC}/src/qt-console/bat.desktop ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop
-.endif
-
-do-install:
-.if ${PKGNAMESUFFIX} == "-bat"
-# Install config files and preserve existing ones
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bareos/bat.conf.sample
-	${INSTALL_MAN}     ${WRKSRC}/manpages/${PORTNAME:S/16//}-bat.1          ${STAGEDIR}${PREFIX}/man/man1/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/bin/${PORTNAME:S/16//}-bat
-	${INSTALL_DATA}	${WRKSRC}/src/images/bat.png ${STAGEDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA}	${WRKSRC}/src/images/bat.svg ${STAGEDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/src/qt-console/${PORTNAME:S/16//}-bat.desktop ${STAGEDIR}${DESKTOPDIR}
-.endif
-.if ${PKGNAMEPREFIX} == "nagios-check_"
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
-	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
-	${STAGEDIR}${PREFIX}/libexec/nagios
-.endif
-.if ${PKGNAMESUFFIX} == "-client-static"
-	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
-	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
-.endif
-.if ${PKGNAMESUFFIX} == "-traymonitor"
-# Install config files and preserve existing ones
-.for d in client director monitor storage
-	${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
-.endif
diff --git a/sysutils/bareos16-server/distinfo b/sysutils/bareos16-server/distinfo
deleted file mode 100644
index 7b097f1d9a1f..000000000000
--- a/sysutils/bareos16-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1532378401
-SHA256 (bareos-bareos-Release-16.2.8_GH0.tar.gz) = 408b45e866d476a8af0cd091b81d9f61cfd1bb14a8d00cb951a755528cf4b860
-SIZE (bareos-bareos-Release-16.2.8_GH0.tar.gz) = 4287084
diff --git a/sysutils/bareos16-server/files/bareos-dir.in b/sysutils/bareos16-server/files/bareos-dir.in
deleted file mode 100644
index 38a209345d4e..000000000000
--- a/sysutils/bareos16-server/files/bareos-dir.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: head/sysutils/bareos-server/files/bareos-dir.in 323275 2013-07-19 09:44:58Z rm $
-#
-# PROVIDE: bareos_dir
-# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# bareos_dir_enable  (bool):   Set to NO by default.
-#                Set it to YES to enable bareos_dir.
-# bareos_dir_flags (params):   Set params used to start bareos_dir.
-# bareos_dir_config (params):  Path to the config file/directory
-#
-
-. /etc/rc.subr
-
-name="bareos_dir"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bareos_dir_enable="NO"}
-: ${bareos_dir_flags="-u bareos -g bareos -v"}
-: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"}
-: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
-
-command=%%PREFIX%%/sbin/bareos-dir
-command_args="-c ${bareos_dir_config}"
-pidfile="${bareos_dir_pidfile}"
-start_precmd="bareos_start_precmd"
-
-bareos_start_precmd() {
-	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
-}
-
-run_rc_command "$1"
diff --git a/sysutils/bareos16-server/files/bareos-fd.in b/sysutils/bareos16-server/files/bareos-fd.in
deleted file mode 100644
index f979cbf2dac1..000000000000
--- a/sysutils/bareos16-server/files/bareos-fd.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: head/sysutils/bacula5-server/files/bacula-fd.in 323275 2013-07-19 09:44:58Z rm $
-#
-# PROVIDE: bareos_fd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# bareos_fd_enable  (bool):  Set to NO by default.
-#               Set it to YES to enable bareos_fd.
-# bareos_fd_flags (params):  Set params used to start bareos_fd.
-# bareos_fd_config (params):  Path to the config file/directory
-#
-
-. /etc/rc.subr
-
-name="bareos_fd"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bareos_fd_enable="NO"}
-: ${bareos_fd_flags="-u root -g wheel -v"}
-: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"}
-: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
-
-command=%%PREFIX%%/sbin/bareos-fd
-command_args="-c ${bareos_fd_config}"
-pidfile="${bareos_fd_pidfile}"
-start_precmd="bareos_start_precmd"
-
-bareos_start_precmd() {
-	[ -d "${pidfile%/*}" ] || {
-		getent passwd bareos > /dev/null 2&>1
-		if [ $? -eq 0] ; then
-			# user bareos exists
-			install -d -o bareos -g bareos ${pidfile%/*}
-		else
-			# bareos_fd as solitair service
-			install -d -o root -g wheel ${pidfile%/*}
-		fi
-	}
-}
-
-run_rc_command "$1"
diff --git a/sysutils/bareos16-server/files/bareos-sd.in b/sysutils/bareos16-server/files/bareos-sd.in
deleted file mode 100644
index 4793e46fc6f4..000000000000
--- a/sysutils/bareos16-server/files/bareos-sd.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: head/sysutils/bacula5-server/files/bacula-sd.in 323486 2013-07-22 17:51:39Z rm $
-#
-# PROVIDE: bareos_sd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# bareos_sd_enable  (bool):  Set to NO by default.
-#               Set it to YES to enable bareos_sd.
-# bareos_sd_flags (params):  Set params used to start bareos_sd.
-# bareos_sd_config (params): Path to the config file/directory
-#
-
-. /etc/rc.subr
-
-name="bareos_sd"
-rcvar=${name}_enable
-
-load_rc_config $name
-
-: ${bareos_sd_enable="NO"}
-: ${bareos_sd_flags="-u bareos -g bareos -v"}
-: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"}
-: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
-
-command=%%PREFIX%%/sbin/bareos-sd
-command_args="-c ${bareos_sd_config}"
-pidfile="${bareos_sd_pidfile}"
-start_precmd="bareos_start_precmd"
-
-bareos_start_precmd() {
-	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
-}
-
-run_rc_command "$1"
diff --git a/sysutils/bareos16-server/files/patch-autoconf_Make.common.in b/sysutils/bareos16-server/files/patch-autoconf_Make.common.in
deleted file mode 100644
index 38093dc657b0..000000000000
--- a/sysutils/bareos16-server/files/patch-autoconf_Make.common.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- autoconf/Make.common.in	2016-11-09 23:17:41.055746000 -0500
-+++ autoconf/Make.common.in	2016-11-09 23:17:59.647897000 -0500
-@@ -62,8 +62,8 @@
- MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs
- INSTALL = @INSTALL@
- # add the -s to the following in PRODUCTION mode
--INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@
--INSTALL_LIB = $(INSTALL) -m 755
-+INSTALL_PROGRAM = $(INSTALL) -s -m @SBINPERM@
-+INSTALL_LIB = $(INSTALL) -s -m 755
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@
- INSTALL_CONFIG = $(INSTALL) -m 640
diff --git a/sysutils/bareos16-server/files/patch-configure b/sysutils/bareos16-server/files/patch-configure
deleted file mode 100644
index 2790798a4180..000000000000
--- a/sysutils/bareos16-server/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure	2015-08-08 15:47:12.347184000 -0500
-+++ configure	2015-08-08 15:48:11.164437000 -0500
-@@ -18626,7 +18626,7 @@
-           found_so=
-           found_a=
-           if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then
-               found_dir="$additional_libdir"
-               found_so="$additional_libdir/lib$name.$shlibext"
-               if test -f "$additional_libdir/lib$name.la"; then
-@@ -21466,7 +21466,7 @@
-           found_so=
-           found_a=
-           if test $use_additional = yes; then
--            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then
-               found_dir="$additional_libdir"
-               found_so="$additional_libdir/lib$name.$shlibext"
-               if test -f "$additional_libdir/lib$name.la"; then
diff --git a/sysutils/bareos16-server/files/patch-src-console-Makefile.in b/sysutils/bareos16-server/files/patch-src-console-Makefile.in
deleted file mode 100644
index b1526de9fb6f..000000000000
--- a/sysutils/bareos16-server/files/patch-src-console-Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/console/Makefile.in	2016-10-16 10:14:36.000000000 -0500
-+++ src/console/Makefile.in	2016-11-16 01:14:33.054997000 -0500
-@@ -28,6 +28,7 @@
- CONS_LIBS = @CONS_LIBS@
- 
- JANSSON_CPPFLAGS = @JANSSON_INC@
-+JANSSON_LDFLAGS = @JANSSON_LIBS@
- 
- INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
- 
-@@ -51,12 +52,12 @@
- bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
- 	      $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
- 
- static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
--	      $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS) $(GNUTLS_LIBS)
-+	      $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \
-+	      $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
- 	strip $@
- 
- 
-@@ -93,7 +94,7 @@
- 	$(MKDIR) $(DESTDIR)$(bindir)
- 	$(MKDIR) $(DESTDIR)$(sbindir)
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole;
--	@if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
-+	@if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
- 	@srcconf=bconsole.conf; \
- 	if  test -f ${DESTDIR}${confdir}/$$srcconf; then \
- 	   destconf=$$srcconf.new; \
diff --git a/sysutils/bareos16-server/files/patch-src-dird-Makefile.in b/sysutils/bareos16-server/files/patch-src-dird-Makefile.in
deleted file mode 100644
index 01552e34b512..000000000000
--- a/sysutils/bareos16-server/files/patch-src-dird-Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/dird/Makefile.in	2016-10-16 10:14:36.000000000 -0500
-+++ src/dird/Makefile.in	2016-11-09 15:47:36.135752000 -0500
-@@ -52,6 +52,7 @@
- INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp
- 
- JANSSON_CPPFLAGS = @JANSSON_INC@
-+JANSSON_LDFLAGS = @JANSSON_LIBS@
- 
- DIRD_RESTYPES = catalog client console counter director fileset job jobdefs messages pool profile schedule storage
- 
-@@ -83,7 +84,7 @@
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
- 	      $(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \
- 	      $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \
--	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS)
-+	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(LMDB_LIBS) $(JANSSON_LDFLAGS)
- 
- bareos-dbcheck: Makefile $(DBCHKOBJS) \
- 	 ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -94,7 +95,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \
- 	      -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
- 
- testfind: Makefile $(TSTFNDOBJS) \
- 	 ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -105,7 +106,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \
- 	      -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \
--	      $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	      $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
- 
- static-bareos-dir:  Makefile $(SVROBJS) \
- 	            ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \
-@@ -160,8 +161,8 @@
- 	            destconf="$$RESDIR/$$RES.new"; \
- 	            echo "    $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- 	         else \
--	            destconf="$$RESDIR/$$RES"; \
--	            echo "    $$RESTYPE/$$RES as \"$$destconf\""; \
-+	            destconf="$$RESDIR/$$RES.sample"; \
-+	            echo "    $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- 	         fi; \
- 	         ${INSTALL_CONFIG} "$$f" "$$destconf"; \
- 	         if test "x${dir_group}" != "x"; then \
-@@ -170,11 +171,6 @@
- 	      fi; \
- 	   done; \
- 	done
--	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir-export/client/
--	@if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
--	   echo "  ==> Saving existing query.sql to query.sql.old"; \
--	   $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
--	fi
- 	${INSTALL_DATA} query.sql ${DESTDIR}${scriptdir}/query.sql
- 	@if test -f static-bareos-dir; then \
- 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bareos-dir $(DESTDIR)$(sbindir)/static-bareos-dir; \
diff --git a/sysutils/bareos16-server/files/patch-src-filed-Makefile.in b/sysutils/bareos16-server/files/patch-src-filed-Makefile.in
deleted file mode 100644
index 9b38048feeba..000000000000
--- a/sysutils/bareos16-server/files/patch-src-filed-Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/files/Makefile.in	2016-10-16 10:14:36.000000000 -0500
-+++ src/filed/Makefile.in	2016-11-10 01:33:16.120709000 -0500
-@@ -25,6 +25,7 @@
- GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
- 
- JANSSON_CPPFLAGS = @JANSSON_INC@
-+JANSSON_LDFLAGS = @JANSSON_LIBS@
- COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
- 
- first_rule: all
-@@ -78,7 +79,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
- 	  -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
--	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	  $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
- 
- static-bareos-fd: Makefile $(SVROBJS) \
- 		  ../findlib/libbareosfind.a \
-@@ -87,7 +88,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- 	   -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
--	   $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS)
-+	   $(DLIB) $(WRAPLIBS) $(GETTEXT_STATIC_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
- 	strip $@
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
-@@ -137,8 +138,8 @@
- 	            destconf="$$RESDIR/$$RES.new"; \
- 	            echo "    $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- 	         else \
--	            destconf="$$RESDIR/$$RES"; \
--	            echo "    $$RESTYPE/$$RES as \"$$destconf\""; \
-+	            destconf="$$RESDIR/$$RES.sample"; \
-+	            echo "    $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- 	         fi; \
- 	         ${INSTALL_CONFIG} "$$f" "$$destconf"; \
- 	         if test "x${fd_group}" != "x"; then \
diff --git a/sysutils/bareos16-server/files/patch-src-plugins-filed_Makefile.in b/sysutils/bareos16-server/files/patch-src-plugins-filed_Makefile.in
deleted file mode 100644
index 4123527790de..000000000000
--- a/sysutils/bareos16-server/files/patch-src-plugins-filed_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/plugins/filed/Makefile.in	2017-03-12 19:49:48.441405000 -0500
-+++ src/plugins/filed/Makefile.in	2017-03-12 19:51:04.400881000 -0500
-@@ -93,7 +93,8 @@
- 
- install: all
- 	$(MKDIR) $(DESTDIR)$(plugindir)
--	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/
-+	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/fileset
-+	$(MKDIR) ${DESTDIR}${confdir}/bareos-dir.d/job
- 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bpipe-fd.la $(DESTDIR)$(plugindir)
- 	$(RMF) $(DESTDIR)$(plugindir)/bpipe-fd.la
- 	for plugin in $(BUILD_PLUGINS); do \
-@@ -110,7 +111,7 @@
- 			$(CP) *.py *.py.template $(DESTDIR)$(plugindir); \
- 			for i in `find python-ldap-conf.d/ \( -name "*.conf" -o -name "*.conf.example" \) -print | cut -d'/' -f2-`; do \
- 				$(MKDIR) `dirname ${DESTDIR}${confdir}/$$i`; \
--				$(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/$$i; \
-+				$(INSTALL_CONFIG) python-ldap-conf.d/$$i ${DESTDIR}${confdir}/`echo $$i | sed -e 's|example|sample|g'`; \
- 			done; \
- 		fi; \
- 	done
diff --git a/sysutils/bareos16-server/files/patch-src-plugins-stored-Makefile.in b/sysutils/bareos16-server/files/patch-src-plugins-stored-Makefile.in
deleted file mode 100644
index 7d4f8fb3b871..000000000000
--- a/sysutils/bareos16-server/files/patch-src-plugins-stored-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/stored/Makefile.in	2015-07-23 18:04:28.275396000 -0500
-+++ src/plugins/stored/Makefile.in	2015-07-23 18:05:09.508399000 -0500
-@@ -39,7 +39,7 @@
- 
- autoxflate-sd.la: Makefile \
- 		  autoxflate-sd$(DEFAULT_OBJECT_TYPE) \
--		  ../../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
-+		  $(LOCALBASE)/lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
- 	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -shared autoxflate-sd.lo -o $@ -rpath $(plugindir) -module -export-dynamic -avoid-version -L../../lib -lbareos
- 
- example-plugin-sd.la: Makefile example-plugin-sd$(DEFAULT_OBJECT_TYPE)
diff --git a/sysutils/bareos16-server/files/patch-src-qt-console-bat.pro.in b/sysutils/bareos16-server/files/patch-src-qt-console-bat.pro.in
deleted file mode 100644
index 71f1a0722c51..000000000000
--- a/sysutils/bareos16-server/files/patch-src-qt-console-bat.pro.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/qt-console/bat.pro.in	2015-07-25 17:11:07.807100000 -0500
-+++ src/qt-console/bat.pro.in	2015-07-25 17:11:57.110388000 -0500
-@@ -32,7 +32,7 @@
- DEPENDPATH   += .
- INCLUDEPATH  += .. ../include .
- QMAKE_LIBDIR += ../lib
--LIBS         += -lbareoscfg -lbareos
-+LIBS         += -lbareoscfg -lbareos -lintl
- LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
- LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
- QMAKE_LINK   = $${LIBTOOL_LINK} $(CXX)
diff --git a/sysutils/bareos16-server/files/patch-src-stored-Makefile.in b/sysutils/bareos16-server/files/patch-src-stored-Makefile.in
deleted file mode 100644
index 59938bea2720..000000000000
--- a/sysutils/bareos16-server/files/patch-src-stored-Makefile.in
+++ /dev/null
@@ -1,73 +0,0 @@
---- src/stored/Makefile.in	2016-10-16 10:14:36.000000000 -0500
-+++ src/stored/Makefile.in	2016-11-09 15:54:32.944172000 -0500
-@@ -93,6 +93,7 @@
- INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
- 
- JANSSON_CPPFLAGS = @JANSSON_INC@
-+JANSSON_LDFLAGS = @JANSSON_LIBS@
- 
- DEBUG = @DEBUG@
- GETTEXT_LIBS = @LIBINTL@
-@@ -170,7 +171,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(SDOBJS) \
- 	   $(NDMP_LIBS) -lbareossd -lbareoscfg -lbareos -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
--	   $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(SD_LIBS) $(GETTEXT_LIBS) $(COMPRESS_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
- 
- static-bareos-sd: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SDOBJS) \
- 	          ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) \
-@@ -192,7 +193,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \
- 	   -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \
--	   $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
- 
- bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
-      ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -201,7 +202,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
- 	   -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
--	   $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
- 
- bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
-           ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -210,7 +211,7 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
- 	   -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \
--	   $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
- 
- bscan:	Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
-         ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
-@@ -220,13 +221,13 @@
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- 	   -lbareossql -lbareoscats $(DB_LIBS) -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) \
--	   $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ${JANSSON_LDFLAGS}
- 
- bcopy:	Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(COPYOBJS) \
- 	../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
- 	@echo "Linking $@ ..."
- 	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \
--	   -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
- 
- Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
- 	cd $(topdir) \
-@@ -259,8 +260,8 @@
- 	            destconf="$$RESDIR/$$RES.new"; \
- 	            echo "    $$RESTYPE/$$RES as \"$$destconf\" (keep existing)"; \
- 	         else \
--	            destconf="$$RESDIR/$$RES"; \
--	            echo "    $$RESTYPE/$$RES as \"$$destconf\""; \
-+	            destconf="$$RESDIR/$$RES.sample"; \
-+	            echo "    $$RESTYPE/$$RES as \"$$destconf\".sample"; \
- 	         fi; \
- 	         ${INSTALL_CONFIG} "$$f" "$$destconf"; \
- 	         if test "x${sd_group}" != "x"; then \
diff --git a/sysutils/bareos16-server/files/patch-src-tools_Makefile.in b/sysutils/bareos16-server/files/patch-src-tools_Makefile.in
deleted file mode 100644
index 9b88111018d5..000000000000
--- a/sysutils/bareos16-server/files/patch-src-tools_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tools/Makefile.in	2016-10-16 10:14:36.000000000 -0500
-+++ src/tools/Makefile.in	2016-11-09 22:56:53.069629000 -0500
-@@ -130,7 +130,7 @@
- 	$(MKDIR) $(DESTDIR)$(sbindir)
- 	@for tool in ${TOOLS_BIN} ; do \
- 	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(bindir)/$$tool ; \
--	   if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) $(bindir)/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \
-+	   if ! [ -r $(DESTDIR)$(sbindir)/$$tool ]; then $(SYMLINK) ../bin/$$tool $(DESTDIR)$(sbindir)/$$tool; fi; \
- 	done
- 	# Allow non-root execution of bsmtp for non-root Directors
- 	chmod 755 $(DESTDIR)$(bindir)/bsmtp
diff --git a/sysutils/bareos16-server/pkg-plist b/sysutils/bareos16-server/pkg-plist
deleted file mode 100644
index 19d08f4d2dc0..000000000000
--- a/sysutils/bareos16-server/pkg-plist
+++ /dev/null
@@ -1,156 +0,0 @@
-@sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
-%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
-bin/bregex
-bin/bsmtp
-bin/bwild
-lib/bareos/plugins/BareosSdPluginBaseclass.py
-lib/bareos/plugins/BareosSdWrapper.py
-lib/bareos/plugins/bareos-sd-class-plugin.py
-lib/bareos/plugins/bareos_sd_consts.py
-lib/bareos/plugins/bareos-sd.py.template
-%%PYTHON%%lib/bareos/plugins/python-sd.so
-lib/bareos/plugins/autoxflate-sd.so
-lib/bareos/plugins/BareosDirPluginBaseclass.py
-lib/bareos/plugins/BareosDirWrapper.py
-lib/bareos/plugins/bareos-dir-class-plugin.py
-lib/bareos/plugins/bareos_dir_consts.py
-lib/bareos/plugins/bareos-dir.py.template
-%%PYTHON%%lib/bareos/plugins/python-dir.so
-%%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
-%%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
-lib/bareos/scripts/bconsole
-lib/bareos/scripts/bareos
-lib/bareos/scripts/bareos_config
-lib/bareos/scripts/bareos-ctl-funcs
-lib/bareos/scripts/bareos-ctl-dir
-lib/bareos/scripts/bareos-ctl-fd
-lib/bareos/scripts/bareos-ctl-sd
-lib/bareos/scripts/mtx-changer
-lib/bareos/scripts/disk-changer
-lib/bareos/scripts/btraceback.gdb
-lib/bareos/scripts/btraceback.dbx
-lib/bareos/scripts/btraceback.mdb
-lib/bareos/scripts/bareos-config
-lib/bareos/scripts/bareos-config-lib.sh
-lib/bareos/scripts/bareos-explorer
-lib/bareos/scripts/bareos-glusterfind-wrapper
-lib/bareos/scripts/create_bareos_database
-lib/bareos/scripts/update_bareos_tables
-lib/bareos/scripts/make_bareos_tables
-lib/bareos/scripts/grant_bareos_privileges
-lib/bareos/scripts/drop_bareos_tables
-lib/bareos/scripts/drop_bareos_database
-lib/bareos/scripts/ddl/versions.map
-lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
-%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
-%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
-%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
-%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
-lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
-lib/bareos/scripts/make_catalog_backup.pl
-lib/bareos/scripts/make_catalog_backup
-lib/bareos/scripts/delete_catalog_backup
-lib/bareos/scripts/query.sql
-%%NDMP%%lib/libbareosndmp-%%LIB_VERSION%%.so
-%%NDMP%%lib/libbareosndmp.la
-%%NDMP%%lib/libbareosndmp.so
-lib/libbareoscats-%%DBTYPE%%-%%LIB_VERSION%%.so
-lib/libbareoscats-%%DBTYPE%%.so
-lib/libbareoscats-%%LIB_VERSION%%.so
-lib/libbareoscats.la
-lib/libbareoscats.so
-lib/libbareossd-%%LIB_VERSION%%.so
-lib/libbareossd.la
-lib/libbareossd.so
-lib/libbareossql-%%LIB_VERSION%%.so
-lib/libbareossql.la
-lib/libbareossql.so
-man/man1/bareos-tray-monitor.1.gz
-man/man1/bregex.1.gz
-man/man1/bsmtp.1.gz
-man/man1/bwild.1.gz
-man/man8/bareos-dbcheck.8.gz
-man/man8/bareos-dir.8.gz
-man/man8/bareos-sd.8.gz
-man/man8/bareos.8.gz
-man/man8/bcopy.8.gz
-man/man8/bextract.8.gz
-man/man8/bls.8.gz
-man/man8/bscan.8.gz
-man/man8/btape.8.gz
-man/man8/btraceback.8.gz
-sbin/bareos
-sbin/bareos-dbcheck
-sbin/bareos-dir
-sbin/bareos-sd
-sbin/bcopy
-sbin/bextract
-sbin/bls
-sbin/bpluginfo
-sbin/bregex
-sbin/bscan
-sbin/bscrypto
-sbin/bsmtp
-sbin/btape
-sbin/btraceback
-sbin/bwild
-sbin/chio-bareos
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
-@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
-@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage
-@dir(bareos,bareos,) %%BAREOS_DIR%%
-@dir(bareos,bareos,) /var/log/bareos
-@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos16-server/pkg-plist.client b/sysutils/bareos16-server/pkg-plist.client
deleted file mode 100644
index 4731763d4bad..000000000000
--- a/sysutils/bareos16-server/pkg-plist.client
+++ /dev/null
@@ -1,54 +0,0 @@
-@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
-@group bareos
-@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
-@group bareos
-%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
-%%PYTHON%%@group bareos
-%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
-%%PYTHON%%@group bareos
-%%PYTHON%%@sample %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
-%%PYTHON%%@group bareos
-@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
-@group wheel
-%%LMDB%%@sample %%ETCDIR%%/plugin-python-ldap.conf.sample
-lib/libbareos.la
-lib/libbareos.so
-lib/libbareos-%%LIB_VERSION%%.so
-lib/libbareoscfg.la
-lib/libbareoscfg.so
-lib/libbareoscfg-%%LIB_VERSION%%.so
-lib/libbareosfind.la
-lib/libbareosfind.so
-lib/libbareosfind-%%LIB_VERSION%%.so
-%%LMDB%%lib/libbareoslmdb.la
-%%LMDB%%lib/libbareoslmdb.so
-%%LMDB%%lib/libbareoslmdb-%%LIB_VERSION%%.so
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
-%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
-%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
-lib/bareos/plugins/bpipe-fd.so
-%%PYTHON%%lib/bareos/plugins/python-fd.so
-man/man8/bareos-fd.8.gz
-man/man1/bconsole.1.gz
-sbin/bareos-fd
-@group bareos
-sbin/bconsole
-bin/bconsole
-@group wheel
-@dir(bareos,bareos,)  %%BAREOS_DIR%%
-%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
-%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
-@dir lib/bareos/plugins
-@dir lib/bareos/scripts
-@dir(bareos,bareos,) /var/log/bareos
-@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos17-client-static/Makefile b/sysutils/bareos17-client-static/Makefile
index b6855572b9c5..c2628a55f14d 100644
--- a/sysutils/bareos17-client-static/Makefile
+++ b/sysutils/bareos17-client-static/Makefile
@@ -1,10 +1,11 @@
-# $FreeBSD$
-
-PORTNAME=	bareos17
-PKGNAMESUFFIX=	-client-static
+PORTNAME=	bareos
+PKGNAMESUFFIX=	17-client-static
 
 COMMENT=	Backup archiving recovery open sourced (static client)
 
+BROKEN_aarch64=	Fails to link: missing sbrk
+BROKEN_riscv64=	Fails to link: missing sbrk
+
 CONFLICTS=	bareos16-client-static-*
 
 PLIST=		${.CURDIR}/pkg-plist
@@ -24,6 +25,4 @@ CONFIGURE_ARGS+=	--enable-client-only \
 			--disable-build-stored \
 			--with-jansson=${LOCALBASE}
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos17-client/Makefile b/sysutils/bareos17-client/Makefile
index abd7a14cfc99..7bd885edfe05 100644
--- a/sysutils/bareos17-client/Makefile
+++ b/sysutils/bareos17-client/Makefile
@@ -1,11 +1,10 @@
-# $FreeBSD$
-
 PORTNAME=	bareos
-PKGNAMESUFFIX=	-client
+PKGNAMESUFFIX=	17-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 BROKEN_aarch64=	Fails to link: missing sbrk
+BROKEN_riscv64=	Fails to link: missing sbrk
 
 CONFLICTS=	bareos16-client-* bareos-client-*
 
diff --git a/sysutils/bareos17-server/Makefile b/sysutils/bareos17-server/Makefile
index 6923315702cd..412e279342f9 100644
--- a/sysutils/bareos17-server/Makefile
+++ b/sysutils/bareos17-server/Makefile
@@ -1,12 +1,10 @@
-# $FreeBSD$
-
-PORTNAME=	bareos17
+PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	17.2.7
-PORTREVISION?=	4
+DISTVERSION=	17.2.9
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
-PKGNAMESUFFIX?=	-server
+PKGNAMESUFFIX?=	17-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
@@ -19,10 +17,8 @@ CONFLICTS?=	bacula*-server-* bareos16-server-*
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
-USES+=		libtool:keepla pkgconfig readline:port shebangfix
+USES+=		libtool:keepla pkgconfig readline shebangfix
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME:S/17//}
-GH_PROJECT=	${PORTNAME:S/17//}
 
 USERS=		bareos
 GROUPS=		${USERS}
@@ -37,8 +33,6 @@ SHEBANG_FILES=	${WRKSRC}/src/cats/make_catalog_backup.pl.in
 CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-ETCDIR=		${PREFIX}/etc/${PORTNAME:S/17//}
-
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SINGLE=		CRYPTO
 OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
@@ -48,7 +42,7 @@ MTX_DESC=		Install mtx for control of autochanger devices
 NDMP_DESC=		Enable build of NDMP support
 SCSICRYPTO_DESC=	Build LTO AME crypto plugin
 
-.if ${PKGNAMESUFFIX} == "-server"
+.if ${PKGNAMESUFFIX} == "17-server"
 OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
 OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
 OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
@@ -69,7 +63,7 @@ OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
 SCSICRYPTO_CONFIGURE_ON=	--enable-scsi-crypto=yes
 SCSICRYPTO_CONFIGURE_OFF=	--enable-scsi-crypto=no
 
-.if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
+.if ${PKGNAMESUFFIX} == "17-client" || ${PKGNAMESUFFIX} == "17-server"  #Till end of the file
 PYTHON_USES=		  python
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
@@ -110,7 +104,8 @@ CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
 .if defined(WITH_CLIENT_ONLY)
 LMDB_CONFIGURE_ON=	--enable-lmdb=yes
 LMDB_CONFIGURE_OFF=	--enable-lmdb=no
-LMDB_CFLAGS=		-DMDB_DSYNC=O_SYNC
+LMDB_CFLAGS=		-DMDB_DSYNC=O_SYNC \
+			-DMDB_USE_POSIX_MUTEX=1
 
 CONFIGURE_ARGS+=--with-fd-user=root \
 		--with-fd-group=wheel
@@ -154,7 +149,7 @@ CONFFILES=		sd dir
 # Server default database
 
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
-MYSQL_USE=	MYSQL=yes
+MYSQL_USES=	mysql
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
@@ -194,6 +189,7 @@ post-patch:
 #	Default bconsole.conf is in ${ETCDIR}
 	@${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
 	@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/bin/python-config|${PYTHON_CMD}-config|g' ${WRKSRC}/configure
 .if defined(WITH_CLIENT_ONLY)
 	@${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
@@ -201,9 +197,9 @@ post-patch:
 #	In server port don't install filed
 	@${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
 		-e 's|src/lib||' -e 's|src/findlib||' -e 's|@FD_PLUGIN_DIR@||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|../lib/|$$(LOCALBASE)/lib/|g' -e 's|../findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
+	@${REINPLACE_CMD} -e 's|\.\./lib/|$$(LOCALBASE)/lib/|g' -e 's|\.\./findlib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/dird/Makefile.in \
 		${WRKSRC}/src/stored/Makefile.in ${WRKSRC}/src/tools/Makefile.in ${WRKSRC}/src/tests/Makefile.in
-	@${REINPLACE_CMD} -e 's|../../lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in
+	@${REINPLACE_CMD} -e 's|\.\./\.\./lib/|$$(LOCALBASE)/lib/|g' ${WRKSRC}/src/plugins/dird/Makefile.in ${WRKSRC}/src/plugins/stored/Makefile.in
 	@${REINPLACE_CMD} -e 's|fd_plugins.h|filed/fd_plugins.h|g' -e 's|dir_plugins.h|dird/dir_plugins.h|g' -e 's|stored.h|stored/stored.h|g' \
 		${WRKSRC}/src/tools/bpluginfo.c
 	@${REINPLACE_CMD} -e 's|perl|$(LOCALBASE)/bin/perl|g' ${WRKSRC}/scripts/mtx-changer.in
@@ -235,5 +231,5 @@ post-install:
 .endif
 .else
 .include "${MASTERDIR}/Makefile.common"
-.endif # -client and -server are defined
+.endif # 17-client and 17-server are defined
 .include <bsd.port.mk>
diff --git a/sysutils/bareos17-server/Makefile.common b/sysutils/bareos17-server/Makefile.common
index 5ae778ccc4ae..0cb0e9014b59 100644
--- a/sysutils/bareos17-server/Makefile.common
+++ b/sysutils/bareos17-server/Makefile.common
@@ -1,5 +1,4 @@
 # Created by: Alonso Cardenas <acm@FreeBSD.org>
-# $FreeBSD$
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|_NONSHARED||g' ${WRKSRC}/src/filed/Makefile.in
@@ -11,7 +10,7 @@ post-build:
 .endif
 
 pre-install:
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if ${PKGNAMESUFFIX} == "17-traymonitor"
 .	for d in client director monitor storage
 		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
 		${FIND} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
@@ -24,11 +23,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
 	${STAGEDIR}${PREFIX}/libexec/nagios
 .endif
-.if ${PKGNAMESUFFIX} == "-client-static"
+.if ${PKGNAMESUFFIX} == "17-client-static"
 	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
 	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
 .endif
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if ${PKGNAMESUFFIX} == "17-traymonitor"
 # Install config files and preserve existing ones
 .for d in client director monitor storage
 	${INSTALL_SCRIPT} ${WRKSRC}/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
diff --git a/sysutils/bareos17-server/distinfo b/sysutils/bareos17-server/distinfo
index 8186063097ce..0a46992e7c74 100644
--- a/sysutils/bareos17-server/distinfo
+++ b/sysutils/bareos17-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535610174
-SHA256 (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 99a5f907e3422532c783ee254dcf5c737d2b1b53522c00924d3e1009289d2fd2
-SIZE (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 4184028
+TIMESTAMP = 1589322594
+SHA256 (bareos-bareos-Release-17.2.9_GH0.tar.gz) = 617b88902710c2581470df54c45d2411a11f1d63554b935f308877a9510f9347
+SIZE (bareos-bareos-Release-17.2.9_GH0.tar.gz) = 4190637
diff --git a/sysutils/bareos17-server/files/bareos-dir.in b/sysutils/bareos17-server/files/bareos-dir.in
index 1d92025ae9a1..86b62370cbb7 100644
--- a/sysutils/bareos17-server/files/bareos-dir.in
+++ b/sysutils/bareos17-server/files/bareos-dir.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/bareos-server/files/bareos-dir.in 323275 2013-07-19 09:44:58Z rm $
-#
+
 # PROVIDE: bareos_dir
 # REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
 # KEYWORD: shutdown
diff --git a/sysutils/bareos17-server/files/bareos-fd.in b/sysutils/bareos17-server/files/bareos-fd.in
index 2a45ee7dfb47..54647786b12c 100644
--- a/sysutils/bareos17-server/files/bareos-fd.in
+++ b/sysutils/bareos17-server/files/bareos-fd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/bacula5-server/files/bacula-fd.in 323275 2013-07-19 09:44:58Z rm $
-#
+
 # PROVIDE: bareos_fd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/bareos17-server/files/bareos-sd.in b/sysutils/bareos17-server/files/bareos-sd.in
index 9c9df6de204b..a5efe78e80f7 100644
--- a/sysutils/bareos17-server/files/bareos-sd.in
+++ b/sysutils/bareos17-server/files/bareos-sd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/bacula5-server/files/bacula-sd.in 323486 2013-07-22 17:51:39Z rm $
-#
+
 # PROVIDE: bareos_sd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/bareos17-server/files/patch-src-plugins-dird_python-dir.c b/sysutils/bareos17-server/files/patch-src-plugins-dird_python-dir.c
new file mode 100644
index 000000000000..6c0c64d50c2d
--- /dev/null
+++ b/sysutils/bareos17-server/files/patch-src-plugins-dird_python-dir.c
@@ -0,0 +1,61 @@
+--- src/plugins/dird/python-dir.c	2019-12-29 01:43:39.125609000 -0500
++++ src/plugins/dird/python-dir.c	2019-12-29 01:48:30.581353000 -0500
+@@ -34,6 +34,13 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#endif
++
+ static const int dbglvl = 150;
+ 
+ #define PLUGIN_LICENSE      "Bareos AGPLv3"
+@@ -114,6 +121,20 @@
+  */
+ static PyThreadState *mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosDIRModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareosdir",
++  NULL,
++  -1,
++  BareosDIRMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -675,7 +696,11 @@
+       /*
+        * Make our callback methods available for Python.
+        */
++#if (PY_VERSION_HEX >  0x03050000)
++      p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef);
++#else
+       p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods);
++#endif
+    }
+ 
+    /*
+@@ -955,7 +980,11 @@
+       char *value;
+ 
+       ctx = PyGetbpContext(pyCtx);
++#if (PY_VERSION_HEX >  0x03050000)
++      value = bstrdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+          retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value);
+       }
diff --git a/sysutils/bareos17-server/files/patch-src-plugins-filed_python-fd.c b/sysutils/bareos17-server/files/patch-src-plugins-filed_python-fd.c
new file mode 100644
index 000000000000..0e5578ed4607
--- /dev/null
+++ b/sysutils/bareos17-server/files/patch-src-plugins-filed_python-fd.c
@@ -0,0 +1,111 @@
+--- src/plugins/filed/python-fd.c	2019-12-29 01:20:40.033054000 -0500
++++ src/plugins/filed/python-fd.c	2019-12-29 01:27:28.921617000 -0500
+@@ -37,6 +37,14 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#define PyString_Check PyBytes_Check
++#endif
++
+ static const int dbglvl = 150;
+ 
+ #define PLUGIN_LICENSE      "Bareos AGPLv3"
+@@ -162,6 +170,20 @@
+  */
+ static PyThreadState *mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosFDModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareosfd",
++  NULL,
++  -1,
++  BareosFDMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -1225,7 +1247,11 @@
+       /*
+        * Make our callback methods available for Python.
+        */
++#if (PY_VERSION_HEX >  0x03050000)
++      p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef);
++#else
+       p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods);
++#endif
+ 
+       /*
+        * Fill in the slots of PyRestoreObject
+@@ -2702,8 +2728,11 @@
+    }
+    case bVarFileSeen: {
+       char *value;
+-
++#if (PY_VERSION_HEX >  0x03050000)
++      value = bstrdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+          retval = bfuncs->setBareosValue(ctx, (bVariable)var, value);
+       }
+@@ -3090,7 +3119,11 @@
+    sp.type = pSavePkt->type;
+    if (pSavePkt->fname) {
+       if (PyString_Check(pSavePkt->fname)) {
++#if (PY_VERSION_HEX >  0x03050000)
++         sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
++#else
+          sp.fname = PyString_AsString(pSavePkt->fname);
++#endif
+       } else {
+          goto bail_out;
+       }
+@@ -3099,7 +3132,11 @@
+    }
+    if (pSavePkt->link) {
+       if (PyString_Check(pSavePkt->link)) {
++#if (PY_VERSION_HEX >  0x03050000)
++         sp.link = bstrdup(PyString_AsString(pSavePkt->link));
++#else
+          sp.link = PyString_AsString(pSavePkt->link);
++#endif
+       } else {
+          goto bail_out;
+       }
+@@ -3142,7 +3179,11 @@
+     */
+    if (pSavePkt->fname) {
+       if (PyString_Check(pSavePkt->fname)) {
++#if (PY_VERSION_HEX >  0x03050000)
++         sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
++#else
+          sp.fname = PyString_AsString(pSavePkt->fname);
++#endif
+       } else {
+          goto bail_out;
+       }
+@@ -3219,7 +3260,11 @@
+       return (char *)"";
+    }
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++   return bstrdup(PyString_AsString(object));
++#else
+    return PyString_AsString(object);
++#endif
+ }
+ 
+ static inline char *PyGetByteArrayValue(PyObject *object)
diff --git a/sysutils/bareos17-server/files/patch-src-plugins-stored_python-sd.c b/sysutils/bareos17-server/files/patch-src-plugins-stored_python-sd.c
new file mode 100644
index 000000000000..5fcedbb67002
--- /dev/null
+++ b/sysutils/bareos17-server/files/patch-src-plugins-stored_python-sd.c
@@ -0,0 +1,61 @@
+--- src/plugins/stored/python-sd.c	2019-12-29 01:43:28.821366000 -0500
++++ src/plugins/stored/python-sd.c	2019-12-29 01:45:39.796709000 -0500
+@@ -34,6 +34,13 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#endif
++
+ static const int dbglvl = 150;
+ 
+ #define PLUGIN_LICENSE      "Bareos AGPLv3"
+@@ -114,6 +121,20 @@
+  */
+ static PyThreadState *mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosSDModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareossd",
++  NULL,
++  -1,
++  BareosSDMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -695,7 +716,11 @@
+       /*
+        * Make our callback methods available for Python.
+        */
++#if (PY_VERSION_HEX >  0x03050000)
++      p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef);
++#else
+       p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods);
++#endif
+    }
+ 
+    /*
+@@ -976,7 +1001,11 @@
+       char *value;
+ 
+       ctx = PyGetbpContext(pyCtx);
++#if (PY_VERSION_HEX >  0x03050000)
++      value = bstrdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+          bfuncs->setBareosValue(ctx, (bsdwVariable)var, value);
+       }
diff --git a/sysutils/bareos17-server/files/patch-src-stored-Makefile.in b/sysutils/bareos17-server/files/patch-src-stored-Makefile.in
index 342274c92317..a5fed4df9a1f 100644
--- a/sysutils/bareos17-server/files/patch-src-stored-Makefile.in
+++ b/sysutils/bareos17-server/files/patch-src-stored-Makefile.in
@@ -43,7 +43,7 @@
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(TAPEOBJS) \
  	   -lbareossd -lbareoscfg -lbareos $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) \
 -	   $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
++	   $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
  
  bls: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BLSOBJS) \
 -     ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@@ -56,7 +56,7 @@
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
  	   -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
 -	   $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
++	   $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
  
  bextract: Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(BEXTOBJS) \
 -          ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@@ -69,7 +69,7 @@
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) \
  	   -lbareossd -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) $(SD_LIBS) $(BEXTRACT_LIBS) \
 -	   $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
++	   $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
  
  bscan:	Makefile libbareossd$(DEFAULT_ARCHIVE_TYPE) $(SCNOBJS) \
 -        ../findlib/libbareosfind$(DEFAULT_ARCHIVE_TYPE) \
@@ -90,7 +90,7 @@
  	@echo "Linking $@ ..."
  	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -o $@ $(COPYOBJS) \
 -	   -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
-+	   -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED)
++	   -lbareossd -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
  
  Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
  	cd $(topdir) \
diff --git a/sysutils/bareos18-client/Makefile b/sysutils/bareos18-client/Makefile
new file mode 100644
index 000000000000..8fbbabb028da
--- /dev/null
+++ b/sysutils/bareos18-client/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	bareos
+PKGNAMESUFFIX=	18-client
+
+COMMENT=	Backup archiving recovery open sourced (client)
+
+BROKEN_aarch64=	Fails to link: missing sbrk
+BROKEN_riscv64=	Fails to link: missing sbrk
+
+CONFLICTS=	bareos17-client-* bareos16-client-* bareos-client-*
+
+WITH_CLIENT_ONLY=yes
+USE_RC_SUBR=	bareos-fd
+
+PLIST=		${PKGDIR}/pkg-plist.client
+MASTERDIR=	${.CURDIR}/../../sysutils/bareos18-server
+
+OPTIONS_GROUP=	PLUGINS
+OPTIONS_GROUP_PLUGINS=	CEPHFS GFAPI RADOS
+OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
+
+CEPHFS_DESC=	CEPHFS fd plugin support
+GFAPI_DESC=	GFAPI fd plugin support
+RADOS_DESC=	RADOS fd plugin support
+LMDB_DESC=	Enable build of LMDB support
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos18-client/bareos-client/Makefile b/sysutils/bareos18-client/bareos-client/Makefile
new file mode 100644
index 000000000000..5bcb6afd2c5a
--- /dev/null
+++ b/sysutils/bareos18-client/bareos-client/Makefile
@@ -0,0 +1,20 @@
+
+PORTNAME=	bareos
+PKGNAMESUFFIX=	-client
+
+COMMENT=	Backup archiving recovery open sourced (client)
+
+BROKEN_aarch64=	Fails to link: missing sbrk
+
+CONFLICTS=	bareos16-client-* bareos17-client-*
+
+WITH_CLIENT_ONLY=yes
+USE_RC_SUBR=	bareos-fd
+
+PLIST=		${PKGDIR}/pkg-plist.client
+MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
+
+OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
+LMDB_DESC=	Enable build of LMDB support
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos18-server/Makefile b/sysutils/bareos18-server/Makefile
new file mode 100644
index 000000000000..b51b4ca9ee3e
--- /dev/null
+++ b/sysutils/bareos18-server/Makefile
@@ -0,0 +1,241 @@
+PORTNAME=	bareos
+DISTVERSIONPREFIX=	Release/
+DISTVERSION=	18.2.10
+PORTREVISION?=	2
+CATEGORIES?=	sysutils
+PKGNAMEPREFIX?=	#
+PKGNAMESUFFIX?=	18-server
+
+MAINTAINER=	acm@FreeBSD.org
+COMMENT?=	Backup archiving recovery open sourced (server)
+
+LICENSE=	AGPLv3 LGPL3
+LICENSE_COMB=	multi
+
+CONFLICTS?=	bacula17*-server-* bareos16-server-* bareos-server-*
+
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
+		libjansson.so:devel/jansson
+
+USES+=		cmake:insource compiler:c++11-lang localbase perl5 pkgconfig \
+		readline shebangfix
+USE_GITHUB=	yes
+USE_PERL5=	run
+
+USERS=		bareos
+GROUPS=		${USERS}
+
+PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
+
+USE_LDCONFIG=	yes
+SHEBANG_LANG=	perl
+SHEBANG_FILES=	${WRKSRC}/core/src/cats/make_catalog_backup.pl.in
+
+CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_SINGLE=		CRYPTO
+OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
+OPTIONS_SUB=		yes
+CRYPTO_DESC=		Cryptographic library
+MTX_DESC=		Install mtx for control of autochanger devices
+NDMP_DESC=		Enable build of NDMP support
+SCSICRYPTO_DESC=	Build LTO AME crypto plugin
+
+.if ${PKGNAMESUFFIX} == "18-server"
+OPTIONS_GROUP=	BACKENDS
+OPTIONS_GROUP_BACKENDS=	CEPHFS GFAPI RADOS
+OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
+OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
+OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
+OPTIONS_SINGLE+=		DATABASE
+DATABASE_DESC=		Database support
+CEPHFS_DESC=	CEPHFS backend support
+GFAPI_DESC=	GFAPI backend support
+RADOS_DESC=	RADOS backend support
+
+NDMP_CMAKE_ON=	-Dndmp=ON
+NDMP_CMAKE_OFF=	-Dndmp=OFF
+.endif
+
+GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+
+OPENSSL_USES=		ssl
+OPENSSL_CMAKE_ON=	-Dopenssl=ON
+OPENSSL_CMAKE_OFF=	-Dopenssl=OFF
+
+SCSICRYPTO_CMAKE_ON=	-Dscsi-crypto=ON
+SCSICRYPTO_CMAKE_OFF=	-Dscsi-crypto=OFF
+
+.if ${PKGNAMESUFFIX} == "18-client" || ${PKGNAMESUFFIX} == "18-server"  #Till end of the file
+PYTHON_USES=		python
+PYTHON_CMAKE_ON=	-Dpython=ON
+PYTHON_CMAKE_OFF=	-Dpython=OFF
+PYTHON_PLUGIN=		yes
+
+.if !defined(WITH_CLIENT_ONLY)
+LIB_DEPENDS+=	libbareos.so:sysutils/bareos18-client
+USE_RC_SUBR?=	bareos-dir bareos-sd
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
+.else
+SUB_FILES+=	pkg-message.server
+.endif
+
+CMAKE_ARGS+=	-Dtcp-wrappers=ON \
+		-Dsmartalloc=OFF \
+		-Dsysconfdir=${PREFIX}/etc \
+		-Darchivedir=${BAREOS_DIR}/storage \
+		-Dworkingdir=${BAREOS_DIR} \
+		-Dconfdir=${PREFIX}/etc/bareos \
+		-Dlibdir=${PREFIX}/lib \
+		-Dlogdir=/var/log/bareos \
+		-Dincludedir=${PREFIX}/include/bareos \
+		-Dreadline=ON \
+		-Ddisable-conio=ON \
+		-Dbatch-insert=ON \
+		-Dhave_plugins=ON \
+		-Dplugindir=${PREFIX}/lib/bareos/plugins \
+		-Dscriptdir=${PREFIX}/lib/bareos/scripts \
+		-Dbackenddir=${PREFIX}/lib/bareos/backends \
+		-Ddump_email=root@localhost \
+		-Djob_email=root@localhost \
+		-Ddb_name=bareos \
+		-Dsbin-perm=755 \
+		-Ddb_user=bareos \
+		-Dbaseport=9101 \
+		-Dpiddir=/var/run/bareos \
+
+.if defined(WITH_CLIENT_ONLY)
+LMDB_CMAKE_ON=	-Dlmdb=ON
+LMDB_CMAKE_OFF=	-Dlmdb=OFF
+LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
+
+CMAKE_ARGS+=	-Dfd-user=root \
+		-Dfd-group=wheel
+.else
+CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
+		-Ddir-group=${BAREOS_GROUP} \
+		-Dsd-user=${BAREOS_USER} \
+		-Dsd-group=operator \
+		-Dlmdb=OFF
+.endif
+
+# The user/group IDs below are registered, see
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
+#
+BAREOS_USER?=	bareos
+BAREOS_GROUP?=	${BAREOS_USER}
+BAREOS_UID?=	997
+BAREOS_GID?=	${BAREOS_UID}
+BAREOS_DIR?=	/var/db/bareos
+
+PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
+
+SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
+		BAREOS_GROUP=${BAREOS_GROUP} \
+		BAREOS_UID=${BAREOS_UID} \
+		BAREOS_GID=${BAREOS_GID} \
+		BAREOS_DIR=${BAREOS_DIR}
+
+NLS_USES=		gettext
+NLS_CMAKE_ON=		-Dnls=ON
+CEPHFS_CMAKE_ON=	-Dcephfs=ON
+CEPHFS_LIB_DEPENDS=	libcephfs.so:net/ceph14
+GFAPI_CMAKE_ON=		-Dgfapi=ON
+GFAPI_LIB_DEPENDS=	libglusterfs.so:net/glusterfs
+RADOS_CMAKE_ON=		-Drados=ON -Dcephfs=ON
+RADOS_LIB_DEPENDS=	librados.so:net/ceph14
+
+# Client only or full server version
+.if defined(WITH_CLIENT_ONLY)
+CONFFILES=	fd
+CMAKE_ARGS+=	-Dclient-only=ON
+
+PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
+PKGINSTALL=	${FILESDIR}/pkg-install.client
+.else
+# Server only Options
+CONFFILES=		sd dir
+CMAKE_ARGS+=	-Dbuild-dird=ON \
+		-Dbuild-stored=ON \
+		-Dbuild_client_only=OFF
+# Server default database
+
+MYSQL_CMAKE_ON=		-Dmysql=ON
+MYSQL_USES=	mysql
+SQLITE3_CMAKE_ON=	-Dsqlite3=ON
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+PGSQL_CMAKE_ON=		-Dpostgresql=ON
+PGSQL_USES=	pgsql
+
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+DBTYPE=			mysql
+SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
+.elif ${PORT_OPTIONS:MSQLITE3}
+DBTYPE=			sqlite3
+.else
+DBTYPE=			postgresql
+SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
+.endif
+PLIST_SUB+=		DBTYPE=${DBTYPE}
+
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+MP1+=	bconsole.1
+MP8+=	bareos-fd.8
+.else
+MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
+	btape.8 btraceback.8 bareos-dbcheck.8
+MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
+.endif
+
+MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
+
+post-patch:
+	@${REINPLACE_CMD}  '42d' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|api/glfs.h|glusterfs/api/glfs.h|g' \
+		${WRKSRC}/core/src/stored/backends/gfapi_device.h
+	@${REINPLACE_CMD} -e 's|sm_dump(false)|sm_dump(jcr,false)|g' \
+		${WRKSRC}/core/src/tools/btestls.cc
+.if ${PKGNAMESUFFIX} == "18-server"
+	@${REINPLACE_CMD}  '25d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
+.endif
+
+post-extract:
+.if defined(WITH_CLIENT_ONLY)
+.	if defined(PYTHON_PLUGIN)
+		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset
+		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job
+.	endif
+.endif
+	@${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
+		${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
+
+.if !target(post-install)
+post-install:
+.if defined(WITH_CLIENT_ONLY)
+	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
+	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
+.else
+	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
+	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
+	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
+	${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
+.endif
+	@${MKDIR} ${STAGEDIR}/var/run/bareos
+.endif
+.else
+.include "${MASTERDIR}/Makefile.common"
+.endif # 18-client and 18-server are defined
+.include <bsd.port.mk>
diff --git a/sysutils/bareos18-server/Makefile.common b/sysutils/bareos18-server/Makefile.common
new file mode 100644
index 000000000000..7c9e646a9e2a
--- /dev/null
+++ b/sysutils/bareos18-server/Makefile.common
@@ -0,0 +1,30 @@
+# Created by: Alonso Cardenas <acm@FreeBSD.org>
+
+post-build:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
+.endif
+
+pre-install:
+.if ${PKGNAMESUFFIX} == "18-traymonitor"
+.	for d in client director monitor storage
+		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
+		${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
+.	endfor
+.endif
+
+do-install:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
+	${STAGEDIR}${PREFIX}/libexec/nagios
+.endif
+.if ${PKGNAMESUFFIX} == "18-traymonitor"
+# Install config files and preserve existing ones
+.for d in client director monitor storage
+	${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
+.endif
diff --git a/sysutils/bareos18-server/distinfo b/sysutils/bareos18-server/distinfo
new file mode 100644
index 000000000000..c4b62d52844a
--- /dev/null
+++ b/sysutils/bareos18-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1608000734
+SHA256 (bareos-bareos-Release-18.2.10_GH0.tar.gz) = 55ef90b2efaa8cb665ef0f9b89e8155e05fcc73da97addfb74f3b7aa57218f63
+SIZE (bareos-bareos-Release-18.2.10_GH0.tar.gz) = 10558902
diff --git a/sysutils/bareos16-server/files/bareos-barcodes b/sysutils/bareos18-server/files/bareos-barcodes
index f42cb7f7aeea..f42cb7f7aeea 100644
--- a/sysutils/bareos16-server/files/bareos-barcodes
+++ b/sysutils/bareos18-server/files/bareos-barcodes
diff --git a/sysutils/bareos18-server/files/bareos-dir.in b/sysutils/bareos18-server/files/bareos-dir.in
new file mode 100644
index 000000000000..86b62370cbb7
--- /dev/null
+++ b/sysutils/bareos18-server/files/bareos-dir.in
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# PROVIDE: bareos_dir
+# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bareos_dir_enable  (bool):   Set to NO by default.
+#                Set it to YES to enable bareos_dir.
+# bareos_dir_flags (params):   Set params used to start bareos_dir.
+# bareos_dir_config (params):  Path to the config file/directory
+#
+
+. /etc/rc.subr
+
+name="bareos_dir"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${bareos_dir_enable="NO"}
+: ${bareos_dir_flags="-u bareos -g bareos -v"}
+: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"}
+: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
+
+command=%%PREFIX%%/sbin/bareos-dir
+command_args="-c ${bareos_dir_config}"
+pidfile="${bareos_dir_pidfile}"
+bconsole_command=/usr/local/bin/bconsole
+start_precmd="bareos_start_precmd"
+restart_precmd="bareos_dir_configtest"
+reload_precmd="bareos_dir_configtest"
+reload_cmd="bareos_dir_reload"
+configtest_cmd="bareos_dir_configtest"
+
+bareos_start_precmd() {
+	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
+	bareos_dir_configtest
+}
+
+bareos_dir_configtest() {
+	echo "Performing sanity check on ${bareos_dir_config} configuration:"
+	eval ${command} -t
+}
+
+bareos_dir_reload() {
+	echo "Performing a graceful reload"
+	# bconsole always exits with 0, so we can't check the return status for success.
+	echo "reload" | ${bconsole_command}
+}
+
+extra_commands="reload configtest"
+run_rc_command "$1"
diff --git a/sysutils/bareos18-server/files/bareos-fd.in b/sysutils/bareos18-server/files/bareos-fd.in
new file mode 100644
index 000000000000..54647786b12c
--- /dev/null
+++ b/sysutils/bareos18-server/files/bareos-fd.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# PROVIDE: bareos_fd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bareos_fd_enable  (bool):  Set to NO by default.
+#               Set it to YES to enable bareos_fd.
+# bareos_fd_flags (params):  Set params used to start bareos_fd.
+# bareos_fd_config (params):  Path to the config file/directory
+#
+
+. /etc/rc.subr
+
+name="bareos_fd"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${bareos_fd_enable="NO"}
+: ${bareos_fd_flags="-u root -g wheel -v"}
+: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"}
+: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
+
+command=%%PREFIX%%/sbin/bareos-fd
+command_args="-c ${bareos_fd_config}"
+pidfile="${bareos_fd_pidfile}"
+start_precmd="bareos_start_precmd"
+
+bareos_start_precmd() {
+	[ -d "${pidfile%/*}" ] || {
+		getent passwd bareos > /dev/null 2&>1
+		if [ $? -eq 0] ; then
+			# user bareos exists
+			install -d -o bareos -g bareos ${pidfile%/*}
+		else
+			# bareos_fd as solitair service
+			install -d -o root -g wheel ${pidfile%/*}
+		fi
+	}
+}
+
+run_rc_command "$1"
diff --git a/sysutils/bareos18-server/files/bareos-sd.in b/sysutils/bareos18-server/files/bareos-sd.in
new file mode 100644
index 000000000000..a5efe78e80f7
--- /dev/null
+++ b/sysutils/bareos18-server/files/bareos-sd.in
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# PROVIDE: bareos_sd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bareos_sd_enable  (bool):  Set to NO by default.
+#               Set it to YES to enable bareos_sd.
+# bareos_sd_flags (params):  Set params used to start bareos_sd.
+# bareos_sd_config (params): Path to the config file/directory
+#
+
+. /etc/rc.subr
+
+name="bareos_sd"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${bareos_sd_enable="NO"}
+: ${bareos_sd_flags="-u bareos -g bareos -v"}
+: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"}
+: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
+
+command=%%PREFIX%%/sbin/bareos-sd
+command_args="-c ${bareos_sd_config}"
+pidfile="${bareos_sd_pidfile}"
+start_precmd="bareos_start_precmd"
+
+bareos_start_precmd() {
+	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
+}
+
+run_rc_command "$1"
diff --git a/sysutils/bareos16-server/files/chio-bareos b/sysutils/bareos18-server/files/chio-bareos
index f006ef78e6ce..f006ef78e6ce 100644
--- a/sysutils/bareos16-server/files/chio-bareos
+++ b/sysutils/bareos18-server/files/chio-bareos
diff --git a/sysutils/bareos18-server/files/patch-core-CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-CMakeLists.txt
new file mode 100644
index 000000000000..c98c93487bd4
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-CMakeLists.txt
@@ -0,0 +1,32 @@
+--- core/CMakeLists.txt	2020-12-11 10:27:01.000000000 -0500
++++ core/CMakeLists.txt	2020-12-14 21:56:05.412121000 -0500
+@@ -115,7 +115,9 @@
+   set(PSCMD "ps -ax -o pid,command")
+   include_directories(/usr/local/include)
+   link_directories(/usr/local/lib)
+-  link_libraries(intl)
++  IF(nls)
++    link_libraries(intl)
++  ENDIF()
+ endif()
+ 
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -187,7 +189,9 @@
+   add_definitions("-D_FILE_OFFSET_BITS=64")
+ endif()
+ 
+-include(FindIntl)
++IF(nls)
++  include(FindIntl)
++ENDIF()
+ 
+ if(developer)
+   add_definitions("-DDEVELOPER=1")
+@@ -600,7 +604,6 @@
+ 
+ add_subdirectory(scripts)
+ add_subdirectory(manpages)
+-add_subdirectory(platforms)
+ add_subdirectory(src)
+ 
+ string(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S")
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake
new file mode 100644
index 000000000000..6e4b63777a70
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake
@@ -0,0 +1,34 @@
+--- core/cmake/BareosCheckIncludes.cmake	2020-12-14 22:02:44.192311000 -0500
++++ core/cmake/BareosCheckIncludes.cmake	2020-12-14 22:06:25.053879000 -0500
+@@ -103,20 +103,20 @@
+ CHECK_INCLUDE_FILES(sys/xattr.h HAVE_SYS_XATTR_H)
+ CHECK_INCLUDE_FILES(api/glfs.h HAVE_API_GLFS_H)
+ 
+-CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
++if(cephfs)
++  CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
++  CHECK_INCLUDE_FILES("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPHFS_CEPH_STATX_H)
++endif()
+ 
+-include(CheckSymbolExists)
+-include(CMakePushCheckState)
+-cmake_push_check_state()
+-set(CMAKE_REQUIRED_LIBRARIES cephfs)
+-check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPHFS_CEPH_STATX_H)
+-cmake_pop_check_state()
++if(rados)
++  CHECK_INCLUDE_FILES(rados/librados.h HAVE_RADOS_LIBRADOS_H)
++  CHECK_INCLUDE_FILES(radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H)
++endif()
+ 
+-CHECK_INCLUDE_FILES(rados/librados.h HAVE_RADOS_LIBRADOS_H)
+-CHECK_INCLUDE_FILES(radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H)
+-
+ #CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H)
+-CHECK_INCLUDE_FILES(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
++if(gfapi)
++  CHECK_INCLUDE_FILES(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
++endif()
+ 
+ CHECK_INCLUDE_FILES(elasto/data.h HAVE_ELASTO_DATA_H)
+ CHECK_INCLUDE_FILES(elasto/file.h HAVE_ELASTO_FILE_H)
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
new file mode 100644
index 000000000000..72fb0630a5fa
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
@@ -0,0 +1,51 @@
+--- core/cmake/BareosFindAllLibraries.cmake	2020-12-11 10:27:01.000000000 -0500
++++ core/cmake/BareosFindAllLibraries.cmake	2020-12-14 22:52:06.210892000 -0500
+@@ -25,13 +25,15 @@
+ 
+ 
+ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-   # make sure we get python 2 not 3
+-   set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9)
+-   find_package(PythonInterp)
+-   INCLUDE(FindPythonLibs)
++   if (python)
++     # make sure we get python 2 or 3
++     set(Python_ADDITIONAL_VERSIONS 3.5 3.6 3.7 3.8 2.7)
++     find_package(PythonInterp)
++     INCLUDE(FindPythonLibs)
+ 
+-   if (${PYTHONLIBS_FOUND})
+-      SET(HAVE_PYTHON 1)
++     if (${PYTHONLIBS_FOUND})
++        SET(HAVE_PYTHON 1)
++     endif()
+    endif()
+ 
+    INCLUDE(FindPostgreSQL)
+@@ -52,13 +54,21 @@
+ 
+ BareosFindLibraryAndHeaders("fastlz" "fastlzlib.h")
+ BareosFindLibraryAndHeaders("jansson" "jansson.h")
+-BareosFindLibraryAndHeaders("rados" "rados/librados.h")
+-BareosFindLibraryAndHeaders("radosstriper" "radosstriper/libradosstriper.h")
+-BareosFindLibraryAndHeaders("cephfs" "cephfs/libcephfs.h")
++if(rados)
++  BareosFindLibraryAndHeaders("rados" "rados/librados.h")
++  BareosFindLibraryAndHeaders("radosstriper" "radosstriper/libradosstriper.h")
++endif()
++if(cephfs)
++  BareosFindLibraryAndHeaders("cephfs" "cephfs/libcephfs.h")
++endif()
+ BareosFindLibraryAndHeaders("pthread" "pthread.h")
+ BareosFindLibraryAndHeaders("cap" "sys/capability.h")
+-BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h")
+-BareosFindLibraryAndHeaders("droplet" "droplet.h")
++if(gfapi)
++  BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h")
++endif()
++if(droplet)
++  BareosFindLibraryAndHeaders("droplet" "droplet.h")
++endif()
+ 
+ BareosFindLibraryAndHeaders("pam" "security/pam_appl.h")
+ 
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
new file mode 100644
index 000000000000..b8a136bc5eae
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
@@ -0,0 +1,84 @@
+--- core/cmake/BareosInstallConfigFiles.cmake	2020-12-11 10:27:01.000000000 -0500
++++ core/cmake/BareosInstallConfigFiles.cmake	2020-12-15 01:25:25.641687000 -0500
+@@ -43,18 +43,9 @@
+    get_filename_component(resname ${resdir} NAME)
+    foreach(configfile ${configfiles})
+       get_filename_component(fname ${configfile} NAME)
+-      if (EXISTS ${DESTCONFDIR}/${resname}/${fname})
+-         MESSAGE(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
+-         MESSAGE(STATUS "rename ${configfile} to ${configfile}.new")
+-         FILE (RENAME "${configfile}" "${configfile}.new")
+-
+-         MESSAGE(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
+-         FILE (INSTALL "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
+-         FILE (RENAME "${configfile}.new" "${configfile}")
+-      else()
+-         MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)")
+-         FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+-      endif()
++      MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
++      FILE (RENAME "${configfile}" "${configfile}.sample")
++      FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}")
+    endforeach()
+ endforeach()
+ 
+@@ -82,21 +73,16 @@
+       get_filename_component(dir   ${configfile} DIRECTORY)
+       get_filename_component(fname ${configfile} NAME)
+ 
+-      if (EXISTS ${DESTCONFDIR}/${configfile})
+-         MESSAGE(STATUS "${configfile} as ${configfile}.new (keep existing)")
+-         FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.new")
+-         FILE(COPY   "${BackendConfigSrcDir}/${configfile}.new" DESTINATION "${DESTCONFDIR}/${dir}")
+-         FILE(RENAME "${BackendConfigSrcDir}/${configfile}.new" "${BackendConfigSrcDir}/${configfile}")
+-      else()
+-         MESSAGE(STATUS "${configfile} as ${configfile}")
+-         FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}")
+-      endif()
++      MESSAGE(STATUS "${configfile} as ${configfile}")
++      FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
++      FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}")
+    endforeach()
+ 
+    file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example")
+    foreach(configfile ${configfiles})
+       get_filename_component(dir   ${configfile} DIRECTORY)
+-      #get_filename_component(fname ${configfile} NAME)
++      get_filename_component(fname ${configfile} NAME)
++      get_filename_component(fsname ${configfile} NAME_WE)
+ 
+       if (EXISTS ${DESTCONFDIR}/${configfile})
+          MESSAGE(STATUS "overwriting ${configfile}")
+@@ -104,7 +90,8 @@
+          MESSAGE(STATUS "${configfile} as ${configfile}")
+       endif()
+ 
+-      FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}")
++      FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample")
++      FILE(COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" DESTINATION "${DESTCONFDIR}/${dir}")
+    endforeach()
+ 
+ ENDFOREACH()
+@@ -122,15 +109,13 @@
+          STRING(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
+          if (NOT "${IS_INFILE}" STREQUAL ".in")
+             get_filename_component(fname ${configfile} NAME)
+-            if (EXISTS ${DESTCONFDIR}/${resname}/${fname})
+-               MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.new (keep existing)")
+-               FILE (RENAME "${configfile}" "${configfile}.new")
+-               FILE (COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
+-               FILE (RENAME "${configfile}.new" "${configfile}")
+-            else()
+-               MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}")
+-               FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+-            endif()
++            get_filename_component(fsname ${configfile} NAME_WE)
++            MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}")
++            FILE(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample")
++            FILE(
++             COPY "${resdir}/${fsname}.conf.sample"
++             DESTINATION "${DESTCONFDIR}/${resname}"
++            )
+          else()
+             MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
+          endif()
diff --git a/sysutils/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
new file mode 100644
index 000000000000..ce294505c385
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
@@ -0,0 +1,15 @@
+--- core/cmake/BareosSetVariableDefaults.cmake	2019-05-10 11:53:19.620402000 -0500
++++ core/cmake/BareosSetVariableDefaults.cmake	2019-05-10 12:13:55.910452000 -0500
+@@ -669,7 +669,11 @@
+ SET(PACKAGE_URL "\"\"")
+ SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
+ 
+-set(ENABLE_NLS 1)
++IF(DEFINED nls)
++  SET(ENABLE_NLS 1)
++ELSE()
++  SET(ENABLE_NLS 0)
++ENDIF()
+ 
+ 
+ IF(HAVE_WIN32)
diff --git a/sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt
new file mode 100644
index 000000000000..ab5442b9a2ba
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-manpages_CMakeLists.txt
@@ -0,0 +1,19 @@
+--- core/manpages/CMakeLists.txt	2019-05-08 21:16:29.369799000 -0500
++++ core/manpages/CMakeLists.txt	2019-05-08 21:17:28.526607000 -0500
+@@ -17,6 +17,7 @@
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
+ 
++IF(client-only)
+ set (MAN1
+    bconsole.1
+    )
+@@ -25,7 +26,7 @@
+    bareos-fd.8
+    bareos.8
+    )
+-
++ENDIF()
+ 
+ IF(NOT client-only)
+ set ( MAN1-server
diff --git a/sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt
new file mode 100644
index 000000000000..44c774124482
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-scripts_CMakeLists.txt
@@ -0,0 +1,75 @@
+--- core/scripts/CMakeLists.txt	2019-12-12 12:04:14.000000000 -0500
++++ core/scripts/CMakeLists.txt	2019-12-28 16:23:36.207715000 -0500
+@@ -17,36 +17,37 @@
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
+ 
++IF(client-only)
++   INSTALL(FILES
++            bareos btraceback
++            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
++                                    GROUP_READ GROUP_EXECUTE
++                                    WORLD_READ WORLD_EXECUTE
++            DESTINATION "${sbindir}")
+ 
+-INSTALL(FILES
+-         bareos btraceback
+-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-                                 GROUP_READ GROUP_EXECUTE
+-                                 WORLD_READ WORLD_EXECUTE
+-         DESTINATION "${sbindir}")
++   INSTALL(FILES
++	    bareos-ctl-fd
++            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
++                        GROUP_READ GROUP_EXECUTE
++                        WORLD_READ WORLD_EXECUTE
++            DESTINATION "${scriptdir}"
++	    COMPONENT filedaemon)
+ 
+-INSTALL(FILES
+-	 bareos-ctl-fd
+-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-                     GROUP_READ GROUP_EXECUTE
+-                     WORLD_READ WORLD_EXECUTE
+-         DESTINATION "${scriptdir}"
+-	 COMPONENT filedaemon)
++   INSTALL(FILES
++            bareos
++            btraceback.gdb
++            btraceback.dbx
++            btraceback.mdb
++            bareos-config
++            bareos-config-lib.sh
++            bareos-ctl-funcs
++            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
++                        GROUP_READ GROUP_EXECUTE
++                        WORLD_READ WORLD_EXECUTE
++            DESTINATION "${scriptdir}"
++   	   )
++ENDIF()
+ 
+-INSTALL(FILES
+-         bareos
+-         btraceback.gdb
+-         btraceback.dbx
+-         btraceback.mdb
+-         bareos-config
+-         bareos-config-lib.sh
+-         bareos-ctl-funcs
+-         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-                     GROUP_READ GROUP_EXECUTE
+-                     WORLD_READ WORLD_EXECUTE
+-         DESTINATION "${scriptdir}"
+-	)
+-
+ IF(NOT client-only)
+    INSTALL(FILES
+          mtx-changer
+@@ -55,7 +56,6 @@
+          bareos-glusterfind-wrapper
+          bareos-ctl-dir
+          bareos-ctl-sd
+-         bareos-ctl-funcs
+          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                      GROUP_READ GROUP_EXECUTE
+                      WORLD_READ WORLD_EXECUTE
diff --git a/sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt
new file mode 100644
index 000000000000..11570458e8e4
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-dird_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- core/src/dird/CMakeLists.txt	2019-05-08 21:45:45.893113000 -0500
++++ core/src/dird/CMakeLists.txt	2019-05-08 21:47:00.616203000 -0500
+@@ -77,6 +77,9 @@
+    bareosfind
+    ${LMDB_LIBS}
+    ${NDMP_LIBS}
++   ${OPENSSL_LIBRARIES}
++   ${PTHREAD_LIBRARIES}
++   ${JANSSON_LIBRARIES}
+ )
+ 
+ IF(HAVE_WIN32)
+@@ -92,7 +95,7 @@
+ add_executable(bareos-dbcheck ${DBCHKSRCS})
+ SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
+ 
+-target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES})
++target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES})
+ 
+ # is not built by default
+ 
diff --git a/sysutils/bareos18-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos18-server/files/patch-core-src-include_baconfig.h
new file mode 100644
index 000000000000..4a9a9b5e839f
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-include_baconfig.h
@@ -0,0 +1,25 @@
+--- core/src/include/baconfig.h	2019-05-10 14:32:06.160940000 -0500
++++ core/src/include/baconfig.h	2019-05-10 14:32:32.142847000 -0500
+@@ -120,11 +120,11 @@
+       #define N_(s) (s)
+    #endif /* N_ */
+ #else /* !ENABLE_NLS */
++   #include <locale.h>
+    #undef _
+    #undef N_
+    #undef textdomain
+    #undef bindtextdomain
+-   #undef setlocale
+ 
+    #ifndef _
+       #define _(s) (s)
+@@ -137,9 +137,6 @@
+    #endif
+    #ifndef bindtextdomain
+       #define bindtextdomain(p, d)
+-   #endif
+-   #ifndef setlocale
+-      #define setlocale(p, d)
+    #endif
+ #endif /* ENABLE_NLS */
+ 
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc
new file mode 100644
index 000000000000..f63db632d130
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-plugins-dird_python-dir.cc
@@ -0,0 +1,61 @@
+--- core/src/plugins/dird/python-dir.cc	2019-12-12 12:04:14.000000000 -0500
++++ core/src/plugins/dird/python-dir.cc	2019-12-29 00:20:30.334502000 -0500
+@@ -35,6 +35,13 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#endif
++
+ #include "python-dir.h"
+ #include "lib/edit.h"
+ 
+@@ -118,6 +125,20 @@
+  */
+ static PyThreadState *mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosDIRModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareosdir",
++  NULL,
++  -1,
++  BareosDIRMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -679,7 +700,11 @@
+       /*
+        * Make our callback methods available for Python.
+        */
++#if (PY_VERSION_HEX >  0x03050000)
++      p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef);
++#else
+       p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods);
++#endif
+    }
+ 
+    /*
+@@ -959,7 +984,11 @@
+       char *value;
+ 
+       ctx = PyGetbpContext(pyCtx);
++#if (PY_VERSION_HEX >  0x03050000)
++      value = bstrdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+          retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value);
+       }
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt
new file mode 100644
index 000000000000..5c59efaffb08
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_CMakeLists.txt
@@ -0,0 +1,35 @@
+--- core/src/plugins/filed/CMakeLists.txt	2019-12-12 12:04:14.000000000 -0500
++++ core/src/plugins/filed/CMakeLists.txt	2019-12-28 16:26:47.855833000 -0500
+@@ -100,18 +100,18 @@
+    INSTALL(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+ endif()
+ 
+-set (PYFILES
+-    bareos-fd.py.template
+-    bareos-fd-local-fileset.py
+-    bareos-fd-mock-test.py
+-    BareosFdPluginBaseclass.py
+-    BareosFdPluginLocalFileset.py
+-    BareosFdWrapper.py
+-    bareos_fd_consts.py
+-    bareos-fd-ldap.py
+-    BareosFdPluginLDAP.py
+-    )
++if (python)
++   set (PYFILES
++       bareos-fd.py.template
++       bareos-fd-local-fileset.py
++       bareos-fd-mock-test.py
++       BareosFdPluginBaseclass.py
++       BareosFdPluginLocalFileset.py
++       BareosFdWrapper.py
++       bareos_fd_consts.py
++       bareos-fd-ldap.py
++       BareosFdPluginLDAP.py
++       )
+ 
+-INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon)
+-
+-
++   INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon)
++endif()
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc
new file mode 100644
index 000000000000..e796a1b23d51
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc
@@ -0,0 +1,24 @@
+--- core/src/plugins/filed/gfapi-fd.cc	2020-12-14 23:47:04.832213000 -0500
++++ core/src/plugins/filed/gfapi-fd.cc	2020-12-14 23:47:56.824952000 -0500
+@@ -30,7 +30,7 @@
+ #include "lib/path_list.h"
+ #include "lib/edit.h"
+ 
+-#include <api/glfs.h>
++#include <glusterfs/api/glfs.h>
+ 
+ 
+ /* avoid missing config.h problem on Debian 8 and Ubuntu 16:
+@@ -39,10 +39,10 @@
+  */
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+-#include <compat-errno.h>
++#include <glusterfs/compat-errno.h>
+ #undef _CONFIG_H
+ #else
+-#include <compat-errno.h>
++#include <glusterfs/compat-errno.h>
+ #endif
+ 
+ namespace filedaemon {
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc
new file mode 100644
index 000000000000..3e48800f4da6
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-plugins-filed_python-fd.cc
@@ -0,0 +1,111 @@
+--- core/src/plugins/filed/python-fd.cc	2019-12-12 12:04:14.000000000 -0500
++++ core/src/plugins/filed/python-fd.cc	2019-12-29 00:41:38.985785000 -0500
+@@ -40,6 +40,14 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#define PyString_Check PyBytes_Check
++#endif
++
+ static const int debuglevel = 150;
+ 
+ #define PLUGIN_LICENSE      "Bareos AGPLv3"
+@@ -163,6 +171,20 @@
+  */
+ static PyThreadState *mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosFDModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareosfd",
++  NULL,
++  -1,
++  BareosFDMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -1226,7 +1248,11 @@
+       /*
+        * Make our callback methods available for Python.
+        */
++#if (PY_VERSION_HEX >  0x03050000)
++      p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef);
++#else
+       p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods);
++#endif
+ 
+       /*
+        * Fill in the slots of PyRestoreObject
+@@ -2704,7 +2730,11 @@
+    case bVarFileSeen: {
+       char *value;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++      value = bstrdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+          retval = bfuncs->setBareosValue(ctx, (bVariable)var, value);
+       }
+@@ -3091,7 +3121,11 @@
+    sp.type = pSavePkt->type;
+    if (pSavePkt->fname) {
+       if (PyString_Check(pSavePkt->fname)) {
++#if (PY_VERSION_HEX >  0x03050000)
++         sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
++#else
+          sp.fname = PyString_AsString(pSavePkt->fname);
++#endif
+       } else {
+          goto bail_out;
+       }
+@@ -3100,7 +3134,11 @@
+    }
+    if (pSavePkt->link) {
+       if (PyString_Check(pSavePkt->link)) {
++#if (PY_VERSION_HEX >  0x03050000)
++         sp.link = bstrdup(PyString_AsString(pSavePkt->link));
++#else
+          sp.link = PyString_AsString(pSavePkt->link);
++#endif
+       } else {
+          goto bail_out;
+       }
+@@ -3143,7 +3181,11 @@
+     */
+    if (pSavePkt->fname) {
+       if (PyString_Check(pSavePkt->fname)) {
++#if (PY_VERSION_HEX >  0x03050000)
++         sp.fname = bstrdup(PyString_AsString(pSavePkt->fname));
++#else
+          sp.fname = PyString_AsString(pSavePkt->fname);
++#endif
+       } else {
+          goto bail_out;
+       }
+@@ -3219,8 +3261,11 @@
+    if (!object || !PyString_Check(object)) {
+       return (char *)"";
+    }
+-
++#if (PY_VERSION_HEX >  0x03050000)
++   return bstrdup(PyString_AsString(object));
++#else
+    return PyString_AsString(object);
++#endif
+ }
+ 
+ static inline char *PyGetByteArrayValue(PyObject *object)
diff --git a/sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc b/sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc
new file mode 100644
index 000000000000..fb84a03d80ef
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-plugins-stored_python-sd.cc
@@ -0,0 +1,61 @@
+--- core/src/plugins/stored/python-sd.cc	2019-12-12 12:04:14.000000000 -0500
++++ core/src/plugins/stored/python-sd.cc	2019-12-29 00:19:19.366390000 -0500
+@@ -36,6 +36,13 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#endif
++
+ static const int debuglevel = 150;
+ 
+ #define PLUGIN_LICENSE      "Bareos AGPLv3"
+@@ -121,6 +128,20 @@
+ extern "C" {
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosSDModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareossd",
++  NULL,
++  -1,
++  BareosSDMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ /**
+  * loadPlugin() and unloadPlugin() are entry points that are
+  *  exported, so Bareos can directly call these two entry points
+@@ -698,7 +719,11 @@
+       /*
+        * Make our callback methods available for Python.
+        */
++#if (PY_VERSION_HEX >  0x03050000)
++      p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef);
++#else
+       p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods);
++#endif
+    }
+ 
+    /*
+@@ -979,7 +1004,11 @@
+       char *value;
+ 
+       ctx = PyGetbpContext(pyCtx);
++#if (PY_VERSION_HEX >  0x03050000)
++      value = bstrdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+          bfuncs->setBareosValue(ctx, (bsdwVariable)var, value);
+       }
diff --git a/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt
new file mode 100644
index 000000000000..2b2618ef7ada
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src-stored_CMakeLists.txt
@@ -0,0 +1,55 @@
+--- core/src/stored/CMakeLists.txt	2020-12-11 10:27:01.000000000 -0500
++++ core/src/stored/CMakeLists.txt	2021-02-19 18:05:23.992747000 -0500
+@@ -193,26 +193,34 @@
+ target_link_libraries(bareos-sd
+    stored_objects
+    ${BAREOS_SD_LIBRARIES}
++   ${JANSSON_LIBRARIES}
++   ${PTHREAD_LIBRARIES}
+    )
+ 
+ add_executable(bls ${BLSSRCS})
+ target_link_libraries(bls
+    bareos bareossd bareosfind 
++   ${PTHREAD_LIBRARIES}
+    )
+ 
+ add_executable(bextract ${BEXTRACTSRS})
+ target_link_libraries(bextract
+    bareossd bareosfind bareos 
++   ${JANSSON_LIBRARIES}
++   ${PTHREAD_LIBRARIES}
+     )
+ 
+ add_executable(bscan ${BSCANSRCS})
+ target_link_libraries(bscan
+    bareos bareossd bareosfind bareossql bareoscats
++   ${PTHREAD_LIBRARIES}
+     )
+ 
+ add_executable(btape ${BTAPESRCS})
+ target_link_libraries(btape
+    bareossd bareos 
++   ${JANSSON_LIBRARIES}
++   ${PTHREAD_LIBRARIES}
+     )
+ 
+ add_executable(bcopy ${BCOPYSRCS})
+@@ -220,6 +228,8 @@
+ 
+ target_link_libraries(bcopy
+    bareossd bareos 
++   ${JANSSON_LIBRARIES}
++   ${PTHREAD_LIBRARIES}
+     )
+ 
+ INSTALL(TARGETS bareossd DESTINATION ${libdir})
+@@ -232,7 +242,7 @@
+ install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
+ install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
+ 
+-INSTALL(DIRECTORY DESTINATION "../${archivedir}")
++INSTALL(DIRECTORY DESTINATION "${archivedir}")
+ 
+ IF(${HAVE_DYNAMIC_SD_BACKENDS})
+ add_subdirectory(backends)
diff --git a/sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt
new file mode 100644
index 000000000000..135d70a4df4c
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core-src_CMakeLists.txt
@@ -0,0 +1,25 @@
+--- core/src/CMakeLists.txt	2019-05-08 21:29:08.173605000 -0500
++++ core/src/CMakeLists.txt	2019-05-08 21:42:27.597876000 -0500
+@@ -30,13 +30,16 @@
+    add_subdirectory(stored)
+ ENDIF()
+ 
+-add_subdirectory(console)
+-IF(${HAVE_LMDB})
+-add_subdirectory(lmdb)
++IF(client-only)
++   add_subdirectory(console)
++   IF(${HAVE_LMDB})
++      add_subdirectory(lmdb)
++   ENDIF()
++   add_subdirectory(lib)
++   add_subdirectory(findlib)
++   add_subdirectory(filed)
+ ENDIF()
+-add_subdirectory(lib)
+-add_subdirectory(findlib)
+-add_subdirectory(filed)
++
+ add_subdirectory(plugins)
+ 
+ if (${traymonitor})
diff --git a/sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
new file mode 100644
index 000000000000..811950bd6a2d
--- /dev/null
+++ b/sysutils/bareos18-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
@@ -0,0 +1,22 @@
+--- core/cmake/bareos-symlink-default-db-backend.cmake.orig	2021-04-13 21:34:51 UTC
++++ core/cmake/bareos-symlink-default-db-backend.cmake
+@@ -16,8 +16,17 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
++
+ MESSAGE(STATUS "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++# The ${libdir} and ${backenddir} are absolute, so figure out
++# a relative path (${backenddir} lives under ${libdir}) instead.
++# Make the link relative, placing the libbareoscats.so in ${libdir}.
++# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see
++# core/src/cats/CMakeLists.txt).
++file(RELATIVE_PATH _rel ${libdir} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX})
++MESSAGE(STATUS ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+-   ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
+-   ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
++   ${_rel}
++   libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
++   WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT
+    )
diff --git a/sysutils/bareos16-server/files/pkg-deinstall.client.in b/sysutils/bareos18-server/files/pkg-deinstall.client.in
index 3be8c2e4874c..3be8c2e4874c 100644
--- a/sysutils/bareos16-server/files/pkg-deinstall.client.in
+++ b/sysutils/bareos18-server/files/pkg-deinstall.client.in
diff --git a/sysutils/bareos16-server/files/pkg-install.client.in b/sysutils/bareos18-server/files/pkg-install.client.in
index 70ca57028237..70ca57028237 100644
--- a/sysutils/bareos16-server/files/pkg-install.client.in
+++ b/sysutils/bareos18-server/files/pkg-install.client.in
diff --git a/sysutils/bareos16-server/files/pkg-message.client.in b/sysutils/bareos18-server/files/pkg-message.client.in
index b3e2d5825e13..b3e2d5825e13 100644
--- a/sysutils/bareos16-server/files/pkg-message.client.in
+++ b/sysutils/bareos18-server/files/pkg-message.client.in
diff --git a/sysutils/bareos16-server/files/pkg-message.server.in b/sysutils/bareos18-server/files/pkg-message.server.in
index 3bb0ef535ce1..3bb0ef535ce1 100644
--- a/sysutils/bareos16-server/files/pkg-message.server.in
+++ b/sysutils/bareos18-server/files/pkg-message.server.in
diff --git a/sysutils/bareos16-server/pkg-descr b/sysutils/bareos18-server/pkg-descr
index 1332fabc0d37..1332fabc0d37 100644
--- a/sysutils/bareos16-server/pkg-descr
+++ b/sysutils/bareos18-server/pkg-descr
diff --git a/sysutils/bareos18-server/pkg-plist b/sysutils/bareos18-server/pkg-plist
new file mode 100644
index 000000000000..b5f4c5afc4a2
--- /dev/null
+++ b/sysutils/bareos18-server/pkg-plist
@@ -0,0 +1,179 @@
+bin/bregex
+bin/bsmtp
+bin/bwild
+bin/timelimit
+@sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sampl
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
+%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
+etc/logrotate.d/bareos-dir
+lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
+lib/bareos/backends/libbareossd-fifo.so
+lib/bareos/backends/libbareossd-gentape.so
+%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so
+%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
+%%RADOS%%lib/bareos/backends/libbareossd-rados.so
+lib/bareos/backends/libbareossd-tape.so
+%%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py
+%%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py
+%%PYTHON%%lib/bareos/plugins/BareosSdPluginBaseclass.py
+%%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py
+lib/bareos/plugins/autoxflate-sd.so
+%%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py
+%%PYTHON%%lib/bareos/plugins/bareos-dir.py.template
+%%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
+%%PYTHON%%lib/bareos/plugins/bareos-sd.py.template
+%%PYTHON%%lib/bareos/plugins/bareos_dir_consts.py
+%%PYTHON%%lib/bareos/plugins/bareos_sd_consts.py
+%%PYTHON%%lib/bareos/plugins/python-dir.so
+%%PYTHON%%lib/bareos/plugins/python-sd.so
+%%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
+%%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
+lib/bareos/scripts/bareos-ctl-dir
+lib/bareos/scripts/bareos-ctl-sd
+lib/bareos/scripts/bareos-explorer
+lib/bareos/scripts/bareos-glusterfind-wrapper
+lib/bareos/scripts/create_bareos_database
+%%MYSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
+%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
+%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
+%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
+%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
+%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
+lib/bareos/scripts/ddl/versions.map
+lib/bareos/scripts/delete_catalog_backup
+lib/bareos/scripts/disk-changer
+lib/bareos/scripts/drop_bareos_database
+lib/bareos/scripts/drop_bareos_tables
+lib/bareos/scripts/grant_bareos_privileges
+lib/bareos/scripts/make_bareos_tables
+lib/bareos/scripts/make_catalog_backup
+lib/bareos/scripts/make_catalog_backup.pl
+lib/bareos/scripts/mtx-changer
+lib/bareos/scripts/query.sql
+lib/bareos/scripts/update_bareos_tables
+lib/libbareoscats.so
+lib/libbareoscats.so.18
+lib/libbareoscats.so.%%LIB_VERSION%%
+%%NDMP%%lib/libbareosndmp.so
+%%NDMP%%lib/libbareosndmp.so.18
+%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
+lib/libbareossd.so
+lib/libbareossql.so
+lib/libbareossql.so.18
+lib/libbareossql.so.%%LIB_VERSION%%
+man/man1/bareos-tray-monitor.1.gz
+man/man1/bregex.1.gz
+man/man1/bsmtp.1.gz
+man/man1/bwild.1.gz
+man/man8/bareos-dbcheck.8.gz
+man/man8/bareos-dir.8.gz
+man/man8/bareos-sd.8.gz
+man/man8/bcopy.8.gz
+man/man8/bextract.8.gz
+man/man8/bls.8.gz
+man/man8/bpluginfo.8.gz
+man/man8/bscan.8.gz
+man/man8/bscrypto.8.gz
+man/man8/btape.8.gz
+man/man8/btraceback.8.gz
+sbin/bareos-dbcheck
+sbin/bareos-dir
+sbin/bareos-sd
+sbin/bcopy
+sbin/bextract
+sbin/bls
+sbin/bpluginfo
+sbin/bregex
+sbin/bscan
+sbin/bscrypto
+sbin/bsmtp
+sbin/btape
+sbin/btestls
+sbin/bwild
+sbin/chio-bareos
+sbin/timelimit
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage
+@dir(bareos,bareos,) %%BAREOS_DIR%%
+@dir(bareos,bareos,) %%BAREOS_DIR%%/storage
+@dir(bareos,bareos,) /var/log/bareos
+@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos18-server/pkg-plist.client b/sysutils/bareos18-server/pkg-plist.client
new file mode 100644
index 000000000000..c5f1adff4f90
--- /dev/null
+++ b/sysutils/bareos18-server/pkg-plist.client
@@ -0,0 +1,59 @@
+bin/bconsole
+@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
+@group bareos
+lib/libbareos.so
+lib/libbareos.so.18
+lib/libbareos.so.%%LIB_VERSION%%
+lib/libbareosfind.so
+lib/libbareosfind.so.18
+lib/libbareosfind.so.%%LIB_VERSION%%
+%%LMDB%%lib/libbareoslmdb.so
+%%LMDB%%lib/libbareoslmdb.so.18
+%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
+%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
+%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
+lib/bareos/plugins/bpipe-fd.so
+%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
+%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
+%%PYTHON%%lib/bareos/plugins/python-fd.so
+%%RADOS%%lib/bareos/plugins/rados-fd.so
+lib/bareos/scripts/bareos
+lib/bareos/scripts/bareos-config
+lib/bareos/scripts/bareos-config-lib.sh
+lib/bareos/scripts/bareos-ctl-fd
+lib/bareos/scripts/bareos-ctl-funcs
+lib/bareos/scripts/btraceback.dbx
+lib/bareos/scripts/btraceback.gdb
+lib/bareos/scripts/btraceback.mdb
+man/man1/bconsole.1.gz
+man/man8/bareos-fd.8.gz
+man/man8/bareos.8.gz
+@group bareos
+sbin/bareos
+@group bareos
+sbin/bareos-fd
+@group bareos
+sbin/bconsole
+@group wheel
+sbin/btraceback
+@group bareos
+%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
+%%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
+@dir(bareos,bareos,)  %%BAREOS_DIR%%
+@dir(bareos,bareos,) /var/log/bareos
+@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos18-traymonitor/Makefile b/sysutils/bareos18-traymonitor/Makefile
new file mode 100644
index 000000000000..2c004728018f
--- /dev/null
+++ b/sysutils/bareos18-traymonitor/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	bareos
+
+PKGNAMESUFFIX=	18-traymonitor
+
+COMMENT=	Backup archiving recovery open sourced (traymonitor)
+
+LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
+		libbareos.so:sysutils/bareos18-client
+
+CONFLICTS=	bacula*-bat-* bareos-traymonitor-*
+
+USES=		pkgconfig gettext-runtime desktop-file-utils qt:5
+USE_QT=		buildtools_build qmake_build uitools_build gui core
+WITH_BAT=	yes
+
+PLIST=		${.CURDIR}/pkg-plist
+CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
+
+MASTERDIR=	${.CURDIR}/../../sysutils/bareos18-server
+
+CMAKE_ARGS+=		-Dtraymonitor=yes \
+			-Dbuild-dird=no \
+			-Dbuild-stored=no \
+			-Dclient-only=yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos18-traymonitor/pkg-descr b/sysutils/bareos18-traymonitor/pkg-descr
new file mode 100644
index 000000000000..6a18fe88fe3a
--- /dev/null
+++ b/sysutils/bareos18-traymonitor/pkg-descr
@@ -0,0 +1,8 @@
+traymonitor inteface for Bareos.
+
+Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
+software to backup, archive and restore files from all major operating systems.
+The fork was founded 2010 out of the bacula.org project. The fork has been
+actively developed and many new features have been added.
+
+WWW: http://www.bareos.org/
diff --git a/sysutils/bareos18-traymonitor/pkg-plist b/sysutils/bareos18-traymonitor/pkg-plist
new file mode 100644
index 000000000000..add26cb88d6d
--- /dev/null
+++ b/sysutils/bareos18-traymonitor/pkg-plist
@@ -0,0 +1,7 @@
+bin/bareos-tray-monitor
+@sample %%ETCDIR%%/tray-monitor.d/client/FileDaemon-local.conf.sample
+@sample %%ETCDIR%%/tray-monitor.d/director/Director-local.conf.sample
+@sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample
+@sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample
+share/applications/bareos-tray-monitor.desktop
+share/pixmaps/bareos-tray-monitor.xpm
diff --git a/sysutils/bareos19-client/Makefile b/sysutils/bareos19-client/Makefile
new file mode 100644
index 000000000000..24496426651b
--- /dev/null
+++ b/sysutils/bareos19-client/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	bareos
+PKGNAMESUFFIX=	19-client
+
+COMMENT=	Backup archiving recovery open sourced (client)
+
+CONFLICTS=	bareos18-client-* bareos17-client-* bareos-client-*
+
+WITH_CLIENT_ONLY=yes
+USE_RC_SUBR=	bareos-fd
+
+PLIST=		${PKGDIR}/pkg-plist.client
+MASTERDIR=	${.CURDIR}/../../sysutils/bareos19-server
+
+OPTIONS_GROUP=	PLUGINS
+OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
+OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
+
+CEPHFS_DESC=	CEPHFS fd plugin support
+GFAPI_DESC=	GFAPI fd plugin support
+RADOS_DESC=	RADOS fd plugin support
+LMDB_DESC=	Enable build of LMDB support
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos19-server/Makefile b/sysutils/bareos19-server/Makefile
new file mode 100644
index 000000000000..0b7b74bcf117
--- /dev/null
+++ b/sysutils/bareos19-server/Makefile
@@ -0,0 +1,238 @@
+PORTNAME=	bareos
+DISTVERSIONPREFIX=	Release/
+DISTVERSION=	19.2.9
+PORTREVISION?=	2
+CATEGORIES?=	sysutils
+PKGNAMEPREFIX?=	#
+PKGNAMESUFFIX?=	19-server
+
+MAINTAINER=	acm@FreeBSD.org
+COMMENT?=	Backup archiving recovery open sourced (server)
+
+LICENSE=	AGPLv3 LGPL3
+LICENSE_COMB=	multi
+
+CONFLICTS?=	bacula18*-server bacula17*-server-*
+
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
+		libjansson.so:devel/jansson
+
+USES+=		cmake compiler:c++11-lang localbase perl5 pkgconfig readline \
+		shebangfix
+USE_GITHUB=	yes
+USE_PERL5=	run
+
+USERS=		bareos
+GROUPS=		${USERS}
+
+PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
+
+USE_LDCONFIG=	yes
+SHEBANG_LANG=	perl
+SHEBANG_FILES=	${WRKSRC}/core/src/cats/make_catalog_backup.pl.in
+
+CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_SINGLE=		CRYPTO
+OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
+OPTIONS_SUB=		yes
+CRYPTO_DESC=		Cryptographic library
+MTX_DESC=		Install mtx for control of autochanger devices
+NDMP_DESC=		Enable build of NDMP support
+SCSICRYPTO_DESC=	Build LTO AME crypto plugin
+
+.if ${PKGNAMESUFFIX} == "19-server"
+OPTIONS_GROUP=  BACKENDS
+OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
+OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
+OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
+OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
+OPTIONS_SINGLE+=		DATABASE
+BACKENDS_DESC= 		Storage backends
+DATABASE_DESC=		Database support
+CEPHFS_DESC=	CEPHFS backend support
+GFAPI_DESC=	GFAPI backend support
+RADOS_DESC=	RADOS backend support
+
+NDMP_CMAKE_ON=	-Dndmp=ON
+NDMP_CMAKE_OFF=	-Dndmp=OFF
+.endif
+
+GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+
+OPENSSL_USES=		ssl
+OPENSSL_CMAKE_ON=	-Dopenssl=ON
+OPENSSL_CMAKE_OFF=	-Dopenssl=OFF
+
+SCSICRYPTO_CMAKE_ON=	-Dscsi-crypto=ON
+SCSICRYPTO_CMAKE_OFF=	-Dscsi-crypto=OFF
+
+.if ${PKGNAMESUFFIX} == "19-client" || ${PKGNAMESUFFIX} == "19-server"  #Till end of the file
+PYTHON_USES=		python
+PYTHON_CMAKE_ON=	-Dpython=ON
+PYTHON_CMAKE_OFF=	-Dpython=OFF
+PYTHON_PLUGIN=		yes
+
+.if !defined(WITH_CLIENT_ONLY)
+LIB_DEPENDS+=	libbareos.so:sysutils/bareos19-client
+USE_RC_SUBR?=	bareos-dir bareos-sd
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
+.else
+SUB_FILES+=	pkg-message.server
+.endif
+
+CMAKE_ARGS+=	-Dtcp-wrappers=ON \
+		-Dsmartalloc=ON \
+		-Dsysconfdir=${PREFIX}/etc \
+		-Darchivedir=${BAREOS_DIR}/storage \
+		-Dworkingdir=${BAREOS_DIR} \
+		-Dconfdir=${PREFIX}/etc/bareos \
+		-Dlibdir=${PREFIX}/lib \
+		-Dlogdir=/var/log/bareos \
+		-Dincludedir=${PREFIX}/include/bareos \
+		-Dreadline=ON \
+		-Ddisable-conio=ON \
+		-Dbatch-insert=ON \
+		-Dhave_plugins=ON \
+		-Dplugindir=${PREFIX}/lib/bareos/plugins \
+		-Dscriptdir=${PREFIX}/lib/bareos/scripts \
+		-Dbackenddir=${PREFIX}/lib/bareos/backends \
+		-Ddump_email=root@localhost \
+		-Djob_email=root@localhost \
+		-Ddb_name=bareos \
+		-Dsbin-perm=755 \
+		-Ddb_user=bareos \
+		-Dbaseport=9101 \
+		-Dpiddir=/var/run/bareos
+
+.if defined(WITH_CLIENT_ONLY)
+LMDB_CMAKE_ON=	-Dlmdb=ON
+LMDB_CMAKE_OFF=	-Dlmdb=OFF
+LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
+
+CMAKE_ARGS+=	-Dfd-user=root \
+		-Dfd-group=wheel
+.else
+CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
+		-Ddir-group=${BAREOS_GROUP} \
+		-Dsd-user=${BAREOS_USER} \
+		-Dsd-group=operator \
+		-Dlmdb=OFF
+.endif
+
+# The user/group IDs below are registered, see
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
+#
+BAREOS_USER?=	bareos
+BAREOS_GROUP?=	${BAREOS_USER}
+BAREOS_UID?=	997
+BAREOS_GID?=	${BAREOS_UID}
+BAREOS_DIR?=	/var/db/bareos
+
+PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
+
+SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
+		BAREOS_GROUP=${BAREOS_GROUP} \
+		BAREOS_UID=${BAREOS_UID} \
+		BAREOS_GID=${BAREOS_GID} \
+		BAREOS_DIR=${BAREOS_DIR}
+
+NLS_USES=		gettext
+NLS_CMAKE_ON=		-Dnls=ON
+CEPHFS_CMAKE_ON=	-Dcephfs=ON
+CEPHFS_LIB_DEPENDS=	libcephfs.so:net/ceph14
+GFAPI_CMAKE_ON=		-Dgfapi=ON
+GFAPI_LIB_DEPENDS=	libglusterfs.so:net/glusterfs
+RADOS_CMAKE_ON=		-Drados=ON -Dcephfs=ON
+RADOS_LIB_DEPENDS=	librados.so:net/ceph14
+
+# Client only or full server version
+.if defined(WITH_CLIENT_ONLY)
+CONFFILES=	fd
+CMAKE_ARGS+=	-Dclient-only=ON
+
+PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
+PKGINSTALL=	${FILESDIR}/pkg-install.client
+.else
+# Server only Options
+CONFFILES=		sd dir
+CMAKE_ARGS+=	-Dbuild-dird=ON \
+		-Dbuild-stored=ON \
+		-Dbuild_client_only=OFF
+# Server default database
+
+MYSQL_CMAKE_ON=		-Dmysql=ON
+MYSQL_USES=	mysql
+SQLITE3_CMAKE_ON=	-Dsqlite3=ON
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+PGSQL_CMAKE_ON=		-Dpostgresql=ON
+PGSQL_USES=	pgsql
+
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+DBTYPE=			mysql
+SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
+.elif ${PORT_OPTIONS:MSQLITE3}
+DBTYPE=			sqlite3
+.else
+DBTYPE=			postgresql
+SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
+.endif
+PLIST_SUB+=		DBTYPE=${DBTYPE}
+
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+MP1+=	bconsole.1
+MP8+=	bareos-fd.8
+.else
+MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
+	btape.8 btraceback.8 bareos-dbcheck.8
+MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
+.endif
+
+MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
+
+post-patch:
+	@${REINPLACE_CMD}  '69,72d' ${WRKSRC}/CMakeLists.txt
+.if ${PKGNAMESUFFIX} == "19-server"
+	@${REINPLACE_CMD}  '24d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
+.endif
+
+post-extract:
+.if defined(WITH_CLIENT_ONLY)
+.	if defined(PYTHON_PLUGIN)
+		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset
+		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job
+.	endif
+.endif
+	@${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
+		${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
+
+.if !target(post-install)
+post-install:
+.if defined(WITH_CLIENT_ONLY)
+	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
+	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
+.else
+	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
+	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
+	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
+	${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
+.endif
+	@${MKDIR} ${STAGEDIR}/var/run/bareos
+.endif
+.else
+.include "${MASTERDIR}/Makefile.common"
+.endif # 19-client and 19-server are defined
+.include <bsd.port.mk>
diff --git a/sysutils/bareos19-server/Makefile.common b/sysutils/bareos19-server/Makefile.common
new file mode 100644
index 000000000000..ceb28552dccc
--- /dev/null
+++ b/sysutils/bareos19-server/Makefile.common
@@ -0,0 +1,33 @@
+# Created by: Alonso Cardenas <acm@FreeBSD.org>
+
+post-patch:
+	@${REINPLACE_CMD}  '69,72d' ${WRKSRC}/CMakeLists.txt
+
+post-build:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos
+.endif
+
+pre-install:
+.if ${PKGNAMESUFFIX} == "19-traymonitor"
+.	for d in client director monitor storage
+		${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
+		${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
+.	endfor
+.endif
+
+do-install:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \
+	${STAGEDIR}${PREFIX}/libexec/nagios
+.endif
+.if ${PKGNAMESUFFIX} == "19-traymonitor"
+# Install config files and preserve existing ones
+.for d in client director monitor storage
+	${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
+.endfor
+	${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR}
+.endif
diff --git a/sysutils/bareos19-server/distinfo b/sysutils/bareos19-server/distinfo
new file mode 100644
index 000000000000..b717914d94e1
--- /dev/null
+++ b/sysutils/bareos19-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1607980168
+SHA256 (bareos-bareos-Release-19.2.9_GH0.tar.gz) = ea203d4bdacc8dcc86164a74f628888ce31cc90858398498137bd25900b8f723
+SIZE (bareos-bareos-Release-19.2.9_GH0.tar.gz) = 12886739
diff --git a/sysutils/bareos19-server/files/bareos-barcodes b/sysutils/bareos19-server/files/bareos-barcodes
new file mode 100644
index 000000000000..f42cb7f7aeea
--- /dev/null
+++ b/sysutils/bareos19-server/files/bareos-barcodes
@@ -0,0 +1,51 @@
+#
+# Bacula barcode simulation file
+# used by ${PREFIX}/sbin/chio-bareos (FreeBSD)
+#
+# The volumenames are returned by the "changer list" command
+# labeling in the console is done by "label barcodes"
+# (then all volumes belog to the default pool).
+# All Lines with an "#" at the bedinning are ignored
+#
+# !!!! If you export an tape and reinsert another one,
+# !!!! don't forget to change the volume name in this file!
+#
+1:Volume1-100
+2:Volume1-101
+3:Volume1-102
+4:Volume1-103
+5:Volume1-104
+6:Volume1-105
+7:Volume1-106
+8:Volume1-107
+9:Volume1-108
+10:Volume1-109
+11:Volume1-110
+12:Volume1-111
+#
+# Further volumes exported from the changer
+#
+# 36GB AIT2 tapes
+#Volume1-100
+#Volume1-101
+#Volume1-102
+#Volume1-103
+#Volume1-104
+#Volume1-105
+#Volume1-106
+#Volume1-107
+#Volume1-108
+#Volume1-109
+#Volume1-110
+#Volume1-111
+#Volume1-112
+#Volume1-113
+#Volume1-114
+#Volume1-115
+#
+# 50GB AIT2 tapes
+#Volume2-200
+#Volume2-201
+#Volume2-202
+#Volume2-203
+#Volume2-204
diff --git a/sysutils/bareos19-server/files/bareos-dir.in b/sysutils/bareos19-server/files/bareos-dir.in
new file mode 100644
index 000000000000..86b62370cbb7
--- /dev/null
+++ b/sysutils/bareos19-server/files/bareos-dir.in
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# PROVIDE: bareos_dir
+# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bareos_dir_enable  (bool):   Set to NO by default.
+#                Set it to YES to enable bareos_dir.
+# bareos_dir_flags (params):   Set params used to start bareos_dir.
+# bareos_dir_config (params):  Path to the config file/directory
+#
+
+. /etc/rc.subr
+
+name="bareos_dir"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${bareos_dir_enable="NO"}
+: ${bareos_dir_flags="-u bareos -g bareos -v"}
+: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"}
+: ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
+
+command=%%PREFIX%%/sbin/bareos-dir
+command_args="-c ${bareos_dir_config}"
+pidfile="${bareos_dir_pidfile}"
+bconsole_command=/usr/local/bin/bconsole
+start_precmd="bareos_start_precmd"
+restart_precmd="bareos_dir_configtest"
+reload_precmd="bareos_dir_configtest"
+reload_cmd="bareos_dir_reload"
+configtest_cmd="bareos_dir_configtest"
+
+bareos_start_precmd() {
+	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
+	bareos_dir_configtest
+}
+
+bareos_dir_configtest() {
+	echo "Performing sanity check on ${bareos_dir_config} configuration:"
+	eval ${command} -t
+}
+
+bareos_dir_reload() {
+	echo "Performing a graceful reload"
+	# bconsole always exits with 0, so we can't check the return status for success.
+	echo "reload" | ${bconsole_command}
+}
+
+extra_commands="reload configtest"
+run_rc_command "$1"
diff --git a/sysutils/bareos19-server/files/bareos-fd.in b/sysutils/bareos19-server/files/bareos-fd.in
new file mode 100644
index 000000000000..54647786b12c
--- /dev/null
+++ b/sysutils/bareos19-server/files/bareos-fd.in
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# PROVIDE: bareos_fd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bareos_fd_enable  (bool):  Set to NO by default.
+#               Set it to YES to enable bareos_fd.
+# bareos_fd_flags (params):  Set params used to start bareos_fd.
+# bareos_fd_config (params):  Path to the config file/directory
+#
+
+. /etc/rc.subr
+
+name="bareos_fd"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${bareos_fd_enable="NO"}
+: ${bareos_fd_flags="-u root -g wheel -v"}
+: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"}
+: ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
+
+command=%%PREFIX%%/sbin/bareos-fd
+command_args="-c ${bareos_fd_config}"
+pidfile="${bareos_fd_pidfile}"
+start_precmd="bareos_start_precmd"
+
+bareos_start_precmd() {
+	[ -d "${pidfile%/*}" ] || {
+		getent passwd bareos > /dev/null 2&>1
+		if [ $? -eq 0] ; then
+			# user bareos exists
+			install -d -o bareos -g bareos ${pidfile%/*}
+		else
+			# bareos_fd as solitair service
+			install -d -o root -g wheel ${pidfile%/*}
+		fi
+	}
+}
+
+run_rc_command "$1"
diff --git a/sysutils/bareos19-server/files/bareos-sd.in b/sysutils/bareos19-server/files/bareos-sd.in
new file mode 100644
index 000000000000..a5efe78e80f7
--- /dev/null
+++ b/sysutils/bareos19-server/files/bareos-sd.in
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# PROVIDE: bareos_sd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bareos_sd_enable  (bool):  Set to NO by default.
+#               Set it to YES to enable bareos_sd.
+# bareos_sd_flags (params):  Set params used to start bareos_sd.
+# bareos_sd_config (params): Path to the config file/directory
+#
+
+. /etc/rc.subr
+
+name="bareos_sd"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${bareos_sd_enable="NO"}
+: ${bareos_sd_flags="-u bareos -g bareos -v"}
+: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"}
+: ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
+
+command=%%PREFIX%%/sbin/bareos-sd
+command_args="-c ${bareos_sd_config}"
+pidfile="${bareos_sd_pidfile}"
+start_precmd="bareos_start_precmd"
+
+bareos_start_precmd() {
+	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
+}
+
+run_rc_command "$1"
diff --git a/sysutils/bareos19-server/files/chio-bareos b/sysutils/bareos19-server/files/chio-bareos
new file mode 100644
index 000000000000..f006ef78e6ce
--- /dev/null
+++ b/sysutils/bareos19-server/files/chio-bareos
@@ -0,0 +1,190 @@
+#!/bin/sh
+#
+# BAREOS interface to tape libraries and autoloaders for FreeBSD
+# (by Rudolf Cejka <cej...@fit.vutbr.cz>, v1.2, 2012/11/14)
+#
+# If you set in your Device resource
+#   Changer Command = "path-to-this-script/chio-changer %c %o %S %a %d"
+# you will have the following input to this script:
+#   chio-changer "changer-device" "command" "slot" "tape-device" "drive-index"
+#                       $1           $2       $3         $4            $5
+# for example (on a FreeBSD system):
+#   chio-changer /dev/ch0 load 1 /dev/nsa0 0
+#
+# If you change the script, take care to return either the chio exit
+# code or a 0. If the script exits with a non-zero exit code, BAREOS
+# will assume the request failed.
+#
+
+PROGNAME=`basename $0`
+
+# Uncomment the following line, if you want to log debug output.
+#DEBUG=/var/run/bareos/${PROGNAME}.log
+
+# Uncomment the following line, if you need to eject a tape before moving
+# it from the drive.
+#OFFLINE=yes
+
+# Uncomment one or more of the following lines, if you need to wait for
+# some time (in seconds) after unloading, loading or transferring a tape.
+#OFFLINE_SLEEP=10
+#LOAD_SLEEP=10
+#MOVE_SLEEP=10
+
+# Uncomment the following line, if you do not have a changer with volume
+# reader.
+#FAKE_BARCODES=/usr/local/etc/bareos-barcodes
+
+usage()
+{
+  cat <<EOF
+Usage: ${PROGNAME} <changer-device> <cmd> [slot] [tape-device] [drive-index]
+
+Commands (<cmd>):
+  unload          Unload a tape into the slot from where it was loaded
+  load <slot>     Load a tape from the slot <slot> (1-based)
+  transfer <slot> <slotdst> Transfer a tape from the slot <slot> to
+                  the slot <slotdst> (1-based)
+  list            List full storage slots
+  listall         List all storage slots and drives with source information
+  loaded          Give slot from where the tape was loaded (0 = empty drive)
+  slots           Give number of available slots
+
+Example:
+  ${PROGNAME} /dev/ch0 load 1        Load a tape from the slot 1
+
+EOF
+  exit 1
+}
+
+# Default settings
+CHANGER=/dev/ch0
+TAPE=/dev/nsa0
+DRIVE=0
+
+CHIO=/bin/chio
+MT=/usr/bin/mt
+
+if [ -n "${DEBUG}" ]; then
+  MSG=$0
+  for PAR; do MSG="${MSG} \"${PAR}\""; done
+  echo `date +"%Y/%m/%d %H:%M:%S"` ${MSG} >> ${DEBUG}
+fi
+
+if [ -n "$1" ]; then
+  CHANGER=$1;
+fi
+COMMAND=$2
+SLOT=$3
+SLOTDST=$4
+if [ -n "$4" ]; then
+  TAPE=$4
+fi
+if [ -n "$5" ]; then
+  DRIVE=$5
+fi
+
+case ${COMMAND} in
+unload)
+  if [ "${OFFLINE}" = yes ]; then
+    ${MT} -f ${TAPE} offline
+    if [ $? = 0 -a -n "${OFFLINE_SLEEP}" ]; then
+      sleep ${OFFLINE_SLEEP}
+    fi
+  fi
+  if [ -z "${SLOT}" ]; then
+    ${CHIO} -f ${CHANGER} return drive ${DRIVE}
+  else
+    ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT} - 1))
+  fi
+  if [ $? -ne 0 ]; then
+    # In case of an error, try to unload the cartridge to the first free slot
+    FREE=`${CHIO} -f ${CHANGER} status slot | \
+      sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \
+      awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'`
+    if [ ${FREE} -gt 0 ]; then
+      ${CHIO} -f ${CHANGER} move drive ${DRIVE} slot $((${FREE} - 1))
+    else
+      exit 1
+    fi
+  fi
+  ;;
+load)
+  if [ -z "${SLOT}" ]; then
+    usage
+  fi
+  ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) drive ${DRIVE}
+  if [ $? -ne 0 ]; then
+    exit 1
+  fi
+  if [ -n "${LOAD_SLEEP}" ]; then
+    sleep ${LOAD_SLEEP}
+  fi
+  ;;
+transfer)
+  if [ -z "${SLOT}" -o -z "${SLOTDST}" ]; then
+    usage
+  fi
+  ${CHIO} -f ${CHANGER} move slot $((${SLOT} - 1)) slot $((${SLOTDST} - 1))
+  if [ $? -ne 0 ]; then
+    exit 1
+  fi
+  if [ -n "${MOVE_SLEEP}" ]; then
+    sleep ${MOVE_SLEEP}
+  fi
+  ;;
+list)
+  if [ -z "${FAKE_BARCODES}" ]; then
+    ${CHIO} -f ${CHANGER} status -v slot | \
+      sed -ne 's/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/\1:\2/p' | \
+      awk -F: '{ print $1 + 1 ":" $2 }'
+  else
+    if [ -f "${FAKE_BARCODES}" ]; then
+      grep -v -e "^#" -e "^$" < ${FAKE_BARCODES}
+    else
+      echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing"
+      exit 1
+    fi
+  fi
+  ;;
+listall)
+  if [ -z "${FAKE_BARCODES}" ]; then
+    ${CHIO} -f ${CHANGER} status -vS | \
+      sed -ne '
+      s/^slot *\([0-9]*\):.*ENAB.*FULL.*voltag.*<\([^:]*\):.*/I:\1:F:\2/p;t
+      s/^slot *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*/S:\1:F:\2/p;t
+      s/^drive *\([0-9]*\):.*FULL.*voltag.*<\([^:]*\):.*source.*<[^0-9]*\([0-9]*\)>.*/D:\1:F:\3:\2/p;t
+      s/^slot *\([0-9]*\):.*ENAB.*voltag.*<\([^:]*\):.*/I:\1:E/p;t
+      s/^slot *\([0-9]*\):.*voltag.*<\([^:]*\):.*/S:\1:E/p;t
+      s/^drive *\([0-9]*\):.*voltag.*<\([^:]*\):.*/D:\1:E/p' | \
+      awk -F: '{ for (n = 1; n <= NF; n++) printf "%s%s",
+      (n == ($1 == "D" ? 4 : 2)) ? ($n == "" ? 0 : $n + 1) : $n,
+      (n == NF) ? "\n" : ":" }'
+  else
+    if [ -f "${FAKE_BARCODES}" ]; then
+      grep -v -e "^#" -e "^$" < ${FAKE_BARCODES} | \
+        awk -F: '{ print "S:" $1 (match($2, "^ *$") ? ":E" : ":F:" $2) }'
+    else
+      echo "${PROGNAME}: Barcode file ${FAKE_BARCODES} is missing"
+      exit 1
+    fi
+  fi
+  ;;
+loaded)
+  # If a tape is loaded, but the source slot is unknown (for example,
+  # after library reboot), try to report the first free slot
+  FREE=`${CHIO} -f ${CHANGER} status slot | \
+    sed -ne '/FULL/d;s/^slot *\([0-9]*\):.*/\1/p' | \
+    awk 'BEGIN { n = 0 } { n = $1 + 1; exit } END { print n }'`
+  ${CHIO} -f ${CHANGER} status -S drive | \
+    sed -ne 's/^drive *'${DRIVE}':.*FULL.*source.*<[^0-9]*\([0-9]*\)>.*/\1/p' \
+    | awk 'BEGIN { n = 0 } { n = ($1 == "") ? '${FREE}' : $1 + 1 } \
+    END { print n }'
+  ;;
+slots)
+  ${CHIO} -f ${CHANGER} status | grep -c "^slot "
+  ;;
+*)
+  usage
+  ;;
+esac
diff --git a/sysutils/bareos19-server/files/patch-core-CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-CMakeLists.txt
new file mode 100644
index 000000000000..955525c77b1c
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-CMakeLists.txt
@@ -0,0 +1,34 @@
+--- core/CMakeLists.txt	2020-01-31 12:45:28.110777000 -0500
++++ core/CMakeLists.txt	2020-01-31 12:47:41.413976000 -0500
+@@ -249,7 +249,9 @@
+   set(PSCMD "ps -ax -o pid,command")
+   include_directories(/usr/local/include)
+   link_directories(/usr/local/lib)
+-  link_libraries(intl)
++  IF(nls)
++    link_libraries(intl)
++  ENDIF()
+ endif()
+ 
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -316,8 +318,11 @@
+   add_definitions("-D_FILE_OFFSET_BITS=64")
+ endif()
+ 
+-include(FindIntl)
+ 
++IF(nls)
++  INCLUDE(FindIntl)
++ENDIF()
++
+ if(developer)
+   add_definitions("-DDEVELOPER=1")
+ endif()
+@@ -746,7 +751,6 @@
+ 
+ add_subdirectory(scripts)
+ add_subdirectory(manpages)
+-add_subdirectory(platforms)
+ add_subdirectory(src)
+ 
+ include(BareosLocalBuildDefinitions OPTIONAL
diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosCheckIncludes.cmake
new file mode 100644
index 000000000000..e7fe16ff0038
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-cmake_BareosCheckIncludes.cmake
@@ -0,0 +1,32 @@
+--- core/cmake/BareosCheckIncludes.cmake	2020-12-11 08:44:43.000000000 -0500
++++ core/cmake/BareosCheckIncludes.cmake	2020-12-14 19:30:00.380545000 -0500
+@@ -100,21 +100,21 @@
+ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H)
+ check_include_files(api/glfs.h HAVE_API_GLFS_H)
+ 
++if(cephfs)
+ check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H)
++check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX)
++endif()
+ 
+-include(CheckSymbolExists)
+-include(CMakePushCheckState)
+-cmake_push_check_state()
+-set(CMAKE_REQUIRED_LIBRARIES cephfs)
+-check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX)
+-cmake_pop_check_state()
+-
++if(rados)
+ check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H)
+ check_include_files(radosstriper/libradosstriper.h
+                     HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H)
++endif()
+ 
+ # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H)
+-check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
++if(gfapi)
++  check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
++endif()
+ 
+ check_include_files(elasto/data.h HAVE_ELASTO_DATA_H)
+ check_include_files(elasto/file.h HAVE_ELASTO_FILE_H)
diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
new file mode 100644
index 000000000000..fc7d187ea1ca
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
@@ -0,0 +1,66 @@
+--- core/cmake/BareosFindAllLibraries.cmake	2020-01-31 11:21:18.000000000 -0500
++++ core/cmake/BareosFindAllLibraries.cmake	2020-02-03 00:55:59.098603000 -0500
+@@ -23,20 +23,22 @@
+ endif()
+ 
+ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  # make sure we get python 2 not 3
+-  set(
+-    Python_ADDITIONAL_VERSIONS
+-    2.5
+-    2.6
+-    2.7
+-    2.8
+-    2.9
+-  )
+-  find_package(PythonInterp)
+-  include(FindPythonLibs)
++  if (python)
++    # make sure we get python 2 not 3
++    set(
++      Python_ADDITIONAL_VERSIONS
++      3.5
++      3.6
++      3.7
++      3.8
++      2.9
++    )
++    find_package(PythonInterp)
++    include(FindPythonLibs)
+ 
+-  if(${PYTHONLIBS_FOUND})
+-    set(HAVE_PYTHON 1)
++    if(${PYTHONLIBS_FOUND})
++      set(HAVE_PYTHON 1)
++    endif()
+   endif()
+ 
+   include(FindPostgreSQL)
+@@ -56,13 +58,22 @@
+ include(BareosFindLibraryAndHeaders)
+ 
+ bareosfindlibraryandheaders("jansson" "jansson.h")
+-bareosfindlibraryandheaders("rados" "rados/librados.h")
+-bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h")
+-bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h")
+ bareosfindlibraryandheaders("pthread" "pthread.h")
+ bareosfindlibraryandheaders("cap" "sys/capability.h")
+-bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h")
+-bareosfindlibraryandheaders("droplet" "droplet.h")
++
++if(rados)
++  bareosfindlibraryandheaders("rados" "rados/librados.h")
++  bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h")
++endif()
++if(cephfs)
++  bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h")
++endif()
++if(gfapi)
++  bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h")
++endif()
++if(droplet)
++  bareosfindlibraryandheaders("droplet" "droplet.h")
++endif()
+ 
+ bareosfindlibraryandheaders("pam" "security/pam_appl.h")
+ 
diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
new file mode 100644
index 000000000000..3c89b1c8a8f7
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake
@@ -0,0 +1,117 @@
+--- core/cmake/BareosInstallConfigFiles.cmake	2020-01-31 11:21:18.000000000 -0500
++++ core/cmake/BareosInstallConfigFiles.cmake	2020-02-03 02:15:35.557127000 -0500
+@@ -60,24 +60,12 @@
+     get_filename_component(resname ${resdir} NAME)
+     foreach(configfile ${configfiles})
+       get_filename_component(fname ${configfile} NAME)
+-      if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
+-        message(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
+-        message(STATUS "rename ${configfile} to ${configfile}.new")
+-        file(RENAME "${configfile}" "${configfile}.new")
+-
+-        message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
+-        file(
+-          INSTALL "${configfile}.new"
+-          DESTINATION "${DESTCONFDIR}/${resname}"
+-        )
+-        file(RENAME "${configfile}.new" "${configfile}")
+-      else()
+-        message(
+-          STATUS
+-            "${resname}/${fname} as ${resname}/${fname} (new installation)"
+-        )
+-        file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+-      endif()
++      message(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
++      file(RENAME "${configfile}" "${configfile}.sample")
++      file(
++	COPY "${configfile}.sample"
++	DESTINATION "${DESTCONFDIR}/${resname}"
++      )
+     endforeach()
+   endforeach()
+ 
+@@ -114,23 +102,12 @@
+       get_filename_component(dir ${configfile} DIRECTORY)
+       get_filename_component(fname ${configfile} NAME)
+ 
+-      if(EXISTS ${DESTCONFDIR}/${configfile})
+-        message(STATUS "${configfile} as ${configfile}.new (keep existing)")
+-        file(RENAME "${BackendConfigSrcDir}/${configfile}"
+-             "${BackendConfigSrcDir}/${configfile}.new")
+-        file(
+-          COPY "${BackendConfigSrcDir}/${configfile}.new"
+-          DESTINATION "${DESTCONFDIR}/${dir}"
+-        )
+-        file(RENAME "${BackendConfigSrcDir}/${configfile}.new"
+-             "${BackendConfigSrcDir}/${configfile}")
+-      else()
+-        message(STATUS "${configfile} as ${configfile}")
+-        file(
+-          COPY "${BackendConfigSrcDir}/${configfile}"
+-          DESTINATION "${DESTCONFDIR}/${dir}"
+-        )
+-      endif()
++      message(STATUS "${configfile} as ${configfile}")
++      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
++      file(
++	COPY "${BackendConfigSrcDir}/${configfile}.sample"
++	DESTINATION "${DESTCONFDIR}/${dir}"
++      )
+     endforeach()
+ 
+     file(
+@@ -140,7 +117,8 @@
+     )
+     foreach(configfile ${configfiles})
+       get_filename_component(dir ${configfile} DIRECTORY)
+-      # get_filename_component(fname ${configfile} NAME)
++      get_filename_component(fname ${configfile} NAME)
++      get_filename_component(fsname ${configfile} NAME_WE)
+ 
+       if(EXISTS ${DESTCONFDIR}/${configfile})
+         message(STATUS "overwriting ${configfile}")
+@@ -148,9 +126,10 @@
+         message(STATUS "${configfile} as ${configfile}")
+       endif()
+ 
++      file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample")
+       file(
+-        COPY "${BackendConfigSrcDir}/${configfile}"
+-        DESTINATION "${DESTCONFDIR}/${dir}"
++	COPY "${BackendConfigSrcDir}/${fsname}.conf.sample"
++	DESTINATION "${DESTCONFDIR}/${dir}"
+       )
+     endforeach()
+ 
+@@ -174,22 +153,14 @@
+         )
+         if(NOT "${IS_INFILE}" STREQUAL ".in")
+           get_filename_component(fname ${configfile} NAME)
+-          if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
+-            message(
+-              STATUS
+-                "${resname}/${fname} as ${resname}/${fname}.new (keep existing)"
+-            )
+-            file(RENAME "${configfile}" "${configfile}.new")
+-            file(
+-              COPY "${configfile}.new"
+-              DESTINATION "${DESTCONFDIR}/${resname}"
+-            )
+-            file(RENAME "${configfile}.new" "${configfile}")
+-          else()
+-            message(STATUS "${resname}/${fname} as ${resname}/${fname}")
+-            file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
+-          endif()
+-        else()
++	  get_filename_component(fsname ${configfile} NAME_WE)
++          message(STATUS "${resname}/${fname} as ${resname}/${fname}")
++          file(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample")
++          file(
++	    COPY "${resdir}/${fsname}.conf.sample"
++	    DESTINATION "${DESTCONFDIR}/${resname}"
++          )
++       else()
+           message(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
+         endif()
+       endforeach()
diff --git a/sysutils/bareos19-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos19-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
new file mode 100644
index 000000000000..935c5a5b3177
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake
@@ -0,0 +1,15 @@
+--- core/cmake/BareosSetVariableDefaults.cmake	2020-01-31 16:21:15.864122000 -0500
++++ core/cmake/BareosSetVariableDefaults.cmake	2020-01-31 16:23:58.960984000 -0500
+@@ -641,7 +641,11 @@
+ set(PACKAGE_URL "\"\"")
+ set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
+ 
+-set(ENABLE_NLS 1)
++if(nls)
++  SET(ENABLE_NLS 1)
++else()
++  SET(ENABLE_NLS 0)
++endif()
+ 
+ if(HAVE_WIN32)
+ 
diff --git a/sysutils/bareos19-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-manpages_CMakeLists.txt
new file mode 100644
index 000000000000..1a78d64effb1
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-manpages_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- core/manpages/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/manpages/CMakeLists.txt	2020-01-31 15:33:19.205416000 -0500
+@@ -17,9 +17,11 @@
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
+ 
++if(client-only)
+ set(MAN1 bconsole.1)
+ 
+ set(MAN8 bareos-fd.8 bareos.8)
++endif()
+ 
+ if(NOT client-only)
+   set(MAN1-server
diff --git a/sysutils/bareos19-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-scripts_CMakeLists.txt
new file mode 100644
index 000000000000..ae7fd0295cdf
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-scripts_CMakeLists.txt
@@ -0,0 +1,59 @@
+--- core/scripts/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/scripts/CMakeLists.txt	2020-01-31 15:37:16.832224000 -0500
+@@ -17,33 +17,35 @@
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
+ 
+-install(
+-  FILES bareos btraceback
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+-              WORLD_READ WORLD_EXECUTE
+-  DESTINATION "${sbindir}"
+-)
++if(client-only)
++   install(
++     FILES bareos btraceback
++     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++                 WORLD_READ WORLD_EXECUTE
++     DESTINATION "${sbindir}"
++   )
+ 
+-install(
+-  FILES bareos-ctl-fd
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+-              WORLD_READ WORLD_EXECUTE
+-  DESTINATION "${scriptdir}"
+-  COMPONENT filedaemon
+-)
++   install(
++     FILES bareos-ctl-fd
++     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++                 WORLD_READ WORLD_EXECUTE
++     DESTINATION "${scriptdir}"
++     COMPONENT filedaemon
++   )
+ 
+-install(
+-  FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
+-        bareos-config-lib.sh bareos-ctl-funcs
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+-              WORLD_READ WORLD_EXECUTE
+-  DESTINATION "${scriptdir}"
+-)
++   install(
++     FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
++           bareos-config-lib.sh bareos-ctl-funcs
++     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++                 WORLD_READ WORLD_EXECUTE
++     DESTINATION "${scriptdir}"
++   )
++endif()
+ 
+ if(NOT client-only)
+   install(
+     FILES mtx-changer disk-changer bareos-explorer bareos-glusterfind-wrapper
+-          bareos-ctl-dir bareos-ctl-sd bareos-ctl-funcs
++          bareos-ctl-dir bareos-ctl-sd
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+                 WORLD_READ WORLD_EXECUTE
+     DESTINATION "${scriptdir}"
diff --git a/sysutils/bareos19-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt
new file mode 100644
index 000000000000..7871e7d5e0f8
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- core/src/dird/dbcopy/CMakeLists.txt	2020-02-01 12:39:35.841314000 -0500
++++ core/src/dird/dbcopy/CMakeLists.txt	2020-02-01 12:39:55.280473000 -0500
+@@ -11,6 +11,9 @@
+       bareossql
+       $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}>
+       ${LMDB_LIBS}
++      ${OPENSSL_LIBRARIES}
++      ${PTHREAD_LIBRARIES}
++      ${JANSSON_LIBRARIES}
+   )
+ 
+ install(TARGETS
diff --git a/sysutils/bareos19-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-dird_CMakeLists.txt
new file mode 100644
index 000000000000..a41310367062
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-dird_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- core/src/dird/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/src/dird/CMakeLists.txt	2020-01-31 15:41:53.134935000 -0500
+@@ -148,7 +148,8 @@
+ add_executable(bareos-dir ${DIRDSRCS})
+ 
+ set(BAREOS_DIR_LIBRARIES dird_objects bareos bareoscats bareossql bareosfind
+-                         ${LMDB_LIBS} ${NDMP_LIBS}
++                         ${LMDB_LIBS} ${NDMP_LIBS} ${OPENSSL_LIBRARIES} 
++			 ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}
+ )
+ 
+ if(HAVE_WIN32)
+@@ -166,7 +167,7 @@
+ add_executable(bareos-dbcheck ${DBCHKSRCS})
+ set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
+ 
+-target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES})
++target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES})
+ 
+ # is not built by default
+ 
diff --git a/sysutils/bareos19-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos19-server/files/patch-core-src-include_baconfig.h
new file mode 100644
index 000000000000..00af8c5eff44
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-include_baconfig.h
@@ -0,0 +1,25 @@
+--- core/src/include/baconfig.h	2020-02-04 15:53:01.627766000 -0500
++++ core/src/include/baconfig.h	2020-02-04 15:53:34.762711000 -0500
+@@ -119,11 +119,11 @@
+ #define N_(s) (s)
+ #endif /* N_ */
+ #else  /* !ENABLE_NLS */
++#include <locale.h>
+ #undef _
+ #undef N_
+ #undef textdomain
+ #undef bindtextdomain
+-#undef setlocale
+ 
+ #ifndef _
+ #define _(s) (s)
+@@ -136,9 +136,6 @@
+ #endif
+ #ifndef bindtextdomain
+ #define bindtextdomain(p, d)
+-#endif
+-#ifndef setlocale
+-#define setlocale(p, d)
+ #endif
+ #endif /* ENABLE_NLS */
+ 
diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-dird_python-dir.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-dird_python-dir.cc
new file mode 100644
index 000000000000..c5a20c421954
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-plugins-dird_python-dir.cc
@@ -0,0 +1,61 @@
+--- core/src/plugins/dird/python-dir.cc	2020-01-31 11:21:18.000000000 -0500
++++ core/src/plugins/dird/python-dir.cc	2020-01-31 15:50:39.024455000 -0500
+@@ -41,6 +41,13 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#endif
++
+ #include "python-dir.h"
+ #include "lib/edit.h"
+ 
+@@ -121,6 +128,20 @@
+  */
+ static PyThreadState* mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosDIRModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareosdir",
++  NULL,
++  -1,
++  BareosDIRMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -660,7 +681,11 @@
+     /*
+      * Make our callback methods available for Python.
+      */
++#if (PY_VERSION_HEX >  0x03050000)
++    p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef);
++#else
+     p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods);
++#endif
+   }
+ 
+   /*
+@@ -939,7 +964,11 @@
+       char* value;
+ 
+       ctx = PyGetbpContext(pyCtx);
++#if (PY_VERSION_HEX >  0x03050000)
++      value = strdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+         retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value);
+       }
diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_CMakeLists.txt
new file mode 100644
index 000000000000..3757a55385cf
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_CMakeLists.txt
@@ -0,0 +1,49 @@
+--- core/src/plugins/filed/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/src/plugins/filed/CMakeLists.txt	2020-01-31 15:54:40.841485000 -0500
+@@ -100,24 +100,26 @@
+   install(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon)
+ endif()
+ 
+-set(PYFILES
+-    bareos-fd.py.template
+-    bareos-fd-local-fileset.py
+-    bareos-fd-mock-test.py
+-    BareosFdPluginBaseclass.py
+-    BareosFdPluginLocalFileset.py
+-    BareosFdWrapper.py
+-    bareos_fd_consts.py
+-    bareos-fd-ldap.py
+-    BareosFdPluginLDAP.py
+-    bareos-fd-ovirt.py
+-    BareosFdPluginOvirt.py
+-    bareos-fd-percona-xtrabackup.py
+-    BareosFdPluginPerconaXtraBackup.py
+-)
++if(python)
++   set(PYFILES
++       bareos-fd.py.template
++       bareos-fd-local-fileset.py
++       bareos-fd-mock-test.py
++       BareosFdPluginBaseclass.py
++       BareosFdPluginLocalFileset.py
++       BareosFdWrapper.py
++       bareos_fd_consts.py
++       bareos-fd-ldap.py
++       BareosFdPluginLDAP.py
++       bareos-fd-ovirt.py
++       BareosFdPluginOvirt.py
++       bareos-fd-percona-xtrabackup.py
++       BareosFdPluginPerconaXtraBackup.py
++   )
+ 
+-install(
+-  FILES ${PYFILES}
+-  DESTINATION ${plugindir}
+-  COMPONENT filedaemon
+-)
++   install(
++     FILES ${PYFILES}
++     DESTINATION ${plugindir}
++     COMPONENT filedaemon
++   )
++endif()
diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_gfapi-fd.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_gfapi-fd.cc
new file mode 100644
index 000000000000..0375b4c33f7e
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_gfapi-fd.cc
@@ -0,0 +1,24 @@
+--- core/src/plugins/filed/gfapi-fd.cc	2020-02-03 00:50:05.248044000 -0500
++++ core/src/plugins/filed/gfapi-fd.cc	2020-02-03 00:50:35.639144000 -0500
+@@ -32,7 +32,7 @@
+ #include "lib/berrno.h"
+ #include "lib/edit.h"
+ 
+-#include <api/glfs.h>
++#include <glusterfs/api/glfs.h>
+ 
+ 
+ /* avoid missing config.h problem on Debian 8 and Ubuntu 16:
+@@ -41,10 +41,10 @@
+  */
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+-#include <compat-errno.h>
++#include <glusterfs/compat-errno.h>
+ #undef _CONFIG_H
+ #else
+-#include <compat-errno.h>
++#include <glusterfs/compat-errno.h>
+ #endif
+ 
+ namespace filedaemon {
diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-filed_python-fd.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_python-fd.cc
new file mode 100644
index 000000000000..a750dbc3a213
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-plugins-filed_python-fd.cc
@@ -0,0 +1,111 @@
+--- core/src/plugins/filed/python-fd.cc	2020-01-31 11:21:18.000000000 -0500
++++ core/src/plugins/filed/python-fd.cc	2020-01-31 17:58:06.370789000 -0500
+@@ -46,6 +46,14 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#define PyString_Check PyBytes_Check
++#endif
++
+ static const int debuglevel = 150;
+ 
+ #define PLUGIN_LICENSE "Bareos AGPLv3"
+@@ -154,6 +162,20 @@
+  */
+ static PyThreadState* mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosFDModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareosfd",
++  NULL,
++  -1,
++  BareosFDMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -1148,7 +1170,11 @@
+     /*
+      * Make our callback methods available for Python.
+      */
++#if (PY_VERSION_HEX >  0x03050000)
++    p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef);
++#else
+     p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods);
++#endif
+ 
+     /*
+      * Fill in the slots of PyRestoreObject
+@@ -2587,7 +2613,11 @@
+     case bVarFileSeen: {
+       char* value;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++      value = strdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) {
+         retval = bfuncs->setBareosValue(ctx, (bVariable)var, value);
+       }
+@@ -2972,7 +3002,11 @@
+   sp.type = pSavePkt->type;
+   if (pSavePkt->fname) {
+     if (PyString_Check(pSavePkt->fname)) {
++#if (PY_VERSION_HEX >  0x03050000)
++      sp.fname = strdup(PyString_AsString(pSavePkt->fname));
++#else
+       sp.fname = PyString_AsString(pSavePkt->fname);
++#endif
+     } else {
+       goto bail_out;
+     }
+@@ -2981,7 +3015,11 @@
+   }
+   if (pSavePkt->link) {
+     if (PyString_Check(pSavePkt->link)) {
++#if (PY_VERSION_HEX >  0x03050000)
++      sp.link = strdup(PyString_AsString(pSavePkt->link));
++#else
+       sp.link = PyString_AsString(pSavePkt->link);
++#endif
+     } else {
+       goto bail_out;
+     }
+@@ -3025,7 +3063,11 @@
+    */
+   if (pSavePkt->fname) {
+     if (PyString_Check(pSavePkt->fname)) {
++#if (PY_VERSION_HEX >  0x03050000)
++      sp.fname = strdup(PyString_AsString(pSavePkt->fname));
++#else
+       sp.fname = PyString_AsString(pSavePkt->fname);
++#endif
+     } else {
+       goto bail_out;
+     }
+@@ -3101,8 +3143,11 @@
+ static inline char* PyGetStringValue(PyObject* object)
+ {
+   if (!object || !PyString_Check(object)) { return (char*)""; }
+-
++#if (PY_VERSION_HEX >  0x03050000)
++  return strdup(PyString_AsString(object));
++#else
+   return PyString_AsString(object);
++#endif
+ }
+ 
+ static inline char* PyGetByteArrayValue(PyObject* object)
diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-plugins-stored_CMakeLists.txt
new file mode 100644
index 000000000000..3dc59542df60
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-plugins-stored_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- core/src/plugins/stored/CMakeLists.txt	2020-02-01 12:41:50.658146000 -0500
++++ core/src/plugins/stored/CMakeLists.txt	2020-02-01 12:43:09.372433000 -0500
+@@ -27,6 +27,10 @@
+     ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}
+   )
+   add_definitions(-DMS_WIN${WINDOWS_BITS})
++else()
++  include_directories(
++    ${PROJECT_SOURCE_DIR}/src/fastlz/include
++  )
+ endif()
+ 
+ add_library(autoxflate-sd MODULE autoxflate-sd.cc)
diff --git a/sysutils/bareos19-server/files/patch-core-src-plugins-stored_python-sd.cc b/sysutils/bareos19-server/files/patch-core-src-plugins-stored_python-sd.cc
new file mode 100644
index 000000000000..7cbc0b4816bb
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-plugins-stored_python-sd.cc
@@ -0,0 +1,61 @@
+--- core/src/plugins/stored/python-sd.cc	2020-01-31 11:21:18.000000000 -0500
++++ core/src/plugins/stored/python-sd.cc	2020-01-31 16:07:55.684864000 -0500
+@@ -41,6 +41,13 @@
+ #error "Need at least Python version 2.6 or newer"
+ #endif
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++#define PyInt_AsLong PyLong_AsLong
++#define PyInt_FromLong PyLong_FromLong
++#define PyString_AsString PyUnicode_AsUTF8
++#define PyString_FromString PyUnicode_FromString
++#endif
++
+ static const int debuglevel = 150;
+ 
+ #define PLUGIN_LICENSE "Bareos AGPLv3"
+@@ -119,6 +126,20 @@
+  */
+ static PyThreadState* mainThreadState;
+ 
++#if (PY_VERSION_HEX >  0x03050000)
++static struct PyModuleDef BareosSDModuleDef = {
++  PyModuleDef_HEAD_INIT,
++  "bareossd",
++  NULL,
++  -1,
++  BareosSDMethods,
++  NULL,
++  NULL,
++  NULL,
++  NULL
++};
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -678,7 +699,11 @@
+     /*
+      * Make our callback methods available for Python.
+      */
++#if (PY_VERSION_HEX >  0x03050000)
++    p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef);
++#else
+     p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods);
++#endif
+   }
+ 
+   /*
+@@ -958,7 +983,11 @@
+       char* value;
+ 
+       ctx = PyGetbpContext(pyCtx);
++#if (PY_VERSION_HEX >  0x03050000)
++      value = strdup(PyString_AsString(pyValue));
++#else
+       value = PyString_AsString(pyValue);
++#endif
+       if (value) { bfuncs->setBareosValue(ctx, (bsdwVariable)var, value); }
+ 
+       break;
diff --git a/sysutils/bareos19-server/files/patch-core-src-stored-backends_gfapi_device.h b/sysutils/bareos19-server/files/patch-core-src-stored-backends_gfapi_device.h
new file mode 100644
index 000000000000..2bd3b2675904
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-stored-backends_gfapi_device.h
@@ -0,0 +1,11 @@
+--- core/src/stored/backends/gfapi_device.h	2020-02-03 01:55:43.902693000 -0500
++++ core/src/stored/backends/gfapi_device.h	2020-02-03 01:52:28.885974000 -0500
+@@ -28,7 +28,7 @@
+ #ifndef BAREOS_STORED_BACKENDS_GFAPI_DEVICE_H_
+ #define BAREOS_STORED_BACKENDS_GFAPI_DEVICE_H_
+ 
+-#include <api/glfs.h>
++#include <glusterfs/api/glfs.h>
+ 
+ #if defined GLFS_FTRUNCATE_HAS_FOUR_ARGS
+ #define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL)
diff --git a/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt
new file mode 100644
index 000000000000..63cff21da895
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src-stored_CMakeLists.txt
@@ -0,0 +1,41 @@
+--- core/src/stored/CMakeLists.txt	2020-12-11 08:44:43.000000000 -0500
++++ core/src/stored/CMakeLists.txt	2021-02-19 17:45:53.384978000 -0500
+@@ -213,23 +213,23 @@
+   list(APPEND BAREOS_SD_LIBRARIES comctl32)
+ endif()
+ 
+-target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES})
++target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
+ 
+ add_executable(bls ${BLSSRCS})
+-target_link_libraries(bls bareos bareossd bareosfind)
++target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES})
+ 
+ add_executable(bextract ${BEXTRACTSRS})
+-target_link_libraries(bextract bareossd bareosfind bareos)
++target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
+ 
+ add_executable(bscan ${BSCANSRCS})
+-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
++target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES})
+ 
+ add_executable(btape ${BTAPESRCS})
+-target_link_libraries(btape bareossd bareos)
++target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
+ 
+ add_executable(bcopy ${BCOPYSRCS})
+ 
+-target_link_libraries(bcopy bareossd bareos)
++target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
+ 
+ install(TARGETS bareossd DESTINATION ${libdir})
+ 
+@@ -243,7 +243,7 @@
+ install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
+ install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake)
+ 
+-install(DIRECTORY DESTINATION "../${archivedir}")
++install(DIRECTORY DESTINATION "${archivedir}")
+ 
+ if(${HAVE_DYNAMIC_SD_BACKENDS})
+   add_subdirectory(backends)
diff --git a/sysutils/bareos19-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos19-server/files/patch-core-src_CMakeLists.txt
new file mode 100644
index 000000000000..f9401574e129
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core-src_CMakeLists.txt
@@ -0,0 +1,28 @@
+--- core/src/CMakeLists.txt	2020-01-31 11:21:18.000000000 -0500
++++ core/src/CMakeLists.txt	2020-02-01 12:33:06.503769000 -0500
+@@ -35,15 +35,18 @@
+   add_subdirectory(tests)
+ endif()
+ 
+-add_subdirectory(console)
+-if(${HAVE_LMDB})
+-  add_subdirectory(lmdb)
++if(client-only)
++   add_subdirectory(console)
++   if(${HAVE_LMDB})
++     add_subdirectory(lmdb)
++   endif()
++   add_subdirectory(lib)
++   add_subdirectory(findlib)
++   add_subdirectory(filed)
++   add_subdirectory(fastlz)
+ endif()
+-add_subdirectory(lib)
+-add_subdirectory(findlib)
+-add_subdirectory(filed)
++
+ add_subdirectory(plugins)
+-add_subdirectory(fastlz)
+ 
+ if(${traymonitor})
+   add_subdirectory(qt-tray-monitor)
diff --git a/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
new file mode 100644
index 000000000000..11bfbd7af603
--- /dev/null
+++ b/sysutils/bareos19-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
@@ -0,0 +1,38 @@
+--- core/cmake/bareos-symlink-default-db-backend.cmake.orig	2020-12-11 13:44:43 UTC
++++ core/cmake/bareos-symlink-default-db-backend.cmake
+@@ -16,15 +16,33 @@
+ #   along with this program; if not, write to the Free Software
+ #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ #   02110-1301, USA.
++
++# The ${libdir} and ${backenddir} are absolute, so figure out
++# a relative path (${backenddir} lives under ${libdir}) instead.
++# Make the link relative, placing the libbareoscats.so in ${libdir}.
++# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see
++# core/src/cats/CMakeLists.txt).
+ message(
+   STATUS
+     "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ )
++file(
++  RELATIVE_PATH 
++    _rel 
++    ${libdir} 
++    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
++)
++message(
++  STATUS 
++    ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}"
++)
++
+ execute_process(
+   COMMAND
+     ${CMAKE_COMMAND}
+     -E
+     create_symlink
+-    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
+-    ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
++    ${_rel}
++    libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
++    WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT
+ )
diff --git a/sysutils/bareos19-server/files/pkg-deinstall.client.in b/sysutils/bareos19-server/files/pkg-deinstall.client.in
new file mode 100644
index 000000000000..3be8c2e4874c
--- /dev/null
+++ b/sysutils/bareos19-server/files/pkg-deinstall.client.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BAREOS_USER%%
+GROUP=%%BAREOS_GROUP%%
+UID=%%BAREOS_UID%%
+GID=%%BAREOS_UID%%
+BACULA_DIR=%%BAREOS_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+	# Delete entries in /etc/services
+        sed -e '/# Bareos port start/,/# Bareos port end/{' \
+            -e 'd' \
+            -e '}' /etc/services > $TMPFILE
+        mv -f $TMPFILE /etc/services
+
+	if [ -d ${BAREOS_DIR} ]; then
+	    echo "Check if ${BAREOS_DIR} is empty and delete it to permanently remove the bareos port."
+	fi
+
+	if pw groupshow "${USER}" 2>/dev/null 1>&2; then
+	    echo "To delete Bareos group permanently, use 'pw groupdel ${GROUP}'"
+	fi
+        ;;
+esac
diff --git a/sysutils/bareos19-server/files/pkg-install.client.in b/sysutils/bareos19-server/files/pkg-install.client.in
new file mode 100644
index 000000000000..70ca57028237
--- /dev/null
+++ b/sysutils/bareos19-server/files/pkg-install.client.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bareos-dir" /etc/services
+if [ "$?" != "0" ]; then
+    echo "# Bareos port start
+bareos-dir      9101/tcp   #Bareos director daemon
+bareos-fd       9102/tcp   #Bareos file daemon
+bareos-sd       9103/tcp   #Bareos storage daemon
+# Bareos port end" >> /etc/services
+fi
diff --git a/sysutils/bareos19-server/files/pkg-message.client.in b/sysutils/bareos19-server/files/pkg-message.client.in
new file mode 100644
index 000000000000..b3e2d5825e13
--- /dev/null
+++ b/sysutils/bareos19-server/files/pkg-message.client.in
@@ -0,0 +1,17 @@
+[
+{ type: install
+  message: <<EOM
+bareos client was installed
+
+1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-fd.d/ and 
+   %%PREFIX%%/etc/bareos/bconsole.d/
+
+2) Add bareos_fd_enable="YES" to /etc/rc.conf.
+
+3) If you want to retain old configuration scheme, you must add the following
+   to /etc/rc.conf
+
+  bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"
+EOM
+}
+]
diff --git a/sysutils/bareos19-server/files/pkg-message.server.in b/sysutils/bareos19-server/files/pkg-message.server.in
new file mode 100644
index 000000000000..3bb0ef535ce1
--- /dev/null
+++ b/sysutils/bareos19-server/files/pkg-message.server.in
@@ -0,0 +1,74 @@
+[
+{ type: install
+  message: <<EOM
+bareos server was installed
+
+1) Sample files are installed in %%PREFIX%%/etc/bareos/bareos-dir.d/ and
+   %%PREFIX%%/etc/bareos/bareos-sd.d/ directories
+
+2) Add bareos_dir_enable="YES" and bareos_sd_enable="YES" to /etc/rc.conf.
+
+3) If you want to retain old configuration scheme, you must add the following
+   to /etc/rc.conf
+
+  bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"
+  bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"
+
+4) Important information about new version of bareos can be found in the
+   ReleaseNotes.
+
+   https://github.com/bareos/bareos/blob/master/README.md
+
+NOTE:
+
+An auto-changer manipulation script based on FreeBSDs
+chio command is included and installed at
+
+  %%PREFIX%%/sbin/chio-bareos
+
+Please have a look at it if you want to use an
+autochanger. You have to configure the usage in
+
+  %%PREFIX%%/etc/bareos/bareos-dir.conf or
+  %%PREFIX%%/etc/bareos/bareos-dir.d/storage/
+
+Take care of correct permissions for changer and
+tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
+they must be accessible by user bareos.
+
+Due to lack of some features in the FreeBSD tape driver
+implementation you MUST add some OS dependent options to
+the bareos-sd.conf file:
+
+  Hardware End of Medium = no;
+  Backward Space Record  = no;
+  Backward Space File    = no;
+
+With 2 filemarks at EOT (see man mt):
+  Fast Forward Space File = no;
+  BSF at EOM = yes;
+  TWO EOF    = yes;
+
+With 1 filemarks at EOT (see man mt):
+  Fast Forward Space File = yes;
+  BSF at EOM = no;
+  TWO EOF   = no;
+
+NOTE: YOU CAN SWITCH EOT model ONLY when starting
+      from scratch with EMPTY tapes.
+
+It is also important that all the scripts accessed
+by RunBeforeJob and RunAfterJob will be executed by
+the user bareos.  Check your permissions.
+
+For USB support read the bareos manual. It could be necessary
+to configure/compile a new kernel.
+
+Look at %%PREFIX%%/lib/bareos/scripts/update_bareos_tables for
+database update procedure.
+
+If you are using sqlite you need to run the make_sqlite_tables script as
+the bareos user. Do this using 'sudo su -m bareos'.
+EOM
+}
+]
diff --git a/sysutils/bareos19-server/pkg-descr b/sysutils/bareos19-server/pkg-descr
new file mode 100644
index 000000000000..1332fabc0d37
--- /dev/null
+++ b/sysutils/bareos19-server/pkg-descr
@@ -0,0 +1,6 @@
+Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
+software to backup, archive and restore files from all major operating systems.
+The fork was founded 2010 out of the bacula.org project. The fork has been
+actively developed and many new features have been added.
+
+WWW: http://www.bareos.org/
diff --git a/sysutils/bareos19-server/pkg-plist b/sysutils/bareos19-server/pkg-plist
new file mode 100644
index 000000000000..d0dc19107dd4
--- /dev/null
+++ b/sysutils/bareos19-server/pkg-plist
@@ -0,0 +1,185 @@
+bin/bregex
+bin/bsmtp
+bin/bwild
+bin/timelimit
+@sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
+%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
+%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
+%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
+%%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
+etc/logrotate.d/bareos-dir
+lib/bareos/backends/libbareoscats-%%DBTYPE%%.so
+lib/bareos/backends/libbareossd-fifo.so
+lib/bareos/backends/libbareossd-gentape.so
+%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so
+%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
+%%RADOS%%lib/bareos/backends/libbareossd-rados.so
+lib/bareos/backends/libbareossd-tape.so
+%%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py
+%%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py
+%%PYTHON%%lib/bareos/plugins/BareosSdPluginBaseclass.py
+%%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py
+lib/bareos/plugins/autoxflate-sd.so
+%%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py
+%%PYTHON%%lib/bareos/plugins/bareos-dir.py.template
+%%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
+%%PYTHON%%lib/bareos/plugins/bareos-sd.py.template
+%%PYTHON%%lib/bareos/plugins/bareos_dir_consts.py
+%%PYTHON%%lib/bareos/plugins/bareos_sd_consts.py
+%%PYTHON%%lib/bareos/plugins/python-dir.so
+%%PYTHON%%lib/bareos/plugins/python-sd.so
+%%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
+%%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
+lib/bareos/scripts/bareos-ctl-dir
+lib/bareos/scripts/bareos-ctl-sd
+lib/bareos/scripts/bareos-explorer
+lib/bareos/scripts/bareos-glusterfind-wrapper
+lib/bareos/scripts/create_bareos_database
+%%MYSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
+%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
+%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
+%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
+%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
+%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql
+%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
+lib/bareos/scripts/ddl/versions.map
+lib/bareos/scripts/delete_catalog_backup
+lib/bareos/scripts/disk-changer
+lib/bareos/scripts/drop_bareos_database
+lib/bareos/scripts/drop_bareos_tables
+lib/bareos/scripts/grant_bareos_privileges
+lib/bareos/scripts/make_bareos_tables
+lib/bareos/scripts/make_catalog_backup
+lib/bareos/scripts/make_catalog_backup.pl
+lib/bareos/scripts/mtx-changer
+lib/bareos/scripts/query.sql
+lib/bareos/scripts/update_bareos_tables
+lib/libbareoscats.so
+lib/libbareoscats.so.19
+lib/libbareoscats.so.%%LIB_VERSION%%
+%%NDMP%%lib/libbareosndmp.so
+%%NDMP%%lib/libbareosndmp.so.19
+%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
+lib/libbareossd.so
+lib/libbareossql.so
+lib/libbareossql.so.19
+lib/libbareossql.so.%%LIB_VERSION%%
+man/man1/bareos-tray-monitor.1.gz
+man/man1/bregex.1.gz
+man/man1/bsmtp.1.gz
+man/man1/bwild.1.gz
+man/man8/bareos-dbcheck.8.gz
+man/man8/bareos-dbcopy.8.gz
+man/man8/bareos-dir.8.gz
+man/man8/bareos-sd.8.gz
+man/man8/bcopy.8.gz
+man/man8/bextract.8.gz
+man/man8/bls.8.gz
+man/man8/bpluginfo.8.gz
+man/man8/bscan.8.gz
+man/man8/bscrypto.8.gz
+man/man8/btape.8.gz
+man/man8/btraceback.8.gz
+sbin/bareos-dbcheck
+sbin/bareos-dbcopy
+sbin/bareos-dir
+sbin/bareos-sd
+sbin/bcopy
+sbin/bextract
+sbin/bls
+sbin/bpluginfo
+sbin/bregex
+sbin/bscan
+sbin/bscrypto
+sbin/bsmtp
+sbin/btape
+sbin/btestls
+sbin/bwild
+sbin/chio-bareos
+sbin/timelimit
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export
+@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
+@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage
+@dir(bareos,bareos,) %%BAREOS_DIR%%
+@dir(bareos,bareos,) %%BAREOS_DIR%%/storage
+@dir(bareos,bareos,) /var/log/bareos
+@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos19-server/pkg-plist.client b/sysutils/bareos19-server/pkg-plist.client
new file mode 100644
index 000000000000..c50cc53142e8
--- /dev/null
+++ b/sysutils/bareos19-server/pkg-plist.client
@@ -0,0 +1,64 @@
+bin/bconsole
+@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
+@group bareos
+@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
+@group bareos
+lib/libbareos.so
+lib/libbareos.so.19
+lib/libbareos.so.%%LIB_VERSION%%
+lib/libbareosfastlz.so
+lib/libbareosfastlz.so.19
+lib/libbareosfastlz.so.%%LIB_VERSION%%
+lib/libbareosfind.so
+lib/libbareosfind.so.19
+lib/libbareosfind.so.%%LIB_VERSION%%
+%%LMDB%%lib/libbareoslmdb.so
+%%LMDB%%lib/libbareoslmdb.so.19
+%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginOvirt.py
+%%PYTHON%%lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
+%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
+%%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
+%%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
+lib/bareos/plugins/bpipe-fd.so
+%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
+%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
+%%PYTHON%%lib/bareos/plugins/python-fd.so
+%%RADOS%%lib/bareos/plugins/rados-fd.so
+lib/bareos/scripts/bareos
+lib/bareos/scripts/bareos-config
+lib/bareos/scripts/bareos-config-lib.sh
+lib/bareos/scripts/bareos-ctl-fd
+lib/bareos/scripts/bareos-ctl-funcs
+lib/bareos/scripts/btraceback.dbx
+lib/bareos/scripts/btraceback.gdb
+lib/bareos/scripts/btraceback.mdb
+man/man1/bconsole.1.gz
+man/man8/bareos-fd.8.gz
+man/man8/bareos.8.gz
+@group bareos
+sbin/bareos
+@group bareos
+sbin/bareos-fd
+@group bareos
+sbin/bconsole
+@group wheel
+sbin/btraceback
+@group bareos
+@dir(bareos,bareos,)  %%BAREOS_DIR%%
+@dir(bareos,bareos,) /var/log/bareos
+@dir(bareos,bareos,) /var/run/bareos
diff --git a/sysutils/bareos19-traymonitor/Makefile b/sysutils/bareos19-traymonitor/Makefile
new file mode 100644
index 000000000000..6774426e8efb
--- /dev/null
+++ b/sysutils/bareos19-traymonitor/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	bareos
+PKGNAMESUFFIX=	19-traymonitor
+
+COMMENT=	Backup archiving recovery open sourced (traymonitor)
+
+LIB_DEPENDS+=	libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
+		libbareos.so:sysutils/bareos19-client
+
+CONFLICTS=	bareos18-traymonitor-* bareos17-traymonitor-* bareos-traymonitor-*
+
+USES=		desktop-file-utils gettext-runtime pkgconfig qt:5
+USE_QT=		buildtools_build qmake_build uitools_build gui core
+WITH_BAT=	yes
+
+PLIST=		${.CURDIR}/pkg-plist
+CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
+
+MASTERDIR=	${.CURDIR}/../../sysutils/bareos19-server
+
+CMAKE_ARGS+=		-Dtraymonitor=yes \
+			-Dbuild-dird=no \
+			-Dbuild-stored=no \
+			-Dclient-only=yes \
+			-Dnls=ON
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos19-traymonitor/pkg-descr b/sysutils/bareos19-traymonitor/pkg-descr
new file mode 100644
index 000000000000..6a18fe88fe3a
--- /dev/null
+++ b/sysutils/bareos19-traymonitor/pkg-descr
@@ -0,0 +1,8 @@
+traymonitor inteface for Bareos.
+
+Bareos (BackupArchivingRecoveryOpenSourced) is a reliable network open source
+software to backup, archive and restore files from all major operating systems.
+The fork was founded 2010 out of the bacula.org project. The fork has been
+actively developed and many new features have been added.
+
+WWW: http://www.bareos.org/
diff --git a/sysutils/bareos19-traymonitor/pkg-plist b/sysutils/bareos19-traymonitor/pkg-plist
new file mode 100644
index 000000000000..add26cb88d6d
--- /dev/null
+++ b/sysutils/bareos19-traymonitor/pkg-plist
@@ -0,0 +1,7 @@
+bin/bareos-tray-monitor
+@sample %%ETCDIR%%/tray-monitor.d/client/FileDaemon-local.conf.sample
+@sample %%ETCDIR%%/tray-monitor.d/director/Director-local.conf.sample
+@sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample
+@sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample
+share/applications/bareos-tray-monitor.desktop
+share/pixmaps/bareos-tray-monitor.xpm
diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile
index 16d95c838fc6..f9a1042e0454 100644
--- a/sysutils/barrier/Makefile
+++ b/sysutils/barrier/Makefile
@@ -1,17 +1,15 @@
-# $FreeBSD$
-
 PORTNAME=	barrier
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.1
+DISTVERSION=	2.3.3
 CATEGORIES=	sysutils
 
-MAINTAINER=	tobik@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mouse and keyboard sharing utility
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++14-lang localbase:ldflags pkgconfig ssl
+USES=		cmake compiler:c++14-lang localbase:ldflags pkgconfig ssl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	debauchee
 USE_XORG=	ice sm x11 xext xi xinerama xrandr xtst
@@ -22,6 +20,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		EXAMPLES GUI
 OPTIONS_DEFAULT=	GUI
+# no GUI option on 11.x with base SSL since qt5-network is not available
+OPTIONS_EXCLUDE=	${${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base:?GUI:}
 OPTIONS_SUB=		yes
 
 GUI_DESC=	Build configuration utility (requires Qt 5)
@@ -42,7 +42,7 @@ post-install:
 	cd ${INSTALL_WRKSRC}/bin && \
 		${INSTALL_PROGRAM} barrierc barriers ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC}/doc && \
-		${INSTALL_MAN} barrierc.1 barriers.1 ${STAGEDIR}${MANPREFIX}/man/man1
+		${INSTALL_MAN} barrierc.1 barriers.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/barrier.conf.example-basic \
 		${STAGEDIR}${ETCDIR}/barrier.conf.sample
diff --git a/sysutils/barrier/distinfo b/sysutils/barrier/distinfo
index e83f426d6282..65d08439c848 100644
--- a/sysutils/barrier/distinfo
+++ b/sysutils/barrier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565421408
-SHA256 (debauchee-barrier-v2.3.1_GH0.tar.gz) = adf6df33a4a07e05784e825a2549ff22fe288aa184f1caee2c2ffddb2cbcf249
-SIZE (debauchee-barrier-v2.3.1_GH0.tar.gz) = 7243275
+TIMESTAMP = 1594973868
+SHA256 (debauchee-barrier-v2.3.3_GH0.tar.gz) = 259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5
+SIZE (debauchee-barrier-v2.3.3_GH0.tar.gz) = 5465909
diff --git a/sysutils/barrier/files/patch-CMakeLists.txt b/sysutils/barrier/files/patch-CMakeLists.txt
index c746a92b9987..1a64ef7a7d59 100644
--- a/sysutils/barrier/files/patch-CMakeLists.txt
+++ b/sysutils/barrier/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-09-08 23:09:56 UTC
+--- CMakeLists.txt.orig	2020-07-14 17:37:45 UTC
 +++ CMakeLists.txt
-@@ -333,7 +333,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -341,7 +341,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
          )
      endif()
  
@@ -9,7 +9,7 @@
      set (OPENSSL_LIBS ssl crypto)
  else()
      find_library (lib_ssl ssl)
-@@ -403,7 +403,7 @@ endif()
+@@ -417,7 +417,7 @@ endif()
  #
  # Linux installation
  #
diff --git a/sysutils/barrier/files/patch-cmake_Version.cmake b/sysutils/barrier/files/patch-cmake_Version.cmake
index fe70764055e4..81e3281e6613 100644
--- a/sysutils/barrier/files/patch-cmake_Version.cmake
+++ b/sysutils/barrier/files/patch-cmake_Version.cmake
@@ -1,6 +1,6 @@
---- cmake/Version.cmake.orig	2019-05-16 15:32:09 UTC
+--- cmake/Version.cmake.orig	2020-07-14 17:37:45 UTC
 +++ cmake/Version.cmake
-@@ -69,7 +69,6 @@ else()
+@@ -70,7 +70,6 @@ else()
      set (BARRIER_BUILD_NUMBER 1)
  endif()
  
diff --git a/sysutils/barrier/files/patch-src_CMakeLists.txt b/sysutils/barrier/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..1eef855cd592
--- /dev/null
+++ b/sysutils/barrier/files/patch-src_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/CMakeLists.txt.orig	2020-07-17 08:17:25 UTC
++++ src/CMakeLists.txt
+@@ -19,7 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
+ 
+ add_subdirectory(lib)
+ add_subdirectory(cmd)
+-add_subdirectory(test)
+ 
+ if (BARRIER_BUILD_GUI)
+     add_subdirectory(gui)
diff --git a/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h b/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
new file mode 100644
index 000000000000..6c2f4a006fca
--- /dev/null
+++ b/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
@@ -0,0 +1,33 @@
+--- src/lib/barrier/KeyMap.h.orig	2020-07-17 08:20:18 UTC
++++ src/lib/barrier/KeyMap.h
+@@ -24,8 +24,6 @@
+ #include "common/stdset.h"
+ #include "common/stdvector.h"
+ 
+-#include <gtest/gtest_prod.h>
+-
+ namespace barrier {
+ 
+ //! Key map
+@@ -325,21 +323,6 @@ class KeyMap { (public)
+     static bool            parseModifiers(String&, KeyModifierMask&);
+ 
+     //@}
+-
+-private:
+-    FRIEND_TEST(KeyMapTests,
+-                findBestKey_requiredDown_matchExactFirstItem);
+-    FRIEND_TEST(KeyMapTests,
+-        findBestKey_requiredAndExtraSensitiveDown_matchExactFirstItem);
+-    FRIEND_TEST(KeyMapTests,
+-        findBestKey_requiredAndExtraSensitiveDown_matchExactSecondItem);
+-    FRIEND_TEST(KeyMapTests,
+-        findBestKey_extraSensitiveDown_matchExactSecondItem);
+-    FRIEND_TEST(KeyMapTests,
+-                findBestKey_noRequiredDown_matchOneRequiredChangeItem);
+-    FRIEND_TEST(KeyMapTests,
+-                findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
+-    FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
+ 
+ private:
+     //! Ways to synthesize a key
diff --git a/sysutils/barrier/pkg-plist b/sysutils/barrier/pkg-plist
index 2a1fde1547b3..72df75322834 100644
--- a/sysutils/barrier/pkg-plist
+++ b/sysutils/barrier/pkg-plist
@@ -2,10 +2,10 @@
 bin/barrierc
 bin/barriers
 @sample %%ETCDIR%%/barrier.conf.sample
-man/man1/barrierc.1.gz
-man/man1/barriers.1.gz
 %%GUI%%share/applications/barrier.desktop
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example-advanced
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example-basic
 %%GUI%%share/icons/hicolor/scalable/apps/barrier.svg
+share/man/man1/barrierc.1.gz
+share/man/man1/barriers.1.gz
diff --git a/sysutils/bashtop/Makefile b/sysutils/bashtop/Makefile
new file mode 100644
index 000000000000..f5e0df9fb849
--- /dev/null
+++ b/sysutils/bashtop/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	bashtop
+DISTVERSION=	0.9.25
+PORTREVISION=	1
+CATEGORIES=	sysutils
+
+MAINTAINER=	lwhsu@FreeBSD.org
+COMMENT=	Linux/OSX/FreeBSD resource monitor
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	coreutils>0:sysutils/coreutils \
+		gsed:textproc/gsed \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
+
+USES=	python:3.5+,run
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	aristocratos
+GH_TAGNAME=	d2eb76e
+
+PLIST_FILES=	bin/bashtop
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bashtop ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/sysutils/bashtop/distinfo b/sysutils/bashtop/distinfo
new file mode 100644
index 000000000000..f6c98da4d6f4
--- /dev/null
+++ b/sysutils/bashtop/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1596792173
+SHA256 (aristocratos-bashtop-0.9.25-d2eb76e_GH0.tar.gz) = 39549e1a7c586bd2c02a9650b0ba79b10d5dcab9287df596ebab0f57922fcec4
+SIZE (aristocratos-bashtop-0.9.25-d2eb76e_GH0.tar.gz) = 453955
diff --git a/sysutils/bashtop/pkg-descr b/sysutils/bashtop/pkg-descr
new file mode 100644
index 000000000000..d2243e72b2ab
--- /dev/null
+++ b/sysutils/bashtop/pkg-descr
@@ -0,0 +1,4 @@
+Resource monitor that shows usage and stats for processor, memory, disks,
+network and processes.
+
+WWW: https://github.com/aristocratos/bashtop
diff --git a/sysutils/bastille/Makefile b/sysutils/bastille/Makefile
index b8987726cdd2..93712c8aad1f 100644
--- a/sysutils/bastille/Makefile
+++ b/sysutils/bastille/Makefile
@@ -1,8 +1,7 @@
 # Created by: Christer Edwards <christer.edwards@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	bastille
-PORTVERSION=	0.4.20190714
+PORTVERSION=	0.8.20210115
 CATEGORIES=	sysutils
 
 MAINTAINER=	christer.edwards@gmail.com
@@ -13,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bastillebsd
-GH_TAGNAME=	5540b22
+GH_TAGNAME=	113beb5
 
 NO_BUILD=	yes
 NO_ARCH=	yes
@@ -27,6 +26,8 @@ post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/${DATADIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/${ETCDIR}/bastille.conf ${STAGEDIR}${ETCDIR}/bastille.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/${PREFIX}/man/man8/bastille.8.gz \
+		${STAGEDIR}${PREFIX}/man/man8/bastille.8.gz
+	${INSTALL_DATA} ${WRKSRC}/${ETCDIR}/bastille.conf.sample ${STAGEDIR}${ETCDIR}/bastille.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/bastille/distinfo b/sysutils/bastille/distinfo
index dd2267a00a78..f848a23a81c8 100644
--- a/sysutils/bastille/distinfo
+++ b/sysutils/bastille/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563199198
-SHA256 (bastillebsd-bastille-0.4.20190714-5540b22_GH0.tar.gz) = 3b52c6fbfc1b8cc1fd514e3ff6979e67afb47979ae3ec966bec865c1a85ab5dd
-SIZE (bastillebsd-bastille-0.4.20190714-5540b22_GH0.tar.gz) = 537679
+TIMESTAMP = 1610768540
+SHA256 (bastillebsd-bastille-0.8.20210115-113beb5_GH0.tar.gz) = 98a01eeda9ae051248ab69b6a0f6ac022cbb30f73745c83d00d0a4a906f48f07
+SIZE (bastillebsd-bastille-0.8.20210115-113beb5_GH0.tar.gz) = 573482
diff --git a/sysutils/bastille/files/bastille.in b/sysutils/bastille/files/bastille.in
index e274b25433af..17cf0df34948 100644
--- a/sysutils/bastille/files/bastille.in
+++ b/sysutils/bastille/files/bastille.in
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Bastille jail startup script
-# $FreeBSD$
-#
+
 # PROVIDE: bastille
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/bastille/pkg-plist b/sysutils/bastille/pkg-plist
index 74b0c8d5fa87..78a777a1db17 100644
--- a/sysutils/bastille/pkg-plist
+++ b/sysutils/bastille/pkg-plist
@@ -1,23 +1,42 @@
-@sample %%ETCDIR%%/bastille.conf.sample %%ETCDIR%%/bastille.conf
+@sample %%ETCDIR%%/bastille.conf.sample
 bin/bastille
 %%DATADIR%%/bootstrap.sh
+%%DATADIR%%/clone.sh
 %%DATADIR%%/cmd.sh
 %%DATADIR%%/colors.pre.sh
+%%DATADIR%%/common.sh
+%%DATADIR%%/config.sh
 %%DATADIR%%/console.sh
+%%DATADIR%%/convert.sh
 %%DATADIR%%/cp.sh
 %%DATADIR%%/create.sh
 %%DATADIR%%/destroy.sh
+%%DATADIR%%/edit.sh
+%%DATADIR%%/export.sh
 %%DATADIR%%/htop.sh
+%%DATADIR%%/import.sh
+%%DATADIR%%/limits.sh
 %%DATADIR%%/list.sh
+%%DATADIR%%/mount.sh
 %%DATADIR%%/pkg.sh
+%%DATADIR%%/rdr.sh
+%%DATADIR%%/rename.sh
 %%DATADIR%%/restart.sh
 %%DATADIR%%/service.sh
 %%DATADIR%%/start.sh
 %%DATADIR%%/stop.sh
 %%DATADIR%%/sysrc.sh
 %%DATADIR%%/template.sh
+%%DATADIR%%/templates/default/base/Bastillefile
+%%DATADIR%%/templates/default/empty/Bastillefile
+%%DATADIR%%/templates/default/thick/Bastillefile
+%%DATADIR%%/templates/default/thin/Bastillefile
+%%DATADIR%%/templates/default/vnet/Bastillefile
 %%DATADIR%%/top.sh
+%%DATADIR%%/umount.sh
 %%DATADIR%%/update.sh
 %%DATADIR%%/upgrade.sh
 %%DATADIR%%/verify.sh
 %%DATADIR%%/zfs.sh
+man/man8/bastille.8.gz
+@dir %%ETCDIR%%
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index c0cd1a353e67..7933e489cf25 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -1,8 +1,6 @@
-# $FreeBSD$
-
 PORTNAME=	batmon
 PORTVERSION=	0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	SAVANNAH/gap
 
diff --git a/sysutils/battmond/Makefile b/sysutils/battmond/Makefile
index 1229c4700c12..e27a079215fc 100644
--- a/sysutils/battmond/Makefile
+++ b/sysutils/battmond/Makefile
@@ -1,8 +1,8 @@
 # Created by: ntarmos@ceid.upatras.gr
-# $FreeBSD$
 
 PORTNAME=	battmond
 DISTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	ntarmos@gmail.com
diff --git a/sysutils/battmond/files/patch-battmond.c b/sysutils/battmond/files/patch-battmond.c
new file mode 100644
index 000000000000..1da5a1b6eb42
--- /dev/null
+++ b/sysutils/battmond/files/patch-battmond.c
@@ -0,0 +1,18 @@
+--- battmond.c.orig	2021-04-11 13:03:15 UTC
++++ battmond.c
+@@ -189,13 +189,12 @@ int main(int argc, char ** argv)
+ #ifdef DEBUG
+ 		fprintf(stderr, "Total battery capacity: %d%%\n", total_cap);
+ #endif
+-		if (num_discharging && !num_charging && total_cap > 0) {
++		if (num_discharging && !num_charging && total_cap >= 0) {
+ 			if (total_cap <= halt) {
+ 				if (dosuspend) { // Suspend
+ 					syslog(LOG_EMERG, BATT_SUSP);
+ 					close(acpifd);
+-					execl("/usr/sbin/acpiconf", "acpiconf", "-s3", NULL);
+-					oops("execl");
++					system("/usr/sbin/acpiconf -s3");
+ 				} else { // Halt
+ 					syslog(LOG_EMERG, BATT_HALT);
+ 					close(acpifd);
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index 75425f8604cd..b5b10091c09e 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -1,5 +1,4 @@
 # Created by: Martin Tournoij <martin@arp242.net>
-# $FreeBSD$
 
 PORTNAME=	battray
 DISTVERSIONPREFIX=	version-
@@ -13,7 +12,7 @@ COMMENT=	Display notebook battery status in tray
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.3+
+USES=		gnome python:3.3+
 USE_GNOME=	pygobject3
 USE_PYTHON=	autoplist distutils optsuffix
 
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 409fa1dbe249..2843fe727102 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -1,5 +1,4 @@
 # Created by: bsdx
-# $FreeBSD$
 
 PORTNAME=	bchunk
 DISTVERSION=	1.2.2
diff --git a/sysutils/beadm-devel/Makefile b/sysutils/beadm-devel/Makefile
index 2afec49095bd..db47dc5d0d56 100644
--- a/sysutils/beadm-devel/Makefile
+++ b/sysutils/beadm-devel/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	beadm
 PORTVERSION=	1.2.99.20180708
 PORTREVISION=	1
@@ -10,7 +8,7 @@ MASTER_SITES=	\
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 
-MAINTAINER=	bdrewery@FreeBSD.org
+MAINTAINER=	vermaden@interia.pl
 COMMENT=	Solaris-like utility to manage Boot Environments on ZFS
 
 LICENSE=	BSD2CLAUSE
diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile
index 6273858a2130..0047e7c403c0 100644
--- a/sysutils/beadm/Makefile
+++ b/sysutils/beadm/Makefile
@@ -1,15 +1,10 @@
-# $FreeBSD$
-
 PORTNAME=	beadm
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.2
 PORTREVISION=	0
 CATEGORIES=	sysutils
-MASTER_SITES=	\
-		LOCAL/bdrewery/${PORTNAME} \
-		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
-		GH
+MASTER_SITES=	GH
 
-MAINTAINER=	bdrewery@FreeBSD.org
+MAINTAINER=	vermaden@interia.pl
 COMMENT=	Solaris-like utility to manage Boot Environments on ZFS
 
 LICENSE=	BSD2CLAUSE
@@ -23,12 +18,12 @@ NO_ARCH=	YES
 CONFLICTS_INSTALL=	beadm-devel-*
 
 PLIST_FILES=	sbin/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		man/man8/${PORTNAME}.8.gz
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
 	    ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
-	  ${STAGEDIR}${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 \
+	  ${STAGEDIR}${MANPREFIX}/man/man8/
 
 .include <bsd.port.mk>
diff --git a/sysutils/beadm/distinfo b/sysutils/beadm/distinfo
index c24244f00117..cd7e1205d9e8 100644
--- a/sysutils/beadm/distinfo
+++ b/sysutils/beadm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563564184
-SHA256 (vermaden-beadm-1.3.0_GH0.tar.gz) = 2ac6537bfb7aa1ceb1757e63d75a1eadd65f1ddc2c7ab4bda609985acddf99ad
-SIZE (vermaden-beadm-1.3.0_GH0.tar.gz) = 15667
+TIMESTAMP = 1606902483
+SHA256 (vermaden-beadm-1.3.2_GH0.tar.gz) = 516ae8e393f8b1fddcba8f0fdd166bc49375e5dcc5ab309c90dfea6670202922
+SIZE (vermaden-beadm-1.3.2_GH0.tar.gz) = 16276
diff --git a/sysutils/beats/Makefile b/sysutils/beats/Makefile
deleted file mode 100644
index 2dc271b33a76..000000000000
--- a/sysutils/beats/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	beats
-PORTVERSION=	6.7.1
-DISTVERSIONPREFIX=v
-CATEGORIES=	sysutils
-
-MAINTAINER=	elastic@FreeBSD.org
-COMMENT=	Collect logs locally and send to remote logstash
-
-LICENSE=	APACHE20
-
-USES=		gmake go
-USE_GITHUB=	yes
-GH_ACCOUNT=	elastic
-USE_RC_SUBR=	${GO_TARGETS}
-
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
-MAKE_ENV+=	GOBUILD_FLAGS=""
-
-OPTIONS_DEFAULT=FILEBEAT HEARTBEAT METRICBEAT
-OPTIONS_DEFINE=	FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
-OPTIONS_SUB=	yes
-
-FILEBEAT_DESC=	Filebeat
-FILEBEAT_VARS=	GO_TARGETS+=filebeat
-
-PACKETBEAT_DESC=Packetbeat
-PACKETBEAT_VARS=GO_TARGETS+=packetbeat
-PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
-
-METRICBEAT_DESC=Metricbeat
-METRICBEAT_VARS=GO_TARGETS+=metricbeat
-
-HEARTBEAT_DESC=	Heartbeat
-HEARTBEAT_VARS=	GO_TARGETS+=heartbeat
-
-.include <bsd.port.options.mk>
-
-do-build:
-.for GO_TARGET in ${GO_TARGETS}
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGET})
-.endfor
-
-do-install:
-.for GO_TARGET in ${GO_TARGETS}
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGET}/${GO_TARGET} \
-		${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/${GO_TARGET}/${GO_TARGET}.yml \
-		${STAGEDIR}${PREFIX}/etc/${GO_TARGET}.yml.sample
-	${MKDIR} ${STAGEDIR}/var/db/beats/${GO_TARGET}
-.endfor
-.for BEATMOD in filebeat metricbeat
-	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
-	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${FIND_ARGS})
-	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
-.endfor
-
-.include <bsd.port.mk>
diff --git a/sysutils/beats/distinfo b/sysutils/beats/distinfo
deleted file mode 100644
index 14e0d45f80e8..000000000000
--- a/sysutils/beats/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1555453757
-SHA256 (elastic-beats-v6.7.1_GH0.tar.gz) = a7834293870d73d734110975daed5660022df868bf01815e873d7c1e1bc761cc
-SIZE (elastic-beats-v6.7.1_GH0.tar.gz) = 33042733
diff --git a/sysutils/beats/files/filebeat.in b/sysutils/beats/files/filebeat.in
deleted file mode 100644
index 4fb2d9d15f91..000000000000
--- a/sysutils/beats/files/filebeat.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: filebeat
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable filebeat:
-#
-# filebeat_enable (bool):	Set to YES to enable filebeat
-# 				Default: NO
-# filebeat_flags (str):		Extra flags passed to filebeat
-# filebeat_conf (str):		filebeat configuration file
-#				Default: ${PREFIX}/etc/filebeat.yml
-
-. /etc/rc.subr
-
-name="filebeat"
-rcvar=${name}_enable
-load_rc_config $name
-
-: ${filebeat_enable:="NO"}
-: ${filebeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
-
-# daemon
-start_precmd=filebeat_prestart
-command=/usr/sbin/daemon
-pidfile="/var/run/${name}"
-command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_config}"
-
-filebeat_prestart() {
-# Have to empty rc_flags so they don't get passed to daemon(8)
-	rc_flags=""
-}
-
-run_rc_command "$1"
diff --git a/sysutils/beats/files/heartbeat.in b/sysutils/beats/files/heartbeat.in
deleted file mode 100644
index 40a07c53157f..000000000000
--- a/sysutils/beats/files/heartbeat.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: heartbeat
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable heartbeat:
-#
-# heartbeat_enable (bool):	Set to YES to enable heartbeat
-# 				Default: NO
-# heartbeat_flags (str):	Extra flags passed to heartbeat
-# heartbeat_conf (str):		heartbeat configuration file
-#				Default: ${PREFIX}/etc/heartbeat.yml
-
-. /etc/rc.subr
-
-name="heartbeat"
-rcvar=${name}_enable
-load_rc_config $name
-
-: ${heartbeat_enable:="NO"}
-: ${heartbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
-
-# daemon
-start_precmd=heartbeat_prestart
-command=/usr/sbin/daemon
-pidfile="/var/run/${name}"
-command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_config}"
-
-heartbeat_prestart() {
-# Have to empty rc_flags so they don't get passed to daemon(8)
-	rc_flags=""
-}
-
-run_rc_command "$1"
diff --git a/sysutils/beats/files/metricbeat.in b/sysutils/beats/files/metricbeat.in
deleted file mode 100644
index 1e3dc5b9d3a7..000000000000
--- a/sysutils/beats/files/metricbeat.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: metricbeat
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable metricbeat:
-#
-# metricbeat_enable (bool):	Set to YES to enable metricbeat
-# 				Default: NO
-# metricbeat_flags (str):	Extra flags passed to metricbeat
-# metricbeat_conf (str):	metricbeat configuration metric
-#				Default: ${PREFIX}/etc/metricbeat.yml
-
-. /etc/rc.subr
-
-name="metricbeat"
-rcvar=${name}_enable
-load_rc_config $name
-
-: ${metricbeat_enable:="NO"}
-: ${metricbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
-
-# daemon
-start_precmd=metricbeat_prestart
-command=/usr/sbin/daemon
-pidfile="/var/run/${name}"
-command_args="-rfP ${pidfile} -p ${pidfile}.child %%PREFIX%%/sbin/${name} ${metricbeat_config}"
-
-metricbeat_prestart() {
-# Have to empty rc_flags so they don't get passed to daemon(8)
-	rc_flags=""
-}
-
-# metricbeat will refuse to quit if linprocfs is mounted, and sadly requires -9
-[ -f /compat/linux/proc/cpuinfo ] && stop_cmd=metricbeat_stop
-
-metricbeat_stop() {
-	pkill -9 -F ${pidfile} > /dev/null 2>&1
-	pkill -9 -F ${pidfile}.child > /dev/null 2>&1
-}
-
-run_rc_command "$1"
diff --git a/sysutils/beats/files/packetbeat.in b/sysutils/beats/files/packetbeat.in
deleted file mode 100644
index 5abaf619437a..000000000000
--- a/sysutils/beats/files/packetbeat.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: packetbeat
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable packetbeat
-#
-# packetbeat_enable (bool):	Set to YES to enable packetbeat
-# 				Default: NO
-# packetbeat_flags (str):	Extra flags passed to packetbeat
-# packetbeat_conf (str):	packetbeat configuration file
-#				Default: ${PREFIX}/etc/packetbeat.yml
-
-. /etc/rc.subr
-
-name="packetbeat"
-rcvar=${name}_enable
-load_rc_config $name
-
-: ${packetbeat_enable:="NO"}
-: ${packetbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
-
-# daemon
-start_precmd=packetbeat_prestart
-command=/usr/sbin/daemon
-pidfile="/var/run/${name}"
-command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_config}"
-
-packetbeat_prestart() {
-# Have to empty rc_flags so they don't get passed to daemon(8)
-	rc_flags=""
-}
-
-run_rc_command "$1"
diff --git a/sysutils/beats/files/patch-filebeat_filebeat.yml b/sysutils/beats/files/patch-filebeat_filebeat.yml
deleted file mode 100644
index fca17c5befb1..000000000000
--- a/sysutils/beats/files/patch-filebeat_filebeat.yml
+++ /dev/null
@@ -1,8 +0,0 @@
---- filebeat/filebeat.yml.orig    2017-02-09 15:20:52 UTC
-+++ filebeat/filebeat.yml
-@@ -112,3 +112,5 @@ output.elasticsearch:
- # To enable all selectors use ["*"]. Examples of other selectors are "beat",
- # "publish", "service".
- #logging.selectors: ["*"]
-+logging.to_syslog: true
-+logging.to_files: false
diff --git a/sysutils/beats/files/patch-heartbeat_heartbeat.yml b/sysutils/beats/files/patch-heartbeat_heartbeat.yml
deleted file mode 100644
index 2e1657791365..000000000000
--- a/sysutils/beats/files/patch-heartbeat_heartbeat.yml
+++ /dev/null
@@ -1,8 +0,0 @@
---- heartbeat/heartbeat.yml.orig    2017-02-20 22:45:44 UTC
-+++ heartbeat/heartbeat.yml
-@@ -77,3 +77,5 @@ output.elasticsearch:
- # To enable all selectors use ["*"]. Examples of other selectors are "beat",
- # "publish", "service".
- #logging.selectors: ["*"]
-+logging.to_syslog: true
-+logging.to_files: false
diff --git a/sysutils/beats/files/patch-libbeat_scripts_Makefile b/sysutils/beats/files/patch-libbeat_scripts_Makefile
deleted file mode 100644
index 3af2cc58dd22..000000000000
--- a/sysutils/beats/files/patch-libbeat_scripts_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbeat/scripts/Makefile.orig    2018-02-01 16:56:52.000000000 +0100
-+++ libbeat/scripts/Makefile    2018-02-07 12:53:00.911420000 +0100
-@@ -27,7 +27,7 @@
- GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*")
- GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go')
- GOPACKAGES_STRESSTESTS=$(shell find . -name '*.go' | xargs awk 'FNR>1 {nextfile} /\+build.*stresstest/ {print FILENAME; nextfile}' | xargs dirname | uniq)
--SHELL=bash
-+SHELL=sh
- ES_HOST?="elasticsearch"
- PWD=$(shell pwd)
- BUILD_DIR?=$(shell pwd)/build
diff --git a/sysutils/beats/files/patch-metricbeat_metricbeat.yml b/sysutils/beats/files/patch-metricbeat_metricbeat.yml
deleted file mode 100644
index 978f37bef3ef..000000000000
--- a/sysutils/beats/files/patch-metricbeat_metricbeat.yml
+++ /dev/null
@@ -1,8 +0,0 @@
---- metricbeat/metricbeat.yml.orig    2017-02-20 22:45:44 UTC
-+++ metricbeat/metricbeat.yml
-@@ -103,3 +103,5 @@ output.elasticsearch:
- # To enable all selectors use ["*"]. Examples of other selectors are "beat",
- # "publish", "service".
- #logging.selectors: ["*"]
-+logging.to_syslog: true
-+logging.to_files: false
diff --git a/sysutils/beats/files/patch-packetbeat_packetbeat.yml b/sysutils/beats/files/patch-packetbeat_packetbeat.yml
deleted file mode 100644
index 9ca4ce3ae2ed..000000000000
--- a/sysutils/beats/files/patch-packetbeat_packetbeat.yml
+++ /dev/null
@@ -1,21 +0,0 @@
---- packetbeat/packetbeat.yml.orig    2017-02-09 16:20:52.000000000 +0100
-+++ packetbeat/packetbeat.yml    2017-02-21 02:04:13.919394000 +0100
-@@ -10,8 +10,10 @@
- #============================== Network device ================================
-
- # Select the network interface to sniff the data. On Linux, you can use the
--# "any" keyword to sniff on all connected interfaces.
--packetbeat.interfaces.device: any
-+# "any" keyword to sniff on all connected interfaces. FreeBSD is a bit different
-+# and the beats programmers did not bother to implement it, so you must set this
-+# to your preferred device
-+packetbeat.interfaces.device: em0
-
- #================================== Flows =====================================
-
-@@ -147,3 +149,5 @@
- # To enable all selectors use ["*"]. Examples of other selectors are "beat",
- # "publish", "service".
- #logging.selectors: ["*"]
-+logging.to_syslog: true
-+logging.to_files: false
diff --git a/sysutils/beats/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go b/sysutils/beats/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go
deleted file mode 100644
index c8b61855c932..000000000000
--- a/sysutils/beats/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/docker/docker/pkg/system/mknod.go.orig	2019-03-12 15:33:33 UTC
-+++ vendor/github.com/docker/docker/pkg/system/mknod.go
-@@ -9,7 +9,7 @@ import (
- // Mknod creates a filesystem node (file, device special file or named pipe) named path
- // with attributes specified by mode and dev.
- func Mknod(path string, mode uint32, dev int) error {
--	return syscall.Mknod(path, mode, dev)
-+	return syscall.Mknod(path, mode, uint64(dev))
- }
-
- // Mkdev is used to build the value of linux devices (in /dev/) which specifies major
diff --git a/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go b/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/beats/files/patch-vendor_github.com_elastic_gosigar_sigar__freebsd.go
+++ /dev/null
diff --git a/sysutils/beats/pkg-plist b/sysutils/beats/pkg-plist
deleted file mode 100644
index 6cfe84499e9a..000000000000
--- a/sysutils/beats/pkg-plist
+++ /dev/null
@@ -1,1164 +0,0 @@
-%%FILEBEAT%%sbin/filebeat
-%%HEARTBEAT%%sbin/heartbeat
-%%METRICBEAT%%sbin/metricbeat
-%%PACKETBEAT%%sbin/packetbeat
-%%FILEBEAT%%@sample etc/filebeat.yml.sample
-%%HEARTBEAT%%@sample etc/heartbeat.yml.sample
-%%METRICBEAT%%@sample etc/metricbeat.yml.sample
-%%PACKETBEAT%%@sample etc/packetbeat.yml.sample
-@dir /var/db/beats
-%%FILEBEAT%%@dir /var/db/beats/filebeat
-%%HEARTBEAT%%@dir /var/db/beats/heartbeat
-%%METRICBEAT%%@dir /var/db/beats/metricbeat
-%%PACKETBEAT%%@dir /var/db/beats/packetbeat
-@dir %%DATADIR%%/metricbeat/module/kubernetes/util
-%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kubeconfig
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/config.yml
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/Dockerfile.kube-state
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/env
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/6/dashboard/Metricbeat-kubernetes-apiserver.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/6/dashboard/Metricbeat-kubernetes-overview.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/dashboard/022a54c0-2bf5-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/294546b0-30d6-11e7-8df8-6d3604a72912.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/7aac4fd0-30e0-11e7-8df8-6d3604a72912.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/408fccf0-30d6-11e7-8df8-6d3604a72912.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/16fa4470-2bfd-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/44f12b40-2bf4-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/cd059410-2bfb-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/174a6ad0-30e0-11e7-8df8-6d3604a72912.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/a4c9d360-30df-11e7-8df8-6d3604a72912.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/d6564360-2bfc-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/e1018b90-2bfb-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/022a54c0-2bf5-11e7-859b-f78b612cde28.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/58e644f0-30d6-11e7-8df8-6d3604a72912.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/da1ff7c0-30ed-11e7-b9e5-2b5b07213ab3.json
-%%DATADIR%%/metricbeat/module/kubernetes/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/module.yml
-%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/data.json
-%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/data.json
-%%DATADIR%%/metricbeat/module/aerospike/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/aerospike/_meta/env
-%%DATADIR%%/metricbeat/module/aerospike/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/aerospike/_meta/config.yml
-%%DATADIR%%/metricbeat/module/aerospike/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/aerospike/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/data.json
-%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/data.json
-%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/haproxy/module.yml
-%%DATADIR%%/metricbeat/module/haproxy/info/_meta/data.json
-%%DATADIR%%/metricbeat/module/haproxy/info/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/haproxy/info/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/haproxy/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/haproxy/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/haproxy/_meta/config.yml
-%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/haproxy/_meta/env
-%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile.1.6
-%%DATADIR%%/metricbeat/module/haproxy/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile.1.7
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-http-frontend.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-http-server.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-http-backend.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-frontend.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-backend.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-overview.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-visualizations.json
-%%DATADIR%%/metricbeat/module/haproxy/_meta/haproxy.conf
-%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/data.json
-%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/data.json
-%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/data.json
-%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/data.json
-%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/module.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/env
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/dashboard/Metricbeat-Rabbitmq.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/RabbitMQ-Erlang-Process-Usage.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/RabbitMQ-Memory-Usage.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/Rabbitmq-Number-of-Nodes.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/RabbitMQ-Queue-Index-Operations.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/search/Metricbeat-Rabbitmq.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/6/dashboard/Metricbeat-rabbitmq-overview.json
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/rabbitmq/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/data.json
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/config.yml
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/env
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/php_fpm/_meta/php-fpm.conf
-%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/data.json
-%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/php_fpm/Dockerfile
-%%DATADIR%%/metricbeat/module/traefik/health/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/traefik/health/_meta/data.json
-%%DATADIR%%/metricbeat/module/traefik/health/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/traefik/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/traefik/_meta/config.yml
-%%DATADIR%%/metricbeat/module/traefik/_meta/env
-%%DATADIR%%/metricbeat/module/traefik/_meta/traefik.toml
-%%DATADIR%%/metricbeat/module/traefik/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/traefik/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/data.json
-%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/logstash/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/logstash/_meta/env
-%%DATADIR%%/metricbeat/module/logstash/_meta/config.yml
-%%DATADIR%%/metricbeat/module/logstash/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/logstash/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/logstash/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/logstash/_meta/healthcheck.sh
-%%DATADIR%%/metricbeat/module/logstash/node/_meta/data.json
-%%DATADIR%%/metricbeat/module/logstash/node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/logstash/node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/data.json
-%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/windows/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/windows/_meta/kibana/6/dashboard/metricbeat-windows-service.json
-%%DATADIR%%/metricbeat/module/windows/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/windows/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/windows/_meta/config.yml
-%%DATADIR%%/metricbeat/module/windows/module.yml
-%%DATADIR%%/metricbeat/module/windows/service/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/windows/service/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/windows/service/_meta/data.json
-%%DATADIR%%/metricbeat/module/nginx/_meta/nginx.conf
-%%DATADIR%%/metricbeat/module/nginx/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/nginx/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/nginx/_meta/config.yml
-%%DATADIR%%/metricbeat/module/nginx/_meta/kibana/6/dashboard/metricbeat-nginx-overview.json
-%%DATADIR%%/metricbeat/module/nginx/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/nginx/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/nginx/_meta/env
-%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/data.json
-%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/nginx/module.yml
-%%DATADIR%%/metricbeat/module/redis/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/redis/_meta/config.yml
-%%DATADIR%%/metricbeat/module/redis/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/redis/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/redis/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/redis/_meta/env
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/6/dashboard/Metricbeat-redis-keys.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/6/dashboard/Metricbeat-redis-overview.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/dashboard/Metricbeat-Redis.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/search/Metricbeat-Redis.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-multiplexing-API.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Keyspaces.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-server-mode.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-hosts.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Connected-clients.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Clients-Metrics.json
-%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Server-Versions.json
-%%DATADIR%%/metricbeat/module/redis/module.yml
-%%DATADIR%%/metricbeat/module/redis/info/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/redis/info/_meta/data.json
-%%DATADIR%%/metricbeat/module/redis/info/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/redis/key/_meta/data.json
-%%DATADIR%%/metricbeat/module/redis/key/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/redis/key/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/data.json
-%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/postgresql/database/_meta/data.json
-%%DATADIR%%/metricbeat/module/postgresql/database/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/postgresql/database/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/data.json
-%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/postgresql/_meta/config.yml
-%%DATADIR%%/metricbeat/module/postgresql/_meta/env
-%%DATADIR%%/metricbeat/module/postgresql/_meta/docker-entrypoint-initdb.d/0-enable-pg_stat_statements.sh
-%%DATADIR%%/metricbeat/module/postgresql/_meta/docker-entrypoint-initdb.d/1-create-extension-pg_stat_statements.sql
-%%DATADIR%%/metricbeat/module/postgresql/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/postgresql/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/postgresql/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/postgresql/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/data.json
-%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/data.json
-%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/env
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.yml
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/.dockerignore
-%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/data.json
-%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/memcached/stats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/memcached/stats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/memcached/stats/_meta/data.json
-%%DATADIR%%/metricbeat/module/memcached/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/memcached/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/memcached/_meta/env
-%%DATADIR%%/metricbeat/module/memcached/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/memcached/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/memcached/_meta/config.yml
-%%DATADIR%%/metricbeat/module/prometheus/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/prometheus/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/prometheus/_meta/env
-%%DATADIR%%/metricbeat/module/prometheus/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/prometheus/_meta/config.yml
-%%DATADIR%%/metricbeat/module/prometheus/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/data.json
-%%DATADIR%%/metricbeat/module/prometheus/stats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/prometheus/stats/_meta/data.json
-%%DATADIR%%/metricbeat/module/prometheus/stats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/data.json
-%%DATADIR%%/metricbeat/module/uwsgi/module.yml
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/env
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/config.yml
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/dashboard/Metricbeat-uWSGI.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/ac7194b0-f0ae-11e7-b9ff-9f96241065de.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/a5058e70-f0ae-11e7-b9ff-9f96241065de.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/ba4a80b0-f0ae-11e7-b9ff-9f96241065de.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/8c5f96e0-f0ae-11e7-b9ff-9f96241065de.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/search/Metricbeat-uWSGI-status.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/6/dashboard/Metricbeat-uwsgi-overview.json
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/.dockerignore
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/uwsgi/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/graphite/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/graphite/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/graphite/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/graphite/_meta/config.yml
-%%DATADIR%%/metricbeat/module/graphite/server/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/graphite/server/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/graphite/server/_meta/data.json
-%%DATADIR%%/metricbeat/module/etcd/self/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/etcd/self/_meta/data.json
-%%DATADIR%%/metricbeat/module/etcd/self/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/etcd/store/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/etcd/store/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/etcd/store/_meta/data.json
-%%DATADIR%%/metricbeat/module/etcd/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/etcd/_meta/config.yml
-%%DATADIR%%/metricbeat/module/etcd/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/etcd/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/etcd/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/etcd/_meta/env
-%%DATADIR%%/metricbeat/module/etcd/leader/_meta/data.json
-%%DATADIR%%/metricbeat/module/etcd/leader/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/etcd/leader/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/cpu/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/cpu/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/cpu/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/uptime/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/uptime/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/uptime/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/filesystem/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/filesystem/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/filesystem/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/fsstat/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/fsstat/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/fsstat/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/process/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/process/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/process/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/core/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/core/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/core/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/diskio/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/diskio/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/diskio/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/socket_summary/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/socket_summary/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/socket/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/socket/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/socket/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/module.yml
-%%DATADIR%%/metricbeat/module/system/raid/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/raid/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/raid/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/load/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/load/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/load/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/memory/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/memory/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/memory/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-network.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-cpu.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/CPU-slash-Memory-per-container.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-processes.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-system-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-memory.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-filesystem-per-Host.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/d1f1f9e0-1b1c-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-filesystem.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/CPU-usage-over-time.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-space-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-space-distribution.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/CPU-Usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/d3166e80-1b91-11e7-bec4-a5e9ec5cab8b.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/ab2d1e90-1b1a-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-disks-by-memory-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/2e224660-1b19-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Swap-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Packet-loss-on-interfaces.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/26732e20-1b91-11e7-bec4-a5e9ec5cab8b.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/1aae9140-1b93-11e7-8ada-3df93aab833e.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Total-Memory.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Network-Packetloss.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-processes-by-CPU-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-utilization-over-time.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/217025e0-2a69-11e7-99f0-399f2a11b723.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-space.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Network-Bytes.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Memory-usage-per-process.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/aa984970-1e0b-11e7-852e-cdcfcfdffddd.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-Load-over-time.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Container-CPU-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Free-disk-space-over-days.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-processes-by-memory-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Servers-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Number-of-processes.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/6b7b9a40-faa1-11e6-86b1-cd7735ff7e23.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/fe064790-1b1f-11e7-bec4-a5e9ec5cab8b.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-overview-by-host.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/522ee670-1b92-11e7-bec4-a5e9ec5cab8b.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/4e4bb1e0-1b1b-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-10-interfaces.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Swap-usage-over-time.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-hosts-by-CPU-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Container-Block-IO.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Number-of-Pids.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-load.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Memory-usage-over-time.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/95490a10-1e23-11e7-958f-490b8dcb96d8.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/CPU-usage-per-process.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-hosts-by-disk-size.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-Navigation.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/e0f001c0-1b18-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Number-of-processes-over-time.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Memory-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/83e12df0-1b91-11e7-bec4-a5e9ec5cab8b.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/bfa5e400-1b16-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/In-vs-Out-Network-Bytes.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/855899e0-1b1c-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-hosts-by-memory-usage.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/089b85d0-1b16-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Container-Memory-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/4d546850-1b15-11e7-b09e-037021c4f8df.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Total-files-over-days.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Available-Memory.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Fsstats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Load-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Cpu-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Memory-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Filesystem-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Cpu-Load-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/System-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Network-data.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Process-stats.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/6/dashboard/Metricbeat-host-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/6/dashboard/Metricbeat-system-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/kibana/6/dashboard/Metricbeat-containers-overview.json
-%%DATADIR%%/metricbeat/module/system/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/system/_meta/config.yml
-%%DATADIR%%/metricbeat/module/system/network/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/network/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/network/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/system/process_summary/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/system/process_summary/_meta/data.json
-%%DATADIR%%/metricbeat/module/system/process_summary/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/jolokia/_meta/env
-%%DATADIR%%/metricbeat/module/jolokia/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/jolokia/_meta/config.yml
-%%DATADIR%%/metricbeat/module/jolokia/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/jolokia/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/jolokia/_meta/jolokia.xml
-%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/data.json
-%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/data.json
-%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/couchbase/_meta/env
-%%DATADIR%%/metricbeat/module/couchbase/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/couchbase/_meta/config.yml
-%%DATADIR%%/metricbeat/module/couchbase/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/couchbase/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/couchbase/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/couchbase/_meta/configure-node.sh
-%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/data.json
-%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/couchbase/node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/couchbase/node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/couchbase/node/_meta/data.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/mysql/_meta/config.yml
-%%DATADIR%%/metricbeat/module/mysql/_meta/env
-%%DATADIR%%/metricbeat/module/mysql/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/search/67e88e60-0005-11e7-aaf1-b342e4b94bb0.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/dashboard/66881e90-0006-11e7-bf7f-c9acc3d3e306.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/e784dc50-0005-11e7-bf7f-c9acc3d3e306.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/45a00c10-0006-11e7-bf7f-c9acc3d3e306.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/4c36c420-000a-11e7-8cd4-73b67e9e3f3c.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/1a99f2b0-0006-11e7-bf7f-c9acc3d3e306.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/0f506420-0006-11e7-bf7f-c9acc3d3e306.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/a2175300-000a-11e7-b001-85aac4878445.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/1ede99e0-0009-11e7-8cd4-73b67e9e3f3c.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/1eda2280-0008-11e7-82f3-2f380154876c.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/6/dashboard/Metricbeat-mysql-overview.json
-%%DATADIR%%/metricbeat/module/mysql/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mysql/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mysql/status/_meta/data.json
-%%DATADIR%%/metricbeat/module/mysql/status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mysql/status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mysql/module.yml
-%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/data.json
-%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/ceph/_meta/env
-%%DATADIR%%/metricbeat/module/ceph/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/ceph/_meta/config.yml
-%%DATADIR%%/metricbeat/module/ceph/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/data.json
-%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kibana/status/_meta/data.json
-%%DATADIR%%/metricbeat/module/kibana/status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kibana/status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kibana/_meta/env
-%%DATADIR%%/metricbeat/module/kibana/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/kibana/_meta/config.yml
-%%DATADIR%%/metricbeat/module/kibana/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kibana/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/kibana/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kibana/stats/_meta/data.json
-%%DATADIR%%/metricbeat/module/kibana/stats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kibana/stats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/apache/module.yml
-%%DATADIR%%/metricbeat/module/apache/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/apache/_meta/env
-%%DATADIR%%/metricbeat/module/apache/_meta/Dockerfile.2.4.12
-%%DATADIR%%/metricbeat/module/apache/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-CPU.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Uptime.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Hostname-list.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Total-accesses-and-kbytes.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Workers.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Load1-slash-5-slash-15.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Scoreboard.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/search/Apache-HTTPD.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/dashboard/Metricbeat-Apache-HTTPD-server-status.json
-%%DATADIR%%/metricbeat/module/apache/_meta/kibana/6/dashboard/Metricbeat-apache-overview.json
-%%DATADIR%%/metricbeat/module/apache/_meta/config.yml
-%%DATADIR%%/metricbeat/module/apache/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/apache/_meta/httpd.conf
-%%DATADIR%%/metricbeat/module/apache/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/apache/status/_meta/data.json
-%%DATADIR%%/metricbeat/module/apache/status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/apache/status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/data.json
-%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/vsphere/_meta/config.yml
-%%DATADIR%%/metricbeat/module/vsphere/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/vsphere/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/vsphere/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/vsphere/_meta/README.md
-%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/data.json
-%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/vsphere/host/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/vsphere/host/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/vsphere/host/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/image/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/image/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/image/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/memory/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/memory/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/memory/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/event/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/event/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/event/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/network/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/network/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/network/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-Network-IO.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-CPU-usage.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-memory-usage.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-containers.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-images-and-names.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-containers-per-host.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-Number-of-Containers.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/dashboard/Metricbeat-Docker.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/search/Metricbeat-Docker.json
-%%DATADIR%%/metricbeat/module/docker/_meta/kibana/6/dashboard/Metricbeat-docker-overview.json
-%%DATADIR%%/metricbeat/module/docker/_meta/config.yml
-%%DATADIR%%/metricbeat/module/docker/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/docker/module.yml
-%%DATADIR%%/metricbeat/module/docker/container/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/container/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/container/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/cpu/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/cpu/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/cpu/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/info/_meta/data.json
-%%DATADIR%%/metricbeat/module/docker/info/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/info/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/diskio/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/docker/diskio/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/docker/diskio/_meta/data.json
-%%DATADIR%%/metricbeat/module/kvm/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kvm/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/kvm/_meta/config.yml
-%%DATADIR%%/metricbeat/module/kvm/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/data.json
-%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/munin/node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/munin/node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/munin/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/munin/_meta/munin-node.conf
-%%DATADIR%%/metricbeat/module/munin/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/munin/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/munin/_meta/env
-%%DATADIR%%/metricbeat/module/munin/_meta/config.yml
-%%DATADIR%%/metricbeat/module/munin/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/data.json
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/envoy.json
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/config.yml
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/envoyproxy/_meta/env
-%%DATADIR%%/metricbeat/module/golang/module.yml
-%%DATADIR%%/metricbeat/module/golang/expvar/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/golang/expvar/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/golang/heap/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/golang/heap/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/golang/heap/_meta/data.json
-%%DATADIR%%/metricbeat/module/golang/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/golang/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/6/dashboard/Metricbeat-golang-overview.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/dashboard/f2dc7320-f519-11e6-a3c9-9d1f7c42b045.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/b046cb80-f52a-11e6-969c-518c48c913e4.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/ab226b50-f52a-11e6-969c-518c48c913e4.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/b59a5200-f52a-11e6-969c-518c48c913e4.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/95388680-f52a-11e6-969c-518c48c913e4.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/9a9a8bf0-f52a-11e6-969c-518c48c913e4.json
-%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/58000780-f529-11e6-844d-b170e2f0a07e.json
-%%DATADIR%%/metricbeat/module/golang/_meta/config.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/data-xpack.json
-%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json
-%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/_meta/env
-%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json
-%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/data.json
-%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/data.json
-%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/data.json
-%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/data.json
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/env
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/config.yml
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/zookeeper/_meta/kibana/6/dashboard/Metricbeat-zookeeper-overview.json
-%%DATADIR%%/metricbeat/module/kafka/_meta/run.sh
-%%DATADIR%%/metricbeat/module/kafka/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/kafka/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kafka/_meta/config.yml
-%%DATADIR%%/metricbeat/module/kafka/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/kafka/_meta/healthcheck.sh
-%%DATADIR%%/metricbeat/module/kafka/_meta/env
-%%DATADIR%%/metricbeat/module/kafka/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kafka/_meta/kibana/6/dashboard/Metricbeat-kafka-overview.json
-%%DATADIR%%/metricbeat/module/kafka/partition/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kafka/partition/_meta/data.json
-%%DATADIR%%/metricbeat/module/kafka/partition/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/data.json
-%%DATADIR%%/metricbeat/module/http/_meta/env
-%%DATADIR%%/metricbeat/module/http/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/http/_meta/config.yml
-%%DATADIR%%/metricbeat/module/http/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/http/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/http/json/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/http/json/_meta/data.json
-%%DATADIR%%/metricbeat/module/http/json/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/http/server/_meta/data.json
-%%DATADIR%%/metricbeat/module/http/server/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/http/server/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/module.yml
-%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/data.json
-%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mongodb/_meta/config.reference.yml
-%%DATADIR%%/metricbeat/module/mongodb/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/_meta/Dockerfile
-%%DATADIR%%/metricbeat/module/mongodb/_meta/config.yml
-%%DATADIR%%/metricbeat/module/mongodb/_meta/env
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/dashboard/Metricbeat-MongoDB.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-Concurrent-transactions-Write.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-Engine-ampersand-Version.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-asserts.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-operation-counters.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-Concurrent-transactions-Read.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-WiredTiger-Cache.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-memory-stats.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-hosts.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/search/MongoDB-search.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/6/dashboard/Metricbeat-mongodb-overview.json
-%%DATADIR%%/metricbeat/module/mongodb/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/data.json
-%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/data.json
-%%DATADIR%%/metricbeat/module/mongodb/status/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mongodb/status/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/status/_meta/data.json
-%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc
-%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/fields.yml
-%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/data.json
-%%DATADIR%%/filebeat/module/iis/_meta/config.yml
-%%DATADIR%%/filebeat/module/iis/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/iis/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/iis/_meta/kibana/6/dashboard/Filebeat-iis.json
-%%DATADIR%%/filebeat/module/iis/_meta/fields.yml
-%%DATADIR%%/filebeat/module/iis/error/manifest.yml
-%%DATADIR%%/filebeat/module/iis/error/config/iis-error.yml
-%%DATADIR%%/filebeat/module/iis/error/_meta/fields.yml
-%%DATADIR%%/filebeat/module/iis/error/ingest/default.json
-%%DATADIR%%/filebeat/module/iis/access/manifest.yml
-%%DATADIR%%/filebeat/module/iis/access/config/iis-access.yml
-%%DATADIR%%/filebeat/module/iis/access/_meta/fields.yml
-%%DATADIR%%/filebeat/module/iis/access/ingest/default.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/6295bdd0-0a0e-11e7-825f-6748cda7d858.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/d1726930-0a7f-11e7-8b04-eb22a5669f27.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/2bb0fa70-0a11-11e7-9e84-43da493ad0c7.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/c5411910-0a87-11e7-8b04-eb22a5669f27.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/5ebdbe50-0a0f-11e7-825f-6748cda7d858.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/dashboard/dfbb49f0-0a0f-11e7-8a62-2d05eaaac5cb.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/search/4ac0a370-0a11-11e7-8b04-eb22a5669f27.json
-%%DATADIR%%/filebeat/module/auditd/_meta/kibana/6/dashboard/Filebeat-auditd.json
-%%DATADIR%%/filebeat/module/auditd/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/auditd/_meta/fields.yml
-%%DATADIR%%/filebeat/module/auditd/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/auditd/_meta/config.yml
-%%DATADIR%%/filebeat/module/auditd/module.yml
-%%DATADIR%%/filebeat/module/auditd/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/auditd/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/auditd/log/manifest.yml
-%%DATADIR%%/filebeat/module/auditd/log/config/log.yml
-%%DATADIR%%/filebeat/module/nginx/module.yml
-%%DATADIR%%/filebeat/module/nginx/access/ingest/default.json
-%%DATADIR%%/filebeat/module/nginx/access/manifest.yml
-%%DATADIR%%/filebeat/module/nginx/access/config/nginx-access.yml
-%%DATADIR%%/filebeat/module/nginx/access/_meta/fields.yml
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/remote_ip_request_rate.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/remote_ip_url_count.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_low_request_rate.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/low_request_rate.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_remote_ip_request_rate.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_remote_ip_url_count.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/visitor_rate.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/response_code.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_visitor_rate.json
-%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_response_code.json
-%%DATADIR%%/filebeat/module/nginx/_meta/config.yml
-%%DATADIR%%/filebeat/module/nginx/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/nginx/_meta/fields.yml
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/search/Filebeat-Nginx-module.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/search/ML-Filebeat-Nginx-Access.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Top-Remote-IPs-Table.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Errors-over-time.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-Response-codes-by-top-URLs.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-Map.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Top-URLs-Table.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/New-Visualization.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Sent-sizes.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Unique-Count-URL-Timechart.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Map.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-Browsers.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Response-Code-Timechart.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Remote-IP-Timechart.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-OSes.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/dashboard/ML-Nginx-Access-Remote-IP-Count-Explorer.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/dashboard/Filebeat-Nginx-Dashboard.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/dashboard/ML-Nginx-Remote-IP-URL-Explorer.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/Filebeat-nginx-overview.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/ml-nginx-remote-ip-url-explorer.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/Filebeat-nginx-logs.json
-%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/ml-nginx-access-remote-ip-count-explorer.json
-%%DATADIR%%/filebeat/module/nginx/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/nginx/error/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/nginx/error/manifest.yml
-%%DATADIR%%/filebeat/module/nginx/error/_meta/fields.yml
-%%DATADIR%%/filebeat/module/nginx/error/config/nginx-error.yml
-%%DATADIR%%/filebeat/module/redis/slowlog/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/redis/slowlog/manifest.yml
-%%DATADIR%%/filebeat/module/redis/slowlog/_meta/fields.yml
-%%DATADIR%%/filebeat/module/redis/slowlog/config/slowlog.yml
-%%DATADIR%%/filebeat/module/redis/log/manifest.yml
-%%DATADIR%%/filebeat/module/redis/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/redis/log/config/log.yml
-%%DATADIR%%/filebeat/module/redis/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/redis/_meta/config.yml
-%%DATADIR%%/filebeat/module/redis/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/redis/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/6/dashboard/Filebeat-redis.json
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/dashboard/7fea2930-478e-11e7-b1f0-cb29bac6bf8b.json
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/search/73613570-4791-11e7-be88-2ddb32f3df97.json
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/search/0ab87b80-478e-11e7-b1f0-cb29bac6bf8b.json
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/visualization/d2864600-478f-11e7-be88-2ddb32f3df97.json
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/visualization/78b9afe0-478f-11e7-b1f0-cb29bac6bf8b.json
-%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/visualization/dcccaa80-4791-11e7-be88-2ddb32f3df97.json
-%%DATADIR%%/filebeat/module/redis/_meta/fields.yml
-%%DATADIR%%/filebeat/module/redis/module.yml
-%%DATADIR%%/filebeat/module/system/syslog/config/syslog.yml
-%%DATADIR%%/filebeat/module/system/syslog/manifest.yml
-%%DATADIR%%/filebeat/module/system/syslog/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/system/syslog/_meta/fields.yml
-%%DATADIR%%/filebeat/module/system/auth/config/auth.yml
-%%DATADIR%%/filebeat/module/system/auth/_meta/fields.yml
-%%DATADIR%%/filebeat/module/system/auth/manifest.yml
-%%DATADIR%%/filebeat/module/system/auth/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/system/module.yml
-%%DATADIR%%/filebeat/module/system/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/system/_meta/config.yml
-%%DATADIR%%/filebeat/module/system/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-ssh-login-attempts.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-auth-sudo-commands.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-new-users-and-groups.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-syslog.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/341ffe70-f9ce-11e6-8115-a7c18106d86a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/78b74f30-f9cd-11e6-8115-a7c18106d86a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/51164310-fa2b-11e6-bbd3-29c986c96e5a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/12667040-fa80-11e6-a1df-a78bd7504d38.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/e121b140-fa78-11e6-a1df-a78bd7504d38.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/dc589770-fa2b-11e6-bbd3-29c986c96e5a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/Syslog-events-by-hostname.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/d16bb400-f9cc-11e6-8115-a7c18106d86a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/346bb290-fa80-11e6-a1df-a78bd7504d38.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/d56ee420-fa79-11e6-a1df-a78bd7504d38.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/5dd15c00-fa78-11e6-ae9b-81e5311e8cab.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/3cec3eb0-f9d3-11e6-8a3e-2b904044ea1d.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/f398d2f0-fa77-11e6-ae9b-81e5311e8cab.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/5c7af030-fa2a-11e6-bbd3-29c986c96e5a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/Syslog-hostnames-and-processes.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/Filebeat-syslog-dashboard.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/277876d0-fa2c-11e6-bbd3-29c986c96e5a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/5517a150-f9ce-11e6-8115-a7c18106d86a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/eb0039f0-fa7f-11e6-a1df-a78bd7504d38.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/b6f321e0-fa25-11e6-bbd3-29c986c96e5a.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/62439dc0-f9c9-11e6-a747-6121780e0414.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/Syslog-system-logs.json
-%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/8030c1b0-fa77-11e6-ae9b-81e5311e8cab.json
-%%DATADIR%%/filebeat/module/system/_meta/fields.yml
-%%DATADIR%%/filebeat/module/apache2/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/6/dashboard/Filebeat-apache2.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/dashboard/Filebeat-Apache2-Dashboard.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/search/Apache2-errors-log.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/search/Apache2-access-logs.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-response-codes-of-top-URLs.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-error-logs-over-time.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-response-codes-over-time.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-access-unique-IPs-map.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-browsers.json
-%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-operating-systems.json
-%%DATADIR%%/filebeat/module/apache2/_meta/fields.yml
-%%DATADIR%%/filebeat/module/apache2/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/apache2/_meta/config.yml
-%%DATADIR%%/filebeat/module/apache2/access/_meta/fields.yml
-%%DATADIR%%/filebeat/module/apache2/access/config/access.yml
-%%DATADIR%%/filebeat/module/apache2/access/ingest/default.json
-%%DATADIR%%/filebeat/module/apache2/access/manifest.yml
-%%DATADIR%%/filebeat/module/apache2/error/manifest.yml
-%%DATADIR%%/filebeat/module/apache2/error/_meta/fields.yml
-%%DATADIR%%/filebeat/module/apache2/error/config/error.yml
-%%DATADIR%%/filebeat/module/apache2/error/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/apache2/module.yml
-%%DATADIR%%/filebeat/module/mongodb/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/mongodb/_meta/config.yml
-%%DATADIR%%/filebeat/module/mongodb/_meta/fields.yml
-%%DATADIR%%/filebeat/module/mongodb/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/mongodb/_meta/kibana/6/dashboard/Filebeat-Mongodb-overview.json
-%%DATADIR%%/filebeat/module/mongodb/module.yml
-%%DATADIR%%/filebeat/module/mongodb/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/mongodb/log/config/log.yml
-%%DATADIR%%/filebeat/module/mongodb/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/mongodb/log/manifest.yml
-%%DATADIR%%/filebeat/module/logstash/slowlog/config/slowlog.yml
-%%DATADIR%%/filebeat/module/logstash/slowlog/_meta/fields.yml
-%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-json.json
-%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json
-%%DATADIR%%/filebeat/module/logstash/slowlog/manifest.yml
-%%DATADIR%%/filebeat/module/logstash/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-plain.json
-%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-json.json
-%%DATADIR%%/filebeat/module/logstash/log/config/log.yml
-%%DATADIR%%/filebeat/module/logstash/log/manifest.yml
-%%DATADIR%%/filebeat/module/logstash/_meta/config.yml
-%%DATADIR%%/filebeat/module/logstash/_meta/kibana/6/dashboard/Filebeat-logstash-slowlog.json
-%%DATADIR%%/filebeat/module/logstash/_meta/kibana/6/dashboard/Filebeat-logstash-log.json
-%%DATADIR%%/filebeat/module/logstash/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/logstash/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/logstash/_meta/fields.yml
-%%DATADIR%%/filebeat/module/logstash/module.yml
-%%DATADIR%%/filebeat/module/osquery/_meta/fields.yml
-%%DATADIR%%/filebeat/module/osquery/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/osquery/_meta/kibana/6/dashboard/osquery-rootkit.json
-%%DATADIR%%/filebeat/module/osquery/_meta/kibana/6/dashboard/osquery-compliance.json
-%%DATADIR%%/filebeat/module/osquery/_meta/config.yml
-%%DATADIR%%/filebeat/module/osquery/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/osquery/module.yml
-%%DATADIR%%/filebeat/module/osquery/result/config/result.yml
-%%DATADIR%%/filebeat/module/osquery/result/manifest.yml
-%%DATADIR%%/filebeat/module/osquery/result/_meta/fields.yml
-%%DATADIR%%/filebeat/module/osquery/result/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/elasticsearch/deprecation/manifest.yml
-%%DATADIR%%/filebeat/module/elasticsearch/deprecation/config/log.yml
-%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/elasticsearch/deprecation/_meta/fields.yml
-%%DATADIR%%/filebeat/module/elasticsearch/module.yml
-%%DATADIR%%/filebeat/module/elasticsearch/_meta/fields.yml
-%%DATADIR%%/filebeat/module/elasticsearch/_meta/config.yml
-%%DATADIR%%/filebeat/module/elasticsearch/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/elasticsearch/server/_meta/fields.yml
-%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/elasticsearch/server/manifest.yml
-%%DATADIR%%/filebeat/module/elasticsearch/server/config/log.yml
-%%DATADIR%%/filebeat/module/elasticsearch/slowlog/manifest.yml
-%%DATADIR%%/filebeat/module/elasticsearch/slowlog/config/slowlog.yml
-%%DATADIR%%/filebeat/module/elasticsearch/slowlog/_meta/fields.yml
-%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/elasticsearch/gc/_meta/fields.yml
-%%DATADIR%%/filebeat/module/elasticsearch/gc/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/elasticsearch/gc/manifest.yml
-%%DATADIR%%/filebeat/module/elasticsearch/gc/config/gc.yml
-%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-json.json
-%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-plaintext.json
-%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/elasticsearch/audit/manifest.yml
-%%DATADIR%%/filebeat/module/elasticsearch/audit/config/audit.yml
-%%DATADIR%%/filebeat/module/elasticsearch/audit/_meta/fields.yml
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/6/dashboard/ml-traefik-remote-ip-url-explorer.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/6/dashboard/Filebeat-traefik-overview.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/6/dashboard/ml-traefik-access-remote-ip-count-explorer.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/search/ML-Filebeat-Traefik-Access.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/search/Filebeat-Traefik-module.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-Map.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-OSes.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Response-Code-Timechart.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Map.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-Browsers.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Unique-Count-URL-Timechart.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Remote-IP-Timechart.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/New-Visualization.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Sent-sizes.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Top-URLs-Table.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Top-Remote-IPs-Table.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-Response-codes-by-top-URLs.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/dashboard/ML-Traefik-Access-Remote-IP-Count-Explorer.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/dashboard/ML-Traefik-Remote-IP-URL-Explorer.json
-%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/dashboard/Filebeat-Traefik-Dashboard.json
-%%DATADIR%%/filebeat/module/traefik/_meta/config.yml
-%%DATADIR%%/filebeat/module/traefik/_meta/fields.yml
-%%DATADIR%%/filebeat/module/traefik/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/traefik/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/traefik/module.yml
-%%DATADIR%%/filebeat/module/traefik/access/_meta/fields.yml
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/visitor_rate.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/remote_ip_url_count.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/response_code.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/low_request_rate.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_response_code.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_low_request_rate.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_visitor_rate.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/remote_ip_request_rate.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_remote_ip_request_rate.json
-%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_remote_ip_url_count.json
-%%DATADIR%%/filebeat/module/traefik/access/config/traefik-access.yml
-%%DATADIR%%/filebeat/module/traefik/access/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/traefik/access/manifest.yml
-%%DATADIR%%/filebeat/module/postgresql/log/manifest.yml
-%%DATADIR%%/filebeat/module/postgresql/log/config/log.yml
-%%DATADIR%%/filebeat/module/postgresql/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/postgresql/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/postgresql/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/postgresql/_meta/fields.yml
-%%DATADIR%%/filebeat/module/postgresql/_meta/kibana/6/dashboard/Filebeat-Postgresql-slowlogs.json
-%%DATADIR%%/filebeat/module/postgresql/_meta/kibana/6/dashboard/Filebeat-Postgresql-overview.json
-%%DATADIR%%/filebeat/module/postgresql/_meta/config.yml
-%%DATADIR%%/filebeat/module/postgresql/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/postgresql/module.yml
-%%DATADIR%%/filebeat/module/kibana/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/kibana/log/manifest.yml
-%%DATADIR%%/filebeat/module/kibana/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/kibana/log/config/log.yml
-%%DATADIR%%/filebeat/module/kibana/module.yml
-%%DATADIR%%/filebeat/module/kibana/_meta/fields.yml
-%%DATADIR%%/filebeat/module/kibana/_meta/config.yml
-%%DATADIR%%/filebeat/module/kibana/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/kafka/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/kafka/log/manifest.yml
-%%DATADIR%%/filebeat/module/kafka/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/kafka/log/config/log.yml
-%%DATADIR%%/filebeat/module/kafka/module.yml
-%%DATADIR%%/filebeat/module/kafka/_meta/kibana/6/dashboard/Filebeat-Kafka-overview.json
-%%DATADIR%%/filebeat/module/kafka/_meta/config.yml
-%%DATADIR%%/filebeat/module/kafka/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/kafka/_meta/fields.yml
-%%DATADIR%%/filebeat/module/haproxy/log/config/file.yml
-%%DATADIR%%/filebeat/module/haproxy/log/config/syslog.yml
-%%DATADIR%%/filebeat/module/haproxy/log/manifest.yml
-%%DATADIR%%/filebeat/module/haproxy/log/_meta/fields.yml
-%%DATADIR%%/filebeat/module/haproxy/log/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/haproxy/_meta/fields.yml
-%%DATADIR%%/filebeat/module/haproxy/_meta/config.yml
-%%DATADIR%%/filebeat/module/haproxy/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json
-%%DATADIR%%/filebeat/module/haproxy/module.yml
-%%DATADIR%%/filebeat/module/icinga/startup/_meta/fields.yml
-%%DATADIR%%/filebeat/module/icinga/startup/config/startup.yml
-%%DATADIR%%/filebeat/module/icinga/startup/manifest.yml
-%%DATADIR%%/filebeat/module/icinga/startup/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/icinga/module.yml
-%%DATADIR%%/filebeat/module/icinga/main/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/icinga/main/_meta/fields.yml
-%%DATADIR%%/filebeat/module/icinga/main/manifest.yml
-%%DATADIR%%/filebeat/module/icinga/main/config/main.yml
-%%DATADIR%%/filebeat/module/icinga/_meta/config.yml
-%%DATADIR%%/filebeat/module/icinga/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/icinga/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/6/dashboard/Filebeat-icinga-main-log.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/6/dashboard/Filebeat-icinga-startup-errors.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/6/dashboard/Filebeat-icinga-debug-log.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/dashboard/b9163ea0-2417-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/dashboard/f693d260-2417-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/dashboard/26309570-2419-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/search/c876e6a0-2418-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/search/710043e0-2417-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/search/ffaf5a30-2413-11e7-a0d9-39604d45ca7f.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/a59b5e00-2417-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/0bc34b60-2419-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/2cf77780-2418-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/fb09d4b0-2418-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/d8e5dc40-2417-11e7-a83b-d5f4cebac9ff.json
-%%DATADIR%%/filebeat/module/icinga/_meta/fields.yml
-%%DATADIR%%/filebeat/module/icinga/debug/config/debug.yml
-%%DATADIR%%/filebeat/module/icinga/debug/_meta/fields.yml
-%%DATADIR%%/filebeat/module/icinga/debug/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/icinga/debug/manifest.yml
-%%DATADIR%%/filebeat/module/mysql/slowlog/config/slowlog.yml
-%%DATADIR%%/filebeat/module/mysql/slowlog/manifest.yml
-%%DATADIR%%/filebeat/module/mysql/slowlog/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/mysql/slowlog/_meta/fields.yml
-%%DATADIR%%/filebeat/module/mysql/error/config/error.yml
-%%DATADIR%%/filebeat/module/mysql/error/manifest.yml
-%%DATADIR%%/filebeat/module/mysql/error/ingest/pipeline.json
-%%DATADIR%%/filebeat/module/mysql/error/_meta/fields.yml
-%%DATADIR%%/filebeat/module/mysql/_meta/docs.asciidoc
-%%DATADIR%%/filebeat/module/mysql/_meta/fields.yml
-%%DATADIR%%/filebeat/module/mysql/_meta/config.yml
-%%DATADIR%%/filebeat/module/mysql/_meta/config.reference.yml
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/6/dashboard/Filebeat-mysql.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-Slow-queries-over-time.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-error-logs.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-Error-logs-levels.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-slowest-queries.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-Slow-logs-by-count.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/search/Filebeat-MySQL-error-log.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/search/Filebeat-MySQL-Slow-log.json
-%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/dashboard/Filebeat-MySQL-Dashboard.json
-%%DATADIR%%/filebeat/module/mysql/module.yml
-%%ETCDIR%%/filebeat.modules.d/haproxy.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/redis.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/system.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/logstash.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/elasticsearch.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/kafka.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/iis.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/apache2.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/auditd.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/icinga.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/mysql.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/traefik.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/postgresql.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/kibana.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/mongodb.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/osquery.yml.disabled
-%%ETCDIR%%/filebeat.modules.d/nginx.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/golang.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/kafka.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/traefik.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/php_fpm.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/kubernetes.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/zookeeper.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/graphite.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/ceph.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/vsphere.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/redis.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/uwsgi.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/memcached.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/couchbase.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/kibana.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/http.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/jolokia.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/munin.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/mysql.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/mongodb.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/prometheus.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/docker.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/etcd.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/elasticsearch.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/rabbitmq.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/logstash.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/envoyproxy.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/postgresql.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/apache.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/haproxy.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/kvm.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/windows.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/dropwizard.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/nginx.yml.disabled
-%%ETCDIR%%/metricbeat.modules.d/system.yml
-%%ETCDIR%%/metricbeat.modules.d/aerospike.yml.disabled
diff --git a/sysutils/beats6/Makefile b/sysutils/beats6/Makefile
new file mode 100644
index 000000000000..c9ac40b515ff
--- /dev/null
+++ b/sysutils/beats6/Makefile
@@ -0,0 +1,71 @@
+# Created by: Palle Girgensohn <girgen@FreeBSD.org>
+
+PORTNAME=	beats
+PORTVERSION=	6.8.15
+DISTVERSIONPREFIX=v
+CATEGORIES=	sysutils
+PKGNAMESUFFIX=	6
+
+MAINTAINER=	elastic@FreeBSD.org
+COMMENT=	Collect logs locally and send to remote logstash
+
+LICENSE=	APACHE20
+
+USES=		gmake go
+USE_GITHUB=	yes
+GH_ACCOUNT=	elastic
+USE_RC_SUBR=	${GO_TARGETS}
+
+CONFLICTS=	beats7*
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
+MAKE_ENV+=	GOBUILD_FLAGS=""
+
+OPTIONS_DEFAULT=FILEBEAT HEARTBEAT METRICBEAT
+OPTIONS_DEFINE=	FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
+OPTIONS_SUB=	yes
+
+FILEBEAT_DESC=	Filebeat
+FILEBEAT_VARS=	GO_TARGETS+=filebeat
+
+PACKETBEAT_DESC=Packetbeat
+PACKETBEAT_VARS=GO_TARGETS+=packetbeat
+PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
+
+METRICBEAT_DESC=Metricbeat
+METRICBEAT_VARS=GO_TARGETS+=metricbeat
+
+HEARTBEAT_DESC=	Heartbeat
+HEARTBEAT_VARS=	GO_TARGETS+=heartbeat
+
+.include <bsd.port.options.mk>
+
+do-build:
+.for GO_TARGET in ${GO_TARGETS}
+	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGET})
+.endfor
+
+do-install:
+.for GO_TARGET in ${GO_TARGETS}
+	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGET}/${GO_TARGET} \
+		${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/${GO_TARGET}/${GO_TARGET}.yml \
+		${STAGEDIR}${PREFIX}/etc/${GO_TARGET}.yml.sample
+	(DEST_COMPONENT_PATH_UNSTAGED=/var/db/beats/${GO_TARGET}/kibana; \
+		DEST_COMPONENT_PATH=${STAGEDIR}$${DEST_COMPONENT_PATH_UNSTAGED}; \
+		${MKDIR} $${DEST_COMPONENT_PATH}; \
+		DASHBOARD_FIND_ARGS="-path */_meta/kibana -type d"; \
+		DASHBOARD_PATHS=$$(${SETENV} ${FIND} ${WRKSRC}/${GO_TARGET} $${DASHBOARD_FIND_ARGS}); \
+		for DASHBOARD_PATH in $${DASHBOARD_PATHS}; \
+		do \
+			(cd $${DASHBOARD_PATH} && ${COPYTREE_SHARE} . $${DEST_COMPONENT_PATH}); \
+		done)
+.endfor
+.for BEATMOD in filebeat metricbeat
+	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
+	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${FIND_ARGS})
+	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
+.endfor
+
+.include <bsd.port.mk>
diff --git a/sysutils/beats6/distinfo b/sysutils/beats6/distinfo
new file mode 100644
index 000000000000..a2cf4eb7488e
--- /dev/null
+++ b/sysutils/beats6/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1617794829
+SHA256 (elastic-beats-v6.8.15_GH0.tar.gz) = 92229c42685231a960f290fb6707f4c625abb60a49552ca20bcb75bb5cf8eab0
+SIZE (elastic-beats-v6.8.15_GH0.tar.gz) = 35585973
diff --git a/sysutils/beats6/files/filebeat.in b/sysutils/beats6/files/filebeat.in
new file mode 100644
index 000000000000..41012f8f72e6
--- /dev/null
+++ b/sysutils/beats6/files/filebeat.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# PROVIDE: filebeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable filebeat:
+#
+# filebeat_enable (bool):	Set to YES to enable filebeat
+# 				Default: NO
+# filebeat_flags (str):		Extra flags passed to filebeat
+# filebeat_conf (str):		filebeat configuration file
+#				Default: ${PREFIX}/etc/filebeat.yml
+
+. /etc/rc.subr
+
+name="filebeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${filebeat_enable:="NO"}
+: ${filebeat_config:="-path.home %%DATADIR%%/${name} -path.config %%PREFIX%%/etc"}
+
+# daemon
+start_precmd=filebeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_config}"
+
+filebeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats6/files/heartbeat.in b/sysutils/beats6/files/heartbeat.in
new file mode 100644
index 000000000000..3393ff197de6
--- /dev/null
+++ b/sysutils/beats6/files/heartbeat.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# PROVIDE: heartbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable heartbeat:
+#
+# heartbeat_enable (bool):	Set to YES to enable heartbeat
+# 				Default: NO
+# heartbeat_flags (str):	Extra flags passed to heartbeat
+# heartbeat_conf (str):		heartbeat configuration file
+#				Default: ${PREFIX}/etc/heartbeat.yml
+
+. /etc/rc.subr
+
+name="heartbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${heartbeat_enable:="NO"}
+: ${heartbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
+
+# daemon
+start_precmd=heartbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_config}"
+
+heartbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats6/files/metricbeat.in b/sysutils/beats6/files/metricbeat.in
new file mode 100644
index 000000000000..9ec75b1759d1
--- /dev/null
+++ b/sysutils/beats6/files/metricbeat.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# PROVIDE: metricbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable metricbeat:
+#
+# metricbeat_enable (bool):	Set to YES to enable metricbeat
+# 				Default: NO
+# metricbeat_flags (str):	Extra flags passed to metricbeat
+# metricbeat_conf (str):	metricbeat configuration metric
+#				Default: ${PREFIX}/etc/metricbeat.yml
+
+. /etc/rc.subr
+
+name="metricbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${metricbeat_enable:="NO"}
+: ${metricbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
+
+# daemon
+start_precmd=metricbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-rfP ${pidfile} -p ${pidfile}.child %%PREFIX%%/sbin/${name} ${metricbeat_config}"
+
+metricbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+# metricbeat will refuse to quit if linprocfs is mounted, and sadly requires -9
+[ -f /compat/linux/proc/cpuinfo ] && stop_cmd=metricbeat_stop
+
+metricbeat_stop() {
+	pkill -9 -F ${pidfile} > /dev/null 2>&1
+	pkill -9 -F ${pidfile}.child > /dev/null 2>&1
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats6/files/packetbeat.in b/sysutils/beats6/files/packetbeat.in
new file mode 100644
index 000000000000..df49786b0dfc
--- /dev/null
+++ b/sysutils/beats6/files/packetbeat.in
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# PROVIDE: packetbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable packetbeat
+#
+# packetbeat_enable (bool):	Set to YES to enable packetbeat
+# 				Default: NO
+# packetbeat_flags (str):	Extra flags passed to packetbeat
+# packetbeat_conf (str):	packetbeat configuration file
+#				Default: ${PREFIX}/etc/packetbeat.yml
+
+. /etc/rc.subr
+
+name="packetbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${packetbeat_enable:="NO"}
+: ${packetbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
+
+# daemon
+start_precmd=packetbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_config}"
+
+packetbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats6/files/patch-filebeat_filebeat.yml b/sysutils/beats6/files/patch-filebeat_filebeat.yml
new file mode 100644
index 000000000000..868d7cfde986
--- /dev/null
+++ b/sysutils/beats6/files/patch-filebeat_filebeat.yml
@@ -0,0 +1,47 @@
+Add Paths section for reference.
+
+--- filebeat/filebeat.yml.orig	2019-10-15 21:08:29 UTC
++++ filebeat/filebeat.yml
+@@ -98,6 +98,33 @@ setup.template.settings:
+ #  env: staging
+ 
+ 
++#================================= Paths ======================================
++
++# The home path for the filebeat installation. This is the default base path
++# for all other path settings and for miscellaneous files that come with the
++# distribution (for example, the sample dashboards).
++# If not set by a CLI flag or in the configuration file, the default for the
++# home path is the location of the binary.
++#path.home:
++
++# The configuration path for the filebeat installation. This is the default
++# base path for configuration files, including the main YAML configuration file
++# and the Elasticsearch template file. If not set by a CLI flag or in the
++# configuration file, the default for the configuration path is the home path.
++#path.config: ${path.home}
++
++# The data path for the filebeat installation. This is the default base path
++# for all the files in which filebeat needs to store its data. If not set by a
++# CLI flag or in the configuration file, the default for the data path is a data
++# subdirectory inside the home path.
++#path.data: ${path.home}/data
++
++# The logs path for a filebeat installation. This is the default location for
++# the Beat's log files. If not set by a CLI flag or in the configuration file,
++# the default for the logs path is a logs subdirectory inside the home path.
++#path.logs: ${path.home}/logs
++
++
+ #============================== Dashboards =====================================
+ # These settings control loading the sample dashboards to the Kibana index. Loading
+ # the dashboards is disabled by default and can be enabled either by setting the
+@@ -190,6 +217,8 @@ processors:
+ # To enable all selectors use ["*"]. Examples of other selectors are "beat",
+ # "publish", "service".
+ #logging.selectors: ["*"]
++logging.to_syslog: true
++logging.to_files: false
+ 
+ #============================== Xpack Monitoring ===============================
+ # filebeat can export internal metrics to a central Elasticsearch monitoring
diff --git a/sysutils/beats6/files/patch-heartbeat_heartbeat.yml b/sysutils/beats6/files/patch-heartbeat_heartbeat.yml
new file mode 100644
index 000000000000..cc2d4a7cf38a
--- /dev/null
+++ b/sysutils/beats6/files/patch-heartbeat_heartbeat.yml
@@ -0,0 +1,47 @@
+Add Paths section for reference.
+
+--- heartbeat/heartbeat.yml.orig	2019-10-15 21:08:29 UTC
++++ heartbeat/heartbeat.yml
+@@ -55,6 +55,33 @@ setup.template.settings:
+ #  env: staging
+ 
+ 
++#================================= Paths ======================================
++
++# The home path for the filebeat installation. This is the default base path
++# for all other path settings and for miscellaneous files that come with the
++# distribution (for example, the sample dashboards).
++# If not set by a CLI flag or in the configuration file, the default for the
++# home path is the location of the binary.
++#path.home:
++
++# The configuration path for the filebeat installation. This is the default
++# base path for configuration files, including the main YAML configuration file
++# and the Elasticsearch template file. If not set by a CLI flag or in the
++# configuration file, the default for the configuration path is the home path.
++#path.config: ${path.home}
++
++# The data path for the filebeat installation. This is the default base path
++# for all the files in which filebeat needs to store its data. If not set by a
++# CLI flag or in the configuration file, the default for the data path is a data
++# subdirectory inside the home path.
++#path.data: ${path.home}/data
++
++# The logs path for a filebeat installation. This is the default location for
++# the Beat's log files. If not set by a CLI flag or in the configuration file,
++# the default for the logs path is a logs subdirectory inside the home path.
++#path.logs: ${path.home}/logs
++
++
+ #============================== Dashboards =====================================
+ # These settings control loading the sample dashboards to the Kibana index. Loading
+ # the dashboards is disabled by default and can be enabled either by setting the
+@@ -147,6 +174,8 @@ processors:
+ # To enable all selectors use ["*"]. Examples of other selectors are "beat",
+ # "publish", "service".
+ #logging.selectors: ["*"]
++logging.to_syslog: true
++logging.to_files: false
+ 
+ #============================== Xpack Monitoring ===============================
+ # heartbeat can export internal metrics to a central Elasticsearch monitoring
diff --git a/sysutils/beats6/files/patch-libbeat_scripts_Makefile b/sysutils/beats6/files/patch-libbeat_scripts_Makefile
new file mode 100644
index 000000000000..c8520470a400
--- /dev/null
+++ b/sysutils/beats6/files/patch-libbeat_scripts_Makefile
@@ -0,0 +1,31 @@
+Fix syntax for sh (get rid of bash-isms)
+
+--- libbeat/scripts/Makefile.orig	2019-10-15 21:08:29 UTC
++++ libbeat/scripts/Makefile
+@@ -35,7 +35,7 @@ GOFILES = $(shell find . -type f -name '*.go')
+ GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*")
+ GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go')
+ GOPACKAGES_STRESSTESTS=$(shell find . -name '*.go' | xargs awk 'FNR>1 {nextfile} /\+build.*stresstest/ {print FILENAME; nextfile}' | xargs dirname | uniq)
+-SHELL=bash
++SHELL=sh
+ ES_HOST?="elasticsearch"
+ PWD=$(shell pwd)
+ BUILD_DIR?=$(shell pwd)/build
+@@ -108,7 +108,7 @@ ${BEAT_NAME}.test: $(GOFILES_ALL)
+ .PHONY: crosscompile
+ crosscompile: ## @build Cross-compile beat for the OS'es specified in GOX_OS variable. The binaries are placed in the build/bin directory.
+ crosscompile: $(GOFILES)
+-ifneq ($(shell [[ $(BEAT_NAME) == journalbeat ]] && echo true ),true)
++ifneq ($(shell [ $(BEAT_NAME) == journalbeat ] && echo true ),true)
+ 	go get github.com/mitchellh/gox
+ 	mkdir -p ${BUILD_DIR}/bin
+ 	gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="$(strip $(GOX_OS))" -osarch="$(strip $(GOX_OSARCH))" ${GOX_FLAGS}
+@@ -338,7 +338,7 @@ ifeq ($(BEAT_REF_YAML),true)
+ 	@chmod 0640 ${BEAT_NAME}.reference.yml
+ endif
+ 
+-ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
++ifneq ($(shell [ $(BEAT_NAME) == libbeat -o $(BEAT_NAME) == metricbeat ] && echo true ),true)
+ 	mkdir -p include
+ 	go run  ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license $(LICENSE) -pkg include -in fields.yml -out include/fields.go $(BEAT_NAME)
+ endif
diff --git a/sysutils/beats6/files/patch-metricbeat_metricbeat.yml b/sysutils/beats6/files/patch-metricbeat_metricbeat.yml
new file mode 100644
index 000000000000..5383e4adbcab
--- /dev/null
+++ b/sysutils/beats6/files/patch-metricbeat_metricbeat.yml
@@ -0,0 +1,47 @@
+Add Paths section for reference.
+
+--- metricbeat/metricbeat.yml.orig	2019-10-15 21:08:29 UTC
++++ metricbeat/metricbeat.yml
+@@ -42,6 +42,33 @@ setup.template.settings:
+ #  env: staging
+ 
+ 
++#================================= Paths ======================================
++
++# The home path for the filebeat installation. This is the default base path
++# for all other path settings and for miscellaneous files that come with the
++# distribution (for example, the sample dashboards).
++# If not set by a CLI flag or in the configuration file, the default for the
++# home path is the location of the binary.
++#path.home:
++
++# The configuration path for the filebeat installation. This is the default
++# base path for configuration files, including the main YAML configuration file
++# and the Elasticsearch template file. If not set by a CLI flag or in the
++# configuration file, the default for the configuration path is the home path.
++#path.config: ${path.home}
++
++# The data path for the filebeat installation. This is the default base path
++# for all the files in which filebeat needs to store its data. If not set by a
++# CLI flag or in the configuration file, the default for the data path is a data
++# subdirectory inside the home path.
++#path.data: ${path.home}/data
++
++# The logs path for a filebeat installation. This is the default location for
++# the Beat's log files. If not set by a CLI flag or in the configuration file,
++# the default for the logs path is a logs subdirectory inside the home path.
++#path.logs: ${path.home}/logs
++
++
+ #============================== Dashboards =====================================
+ # These settings control loading the sample dashboards to the Kibana index. Loading
+ # the dashboards is disabled by default and can be enabled either by setting the
+@@ -134,6 +161,8 @@ processors:
+ # To enable all selectors use ["*"]. Examples of other selectors are "beat",
+ # "publish", "service".
+ #logging.selectors: ["*"]
++logging.to_syslog: true
++logging.to_files: false
+ 
+ #============================== Xpack Monitoring ===============================
+ # metricbeat can export internal metrics to a central Elasticsearch monitoring
diff --git a/sysutils/beats6/files/patch-packetbeat_packetbeat.yml b/sysutils/beats6/files/patch-packetbeat_packetbeat.yml
new file mode 100644
index 000000000000..612f1e09be08
--- /dev/null
+++ b/sysutils/beats6/files/patch-packetbeat_packetbeat.yml
@@ -0,0 +1,24 @@
+--- packetbeat/packetbeat.yml.orig	2019-10-15 21:08:29 UTC
++++ packetbeat/packetbeat.yml
+@@ -10,8 +10,10 @@
+ #============================== Network device ================================
+ 
+ # Select the network interface to sniff the data. On Linux, you can use the
+-# "any" keyword to sniff on all connected interfaces.
+-packetbeat.interfaces.device: any
++# "any" keyword to sniff on all connected interfaces. FreeBSD is a bit different
++# and the beats programmers did not bother to implement it, so you must set this
++# to your preferred device
++packetbeat.interfaces.device: em0
+ 
+ #================================== Flows =====================================
+ 
+@@ -217,6 +219,8 @@ processors:
+ # To enable all selectors use ["*"]. Examples of other selectors are "beat",
+ # "publish", "service".
+ #logging.selectors: ["*"]
++logging.to_syslog: true
++logging.to_files: false
+ 
+ #============================== Xpack Monitoring ===============================
+ # packetbeat can export internal metrics to a central Elasticsearch monitoring
diff --git a/sysutils/beats6/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go b/sysutils/beats6/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go
new file mode 100644
index 000000000000..635597afaa27
--- /dev/null
+++ b/sysutils/beats6/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go
@@ -0,0 +1,11 @@
+--- vendor/github.com/docker/docker/pkg/system/mknod.go.orig	2019-10-15 21:08:29 UTC
++++ vendor/github.com/docker/docker/pkg/system/mknod.go
+@@ -9,7 +9,7 @@ import (
+ // Mknod creates a filesystem node (file, device special file or named pipe) named path
+ // with attributes specified by mode and dev.
+ func Mknod(path string, mode uint32, dev int) error {
+-	return syscall.Mknod(path, mode, dev)
++	return syscall.Mknod(path, mode, uint64(dev))
+ }
+ 
+ // Mkdev is used to build the value of linux devices (in /dev/) which specifies major
diff --git a/sysutils/beats/pkg-descr b/sysutils/beats6/pkg-descr
index fffdb0f6fb43..fffdb0f6fb43 100644
--- a/sysutils/beats/pkg-descr
+++ b/sysutils/beats6/pkg-descr
diff --git a/sysutils/beats6/pkg-plist b/sysutils/beats6/pkg-plist
new file mode 100644
index 000000000000..cdf43648aa91
--- /dev/null
+++ b/sysutils/beats6/pkg-plist
@@ -0,0 +1,1498 @@
+%%FILEBEAT%%etc/filebeat.yml.sample
+%%FILEBEAT%%sbin/filebeat
+%%HEARTBEAT%%etc/heartbeat.yml.sample
+%%HEARTBEAT%%sbin/heartbeat
+%%METRICBEAT%%etc/metricbeat.yml.sample
+%%METRICBEAT%%sbin/metricbeat
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/apache2.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/auditd.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/elasticsearch.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/haproxy.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/icinga.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/iis.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/kafka.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/kibana.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/logstash.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/mongodb.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/mysql.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/nginx.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/osquery.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/postgresql.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/redis.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/system.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/traefik.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/aerospike.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/apache.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/ceph.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/couchbase.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/docker.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/dropwizard.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/elasticsearch.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/envoyproxy.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/etcd.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/golang.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/graphite.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/haproxy.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/http.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/jolokia.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kafka.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kibana.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kubernetes.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kvm.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/logstash.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/memcached.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/mongodb.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/munin.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/mysql.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/nginx.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/php_fpm.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/postgresql.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/prometheus.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/rabbitmq.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/redis.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/system.yml
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/traefik.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/uwsgi.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/vsphere.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/windows.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/zookeeper.yml.disabled
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/dashboard/Filebeat-Apache2-Dashboard.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/search/Apache2-access-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/search/Apache2-errors-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-access-unique-IPs-map.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-browsers.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-error-logs-over-time.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-operating-systems.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-response-codes-of-top-URLs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/5/visualization/Apache2-response-codes-over-time.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/_meta/kibana/6/dashboard/Filebeat-apache2.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/access/config/access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/access/ingest/default.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/error/config/error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/error/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/dashboard/dfbb49f0-0a0f-11e7-8a62-2d05eaaac5cb.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/search/4ac0a370-0a11-11e7-8b04-eb22a5669f27.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/2bb0fa70-0a11-11e7-9e84-43da493ad0c7.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/5ebdbe50-0a0f-11e7-825f-6748cda7d858.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/6295bdd0-0a0e-11e7-825f-6748cda7d858.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/c5411910-0a87-11e7-8b04-eb22a5669f27.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/5/visualization/d1726930-0a7f-11e7-8b04-eb22a5669f27.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/6/dashboard/Filebeat-auditd.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/config/audit.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-json.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-plaintext.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/config/gc.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/kibana/6/dashboard/Filebeat-haproxy-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/config/file.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/config/syslog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/dashboard/26309570-2419-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/dashboard/b9163ea0-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/dashboard/f693d260-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/search/710043e0-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/search/c876e6a0-2418-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/search/ffaf5a30-2413-11e7-a0d9-39604d45ca7f.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/0bc34b60-2419-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/2cf77780-2418-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/a59b5e00-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/d8e5dc40-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/5/visualization/fb09d4b0-2418-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/6/dashboard/Filebeat-icinga-debug-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/6/dashboard/Filebeat-icinga-main-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/6/dashboard/Filebeat-icinga-startup-errors.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/config/debug.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/config/main.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/config/startup.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/kibana/6/dashboard/Filebeat-iis.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/config/iis-access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/ingest/default.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/config/iis-error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/ingest/default.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/kibana/6/dashboard/Filebeat-Kafka-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/kibana/6/dashboard/Filebeat-logstash-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/kibana/6/dashboard/Filebeat-logstash-slowlog.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-json.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-plain.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-json.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/kibana/6/dashboard/Filebeat-Mongodb-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/dashboard/Filebeat-MySQL-Dashboard.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/search/Filebeat-MySQL-Slow-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/search/Filebeat-MySQL-error-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-Error-logs-levels.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-Slow-logs-by-count.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-Slow-queries-over-time.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-error-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/5/visualization/MySQL-slowest-queries.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/6/dashboard/Filebeat-mysql.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/config/error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/dashboard/Filebeat-Nginx-Dashboard.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/dashboard/ML-Nginx-Access-Remote-IP-Count-Explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/dashboard/ML-Nginx-Remote-IP-URL-Explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/search/Filebeat-Nginx-module.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/search/ML-Filebeat-Nginx-Access.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Errors-over-time.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Map.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Remote-IP-Timechart.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Response-Code-Timechart.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Top-Remote-IPs-Table.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Top-URLs-Table.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/ML-Nginx-Access-Unique-Count-URL-Timechart.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/New-Visualization.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-Browsers.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-Map.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-OSes.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Nginx-Access-Response-codes-by-top-URLs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/5/visualization/Sent-sizes.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/Filebeat-nginx-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/Filebeat-nginx-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/ml-nginx-access-remote-ip-count-explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/6/dashboard/ml-nginx-remote-ip-url-explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/config/nginx-access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/ingest/default.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_low_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_remote_ip_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_remote_ip_url_count.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_response_code.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/datafeed_visitor_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/low_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/remote_ip_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/remote_ip_url_count.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/response_code.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/machine_learning/visitor_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/config/nginx-error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/kibana/6/dashboard/osquery-compliance.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/kibana/6/dashboard/osquery-rootkit.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/config/result.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/kibana/6/dashboard/Filebeat-Postgresql-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/kibana/6/dashboard/Filebeat-Postgresql-slowlogs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/dashboard/7fea2930-478e-11e7-b1f0-cb29bac6bf8b.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/search/0ab87b80-478e-11e7-b1f0-cb29bac6bf8b.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/search/73613570-4791-11e7-be88-2ddb32f3df97.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/visualization/78b9afe0-478f-11e7-b1f0-cb29bac6bf8b.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/visualization/d2864600-478f-11e7-be88-2ddb32f3df97.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/5/visualization/dcccaa80-4791-11e7-be88-2ddb32f3df97.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/6/dashboard/Filebeat-redis.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/277876d0-fa2c-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/5517a150-f9ce-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/dashboard/Filebeat-syslog-dashboard.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/62439dc0-f9c9-11e6-a747-6121780e0414.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/8030c1b0-fa77-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/Syslog-system-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/b6f321e0-fa25-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/search/eb0039f0-fa7f-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/12667040-fa80-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/341ffe70-f9ce-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/346bb290-fa80-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/3cec3eb0-f9d3-11e6-8a3e-2b904044ea1d.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/51164310-fa2b-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/5c7af030-fa2a-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/5dd15c00-fa78-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/78b74f30-f9cd-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/Syslog-events-by-hostname.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/Syslog-hostnames-and-processes.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/d16bb400-f9cc-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/d56ee420-fa79-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/dc589770-fa2b-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/e121b140-fa78-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/5/visualization/f398d2f0-fa77-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-auth-sudo-commands.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-new-users-and-groups.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-ssh-login-attempts.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/6/dashboard/Filebeat-syslog.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/config/auth.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/config/syslog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/dashboard/Filebeat-Traefik-Dashboard.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/dashboard/ML-Traefik-Access-Remote-IP-Count-Explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/dashboard/ML-Traefik-Remote-IP-URL-Explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/search/Filebeat-Traefik-module.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/search/ML-Filebeat-Traefik-Access.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Map.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Remote-IP-Timechart.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Response-Code-Timechart.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Top-Remote-IPs-Table.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Top-URLs-Table.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/ML-Traefik-Access-Unique-Count-URL-Timechart.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/New-Visualization.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Sent-sizes.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-Browsers.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-Map.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-OSes.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/5/visualization/Traefik-Access-Response-codes-by-top-URLs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/6/dashboard/Filebeat-traefik-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/6/dashboard/ml-traefik-access-remote-ip-count-explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/6/dashboard/ml-traefik-remote-ip-url-explorer.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/config/traefik-access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_low_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_remote_ip_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_remote_ip_url_count.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_response_code.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/datafeed_visitor_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/low_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/remote_ip_request_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/remote_ip_url_count.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/response_code.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/machine_learning/visitor_rate.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/Dockerfile.2.4.12
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/httpd.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/dashboard/Metricbeat-Apache-HTTPD-server-status.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/search/Apache-HTTPD.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-CPU.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Hostname-list.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Load1-slash-5-slash-15.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Scoreboard.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Total-accesses-and-kbytes.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Uptime.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/5/visualization/Apache-HTTPD-Workers.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/6/dashboard/Metricbeat-apache-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/configure-node.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/dashboard/Metricbeat-Docker.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/search/Metricbeat-Docker.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-CPU-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-Network-IO.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-Number-of-Containers.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-containers-per-host.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-containers.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-images-and-names.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/5/visualization/Docker-memory-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/6/dashboard/Metricbeat-docker-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/container/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/container/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/container/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/cpu/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/cpu/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/cpu/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/diskio/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/diskio/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/diskio/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/event/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/event/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/event/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/image/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/image/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/image/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/info/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/info/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/info/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/memory/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/memory/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/memory/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/network/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/network/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/network/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/.dockerignore
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/data-xpack.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/envoy.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/leader/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/leader/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/leader/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/self/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/self/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/self/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/store/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/store/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/store/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/dashboard/f2dc7320-f519-11e6-a3c9-9d1f7c42b045.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/58000780-f529-11e6-844d-b170e2f0a07e.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/95388680-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/9a9a8bf0-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/ab226b50-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/b046cb80-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/5/visualization/b59a5200-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/6/dashboard/Metricbeat-golang-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/expvar/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/expvar/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/heap/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/heap/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/heap/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile.1.6
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile.1.7
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/haproxy.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-backend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-frontend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-http-backend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-http-frontend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-http-server.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/6/dashboard/Metricbeat-haproxy-visualizations.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/info/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/info/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/info/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/json/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/json/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/json/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/jolokia.xml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/healthcheck.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/kibana/6/dashboard/Metricbeat-kafka-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/run.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/partition/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/partition/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/partition/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/Dockerfile.kube-state
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/dashboard/022a54c0-2bf5-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/022a54c0-2bf5-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/16fa4470-2bfd-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/174a6ad0-30e0-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/294546b0-30d6-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/408fccf0-30d6-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/44f12b40-2bf4-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/58e644f0-30d6-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/7aac4fd0-30e0-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/a4c9d360-30df-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/cd059410-2bfb-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/d6564360-2bfc-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/da1ff7c0-30ed-11e7-b9e5-2b5b07213ab3.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/5/visualization/e1018b90-2bfb-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/6/dashboard/Metricbeat-kubernetes-apiserver.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/6/dashboard/Metricbeat-kubernetes-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kubeconfig
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/healthcheck.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/dashboard/Metricbeat-MongoDB.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/search/MongoDB-search.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-Concurrent-transactions-Read.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-Concurrent-transactions-Write.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-Engine-ampersand-Version.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-WiredTiger-Cache.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-asserts.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-hosts.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-memory-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/5/visualization/MongoDB-operation-counters.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/6/dashboard/Metricbeat-mongodb-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/munin-node.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/dashboard/66881e90-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/search/67e88e60-0005-11e7-aaf1-b342e4b94bb0.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/0f506420-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/1a99f2b0-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/1eda2280-0008-11e7-82f3-2f380154876c.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/1ede99e0-0009-11e7-8cd4-73b67e9e3f3c.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/45a00c10-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/4c36c420-000a-11e7-8cd4-73b67e9e3f3c.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/a2175300-000a-11e7-b001-85aac4878445.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/5/visualization/e784dc50-0005-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/6/dashboard/Metricbeat-mysql-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/kibana/6/dashboard/metricbeat-nginx-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/nginx.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/php-fpm.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/docker-entrypoint-initdb.d/0-enable-pg_stat_statements.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/docker-entrypoint-initdb.d/1-create-extension-pg_stat_statements.sql
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/database/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/database/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/database/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/dashboard/Metricbeat-Rabbitmq.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/search/Metricbeat-Rabbitmq.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/RabbitMQ-Erlang-Process-Usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/RabbitMQ-Memory-Usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/RabbitMQ-Queue-Index-Operations.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/5/visualization/Rabbitmq-Number-of-Nodes.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/6/dashboard/Metricbeat-rabbitmq-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/dashboard/Metricbeat-Redis.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/search/Metricbeat-Redis.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Clients-Metrics.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Connected-clients.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Keyspaces.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-Server-Versions.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-hosts.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-multiplexing-API.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/5/visualization/Redis-server-mode.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/6/dashboard/Metricbeat-redis-keys.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/6/dashboard/Metricbeat-redis-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/info/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/info/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/info/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/key/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/key/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/key/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/CPU-slash-Memory-per-container.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-cpu.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-filesystem-per-Host.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-filesystem.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-memory.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-network.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-processes.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/Metricbeat-system-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/dashboard/d1f1f9e0-1b1c-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Cpu-Load-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Cpu-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Filesystem-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Fsstats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Load-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Memory-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Network-data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/Process-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/search/System-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/089b85d0-1b16-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/1aae9140-1b93-11e7-8ada-3df93aab833e.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/217025e0-2a69-11e7-99f0-399f2a11b723.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/26732e20-1b91-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/2e224660-1b19-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/4d546850-1b15-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/4e4bb1e0-1b1b-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/522ee670-1b92-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/6b7b9a40-faa1-11e6-86b1-cd7735ff7e23.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/83e12df0-1b91-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/855899e0-1b1c-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/95490a10-1e23-11e7-958f-490b8dcb96d8.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Available-Memory.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/CPU-Usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/CPU-usage-over-time.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/CPU-usage-per-process.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Container-Block-IO.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Container-CPU-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Container-Memory-stats.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-space-distribution.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-space-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-space.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Disk-utilization-over-time.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Free-disk-space-over-days.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/In-vs-Out-Network-Bytes.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Memory-usage-over-time.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Memory-usage-per-process.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Memory-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Network-Bytes.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Network-Packetloss.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Number-of-Pids.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Number-of-processes-over-time.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Number-of-processes.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Packet-loss-on-interfaces.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Servers-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Swap-usage-over-time.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Swap-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-Load-over-time.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-Navigation.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-load.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/System-overview-by-host.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-10-interfaces.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-disks-by-memory-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-hosts-by-CPU-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-hosts-by-disk-size.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-hosts-by-memory-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-processes-by-CPU-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Top-processes-by-memory-usage.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Total-Memory.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/Total-files-over-days.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/aa984970-1e0b-11e7-852e-cdcfcfdffddd.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/ab2d1e90-1b1a-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/bfa5e400-1b16-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/d3166e80-1b91-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/e0f001c0-1b18-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/5/visualization/fe064790-1b1f-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/6/dashboard/Metricbeat-containers-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/6/dashboard/Metricbeat-host-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/6/dashboard/Metricbeat-system-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/core/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/core/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/core/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/cpu/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/cpu/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/cpu/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/diskio/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/diskio/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/diskio/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/filesystem/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/filesystem/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/filesystem/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/fsstat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/fsstat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/fsstat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/load/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/load/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/load/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/memory/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/memory/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/memory/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process_summary/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/raid/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/raid/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/raid/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/traefik.toml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/.dockerignore
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/dashboard/Metricbeat-uWSGI.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/search/Metricbeat-uWSGI-status.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/8c5f96e0-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/a5058e70-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/ac7194b0-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/5/visualization/ba4a80b0-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/6/dashboard/Metricbeat-uwsgi-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/kibana/6/dashboard/metricbeat-windows-service.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/service/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/service/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/service/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/env
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/kibana/6/dashboard/Metricbeat-zookeeper-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/fields.yml
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/0d3f2380-fa78-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/26309570-2419-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/277876d0-fa2c-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/5517a150-f9ce-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/7fea2930-478e-11e7-b1f0-cb29bac6bf8b.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/Filebeat-Apache2-Dashboard.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/Filebeat-MySQL-Dashboard.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/Filebeat-Nginx-Dashboard.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/Filebeat-Traefik-Dashboard.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/Filebeat-syslog-dashboard.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/ML-Nginx-Access-Remote-IP-Count-Explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/ML-Nginx-Remote-IP-URL-Explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/ML-Traefik-Access-Remote-IP-Count-Explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/ML-Traefik-Remote-IP-URL-Explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/b9163ea0-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/dfbb49f0-0a0f-11e7-8a62-2d05eaaac5cb.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/dashboard/f693d260-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/0ab87b80-478e-11e7-b1f0-cb29bac6bf8b.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/4ac0a370-0a11-11e7-8b04-eb22a5669f27.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/62439dc0-f9c9-11e6-a747-6121780e0414.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/710043e0-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/73613570-4791-11e7-be88-2ddb32f3df97.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/8030c1b0-fa77-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Apache2-access-logs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Apache2-errors-log.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Filebeat-MySQL-Slow-log.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Filebeat-MySQL-error-log.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Filebeat-Nginx-module.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Filebeat-Traefik-module.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/ML-Filebeat-Nginx-Access.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/ML-Filebeat-Traefik-Access.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/Syslog-system-logs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/b6f321e0-fa25-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/c876e6a0-2418-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/eb0039f0-fa7f-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/search/ffaf5a30-2413-11e7-a0d9-39604d45ca7f.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/0bc34b60-2419-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/12667040-fa80-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/2bb0fa70-0a11-11e7-9e84-43da493ad0c7.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/2cf77780-2418-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/341ffe70-f9ce-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/346bb290-fa80-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/3cec3eb0-f9d3-11e6-8a3e-2b904044ea1d.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/51164310-fa2b-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/5c7af030-fa2a-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/5dd15c00-fa78-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/5ebdbe50-0a0f-11e7-825f-6748cda7d858.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/6295bdd0-0a0e-11e7-825f-6748cda7d858.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/78b74f30-f9cd-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/78b9afe0-478f-11e7-b1f0-cb29bac6bf8b.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Apache2-access-unique-IPs-map.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Apache2-browsers.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Apache2-error-logs-over-time.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Apache2-operating-systems.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Apache2-response-codes-of-top-URLs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Apache2-response-codes-over-time.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Errors-over-time.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Nginx-Access-Map.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Nginx-Access-Remote-IP-Timechart.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Nginx-Access-Response-Code-Timechart.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Nginx-Access-Top-Remote-IPs-Table.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Nginx-Access-Top-URLs-Table.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Nginx-Access-Unique-Count-URL-Timechart.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Traefik-Access-Map.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Traefik-Access-Remote-IP-Timechart.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Traefik-Access-Response-Code-Timechart.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Traefik-Access-Top-Remote-IPs-Table.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Traefik-Access-Top-URLs-Table.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/ML-Traefik-Access-Unique-Count-URL-Timechart.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/MySQL-Error-logs-levels.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/MySQL-Slow-logs-by-count.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/MySQL-Slow-queries-over-time.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/MySQL-error-logs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/MySQL-slowest-queries.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/New-Visualization.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Nginx-Access-Browsers.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Nginx-Access-Map.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Nginx-Access-OSes.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Nginx-Access-Response-codes-by-top-URLs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Sent-sizes.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Syslog-events-by-hostname.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Syslog-hostnames-and-processes.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Traefik-Access-Browsers.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Traefik-Access-Map.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Traefik-Access-OSes.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/Traefik-Access-Response-codes-by-top-URLs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/a59b5e00-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/c5411910-0a87-11e7-8b04-eb22a5669f27.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/d16bb400-f9cc-11e6-8115-a7c18106d86a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/d1726930-0a7f-11e7-8b04-eb22a5669f27.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/d2864600-478f-11e7-be88-2ddb32f3df97.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/d56ee420-fa79-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/d8e5dc40-2417-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/dc589770-fa2b-11e6-bbd3-29c986c96e5a.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/dcccaa80-4791-11e7-be88-2ddb32f3df97.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/e121b140-fa78-11e6-a1df-a78bd7504d38.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/f398d2f0-fa77-11e6-ae9b-81e5311e8cab.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/5/visualization/fb09d4b0-2418-11e7-a83b-d5f4cebac9ff.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-Kafka-overview.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-Mongodb-overview.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-Postgresql-overview.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-Postgresql-slowlogs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-apache2.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-auditd.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-auth-sudo-commands.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-haproxy-overview.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-icinga-debug-log.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-icinga-main-log.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-icinga-startup-errors.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-iis.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-logstash-log.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-logstash-slowlog.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-mysql.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-new-users-and-groups.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-nginx-logs.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-nginx-overview.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-redis.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-ssh-login-attempts.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-syslog.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/Filebeat-traefik-overview.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/ml-nginx-access-remote-ip-count-explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/ml-nginx-remote-ip-url-explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/ml-traefik-access-remote-ip-count-explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/ml-traefik-remote-ip-url-explorer.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/osquery-compliance.json
+%%FILEBEAT%%/var/db/beats/filebeat/kibana/6/dashboard/osquery-rootkit.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/dashboard/f3e771c0-eb19-11e6-be20-559646f8b9ba.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/search/02014c80-29d2-11e7-a68f-bfaa2341cc52.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/visualization/091c3a90-eb1e-11e6-be20-559646f8b9ba.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/visualization/0f4c0560-eb20-11e6-9f11-159ff202874a.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/visualization/1738dbc0-eb1d-11e6-be20-559646f8b9ba.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/visualization/920e8140-eb1a-11e6-be20-559646f8b9ba.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/5/visualization/c65ef340-eb19-11e6-be20-559646f8b9ba.json
+%%HEARTBEAT%%/var/db/beats/heartbeat/kibana/6/dashboard/Heartbeat-http-monitor.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/022a54c0-2bf5-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/66881e90-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/79ffd6e0-faa0-11e6-947f-177f697178b8.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/CPU-slash-Memory-per-container.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-Apache-HTTPD-server-status.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-Docker.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-MongoDB.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-Rabbitmq.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-Redis.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-cpu.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-filesystem-per-Host.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-filesystem.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-memory.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-network.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-processes.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-system-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/Metricbeat-uWSGI.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/d1f1f9e0-1b1c-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/dashboard/f2dc7320-f519-11e6-a3c9-9d1f7c42b045.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/67e88e60-0005-11e7-aaf1-b342e4b94bb0.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Apache-HTTPD.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Cpu-Load-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Cpu-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Filesystem-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Fsstats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Load-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Memory-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Metricbeat-Docker.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Metricbeat-Rabbitmq.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Metricbeat-Redis.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Metricbeat-uWSGI-status.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/MongoDB-search.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Network-data.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/Process-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/search/System-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/022a54c0-2bf5-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/089b85d0-1b16-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/0f506420-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/16fa4470-2bfd-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/174a6ad0-30e0-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/1a99f2b0-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/1aae9140-1b93-11e7-8ada-3df93aab833e.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/1eda2280-0008-11e7-82f3-2f380154876c.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/1ede99e0-0009-11e7-8cd4-73b67e9e3f3c.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/217025e0-2a69-11e7-99f0-399f2a11b723.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/26732e20-1b91-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/294546b0-30d6-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/2e224660-1b19-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/34f97ee0-1b96-11e7-8ada-3df93aab833e.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/408fccf0-30d6-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/44f12b40-2bf4-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/45a00c10-0006-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/4c36c420-000a-11e7-8cd4-73b67e9e3f3c.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/4d546850-1b15-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/4e4bb1e0-1b1b-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/522ee670-1b92-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/58000780-f529-11e6-844d-b170e2f0a07e.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/58e644f0-30d6-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/6b7b9a40-faa1-11e6-86b1-cd7735ff7e23.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/7aac4fd0-30e0-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/83e12df0-1b91-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/855899e0-1b1c-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/8c5f96e0-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/95388680-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/95490a10-1e23-11e7-958f-490b8dcb96d8.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/9a9a8bf0-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-CPU.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-Hostname-list.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-Load1-slash-5-slash-15.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-Scoreboard.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-Total-accesses-and-kbytes.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-Uptime.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Apache-HTTPD-Workers.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Available-Memory.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/CPU-Usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/CPU-usage-over-time.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/CPU-usage-per-process.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Container-Block-IO.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Container-CPU-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Container-Memory-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Disk-space-distribution.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Disk-space-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Disk-space.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Disk-utilization-over-time.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-CPU-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-Network-IO.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-Number-of-Containers.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-containers-per-host.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-containers.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-images-and-names.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Docker-memory-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Free-disk-space-over-days.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/In-vs-Out-Network-Bytes.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Memory-usage-over-time.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Memory-usage-per-process.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Memory-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-Concurrent-transactions-Read.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-Concurrent-transactions-Write.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-Engine-ampersand-Version.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-WiredTiger-Cache.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-asserts.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-hosts.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-memory-stats.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/MongoDB-operation-counters.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Network-Bytes.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Network-Packetloss.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Number-of-Pids.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Number-of-processes-over-time.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Number-of-processes.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Packet-loss-on-interfaces.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/RabbitMQ-Erlang-Process-Usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/RabbitMQ-Memory-Usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/RabbitMQ-Queue-Index-Operations.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Rabbitmq-Number-of-Nodes.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-Clients-Metrics.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-Connected-clients.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-Keyspaces.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-Server-Versions.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-hosts.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-multiplexing-API.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Redis-server-mode.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Servers-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Swap-usage-over-time.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Swap-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/System-Load-over-time.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/System-Navigation.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/System-load.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/System-overview-by-host.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-10-interfaces.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-disks-by-memory-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-hosts-by-CPU-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-hosts-by-disk-size.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-hosts-by-memory-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-processes-by-CPU-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Top-processes-by-memory-usage.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Total-Memory.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/Total-files-over-days.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/a2175300-000a-11e7-b001-85aac4878445.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/a4c9d360-30df-11e7-8df8-6d3604a72912.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/a5058e70-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/aa984970-1e0b-11e7-852e-cdcfcfdffddd.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/ab226b50-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/ab2d1e90-1b1a-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/ac7194b0-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/b046cb80-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/b59a5200-f52a-11e6-969c-518c48c913e4.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/ba4a80b0-f0ae-11e7-b9ff-9f96241065de.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/bfa5e400-1b16-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/cd059410-2bfb-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/d3166e80-1b91-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/d6564360-2bfc-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/da1ff7c0-30ed-11e7-b9e5-2b5b07213ab3.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/e0f001c0-1b18-11e7-b09e-037021c4f8df.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/e1018b90-2bfb-11e7-859b-f78b612cde28.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/e784dc50-0005-11e7-bf7f-c9acc3d3e306.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/5/visualization/fe064790-1b1f-11e7-bec4-a5e9ec5cab8b.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-apache-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-containers-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-docker-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-golang-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-backend.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-frontend.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-http-backend.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-http-frontend.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-http-server.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-haproxy-visualizations.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-host-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-kafka-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-kubernetes-apiserver.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-kubernetes-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-mongodb-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-mysql-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-rabbitmq-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-redis-keys.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-redis-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-system-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-uwsgi-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/Metricbeat-zookeeper-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/metricbeat-nginx-overview.json
+%%METRICBEAT%%/var/db/beats/metricbeat/kibana/6/dashboard/metricbeat-windows-service.json
+%%METRICBEAT%%@dir %%DATADIR%%/metricbeat/module/kubernetes/util
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana/5/dashboard
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana/5/search
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana/5/visualization
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana/5
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana/6/dashboard
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana/6
+%%FILEBEAT%%@dir /var/db/beats/filebeat/kibana
+%%FILEBEAT%%@dir /var/db/beats/filebeat
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana/5/dashboard
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana/5/search
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana/5/visualization
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana/5
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana/6/dashboard
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana/6
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat/kibana
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana/5/dashboard
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana/5/search
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana/5/visualization
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana/5
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana/6/dashboard
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana/6
+%%METRICBEAT%%@dir /var/db/beats/metricbeat/kibana
+%%METRICBEAT%%@dir /var/db/beats/metricbeat
+@dir /var/db/beats
diff --git a/sysutils/beats7/Makefile b/sysutils/beats7/Makefile
new file mode 100644
index 000000000000..cc1dbedeb090
--- /dev/null
+++ b/sysutils/beats7/Makefile
@@ -0,0 +1,386 @@
+PORTNAME=	beats
+DISTVERSIONPREFIX=	v
+DISTVERSION=	7.10.1
+CATEGORIES=	sysutils
+PKGNAMESUFFIX?=	7
+
+MAINTAINER=	elastic@FreeBSD.org
+COMMENT=	Send logs, network, metrics and heartbeat to elasticsearch or logstash
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/mage:devel/mage
+
+USES=		gmake go:modules
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	elastic
+GH_TUPLE=	Azure:azure-amqp-common-go:v3.0.0:azure_azure_amqp_common_go_v3/vendor/github.com/Azure/azure-amqp-common-go/v3 \
+		Azure:azure-event-hubs-go:v3.1.2:azure_azure_event_hubs_go_v3/vendor/github.com/Azure/azure-event-hubs-go/v3 \
+		Azure:azure-pipeline-go:v0.2.1:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
+		Azure:azure-sdk-for-go:v37.1.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
+		Azure:azure-storage-blob-go:v0.8.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
+		Azure:go-amqp:v0.12.6:azure_go_amqp/vendor/github.com/Azure/go-amqp \
+		Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \
+		Azure:go-autorest:5bd9621f41a0:azure_go_autorest_date \
+		Azure:go-autorest:aff029487b89:azure_go_autorest_adal \
+		Azure:go-autorest:autorest/v0.9.4:azure_go_autorest_autorest \
+		Azure:go-autorest:b965d219bd9d:azure_go_autorest_auth \
+		Azure:go-autorest:cc407fb4f94c:azure_go_autorest_cli \
+		Azure:go-autorest:logger/v0.1.0:azure_go_autorest_logger \
+		Azure:go-autorest:tracing/v0.5.0:azure_go_autorest_tracing \
+		Azure:go-autorest:v12.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
+		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
+		DataDog:zstd:v1.4.1:datadog_zstd/vendor/github.com/DataDog/zstd \
+		Masterminds:semver:v1.4.2:masterminds_semver/vendor/github.com/Masterminds/semver \
+		Microsoft:hcsshim:v0.8.7:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
+		StackExchange:wmi:9f32b5905fd6:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
+		adriansr:fsnotify:c9bbe1f46f1d:adriansr_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		adriansr:gopacket:dd62abfa8a41:adriansr_gopacket/vendor/github.com/google/gopacket \
+		aerospike:aerospike-client-go:0f3b54da6bdc:aerospike_aerospike_client_go/vendor/github.com/aerospike/aerospike-client-go \
+		akavel:rsrc:v0.8.0:akavel_rsrc/vendor/github.com/akavel/rsrc \
+		andrewkroh:goja:dd2ac4456e20:andrewkroh_goja/vendor/github.com/dop251/goja \
+		andrewkroh:sys:287798fe3e43:andrewkroh_sys/vendor/github.com/andrewkroh/sys \
+		antlr:antlr4:be881fa6b91d:antlr_antlr4/vendor/github.com/antlr/antlr4 \
+		apoydence:eachers:23942921fe77:apoydence_eachers/vendor/github.com/apoydence/eachers \
+		armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
+		armon:go-socks5:e75332964ef5:armon_go_socks5/vendor/github.com/armon/go-socks5 \
+		aws:aws-lambda-go:v1.6.0:aws_aws_lambda_go/vendor/github.com/aws/aws-lambda-go \
+		aws:aws-sdk-go-v2:v0.9.0:aws_aws_sdk_go_v2/vendor/github.com/aws/aws-sdk-go-v2 \
+		awslabs:goformation:v4.1.0:awslabs_goformation_v4/vendor/github.com/awslabs/goformation/v4 \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		bi-zone:go-winio:v0.4.15:bi_zone_go_winio/vendor/github.com/Microsoft/go-winio \
+		blakerouse:service:057808572ffa:blakerouse_service/vendor/github.com/kardianos/service \
+		blakesmith:ar:8bd4349a67f2:blakesmith_ar/vendor/github.com/blakesmith/ar \
+		bradleyfalzon:ghinstallation:v1.1.0:bradleyfalzon_ghinstallation/vendor/github.com/bradleyfalzon/ghinstallation \
+		bsm:sarama-cluster:7e67d87a6b3f:bsm_sarama_cluster/vendor/github.com/bsm/sarama-cluster \
+		cavaliercoder:badio:ce5280129e9e:cavaliercoder_badio/vendor/github.com/cavaliercoder/badio \
+		cavaliercoder:go-rpm:7a9c54e3d83e:cavaliercoder_go_rpm/vendor/github.com/cavaliercoder/go-rpm \
+		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
+		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
+		cloudfoundry-community:go-cfclient:35bcce23fc5f:cloudfoundry_community_go_cfclient/vendor/github.com/cloudfoundry-community/go-cfclient \
+		cloudfoundry-incubator:rfc5424:236a6d29298a:cloudfoundry_incubator_rfc5424/vendor/code.cloudfoundry.org/rfc5424 \
+		cloudfoundry:go-diodes:f77fb823c7ee:cloudfoundry_go_diodes/vendor/code.cloudfoundry.org/go-diodes \
+		cloudfoundry:go-loggregator:v7.4.0:cloudfoundry_go_loggregator/vendor/code.cloudfoundry.org/go-loggregator \
+		cloudfoundry:gofileutils:4d0c80011a0f:cloudfoundry_gofileutils/vendor/code.cloudfoundry.org/gofileutils \
+		cloudfoundry:noaa:v2.1.0:cloudfoundry_noaa/vendor/github.com/cloudfoundry/noaa \
+		cloudfoundry:sonde-go:b33733203bb4:cloudfoundry_sonde_go/vendor/github.com/cloudfoundry/sonde-go \
+		containerd:containerd:v1.3.3:containerd_containerd/vendor/github.com/containerd/containerd \
+		containerd:continuity:26c1120b8d41:containerd_continuity/vendor/github.com/containerd/continuity \
+		containerd:fifo:bda0ff6ed73c:containerd_fifo/vendor/github.com/containerd/fifo \
+		coreos:go-systemd:v22.0.0:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
+		coreos:pkg:97fdf19511ea:coreos_pkg/vendor/github.com/coreos/pkg \
+		cucumber:godog:v0.8.1:cucumber_godog/vendor/github.com/cucumber/godog \
+		cyphar:filepath-securejoin:v0.2.2:cyphar_filepath_securejoin/vendor/github.com/cyphar/filepath-securejoin \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		davecgh:go-xdr:e6a2ba005892:davecgh_go_xdr/vendor/github.com/davecgh/go-xdr \
+		denisenkom:go-mssqldb:bbfc9a55622e:denisenkom_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \
+		devigned:tab:0c15cf42f9a2:devigned_tab/vendor/github.com/devigned/tab \
+		dgraph-io:badger:f5a7e0a1c83b:dgraph_io_badger_v2/vendor/github.com/dgraph-io/badger/v2 \
+		dgraph-io:ristretto:f66de99634de:dgraph_io_ristretto/vendor/github.com/dgraph-io/ristretto \
+		dgrijalva:jwt-go:5e25c22bd5d6:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
+		dgryski:go-farm:6a90982ecee2:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
+		digitalocean:go-libvirt:6075ea3c39a1:digitalocean_go_libvirt/vendor/github.com/digitalocean/go-libvirt \
+		dimchansky:utfbom:v1.1.0:dimchansky_utfbom/vendor/github.com/dimchansky/utfbom \
+		dlclark:regexp2:7632a260cbaf:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
+		docker:distribution:v2.7.1:docker_distribution/vendor/github.com/docker/distribution \
+		docker:engine:ea84732a7725:docker_engine/vendor/github.com/docker/docker \
+		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
+		docker:go-metrics:v0.0.1:docker_go_metrics/vendor/github.com/docker/go-metrics \
+		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
+		docker:spdystream:449fdfce4d96:docker_spdystream/vendor/github.com/docker/spdystream \
+		dominikh:go-tools:v0.0.1-2019.2.3:dominikh_go_tools/vendor/honnef.co/go/tools \
+		dop251:goja_nodejs:adff31b136e6:dop251_goja_nodejs/vendor/github.com/dop251/goja_nodejs \
+		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
+		eapache:go-resiliency:v1.2.0:eapache_go_resiliency/vendor/github.com/eapache/go-resiliency \
+		eapache:go-xerial-snappy:776d5712da21:eapache_go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \
+		eapache:queue:v1.1.0:eapache_queue/vendor/github.com/eapache/queue \
+		eclipse:paho.mqtt.golang:0d940dd29fd2:eclipse_paho_mqtt_golang/vendor/github.com/eclipse/paho.mqtt.golang \
+		elastic:apm-agent-go:v1.9.0:elastic_apm_agent_go \
+		elastic:dhcp:57ec251c7eb3:elastic_dhcp/vendor/github.com/insomniacslk/dhcp \
+		elastic:ecs-logging-go-zap:v0.3.0:elastic_ecs_logging_go_zap/vendor/go.elastic.co/ecszap \
+		elastic:ecs:v1.6.0:elastic_ecs/vendor/github.com/elastic/ecs \
+		elastic:elastic-agent-client:d43b7ad5833a:elastic_elastic_agent_client_v7/vendor/github.com/elastic/elastic-agent-client/v7 \
+		elastic:fsevents:e1d381a4d270:elastic_fsevents/vendor/github.com/fsnotify/fsevents \
+		elastic:go-concert:v0.0.4:elastic_go_concert/vendor/github.com/elastic/go-concert \
+		elastic:go-fastjson:v1.1.0:elastic_go_fastjson/vendor/go.elastic.co/fastjson \
+		elastic:go-libaudit:v2.0.2:elastic_go_libaudit_v2/vendor/github.com/elastic/go-libaudit/v2 \
+		elastic:go-licence-detector:v0.4.0:elastic_go_licence_detector/vendor/go.elastic.co/go-licence-detector \
+		elastic:go-licenser:v0.3.1:elastic_go_licenser/vendor/github.com/elastic/go-licenser \
+		elastic:go-lookslike:v0.3.0:elastic_go_lookslike/vendor/github.com/elastic/go-lookslike \
+		elastic:go-lumber:v0.1.0:elastic_go_lumber/vendor/github.com/elastic/go-lumber \
+		elastic:go-perf:9c656876f595:elastic_go_perf/vendor/github.com/elastic/go-perf \
+		elastic:go-plugins-helpers:bdf17607b79f:elastic_go_plugins_helpers/vendor/github.com/docker/go-plugins-helpers \
+		elastic:go-seccomp-bpf:v1.1.0:elastic_go_seccomp_bpf/vendor/github.com/elastic/go-seccomp-bpf \
+		elastic:go-structform:v0.0.7:elastic_go_structform/vendor/github.com/elastic/go-structform \
+		elastic:go-sysinfo:v1.3.0:elastic_go_sysinfo/vendor/github.com/elastic/go-sysinfo \
+		elastic:go-txfile:v0.0.7:elastic_go_txfile/vendor/github.com/elastic/go-txfile \
+		elastic:go-ucfg:v0.8.3:elastic_go_ucfg/vendor/github.com/elastic/go-ucfg \
+		elastic:go-windows:v1.0.1:elastic_go_windows/vendor/github.com/elastic/go-windows \
+		elastic:gosigar:f115143bb233:elastic_gosigar/vendor/github.com/elastic/gosigar \
+		elastic:sarama:0e7b69039eec:elastic_sarama/vendor/github.com/Shopify/sarama \
+		etcd-io:bbolt:v1.3.4:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		evanphx:json-patch:v4.2.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
+		fatih:color:v1.5.0:fatih_color/vendor/github.com/fatih/color \
+		garyburd:redigo:b8dc90050f24:garyburd_redigo/vendor/github.com/garyburd/redigo \
+		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
+		go-mgo:mgo:3f83fa500528:go_mgo_mgo/vendor/gopkg.in/mgo.v2 \
+		go-ole:go-ole:14974a1cf647:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
+		go-sourcemap:sourcemap:v2.1.2:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \
+		go-sql-driver:mysql:v1.4.1:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
+		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gobuffalo:here:v0.6.0:gobuffalo_here/vendor/github.com/gobuffalo/here \
+		gocarina:gocsv:ffef3ffc77be:gocarina_gocsv/vendor/github.com/gocarina/gocsv \
+		godbus:dbus:ade71ed3457e:godbus_dbus/vendor/github.com/godbus/dbus \
+		godbus:dbus:v5.0.3:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
+		godror:godror:v0.10.4:godror_godror/vendor/github.com/godror/godror \
+		gofrs:flock:5135e617513b:gofrs_flock/vendor/github.com/gofrs/flock \
+		gofrs:uuid:v3.3.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang-sql:civil:cb61b32ac6fe:golang_sql_civil/vendor/github.com/golang-sql/civil \
+		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:06a226fb4e37:golang_crypto/vendor/golang.org/x/crypto \
+		golang:exp:da58074b4299:golang_exp/vendor/golang.org/x/exp \
+		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:lint:910be7a94367:golang_lint/vendor/golang.org/x/lint \
+		golang:mod:v0.3.0:golang_mod/vendor/golang.org/x/mod \
+		golang:net:16171245cfb2:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
+		golang:sync:43a5402ce75a:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:ddb9806d33ae:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		golang:tools:c00d67ef29d0:golang_tools/vendor/golang.org/x/tools \
+		golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
+		google:flatbuffers:7a6b2bf521e9:google_flatbuffers/vendor/github.com/google/flatbuffers \
+		google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-genproto:f3c370f40bfb:google_go_genproto/vendor/google.golang.org/genproto \
+		google:go-github:v28.1.1:google_go_github_v28/vendor/github.com/google/go-github/v28 \
+		google:go-github:v29.0.2:google_go_github_v29/vendor/github.com/google/go-github/v29 \
+		google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \
+		google:gofuzz:v1.1.0:google_gofuzz/vendor/github.com/google/gofuzz \
+		google:licenseclassifier:879cb1424de0:google_licenseclassifier/vendor/github.com/google/licenseclassifier \
+		google:uuid:c2e93f3ae59f:google_uuid/vendor/github.com/google/uuid \
+		googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
+		googleapis:gnostic:25d8b0b66985:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+		googleapis:google-cloud-go:bigquery/v1.0.1:googleapis_google_cloud_go_bigquery \
+		googleapis:google-cloud-go:datastore/v1.0.0:googleapis_google_cloud_go_datastore \
+		googleapis:google-cloud-go:pubsub/v1.0.1:googleapis_google_cloud_go_pubsub \
+		googleapis:google-cloud-go:storage/v1.0.0:googleapis_google_cloud_go_storage \
+		googleapis:google-cloud-go:v0.51.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+		gorhill:cronexpr:d520615e531a:gorhill_cronexpr/vendor/github.com/gorhill/cronexpr \
+		gorilla:mux:v1.7.2:gorilla_mux/vendor/github.com/gorilla/mux \
+		gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \
+		gotestyourself:gotest.tools:v2.2.0:gotestyourself_gotest_tools/vendor/gotest.tools \
+		grpc-ecosystem:grpc-gateway:v1.13.0:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
+		grpc:grpc-go:v1.29.1:grpc_grpc_go/vendor/google.golang.org/grpc \
+		h2non:filetype:v1.0.12:h2non_filetype/vendor/github.com/h2non/filetype \
+		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
+		hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
+		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
+		hashicorp:go-retryablehttp:v0.6.6:hashicorp_go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \
+		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
+		hashicorp:go-version:v1.0.0:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
+		hashicorp:golang-lru:59383c442f7d:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		haya14busa:go-actions-toolkit:ca0307860f01:haya14busa_go_actions_toolkit/vendor/github.com/haya14busa/go-actions-toolkit \
+		hectane:go-acl:da78bae5fc95:hectane_go_acl/vendor/github.com/hectane/go-acl \
+		imdario:mergo:v0.3.6:imdario_mergo/vendor/github.com/imdario/mergo \
+		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
+		jcmturner:aescts:v1.0.1:jcmturner_aescts/vendor/gopkg.in/jcmturner/aescts.v1 \
+		jcmturner:dnsutils:v1.0.1:jcmturner_dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \
+		jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \
+		jcmturner:goidentity:v3.0.0:jcmturner_goidentity/vendor/gopkg.in/jcmturner/goidentity.v3 \
+		jcmturner:gokrb5:v7.5.0:jcmturner_gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v7 \
+		jcmturner:rpc:v1.1.0:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v1 \
+		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
+		jmoiron:sqlx:d7d95172beb5:jmoiron_sqlx/vendor/github.com/jmoiron/sqlx \
+		joeshaw:multierror:69b34d4ec901:joeshaw_multierror/vendor/github.com/joeshaw/multierror \
+		josephspurrier:goversioninfo:14b0ab84c6ca:josephspurrier_goversioninfo/vendor/github.com/josephspurrier/goversioninfo \
+		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
+		json-iterator:go:v1.1.8:json_iterator_go/vendor/github.com/json-iterator/go \
+		jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
+		karrick:godirwalk:v1.15.6:karrick_godirwalk/vendor/github.com/karrick/godirwalk \
+		klauspost:compress:v1.9.8:klauspost_compress/vendor/github.com/klauspost/compress \
+		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		kubernetes-sigs:structured-merge-diff:v3.0.0:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff/v3 \
+		kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
+		kubernetes:api:v0.18.3:kubernetes_api/vendor/k8s.io/api \
+		kubernetes:apimachinery:v0.18.3:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
+		kubernetes:client-go:v0.18.3:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:klog:v1.0.0:kubernetes_klog/vendor/k8s.io/klog \
+		kubernetes:kube-openapi:61e04a5be9a6:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
+		kubernetes:utils:a9aa75ae1b89:kubernetes_utils/vendor/k8s.io/utils \
+		leighmcculloch:embedfiles:995e0740726f:leighmcculloch_embedfiles/vendor/4d63.com/embedfiles \
+		leighmcculloch:go-tz:6d37baae851b:leighmcculloch_go_tz/vendor/4d63.com/tz \
+		lib:pq:2ff3cb3adc01:lib_pq/vendor/github.com/lib/pq \
+		magefile:mage:v1.10.0:magefile_mage/vendor/github.com/magefile/mage \
+		mailru:easyjson:v0.7.1:mailru_easyjson/vendor/github.com/mailru/easyjson \
+		markbates:pkger:v0.17.0:markbates_pkger/vendor/github.com/markbates/pkger \
+		mattn:go-colorable:v0.0.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-ieproxy:7c0f6868bffe:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
+		mattn:go-isatty:v0.0.2:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-shellwords:v1.0.7:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \
+		matttproud:golang_protobuf_extensions:c182affec369:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		miekg:dns:v1.1.15:miekg_dns/vendor/github.com/miekg/dns \
+		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
+		mitchellh:gox:v1.0.1:mitchellh_gox/vendor/github.com/mitchellh/gox \
+		mitchellh:hashstructure:ab25296c0f51:mitchellh_hashstructure/vendor/github.com/mitchellh/hashstructure \
+		mitchellh:iochan:v1.0.0:mitchellh_iochan/vendor/github.com/mitchellh/iochan \
+		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
+		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
+		morikuni:aec:v1.0.0:morikuni_aec/vendor/github.com/morikuni/aec \
+		oklog:ulid:v1.3.1:oklog_ulid/vendor/github.com/oklog/ulid \
+		opencontainers:go-digest:ac19fd6e7483:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
+		opencontainers:image-spec:775207bd45b6:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
+		opencontainers:runc:v1.0.0-rc9:opencontainers_runc/vendor/github.com/opencontainers/runc \
+		otiai10:copy:v1.2.0:otiai10_copy/vendor/github.com/otiai10/copy \
+		pierrec:lz4:v2.4.1:pierrec_lz4/vendor/github.com/pierrec/lz4 \
+		pierrre:gotestcover:924dca7d15f0:pierrre_gotestcover/vendor/github.com/pierrre/gotestcover \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		poy:eachers:23942921fe77:poy_eachers \
+		prometheus:client_golang:20428fa0bffc:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.7.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.0.11:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		prometheus:prometheus:v2.5.0:prometheus_prometheus/vendor/github.com/prometheus/prometheus \
+		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		rcrowley:go-metrics:cac0b30c2563:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \
+		reviewdog:errorformat:8983be9bc7dd:reviewdog_errorformat/vendor/github.com/reviewdog/errorformat \
+		reviewdog:reviewdog:v0.9.17:reviewdog_reviewdog/vendor/github.com/reviewdog/reviewdog \
+		samuel:go-parser:ca8abbf65d0e:samuel_go_parser/vendor/github.com/samuel/go-parser \
+		samuel:go-thrift:2187045faa54:samuel_go_thrift/vendor/github.com/samuel/go-thrift \
+		sanathkr:go-yaml:ed9d249f429b:sanathkr_go_yaml/vendor/github.com/sanathkr/go-yaml \
+		sanathkr:yaml:0056894fa522:sanathkr_yaml/vendor/github.com/sanathkr/yaml \
+		santhosh-tekuri:jsonschema:v1.2.4:santhosh_tekuri_jsonschema/vendor/github.com/santhosh-tekuri/jsonschema \
+		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
+		sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
+		shirou:gopsutil:v2.20.9:shirou_gopsutil/vendor/github.com/shirou/gopsutil \
+		shopspring:decimal:v1.2.0:shopspring_decimal/vendor/github.com/shopspring/decimal \
+		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		spf13:cobra:v0.0.5:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
+		tsg:go-daemon:e704b93fd89b:tsg_go_daemon/vendor/github.com/tsg/go-daemon \
+		tsg:gopacket:2ab8e397a786:tsg_gopacket/vendor/github.com/tsg/gopacket \
+		uber-go:atomic:v1.5.0:uber_go_atomic/vendor/go.uber.org/atomic \
+		uber-go:multierr:v1.3.0:uber_go_multierr/vendor/go.uber.org/multierr \
+		uber-go:tools:2cfd321de3ee:uber_go_tools/vendor/go.uber.org/tools \
+		uber-go:zap:v1.14.0:uber_go_zap/vendor/go.uber.org/zap \
+		ugorji:go:v1.1.8:ugorji_go_codec/vendor/github.com/ugorji/go \
+		urso:diag:21b3cc8eb797:urso_diag/vendor/github.com/urso/diag \
+		urso:go-bin:781c575c9f0e:urso_go_bin/vendor/github.com/urso/go-bin \
+		urso:magetools:290c89e0c230:urso_magetools/vendor/github.com/urso/magetools \
+		urso:sderr:c2a16f3d43ec:urso_sderr/vendor/github.com/urso/sderr \
+		vmware:govmomi:2cad15190b41:vmware_govmomi/vendor/github.com/vmware/govmomi \
+		xanzy:go-gitlab:v0.22.3:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab \
+		yuin:gopher-lua:b402f3114ec7:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua
+
+USE_GITLAB=	nodefault
+GL_TUPLE=	https://gitlab.howett.net:go:plist:591f970eefbbeb04d7b37f334a0c4c3256e32876:go_plist/vendor/howett.net/plist
+
+USE_RC_SUBR=	${GO_TARGETS}
+
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+CGO_CFLAGS=	-I.
+CGO_LDFLAGS=	-L.
+_FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
+MAKE_ENV+=	GOBUILD_FLAGS="-mod=vendor"
+
+CONFLICTS=	beats6*
+
+OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
+OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
+OPTIONS_SUB=		yes
+
+AUDITBEAT_DESC=		Auditbeat
+FILEBEAT_DESC=		Filebeat
+HEARTBEAT_DESC=		Heartbeat
+METRICBEAT_DESC=	Metricbeat
+PACKETBEAT_DESC=	Packetbeat
+AUDITBEAT_VARS=		GO_TARGETS+=auditbeat
+FILEBEAT_VARS=		GO_TARGETS+=filebeat
+HEARTBEAT_VARS=		GO_TARGETS+=heartbeat
+METRICBEAT_VARS=	GO_TARGETS+=metricbeat
+PACKETBEAT_VARS=	CGO_CFLAGS+=-I/usr/include \
+			CGO_LDFLAGS+=-L/usr/lib \
+			GO_TARGETS+=packetbeat
+
+.include <bsd.port.options.mk>
+
+post-extract:
+	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/bigquery
+	@${RLN} ${WRKSRC_googleapis_google_cloud_go_bigquery}/bigquery ${WRKSRC}/vendor/cloud.google.com/go/bigquery
+	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/datastore
+	@${RLN} ${WRKSRC_googleapis_google_cloud_go_datastore}/datastore ${WRKSRC}/vendor/cloud.google.com/go/datastore
+	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/pubsub
+	@${RLN} ${WRKSRC_googleapis_google_cloud_go_pubsub}/pubsub ${WRKSRC}/vendor/cloud.google.com/go/pubsub
+	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage
+	@${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/storage
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
+	@${RLN} ${WRKSRC_azure_go_autorest_autorest}/autorest ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
+	@${RLN} ${WRKSRC_azure_go_autorest_adal}/autorest/adal ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/auth
+	@${RLN} ${WRKSRC_azure_go_autorest_auth}/autorest/azure/auth ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/auth
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/cli
+	@${RLN} ${WRKSRC_azure_go_autorest_cli}/autorest/azure/cli ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/azure/cli
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date
+	@${RLN} ${WRKSRC_azure_go_autorest_date}/autorest/date ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/date
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
+	@${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
+	@${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
+	@${MKDIR} ${WRKSRC}/vendor/github.com/poy
+	@${RLN} ${WRKSRC_apoydence_eachers} ${WRKSRC}/vendor/github.com/poy/eachers
+	@${RLN} ${WRKSRC_elastic_apm_agent_go} ${WRKSRC}/vendor/go.elastic.co/apm
+
+post-patch:
+	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${PORTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
+
+do-build:
+.for GO_TARGET in ${GO_TARGETS}
+	(cd ${GO_WRKSRC}/${GO_TARGET}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${LOCALBASE}/bin/mage build)
+.endfor
+
+do-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+.for BEATMOD in ${GO_TARGETS}
+	${MKDIR} ${STAGEDIR}/var/db/beats/${BEATMOD}
+	${INSTALL_PROGRAM} ${GO_WRKSRC}/${BEATMOD}/${BEATMOD} \
+		${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.yml \
+		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.sample
+	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.reference.yml \
+		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference
+	(KIBANA_PATH=${STAGEDIR}${DATADIR}/${BEATMOD}/kibana; \
+		${MKDIR} $${KIBANA_PATH}; \
+		DASHBOARD_FIND_ARGS="-path */_meta/kibana -type d"; \
+		DASHBOARD_PATHS=$$(${SETENV} ${FIND} ${WRKSRC}/${BEATMOD} $${DASHBOARD_FIND_ARGS}); \
+		for DASHBOARD_PATH in $${DASHBOARD_PATHS}; \
+		do \
+			(cd $${DASHBOARD_PATH} && ${COPYTREE_SHARE} . $${KIBANA_PATH}); \
+		done)
+.endfor
+.for BEATMOD in filebeat metricbeat
+.if !empty(GO_TARGETS:M${BEATMOD})
+	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
+	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${_FIND_ARGS})
+	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
+.endif
+.endfor
+.for BEATMOD in auditbeat
+.if !empty(GO_TARGETS:M${BEATMOD})
+	${MKDIR} ${STAGEDIR}${DATADIR}/${BEATMOD}/module
+	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${_FIND_ARGS})
+.endif
+.endfor
+
+.include <bsd.port.mk>
diff --git a/sysutils/beats7/distinfo b/sysutils/beats7/distinfo
new file mode 100644
index 000000000000..d08c2c61e888
--- /dev/null
+++ b/sysutils/beats7/distinfo
@@ -0,0 +1,539 @@
+TIMESTAMP = 1617892435
+SHA256 (elastic-beats-v7.10.1_GH0.tar.gz) = b76691ab8297034d8fd6578bef148a46389f88bb27d819c5d4348b7fec6351c2
+SIZE (elastic-beats-v7.10.1_GH0.tar.gz) = 87464835
+SHA256 (Azure-azure-amqp-common-go-v3.0.0_GH0.tar.gz) = f498d230bba298dbd42d3d904a7d174ad5a5ec2794bdcb2d26467137235dfb9a
+SIZE (Azure-azure-amqp-common-go-v3.0.0_GH0.tar.gz) = 17018
+SHA256 (Azure-azure-event-hubs-go-v3.1.2_GH0.tar.gz) = 3235c3f8c097f4e63d0e051bdf939ac33231d651faa5822632b8a8594adb5ddd
+SIZE (Azure-azure-event-hubs-go-v3.1.2_GH0.tar.gz) = 112187
+SHA256 (Azure-azure-pipeline-go-v0.2.1_GH0.tar.gz) = 97738fe9fe1c5bab41b89fc97cef08537e53cd3f38f5686e3853d2aecb20133d
+SIZE (Azure-azure-pipeline-go-v0.2.1_GH0.tar.gz) = 16378
+SHA256 (Azure-azure-sdk-for-go-v37.1.0_GH0.tar.gz) = 1bae75bc54dece4e8bc7087928ea3b8b7b4cef3a44ebc1148636a44806479af7
+SIZE (Azure-azure-sdk-for-go-v37.1.0_GH0.tar.gz) = 20210433
+SHA256 (Azure-azure-storage-blob-go-v0.8.0_GH0.tar.gz) = e50db03bc05b952159e0a1d393c841c217c3aecd6ce745f8b9c42fd498e476c7
+SIZE (Azure-azure-storage-blob-go-v0.8.0_GH0.tar.gz) = 174822
+SHA256 (Azure-go-amqp-v0.12.6_GH0.tar.gz) = f8598280c68c60c57f9249af2cecf788048bb07bc97fbbe982867c180bad7136
+SIZE (Azure-go-amqp-v0.12.6_GH0.tar.gz) = 396804
+SHA256 (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = ee1ebe2efef498be1c558bf71e143289db2d21e2d42592503ad2d4a989006821
+SIZE (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = 20946
+SHA256 (Azure-go-autorest-5bd9621f41a0_GH0.tar.gz) = 1cd0fa3f623475cd94daf16fff33e873d6a8191de89b1306008744fbf78f892b
+SIZE (Azure-go-autorest-5bd9621f41a0_GH0.tar.gz) = 156993
+SHA256 (Azure-go-autorest-aff029487b89_GH0.tar.gz) = cf99b6939d320afaa59115f70154bb989f64fc0ee62acf7ef5c1dbfe96be0647
+SIZE (Azure-go-autorest-aff029487b89_GH0.tar.gz) = 165356
+SHA256 (Azure-go-autorest-autorest-v0.9.4_GH0.tar.gz) = c61eef40e07af7ce8d2181fe93bc98c796cbe01d9126be50ab6fa949b3cb3943
+SIZE (Azure-go-autorest-autorest-v0.9.4_GH0.tar.gz) = 165546
+SHA256 (Azure-go-autorest-b965d219bd9d_GH0.tar.gz) = 51108622e85d3acb59d5ecedda0ecf835ddb8fa7aca8a39a52d6bd3ac5a0f2b4
+SIZE (Azure-go-autorest-b965d219bd9d_GH0.tar.gz) = 165544
+SHA256 (Azure-go-autorest-cc407fb4f94c_GH0.tar.gz) = 932b806389a390161ec7bf5651088726b11a9d3abe1debb02999ef4514aadcf6
+SIZE (Azure-go-autorest-cc407fb4f94c_GH0.tar.gz) = 164625
+SHA256 (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = d642ed3d87f3dc9fcde6c7ff7b82a3b3463b70f6ff2d5a7c6c37099d754c464e
+SIZE (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = 141423
+SHA256 (Azure-go-autorest-tracing-v0.5.0_GH0.tar.gz) = af322c3ccc73be318dddafd20f43baaa4be95dc58312f8d781cca29931cfa02f
+SIZE (Azure-go-autorest-tracing-v0.5.0_GH0.tar.gz) = 181045
+SHA256 (Azure-go-autorest-v12.2.0_GH0.tar.gz) = de9882aef87762981c13b03bc9fff092b5fb8c97a464ad65518b6cde3e347e7a
+SIZE (Azure-go-autorest-v12.2.0_GH0.tar.gz) = 173266
+SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
+SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
+SHA256 (DataDog-zstd-v1.4.1_GH0.tar.gz) = 48c0ad82d9bc66d77ca95aa47374bed6b6466510da66a2b2f9215cb239cb8137
+SIZE (DataDog-zstd-v1.4.1_GH0.tar.gz) = 498749
+SHA256 (Masterminds-semver-v1.4.2_GH0.tar.gz) = 13532037b53099292eca94fffba355f2399284b5f7b5c9cb7d9d4fce760336dd
+SIZE (Masterminds-semver-v1.4.2_GH0.tar.gz) = 15901
+SHA256 (Microsoft-hcsshim-v0.8.7_GH0.tar.gz) = 21ba15424d314563a8e4f5593b1569510e0e576b7b2d726501fac0ccfb9d1440
+SIZE (Microsoft-hcsshim-v0.8.7_GH0.tar.gz) = 3402184
+SHA256 (StackExchange-wmi-9f32b5905fd6_GH0.tar.gz) = 94655fdda257b6ff72f12b1332f0082a2804154730a1e1c12d03b36b0e28a285
+SIZE (StackExchange-wmi-9f32b5905fd6_GH0.tar.gz) = 11099
+SHA256 (adriansr-fsnotify-c9bbe1f46f1d_GH0.tar.gz) = b5797425a8c932bd8eeb4a42f6ca6f1be88f29247c26dbe35ae0ccc026a3879d
+SIZE (adriansr-fsnotify-c9bbe1f46f1d_GH0.tar.gz) = 31333
+SHA256 (adriansr-gopacket-dd62abfa8a41_GH0.tar.gz) = 03acd371d029dc84e7d3d5dfb342c3112823b588647b3db990f52055e625cf37
+SIZE (adriansr-gopacket-dd62abfa8a41_GH0.tar.gz) = 921229
+SHA256 (aerospike-aerospike-client-go-0f3b54da6bdc_GH0.tar.gz) = 4dd116aa072c8d818d4b5972615b0bcdf1bf347ede2a5e111a7bf824e10129d8
+SIZE (aerospike-aerospike-client-go-0f3b54da6bdc_GH0.tar.gz) = 230578
+SHA256 (akavel-rsrc-v0.8.0_GH0.tar.gz) = b12d41b1eaf7e9342ac722d9f96f4a5b82d31fb5819d39f1f8dbe81439e987c1
+SIZE (akavel-rsrc-v0.8.0_GH0.tar.gz) = 11150
+SHA256 (andrewkroh-goja-dd2ac4456e20_GH0.tar.gz) = 92cac0b6e79fb769b1f4adddb3b218dc78368282f6d554b0cba7de407123c22c
+SIZE (andrewkroh-goja-dd2ac4456e20_GH0.tar.gz) = 168845
+SHA256 (andrewkroh-sys-287798fe3e43_GH0.tar.gz) = ac5f5fc000304e7dde8e737b65a236dd7807ecf779d4c9597d69954194369edf
+SIZE (andrewkroh-sys-287798fe3e43_GH0.tar.gz) = 539225
+SHA256 (antlr-antlr4-be881fa6b91d_GH0.tar.gz) = c447506a4f13d1e684efcba5a03a1e2da0add1313372a69e3ef1cbc85da3b6f4
+SIZE (antlr-antlr4-be881fa6b91d_GH0.tar.gz) = 4494764
+SHA256 (apoydence-eachers-23942921fe77_GH0.tar.gz) = 061643187b3d6ec51031b0fb5258fa710ad958a2fa39a93a8351302dd340576a
+SIZE (apoydence-eachers-23942921fe77_GH0.tar.gz) = 5853
+SHA256 (armon-go-radix-v1.0.0_GH0.tar.gz) = 9e5238a553708bccf930d1f9d0ce62ce30d92602b64ea248585ce06ec7bfee17
+SIZE (armon-go-radix-v1.0.0_GH0.tar.gz) = 5975
+SHA256 (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 37f9cad3e321c452ea54824021ecd5b6ef4222c68b25f9c8a66a0c6d8411437e
+SIZE (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 8586
+SHA256 (aws-aws-lambda-go-v1.6.0_GH0.tar.gz) = aaf177ea73b32a6b10fb7d20a74381a6b32049a06c696ca8452a14fa87b87881
+SIZE (aws-aws-lambda-go-v1.6.0_GH0.tar.gz) = 51271
+SHA256 (aws-aws-sdk-go-v2-v0.9.0_GH0.tar.gz) = 874ccb29f51dff095297daabfd02dc71cd15592525df11877430513a5cfb7d42
+SIZE (aws-aws-sdk-go-v2-v0.9.0_GH0.tar.gz) = 9959914
+SHA256 (awslabs-goformation-v4.1.0_GH0.tar.gz) = 0089b96bee355cca0d0745a35e476beca32a51fc093694b49689f345ca5d50ad
+SIZE (awslabs-goformation-v4.1.0_GH0.tar.gz) = 2703139
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (bi-zone-go-winio-v0.4.15_GH0.tar.gz) = 8243698dbdbc739d859a187f4fad0a2897b2b5ce29bd26a193ddb1c8f83eac61
+SIZE (bi-zone-go-winio-v0.4.15_GH0.tar.gz) = 120126
+SHA256 (blakerouse-service-057808572ffa_GH0.tar.gz) = ce3352c4fb6ed83d9c20c9395a24d2fa1d1bd7feb2168caed30b5f4c384606af
+SIZE (blakerouse-service-057808572ffa_GH0.tar.gz) = 24456
+SHA256 (blakesmith-ar-8bd4349a67f2_GH0.tar.gz) = 51d0ca71a5f31d283eb43142fadd036c9df909ebe5e5d7af031f6b9b91c65a67
+SIZE (blakesmith-ar-8bd4349a67f2_GH0.tar.gz) = 4057
+SHA256 (bradleyfalzon-ghinstallation-v1.1.0_GH0.tar.gz) = 3f8a64aa5f305cef60f956909e6746817f54800c8f38fe901b6ed4d3d87b7708
+SIZE (bradleyfalzon-ghinstallation-v1.1.0_GH0.tar.gz) = 12066
+SHA256 (bsm-sarama-cluster-7e67d87a6b3f_GH0.tar.gz) = b93f207347451f8d874f65a42f42516196404a8ef0dd691118a354521e87ca1d
+SIZE (bsm-sarama-cluster-7e67d87a6b3f_GH0.tar.gz) = 22648
+SHA256 (cavaliercoder-badio-ce5280129e9e_GH0.tar.gz) = 215acb2031e2f63ed6a51b599982cc0cd3035584959b1ff983c29c56c3bf8393
+SIZE (cavaliercoder-badio-ce5280129e9e_GH0.tar.gz) = 4405
+SHA256 (cavaliercoder-go-rpm-7a9c54e3d83e_GH0.tar.gz) = 7cf5dfdc72e6d2afe741cbc59058ce04e58f545a49f3649623df11b02f57aaa1
+SIZE (cavaliercoder-go-rpm-7a9c54e3d83e_GH0.tar.gz) = 311863
+SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
+SIZE (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 165321
+SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
+SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (cloudfoundry-community-go-cfclient-35bcce23fc5f_GH0.tar.gz) = fc6599d7d7c30ad6324cd58932971b39cd88913b405aa2f20fe516b93b276ed6
+SIZE (cloudfoundry-community-go-cfclient-35bcce23fc5f_GH0.tar.gz) = 104980
+SHA256 (cloudfoundry-incubator-rfc5424-236a6d29298a_GH0.tar.gz) = deb4c3f32c86ca93c98c61ce832dc99711137c23b88b3ae79f32326a6ea8048f
+SIZE (cloudfoundry-incubator-rfc5424-236a6d29298a_GH0.tar.gz) = 8315
+SHA256 (cloudfoundry-go-diodes-f77fb823c7ee_GH0.tar.gz) = b24b1022add7bd9c8eaf2e9dc5e88459c51bbe6b7b248e7cf721557585ede46c
+SIZE (cloudfoundry-go-diodes-f77fb823c7ee_GH0.tar.gz) = 11813
+SHA256 (cloudfoundry-go-loggregator-v7.4.0_GH0.tar.gz) = 51c11786eca6c0cb0f76a53a1d4519d753ccbb86268f82b7bbe3cefa147cba63
+SIZE (cloudfoundry-go-loggregator-v7.4.0_GH0.tar.gz) = 69869
+SHA256 (cloudfoundry-gofileutils-4d0c80011a0f_GH0.tar.gz) = b0e76138f5a1e005b85e83e2961ef7254da69bcdee9c02d5287cc6577bf8e45b
+SIZE (cloudfoundry-gofileutils-4d0c80011a0f_GH0.tar.gz) = 10043
+SHA256 (cloudfoundry-noaa-v2.1.0_GH0.tar.gz) = af8e4f70388ecdad36b9b20c24c094314ba84db3e0a4e2cf19c5de0db9ba2be0
+SIZE (cloudfoundry-noaa-v2.1.0_GH0.tar.gz) = 27918
+SHA256 (cloudfoundry-sonde-go-b33733203bb4_GH0.tar.gz) = 53e830216aaef0f8159842dcec72506ff88c4d5a80895343cf76130b7499c438
+SIZE (cloudfoundry-sonde-go-b33733203bb4_GH0.tar.gz) = 27341
+SHA256 (containerd-containerd-v1.3.3_GH0.tar.gz) = f5a3079210660a65a4ba36e322da03b465a83f18af563d33c4ef841ccb4411ae
+SIZE (containerd-containerd-v1.3.3_GH0.tar.gz) = 5696694
+SHA256 (containerd-continuity-26c1120b8d41_GH0.tar.gz) = 1b1c3cb7beb78bff597b097917f8905ed86fc622f97e4bf72bc45ea2f7e770f3
+SIZE (containerd-continuity-26c1120b8d41_GH0.tar.gz) = 1286604
+SHA256 (containerd-fifo-bda0ff6ed73c_GH0.tar.gz) = 15a2ca540726394b9fc428d407e37ceb154c7668f24f9c12940458bfe121c7f6
+SIZE (containerd-fifo-bda0ff6ed73c_GH0.tar.gz) = 10766
+SHA256 (coreos-go-systemd-v22.0.0_GH0.tar.gz) = c531193b788f30a0927a0f1396b9010b81227b7a29c5a324cf867202e2099af4
+SIZE (coreos-go-systemd-v22.0.0_GH0.tar.gz) = 67883
+SHA256 (coreos-pkg-97fdf19511ea_GH0.tar.gz) = 56c6329732085445d341b4cf6a1e3590062371b5837b189294f9ce11361172c0
+SIZE (coreos-pkg-97fdf19511ea_GH0.tar.gz) = 32440
+SHA256 (cucumber-godog-v0.8.1_GH0.tar.gz) = d5ae339676a7dd793a1333c55a37bb4eac4670eee962a61f221b5fa7c4807838
+SIZE (cucumber-godog-v0.8.1_GH0.tar.gz) = 587159
+SHA256 (cyphar-filepath-securejoin-v0.2.2_GH0.tar.gz) = 85410db58d5a37db05ff1f681fc538bb53893c0a8c555db5482770396e5c15e9
+SIZE (cyphar-filepath-securejoin-v0.2.2_GH0.tar.gz) = 10822
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (davecgh-go-xdr-e6a2ba005892_GH0.tar.gz) = 4dc40426ad2faeb4bfc76c77ba200ee21788ad22374f7a5f86fa761a5225b2d3
+SIZE (davecgh-go-xdr-e6a2ba005892_GH0.tar.gz) = 49528
+SHA256 (denisenkom-go-mssqldb-bbfc9a55622e_GH0.tar.gz) = f2bb76e4aebbb3dc7ead766a9e2b543c5e7490b28cc744aee92c6984b2383cee
+SIZE (denisenkom-go-mssqldb-bbfc9a55622e_GH0.tar.gz) = 522375
+SHA256 (devigned-tab-0c15cf42f9a2_GH0.tar.gz) = 88e3b8f31a827d1677b48b8eaa99420bef9ccbcae784231f2b2cfab98e0cac0e
+SIZE (devigned-tab-0c15cf42f9a2_GH0.tar.gz) = 10293
+SHA256 (dgraph-io-badger-f5a7e0a1c83b_GH0.tar.gz) = 59d4310f05dd52634fd31a596bcd26f4c212b9c45921881f25d95a738776d639
+SIZE (dgraph-io-badger-f5a7e0a1c83b_GH0.tar.gz) = 346779
+SHA256 (dgraph-io-ristretto-f66de99634de_GH0.tar.gz) = 416a972246cece89e9aafca82583addc064c8bbabdbb5c6c614ecee6a59180f5
+SIZE (dgraph-io-ristretto-f66de99634de_GH0.tar.gz) = 266327
+SHA256 (dgrijalva-jwt-go-5e25c22bd5d6_GH0.tar.gz) = e90211288461124c0c6d2e111c5dec42dac4b72b39b87b8fbc74aced86c80344
+SIZE (dgrijalva-jwt-go-5e25c22bd5d6_GH0.tar.gz) = 37163
+SHA256 (dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 47bda738d281105cc7b1cb832880f93d220eae40b18095dc322b0b7bf44fdf23
+SIZE (dgryski-go-farm-6a90982ecee2_GH0.tar.gz) = 26800
+SHA256 (digitalocean-go-libvirt-6075ea3c39a1_GH0.tar.gz) = 90ff9d416a48f5a8fdac8f469f36c7fa03ec4262d73c9d54f14df8bb10ed3cb3
+SIZE (digitalocean-go-libvirt-6075ea3c39a1_GH0.tar.gz) = 103615
+SHA256 (dimchansky-utfbom-v1.1.0_GH0.tar.gz) = 86dd5045ac9318f945fed22f8dd1523051d65f7bea8da530b7e74759d8897463
+SIZE (dimchansky-utfbom-v1.1.0_GH0.tar.gz) = 8422
+SHA256 (dlclark-regexp2-7632a260cbaf_GH0.tar.gz) = 3b8666b6d68b26cb936f2027b5b4cef7fd5f0dedac5601c92e81d5f2bd066e5d
+SIZE (dlclark-regexp2-7632a260cbaf_GH0.tar.gz) = 202490
+SHA256 (docker-distribution-v2.7.1_GH0.tar.gz) = 4c3609c102351f15c0386f619d48bb592f3100726b4bde86f3eba7739192ff55
+SIZE (docker-distribution-v2.7.1_GH0.tar.gz) = 1996699
+SHA256 (docker-engine-ea84732a7725_GH0.tar.gz) = 4bb3c3062daa0bd0bccb363c923a045ee670a0a24a7a1c05eebf2c856b1cdad3
+SIZE (docker-engine-ea84732a7725_GH0.tar.gz) = 9437664
+SHA256 (docker-go-connections-v0.4.0_GH0.tar.gz) = e31dfcf72dd9b07bf6dc320671a78a142a1b7c6287a7282c034c8cd463bc8663
+SIZE (docker-go-connections-v0.4.0_GH0.tar.gz) = 30770
+SHA256 (docker-go-metrics-v0.0.1_GH0.tar.gz) = a8a31fd2f59880f4d771c7de45b7dbcee309468ed94740d960e0c76488f9a60b
+SIZE (docker-go-metrics-v0.0.1_GH0.tar.gz) = 19923
+SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b
+SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514
+SHA256 (docker-spdystream-449fdfce4d96_GH0.tar.gz) = bf27356ac5790fb852f90da56d072145c89d23a0c3f9806bd85ca94305c9cf15
+SIZE (docker-spdystream-449fdfce4d96_GH0.tar.gz) = 35383
+SHA256 (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 3b16c5bec68f71d13be0216b849ce910aa4a1844db6e08dafe90fb1a439974c7
+SIZE (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 367559
+SHA256 (dop251-goja_nodejs-adff31b136e6_GH0.tar.gz) = 161efa627c19fa2d7c51538234922cbe62eb30d9fc553a31ff9aefad9d64f3bb
+SIZE (dop251-goja_nodejs-adff31b136e6_GH0.tar.gz) = 5866
+SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
+SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
+SHA256 (eapache-go-resiliency-v1.2.0_GH0.tar.gz) = f9b3d4e28c7f456e912462f72041124b0d152044d20f84c645e287443a0200ef
+SIZE (eapache-go-resiliency-v1.2.0_GH0.tar.gz) = 10399
+SHA256 (eapache-go-xerial-snappy-776d5712da21_GH0.tar.gz) = 4bc90007c4d09abfb9d5a078c48049d5daa70d84fee050565f3230358b833516
+SIZE (eapache-go-xerial-snappy-776d5712da21_GH0.tar.gz) = 7896
+SHA256 (eapache-queue-v1.1.0_GH0.tar.gz) = 2be4716ba2bba5f7c125a8fe72ba534f02cf0d7d98d3a372d4ebe54b170f7329
+SIZE (eapache-queue-v1.1.0_GH0.tar.gz) = 3502
+SHA256 (eclipse-paho.mqtt.golang-0d940dd29fd2_GH0.tar.gz) = 9096beeaa927266920bf6c28a4faccda36896c034e8532391ee31193e5c5f8f2
+SIZE (eclipse-paho.mqtt.golang-0d940dd29fd2_GH0.tar.gz) = 77249
+SHA256 (elastic-apm-agent-go-v1.9.0_GH0.tar.gz) = 2261b30393d8c3b21deaf5a6f2de611f865f360140a08eae8d2766bb415ed32e
+SIZE (elastic-apm-agent-go-v1.9.0_GH0.tar.gz) = 438358
+SHA256 (elastic-dhcp-57ec251c7eb3_GH0.tar.gz) = ef8dc41b36cceda8bee717073b0e25109ea43ed2dc0f38a577ace917f293010e
+SIZE (elastic-dhcp-57ec251c7eb3_GH0.tar.gz) = 65299
+SHA256 (elastic-ecs-logging-go-zap-v0.3.0_GH0.tar.gz) = fbfd4f567e729bb0b60820c7b0848711ead337af053f61d802a31a57600562a3
+SIZE (elastic-ecs-logging-go-zap-v0.3.0_GH0.tar.gz) = 21041
+SHA256 (elastic-ecs-v1.6.0_GH0.tar.gz) = 0eaaf56ac27898d9d8e8a59153fb8f9d8aa39de657b4937a322ba409a0d20bb2
+SIZE (elastic-ecs-v1.6.0_GH0.tar.gz) = 567932
+SHA256 (elastic-elastic-agent-client-d43b7ad5833a_GH0.tar.gz) = 57874c5411ec8bd47303d7fe2397bfd51142462e5ec273da686cf8dd0d6fa30a
+SIZE (elastic-elastic-agent-client-d43b7ad5833a_GH0.tar.gz) = 27865
+SHA256 (elastic-fsevents-e1d381a4d270_GH0.tar.gz) = 76950a74dc771138a2bff412742baebedb3d86318bb3b0de24292f0f538e6ed8
+SIZE (elastic-fsevents-e1d381a4d270_GH0.tar.gz) = 12596
+SHA256 (elastic-go-concert-v0.0.4_GH0.tar.gz) = c14e8f803414ca6e0893fa953d11548073366f68c9e0c0a05e1d0d04b45f8af5
+SIZE (elastic-go-concert-v0.0.4_GH0.tar.gz) = 30829
+SHA256 (elastic-go-fastjson-v1.1.0_GH0.tar.gz) = 76bce00719eef94c2fd173ea92e95daaeec7c46d909657436b90fa46931a7571
+SIZE (elastic-go-fastjson-v1.1.0_GH0.tar.gz) = 10404
+SHA256 (elastic-go-libaudit-v2.0.2_GH0.tar.gz) = f955786259dde1f0f1a4c8ad693352375f5af60d1702316fc00a8208b5ab7e8f
+SIZE (elastic-go-libaudit-v2.0.2_GH0.tar.gz) = 165395
+SHA256 (elastic-go-licence-detector-v0.4.0_GH0.tar.gz) = f5778f7bdbb0ae695417ac5f6ee94cf6acbb7b056bb889419c9cd3f73f9ac8cd
+SIZE (elastic-go-licence-detector-v0.4.0_GH0.tar.gz) = 11522954
+SHA256 (elastic-go-licenser-v0.3.1_GH0.tar.gz) = ea07d12bd87b8b7319aa0dee93836023f974365a7dcbfeea73c72beb442dbf37
+SIZE (elastic-go-licenser-v0.3.1_GH0.tar.gz) = 17439
+SHA256 (elastic-go-lookslike-v0.3.0_GH0.tar.gz) = a5d6ffac1ea73db6ee310f063677c01af7ef6729db2324c1242f29df3c5333aa
+SIZE (elastic-go-lookslike-v0.3.0_GH0.tar.gz) = 22753
+SHA256 (elastic-go-lumber-v0.1.0_GH0.tar.gz) = 7c6dd5e6f833ac91f4af5063d746db3abf80d0734bebc6c2274b193fa4822851
+SIZE (elastic-go-lumber-v0.1.0_GH0.tar.gz) = 13897
+SHA256 (elastic-go-perf-9c656876f595_GH0.tar.gz) = 9ac7240360f0d7b54360d852ec5bf19b0696989fe9561891638afe0d09d55563
+SIZE (elastic-go-perf-9c656876f595_GH0.tar.gz) = 39221
+SHA256 (elastic-go-plugins-helpers-bdf17607b79f_GH0.tar.gz) = 6dd0c791b2a722799411142ffdf2e8866d3c43517cd7b141844a2af0be493f61
+SIZE (elastic-go-plugins-helpers-bdf17607b79f_GH0.tar.gz) = 35825
+SHA256 (elastic-go-seccomp-bpf-v1.1.0_GH0.tar.gz) = 139331d4a3f426e2152c29d8bb2b00851c8b92a6448143d47ddba3d506761e5a
+SIZE (elastic-go-seccomp-bpf-v1.1.0_GH0.tar.gz) = 31173
+SHA256 (elastic-go-structform-v0.0.7_GH0.tar.gz) = bab2bb39bb30e4cf6e0b2ad0e864daa96bc7fdeb663b0768199e5273a965e0fc
+SIZE (elastic-go-structform-v0.0.7_GH0.tar.gz) = 382288
+SHA256 (elastic-go-sysinfo-v1.3.0_GH0.tar.gz) = ee978e21b8eca938908c9b0f1d677a6c2ed96161cf3d1a70bdce8444f9efa993
+SIZE (elastic-go-sysinfo-v1.3.0_GH0.tar.gz) = 57202
+SHA256 (elastic-go-txfile-v0.0.7_GH0.tar.gz) = 91bada2c161c4c7ce2a9641518499113f0cd81ba7785ecf90b370dc09cc2dcc3
+SIZE (elastic-go-txfile-v0.0.7_GH0.tar.gz) = 115915
+SHA256 (elastic-go-ucfg-v0.8.3_GH0.tar.gz) = 3e40e6b50da738389071b3b7441a2636c94e52d19c6aafb405471eabcd4e3f09
+SIZE (elastic-go-ucfg-v0.8.3_GH0.tar.gz) = 190494
+SHA256 (elastic-go-windows-v1.0.1_GH0.tar.gz) = 52043392ca03e270c3f9c8632c78fa71885af756043f3258d20865185b8199ed
+SIZE (elastic-go-windows-v1.0.1_GH0.tar.gz) = 16844
+SHA256 (elastic-gosigar-f115143bb233_GH0.tar.gz) = 4f6c500d4037feb130ce142da78ea2628dadd075a6c5bf1cea907fcf55c62571
+SIZE (elastic-gosigar-f115143bb233_GH0.tar.gz) = 79199
+SHA256 (elastic-sarama-0e7b69039eec_GH0.tar.gz) = ff169f211d35447f150111967637a7baae46d3a34cf0a7460bd5d954be072b68
+SIZE (elastic-sarama-0e7b69039eec_GH0.tar.gz) = 268761
+SHA256 (etcd-io-bbolt-v1.3.4_GH0.tar.gz) = 536029610c6cd08e4a9fe2e1b0857ae539b0736850132cbbe1c18f0fbed8a4da
+SIZE (etcd-io-bbolt-v1.3.4_GH0.tar.gz) = 95404
+SHA256 (evanphx-json-patch-v4.2.0_GH0.tar.gz) = 256711ab08b342be5d7ea7e2d84bf498110641f8fdc0f81806d3e3bb868c2813
+SIZE (evanphx-json-patch-v4.2.0_GH0.tar.gz) = 14569
+SHA256 (fatih-color-v1.5.0_GH0.tar.gz) = f22564848cd7d24022413c719bbc9c35d014ba7d19ee802b29ba5a93016d3250
+SIZE (fatih-color-v1.5.0_GH0.tar.gz) = 586937
+SHA256 (garyburd-redigo-b8dc90050f24_GH0.tar.gz) = 8e1b9211c7d64b29e9c6f97d0b7da99b33f6f54631dce4eea6743b64eea402a2
+SIZE (garyburd-redigo-b8dc90050f24_GH0.tar.gz) = 34046
+SHA256 (go-inf-inf-v0.9.1_GH0.tar.gz) = 756e00e87207cb063d305b6e38bf56dba4d76586fbe40b7d6b657d22516d0f71
+SIZE (go-inf-inf-v0.9.1_GH0.tar.gz) = 13072
+SHA256 (go-mgo-mgo-3f83fa500528_GH0.tar.gz) = 8f6051f4e5634ae87d5dc7683e84f0345f3fb6a708fd6d15240a87f377807360
+SIZE (go-mgo-mgo-3f83fa500528_GH0.tar.gz) = 376760
+SHA256 (go-ole-go-ole-14974a1cf647_GH0.tar.gz) = 87c0a03b90f3e5e22d1272ea620429eb63aff97405a5c1dc8d28d757ce9b888a
+SIZE (go-ole-go-ole-14974a1cf647_GH0.tar.gz) = 52034
+SHA256 (go-sourcemap-sourcemap-v2.1.2_GH0.tar.gz) = 6e9981d0cf3def24f67bb1f0af720f0100105d4b387fc0fe7dc7d3535388c61a
+SIZE (go-sourcemap-sourcemap-v2.1.2_GH0.tar.gz) = 6378
+SHA256 (go-sql-driver-mysql-v1.4.1_GH0.tar.gz) = 9b5d435903a674cd761310365df992a1b4eed2e4e2f0c8aa90bdc996c330d7ae
+SIZE (go-sql-driver-mysql-v1.4.1_GH0.tar.gz) = 83524
+SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
+SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
+SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
+SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
+SHA256 (gobuffalo-here-v0.6.0_GH0.tar.gz) = a996bdf6da7baddaf2851629dcdb65bdd44086de7ea9983863af0b0bf3b3647d
+SIZE (gobuffalo-here-v0.6.0_GH0.tar.gz) = 8986
+SHA256 (gocarina-gocsv-ffef3ffc77be_GH0.tar.gz) = b94fcd9da565924ef9466b7a09486a341c09020c85d74f3011e126d8a438ce42
+SIZE (gocarina-gocsv-ffef3ffc77be_GH0.tar.gz) = 12922
+SHA256 (godbus-dbus-ade71ed3457e_GH0.tar.gz) = 47b89b5d903b0b3e8437ac7c27825a09e54e6cce34812f0f046f07c77fc03a42
+SIZE (godbus-dbus-ade71ed3457e_GH0.tar.gz) = 61206
+SHA256 (godbus-dbus-v5.0.3_GH0.tar.gz) = 49d27bde2861f5e5ab4195fddc5f38f25324aac3b32b3cc03e712cca3d2b75fa
+SIZE (godbus-dbus-v5.0.3_GH0.tar.gz) = 63630
+SHA256 (godror-godror-v0.10.4_GH0.tar.gz) = ef50fc9cdf155b666e911545cc4211de88db1af8408721ea80d0e1784f5876b8
+SIZE (godror-godror-v0.10.4_GH0.tar.gz) = 271454
+SHA256 (gofrs-flock-5135e617513b_GH0.tar.gz) = 59644ab45696775819ced0299ff5a6aac33515c7f2ad02f7531425e278427c9e
+SIZE (gofrs-flock-5135e617513b_GH0.tar.gz) = 7290
+SHA256 (gofrs-uuid-v3.3.0_GH0.tar.gz) = e9e33d86dfb753b1569414d733e8483d565345df302240a5c9f2930c02951ccb
+SIZE (gofrs-uuid-v3.3.0_GH0.tar.gz) = 17919
+SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
+SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
+SHA256 (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = ebc100d46719b1374b59e59bc63baffaec6a2bface5b0d519024f43c097cdc3e
+SIZE (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = 8359
+SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
+SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
+SHA256 (golang-crypto-06a226fb4e37_GH0.tar.gz) = 7a00dcb4857a42efb0d93d3cae8c33f1f05048a0ee54c7437c79b848a622833a
+SIZE (golang-crypto-06a226fb4e37_GH0.tar.gz) = 1728425
+SHA256 (golang-exp-da58074b4299_GH0.tar.gz) = 25c8abc24a515aea70869eb6a5c8671d71821a22b90837807cfd2da7ebf893ff
+SIZE (golang-exp-da58074b4299_GH0.tar.gz) = 1484336
+SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70
+SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040
+SHA256 (golang-lint-910be7a94367_GH0.tar.gz) = fb702d9a4efbe7f23f33772e2ba9908db74d33beff3c1688ddb9a72a736bdf41
+SIZE (golang-lint-910be7a94367_GH0.tar.gz) = 31816
+SHA256 (golang-mod-v0.3.0_GH0.tar.gz) = bc97bb300928a00cfe64d97b3240c760668060cda0767e0d0b413e506fc3fa0a
+SIZE (golang-mod-v0.3.0_GH0.tar.gz) = 93941
+SHA256 (golang-net-16171245cfb2_GH0.tar.gz) = 941e5a2afb85a131b42f8503fe1a760447a40a0f26539c11ca489f4f24a77e77
+SIZE (golang-net-16171245cfb2_GH0.tar.gz) = 1172446
+SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
+SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
+SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
+SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
+SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
+SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
+SHA256 (golang-sync-43a5402ce75a_GH0.tar.gz) = c9a58dbd06f5747ccf112cc29eb6f82ab2b8a3cd18908efa2d949a27d3924fc8
+SIZE (golang-sync-43a5402ce75a_GH0.tar.gz) = 17275
+SHA256 (golang-sys-ddb9806d33ae_GH0.tar.gz) = c441ebb395a1facea244428b70a77fa792e3d83063275a611adda070e899eaca
+SIZE (golang-sys-ddb9806d33ae_GH0.tar.gz) = 1054636
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
+SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
+SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
+SHA256 (golang-tools-c00d67ef29d0_GH0.tar.gz) = a5374d3adc8110395d0fcff337c018d1033e7b9d98cb26b7712748716a9ecba1
+SIZE (golang-tools-c00d67ef29d0_GH0.tar.gz) = 2301798
+SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb4d99e6cba2e3e5331d064f46640cc01a0e630ee6a684ae810bd94a7e4eb7
+SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
+SHA256 (google-flatbuffers-7a6b2bf521e9_GH0.tar.gz) = a4c1ab93dd74b1c384c03b3d21e5d48d96958b6894744717442f997e7f419e83
+SIZE (google-flatbuffers-7a6b2bf521e9_GH0.tar.gz) = 613246
+SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
+SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600
+SHA256 (google-go-genproto-f3c370f40bfb_GH0.tar.gz) = 754588f44bdfdbe4521ad0950375a0357f2454ff6de43e0e6d6a88b5b5182c55
+SIZE (google-go-genproto-f3c370f40bfb_GH0.tar.gz) = 5857725
+SHA256 (google-go-github-v28.1.1_GH0.tar.gz) = dffd3d5e682ae6c5d264beabd75bef986f4c7b79d26e7d3c21bb3ad0ea3117bc
+SIZE (google-go-github-v28.1.1_GH0.tar.gz) = 255821
+SHA256 (google-go-github-v29.0.2_GH0.tar.gz) = 6b54a6cc493c5669aa6dab4881e9cea70ecd5d903a711b65d16eaa5469107ec8
+SIZE (google-go-github-v29.0.2_GH0.tar.gz) = 276668
+SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed
+SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529
+SHA256 (google-gofuzz-v1.1.0_GH0.tar.gz) = 29aaa068090a761e6cc10e3722c5cc4c6a09840c50b442e5a53088e95bd3f325
+SIZE (google-gofuzz-v1.1.0_GH0.tar.gz) = 13517
+SHA256 (google-licenseclassifier-879cb1424de0_GH0.tar.gz) = 783cc676e128d05fc9bcc40a9d9e15b72adf0ea55dd954c871092cb191caa126
+SIZE (google-licenseclassifier-879cb1424de0_GH0.tar.gz) = 6702973
+SHA256 (google-uuid-c2e93f3ae59f_GH0.tar.gz) = a82501713d11ca4fd15505498393e349e30e2310cd915f33662315d8a9988294
+SIZE (google-uuid-c2e93f3ae59f_GH0.tar.gz) = 13866
+SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
+SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
+SHA256 (googleapis-gnostic-25d8b0b66985_GH0.tar.gz) = 3052bbb7255755bc3fa6709d24a8d9bc1a8b392b7e0f2096d75523d831619e7c
+SIZE (googleapis-gnostic-25d8b0b66985_GH0.tar.gz) = 424874
+SHA256 (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 6d628266b507a71f26ce2fd426758e1241f9dd94458752d9d12a0b09da983844
+SIZE (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 13259795
+SHA256 (googleapis-google-cloud-go-bigquery-v1.0.1_GH0.tar.gz) = 04c072c71719e3c808ad3e4a3441a84e479d99482b0121f291e759ea60d10298
+SIZE (googleapis-google-cloud-go-bigquery-v1.0.1_GH0.tar.gz) = 2221115
+SHA256 (googleapis-google-cloud-go-datastore-v1.0.0_GH0.tar.gz) = 1df94b2b7f22e2eff0711cb2260cdaf996d496b98331cca257ac78fcfcd9558b
+SIZE (googleapis-google-cloud-go-datastore-v1.0.0_GH0.tar.gz) = 2214029
+SHA256 (googleapis-google-cloud-go-pubsub-v1.0.1_GH0.tar.gz) = 9f50174b3ded8e23d3840dfb1f74386530df2773d585ba79f4046fbc0fc7e267
+SIZE (googleapis-google-cloud-go-pubsub-v1.0.1_GH0.tar.gz) = 2254977
+SHA256 (googleapis-google-cloud-go-storage-v1.0.0_GH0.tar.gz) = 402acf8e3139681bc61193ec8110d0f90f3c2b669d33b78b2d9c672d9a2699a2
+SIZE (googleapis-google-cloud-go-storage-v1.0.0_GH0.tar.gz) = 2275260
+SHA256 (googleapis-google-cloud-go-v0.51.0_GH0.tar.gz) = efee71ab4baf86277c6ceec4633dd606595e4b0fa299c22863dbeb03eed65941
+SIZE (googleapis-google-cloud-go-v0.51.0_GH0.tar.gz) = 2441854
+SHA256 (gorhill-cronexpr-d520615e531a_GH0.tar.gz) = e1b4e2f1728ab86e462a11c845aeafdd85a43927a893fe737368ae4b062b9a8c
+SIZE (gorhill-cronexpr-d520615e531a_GH0.tar.gz) = 28872
+SHA256 (gorilla-mux-v1.7.2_GH0.tar.gz) = 56920f5c8a9286478005a13940c27069242447812ac47f4e6221cfc9d13ea73f
+SIZE (gorilla-mux-v1.7.2_GH0.tar.gz) = 40933
+SHA256 (gorilla-websocket-v1.4.1_GH0.tar.gz) = 9e5bd337d58a978bf4072767252ddb394b53e2b459697633794abd96e8eb3fa6
+SIZE (gorilla-websocket-v1.4.1_GH0.tar.gz) = 54218
+SHA256 (gotestyourself-gotest.tools-v2.2.0_GH0.tar.gz) = 5d4c441f8cb2949ddab1d196fac936df79b629b580c88597b100a74a97ca58ea
+SIZE (gotestyourself-gotest.tools-v2.2.0_GH0.tar.gz) = 56880
+SHA256 (grpc-ecosystem-grpc-gateway-v1.13.0_GH0.tar.gz) = 6ddd9a29326a09ed0bea233190b11b3d0ff56cb28025c3ffcaf386d091884e90
+SIZE (grpc-ecosystem-grpc-gateway-v1.13.0_GH0.tar.gz) = 464268
+SHA256 (grpc-grpc-go-v1.29.1_GH0.tar.gz) = b626c128878d1d7aaf79c6f4f73cba0eadd26405a30fc00b71cc9a12e56fef38
+SIZE (grpc-grpc-go-v1.29.1_GH0.tar.gz) = 892944
+SHA256 (h2non-filetype-v1.0.12_GH0.tar.gz) = a7367267b3eb05b0a22893efebb0f47f3c93081dca9ff65d498bbb4aa9fddc58
+SIZE (h2non-filetype-v1.0.12_GH0.tar.gz) = 3632270
+SHA256 (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 26afc0e5895c6ce87c881c5c02c682ccc9a08174a9c27ca26d4a1e72dbf78128
+SIZE (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 8346
+SHA256 (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 24dedefe5edc4698dfa7e15a472369078a3447e8096e6d856549341c873c4a0b
+SIZE (hashicorp-go-cleanhttp-v0.5.1_GH0.tar.gz) = 8069
+SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4
+SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084
+SHA256 (hashicorp-go-retryablehttp-v0.6.6_GH0.tar.gz) = 1e1a07428ba95d9e1b7adf80230d0f90ab5711d874187820f1ace2fab4b4ddb1
+SIZE (hashicorp-go-retryablehttp-v0.6.6_GH0.tar.gz) = 18468
+SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88806c90712a4b66013b20a1ff0562eae
+SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058
+SHA256 (hashicorp-go-version-v1.0.0_GH0.tar.gz) = 12b2d8fd048ebbf3df38df5865aa7a673444a0c553cac0e338d0471c14733f96
+SIZE (hashicorp-go-version-v1.0.0_GH0.tar.gz) = 12479
+SHA256 (hashicorp-golang-lru-59383c442f7d_GH0.tar.gz) = b1e83f4e741e75bc1f1455ab5d58a1e093d9b49d97e6f2da2777f7a4a70ba2cc
+SIZE (hashicorp-golang-lru-59383c442f7d_GH0.tar.gz) = 13003
+SHA256 (haya14busa-go-actions-toolkit-ca0307860f01_GH0.tar.gz) = b0426a1a8d60d93762f7f6e6449070f109346b85fd7ab9796ecc36d59d74e347
+SIZE (haya14busa-go-actions-toolkit-ca0307860f01_GH0.tar.gz) = 7008
+SHA256 (hectane-go-acl-da78bae5fc95_GH0.tar.gz) = 96cfa9779b03068634218a84a19d34716dc6caec016a278e47e662f470d380b3
+SIZE (hectane-go-acl-da78bae5fc95_GH0.tar.gz) = 6294
+SHA256 (imdario-mergo-v0.3.6_GH0.tar.gz) = 91feb682c2abaaa6284f9363a177f77d927dd693518e20501f82982b75fdae84
+SIZE (imdario-mergo-v0.3.6_GH0.tar.gz) = 16068
+SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
+SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
+SHA256 (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 89d8aa45b05c9cd5e66c40a5c4f3a5224dbf9632d1fd1e27d05f2ad26effae32
+SIZE (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 7311
+SHA256 (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 9781a79a5b46e6ad245d238d1be1b37d8eab9ca9e57edb575ef0af158adeeefb
+SIZE (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 6346
+SHA256 (jcmturner-gofork-v1.0.0_GH0.tar.gz) = d85188110837abd563dca4d9013665f82348a541beb47ee08207e70a161c9755
+SIZE (jcmturner-gofork-v1.0.0_GH0.tar.gz) = 27036
+SHA256 (jcmturner-goidentity-v3.0.0_GH0.tar.gz) = 599b4fc0a2bba638d30c6fbf6748024080221f72d845aedfcfb207dd39ede948
+SIZE (jcmturner-goidentity-v3.0.0_GH0.tar.gz) = 5759
+SHA256 (jcmturner-gokrb5-v7.5.0_GH0.tar.gz) = 1a3d2c93275bfa4d373b7915821bd549d1db27340ac78af4b56cb4041b79f159
+SIZE (jcmturner-gokrb5-v7.5.0_GH0.tar.gz) = 115323097
+SHA256 (jcmturner-rpc-v1.1.0_GH0.tar.gz) = 4ec57839cacb49d87fe22d4ee4286daf4944808d9af09739d218c62255f364b7
+SIZE (jcmturner-rpc-v1.1.0_GH0.tar.gz) = 28845
+SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
+SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
+SHA256 (jmoiron-sqlx-d7d95172beb5_GH0.tar.gz) = 4f460c21206aac70f70682cbe9dde84c2eae95cff1beb5ac6bdd4822d8165618
+SIZE (jmoiron-sqlx-d7d95172beb5_GH0.tar.gz) = 50181
+SHA256 (joeshaw-multierror-69b34d4ec901_GH0.tar.gz) = 8f53148758c58301d48b37ab9c27706c87e0bf94a84a919dc8dcc92f3e461449
+SIZE (joeshaw-multierror-69b34d4ec901_GH0.tar.gz) = 2163
+SHA256 (josephspurrier-goversioninfo-14b0ab84c6ca_GH0.tar.gz) = f413b88d006d169d2b6eb78aeb1166c35f1e6841689f2d70a1b6ff16566af6de
+SIZE (josephspurrier-goversioninfo-14b0ab84c6ca_GH0.tar.gz) = 52898
+SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f
+SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507
+SHA256 (json-iterator-go-v1.1.8_GH0.tar.gz) = 0e16ec1a5175936864f3ee101951f58845ae0c86211e9a15b0c6bbf23752e62d
+SIZE (json-iterator-go-v1.1.8_GH0.tar.gz) = 79177
+SHA256 (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 4999e6d8feefe5b89eb9c2b3845a3c0ecdb6f0b0ba4e9785567a43f8952fff15
+SIZE (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 17764
+SHA256 (karrick-godirwalk-v1.15.6_GH0.tar.gz) = d861987afed4e6c6998ab5d502c1480390175b3dc64b2c6cdb46367c2fdc054f
+SIZE (karrick-godirwalk-v1.15.6_GH0.tar.gz) = 24756
+SHA256 (klauspost-compress-v1.9.8_GH0.tar.gz) = 875db400d8bd838ce050db5931f540c17186f6ec2630420238da48be7bac1f56
+SIZE (klauspost-compress-v1.9.8_GH0.tar.gz) = 16106285
+SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
+SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
+SHA256 (kubernetes-sigs-structured-merge-diff-v3.0.0_GH0.tar.gz) = 4664fde5ca35bec02624912d51ef75546d4b105619da7a7aca14abac050bf555
+SIZE (kubernetes-sigs-structured-merge-diff-v3.0.0_GH0.tar.gz) = 271444
+SHA256 (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 80612b8cc63863556906f04df7eca89179bf81e5b3d1133c082bd7e5e35d5514
+SIZE (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 92574
+SHA256 (kubernetes-api-v0.18.3_GH0.tar.gz) = 2202f9fb8a0dd5b12b10de81aaccf03d8c8c863ce7af81c652ded595e26f88d6
+SIZE (kubernetes-api-v0.18.3_GH0.tar.gz) = 2238108
+SHA256 (kubernetes-apimachinery-v0.18.3_GH0.tar.gz) = eb5fe41699643bf2b265ba23e89151cf9e0a8bc02c276abf996c013edcf3e9f8
+SIZE (kubernetes-apimachinery-v0.18.3_GH0.tar.gz) = 523694
+SHA256 (kubernetes-client-go-v0.18.3_GH0.tar.gz) = bc91f408bc228f3f5b22a3df311831e65d0aec45ce47c67a41ce4489f9827922
+SIZE (kubernetes-client-go-v0.18.3_GH0.tar.gz) = 727119
+SHA256 (kubernetes-klog-v1.0.0_GH0.tar.gz) = eb84fc7a8051175f2da4a428360ce70703c8ccdd0e987fddc2f9d5c8fd97cd00
+SIZE (kubernetes-klog-v1.0.0_GH0.tar.gz) = 32366
+SHA256 (kubernetes-kube-openapi-61e04a5be9a6_GH0.tar.gz) = e2be55eda6f2fc987624d2cbc33dcb681591f9632a738ef763538b8e5c707fa2
+SIZE (kubernetes-kube-openapi-61e04a5be9a6_GH0.tar.gz) = 747355
+SHA256 (kubernetes-utils-a9aa75ae1b89_GH0.tar.gz) = 61050807bb03c27fb36ae6e216e91b8f8d9f0944a2ff057222107ad27fc8c0b7
+SIZE (kubernetes-utils-a9aa75ae1b89_GH0.tar.gz) = 84627
+SHA256 (leighmcculloch-embedfiles-995e0740726f_GH0.tar.gz) = 2521a5b57c2c2da4f5399102e56466fa4d0672202853f4cfec6b1a5117e7a5f0
+SIZE (leighmcculloch-embedfiles-995e0740726f_GH0.tar.gz) = 2342
+SHA256 (leighmcculloch-go-tz-6d37baae851b_GH0.tar.gz) = b92ea0047439836c7f1d76bc05410e78c9f55e7a44b709c0b1554034f43352bb
+SIZE (leighmcculloch-go-tz-6d37baae851b_GH0.tar.gz) = 310186
+SHA256 (lib-pq-2ff3cb3adc01_GH0.tar.gz) = 7c2cccbd83365de4b6a656b3e71a9bb34742c6836617087509d6e0d67e357b31
+SIZE (lib-pq-2ff3cb3adc01_GH0.tar.gz) = 96057
+SHA256 (magefile-mage-v1.10.0_GH0.tar.gz) = 7d7f46f62df9dfb1a3a03173a1c14d77fdc53b3c99821da02d32a4ba730838fe
+SIZE (magefile-mage-v1.10.0_GH0.tar.gz) = 8792150
+SHA256 (mailru-easyjson-v0.7.1_GH0.tar.gz) = 87565eae22943135338abd633530e0936b1a043c79a154589a841aa27f11d686
+SIZE (mailru-easyjson-v0.7.1_GH0.tar.gz) = 74194
+SHA256 (markbates-pkger-v0.17.0_GH0.tar.gz) = 2a4593803004027257b1360022ae51d44a726b8881df92d315b353748c61d654
+SIZE (markbates-pkger-v0.17.0_GH0.tar.gz) = 518484
+SHA256 (mattn-go-colorable-v0.0.8_GH0.tar.gz) = 4f7b0196c6d7a7be96ba394c94860384b537cec6e0da57951bccda0d42c1c23c
+SIZE (mattn-go-colorable-v0.0.8_GH0.tar.gz) = 7526
+SHA256 (mattn-go-ieproxy-7c0f6868bffe_GH0.tar.gz) = caf8b5faaa47c492900bd84e6b56e5d83d5996188b98c324d8c328344ea21bb4
+SIZE (mattn-go-ieproxy-7c0f6868bffe_GH0.tar.gz) = 8486
+SHA256 (mattn-go-isatty-v0.0.2_GH0.tar.gz) = c0681d72b185a8d4aa8f6a557d181bf25c6e3e7f3874711de507e550b25408bf
+SIZE (mattn-go-isatty-v0.0.2_GH0.tar.gz) = 3258
+SHA256 (mattn-go-shellwords-v1.0.7_GH0.tar.gz) = 7be2539333c5bcab78f5cc632b25446aff9c8f00009dd0eb70403b081003c372
+SIZE (mattn-go-shellwords-v1.0.7_GH0.tar.gz) = 5079
+SHA256 (matttproud-golang_protobuf_extensions-c182affec369_GH0.tar.gz) = 66a6911e621bfd8823078568688b5683d66ce0b8f85da7b1288d3533d2724735
+SIZE (matttproud-golang_protobuf_extensions-c182affec369_GH0.tar.gz) = 37518
+SHA256 (miekg-dns-v1.1.15_GH0.tar.gz) = a27dbc6e920596548db7edb0996a9338f60f14dd65255787a78dad8de039aba3
+SIZE (miekg-dns-v1.1.15_GH0.tar.gz) = 1692734
+SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
+SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
+SHA256 (mitchellh-gox-v1.0.1_GH0.tar.gz) = 25aab55a4ba75653931be2a2b95e29216b54bd8fecc7931bd416efe49a388229
+SIZE (mitchellh-gox-v1.0.1_GH0.tar.gz) = 30819
+SHA256 (mitchellh-hashstructure-ab25296c0f51_GH0.tar.gz) = f361c4a6ce1e797f4e885e6a72d8a8e548230d1913fef1b8b1716aa37bac75fe
+SIZE (mitchellh-hashstructure-ab25296c0f51_GH0.tar.gz) = 5937
+SHA256 (mitchellh-iochan-v1.0.0_GH0.tar.gz) = 2a9d55fa9fcdfca4c9299b0500acd5a6ced203cff60f296a5f136cf78fce938b
+SIZE (mitchellh-iochan-v1.0.0_GH0.tar.gz) = 1817
+SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
+SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
+SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
+SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
+SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
+SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
+SHA256 (morikuni-aec-v1.0.0_GH0.tar.gz) = 560235880d23e531fcbf59ab768bdb213ea54d0169452a61ec54187dca393d77
+SIZE (morikuni-aec-v1.0.0_GH0.tar.gz) = 55416
+SHA256 (oklog-ulid-v1.3.1_GH0.tar.gz) = 499a6ee77ca473a44ad9f11425a8f87f6c02ff1221b11f24d13bee13ce632640
+SIZE (oklog-ulid-v1.3.1_GH0.tar.gz) = 55582
+SHA256 (opencontainers-go-digest-ac19fd6e7483_GH0.tar.gz) = 08c5675cfc1319a4a3a0025415afa8677c257c669d644637e6234c527af992f9
+SIZE (opencontainers-go-digest-ac19fd6e7483_GH0.tar.gz) = 19139
+SHA256 (opencontainers-image-spec-775207bd45b6_GH0.tar.gz) = 83643269bda44a95279eebc7fd5d0ed35de1b4afed73b44f87b1e1e74064d9d2
+SIZE (opencontainers-image-spec-775207bd45b6_GH0.tar.gz) = 141521
+SHA256 (opencontainers-runc-v1.0.0-rc9_GH0.tar.gz) = 2ec69c25df9f02c6fd38eb287145f8afba6772f809abe01df4534b5bfd68e8d4
+SIZE (opencontainers-runc-v1.0.0-rc9_GH0.tar.gz) = 1883127
+SHA256 (otiai10-copy-v1.2.0_GH0.tar.gz) = 3ed36d24b75b99fe1a24743f7d8834ac60df5396203fd82b370b1f2fdb9d4214
+SIZE (otiai10-copy-v1.2.0_GH0.tar.gz) = 6429
+SHA256 (pierrec-lz4-v2.4.1_GH0.tar.gz) = e676ab183c609fd4d2014ec96f88c5735f6272ac870acfe4543d4fcdfc0165a0
+SIZE (pierrec-lz4-v2.4.1_GH0.tar.gz) = 20509213
+SHA256 (pierrre-gotestcover-924dca7d15f0_GH0.tar.gz) = 19858cf79ca4ba3385b3f1bb3f8da214c4630253d211817b1ab6e21d505dd6fc
+SIZE (pierrre-gotestcover-924dca7d15f0_GH0.tar.gz) = 4081
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (poy-eachers-23942921fe77_GH0.tar.gz) = 061643187b3d6ec51031b0fb5258fa710ad958a2fa39a93a8351302dd340576a
+SIZE (poy-eachers-23942921fe77_GH0.tar.gz) = 5853
+SHA256 (prometheus-client_golang-20428fa0bffc_GH0.tar.gz) = 8498537ca30f2cca26126ec35b79aed56c130579b708a86bde3f22f45021044e
+SIZE (prometheus-client_golang-20428fa0bffc_GH0.tar.gz) = 140640
+SHA256 (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03
+SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495
+SHA256 (prometheus-common-v0.7.0_GH0.tar.gz) = 71b1dce2afd959f9fcab3b5e097dfa9d398a61749851d290114746a3f8f119ae
+SIZE (prometheus-common-v0.7.0_GH0.tar.gz) = 100520
+SHA256 (prometheus-procfs-v0.0.11_GH0.tar.gz) = fd84664db471a0d08d721abc383665fe9a61a56001ff2c8b3b3734f8146bf0ae
+SIZE (prometheus-procfs-v0.0.11_GH0.tar.gz) = 135114
+SHA256 (prometheus-prometheus-v2.5.0_GH0.tar.gz) = e1484edbb63480bc5ce75b661a328abb7b7b2c609de41e8fd0af0e6539fe02c7
+SIZE (prometheus-prometheus-v2.5.0_GH0.tar.gz) = 6123272
+SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
+SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648
+SHA256 (rcrowley-go-metrics-cac0b30c2563_GH0.tar.gz) = d509efdc86ad876288937eeec07ac73c0d72a65dbf507984a40f927aac5e91cc
+SIZE (rcrowley-go-metrics-cac0b30c2563_GH0.tar.gz) = 37569
+SHA256 (reviewdog-errorformat-8983be9bc7dd_GH0.tar.gz) = 6414d7bfcf9f5f02d1c6c20d855cd592f99a9e8c4e3efe2bc89def1d2dac4a70
+SIZE (reviewdog-errorformat-8983be9bc7dd_GH0.tar.gz) = 40528
+SHA256 (reviewdog-reviewdog-v0.9.17_GH0.tar.gz) = a99c6f657373db69d2af0415f58199fcbb39ffc9698ce09c0f1b3a61b6a21419
+SIZE (reviewdog-reviewdog-v0.9.17_GH0.tar.gz) = 131557
+SHA256 (samuel-go-parser-ca8abbf65d0e_GH0.tar.gz) = dc0fc429374b456618f47d2ad8833e36a57f04dcd5857b5fccb884e495a69bb9
+SIZE (samuel-go-parser-ca8abbf65d0e_GH0.tar.gz) = 3556
+SHA256 (samuel-go-thrift-2187045faa54_GH0.tar.gz) = e1196eb5d8754f934fedf4d919dce34a7b52c026c252edb1b54094364a7bfe25
+SIZE (samuel-go-thrift-2187045faa54_GH0.tar.gz) = 48157
+SHA256 (sanathkr-go-yaml-ed9d249f429b_GH0.tar.gz) = 911793de21f5ed1c9e771d43d46694d6e8d43eb92d85a3f17cc3d4378c3d2806
+SIZE (sanathkr-go-yaml-ed9d249f429b_GH0.tar.gz) = 65414
+SHA256 (sanathkr-yaml-0056894fa522_GH0.tar.gz) = f7912354109b655d9e4f3ebf1d9e5cfca6f686d5f8df04b78fec4fcaf075f679
+SIZE (sanathkr-yaml-0056894fa522_GH0.tar.gz) = 11770
+SHA256 (santhosh-tekuri-jsonschema-v1.2.4_GH0.tar.gz) = a5c4f3144052a308e2af5e9d0f49e4abd7ea96fa15b2c24c80882ce9c52300c3
+SIZE (santhosh-tekuri-jsonschema-v1.2.4_GH0.tar.gz) = 57750
+SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7
+SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297
+SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c217c0499ef5573ab7176352229451
+SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552
+SHA256 (shirou-gopsutil-v2.20.9_GH0.tar.gz) = 1d3ebcd95e78b16c71ba3e95fea5cb7352e40d275caed84d024418cfe27349cc
+SIZE (shirou-gopsutil-v2.20.9_GH0.tar.gz) = 140491
+SHA256 (shopspring-decimal-v1.2.0_GH0.tar.gz) = 59fa76645f63d7383d3f306fe2f7136d923e2aa514d9a9353938d9654b842f58
+SIZE (shopspring-decimal-v1.2.0_GH0.tar.gz) = 37755
+SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
+SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
+SHA256 (spf13-cobra-v0.0.5_GH0.tar.gz) = 79226ce00e2b91306277e679d024eea6d17d0c02fc671555fd25df0c3ea07423
+SIZE (spf13-cobra-v0.0.5_GH0.tar.gz) = 111126
+SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+SHA256 (stretchr-objx-v0.2.0_GH0.tar.gz) = be7dce02798cdc24cee6bd2d95bfcf6976b1521ef735349bf5e7dfe6d147746f
+SIZE (stretchr-objx-v0.2.0_GH0.tar.gz) = 79981
+SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
+SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
+SHA256 (tsg-go-daemon-e704b93fd89b_GH0.tar.gz) = 3dfd972df49c40d6c4d14c729f7cecdbe4771e6cc1ede49dc42a863d94247694
+SIZE (tsg-go-daemon-e704b93fd89b_GH0.tar.gz) = 7066
+SHA256 (tsg-gopacket-2ab8e397a786_GH0.tar.gz) = 85a53a77b8647b350f9a37174cb9f6ee2d9215de61d755b91ee59c962d0486ae
+SIZE (tsg-gopacket-2ab8e397a786_GH0.tar.gz) = 605163
+SHA256 (uber-go-atomic-v1.5.0_GH0.tar.gz) = 3b003515efb86c67aced0ce9e954cca50964ee0afe83e5a63dfe43aa58347290
+SIZE (uber-go-atomic-v1.5.0_GH0.tar.gz) = 9365
+SHA256 (uber-go-multierr-v1.3.0_GH0.tar.gz) = 54bba1d61d996b98ccdf1d353e0fc66bbff599fe202719d1f55e490e127be574
+SIZE (uber-go-multierr-v1.3.0_GH0.tar.gz) = 11537
+SHA256 (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = a7d91d3ddea6d8a83240af46436e02d65b835b60bcb85ad1c5bc6aebad32f567
+SIZE (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = 11054
+SHA256 (uber-go-zap-v1.14.0_GH0.tar.gz) = b2dfc553e09a151a02576bd4289f199ae37e827274a789a75ae161cc5b3f56ac
+SIZE (uber-go-zap-v1.14.0_GH0.tar.gz) = 125173
+SHA256 (ugorji-go-v1.1.8_GH0.tar.gz) = 7c351a1376b0fdc1838a04ab547c4e41fae9b17e4d755e86b568fa12033343c8
+SIZE (ugorji-go-v1.1.8_GH0.tar.gz) = 285652
+SHA256 (urso-diag-21b3cc8eb797_GH0.tar.gz) = 6a3b14d2bf23a5fef638dc51851d38c50038324af9112287843f267687468934
+SIZE (urso-diag-21b3cc8eb797_GH0.tar.gz) = 34525
+SHA256 (urso-go-bin-781c575c9f0e_GH0.tar.gz) = 2680616df52967de0b5a904bbfd1184990dc4aa47101418cd04bad3e0088e03a
+SIZE (urso-go-bin-781c575c9f0e_GH0.tar.gz) = 8232
+SHA256 (urso-magetools-290c89e0c230_GH0.tar.gz) = 197fb140865b30794252888e96d7d837d28809e9a45d7c2a91575bc4362781bd
+SIZE (urso-magetools-290c89e0c230_GH0.tar.gz) = 6417
+SHA256 (urso-sderr-c2a16f3d43ec_GH0.tar.gz) = 51a557581105fac620995d41fdd18951dd1bab0786aa87c8aa28709a7e8b1f66
+SIZE (urso-sderr-c2a16f3d43ec_GH0.tar.gz) = 9750
+SHA256 (vmware-govmomi-2cad15190b41_GH0.tar.gz) = 01a96f4ba7630bb11addee19188fd321d394f34df4b9b406652e30f9b7a23b50
+SIZE (vmware-govmomi-2cad15190b41_GH0.tar.gz) = 816453
+SHA256 (xanzy-go-gitlab-v0.22.3_GH0.tar.gz) = aa40b2b1897d80d9e33f55b42433d47b24bd70ef25f0db2d0e5661d0d4921d59
+SIZE (xanzy-go-gitlab-v0.22.3_GH0.tar.gz) = 157131
+SHA256 (yuin-gopher-lua-b402f3114ec7_GH0.tar.gz) = 711f25e8fadcb10acdc75d3eadf73b9f1ba71f86269b519ef9a092e4c7716cd5
+SIZE (yuin-gopher-lua-b402f3114ec7_GH0.tar.gz) = 148939
+SHA256 (go-plist-591f970eefbbeb04d7b37f334a0c4c3256e32876_GL0.tar.gz) = 08e833247af19e58496741bd690e2445e2e5fa7ca11b2849db4310f42f26ed64
+SIZE (go-plist-591f970eefbbeb04d7b37f334a0c4c3256e32876_GL0.tar.gz) = 49099
diff --git a/sysutils/beats7/files/auditbeat.in b/sysutils/beats7/files/auditbeat.in
new file mode 100644
index 000000000000..4091c69b6182
--- /dev/null
+++ b/sysutils/beats7/files/auditbeat.in
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# PROVIDE: auditbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable auditbeat:
+#
+# auditbeat_enable (bool):	Set to YES to enable auditbeat
+# 				Default: NO
+# auditbeat_flags (str):	Extra flags passed to auditbeat
+# auditbeat_config (str):	auditbeat configuration directory
+#				Default: ${PREFIX}/etc/beats
+# auditbeat_conffile (str):	auditbeat configuration file
+#				relative to ${auditbeat_conf}
+#				Default: auditbeat.yml
+
+. /etc/rc.subr
+
+name="auditbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${auditbeat_enable:="NO"}
+: ${auditbeat_config:="%%ETCDIR%%"}
+: ${auditbeat_conffile:="auditbeat.yml"}
+: ${auditbeat_home:="%%DATADIR%%/auditbeat"}
+: ${auditbeat_logs:="/var/log/beats"}
+: ${auditbeat_data:="/var/db/beats/auditbeat"}
+
+# daemon
+start_precmd=auditbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${auditbeat_flags} --path.config ${auditbeat_config} --path.home ${auditbeat_home} --path.data ${auditbeat_data} --path.logs ${auditbeat_logs} -c ${auditbeat_conffile}"
+auditbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+# auditbeat will refuse to quit if linprocfs is mounted, and sadly requires -9
+[ -f /compat/linux/proc/cpuinfo ] && stop_cmd=auditbeat_stop
+
+auditbeat_stop() {
+	pkill -9 -F ${pidfile} > /dev/null 2>&1
+	pkill -9 -F ${pidfile}.child > /dev/null 2>&1
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats7/files/filebeat.in b/sysutils/beats7/files/filebeat.in
new file mode 100644
index 000000000000..8ae08af5b398
--- /dev/null
+++ b/sysutils/beats7/files/filebeat.in
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# PROVIDE: filebeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable filebeat:
+#
+# filebeat_enable (bool):	Set to YES to enable filebeat
+# 				Default: NO
+# filebeat_flags (str):		Extra flags passed to filebeat
+# filebeat_config (str):	filebeat configuration directory
+#				Default: ${PREFIX}/etc/beats
+# filebeat_conffile (str):	filebeat configuration file
+#				relative to ${filebeat_conf}
+#				Default: filebeat.yml
+
+. /etc/rc.subr
+
+name="filebeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${filebeat_enable:="NO"}
+: ${filebeat_config:="%%ETCDIR%%"}
+: ${filebeat_conffile:="filebeat.yml"}
+: ${filebeat_home:="%%DATADIR%%/filebeat"}
+: ${filebeat_logs:="/var/log/beats"}
+: ${filebeat_data:="/var/db/beats/filebeat"}
+
+# daemon
+start_precmd=filebeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_flags} --path.config ${filebeat_config} --path.home ${filebeat_home} --path.data ${filebeat_data} --path.logs ${filebeat_logs} -c ${filebeat_conffile}"
+
+filebeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats7/files/heartbeat.in b/sysutils/beats7/files/heartbeat.in
new file mode 100644
index 000000000000..d99374ab011c
--- /dev/null
+++ b/sysutils/beats7/files/heartbeat.in
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# PROVIDE: heartbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable heartbeat:
+#
+# heartbeat_enable (bool):	Set to YES to enable heartbeat
+# 				Default: NO
+# heartbeat_flags (str):	Extra flags passed to heartbeat
+# heartbeat_config (str):	heartbeat configuration directory
+#				Default: ${PREFIX}/etc/beats
+# heartbeat_conffile (str):	heartbeat configuration file
+#				relative to ${heartbeat_conf}
+#				Default: heartbeat.yml
+
+. /etc/rc.subr
+
+name="heartbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${heartbeat_enable:="NO"}
+: ${heartbeat_config:="%%ETCDIR%%"}
+: ${heartbeat_conffile:="heartbeat.yml"}
+: ${heartbeat_home:="%%DATADIR%%/heartbeat"}
+: ${heartbeat_logs:="/var/log/beats"}
+: ${heartbeat_data:="/var/db/beats/heartbeat"}
+
+
+# daemon
+start_precmd=heartbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_flags} --path.config ${heartbeat_config} --path.home ${heartbeat_home} --path.data ${heartbeat_data} --path.logs ${heartbeat_logs} -c ${heartbeat_conffile}"
+
+heartbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats7/files/metricbeat.in b/sysutils/beats7/files/metricbeat.in
new file mode 100644
index 000000000000..270966c4f669
--- /dev/null
+++ b/sysutils/beats7/files/metricbeat.in
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# PROVIDE: metricbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable metricbeat:
+#
+# metricbeat_enable (bool):	Set to YES to enable metricbeat
+# 				Default: NO
+# metricbeat_flags (str):	Extra flags passed to metricbeat
+# metricbeat_config (str):	metricbeat configuration directory
+#				Default: ${PREFIX}/etc/beats
+# metricbeat_conffile (str):	metricbeat configuration file
+#				relative to ${metricbeat_conf}
+#				Default: metricbeat.yml
+
+. /etc/rc.subr
+
+name="metricbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${metricbeat_enable:="NO"}
+: ${metricbeat_config:="%%ETCDIR%%"}
+: ${metricbeat_conffile:="metricbeat.yml"}
+: ${metricbeat_home:="%%DATADIR%%/metricbeat"}
+: ${metricbeat_logs:="/var/log/beats"}
+: ${metricbeat_data:="/var/db/beats/metricbeat"}
+
+# daemon
+start_precmd=metricbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${metricbeat_flags} --path.config ${metricbeat_config} --path.home ${metricbeat_home} --path.data ${metricbeat_data} --path.logs ${metricbeat_logs} -c ${metricbeat_conffile}"
+
+metricbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+# metricbeat will refuse to quit if linprocfs is mounted, and sadly requires -9
+[ -f /compat/linux/proc/cpuinfo ] && stop_cmd=metricbeat_stop
+
+metricbeat_stop() {
+	pkill -9 -F ${pidfile} > /dev/null 2>&1
+	pkill -9 -F ${pidfile}.child > /dev/null 2>&1
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats7/files/packetbeat.in b/sysutils/beats7/files/packetbeat.in
new file mode 100644
index 000000000000..4dc21856c49a
--- /dev/null
+++ b/sysutils/beats7/files/packetbeat.in
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# PROVIDE: packetbeat
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable packetbeat
+#
+# packetbeat_enable (bool):	Set to YES to enable packetbeat
+# 				Default: NO
+# packetbeat_flags (str):	Extra flags passed to packetbeat
+# packetbeat_config (str):	packetbeat configuration directory
+#				Default: ${PREFIX}/etc/beats
+# packetbeat_conffile (str):	packetbeat configuration file
+#				relative to ${packetbeat_conf}
+#				Default: packetbeat.yml
+
+. /etc/rc.subr
+
+name="packetbeat"
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${packetbeat_enable:="NO"}
+: ${packetbeat_config:="%%ETCDIR%%"}
+: ${packetbeat_conffile:="packetbeat.yml"}
+: ${packetbeat_home:="%%DATADIR%%/packetbeat"}
+: ${packetbeat_logs:="/var/log/beats"}
+: ${packetbeat_data:="/var/db/beats/packetbeat"}
+
+# daemon
+start_precmd=packetbeat_prestart
+command=/usr/sbin/daemon
+pidfile="/var/run/${name}"
+command_args="-frP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_flags} --path.config ${packetbeat_config} --path.home ${packetbeat_home} --path.data ${packetbeat_data} --path.logs ${packetbeat_logs} -c ${packetbeat_conffile}"
+
+packetbeat_prestart() {
+# Have to empty rc_flags so they don't get passed to daemon(8)
+	rc_flags=""
+}
+
+run_rc_command "$1"
diff --git a/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml b/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml
new file mode 100644
index 000000000000..be8e71ffaffe
--- /dev/null
+++ b/sysutils/beats7/files/patch-auditbeat_auditbeat.reference.yml
@@ -0,0 +1,11 @@
+--- auditbeat/auditbeat.reference.yml.orig	2020-09-25 20:02:33 UTC
++++ auditbeat/auditbeat.reference.yml
+@@ -14,7 +14,7 @@
+ auditbeat.config.modules:
+ 
+   # Glob pattern for configuration reloading
+-  path: ${path.config}/modules.d/*.yml
++  path: ${path.config}/auditbeat.modules.d/*.yml
+ 
+   # Period on which files under path should be checked for changes
+   reload.period: 10s
diff --git a/sysutils/beats7/files/patch-dev-tools_mage_settings.go b/sysutils/beats7/files/patch-dev-tools_mage_settings.go
new file mode 100644
index 000000000000..876a7b32ab45
--- /dev/null
+++ b/sysutils/beats7/files/patch-dev-tools_mage_settings.go
@@ -0,0 +1,20 @@
+--- dev-tools/mage/settings.go.orig	2020-08-22 20:18:50 UTC
++++ dev-tools/mage/settings.go
+@@ -30,7 +30,6 @@ import (
+ 	"sync"
+ 	"time"
+ 
+-	"github.com/magefile/mage/sh"
+ 	"github.com/pkg/errors"
+ 	"golang.org/x/tools/go/vcs"
+ 
+@@ -233,7 +232,8 @@ var (
+ func CommitHash() (string, error) {
+ 	var err error
+ 	commitHashOnce.Do(func() {
+-		commitHash, err = sh.Output("git", "rev-parse", "HEAD")
++		err = nil
++		commitHash = "%%BEATSVERSION%%"
+ 	})
+ 	return commitHash, err
+ }
diff --git a/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml b/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml
new file mode 100644
index 000000000000..bf0927a2f8a2
--- /dev/null
+++ b/sysutils/beats7/files/patch-filebeat_filebeat.reference.yml
@@ -0,0 +1,11 @@
+--- filebeat/filebeat.reference.yml.orig	2020-09-25 20:03:46 UTC
++++ filebeat/filebeat.reference.yml
+@@ -840,7 +840,7 @@ filebeat.inputs:
+     #reload.period: 10s
+   #modules:
+     #enabled: false
+-    #path: modules.d/*.yml
++    #path: filebeat.modules.d/*.yml
+     #reload.enabled: true
+     #reload.period: 10s
+ 
diff --git a/sysutils/beats7/files/patch-filebeat_filebeat.yml b/sysutils/beats7/files/patch-filebeat_filebeat.yml
new file mode 100644
index 000000000000..56b3dc0a2409
--- /dev/null
+++ b/sysutils/beats7/files/patch-filebeat_filebeat.yml
@@ -0,0 +1,22 @@
+--- filebeat/filebeat.yml.orig	2020-09-17 22:28:49 UTC
++++ filebeat/filebeat.yml
+@@ -66,7 +66,7 @@ filebeat.inputs:
+ 
+ filebeat.config.modules:
+   # Glob pattern for configuration loading
+-  path: ${path.config}/modules.d/*.yml
++  path: ${path.config}/filebeat.modules.d/*.yml
+ 
+   # Set to true to enable config reloading
+   reload.enabled: false
+@@ -176,8 +176,8 @@ processors:
+   - add_host_metadata:
+       when.not.contains.tags: forwarded
+   - add_cloud_metadata: ~
+-  - add_docker_metadata: ~
+-  - add_kubernetes_metadata: ~
++#  - add_docker_metadata: ~
++#  - add_kubernetes_metadata: ~
+ 
+ # ================================== Logging ===================================
+ 
diff --git a/sysutils/beats7/files/patch-libbeat_scripts_Makefile b/sysutils/beats7/files/patch-libbeat_scripts_Makefile
new file mode 100644
index 000000000000..94c45082d3b7
--- /dev/null
+++ b/sysutils/beats7/files/patch-libbeat_scripts_Makefile
@@ -0,0 +1,37 @@
+Fix syntax for sh (get rid of bash-isms)
+
+--- libbeat/scripts/Makefile.orig	2020-08-11 15:19:45 UTC
++++ libbeat/scripts/Makefile
+@@ -42,7 +42,7 @@ GOFILES = $(shell find . -type f -name '*.go' 2>/dev/n
+ GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*" 2>/dev/null)
+ GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go' 2>/dev/null)
+ GOPACKAGES_STRESSTESTS=$(shell find . -name '*.go' 2>/dev/null | xargs awk 'FNR>1 {nextfile} /\+build.*stresstest/ {print FILENAME; nextfile}' | xargs dirname | uniq)
+-SHELL=bash
++SHELL=sh
+ ES_HOST?=elasticsearch
+ ES_PORT?=9200
+ ES_USER?=beats
+@@ -139,7 +139,7 @@ ${BEAT_NAME}.test: $(GOFILES_ALL)
+ .PHONY: crosscompile
+ crosscompile: ## @build Cross-compile beat for the OS'es specified in GOX_OS variable. The binaries are placed in the build/bin directory.
+ crosscompile: $(GOFILES)
+-ifneq ($(shell [[ $(BEAT_NAME) == journalbeat ]] && echo true ),true)
++ifneq ($(shell [ $(BEAT_NAME) = journalbeat ] && echo true ),true)
+ 	go ${INSTALL_CMD} github.com/mitchellh/gox
+ 	mkdir -p ${BUILD_DIR}/bin
+ 	gox -output="${BUILD_DIR}/bin/{{.Dir}}-{{.OS}}-{{.Arch}}" -os="$(strip $(GOX_OS))" -osarch="$(strip $(GOX_OSARCH))" ${GOX_FLAGS}
+@@ -355,12 +355,12 @@ ifndef EXCLUDE_COMMON_UPDATE_TARGET
+ update: python-env fields collect config ## @build Update expects the most recent version of libbeat in the GOPATH
+ 	@echo "Updating generated files for ${BEAT_NAME}"
+ 
+-ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
++ifneq ($(shell [ $(BEAT_NAME) = libbeat -o $(BEAT_NAME) = metricbeat ] && echo true ),true)
+ 	mkdir -p include
+ 	go run ${INSTALL_FLAG} ${ES_BEATS}/dev-tools/cmd/asset/asset.go -license $(LICENSE) -pkg include -in fields.yml -out include/fields.go $(BEAT_NAME)
+ endif
+ 
+-ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
++ifneq ($(shell [ $(BEAT_NAME) = libbeat -o $(BEAT_NAME) = metricbeat ] && echo true ),true)
+ 	@# Update docs
+ 	@mkdir -p docs
+ 	@${PYTHON_ENV_EXE} ${ES_BEATS}/libbeat/scripts/generate_fields_docs.py $(PWD)/fields.yml ${BEAT_TITLE} ${ES_BEATS}
diff --git a/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml b/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml
new file mode 100644
index 000000000000..d568583ad448
--- /dev/null
+++ b/sysutils/beats7/files/patch-metricbeat_metricbeat.reference.yml
@@ -0,0 +1,11 @@
+--- metricbeat/metricbeat.reference.yml.orig	2020-09-25 20:07:52 UTC
++++ metricbeat/metricbeat.reference.yml
+@@ -14,7 +14,7 @@
+ metricbeat.config.modules:
+ 
+   # Glob pattern for configuration reloading
+-  path: ${path.config}/modules.d/*.yml
++  path: ${path.config}/metricbeat.modules.d/*.yml
+ 
+   # Period on which files under path should be checked for changes
+   reload.period: 10s
diff --git a/sysutils/beats7/files/patch-metricbeat_metricbeat.yml b/sysutils/beats7/files/patch-metricbeat_metricbeat.yml
new file mode 100644
index 000000000000..ab654fa91272
--- /dev/null
+++ b/sysutils/beats7/files/patch-metricbeat_metricbeat.yml
@@ -0,0 +1,22 @@
+--- metricbeat/metricbeat.yml.orig	2020-09-17 22:28:49 UTC
++++ metricbeat/metricbeat.yml
+@@ -11,7 +11,7 @@
+ 
+ metricbeat.config.modules:
+   # Glob pattern for configuration loading
+-  path: ${path.config}/modules.d/*.yml
++  path: ${path.config}/metricbeat.modules.d/*.yml
+ 
+   # Set to true to enable config reloading
+   reload.enabled: false
+@@ -123,8 +123,8 @@ output.elasticsearch:
+ processors:
+   - add_host_metadata: ~
+   - add_cloud_metadata: ~
+-  - add_docker_metadata: ~
+-  - add_kubernetes_metadata: ~
++#  - add_docker_metadata: ~
++#  - add_kubernetes_metadata: ~
+ 
+ 
+ # ================================== Logging ===================================
diff --git a/sysutils/beats7/files/patch-packetbeat_packetbeat.yml b/sysutils/beats7/files/patch-packetbeat_packetbeat.yml
new file mode 100644
index 000000000000..a635cea06227
--- /dev/null
+++ b/sysutils/beats7/files/patch-packetbeat_packetbeat.yml
@@ -0,0 +1,15 @@
+--- packetbeat/packetbeat.yml.orig	2020-08-11 15:19:45 UTC
++++ packetbeat/packetbeat.yml
+@@ -10,8 +10,10 @@
+ # =============================== Network device ===============================
+ 
+ # Select the network interface to sniff the data. On Linux, you can use the
+-# "any" keyword to sniff on all connected interfaces.
+-packetbeat.interfaces.device: any
++# "any" keyword to sniff on all connected interfaces. FreeBSD is a bit different
++# and the beats programmers did not bother to implement it, so you must set this
++# to your preferred device
++packetbeat.interfaces.device: em0
+ 
+ # =================================== Flows ====================================
+ 
diff --git a/sysutils/beats7/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go b/sysutils/beats7/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go
new file mode 100644
index 000000000000..a8394bbc5084
--- /dev/null
+++ b/sysutils/beats7/files/patch-vendor_github.com_docker_docker_pkg_system_mknod.go
@@ -0,0 +1,11 @@
+--- vendor/github.com/docker/docker/pkg/system/mknod.go.orig	2020-08-22 15:24:38 UTC
++++ vendor/github.com/docker/docker/pkg/system/mknod.go
+@@ -9,7 +9,7 @@ import (
+ // Mknod creates a filesystem node (file, device special file or named pipe) named path
+ // with attributes specified by mode and dev.
+ func Mknod(path string, mode uint32, dev int) error {
+-	return unix.Mknod(path, mode, dev)
++	return unix.Mknod(path, mode, uint64(dev))
+ }
+ 
+ // Mkdev is used to build the value of linux devices (in /dev/) which specifies major
diff --git a/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go b/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go
new file mode 100644
index 000000000000..75565f7fec27
--- /dev/null
+++ b/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go
@@ -0,0 +1,13 @@
+--- vendor/github.com/godbus/dbus/transport_unixcred_freebsd.go.orig	2019-04-22 16:23:47 UTC
++++ vendor/github.com/godbus/dbus/transport_unixcred_freebsd.go
+@@ -8,8 +8,9 @@
+ package dbus
+ 
+ /*
+-const int sizeofPtr = sizeof(void*);
++static const int sizeofPtr = sizeof(void*);
+ #define _WANT_UCRED
++#include <sys/types.h>
+ #include <sys/ucred.h>
+ */
+ import "C"
diff --git a/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__freebsd.go b/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__freebsd.go
new file mode 100644
index 000000000000..5bd94a96d4af
--- /dev/null
+++ b/sysutils/beats7/files/patch-vendor_github.com_godbus_dbus_v5_transport__unixcred__freebsd.go
@@ -0,0 +1,13 @@
+--- vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go.orig	2019-09-30 20:29:11 UTC
++++ vendor/github.com/godbus/dbus/v5/transport_unixcred_freebsd.go
+@@ -8,8 +8,9 @@
+ package dbus
+ 
+ /*
+-const int sizeofPtr = sizeof(void*);
++static const int sizeofPtr = sizeof(void*);
+ #define _WANT_UCRED
++#include <sys/types.h>
+ #include <sys/ucred.h>
+ */
+ import "C"
diff --git a/sysutils/beats7/files/patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go b/sysutils/beats7/files/patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go
new file mode 100644
index 000000000000..49bf705ac5b3
--- /dev/null
+++ b/sysutils/beats7/files/patch-vendor_github.com_insomniacslk_dhcp_dhcpv4_bindtodevice__bsd.go
@@ -0,0 +1,21 @@
+--- vendor/github.com/insomniacslk/dhcp/dhcpv4/bindtodevice_bsd.go.orig	2020-08-22 20:10:53 UTC
++++ vendor/github.com/insomniacslk/dhcp/dhcpv4/bindtodevice_bsd.go
+@@ -0,0 +1,18 @@
++// build freebsd openbsd netbsd
++
++package dhcpv4
++
++import (
++      "net"
++      "syscall"
++)
++
++// BindToInterface emulates linux's SO_BINDTODEVICE option for a socket by using
++// IP_RECVIF.
++func BindToInterface(fd int, ifname string) error {
++      iface, err := net.InterfaceByName(ifname)
++      if err != nil {
++              return err
++      }
++      return syscall.SetsockoptInt(fd, syscall.IPPROTO_IP, syscall.IP_RECVIF, iface.Index)
++}
diff --git a/sysutils/beats7/files/patch-vendor_github.com_opencontainers_runc_vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go b/sysutils/beats7/files/patch-vendor_github.com_opencontainers_runc_vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go
new file mode 100644
index 000000000000..5d5ccfb4631b
--- /dev/null
+++ b/sysutils/beats7/files/patch-vendor_github.com_opencontainers_runc_vendor_github.com_godbus_dbus_transport__unixcred__freebsd.go
@@ -0,0 +1,13 @@
+--- vendor/github.com/opencontainers/runc/vendor/github.com/godbus/dbus/transport_unixcred_freebsd.go.orig	2019-09-30 16:36:09 UTC
++++ vendor/github.com/opencontainers/runc/vendor/github.com/godbus/dbus/transport_unixcred_freebsd.go
+@@ -8,8 +8,9 @@
+ package dbus
+ 
+ /*
+-const int sizeofPtr = sizeof(void*);
++static const int sizeofPtr = sizeof(void*);
+ #define _WANT_UCRED
++#include <sys/types.h>#include <sys/types.h>
+ #include <sys/ucred.h>
+ */
+ import "C"
diff --git a/sysutils/beats7/pkg-descr b/sysutils/beats7/pkg-descr
new file mode 100644
index 000000000000..fffdb0f6fb43
--- /dev/null
+++ b/sysutils/beats7/pkg-descr
@@ -0,0 +1,20 @@
+Beats is the platform for building lightweight, open source data
+shippers for many types of operational data you want to enrich with
+Logstash, search and analyze in Elasticsearch, and visualize in Kibana.
+Whether you're interested in log files, infrastructure metrics, network
+packets, or any other type of data, Beats serves as the foundation for
+keeping a beat on your data.
+
+Filebeat is a lightweight, open source shipper for log file data. As the
+next-generation Logstash Forwarder, Filebeat tails logs and quickly
+sends this information to Logstash for further parsing and enrichment or
+to Elasticsearch for centralized storage and analysis.
+
+Metricbeat Collect metrics from your systems and services. From CPU to memory,
+Redis to Nginx, and much more, Metricbeat is a lightweight way to send system
+and service statistics.
+
+Packetbeat is a lightweight network packet analyzer that sends data to Logstash
+or Elasticsearch.
+
+WWW: https://www.elastic.co/products/beats/
diff --git a/sysutils/beats7/pkg-plist b/sysutils/beats7/pkg-plist
new file mode 100644
index 000000000000..800876c2f36e
--- /dev/null
+++ b/sysutils/beats7/pkg-plist
@@ -0,0 +1,1270 @@
+%%AUDITBEAT%%sbin/auditbeat
+%%AUDITBEAT%%%%ETCDIR%%/auditbeat.yml.reference
+%%AUDITBEAT%%%%ETCDIR%%/auditbeat.yml.sample
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-file-integrity.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-kernel-executions.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-kernel-overview.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/kibana/7/dashboard/auditbeat-kernel-sockets.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/accept.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/audit.rules.d/sample-rules-linux-32bit.conf
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/audit.rules.d/sample-rules-linux-64bit.conf
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/config.yml.tmpl
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/data.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/docs.asciidoc
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/execve.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/fields.yml
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-executions.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-overview.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/_meta/kibana/7/dashboard/auditbeat-kernel-sockets.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/auditd/module.yml
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/config.yml.tmpl
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/data.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/docs.asciidoc
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/fields.yml
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/_meta/kibana/7/dashboard/auditbeat-file-integrity.json
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/module.yml
+%%AUDITBEAT%%%%DATADIR%%/auditbeat/module/file_integrity/schema.fbs
+%%AUDITBEAT%%@dir %%DATADIR%%/auditbeat/module/file_integrity/monitor
+%%AUDITBEAT%%@dir %%DATADIR%%/auditbeat/module/file_integrity/schema
+%%AUDITBEAT%%@dir /var/db/beats/auditbeat
+%%FILEBEAT%%sbin/filebeat
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/apache.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/auditd.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/elasticsearch.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/haproxy.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/icinga.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/iis.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/kafka.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/kibana.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/logstash.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/mongodb.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/mysql.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/nats.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/nginx.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/osquery.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/postgresql.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/redis.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/santa.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/system.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.modules.d/traefik.yml.disabled
+%%FILEBEAT%%%%ETCDIR%%/filebeat.yml.reference
+%%FILEBEAT%%%%ETCDIR%%/filebeat.yml.sample
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Kafka-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Mongodb-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Postgresql-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-Postgresql-slowlogs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-apache.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-auditd.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-auth-sudo-commands.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-haproxy-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-icinga-debug-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-icinga-main-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-icinga-startup-errors.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-iis.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-logstash-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-logstash-slowlog.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-mysql.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nats-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-new-users-and-groups.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-ingress-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-ingress-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-nginx-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-redis.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-ssh-login-attempts.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-syslog.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/Filebeat-traefik-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/filebeat-santa-log-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/osquery-compliance.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/kibana/7/dashboard/osquery-rootkit.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/_meta/kibana/7/dashboard/Filebeat-apache.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/config/access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/config/error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/apache2/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/_meta/kibana/7/dashboard/Filebeat-auditd.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/auditd/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/config/audit.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-json.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline-plaintext.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/audit/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline-json.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline-plaintext.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/deprecation/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/config/gc.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/gc/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline-json.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline-plaintext.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/server/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline-json.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline-plaintext.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/elasticsearch/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/_meta/kibana/7/dashboard/Filebeat-haproxy-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/config/file.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/config/syslog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/haproxy/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-debug-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-main-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/_meta/kibana/7/dashboard/Filebeat-icinga-startup-errors.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/config/debug.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/debug/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/config/main.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/main/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/config/startup.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/icinga/startup/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/_meta/kibana/7/dashboard/Filebeat-iis.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/config/iis-access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/config/iis-error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/iis/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/_meta/kibana/7/dashboard/Filebeat-Kafka-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kafka/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/kibana/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-log.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/_meta/kibana/7/dashboard/Filebeat-logstash-slowlog.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-json.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline-plaintext.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-json.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline-plaintext.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/logstash/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/_meta/kibana/7/dashboard/Filebeat-Mongodb-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mongodb/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/_meta/kibana/7/dashboard/Filebeat-mysql.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/config/error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/mysql/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/_meta/kibana/7/dashboard/Filebeat-nats-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nats/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-ingress-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-ingress-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-logs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/_meta/kibana/7/dashboard/Filebeat-nginx-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/config/nginx-access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/config/nginx-error.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/error/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/config/ingress_controller.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/ingress_controller/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/nginx/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-compliance.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/_meta/kibana/7/dashboard/osquery-rootkit.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/config/result.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/osquery/result/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/kibana/7/dashboard/Filebeat-Postgresql-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/_meta/kibana/7/dashboard/Filebeat-Postgresql-slowlogs.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/postgresql/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/_meta/kibana/7/dashboard/Filebeat-redis.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/config/log.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/config/slowlog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/ingest/pipeline.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/redis/slowlog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/_meta/kibana/7/dashboard/filebeat-santa-log-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/log/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/log/config/file.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/log/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/log/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/santa/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-auth-sudo-commands.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-new-users-and-groups.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-ssh-login-attempts.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/_meta/kibana/7/dashboard/Filebeat-syslog.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/config/auth.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/auth/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/module.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/config/syslog.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/system/syslog/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/config.reference.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/config.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/docs.asciidoc
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/_meta/kibana/7/dashboard/Filebeat-traefik-overview.json
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/_meta/fields.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/config/traefik-access.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/ingest/pipeline.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/access/manifest.yml
+%%FILEBEAT%%%%DATADIR%%/filebeat/module/traefik/module.yml
+%%FILEBEAT%%@dir /var/db/beats/filebeat
+%%HEARTBEAT%%sbin/heartbeat
+%%HEARTBEAT%%%%ETCDIR%%/heartbeat.yml.reference
+%%HEARTBEAT%%%%ETCDIR%%/heartbeat.yml.sample
+%%HEARTBEAT%%@dir %%DATADIR%%/heartbeat/kibana
+%%HEARTBEAT%%@dir /var/db/beats/heartbeat
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/aerospike.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/apache.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/beat-xpack.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/beat.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/ceph-mgr.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/ceph.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/consul.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/couchbase.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/couchdb.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/docker.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/dropwizard.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/elasticsearch-xpack.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/elasticsearch.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/envoyproxy.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/etcd.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/golang.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/graphite.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/haproxy.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/http.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/jolokia.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kafka.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kibana-xpack.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kibana.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kubernetes.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/kvm.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/linux.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/logstash-xpack.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/logstash.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/memcached.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/mongodb.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/munin.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/mysql.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/nats.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/nginx.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/php_fpm.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/postgresql.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/prometheus.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/rabbitmq.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/redis.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/system.yml
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/traefik.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/uwsgi.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/vsphere.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/windows.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.modules.d/zookeeper.yml.disabled
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.yml.reference
+%%METRICBEAT%%%%ETCDIR%%/metricbeat.yml.sample
+%%METRICBEAT%%sbin/metricbeat
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-Host-Services-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-aerospike-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-apache-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-ceph-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-consul-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-containers-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-couchbase-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-couchdb-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-docker-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-golang-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-backend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-frontend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-http-backend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-http-frontend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-http-server.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-haproxy-visualizations.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-host-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-kafka-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-kubernetes-apiserver.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-kubernetes-controller-manager.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-kubernetes-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-kubernetes-proxy.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-kubernetes-scheduler.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-mongodb-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-mysql-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-nats-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-postgresql-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-prometheus-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-rabbitmq-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-redis-keys.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-redis-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-system-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-uwsgi-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/Metricbeat-zookeeper-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-nginx-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-vsphere-host.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-vsphere-vm.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/kibana/7/dashboard/metricbeat-windows-service.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/_meta/kibana/7/dashboard/Metricbeat-aerospike-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/aerospike/namespace/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/httpd.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/kibana/7/dashboard/Metricbeat-apache-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/apache/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/config-xpack.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/_meta/healthcheck.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/state/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/state/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/state/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/beat/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile.jewel
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/Dockerfile.nautilus
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config-mgr.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/healthcheck.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/kibana/7/dashboard/Metricbeat-ceph-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_disk/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/cluster_status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_disk/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_disk/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_disk/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_cluster_health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_perf/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_perf/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_perf/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_pool_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_pool_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_pool_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_tree/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_tree/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_osd_tree/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_pool_disk/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_pool_disk/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/mgr_pool_disk/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/monitor_health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_df/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/osd_tree/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/ceph/pool_disk/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/_meta/kibana/7/dashboard/Metricbeat-consul-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/agent/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/agent/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/agent/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/consul/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/configure-node.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/_meta/kibana/7/dashboard/Metricbeat-couchbase-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/bucket/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/cluster/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchbase/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/_meta/kibana/7/dashboard/Metricbeat-couchdb-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/_meta/local.ini
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/couchdb/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/_meta/kibana/7/dashboard/Metricbeat-docker-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/container/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/container/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/container/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/cpu/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/cpu/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/cpu/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/diskio/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/diskio/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/diskio/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/event/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/event/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/event/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/healthcheck/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/image/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/image/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/image/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/info/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/info/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/info/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/memory/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/memory/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/memory/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/network/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/network/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/docker/network/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/.dockerignore
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/collector/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/dropwizard/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config-xpack.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ccr/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/cluster_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/enrich/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/enrich/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/enrich/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_recovery/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/data-xpack.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/index_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/ml_job/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/data-xpack.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/node_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/pending_tasks/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/data-xpack.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/elasticsearch/shard/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/envoy.yaml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/envoyproxy/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/leader/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/leader/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/leader/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/metrics/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/metrics/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/metrics/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/self/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/self/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/self/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/store/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/store/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/etcd/store/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/_meta/kibana/7/dashboard/Metricbeat-golang-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/expvar/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/expvar/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/expvar/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/heap/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/heap/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/heap/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/golang/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/graphite/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/ca.crt
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/ca.key
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/ca.pem
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.crt
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.csr
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.key
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/client.pem
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/generate.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.crt
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.csr
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.key
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/certs/server.pem
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/haproxy.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-backend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-frontend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-backend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-frontend.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-http-server.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/kibana/7/dashboard/Metricbeat-haproxy-visualizations.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/info/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/info/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/info/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/haproxy/stat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/json/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/json/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/json/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/http/server/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/jolokia-1.5.0.sum
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/_meta/jolokia.xml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/jolokia/jmx/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/healthcheck.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/jaas-kafka-client-consumer.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/jaas-kafka-client-producer.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/kafka_server_jaas.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/kibana/7/dashboard/Metricbeat-kafka-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/run.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/sasl-consumer.properties
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/sasl-producer.properties
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/broker/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/broker/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/broker/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/broker/manifest.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumer/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumer/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumer/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumer/manifest.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/consumergroup/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/partition/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/partition/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/partition/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/producer/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/producer/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/producer/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kafka/producer/manifest.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/config-xpack.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kibana/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-apiserver.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-controller-manager.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-proxy.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-scheduler.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/apiserver/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/apiserver/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/container/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/controllermanager/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/controllermanager/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/controllermanager/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/controllermanager/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/event/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/kubernetes.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/pod/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/proxy/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/proxy/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/proxy/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/proxy/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/scheduler/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/scheduler/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/scheduler/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/scheduler/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_container/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_cronjob/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_cronjob/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_cronjob/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_cronjob/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_daemonset/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_daemonset/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_daemonset/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_deployment/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_persistentvolume/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_persistentvolume/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_persistentvolumeclaim/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_persistentvolumeclaim/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_persistentvolumeclaim/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_pod/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_replicaset/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_resourcequota/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_resourcequota/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_resourcequota/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_resourcequota/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_service/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_service/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_service/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_service/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_service/svc-out.txt
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_statefulset/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/state_storageclass/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/system/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kubernetes/volume/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/dommemstat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/kvm/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/conntrack/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/conntrack/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/conntrack/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/iostat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/iostat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/iostat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/ksm/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/ksm/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/ksm/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/memory/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/memory/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/memory/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/pageinfo/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/pageinfo/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/linux/pageinfo/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/config-xpack.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/healthcheck.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/_meta/pipeline/logstash.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/logstash/node_stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/memcached/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/_meta/kibana/7/dashboard/Metricbeat-mongodb-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/collstats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/dbstats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/metrics/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/replstatus/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mongodb/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/_meta/munin-node.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/munin/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/kibana/7/dashboard/Metricbeat-mysql-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/galera_status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/performance/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/performance/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/performance/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/performance/manifest.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/query/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/query/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/mysql/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/kibana/7/dashboard/Metricbeat-nats-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/run.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/connections/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/connections/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/connections/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/routes/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/routes/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/routes/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/stats/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/stats/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/stats/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/subscriptions/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/subscriptions/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nats/subscriptions/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/kibana/7/dashboard/metricbeat-nginx-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/_meta/nginx.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/nginx/stubstatus/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/_meta/php-fpm.conf
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/pool/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/php_fpm/process/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/docker-entrypoint-initdb.d/0-enable-pg_stat_statements.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/docker-entrypoint-initdb.d/1-create-extension-pg_stat_statements.sql
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/_meta/kibana/7/dashboard/Metricbeat-postgresql-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/activity/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/bgwriter/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/database/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/database/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/database/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/postgresql/statement/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/config.epr.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/kibana/7/dashboard/Metricbeat-prometheus-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/prometheus.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/_meta/run.sh
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/collector/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/query/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/query/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/query/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/remote_write/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/remote_write/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/prometheus/remote_write/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/_meta/kibana/7/dashboard/Metricbeat-rabbitmq-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/connection/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/exchange/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/node/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/rabbitmq/queue/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/7/dashboard/Metricbeat-redis-keys.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/kibana/7/dashboard/Metricbeat-redis-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/info/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/info/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/info/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/key/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/key/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/key/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/keyspace/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/redis/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-Host-Services-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-containers-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-host-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-system-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/core/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/core/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/core/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/cpu/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/cpu/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/cpu/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/diskio/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/diskio/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/diskio/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/entropy/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/entropy/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/entropy/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/filesystem/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/filesystem/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/filesystem/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/fsstat/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/fsstat/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/fsstat/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/load/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/load/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/load/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/memory/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/memory/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/memory/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network_summary/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/network_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process_summary/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/process_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/raid/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/raid/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/raid/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/service/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/service/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/service/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/data_inbound.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/data_outbound.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket_summary/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/socket_summary/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/uptime/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/users/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/users/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/system/users/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/_meta/traefik.toml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/health/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/health/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/traefik/health/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/.dockerignore
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/kibana/7/dashboard/Metricbeat-uwsgi-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/_meta/supported-versions.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/uwsgi/status/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/README.md
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-host.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/_meta/kibana/7/dashboard/metricbeat-vsphere-vm.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/datastore/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/host/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/vsphere/virtualmachine/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/_meta/kibana/7/dashboard/metricbeat-windows-service.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/module.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/perfmon/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/service/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/service/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/windows/service/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/Dockerfile
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/config.reference.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/config.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/_meta/kibana/7/dashboard/Metricbeat-zookeeper-overview.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/connection/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/connection/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/connection/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/docker-compose.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/mntr/_meta/fields.yml
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/data.json
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/docs.asciidoc
+%%METRICBEAT%%%%DATADIR%%/metricbeat/module/zookeeper/server/_meta/fields.yml
+%%METRICBEAT%%@dir %%DATADIR%%/metricbeat/module/ceph/mgr
+%%METRICBEAT%%@dir %%DATADIR%%/metricbeat/module/kubernetes/util
+%%METRICBEAT%%@dir %%DATADIR%%/metricbeat/module/system/raid/blockinfo
+%%METRICBEAT%%@dir /var/db/beats/metricbeat
+%%PACKETBEAT%%sbin/packetbeat
+%%PACKETBEAT%%%%ETCDIR%%/packetbeat.yml.reference
+%%PACKETBEAT%%%%ETCDIR%%/packetbeat.yml.sample
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-cassandra.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-dhcpv4.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-dns-overview.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-dns-tunneling.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-flows.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-http.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-mongodb.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-mysql.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-nfs.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-overview.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-pgsql.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-thrift.json
+%%PACKETBEAT%%%%DATADIR%%/packetbeat/kibana/7/dashboard/Packetbeat-tls.json
+%%PACKETBEAT%%@dir /var/db/beats/packetbeat
+@dir /var/db/beats
diff --git a/sysutils/bfs/Makefile b/sysutils/bfs/Makefile
index efb854fc83c7..bdec4094fad9 100644
--- a/sysutils/bfs/Makefile
+++ b/sysutils/bfs/Makefile
@@ -1,38 +1,23 @@
-# $FreeBSD$
-
 PORTNAME=	bfs
-DISTVERSION=	1.5.1
+DISTVERSION=	2.2
 CATEGORIES=	sysutils
 
-MAINTAINER=	tobik@FreeBSD.org
+MAINTAINER=	driesm.michiels@gmail.com
 COMMENT=	Breadth-first version of the UNIX find command
 
 LICENSE=	BSD0CLAUSE
-LICENSE_NAME=	BSD Zero Clause License
-LICENSE_FILE=	${WRKSRC}/COPYING
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		gmake shebangfix
+USES=		compiler:c11 gmake shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	tavianator
 
 SHEBANG_FILES=	tests.sh tests/*.sh
-
 TEST_TARGET=	check
 
-PLIST_FILES=	bin/bfs \
-		man/man1/bfs.1.gz
-
-post-patch:
-# Disable test_L_acl and test_acl tests since they assume POSIX.1e
-# ACLs and will fail on ZFS or tmpfs.
-	@${REINPLACE_CMD} -e '/^    test_acl/d' -e '/^    test_L_acl/d' \
-		${WRKSRC}/tests.sh
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bfs ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bfs.1 ${STAGEDIR}${MANPREFIX}/man/man1
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bfs
 
 .include <bsd.port.mk>
diff --git a/sysutils/bfs/distinfo b/sysutils/bfs/distinfo
index 4b93acf25003..b1add298e6a5 100644
--- a/sysutils/bfs/distinfo
+++ b/sysutils/bfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568492704
-SHA256 (tavianator-bfs-1.5.1_GH0.tar.gz) = 28defd5f66043c5bfda8b715e9e3eac92a0a1f59b3ec39c78d527a2fb5e0735b
-SIZE (tavianator-bfs-1.5.1_GH0.tar.gz) = 113824
+TIMESTAMP = 1615108580
+SHA256 (tavianator-bfs-2.2_GH0.tar.gz) = 09cff2033544cbaa31af2ad7d59347056a53c04ff7c469bb5904e575d3641053
+SIZE (tavianator-bfs-2.2_GH0.tar.gz) = 137118
diff --git a/sysutils/bfs/pkg-plist b/sysutils/bfs/pkg-plist
new file mode 100644
index 000000000000..ba45b8edc306
--- /dev/null
+++ b/sysutils/bfs/pkg-plist
@@ -0,0 +1,3 @@
+bin/bfs
+share/bash-completion/completions/bfs
+share/man/man1/bfs.1.gz
diff --git a/sysutils/bhyve-firmware/Makefile b/sysutils/bhyve-firmware/Makefile
index 8a725dc39af3..1fb78f76049c 100644
--- a/sysutils/bhyve-firmware/Makefile
+++ b/sysutils/bhyve-firmware/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	bhyve-firmware
 PORTVERSION=	1.0
 PORTREVISION=	1
@@ -16,4 +14,11 @@ OPTIONS_DEFAULT=	CSM
 CSM_DESC=		Include firmware with Compatibility Support Module
 CSM_RUN_DEPENDS=	uefi-edk2-bhyve-csm>=0:sysutils/uefi-edk2-bhyve-csm
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCSM}
+DEPRECATED=	Uses EOL Python 2.7 via sysutils/uefi-edk2-bhyve
+EXPIRATION_DATE=2021-06-23
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/bhyve-rc/Makefile b/sysutils/bhyve-rc/Makefile
index 6dd41054270e..f3eddb09f2f4 100644
--- a/sysutils/bhyve-rc/Makefile
+++ b/sysutils/bhyve-rc/Makefile
@@ -1,5 +1,4 @@
 # Created by: Michael Gmelin <freebsd@grem.de>
-# $FreeBSD$
 
 PORTNAME=	bhyve-rc
 PORTVERSION=	3
@@ -8,7 +7,7 @@ MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	freebsd@grem.de
+MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	FreeBSD RC script for starting bhyve guests in tmux
 
 RUN_DEPENDS=	tmux:sysutils/tmux
diff --git a/sysutils/bhyve-rc/files/bhyve.in b/sysutils/bhyve-rc/files/bhyve.in
index 3d187bf7392f..32906a7b9229 100644
--- a/sysutils/bhyve-rc/files/bhyve.in
+++ b/sysutils/bhyve-rc/files/bhyve.in
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $FreeBSD: mgmelin
-#
 
 # PROVIDE: bhyve
 # REQUIRE: LOGIN
diff --git a/sysutils/bibelot/Makefile b/sysutils/bibelot/Makefile
deleted file mode 100644
index 942473376cb2..000000000000
--- a/sysutils/bibelot/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	bibelot
-PORTVERSION=	0.9.4
-CATEGORIES=	sysutils
-MASTER_SITES=	SF/${PORTNAME}/Bibelot/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Formats and converts text documents into compressed PalmDoc .pdb files
-
-DEPRECATED=	obsolete technology
-EXPIRATION_DATE=	2019-09-21
-
-USES=		perl5 shebangfix
-NO_BUILD=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PLIST_FILES=	bin/bibelot
-SHEBANG_FILES=	bibelot.pl
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/sysutils/bibelot/distinfo b/sysutils/bibelot/distinfo
deleted file mode 100644
index 8b96c4ebe27a..000000000000
--- a/sysutils/bibelot/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bibelot-0.9.4.tar.gz) = bc8fe3018553ae641d143586d965eab2e4e6d8a52df304b302a033aba63da007
-SIZE (bibelot-0.9.4.tar.gz) = 22451
diff --git a/sysutils/bibelot/pkg-descr b/sysutils/bibelot/pkg-descr
deleted file mode 100644
index ed2241b15356..000000000000
--- a/sysutils/bibelot/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-bibelot.pl is a Perl script that formats and converts text documents
-into compressed PalmDoc .pdb files, suitable for reading on a Palm
-or Handspring device with any standard PalmDoc reader (AportisDoc,
-CSpotRun, RichReader, TealDoc, etc.)
-
-WWW: https://sourceforge.net/projects/bibelot/
diff --git a/sysutils/biosfont/Makefile b/sysutils/biosfont/Makefile
index 53fb25306089..beb99fd807c9 100644
--- a/sysutils/biosfont/Makefile
+++ b/sysutils/biosfont/Makefile
@@ -1,20 +1,21 @@
 # Created by: rene
-# $FreeBSD$
 
 PORTNAME=	biosfont
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3
 CATEGORIES=	sysutils
-MASTER_SITES=	LOCAL/rene
 
-MAINTAINER=	rene@FreeBSD.org
+MAINTAINER=	rene0@freedom.nl
 COMMENT=	Kernel module to retrieve bitmap fonts from BIOS memory
 
 LICENSE=	BSD2CLAUSE
 
 # only platforms guaranteed to be ok, feedback/patches are welcome
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		uidfix kmod
+USE_GITHUB=	yes
+GH_ACCOUNT=	rene0
+WRKSRC_SUBDIR=	biosfont
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/biosfont.h ${STAGEDIR}${PREFIX}/include
diff --git a/sysutils/biosfont/distinfo b/sysutils/biosfont/distinfo
index a45dcb5d3ea9..b78d9ddfb730 100644
--- a/sysutils/biosfont/distinfo
+++ b/sysutils/biosfont/distinfo
@@ -1,2 +1,3 @@
-SHA256 (biosfont-1.2.1.tar.gz) = 296fd64b5ee35eb367be9eabef01739897995efafdd99f8dbdb94e6f1b75a351
-SIZE (biosfont-1.2.1.tar.gz) = 3333
+TIMESTAMP = 1577225565
+SHA256 (rene0-biosfont-1.3_GH0.tar.gz) = b712b6f192e298d600bbe7e3765e7874d7eb49b6f7909dc9b1045c84f062dd39
+SIZE (rene0-biosfont-1.3_GH0.tar.gz) = 6174
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index 3c0373dec12c..23510614dc2d 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -1,16 +1,11 @@
 # Created by: Yoshifumi Watanabe <mwatts@edu1.tokyo-med.ac.jp>
-# $FreeBSD$
 
 PORTNAME=	bkpupsd
 PORTVERSION=	1.0a
 CATEGORIES=	sysutils
-MASTER_SITES=	http://ftp.knit.kagoshima-u.ac.jp/pub/Unix/bkpupsd/
+MASTER_SITES=	https://BSDforge.com/projects/source/sysutils/bkpupsd/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Simple UPS daemon for APC BK Pro(TM)
 
-BROKEN=		unfetchable
-DEPRECATED=	Unfetchable, unmaintained
-EXPIRATION_DATE=	2019-10-16
-
 .include <bsd.port.mk>
diff --git a/sysutils/bksh/Makefile b/sysutils/bksh/Makefile
index 1fcd462c878c..e7fa0dd2473d 100644
--- a/sysutils/bksh/Makefile
+++ b/sysutils/bksh/Makefile
@@ -1,5 +1,4 @@
 # Created by: The Anarcat <anarcat@anarcat.ath.cx>
-# $FreeBSD$
 
 PORTNAME=	bksh
 PORTVERSION=	1.7
@@ -14,6 +13,6 @@ USES=		uidfix
 PLIST_FILES=	bin/bksh
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/NOMAN/NO_MAN/" ${WRKSRC}/local.mk
+	@${REINPLACE_CMD} -e "s/NOMAN.*/MAN=/" ${WRKSRC}/local.mk
 
 .include <bsd.port.mk>
diff --git a/sysutils/boot-extract/Makefile b/sysutils/boot-extract/Makefile
index 8fee551aa9e4..25db6f63f213 100644
--- a/sysutils/boot-extract/Makefile
+++ b/sysutils/boot-extract/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	boot-extract
 PORTVERSION=	g20190614
 CATEGORIES=	sysutils
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index c3d7f480eef7..ac45815ffaa2 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -1,5 +1,4 @@
 # Created by: James O'Gorman <james@netinertia.co.uk>
-# $FreeBSD$
 
 PORTNAME=	boxbackup
 PORTVERSION=	0.11.r${SVNVERSION:C/^[0-9\.]+_[a-z]+_([0-9]+)/\1/}
@@ -9,8 +8,8 @@ MASTER_SITES=	http://www.boxbackup.org/snapshots/201108/
 PKGNAMESUFFIX=	${CLIENT_OR_SERVER}-devel
 DISTNAME=	${PORTNAME}-${SVNVERSION}
 
-MAINTAINER=	portmaster@BSDforge.com
-COMMENT=	Open source, completely automatic on-line backup system for UNIX
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Open-source, completely automatic on-line backup system
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
@@ -42,6 +41,7 @@ MAKE_JOBS_UNSAFE=	yes
 .if ${SSL_DEFAULT} == base
 BROKEN_FreeBSD_12=	field has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
 BROKEN_FreeBSD_13=	field has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
+BROKEN_FreeBSD_14=	field has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
 .endif
 
 CLIENTDIR=	CLIENT
diff --git a/sysutils/boxbackup-devel/files/999.boxbackup.in b/sysutils/boxbackup-devel/files/999.boxbackup.in
index 9422cbfc1744..62e583372d9f 100644
--- a/sysutils/boxbackup-devel/files/999.boxbackup.in
+++ b/sysutils/boxbackup-devel/files/999.boxbackup.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
-#
 # Box Backup monthly store compare
 #
 # Add the following to /etc/periodic.conf to enable the monthly compare:
diff --git a/sysutils/boxbackup-devel/files/bbackupd.in b/sysutils/boxbackup-devel/files/bbackupd.in
index e74a9df86073..c3576006acd7 100644
--- a/sysutils/boxbackup-devel/files/bbackupd.in
+++ b/sysutils/boxbackup-devel/files/bbackupd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: bbackupd
 # REQUIRE: NETWORKING
 # KEYWORD: shutdown
diff --git a/sysutils/boxbackup-devel/files/bbstored.in b/sysutils/boxbackup-devel/files/bbstored.in
index f5163bb165ba..07c7d411e593 100644
--- a/sysutils/boxbackup-devel/files/bbstored.in
+++ b/sysutils/boxbackup-devel/files/bbstored.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: bbstored
 # REQUIRE: NETWORKING
 # KEYWORD: shutdown
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/Makefile
+++ /dev/null
diff --git a/sysutils/boxbackup/distinfo b/sysutils/boxbackup/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/distinfo
+++ /dev/null
diff --git a/sysutils/boxbackup/files/999.boxbackup.in b/sysutils/boxbackup/files/999.boxbackup.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/files/999.boxbackup.in
+++ /dev/null
diff --git a/sysutils/boxbackup/files/bbackupd.in b/sysutils/boxbackup/files/bbackupd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/files/bbackupd.in
+++ /dev/null
diff --git a/sysutils/boxbackup/files/bbstored.in b/sysutils/boxbackup/files/bbstored.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/files/bbstored.in
+++ /dev/null
diff --git a/sysutils/boxbackup/files/patch-bbackupd-config b/sysutils/boxbackup/files/patch-bbackupd-config
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/files/patch-bbackupd-config
+++ /dev/null
diff --git a/sysutils/boxbackup/files/patch-configure.ac b/sysutils/boxbackup/files/patch-configure.ac
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/files/patch-configure.ac
+++ /dev/null
diff --git a/sysutils/boxbackup/files/pkg-message.in b/sysutils/boxbackup/files/pkg-message.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/files/pkg-message.in
+++ /dev/null
diff --git a/sysutils/boxbackup/pkg-descr b/sysutils/boxbackup/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/pkg-descr
+++ /dev/null
diff --git a/sysutils/boxbackup/pkg-plist b/sysutils/boxbackup/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/boxbackup/pkg-plist
+++ /dev/null
diff --git a/sysutils/bpytop/Makefile b/sysutils/bpytop/Makefile
new file mode 100644
index 000000000000..25be37e3b97a
--- /dev/null
+++ b/sysutils/bpytop/Makefile
@@ -0,0 +1,28 @@
+PORTNAME=	bpytop
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.66
+CATEGORIES=	sysutils
+
+MAINTAINER=	lwhsu@FreeBSD.org
+COMMENT=	Linux/OSX/FreeBSD resource monitor
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
+
+USES=		python shebangfix
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	aristocratos
+
+SHEBANG_FILES=	${WRKSRC}/bpytop.py
+
+NO_ARCH=	yes
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/bpytop.py ${STAGEDIR}${PREFIX}/bin/bpytop
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} themes ${STAGEDIR}${DATADIR})
+
+.include <bsd.port.mk>
diff --git a/sysutils/bpytop/distinfo b/sysutils/bpytop/distinfo
new file mode 100644
index 000000000000..1bdc5ecfe58e
--- /dev/null
+++ b/sysutils/bpytop/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1622463518
+SHA256 (aristocratos-bpytop-v1.0.66_GH0.tar.gz) = a753f450d3cd1da3d29d3d0cabdba805f82e838593cb2a6df142916a5fc9911b
+SIZE (aristocratos-bpytop-v1.0.66_GH0.tar.gz) = 628432
diff --git a/sysutils/bpytop/pkg-descr b/sysutils/bpytop/pkg-descr
new file mode 100644
index 000000000000..1c6884b86dc1
--- /dev/null
+++ b/sysutils/bpytop/pkg-descr
@@ -0,0 +1,6 @@
+Resource monitor that shows usage and stats for processor, memory, disks,
+network and processes.
+
+Python port of bashtop. (https://github.com/aristocratos/bashtop)
+
+WWW: https://github.com/aristocratos/bpytop
diff --git a/sysutils/bpytop/pkg-plist b/sysutils/bpytop/pkg-plist
new file mode 100644
index 000000000000..2a07c19ae810
--- /dev/null
+++ b/sysutils/bpytop/pkg-plist
@@ -0,0 +1,15 @@
+bin/bpytop
+%%DATADIR%%/themes/adapta.theme
+%%DATADIR%%/themes/default_black.theme
+%%DATADIR%%/themes/dracula.theme
+%%DATADIR%%/themes/dusklight.theme
+%%DATADIR%%/themes/flat-remix-light.theme
+%%DATADIR%%/themes/flat-remix.theme
+%%DATADIR%%/themes/greyscale.theme
+%%DATADIR%%/themes/gruvbox_dark.theme
+%%DATADIR%%/themes/kyli0x.theme
+%%DATADIR%%/themes/matcha-dark-sea.theme
+%%DATADIR%%/themes/monokai.theme
+%%DATADIR%%/themes/nord.theme
+%%DATADIR%%/themes/solarized_dark.theme
+%%DATADIR%%/themes/whiteout.theme
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index cb4500be9dd8..4ea94c76c52b 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,8 +1,8 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	brasero
 PORTVERSION=	3.12.2
+PORTREVISION=	1
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 RUN_DEPENDS=	growisofs:sysutils/dvd+rw-tools \
 		cdrdao:sysutils/cdrdao
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shared-mime-info tar:xz
+USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
+		pkgconfig shared-mime-info tar:xz xorg
 USE_GNOME=	gnomeprefix gtk30 intlhack libxml2
 GNU_CONFIGURE=	yes
 USE_XORG=	sm ice
diff --git a/sysutils/brename/Makefile b/sysutils/brename/Makefile
new file mode 100644
index 000000000000..8a103b111e35
--- /dev/null
+++ b/sysutils/brename/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	brename
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.11.0-5
+DISTVERSIONSUFFIX=	-g2e8b7d0
+CATEGORIES=	sysutils
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Tool for batch renaming files/directories via regular expressions
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go
+USE_GITHUB=	yes
+GH_ACCOUNT=	shenwei356
+GH_TUPLE=	\
+		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
+		golang:sys:0cec03c:golang_sys/vendor/golang.org/x/sys \
+		klauspost:compress:b5e9484:klauspost_compress/vendor/github.com/klauspost/compress \
+		klauspost:pgzip:e899416:klauspost_pgzip/vendor/github.com/klauspost/pgzip \
+		mattn:go-colorable:v0.1.2:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		shenwei356:breader:d28a754:shenwei356_breader/vendor/github.com/shenwei356/breader \
+		shenwei356:go-logging:c6b9702:shenwei356_go_logging/vendor/github.com/shenwei356/go-logging \
+		shenwei356:natsort:600d539:shenwei356_natsort/vendor/github.com/shenwei356/natsort \
+		shenwei356:util:3c0b696:shenwei356_util/vendor/github.com/shenwei356/util \
+		shenwei356:xopen:f4f16dd:shenwei356_xopen/vendor/github.com/shenwei356/xopen \
+		spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		twotwotwo:sorts:bf5c1f2:twotwotwo_sorts//vendor/github.com/twotwotwo/sorts
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/sysutils/brename/distinfo b/sysutils/brename/distinfo
new file mode 100644
index 000000000000..54f576881739
--- /dev/null
+++ b/sysutils/brename/distinfo
@@ -0,0 +1,31 @@
+TIMESTAMP = 1621921810
+SHA256 (shenwei356-brename-v2.11.0-5-g2e8b7d0_GH0.tar.gz) = 33414e0d402679ebc3c3902e5951d9606d55ba95012d5f5b8b1c661ad544dbf2
+SIZE (shenwei356-brename-v2.11.0-5-g2e8b7d0_GH0.tar.gz) = 47797
+SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f
+SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
+SHA256 (golang-sys-0cec03c_GH0.tar.gz) = c1d4a064c6a562252bb94ebfa97ebc12be0fb379366cc0135e4985ba729141d1
+SIZE (golang-sys-0cec03c_GH0.tar.gz) = 1196744
+SHA256 (klauspost-compress-b5e9484_GH0.tar.gz) = 923d73d68a07d70c6a87dd015ca215a4c84ba6eb9003d7c9fa0788fcf467cb19
+SIZE (klauspost-compress-b5e9484_GH0.tar.gz) = 15348386
+SHA256 (klauspost-pgzip-e899416_GH0.tar.gz) = f442399ae94b63519f292f2705b1146086c2d2fa2d71359b81d56f5ade3a1a40
+SIZE (klauspost-pgzip-e899416_GH0.tar.gz) = 125932
+SHA256 (mattn-go-colorable-v0.1.2_GH0.tar.gz) = a7189bd9005c571303b117261955ce53b0e2aa89fe415e2289659be343fe1651
+SIZE (mattn-go-colorable-v0.1.2_GH0.tar.gz) = 8518
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (shenwei356-breader-d28a754_GH0.tar.gz) = 3db2cc2f24b4c4126331d4c89a7ae4a416b029b5ef55f67832f74ced69031506
+SIZE (shenwei356-breader-d28a754_GH0.tar.gz) = 5332
+SHA256 (shenwei356-go-logging-c6b9702_GH0.tar.gz) = 68ca51c09ab8d8605cfb4fb5cfe45032b2e466470d51db6e55b9a7a6ed132a53
+SIZE (shenwei356-go-logging-c6b9702_GH0.tar.gz) = 36393
+SHA256 (shenwei356-natsort-600d539_GH0.tar.gz) = d925add5f7a7fabcf6e11c9c7a99fe6883bb7859341fea6f3a1b08804552f9af
+SIZE (shenwei356-natsort-600d539_GH0.tar.gz) = 2868
+SHA256 (shenwei356-util-3c0b696_GH0.tar.gz) = 7027b1645625ffd1e412f86ad6e7270dff7d256a7fd59b926309216c19f2192c
+SIZE (shenwei356-util-3c0b696_GH0.tar.gz) = 28607
+SHA256 (shenwei356-xopen-f4f16dd_GH0.tar.gz) = 23b0667c28e74db1ef78ecf1ac6a71ed69f892ab5d661983065b71230215913c
+SIZE (shenwei356-xopen-f4f16dd_GH0.tar.gz) = 5385
+SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
+SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
+SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+SHA256 (twotwotwo-sorts-bf5c1f2_GH0.tar.gz) = 5cc0560f47d7d675a6a8493194320e4b650e6c567d31b086aa1878c7feed8474
+SIZE (twotwotwo-sorts-bf5c1f2_GH0.tar.gz) = 20276
diff --git a/sysutils/brename/pkg-descr b/sysutils/brename/pkg-descr
new file mode 100644
index 000000000000..458b844ed2c7
--- /dev/null
+++ b/sysutils/brename/pkg-descr
@@ -0,0 +1,4 @@
+brename is a practical cross-platform command-line tool for safely batch
+renaming files/directories via regular expressions.
+
+WWW: https://github.com/shenwei356/brename
diff --git a/sysutils/bsd-splash-changer/Makefile b/sysutils/bsd-splash-changer/Makefile
index ee4c11a21a6d..176e6d045ea4 100644
--- a/sysutils/bsd-splash-changer/Makefile
+++ b/sysutils/bsd-splash-changer/Makefile
@@ -1,5 +1,4 @@
 # Created by: Martin Otto
-# $FreeBSD$
 
 PORTNAME=	bsd-splash-changer
 PORTVERSION=	060211
diff --git a/sysutils/bsd-splash-changer/files/change_splash.in b/sysutils/bsd-splash-changer/files/change_splash.in
index f4a5122f69d7..bb473b676ef1 100644
--- a/sysutils/bsd-splash-changer/files/change_splash.in
+++ b/sysutils/bsd-splash-changer/files/change_splash.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: change_splash
 # REQUIRE: mountcritremote
 #
diff --git a/sysutils/bsdconfig/Makefile b/sysutils/bsdconfig/Makefile
index 49a77d3e7b07..ac5f30fb5f6b 100644
--- a/sysutils/bsdconfig/Makefile
+++ b/sysutils/bsdconfig/Makefile
@@ -1,5 +1,4 @@
 # Created by: Devin Teske <dteske@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	bsdconfig
 PORTVERSION=	0.9.0
diff --git a/sysutils/bsdcrashtar/Makefile b/sysutils/bsdcrashtar/Makefile
index 17fdb38fd973..67775979fcf2 100644
--- a/sysutils/bsdcrashtar/Makefile
+++ b/sysutils/bsdcrashtar/Makefile
@@ -1,5 +1,4 @@
 # Created by: Mikolaj Golub <to.my.trociny@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	bsdcrashtar
 PORTVERSION=	0.1.3
diff --git a/sysutils/bsdfan/Makefile b/sysutils/bsdfan/Makefile
new file mode 100644
index 000000000000..bae70321cf13
--- /dev/null
+++ b/sysutils/bsdfan/Makefile
@@ -0,0 +1,28 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+
+PORTNAME=	bsdfan
+PORTVERSION=	g20180112
+CATEGORIES=	sysutils
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Utility to manage fans on Lenovo ThinkPad laptops
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+ONLY_FOR_ARCHS=	amd64 i386
+ONLY_FOR_ARCHS_REASON=	requires acpi_ibm(4) which is only available on x86
+
+USES=		uidfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	claudiozz
+GH_TAGNAME=	d8428a7
+
+PLIST_FILES=	bin/bsdfan man/man1/bsdfan.1.gz \
+		@sample\ etc/bsdfan.conf.sample
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/bsdfan.conf \
+		${STAGEDIR}${PREFIX}/etc/bsdfan.conf.sample
+
+.include <bsd.port.mk>
diff --git a/sysutils/bsdfan/distinfo b/sysutils/bsdfan/distinfo
new file mode 100644
index 000000000000..9fa237ea1a41
--- /dev/null
+++ b/sysutils/bsdfan/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1515773468
+SHA256 (claudiozz-bsdfan-g20180112-d8428a7_GH0.tar.gz) = d8047d71e6f0dda4239e6926ff4a8b6dd5999082a3d9f6a2eca55f7ae2f0b153
+SIZE (claudiozz-bsdfan-g20180112-d8428a7_GH0.tar.gz) = 5728
diff --git a/sysutils/bsdfan/pkg-descr b/sysutils/bsdfan/pkg-descr
new file mode 100644
index 000000000000..0d3267de2740
--- /dev/null
+++ b/sysutils/bsdfan/pkg-descr
@@ -0,0 +1,5 @@
+This is a simple utility to manage Lenovo ThinkPad fans on FreeBSD.
+It automatically regulates the fan speed by the sensor temperature
+and user configuration.
+
+WWW: https://github.com/claudiozz/bsdfan
diff --git a/sysutils/bsdhwmon/Makefile b/sysutils/bsdhwmon/Makefile
index ef7a5d554d38..17a18db43434 100644
--- a/sysutils/bsdhwmon/Makefile
+++ b/sysutils/bsdhwmon/Makefile
@@ -1,5 +1,4 @@
 # Created by: Jeremy Chadwick <jdc@parodius.com>
-# $FreeBSD$
 
 PORTNAME=	bsdhwmon
 PORTVERSION=	20151206
diff --git a/sysutils/bsdinfo/Makefile b/sysutils/bsdinfo/Makefile
index 539a5cc58876..8d7f4dc110f6 100644
--- a/sysutils/bsdinfo/Makefile
+++ b/sysutils/bsdinfo/Makefile
@@ -1,17 +1,17 @@
 # Created by: samu <freebsd-ports@samu.pl>
-# $FreeBSD$
 
 PORTNAME=	bsdinfo
 PORTVERSION=	0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	GHC
 
 MAINTAINER=	freebsd-ports@samu.pl
 COMMENT=	Simple utility to display system-based information
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	samupl
+GH_TAGNAME=	7ed6607958035244870877191c2764c9ba77f19d
+
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	X256
diff --git a/sysutils/bsdinfo/distinfo b/sysutils/bsdinfo/distinfo
index e742f7add888..066739fff2cb 100644
--- a/sysutils/bsdinfo/distinfo
+++ b/sysutils/bsdinfo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bsdinfo-0.22.tar.gz) = d9856f23f53ab67374e394a279576c20b97377252807390ae70f5ec7de936ae7
-SIZE (bsdinfo-0.22.tar.gz) = 4305
+TIMESTAMP = 1585168864
+SHA256 (samupl-bsdinfo-0.22-7ed6607958035244870877191c2764c9ba77f19d_GH0.tar.gz) = dbf803a701a6ae91de335841043ddce1d2677b6ee0537f3481de247b457885ec
+SIZE (samupl-bsdinfo-0.22-7ed6607958035244870877191c2764c9ba77f19d_GH0.tar.gz) = 120595
diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile
index 0f324f514da0..3ac949341561 100644
--- a/sysutils/bsdisks/Makefile
+++ b/sysutils/bsdisks/Makefile
@@ -1,9 +1,6 @@
-# $FreeBSD$
-
 PORTNAME=	bsdisks
-DISTVERSION=	0.9
+DISTVERSION=	0.26
 CATEGORIES=	sysutils
-MASTER_SITES=	https://bitbucket.org/arrowd/bsdisks/downloads/
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	UDisks2 service implementation for FreeBSD
@@ -14,4 +11,9 @@ USES=		cmake compiler:c++11-lang qt:5
 
 USE_QT=		qmake_build buildtools_build core dbus
 
+USE_GITLAB=		yes
+GL_SITE=		https://foss.heptapod.net
+GL_ACCOUNT=		bsdutils
+GL_COMMIT=		e1d6cc627e5371f26a3350f19e19f0d1d017b1f2
+
 .include <bsd.port.mk>
diff --git a/sysutils/bsdisks/distinfo b/sysutils/bsdisks/distinfo
index b8746f973bd7..b398844fe272 100644
--- a/sysutils/bsdisks/distinfo
+++ b/sysutils/bsdisks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567954257
-SHA256 (bsdisks-0.9.tar.gz) = 273ea0ca76570575786e13167f9c41afe68d611083e943c795db1a989efe800b
-SIZE (bsdisks-0.9.tar.gz) = 101181
+TIMESTAMP = 1622461141
+SHA256 (bsdutils-bsdisks-e1d6cc627e5371f26a3350f19e19f0d1d017b1f2_GL0.tar.gz) = ce8c364d91c3f2bb6c312da6047e2006cbb47b63ffd0f10d333cbeb2261861af
+SIZE (bsdutils-bsdisks-e1d6cc627e5371f26a3350f19e19f0d1d017b1f2_GL0.tar.gz) = 109764
diff --git a/sysutils/bsdisks/pkg-descr b/sysutils/bsdisks/pkg-descr
index 31291f1755ae..bfb642abc30d 100644
--- a/sysutils/bsdisks/pkg-descr
+++ b/sysutils/bsdisks/pkg-descr
@@ -3,4 +3,4 @@ and perform operations on disks and storage devices
 via D-Bus API. Bsdisks is an implementation of UDisks2
 service for FreeBSD.
 
-WWW: https://bitbucket.org/arrowd/bsdisks
+WWW: https://foss.heptapod.net/bsdutils/bsdisks
diff --git a/sysutils/bsdisks/pkg-plist b/sysutils/bsdisks/pkg-plist
index d78e69e1a2ef..a11b4cbf30ab 100644
--- a/sysutils/bsdisks/pkg-plist
+++ b/sysutils/bsdisks/pkg-plist
@@ -1,3 +1,8 @@
 bin/bsdisks
 etc/dbus-1/system.d/org.freedesktop.UDisks2.conf
+man/man5/bsdisks.conf.5.gz
+man/man8/bsdisks.8.gz
 share/dbus-1/system-services/org.freedesktop.UDisks2.service
+@sample etc/bsdisks.conf.sample
+@sample etc/newsyslog.conf.d/bsdisks-newsyslog.conf.sample
+@sample etc/syslog.d/bsdisks-syslog.conf.sample
diff --git a/sysutils/bsdploy/Makefile b/sysutils/bsdploy/Makefile
deleted file mode 100644
index 8994b1a0c764..000000000000
--- a/sysutils/bsdploy/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Kubilay Kocak <koobs@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	bsdploy
-PORTVERSION=	2.3.0
-CATEGORIES=	sysutils python
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Tool to remotely provision, configure and maintain FreeBSD jails
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ploy>=1.5.0:sysutils/py-ploy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${PY_FLAVOR}
-
-USES=			python:-2.7
-USE_PYTHON=		autoplist concurrent distutils
-
-OPTIONS_DEFINE=		EC2
-OPTIONS_DEFAULT=	EC2
-
-EC2_DESC=		Support Amazon Web Services EC2 hosts
-EC2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2@${PY_FLAVOR}
-
-NO_ARCH=	yes
-
-do-test:
-	${RM} ${WRKSRC}/pytest.ini
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -k 'not test_virtualbox'
-
-.include <bsd.port.mk>
diff --git a/sysutils/bsdploy/distinfo b/sysutils/bsdploy/distinfo
deleted file mode 100644
index f4cb992944f0..000000000000
--- a/sysutils/bsdploy/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1558180560
-SHA256 (bsdploy-2.3.0.tar.gz) = 14d54adf00bcc511a0a5617ada24540264133d086fbc91c48d9fa17347a0fc75
-SIZE (bsdploy-2.3.0.tar.gz) = 76926
diff --git a/sysutils/bsdploy/pkg-descr b/sysutils/bsdploy/pkg-descr
deleted file mode 100644
index 0d10a5549c31..000000000000
--- a/sysutils/bsdploy/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-BSDploy is a comprehensive tool to provision, configure and maintain
-FreeBSD jail hosts and jails.
-
-Its main design goal is to lower the barrier to repeatable jail setups.
-
-  * Modular provisioning with plugins for VirtualBox, Amazon EC2 and
-    an achitecture to support more.
-  * Bootstrap complete jail hosts from scratch.
-  * Declarative configuration: All hosts and their properties defined
-    in ploy.conf are automatically exposed to Ansible.
-  * Imperative maintenance: Run Fabric scripts with ploy do JAILNAME
-    TASKNAME and have all of the hosts and their variables in fab.env.
-  * Configure ZFS pools and filesystems with whole-disk-encryption.
-
-WWW: https://github.com/ployground/bsdploy
diff --git a/sysutils/bsdstats/Makefile b/sysutils/bsdstats/Makefile
index 4d4bb6e881fd..e696ed85b68e 100644
--- a/sysutils/bsdstats/Makefile
+++ b/sysutils/bsdstats/Makefile
@@ -1,13 +1,12 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	bsdstats
-PORTVERSION=	6.0
+PORTVERSION=	7.0
 PORTREVISION=	2
 CATEGORIES=	sysutils
 DISTFILES=
 
-MAINTAINER=	yuri@FreeBSD.org
+MAINTAINER=	scrappy@hub.org
 COMMENT=	Monthly script for reporting anonymous statistics about your machine
 
 LICENSE=	BSD4CLAUSE
@@ -18,28 +17,23 @@ SUB_FILES=	300.statistics bsdstats-send pkg-message
 SUB_LIST+=	VERSION=${PORTVERSION}
 NO_ARCH=	YES
 
-OPTIONS_DEFINE=	TOR
-TOR_DESC=	Submit securely through TOR anonymity network
-
 PLIST_FILES=	bin/bsdstats-send \
 		etc/periodic/monthly/300.statistics
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	TOR
+TOR_DESC=	Submit securely through TOR anonymity network
 
-.if ${PORT_OPTIONS:MTOR}
-RUN_DEPENDS+=	tor:security/tor
-.endif
+TOR_RUN_DEPENDS=	tor:security/tor
 
-pre-install:
-.if ${PORT_OPTIONS:MTOR}
+pre-install-TOR-on:
 	@${REINPLACE_CMD} -e 's|USE_TOR=NO|USE_TOR=YES|' ${WRKDIR}/300.statistics
 	@${REINPLACE_CMD} -e 's|# REQUIRE: LOGIN|# REQUIRE: LOGIN tor|' ${WRKDIR}/bsdstats
 	@${REINPLACE_CMD} -e 's|@@TOR_MESSAGE@@|Statistics will be submitted anonymously through the TOR network|' \
 	    ${WRKDIR}/pkg-message
-.else
+
+pre-install-TOR-off:
 	@${REINPLACE_CMD} -e 's|@@TOR_MESSAGE@@|You can build bsdstats with TOR port option to submit anonymously|' \
 	    ${WRKDIR}/pkg-message
-.endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/monthly
@@ -48,4 +42,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bsdstats-send \
 		${STAGEDIR}${PREFIX}/bin/bsdstats-send
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/bsdstats/files/300.statistics.in b/sysutils/bsdstats/files/300.statistics.in
index 936bfad4c454..0985059d5555 100644
--- a/sysutils/bsdstats/files/300.statistics.in
+++ b/sysutils/bsdstats/files/300.statistics.in
@@ -1,7 +1,4 @@
 #!/bin/sh -
-#
-# $FreeBSD$
-#
 
 #
 # options
@@ -26,24 +23,12 @@ WC=/usr/bin/wc
 MV=/bin/mv
 RM=/bin/rm
 case $(${UNAME}) in
-  FreeBSD)
-    UMASK=/usr/bin/umask
-    OPENSSL=/usr/bin/openssl
-    CHOWN=/usr/sbin/chown
-    NC=/usr/bin/nc
-    ;;
   OpenBSD)
     UMASK=/usr/bin/umask
     OPENSSL=/usr/sbin/openssl
     CHOWN=/sbin/chown
     NC=/usr/bin/nc
     ;;
-  DragonFly)
-    UMASK=/usr/bin/umask
-    OPENSSL=/usr/bin/openssl
-    CHOWN=/usr/sbin/chown
-    NC=/usr/local/bin/netcat
-    ;;
   NetBSD)
     UMASK=umask
     OPENSSL=/usr/bin/openssl
@@ -82,6 +67,9 @@ fi
 #
 # global values
 #
+monthly_statistics_enable=${monthly_statistics_enable:-"NO"}
+monthly_statistics_report_devices=${monthly_statistics_report_devices:-"YES"}
+monthly_statistics_report_ports=${monthly_statistics_report_ports:-"YES"}
 checkin_server=${monthly_statistics_checkin_server:-"rpt.bsdstats.org"}
 bsdstats_log=${monthly_statistics_logfile:-"/var/log/bsdstats"}
 id_token_file='/var/db/bsdstats'
@@ -351,16 +339,24 @@ setup_proxies() {
 
 report_devices() {
   case $(${UNAME}) in
-    FreeBSD|DragonFly)
+    FreeBSD|DragonFly|MidnightBSD)
       local query_string=""
       local line
-      for line in $(${PCICONF} -l); do
+      while read line
+      do
         local DRIVER=$(echo "${line}" | ${AWK} -F\@ '{print $1}')
-        local DEV=$(echo "${line}" | ${AWK} '{print $4}' | ${CUT} -c8-15)
+        if [ "0`echo "${line}" | awk '{print $5}' | awk -F= '{print $1}'`" = "0vendor" ]; then
+          local VENDOR=$(echo "${line}" | ${AWK} '{print $5}' | ${CUT} -c10-15)
+          local DEVICE=$(echo "${line}" | ${AWK} '{print $6}' | ${CUT} -c10-15)
+          local DEV=$(echo "${DEVICE}${VENDOR}")
+        else
+          local DEV=$(echo "${line}" | ${AWK} '{print $4}' | ${CUT} -c8-15)
+        fi
         local CLASS=$(echo "${line}" | ${AWK} '{print $2}' | ${CUT} -c9-14)
         query_string=$query_string`echo \&dev[]=${DRIVER}:${DEV}:${CLASS}`
-      done
-
+      done << EOT
+$(${PCICONF} -l)
+EOT
       echo_begin "Posting device statistics to ${checkin_server_description}"
       do_http_request_check_status "GET" "/scripts/report_devices.php?token=${TOKEN}&key=${KEY}$query_string" \
         "" "" "system devices submission"
@@ -373,15 +369,38 @@ report_devices() {
   esac
 }
 
+get_mports() {
+  for i in `/usr/libexec/mport.list | xargs`
+  do
+    pkg=$(echo "select pkg from packages where pkg || '-' || version = '$i'" | sqlite3 /var/db/mport/master.db)
+    echo -n "$i "
+    mport info $pkg | grep Origin | awk '{print $3}'
+  done
+}
+
 report_ports() {
   case $(${UNAME}) in
-    FreeBSD|DragonFly)
+    FreeBSD|DragonFly|MidnightBSD)
       local query_string=""
       # Detect pkgng
       if [ -e /var/db/pkg/local.sqlite ]; then
         # Use pkgng
-        query_string="${query_string}$(pkg info -o "*" | ${SED} -E -e 's/\+/%2b/g' -e 's/,/%2c/g' -e 's/^([^ ]+) +([^\/]+)\/.+$/\&port[]=\2:\1/g' | tr -d '\n')"
+        case $(${UNAME}) in
+          MidnightBSD)
+            report_uri="/scripts/report_ports.php"
+            query_string="${query_string}$( get_mports | ${SED} -E -e 's/\+/%2b/g' -e 's/,/%2c/g' -e 's/^([^ ]+) +([^\/]+)\/.+$/\&port[]=\2:\1/g' | tr -d '\n')"
+            ;;
+          *)
+            report_uri="/scripts/report_ports_v2.php"
+            if [ -f %%PREFIX%%/etc/bsdstats.conf -a "0" = "0`grep ^all-ports /usr/local/etc/bsdstats.conf`" ]; then
+              query_string=$( pkg query %n:%v:%o | fgrep -f %%PREFIX%%/etc/bsdstats.conf | awk -F\/ '{print $1}' | sed -E -e 's/\+/%2b/g' -e 's/,/%2c/g' | awk '{printf"&port[]=%s", $1}' )
+            else
+              query_string=$( pkg query %n:%v:%o | awk -F\/ '{print $1}' | sed -E -e 's/\+/%2b/g' -e 's/,/%2c/g' | awk '{printf"&port[]=%s", $1}' )
+            fi
+            ;;
+        esac
       else
+        report_uri="/scripts/report_ports.php"
     #-----BEGIN LEGACY: to delete when FreeBSD with pkg_ tools is out of support period (!!! don't forget to clarify what does DragonFly use before removing !!!) -----
         # Use obsolete pkg_* tools
         local line
@@ -394,7 +413,7 @@ report_ports() {
     #-----END LEGACY-----
       fi
       echo_begin "Posting port statistics to ${checkin_server_description}"
-      do_http_request_check_status "POST" "/scripts/report_ports.php" \
+      do_http_request_check_status "POST" $report_uri \
         "token=${TOKEN}&key=${KEY}${query_string}" "application/x-www-form-urlencoded" "ports submission"
       echo_end_success
       log "INFO" "Posted port statistics to ${checkin_server_description}"
@@ -515,27 +534,14 @@ report_all() {
        report_devices
        report_cpu
        ;;
-    [Nn][Oo])
-       echo "Posting monthly device/CPU statistics disabled"
-       echo "    set monthly_statistics_report_devices=\"YES\" in $periodic_conf"
-       ;;
     *)
-       # opt-out for devices
-       report_devices
-       report_cpu
        ;;
   esac
   case "$monthly_statistics_report_ports" in
     [Yy][Ee][Ss])
       report_ports
       ;;
-    [Nn][Oo])
-      echo "Posting monthly ports statistics disabled"
-      echo "    set monthly_statistics_report_ports=\"YES\" in $periodic_conf"
-      ;;
     *)
-      # opt-out for ports
-      report_ports
       ;;
   esac
   # end
@@ -553,14 +559,7 @@ case "$monthly_statistics_enable" in
     # explicitly enabled: report it
     report_all "$1"
     ;;
-  [Nn][Oo])
-    echo "Posting monthly OS statistics disabled"
-    echo "    set monthly_statistics_enable=\"YES\" in $periodic_conf"
-    rc=1
-    ;;
   *)
-    # opt-out: we report when user has BSDstats installed, and user didn't say "NO"
-    report_all "$1"
     ;;
 esac
 
diff --git a/sysutils/bsdstats/files/bsdstats.in b/sysutils/bsdstats/files/bsdstats.in
index c26475ef6442..838450413504 100644
--- a/sysutils/bsdstats/files/bsdstats.in
+++ b/sysutils/bsdstats/files/bsdstats.in
@@ -1,7 +1,4 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
 
 # PROVIDE: bsdstats
 # REQUIRE: LOGIN
diff --git a/sysutils/bsdstats/files/pkg-message.in b/sysutils/bsdstats/files/pkg-message.in
index 7c9c0da60ce5..a1e0f6a20c48 100644
--- a/sysutils/bsdstats/files/pkg-message.in
+++ b/sysutils/bsdstats/files/pkg-message.in
@@ -1,15 +1,23 @@
 [
 { type: install
   message: <<EOM
-You installed BSDstats: script reporting statistics about your machine
+You installed BSDstats: script reporting statistics about your machine.
 
-To disable monthly reporting, add this line to /etc/periodic.conf:
-	monthly_statistics_enable="NO"
+To enable monthly reporting, add this line to /etc/periodic.conf:
+	monthly_statistics_enable="YES"
 
 To disable parts of reporting, add these lines to /etc/periodic.conf:
 	monthly_statistics_report_devices="NO"
 	monthly_statistics_report_ports="NO"
 
+To limit which ports are being submitted:
+	create %%PREFIX%%/etc/bsdstats.conf and list ports to report in
+	the form ${category}/${portname}, one entry per line. It is also
+	possible to use the special self explanatory keyword "all-ports".
+Example:
+	sysutils/bsdstats
+	ports-mgmt/pkg
+
 To enable reporting on bootup, add this line to /etc/rc.conf:
 	bsdstats_enable="YES"
 
@@ -22,4 +30,12 @@ To view current statistics, go to:
 @@TOR_MESSAGE@@
 EOM
 }
+{ type: upgrade
+  maximum_version: "7.0"
+  message: <<EOM
+BSDstats is now disabled by default, to enable monthly reporting, add
+this line to /etc/periodic.conf:
+	monthly_statistics_enable="YES"
+EOM
+}
 ]
diff --git a/sysutils/bsdstats/pkg-descr b/sysutils/bsdstats/pkg-descr
index d00474c83321..43ab220b4717 100644
--- a/sysutils/bsdstats/pkg-descr
+++ b/sysutils/bsdstats/pkg-descr
@@ -12,4 +12,4 @@ statistics anonymously to a central server (http://bsdstats.org).
 Potentially sensitive details like IP addresses and hostnames are not
 stored by or relayed through the BSDstats server.
 
-WWW: http://www.bsdstats.org/
+WWW: https://www.bsdstats.org/
diff --git a/sysutils/bsdstats/pkg-install b/sysutils/bsdstats/pkg-install
deleted file mode 100644
index ae1695356a9a..000000000000
--- a/sysutils/bsdstats/pkg-install
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# pkg-install : based off ${PORTSDIR}/mail/courier/files/pkg-install.in
-
-# The default answer to each of the installation questions is "yes". You can
-# override a question's default by setting its environment variable to "no".
-#
-# Environment Variable      | Question
-# --------------------------+------------------------------------------------------------------
-# BSDSTATS_MONTHLY_NOW      | Would you like to run it now?
-# BSDSTATS_REBOOT_REPORTING | Would you like to enable reporting on bootup in /etc/rc.conf?
-
-if [ -n "$PACKAGE_BUILDING" ]; then
-	BSDSTATS_MONTHLY_NOW=${BSDSTATS_MONTHLY_NOW:=no}
-	BSDSTATS_REBOOT_REPORTING=${BSDSTATS_REBOOT_REPORTING:=no}
-else
-	BSDSTATS_MONTHLY_NOW=${BSDSTATS_MONTHLY_NOW:=yes}
-	BSDSTATS_REBOOT_REPORTING=${BSDSTATS_REBOOT_REPORTING:=yes}
-fi
-
-ask() {
-	local question default answer
-
-	question=$1
-	default=$2
-	if [ -z "$BATCH" -a -z "$PACKAGE_BUILDING" ]; then
-		read -p "$question [$default]? " answer
-	fi
-	if [ -z "$answer" ]; then
-		answer=$default
-	fi
-	echo $answer
-}
-
-yesno() {
-	local question default answer
-
-	question=$1
-	default=$2
-	while :; do
-		answer=$(ask "$question" "$default")
-		case "$answer" in
-			[Yy]*) return 0;;
-			[Nn]*) return 1;;
-		esac
-		echo "Please answer yes or no."
-	done
-}
-
-if [ "$2" = "POST-INSTALL" ]; then
-	log_file="${INSTALL_PREFIX}/var/log/bsdstats"
-	need_to_ask=0
-	if [ ! -e ${log_file} ]; then
-		need_to_ask=1
-	elif [ $(($(date +"%s")-$(stat -f %Sm -t %s ${log_file}))) -gt $((60*60*24*40)) ]; then
-		need_to_ask=1
-	fi
-	if [ $need_to_ask = 1 ]; then
-		if yesno "Would you like to run BSDstats now" $BSDSTATS_MONTHLY_NOW; then
-			${INSTALL_PREFIX}${PKG_PREFIX}/etc/periodic/monthly/300.statistics -nodelay
-		fi
-	fi
-	if [ ! -f "/etc/rc.conf" ] || [ -z $(grep bsdstats_enable /etc/rc.conf) ]; then
-		echo
-		echo "If you're installing BSDstats on a system that won't always be on, such as a"
-		echo "desktop or a laptop, it is recommended that you enable it in /etc/rc.conf so"
-		echo "that it will run on bootup. This will ensure that, even if your computer is"
-		echo "off when \"monthly\" runs, your computer will be counted properly."
-		echo
-		if yesno "Would you like to enable reporting on bootup in /etc/rc.conf" $BSDSTATS_REBOOT_REPORTING; then
-			echo "bsdstats_enable=\"YES\"" >> /etc/rc.conf
-		fi
-	fi
-fi
diff --git a/sysutils/bstack/Makefile b/sysutils/bstack/Makefile
index 769be9e272ad..c5cbc6191636 100644
--- a/sysutils/bstack/Makefile
+++ b/sysutils/bstack/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	bstack
 PORTVERSION=	0.1
 PORTREVISION=	1
diff --git a/sysutils/btsixad/Makefile b/sysutils/btsixad/Makefile
index e205324f2d00..b748e2294987 100644
--- a/sysutils/btsixad/Makefile
+++ b/sysutils/btsixad/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	btsixad
-PORTVERSION=	0.1
+PORTVERSION=	0.1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://althenia.net/files/
 
@@ -10,8 +8,6 @@ COMMENT=	Driver for Sixaxis gamepad connected over Bluetooth
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
-
 USES=		uidfix
 
 PLIST_FILES=	sbin/btsixad \
diff --git a/sysutils/btsixad/distinfo b/sysutils/btsixad/distinfo
index b9a14625e8d0..0f6a55305007 100644
--- a/sysutils/btsixad/distinfo
+++ b/sysutils/btsixad/distinfo
@@ -1,2 +1,3 @@
-SHA256 (btsixad-0.1.tar.gz) = 1aa42069723ad0be4d9efa46ded382c9d1a9416320cdcb276c0928a94cd93667
-SIZE (btsixad-0.1.tar.gz) = 15490
+TIMESTAMP = 1598107318
+SHA256 (btsixad-0.1.1.tar.gz) = b932a6446fc63b5b72e24a76d77dea5d317c5c382032fcb2a9882da24fc2aece
+SIZE (btsixad-0.1.1.tar.gz) = 15508
diff --git a/sysutils/bulk_extractor/Makefile b/sysutils/bulk_extractor/Makefile
index d280b5d78289..d215a244a28e 100644
--- a/sysutils/bulk_extractor/Makefile
+++ b/sysutils/bulk_extractor/Makefile
@@ -1,9 +1,8 @@
 # Created by: MANTANI Nobutaka <nobutaka@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	bulk_extractor
 PORTVERSION=	1.5.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://digitalcorpora.org/downloads/bulk_extractor/
 
diff --git a/sysutils/burp-devel/Makefile b/sysutils/burp-devel/Makefile
index f99f15f17ca8..667863ffcddc 100644
--- a/sysutils/burp-devel/Makefile
+++ b/sysutils/burp-devel/Makefile
@@ -1,14 +1,39 @@
-# $FreeBSD$
-
-PORTVERSION=	2.3.14
+PORTNAME=	burp
+PORTVERSION=	2.3.38
+CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/grke/burp/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
 
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Network backup and restore program (development)
 
-MASTERDIR=	${.CURDIR}/../burp
-DISTINFO_FILE=	${.CURDIR}/distinfo
+LICENSE=	AGPLv3 PD
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
+		${LOCALBASE}/include/yajl/yajl_common.h:devel/yajl
+LIB_DEPENDS=	librsync.so:net/librsync
+RUN_DEPENDS=	bash:shells/bash
+
+#USES=		gmake libtool ncurses pkgconfig ssl tar:bz2
+USES=		compiler:c11 libtool ncurses pkgconfig ssl tar:bz2
+
+CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-all
+USE_RC_SUBR=	burp
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 CONFLICTS_INSTALL=	burp
-PORTSCOUT=
 
-.include "${MASTERDIR}/Makefile"
+OPTIONS_DEFINE=	IPV6
+IPV6_CONFIGURE_ENABLE=	ipv6
+
+post-install:
+.for file in CA.cnf burp.conf burp-server.conf clientconfdir/testclient
+	${MV} ${STAGEDIR}${ETCDIR}/${file} ${STAGEDIR}${ETCDIR}/${file}.sample
+.endfor
+
+.include <bsd.port.mk>
diff --git a/sysutils/burp-devel/distinfo b/sysutils/burp-devel/distinfo
index d2d1b4b04627..bb8026b0ee0e 100644
--- a/sysutils/burp-devel/distinfo
+++ b/sysutils/burp-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567498369
-SHA256 (grke-burp-2.3.14_GH0.tar.gz) = 80a37bdc6628fcf11b15bc5bf887be2e2e7d8342eba7229297c914d55f95f86f
-SIZE (grke-burp-2.3.14_GH0.tar.gz) = 621442
+TIMESTAMP = 1605426359
+SHA256 (burp-2.3.38.tar.bz2) = fd5a43a1bf51dc22e35fe34df0675b18443944b715891157e1be35cab1d9150f
+SIZE (burp-2.3.38.tar.bz2) = 721591
diff --git a/sysutils/burp-devel/files/burp.in b/sysutils/burp-devel/files/burp.in
new file mode 100644
index 000000000000..0b1503213ab1
--- /dev/null
+++ b/sysutils/burp-devel/files/burp.in
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Burp rc.d script, placed in the public domain by Jarkko Kniivilä @ 2014-05-14
+
+# PROVIDE: burp
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable Burp:
+#
+#  burp_enable="YES"
+#  # optional
+#  burp_config="%%PREFIX%%/etc/burp/burp-server.conf"
+#
+#
+
+export PATH="$PATH:%%PREFIX%%/bin:%%PREFIX%%/sbin"
+
+. /etc/rc.subr
+
+name=burp
+rcvar=burp_enable
+monitor_cmd="${name}_monitor"
+summary_cmd="${name}_summary"
+
+load_rc_config $name
+
+# Set some defaults
+: ${burp_enable:="NO"}
+: ${burp_config:="%%PREFIX%%/etc/burp/burp-server.conf"}
+
+burp_flags="-c ${burp_config}"
+
+command="%%PREFIX%%/sbin/${name}"
+command_args="> /dev/null 2>&1"
+
+pidfile="/var/run/${name}.server.pid"  # this really depends on the config file so make sure they concur
+required_files="${burp_config}"
+sig_reload="HUP"
+extra_commands="reload monitor summary"
+
+burp_monitor()
+{
+    rc_flags="-a s ${rc_flags}"
+    ${command} ${rc_flags}
+}
+
+burp_summary()
+{
+    # This allows you to get the output of the '-a S' flag thusly:
+    # service burp summary -C $my_client
+
+    rc_flags="-a S ${rc_flags}"
+    ${command} ${rc_flags} "$@"
+}
+
+run_rc_command "$@"
diff --git a/sysutils/burp-devel/pkg-descr b/sysutils/burp-devel/pkg-descr
new file mode 100644
index 000000000000..77e7e407bd50
--- /dev/null
+++ b/sysutils/burp-devel/pkg-descr
@@ -0,0 +1,12 @@
+Burp is a network backup and restore program. It attempts to reduce network
+traffic and the amount of space that is used by each backup. There are two
+independent backup protocols to choose from:
+- Protocol 1: Optionally uses librsync.
+  Available in all burp versions and is stable.
+- Protocol 2: Uses variable length chunking for inline deduplication, and
+  sparse indexing on the server side.
+  Available from burp version 2.0.x, but is experimental and should not be used
+  in production.
+
+WWW: https://burp.grke.org/
+WWW: https://github.com/grke/burp
diff --git a/sysutils/burp-devel/pkg-plist b/sysutils/burp-devel/pkg-plist
index e69de29bb2d1..51f25d668195 100644
--- a/sysutils/burp-devel/pkg-plist
+++ b/sysutils/burp-devel/pkg-plist
@@ -0,0 +1,26 @@
+bin/vss_strip
+@dir etc/burp/CA-client
+@sample etc/burp/CA.cnf.sample
+@dir etc/burp/autoupgrade/server/win32
+@dir etc/burp/autoupgrade/server/win64/%%PORTVERSION%%
+@sample etc/burp/burp-server.conf.sample
+@sample etc/burp/burp.conf.sample
+etc/burp/clientconfdir/incexc/example
+@sample etc/burp/clientconfdir/testclient.sample
+man/man8/bedup.8.gz
+man/man8/bsigs.8.gz
+man/man8/bsparse.8.gz
+man/man8/burp.8.gz
+man/man8/burp_ca.8.gz
+man/man8/vss_strip.8.gz
+sbin/bedup
+sbin/bsigs
+sbin/bsparse
+sbin/burp
+sbin/burp_ca
+%%DATADIR%%/scripts/backup_tool_script
+%%DATADIR%%/scripts/notify_script
+%%DATADIR%%/scripts/ssl_extra_checks_script
+%%DATADIR%%/scripts/summary_script
+%%DATADIR%%/scripts/timer_script
+@dir /var/spool/burp
diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index 2fafa811e574..6873c0294bc7 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -1,12 +1,12 @@
 # Created by: Loic Pefferkorn <loic-freebsd@loicp.eu>
-# $FreeBSD$
 
 PORTNAME=	burp
-PORTVERSION?=	2.2.18
-PORTREVISION?=	1
+PORTVERSION=	2.2.18
+PORTREVISION=	4
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/grke/burp/releases/download/${PORTVERSION}/
 
-MAINTAINER=	phascolarctos@protonmail.ch
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Network backup and restore program
 
 LICENSE=	AGPLv3 PD
@@ -15,30 +15,29 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
 		${LOCALBASE}/include/yajl/yajl_common.h:devel/yajl
-LIB_DEPENDS=	librsync.so:net/librsync2
+LIB_DEPENDS=	librsync.so:net/librsync
+RUN_DEPENDS=	bash:shells/bash
 
-USES=		autoreconf gmake libtool ncurses pkgconfig ssl
-USE_GITHUB=	yes
+#USES=		gmake libtool ncurses pkgconfig ssl tar:bz2
+USES=		libtool ncurses pkgconfig ssl tar:bz2
 
-GH_ACCOUNT=	grke
-
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
-
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-all
-
-CONFLICTS_INSTALL?=	burp-devel
-PORTSCOUT?=		limit:^2\.2\.
+USE_RC_SUBR=	burp
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=		IPV6
-IPV6_CONFIGURE_ENABLE=	ipv6
+CONFLICTS_INSTALL=	burp-devel
 
-post-patch:
-	${REINPLACE_CMD} "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/freebsd/rc.d/burp
+PORTSCOUT=	limit:^2\.2\.
+
+OPTIONS_DEFINE=	IPV6
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/freebsd/rc.d/burp ${STAGEDIR}${PREFIX}/etc/rc.d/burp
+.for file in CA.cnf burp.conf burp-server.conf clientconfdir/testclient
+	${MV} ${STAGEDIR}${ETCDIR}/${file} ${STAGEDIR}${ETCDIR}/${file}.sample
+.endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/burp/distinfo b/sysutils/burp/distinfo
index f59cf1381bc0..519e88d7481e 100644
--- a/sysutils/burp/distinfo
+++ b/sysutils/burp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553621533
-SHA256 (grke-burp-2.2.18_GH0.tar.gz) = 7d3e4b4563dbe0b399a050462f4be01dc39a331f7a6eba760341fb1cf80cdd00
-SIZE (grke-burp-2.2.18_GH0.tar.gz) = 632805
+TIMESTAMP = 1598777616
+SHA256 (burp-2.2.18.tar.bz2) = 9c0c5298d8c2995d30d4e1a63d2882662e7056ce2b0cee1f65d7d0a6775c0f81
+SIZE (burp-2.2.18.tar.bz2) = 816545
diff --git a/sysutils/burp/files/burp.in b/sysutils/burp/files/burp.in
index e69de29bb2d1..0b1503213ab1 100644
--- a/sysutils/burp/files/burp.in
+++ b/sysutils/burp/files/burp.in
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Burp rc.d script, placed in the public domain by Jarkko Kniivilä @ 2014-05-14
+
+# PROVIDE: burp
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable Burp:
+#
+#  burp_enable="YES"
+#  # optional
+#  burp_config="%%PREFIX%%/etc/burp/burp-server.conf"
+#
+#
+
+export PATH="$PATH:%%PREFIX%%/bin:%%PREFIX%%/sbin"
+
+. /etc/rc.subr
+
+name=burp
+rcvar=burp_enable
+monitor_cmd="${name}_monitor"
+summary_cmd="${name}_summary"
+
+load_rc_config $name
+
+# Set some defaults
+: ${burp_enable:="NO"}
+: ${burp_config:="%%PREFIX%%/etc/burp/burp-server.conf"}
+
+burp_flags="-c ${burp_config}"
+
+command="%%PREFIX%%/sbin/${name}"
+command_args="> /dev/null 2>&1"
+
+pidfile="/var/run/${name}.server.pid"  # this really depends on the config file so make sure they concur
+required_files="${burp_config}"
+sig_reload="HUP"
+extra_commands="reload monitor summary"
+
+burp_monitor()
+{
+    rc_flags="-a s ${rc_flags}"
+    ${command} ${rc_flags}
+}
+
+burp_summary()
+{
+    # This allows you to get the output of the '-a S' flag thusly:
+    # service burp summary -C $my_client
+
+    rc_flags="-a S ${rc_flags}"
+    ${command} ${rc_flags} "$@"
+}
+
+run_rc_command "$@"
diff --git a/sysutils/burp/pkg-descr b/sysutils/burp/pkg-descr
index 447b6e5952ff..77e7e407bd50 100644
--- a/sysutils/burp/pkg-descr
+++ b/sysutils/burp/pkg-descr
@@ -1,6 +1,12 @@
-Burp is a backup and restore program.
-It uses librsync in order to save on the amount of space that is used
-by each backup. It also uses VSS (Volume Shadow Copy Service)
-to make snapshots when backing up Windows computers.
+Burp is a network backup and restore program. It attempts to reduce network
+traffic and the amount of space that is used by each backup. There are two
+independent backup protocols to choose from:
+- Protocol 1: Optionally uses librsync.
+  Available in all burp versions and is stable.
+- Protocol 2: Uses variable length chunking for inline deduplication, and
+  sparse indexing on the server side.
+  Available from burp version 2.0.x, but is experimental and should not be used
+  in production.
 
 WWW: https://burp.grke.org/
+WWW: https://github.com/grke/burp
diff --git a/sysutils/burp/pkg-plist b/sysutils/burp/pkg-plist
index bd5b3fd05bbc..51f25d668195 100644
--- a/sysutils/burp/pkg-plist
+++ b/sysutils/burp/pkg-plist
@@ -1,10 +1,12 @@
 bin/vss_strip
-%%ETCDIR%%/CA.cnf
-%%ETCDIR%%/burp-server.conf
-%%ETCDIR%%/burp.conf
-%%ETCDIR%%/clientconfdir/incexc/example
-%%ETCDIR%%/clientconfdir/testclient
-etc/rc.d/burp
+@dir etc/burp/CA-client
+@sample etc/burp/CA.cnf.sample
+@dir etc/burp/autoupgrade/server/win32
+@dir etc/burp/autoupgrade/server/win64/%%PORTVERSION%%
+@sample etc/burp/burp-server.conf.sample
+@sample etc/burp/burp.conf.sample
+etc/burp/clientconfdir/incexc/example
+@sample etc/burp/clientconfdir/testclient.sample
 man/man8/bedup.8.gz
 man/man8/bsigs.8.gz
 man/man8/bsparse.8.gz
@@ -21,7 +23,4 @@ sbin/burp_ca
 %%DATADIR%%/scripts/ssl_extra_checks_script
 %%DATADIR%%/scripts/summary_script
 %%DATADIR%%/scripts/timer_script
-@dir %%ETCDIR%%/CA-client
-@dir %%ETCDIR%%/autoupgrade/server/win32
-@dir %%ETCDIR%%/autoupgrade/server/win64/%%PORTVERSION%%
 @dir /var/spool/burp
diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index d456a5e89acd..5b4fafde1f09 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -1,13 +1,12 @@
 # Created by: luigi@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	busybox
-PORTVERSION=	1.30.1
+PORTVERSION=	1.32.1
 PORTREVISION=	1
 CATEGORIES=	sysutils misc shells
 MASTER_SITES=	https://busybox.net/downloads/
 
-MAINTAINER=	samm@os2.kiev.ua
+MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Set of common utilities built as single binary
 
 LICENSE=	GPLv2
@@ -20,7 +19,6 @@ USE_PERL5=	build
 OPTIONS_DEFINE=	DOCS STATIC
 STATIC_LDFLAGS=	-static
 
-CONFLICTS_INSTALL=	busybox-unstable-*
 .include <bsd.port.options.mk>
 # fix ash crash on arm, see shell/ash.c
 .if ${ARCH} == "armv6"
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index 337e51dc2b0d..5679f7f1c6bf 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561964361
-SHA256 (busybox-1.30.1.tar.bz2) = 3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc
-SIZE (busybox-1.30.1.tar.bz2) = 7793781
+TIMESTAMP = 1609623487
+SHA256 (busybox-1.32.1.tar.bz2) = 9d57c4bd33974140fd4111260468af22856f12f5b5ef7c70c8d9b75c712a0dee
+SIZE (busybox-1.32.1.tar.bz2) = 2444679
diff --git a/sysutils/busybox/files/data-.config b/sysutils/busybox/files/data-.config
index cf85d26f8e4c..1989e48c14c2 100644
--- a/sysutils/busybox/files/data-.config
+++ b/sysutils/busybox/files/data-.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.30.1
-# Mon Jul  8 22:30:54 2019
+# Busybox version: 1.31.0
+# Mon Oct 14 17:36:36 2019
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -19,7 +19,7 @@ CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_LFS=y
 # CONFIG_PAM is not set
 CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_UTMP is not set
+CONFIG_FEATURE_UTMP=y
 # CONFIG_FEATURE_WTMP is not set
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_PID_FILE_PATH="/var/run"
@@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_SELINUX is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
 CONFIG_PLATFORM_LINUX=y
 
@@ -187,9 +188,9 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 # CONFIG_FEATURE_TAR_SELINUX is not set
 CONFIG_UNZIP=y
 CONFIG_FEATURE_UNZIP_CDF=y
-# CONFIG_FEATURE_UNZIP_BZIP2 is not set
-# CONFIG_FEATURE_UNZIP_LZMA is not set
-# CONFIG_FEATURE_UNZIP_XZ is not set
+CONFIG_FEATURE_UNZIP_BZIP2=y
+CONFIG_FEATURE_UNZIP_LZMA=y
+CONFIG_FEATURE_UNZIP_XZ=y
 CONFIG_FEATURE_LZMA_FAST=y
 
 #
@@ -210,10 +211,10 @@ CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_REFLINK=y
 CONFIG_CUT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_FEATURE_DATE_COMPAT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
 CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
@@ -236,7 +237,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FACTOR=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
-CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_HOSTID=y
@@ -297,20 +297,21 @@ CONFIG_FEATURE_SORT_BIG=y
 CONFIG_SPLIT=y
 CONFIG_FEATURE_SPLIT_FANCY=y
 CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_FEATURE_STAT_FORMAT=y
 # CONFIG_FEATURE_STAT_FILESYSTEM is not set
 CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
 # CONFIG_FEATURE_SYNC_FANCY is not set
-# CONFIG_TAC is not set
+CONFIG_FSYNC=y
+CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
 CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TEST=y
-# CONFIG_TEST1 is not set
-# CONFIG_TEST2 is not set
+CONFIG_TEST1=y
+CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TIMEOUT=y
 CONFIG_TOUCH=y
@@ -333,9 +334,9 @@ CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHO is not set
-# CONFIG_W is not set
-# CONFIG_USERS is not set
+CONFIG_WHO=y
+CONFIG_W=y
+CONFIG_USERS=y
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
@@ -462,8 +463,8 @@ CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_FEATURE_FIND_LINKS=y
 CONFIG_GREP=y
-# CONFIG_EGREP is not set
-# CONFIG_FGREP is not set
+CONFIG_EGREP=y
+CONFIG_FGREP=y
 CONFIG_FEATURE_GREP_CONTEXT=y
 CONFIG_XARGS=y
 CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
@@ -480,7 +481,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
 # CONFIG_BOOTCHARTD is not set
 # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-# CONFIG_HALT is not set
+CONFIG_HALT=y
 CONFIG_POWEROFF=y
 CONFIG_REBOOT=y
 # CONFIG_FEATURE_WAIT_FOR_INIT is not set
@@ -635,6 +636,7 @@ CONFIG_XXD=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_FEATURE_MDEV_DAEMON is not set
 # CONFIG_MESG is not set
 # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 # CONFIG_MKE2FS is not set
@@ -668,7 +670,7 @@ CONFIG_READPROFILE=y
 CONFIG_RENICE=y
 CONFIG_REV=y
 # CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
+CONFIG_SCRIPT=y
 CONFIG_SCRIPTREPLAY=y
 # CONFIG_SETARCH is not set
 # CONFIG_LINUX32 is not set
@@ -690,7 +692,7 @@ CONFIG_SETSID=y
 # CONFIG_UMOUNT is not set
 # CONFIG_FEATURE_UMOUNT_ALL is not set
 # CONFIG_UNSHARE is not set
-# CONFIG_WALL is not set
+CONFIG_WALL=y
 # CONFIG_FEATURE_MOUNT_LOOP is not set
 # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
@@ -736,14 +738,14 @@ CONFIG_FEATURE_BC_LONG_OPTIONS=y
 # CONFIG_BEEP is not set
 CONFIG_FEATURE_BEEP_FREQ=0
 CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
+CONFIG_FEATURE_CHAT_TTY_HIFI=y
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
+CONFIG_FEATURE_CHAT_SEND_ESCAPES=y
+CONFIG_FEATURE_CHAT_VAR_ABORT_LEN=y
+CONFIG_FEATURE_CHAT_CLR_ABORT=y
 # CONFIG_CONSPY is not set
 CONFIG_CROND=y
 CONFIG_FEATURE_CROND_D=y
@@ -774,6 +776,7 @@ CONFIG_HEXEDIT=y
 # CONFIG_I2CSET is not set
 # CONFIG_I2CDUMP is not set
 # CONFIG_I2CDETECT is not set
+# CONFIG_I2CTRANSFER is not set
 # CONFIG_INOTIFYD is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
@@ -807,6 +810,7 @@ CONFIG_MICROCOM=y
 # CONFIG_SETSERIAL is not set
 CONFIG_STRINGS=y
 # CONFIG_TIME is not set
+CONFIG_TS=y
 CONFIG_TTYSIZE=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
@@ -834,17 +838,17 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 CONFIG_DNSD=y
 # CONFIG_ETHER_WAKE is not set
 CONFIG_FTPD=y
-# CONFIG_FEATURE_FTPD_WRITE is not set
+CONFIG_FEATURE_FTPD_WRITE=y
 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
+CONFIG_FEATURE_FTPD_AUTHENTICATION=y
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
 CONFIG_HOSTNAME=y
-# CONFIG_DNSDOMAINNAME is not set
+CONFIG_DNSDOMAINNAME=y
 CONFIG_HTTPD=y
 CONFIG_FEATURE_HTTPD_RANGES=y
-# CONFIG_FEATURE_HTTPD_SETUID is not set
+CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 CONFIG_FEATURE_HTTPD_AUTH_MD5=y
 CONFIG_FEATURE_HTTPD_CGI=y
@@ -923,7 +927,8 @@ CONFIG_PSCAN=y
 CONFIG_SSL_CLIENT=y
 # CONFIG_TC is not set
 # CONFIG_FEATURE_TC_INGRESS is not set
-# CONFIG_TCPSVD is not set
+CONFIG_TCPSVD=y
+# DOes not work on FreeBSD
 # CONFIG_UDPSVD is not set
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
@@ -934,6 +939,7 @@ CONFIG_FEATURE_TELNETD_STANDALONE=y
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+CONFIG_FEATURE_TFTP_HPA_COMPAT=y
 CONFIG_TFTPD=y
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
@@ -954,7 +960,7 @@ CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_HTTPS=y
 CONFIG_FEATURE_WGET_OPENSSL=y
-# CONFIG_WHOIS is not set
+CONFIG_WHOIS=y
 # CONFIG_ZCIP is not set
 # CONFIG_UDHCPD is not set
 # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
@@ -1042,19 +1048,19 @@ CONFIG_FEATURE_SHOW_THREADS=y
 #
 # Runit Utilities
 #
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
+CONFIG_RUNSV=y
+CONFIG_RUNSVDIR=y
 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
+CONFIG_SV=y
 CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVC is not set
+CONFIG_SVC=y
 CONFIG_SVOK=y
-# CONFIG_SVLOGD is not set
+CONFIG_SVLOGD=y
 # CONFIG_CHCON is not set
 # CONFIG_GETENFORCE is not set
 # CONFIG_GETSEBOOL is not set
@@ -1097,41 +1103,41 @@ CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_LINENO_VAR is not set
+CONFIG_HUSH=y
+CONFIG_HUSH_BASH_COMPAT=y
+CONFIG_HUSH_BRACE_EXPANSION=y
+CONFIG_HUSH_LINENO_VAR=y
 # CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_HUSH_ECHO is not set
-# CONFIG_HUSH_PRINTF is not set
-# CONFIG_HUSH_TEST is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_EXPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_READONLY is not set
-# CONFIG_HUSH_KILL is not set
-# CONFIG_HUSH_WAIT is not set
-# CONFIG_HUSH_COMMAND is not set
-# CONFIG_HUSH_TRAP is not set
-# CONFIG_HUSH_TYPE is not set
-# CONFIG_HUSH_TIMES is not set
-# CONFIG_HUSH_READ is not set
-# CONFIG_HUSH_SET is not set
-# CONFIG_HUSH_UNSET is not set
-# CONFIG_HUSH_ULIMIT is not set
-# CONFIG_HUSH_UMASK is not set
-# CONFIG_HUSH_GETOPTS is not set
+CONFIG_HUSH_INTERACTIVE=y
+CONFIG_HUSH_SAVEHISTORY=y
+CONFIG_HUSH_JOB=y
+CONFIG_HUSH_TICK=y
+CONFIG_HUSH_IF=y
+CONFIG_HUSH_LOOPS=y
+CONFIG_HUSH_CASE=y
+CONFIG_HUSH_FUNCTIONS=y
+CONFIG_HUSH_LOCAL=y
+CONFIG_HUSH_RANDOM_SUPPORT=y
+CONFIG_HUSH_MODE_X=y
+CONFIG_HUSH_ECHO=y
+CONFIG_HUSH_PRINTF=y
+CONFIG_HUSH_TEST=y
+CONFIG_HUSH_HELP=y
+CONFIG_HUSH_EXPORT=y
+CONFIG_HUSH_EXPORT_N=y
+CONFIG_HUSH_READONLY=y
+CONFIG_HUSH_KILL=y
+CONFIG_HUSH_WAIT=y
+CONFIG_HUSH_COMMAND=y
+CONFIG_HUSH_TRAP=y
+CONFIG_HUSH_TYPE=y
+CONFIG_HUSH_TIMES=y
+CONFIG_HUSH_READ=y
+CONFIG_HUSH_SET=y
+CONFIG_HUSH_UNSET=y
+CONFIG_HUSH_ULIMIT=y
+CONFIG_HUSH_UMASK=y
+CONFIG_HUSH_GETOPTS=y
 # CONFIG_HUSH_MEMLEAK is not set
 
 #
@@ -1139,6 +1145,7 @@ CONFIG_CTTYHACK=y
 #
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
@@ -1161,9 +1168,15 @@ CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
 CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
 CONFIG_FEATURE_REMOTE_LOG=y
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_DUP=y
 CONFIG_FEATURE_SYSLOGD_CFG=y
 CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_FEATURE_KMSG_SYSLOG=y
+
+CONFIG_WARN_SIMPLE_MSG=n
+CONFIG_FEATURE_FIND_EMPTY=y
+CONFIG_MIM=y
+CONFIG_SHELL_HUSH=n
+CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS=n
diff --git a/sysutils/busybox/files/patch-Makefile.flags b/sysutils/busybox/files/patch-Makefile.flags
index 5e2842a6c0e6..a2136dedaf79 100644
--- a/sysutils/busybox/files/patch-Makefile.flags
+++ b/sysutils/busybox/files/patch-Makefile.flags
@@ -1,30 +1,12 @@
---- Makefile.flags.orig	2018-12-05 14:44:34 UTC
+--- Makefile.flags.orig	2021-01-03 14:40:37 UTC
 +++ Makefile.flags
-@@ -47,12 +47,11 @@ endif
- # gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action()
- CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition)
- 
--CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
-+CFLAGS += $(call cc-option,-fno-builtin-strlen -fomit-frame-pointer -ffunction-sections -fdata-sections,)
- # -fno-guess-branch-probability: prohibit pseudo-random guessing
- # of branch probabilities (hopefully makes bloatcheck more stable):
- CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
--CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
--CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
-+CFLAGS += $(call cc-option,-funsigned-char,)
- # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary):
- CFLAGS += $(call cc-option,-fno-unwind-tables,)
- CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,)
-@@ -156,9 +155,9 @@ CPPFLAGS += $(SELINUX_CFLAGS)
- LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+@@ -180,7 +180,9 @@ LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$
  endif
  
--ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
--LDLIBS += resolv
--endif
-+# ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
-+# LDLIBS += resolv
-+# endif
+ ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
++ifeq ($(CONFIG_UNAME_OSNAME),Linux)
+ LDLIBS += resolv
++endif
+ endif
  
  ifeq ($(CONFIG_EFENCE),y)
- LDLIBS += efence
diff --git a/sysutils/busybox/files/patch-coreutils_mknod.c b/sysutils/busybox/files/patch-coreutils_mknod.c
index a480d2fdf999..a166e320359d 100644
--- a/sysutils/busybox/files/patch-coreutils_mknod.c
+++ b/sysutils/busybox/files/patch-coreutils_mknod.c
@@ -1,12 +1,12 @@
---- coreutils/mknod.c.orig	2018-12-30 15:14:20 UTC
+--- coreutils/mknod.c.orig	2021-01-01 10:52:27 UTC
 +++ coreutils/mknod.c
-@@ -36,7 +36,8 @@
+@@ -36,7 +36,9 @@
  //usage:       "$ mknod /dev/fd0 b 2 0\n"
  //usage:       "$ mknod -m 644 /tmp/pipe p\n"
  
--#include <sys/sysmacros.h>  // For makedev
-+// #include <sys/sysmacros.h>  // For makedev
-+#include <sys/types.h>
++#ifdef __linux__
+ #include <sys/sysmacros.h>  // For makedev
++#endif
  
  #include "libbb.h"
  #include "libcoreutils/coreutils.h"
diff --git a/sysutils/busybox/files/patch-include_libbb.h b/sysutils/busybox/files/patch-include_libbb.h
index 4fa8683ac306..a4bd33838b78 100644
--- a/sysutils/busybox/files/patch-include_libbb.h
+++ b/sysutils/busybox/files/patch-include_libbb.h
@@ -1,22 +1,14 @@
---- include/libbb.h.orig	2019-02-14 13:31:15 UTC
+--- include/libbb.h.orig	2021-01-04 13:16:47 UTC
 +++ include/libbb.h
-@@ -53,6 +53,9 @@
- #include <termios.h>
- #include <time.h>
- #include <sys/param.h>
-+#ifndef HAVE_XTABS
-+# define XTABS TAB3
+@@ -106,7 +106,11 @@
+ #  define updwtmpx updwtmp
+ #  define _PATH_UTMPX _PATH_UTMP
+ # else
++#ifndef __FreeBSD__
+ #  include <utmp.h>
++#else
++#define  _PATH_UTMPX "/var/run/utx.active"
 +#endif
- #include <pwd.h>
- #include <grp.h>
- #if ENABLE_FEATURE_SHADOWPASSWDS
-@@ -160,9 +163,6 @@
- #ifndef HAVE_FDATASYNC
- # define fdatasync fsync
- #endif
--#ifndef HAVE_XTABS
--# define XTABS TAB3
--#endif
- /*
-  * Use '%m' to append error string on platforms that support it,
-  * '%s' and strerror() on those that don't.
+ #  include <utmpx.h>
+ #  if defined _PATH_UTMP && !defined _PATH_UTMPX
+ #   define _PATH_UTMPX _PATH_UTMP
diff --git a/sysutils/busybox/files/patch-include_platform.h b/sysutils/busybox/files/patch-include_platform.h
index 1a9d8a70ddec..b55ee80327fd 100644
--- a/sysutils/busybox/files/patch-include_platform.h
+++ b/sysutils/busybox/files/patch-include_platform.h
@@ -1,6 +1,6 @@
---- include/platform.h.orig	2018-12-05 14:44:34 UTC
+--- include/platform.h.orig	2021-01-01 13:30:02 UTC
 +++ include/platform.h
-@@ -315,7 +315,7 @@ typedef unsigned smalluint;
+@@ -319,7 +319,7 @@ typedef unsigned smalluint;
  #endif
  
  /* Define bb_setpgrp */
diff --git a/sysutils/busybox/files/patch-libbb_pw__encrypt.c b/sysutils/busybox/files/patch-libbb_pw__encrypt.c
index a1bcc3517408..a482e9e30ac5 100644
--- a/sysutils/busybox/files/patch-libbb_pw__encrypt.c
+++ b/sysutils/busybox/files/patch-libbb_pw__encrypt.c
@@ -1,11 +1,12 @@
---- libbb/pw_encrypt.c.orig	2018-12-05 14:44:34 UTC
+--- libbb/pw_encrypt.c.orig	2021-01-01 13:30:02 UTC
 +++ libbb/pw_encrypt.c
-@@ -6,7 +6,7 @@
-  *
+@@ -7,7 +7,9 @@
   * Licensed under GPLv2 or later, see file LICENSE in this source tree.
   */
--#include <crypt.h>
-+#include <unistd.h>
+ #if !ENABLE_USE_BB_CRYPT
++#ifndef __FreeBSD__
+ #include <crypt.h>
++#endif
+ #endif
  #include "libbb.h"
  
- /* static const uint8_t ascii64[] ALIGN1 =
diff --git a/sysutils/busybox/files/patch-miscutils_man.c b/sysutils/busybox/files/patch-miscutils_man.c
deleted file mode 100644
index e7e2153aa5ea..000000000000
--- a/sysutils/busybox/files/patch-miscutils_man.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- miscutils/man.c.orig	2018-12-30 15:14:20 UTC
-+++ miscutils/man.c
-@@ -265,7 +265,7 @@ int man_main(int argc UNUSED_PARAM, char
- 	if (!man_path_list) {
- 		/* default, may be overridden by /etc/man.conf */
- 		man_path_list = xzalloc(2 * sizeof(man_path_list[0]));
--		man_path_list[0] = (char*)"/usr/man";
-+		man_path_list[0] = (char*)"/usr/share/man";
- 		/* count_mp stays 0.
- 		 * Thus, man.conf will overwrite man_path_list[0]
- 		 * if a path is defined there.
diff --git a/sysutils/busybox/files/patch-networking_httpd.c b/sysutils/busybox/files/patch-networking_httpd.c
index e43d9dced43e..b60b94972e5c 100644
--- a/sysutils/busybox/files/patch-networking_httpd.c
+++ b/sysutils/busybox/files/patch-networking_httpd.c
@@ -1,17 +1,14 @@
---- networking/httpd.c.orig	2018-12-05 14:44:34 UTC
+--- networking/httpd.c.orig	2021-01-01 13:30:02 UTC
 +++ networking/httpd.c
-@@ -2109,10 +2109,10 @@ static void handle_incoming_and_exit(con
- 	}
- #if ENABLE_FEATURE_IPV6
- 	if (fromAddr->u.sa.sa_family == AF_INET6
--	 && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
--	 && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0
--	 && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff)
--		rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
-+	 && fromAddr->u.sin6.sin6_addr.s6_addr[0] == 0
-+	 && fromAddr->u.sin6.sin6_addr.s6_addr[1] == 0
-+	 && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[2]) == 0xffff)
-+		rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[3]);
- #endif
- 	if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
- 		/* NB: can be NULL (user runs httpd -i by hand?) */
+@@ -267,6 +267,11 @@
+ 
+ #define HEADER_READ_TIMEOUT 60
+ 
++/* see sys/netinet6/in6.h */
++#ifdef __FreeBSD__
++#define s6_addr32 __u6_addr.__u6_addr32
++#endif
++
+ static const char DEFAULT_PATH_HTTPD_CONF[] ALIGN1 = "/etc";
+ static const char HTTPD_CONF[] ALIGN1 = "httpd.conf";
+ static const char HTTP_200[] ALIGN1 = "HTTP/1.0 200 OK\r\n";
diff --git a/sysutils/busybox/files/patch-networking_nslookup.c b/sysutils/busybox/files/patch-networking_nslookup.c
index 5104149fdb83..08bf1836220a 100644
--- a/sysutils/busybox/files/patch-networking_nslookup.c
+++ b/sysutils/busybox/files/patch-networking_nslookup.c
@@ -1,10 +1,12 @@
---- networking/nslookup.c.orig	2019-02-14 13:31:15 UTC
+--- networking/nslookup.c.orig	2021-01-01 13:30:02 UTC
 +++ networking/nslookup.c
-@@ -34,6 +34,7 @@
+@@ -34,6 +34,9 @@
  //usage:       "Name:       debian\n"
  //usage:       "Address:    127.0.0.1\n"
  
-+#include <netinet/in.h>
++#ifdef __FreeBSD__
++#include <netinet/in.h> /* for struct in_addr */
++#endif
  #include <resolv.h>
  #include <net/if.h>	/* for IFNAMSIZ */
  //#include <arpa/inet.h>
diff --git a/sysutils/busybox/files/patch-networking_ping.c b/sysutils/busybox/files/patch-networking_ping.c
index 402625dac057..884881198fa2 100644
--- a/sysutils/busybox/files/patch-networking_ping.c
+++ b/sysutils/busybox/files/patch-networking_ping.c
@@ -1,22 +1,22 @@
---- networking/ping.c.orig	2018-12-30 15:14:20 UTC
+--- networking/ping.c.orig	2021-01-01 13:30:02 UTC
 +++ networking/ping.c
-@@ -119,7 +119,12 @@
+@@ -119,6 +119,10 @@
  //usage:       "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
  
  #include <net/if.h>
-+
-+#include <netinet/in.h>
-+#include <netinet/in_systm.h>
++#ifdef __FreeBSD__
++#include <netinet/in.h> /* struct ip and friends */
 +#include <netinet/ip.h>
++#endif
  #include <netinet/ip_icmp.h>
-+
  #include "libbb.h"
  #include "common_bufsiz.h"
- 
-@@ -147,6 +152,42 @@
- # define SOL_RAW IPPROTO_RAW
- #endif
- 
+@@ -155,6 +159,41 @@
+ #  undef IPV6_HOPLIMIT
+ #  define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
+ # endif
++#endif
++
 +#if defined(__FreeBSD__) || defined(__APPLE__)
 +/**
 + * On BSD the IPv4 struct is called struct ip and instead of iXX
@@ -50,9 +50,6 @@
 +    u_int32_t daddr;
 +    /*The options start here. */
 +  };
-+#endif
-+
-+
- #if ENABLE_PING6
- # include <netinet/icmp6.h>
- /* I see RENUMBERED constants in bits/in.h - !!?
+ #endif
+ 
+ enum {
diff --git a/sysutils/busybox/files/patch-networking_traceroute.c b/sysutils/busybox/files/patch-networking_traceroute.c
index 34dae6e92f49..9ef5f3d6f18c 100644
--- a/sysutils/busybox/files/patch-networking_traceroute.c
+++ b/sysutils/busybox/files/patch-networking_traceroute.c
@@ -1,20 +1,28 @@
---- networking/traceroute.c.orig	2018-12-30 15:14:20 UTC
+--- networking/traceroute.c.orig	2021-01-01 13:30:02 UTC
 +++ networking/traceroute.c
-@@ -635,7 +635,7 @@ packet4_ok(int read_len, const struct so
+@@ -634,8 +634,8 @@ packet4_ok(int read_len, const struct sockaddr_in *fro
+ // Off: since we do not form the entire IP packet,
  // but defer it to kernel, we can't set source port,
  // and thus can't check it here in the reply
- 			/* && up->source == htons(ident) */
+-			/* && up->source == htons(ident) */
 -			 && up->dest == htons(port + seq)
++			/* && up->uh_sport == htons(ident) */
 +			 && up->uh_dport == htons(port + seq)
  			) {
  				return (type == ICMP_TIMXCEED ? -1 : code + 1);
  			}
-@@ -933,7 +933,7 @@ common_traceroute_main(int op, char **ar
+@@ -932,8 +932,13 @@ common_traceroute_main(int op, char **argv)
+ 		setsockopt_SOL_SOCKET_1(rcvsock, SO_DONTROUTE);
  
  #if ENABLE_TRACEROUTE6
++#ifdef __FreeBSD__
++#define SOL_V6_OPTION SOL_IPV6
++#else
++#define SOL_V6_OPTION SOL_RAW
++#endif
  	if (af == AF_INET6) {
 -		if (setsockopt_int(rcvsock, SOL_RAW, IPV6_CHECKSUM, 2) != 0)
-+		if (setsockopt_int(rcvsock, SOL_IPV6, IPV6_CHECKSUM, 2) != 0)
++		if (setsockopt_int(rcvsock, SOL_V6_OPTION, IPV6_CHECKSUM, 2) != 0)
  			bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM");
  		xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
  	} else
diff --git a/sysutils/busybox/files/patch-shell_hush.c b/sysutils/busybox/files/patch-shell_hush.c
new file mode 100644
index 000000000000..0abc3df66689
--- /dev/null
+++ b/sysutils/busybox/files/patch-shell_hush.c
@@ -0,0 +1,30 @@
+--- shell/hush.c.orig	2021-01-01 13:30:58 UTC
++++ shell/hush.c
+@@ -348,7 +348,7 @@
+ #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \
+ 	|| defined(__APPLE__) \
+     )
+-# include <malloc.h>   /* for malloc_trim */
++# include <stdlib.h>   /* for malloc_trim */
+ #endif
+ #include <glob.h>
+ /* #include <dmalloc.h> */
+@@ -2091,6 +2091,18 @@ static void hush_exit(int exitcode)
+ #endif
+ }
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version < 1202000
++int
++sigisemptyset(const sigset_t *set)
++{
++	int i;
++
++	for (i = 0; i < _SIG_WORDS; i++)
++		if (set->__bits[i] != 0)
++			return (0);
++	return (1);
++}
++#endif
+ 
+ //TODO: return a mask of ALL handled sigs?
+ static int check_and_run_traps(void)
diff --git a/sysutils/busybox/files/patch-shell_shell__common.c b/sysutils/busybox/files/patch-shell_shell__common.c
new file mode 100644
index 000000000000..f3db3627e0a5
--- /dev/null
+++ b/sysutils/busybox/files/patch-shell_shell__common.c
@@ -0,0 +1,12 @@
+--- shell/shell_common.c.orig	2021-01-01 13:30:58 UTC
++++ shell/shell_common.c
+@@ -327,7 +327,9 @@ struct limits {
+ static const struct limits limits_tbl[] = {
+ 	{ RLIMIT_CORE,		9,	}, // -c
+ 	{ RLIMIT_DATA,		10,	}, // -d
++#ifdef RLIMIT_NICE
+ 	{ RLIMIT_NICE,		0,	}, // -e
++#endif
+ 	{ RLIMIT_FSIZE,		9,	}, // -f
+ #define LIMIT_F_IDX     3
+ #ifdef RLIMIT_SIGPENDING
diff --git a/sysutils/busybox/pkg-descr b/sysutils/busybox/pkg-descr
index 5c35f87e6138..8d4f59d94574 100644
--- a/sysutils/busybox/pkg-descr
+++ b/sysutils/busybox/pkg-descr
@@ -2,4 +2,4 @@ busybox is a set of common utilities built as a single
 crunched binary, and sometimes stripped down in features
 to fit the needs of embedded systems.
 
-WWW: http://www.busybox.net/
+WWW: https://www.busybox.net/
diff --git a/sysutils/bvm/Makefile b/sysutils/bvm/Makefile
index a331706a80ac..555b2f9b25d6 100644
--- a/sysutils/bvm/Makefile
+++ b/sysutils/bvm/Makefile
@@ -1,8 +1,7 @@
 # Created by: Qiang Guo <guoqiang_cn@126.com>
-# $FreeBSD$
 
 PORTNAME=	bvm
-PORTVERSION=	1.2.4
+PORTVERSION=	1.3.2
 CATEGORIES=	sysutils
 
 MAINTAINER=	guoqiang_cn@126.com
@@ -28,9 +27,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/bvm.conf ${STAGEDIR}${PREFIX}/etc/bvm/bvm.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/nat.conf ${STAGEDIR}${PREFIX}/etc/bvm/nat.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/switch.conf ${STAGEDIR}${PREFIX}/etc/bvm/switch.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/conf/dhcp.conf ${STAGEDIR}${PREFIX}/etc/bvm/dhcp.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/bvmd ${STAGEDIR}${PREFIX}/etc/rc.d/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/bvm ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/bvmb ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/bvmdhcp ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/bvm.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/bvm/distinfo b/sysutils/bvm/distinfo
index 50c264cc7d0e..9fe366695e05 100644
--- a/sysutils/bvm/distinfo
+++ b/sysutils/bvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551663917
-SHA256 (bigdragonsoft-bvm-1.2.4_GH0.tar.gz) = 4802b22f3995c13f327160553fcfc129b1ef21a9c271b5769d806cf6a3891f40
-SIZE (bigdragonsoft-bvm-1.2.4_GH0.tar.gz) = 62646
+TIMESTAMP = 1616745016
+SHA256 (bigdragonsoft-bvm-1.3.2_GH0.tar.gz) = 02c1da69155c02dab41a656c534c1a30c3a09bf673c5c9f1f72382e42896345b
+SIZE (bigdragonsoft-bvm-1.3.2_GH0.tar.gz) = 125259
diff --git a/sysutils/bvm/pkg-plist b/sysutils/bvm/pkg-plist
index 59351154f725..d9dd3dcbbfa8 100644
--- a/sysutils/bvm/pkg-plist
+++ b/sysutils/bvm/pkg-plist
@@ -1,7 +1,9 @@
 bin/bvm
 bin/bvmb
+bin/bvmdhcp
 @sample %%ETCDIR%%/bvm.conf.sample
 @sample %%ETCDIR%%/nat.conf.sample
 @sample %%ETCDIR%%/switch.conf.sample
+@sample %%ETCDIR%%/dhcp.conf.sample
 etc/rc.d/bvmd
 man/man8/bvm.8.gz
diff --git a/sysutils/byobu/Makefile b/sysutils/byobu/Makefile
index c3207345b8f7..c38384a267a2 100644
--- a/sysutils/byobu/Makefile
+++ b/sysutils/byobu/Makefile
@@ -1,14 +1,13 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
-# $FreeBSD$
 
 PORTNAME=	byobu
-PORTVERSION=	5.129
-PORTREVISION=	3
+PORTVERSION=	5.133
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
-MAINTAINER=	jcoffman@xsecure.io
+MAINTAINER=	cws@cybersecu.red
 COMMENT=	Profile and configuration utilities for GNU Screen and/or tmux
 
 LICENSE=	GPLv3
@@ -17,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	bash:shells/bash \
 		gsed:textproc/gsed
 
-USES=		autoreconf python shebangfix
+USES=		autoreconf python shebangfix ncurses:port
 
 SHEBANG_FILES=	usr/lib/byobu/include/notify_osd \
 		usr/lib/byobu/include/config.py.in \
@@ -51,7 +50,5 @@ post-patch:
 			-e "s@/usr/bin/python@${PYTHON_CMD}@"
 	${REINPLACE_CMD} -e 's,@sysconfdir@/profile.d,$$(datadir)/@PACKAGE@,' \
 		${WRKSRC}/etc/profile.d/Makefile.am
-	${FIND} ${WRKSRC}/usr/lib/byobu -type f -maxdepth 1 | ${XARGS} \
-		${REINPLACE_CMD} -e 's:/proc:/compat/linux/proc:g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/byobu/distinfo b/sysutils/byobu/distinfo
index bbd16ebfd47f..fa59040067a3 100644
--- a/sysutils/byobu/distinfo
+++ b/sysutils/byobu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566517721
-SHA256 (byobu_5.129.orig.tar.gz) = e5135f20750c359b6371ee87cf2729c6038fbf3a6e66680e67f6a2125b07c2b9
-SIZE (byobu_5.129.orig.tar.gz) = 758633
+TIMESTAMP = 1583179457
+SHA256 (byobu_5.133.orig.tar.gz) = 4d8ea48f8c059e56f7174df89b04a08c32286bae5a21562c5c6f61be6dab7563
+SIZE (byobu_5.133.orig.tar.gz) = 761655
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_cpu__count b/sysutils/byobu/files/patch-usr_lib_byobu_cpu__count
new file mode 100644
index 000000000000..488987644088
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_cpu__count
@@ -0,0 +1,13 @@
+--- usr/lib/byobu/cpu_count.orig	2016-04-07 22:05:52 UTC
++++ usr/lib/byobu/cpu_count
+@@ -25,7 +25,9 @@ __cpu_count_detail() {
+ 
+ __cpu_count() {
+ 	local c
+-	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
++	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || \
++		grep -ci "^processor" /proc/cpuinfo || \
++		sysctl -n hw.ncpu)
+ 	[ "$c" = "1" ] || printf "%sx" "$c"
+ }
+ 
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_cpu__freq b/sysutils/byobu/files/patch-usr_lib_byobu_cpu__freq
new file mode 100644
index 000000000000..094594b3d855
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_cpu__freq
@@ -0,0 +1,30 @@
+--- usr/lib/byobu/cpu_freq.orig	2016-04-07 22:05:52 UTC
++++ usr/lib/byobu/cpu_freq
+@@ -25,6 +25,7 @@ __cpu_freq_detail() {
+ 
+ __cpu_freq() {
+ 	local hz freq count
++
+ 	if [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then
+ 		read hz < /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
+ 		fpdiv $hz "1000000" 1 # 1Ghz
+@@ -33,7 +34,6 @@ __cpu_freq() {
+ 		if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then
+ 			freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
+ 		else
+-			# Must scale frequency by number of processors, if counting bogomips
+ 			count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
+ 			freq=$(egrep -i -m 1 "^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
+ 			freq=$(printf "%s %s" "$freq" "$count" | awk '{printf "%01.1f\n", $1/$2/1000}')
+@@ -41,7 +41,11 @@ __cpu_freq() {
+ 	elif hz=$(sysctl -n hw.cpufrequency 2>/dev/null); then
+ 		fpdiv $hz "1000000000" 1 # 1Ghz
+ 		freq="$_RET"
++	elif hz=$(sysctl -n machdep.tsc_freq 2>/dev/null); then
++		fpdiv $hz "1000000000" 1
++		freq="$_RET"
+ 	fi
++
+ 	[ -n "$freq" ] || return
+ 	color b c W; printf "%s" "$freq"; color -; color c W; printf "%s" "$ICON_GHz"; color --
+ }
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_disk b/sysutils/byobu/files/patch-usr_lib_byobu_disk
index 5198a1d25cc6..7d8e86a147b5 100644
--- a/sysutils/byobu/files/patch-usr_lib_byobu_disk
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_disk
@@ -1,25 +1,28 @@
---- usr/lib/byobu/disk.orig	2016-04-07 22:05:52 UTC
+--- usr/lib/byobu/disk.orig	2020-02-09 16:40:29 UTC
 +++ usr/lib/byobu/disk
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,11 @@
  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
  __disk_detail() {
 -	df -h -P
-+	df -h
++	if [ $(uname) = "FreeBSD" ]; then
++		df -h
++	else
++		df -h -P
++	fi
  }
  
  __disk() {
-@@ -28,11 +28,11 @@ __disk() {
- 	# Default to /, but let users override
- 	[ -z "$MONITORED_DISK" ] && MP="/" || MP="$MONITORED_DISK"
- 	case $MP in
--		/dev/*) MP=$(awk '$1 == m { print $2; exit(0); }' "m=$MP" /proc/mounts);;
-+		/dev/*) MP=$(awk '$1 == m { print $2; exit(0); }' "m=$MP" /compat/linux/proc/mounts);;
+@@ -32,7 +36,11 @@ __disk() {
  	esac
  	# this could be done faster with 'stat --file-system --format'
  	# but then we'd have to do blocks -> human units ourselves
 -	out=$({ df -h -P "$MP" 2>/dev/null || df -h "$MP"; } | awk 'END { printf("%s %s", $2, $5); }')
-+	out=$({ df -h "$MP" 2>/dev/null || df -h "$MP"; } | awk 'END { printf("%s %s", $2, $5); }')
++	if [ $(uname) = "FreeBSD" ]; then
++		out=$({ df -h "$MP" 2>/dev/null || df -h "$MP"; } | awk 'END { printf("%s %s", $2, $5); }')
++	else
++		out=$({ df -h -P "$MP" 2>/dev/null || df -h "$MP"; } | awk 'END { printf("%s %s", $2, $5); }')
++	fi
  	set -- ${out}
  	size=${1}; pct=${2};
  	unit=${size#${size%?}} # get the unit (last char)
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_include_colors b/sysutils/byobu/files/patch-usr_lib_byobu_include_colors
new file mode 100644
index 000000000000..12f3a3783fb7
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_include_colors
@@ -0,0 +1,20 @@
+--- usr/lib/byobu/include/colors.orig	2021-04-18 17:01:25 UTC
++++ usr/lib/byobu/include/colors
+@@ -22,13 +22,13 @@
+ # Inspired by http://design.ubuntu.com/brand/colour-palette
+ 
+ # Cool grey
+-export BYOBU_DARK="\#333333"
++export BYOBU_DARK="#333333"
+ 
+ # Warm white
+-export BYOBU_LIGHT="\#EEEEEE"
++export BYOBU_LIGHT="#EEEEEE"
+ 
+ # Aubergine
+-export BYOBU_ACCENT="\#75507B"
++export BYOBU_ACCENT="#75507B"
+ 
+ # Ubuntu orange
+-export BYOBU_HIGHLIGHT="\#DD4814"
++export BYOBU_HIGHLIGHT="#DD4814"
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_load__average b/sysutils/byobu/files/patch-usr_lib_byobu_load__average
new file mode 100644
index 000000000000..c060aa5d5505
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_load__average
@@ -0,0 +1,11 @@
+--- usr/lib/byobu/load_average.orig	2016-04-07 22:05:52 UTC
++++ usr/lib/byobu/load_average
+@@ -26,6 +26,8 @@ __load_average_detail() {
+ __load_average() {
+ 	if [ -r "/proc/loadavg" ]; then
+ 		read one five fifteen other < /proc/loadavg
++	elif [ $(uname) = "FreeBSD" ]; then
++		one=$(uptime | sed -En 's:.*averages\: ([[:digit:]]+\.[[:digit:]]+),.*:\1:p')
+ 	else
+ 		one=$(uptime | sed -e "s/.*://" | awk '{print $1}')
+ 	fi
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_memory b/sysutils/byobu/files/patch-usr_lib_byobu_memory
index b4952a8fbfae..bf08bbfac38b 100644
--- a/sysutils/byobu/files/patch-usr_lib_byobu_memory
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_memory
@@ -1,11 +1,74 @@
---- usr/lib/byobu/memory.orig	2019-08-23 17:23:09 UTC
+--- usr/lib/byobu/memory.orig	2016-09-15 19:22:48 UTC
 +++ usr/lib/byobu/memory
-@@ -52,7 +52,7 @@ __memory() {
-         buffers_plus_cached=$(($buffers+$cached))
-         # "free output" buffers and cache (output from 'free')
-         fo_buffers=$(($kb_main_used - $buffers_plus_cached))
+@@ -26,16 +26,35 @@ __memory_detail() {
+ __memory() {
+ 	local free="" total="" buffers="" cached=""
+ 	local kb_main_used=0 buffers_plus_cached=0 fo_buffers=0 fo_cached=0
+-	if [ -r /proc/meminfo ]; then
+-		while read tok val unit; do
+-			case "$tok" in
+-				MemTotal:) total=${val};;
+-				MemFree:) free=${val};;
+-				Buffers:) buffers=${val};;
+-				Cached:) cached=${val};;
+-			esac
+-			[ -n "${free}" -a -n "${total}" -a -n "${buffers}" -a -n "${cached}" ] && break;
+-		done < /proc/meminfo
++
++	if [ $(uname) = "Linux" ]; then
++		if [ -r /proc/meminfo ]; then
++			while read tok val unit; do
++				case "$tok" in
++					MemTotal:) total=${val};;
++					MemFree:) free=${val};;
++					Buffers:) buffers=${val};;
++					Cached:) cached=${val};;
++				esac
++				[ -n "${free}" -a -n "${total}" -a -n "${buffers}" -a -n "${cached}" ] && break;
++			done < /proc/meminfo
++		fi
++	elif [ $(uname) = "FreeBSD" ]; then
++		# FreeBSD support
++		mem_phys=$(sysctl -n hw.physmem)
++		page_size=$(sysctl -n hw.pagesize)
++		mem_inactive=$(($(sysctl -n vm.stats.vm.v_inactive_count)*$page_size))
++		mem_cache=$(($(sysctl -n vm.stats.vm.v_cache_count)*$page_size))
++		mem_free=$(($(sysctl -n vm.stats.vm.v_free_count)*$page_size))
++
++		mem_avail=$(($mem_inactive+$mem_cache+$mem_free))
++		mem_used=$(($mem_phys-$mem_avail))
++
++		total=$(($mem_phys/1024))
++		free=$(($mem_avail/1024))
++
++		buffers=0
++		cached=0
+ 	elif eval $BYOBU_TEST vm_stat >/dev/null 2>&1; then
+ 		# MacOS support
+ 		# calculation borrowed from http://apple.stackexchange.com/a/48195/18857
+@@ -44,16 +63,18 @@ __memory() {
+ 		speculative_blocks=$(vm_stat | grep speculative | awk '{ print $3 }' | sed -e 's/\.//')
+ 		free=$((($free_blocks+speculative_blocks)*4))
+ 		inactive=$(($inactive_blocks*4))
+-		total=$((($free+$inactive)))
++		total=$(($free+$inactive))
+ 		buffers=0
+ 		cached=0
+ 	fi
+-        kb_main_used=$(($total-$free))
+-        buffers_plus_cached=$(($buffers+$cached))
+-        # "free output" buffers and cache (output from 'free')
+-        fo_buffers=$(($kb_main_used - $buffers_plus_cached))
 -        fpdiv $((100*${fo_buffers})) "${total}" 0;
-+        fpdiv $((100*${kb_main_used})) "${total}" 0;
-         usage=${_RET}
+-        usage=${_RET}
++
++	kb_main_used=$(($total-$free))
++	buffers_plus_cached=$(($buffers+$cached))
++	# "free output" buffers and cache (output from 'free')
++	fo_buffers=$(($kb_main_used - $buffers_plus_cached))
++	fpdiv $((100*${fo_buffers})) "${total}" 0;
++	usage=${_RET}
++
  	if [ $total -ge 1048576 ]; then
  		fpdiv "$total" 1048567 1
+ 		total=${_RET}
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_time__binary b/sysutils/byobu/files/patch-usr_lib_byobu_time__binary
new file mode 100644
index 000000000000..ac5fcb4524d8
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_time__binary
@@ -0,0 +1,8 @@
+--- usr/lib/byobu/time_binary.orig	2013-08-28 03:50:01 UTC
++++ usr/lib/byobu/time_binary
+@@ -172,3 +172,5 @@ fi
+ color k w
+ printf "%s" "$display_time"
+ color --
++
++# vi: syntax=sh ts=4 noexpandtab
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_trash b/sysutils/byobu/files/patch-usr_lib_byobu_trash
new file mode 100644
index 000000000000..dca0d6909af2
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_trash
@@ -0,0 +1,9 @@
+--- usr/lib/byobu/trash.orig	2016-04-07 22:05:52 UTC
++++ usr/lib/byobu/trash
+@@ -34,4 +34,4 @@ __trash() {
+ 	printf "%s[%s]" "$ICON_TRASH" "$count"
+ }
+ 
+-# vi: syntax=sh ts=4 noexpandtab
++# vi: syntax=sh ts=4 noexpandtab
+\ No newline at end of file
diff --git a/sysutils/byobu/files/patch-usr_lib_byobu_uptime b/sysutils/byobu/files/patch-usr_lib_byobu_uptime
new file mode 100644
index 000000000000..25efa2075fb4
--- /dev/null
+++ b/sysutils/byobu/files/patch-usr_lib_byobu_uptime
@@ -0,0 +1,12 @@
+--- usr/lib/byobu/uptime.orig	2016-05-31 14:48:13 UTC
++++ usr/lib/byobu/uptime
+@@ -30,6 +30,9 @@ __uptime() {
+ 	if [ -r /proc/uptime ]; then
+ 		read u idle < /proc/uptime
+ 		u=${u%.*}
++	elif [ $(uname) = "FreeBSD" ]; then
++		u=$(sysctl -n kern.boottime | sed -En 's:.*sec = ([[:digit:]]+),.*:\1:p')
++		u=$(($(date +%s) - $u))
+ 	elif [ -x /usr/sbin/sysctl ]; then
+ 		# MacOS support
+ 		u=$(/usr/sbin/sysctl -n kern.boottime | cut -f4 -d' ' | cut -d',' -f1)
diff --git a/sysutils/byobu/pkg-message b/sysutils/byobu/pkg-message
deleted file mode 100644
index 9b5cb832d96f..000000000000
--- a/sysutils/byobu/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-byobu requires linprocfs(5) mounted on /compat/linux/proc
-
-If you have not done it yet, please do the following:
-
-	mkdir -p /compat/linux/proc
-	mount -t linprocfs linproc /compat/linux/proc
-
-To make it permanent, you need the following line in /etc/fstab:
-
-	linproc  /compat/linux/proc  linprocfs  rw,late  0 0
-EOM
-}
-]
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 3482681c7faf..c487b16c9297 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -1,8 +1,7 @@
 # Created by: jpaetzel@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	catfish
-PORTVERSION=	1.4.10
+PORTVERSION=	4.16.0
 CATEGORIES=	sysutils
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -14,18 +13,23 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
 	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
+BUILD_DEPENDS=	\
+	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
-BUILD_DEPENDS=	${RUN_DEPENDS}
 
-USES=		desktop-file-utils gettext-tools gnome python:2.7 tar:bz2
-USE_PYTHON=	distutils
+USES=		desktop-file-utils gettext-tools gnome python:3.4+ tar:bz2
+USE_PYTHON=	distutils noflavors
 USE_GNOME=	gtk30 intltool pygobject3
 
 NO_ARCH=	yes
 INSTALLS_ICONS=	yes
 
+PORTSCOUT=	limitw:1,even
+
 OPTIONS_DEFINE=	DOCS ZEITGEIST
-OPTIONS_DEFAULT=ZEITGEIST POLKIT
+OPTIONS_DEFAULT=POLKIT
 OPTIONS_MULTI=	PRIVILEGES
 OPTIONS_MULTI_PRIVILEGES=	POLKIT SUDO
 
@@ -35,14 +39,9 @@ POLKIT_RUN_DEPENDS=	pkexec:sysutils/polkit
 SUDO_DESC=	Provide sudo support
 SUDO_RUN_DEPENDS=	sudo:security/sudo
 
-ZEITGEIST_DESC=	Provide recent search suggestions
+ZEITGEIST_DESC=	Provide recent search suggestions (broken)
 ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 
-post-install:
-	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/catfish.1 ${STAGEDIR}${PREFIX}/man/man1/catfish.1
-	(cd ${STAGEDIR}${PREFIX}/share && ${RMDIR} -p man/man1)
-	${GZIP} ${STAGEDIR}${PREFIX}/man/man1/catfish.1
-
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} --root=${STAGEDIR}
diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo
index 53c9f7b34e53..8539146abe04 100644
--- a/sysutils/catfish/distinfo
+++ b/sysutils/catfish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568376958
-SHA256 (xfce4/catfish-1.4.10.tar.bz2) = 2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d
-SIZE (xfce4/catfish-1.4.10.tar.bz2) = 213951
+TIMESTAMP = 1610115107
+SHA256 (xfce4/catfish-4.16.0.tar.bz2) = 1f6facee57a659af560f06024ca6f98aa4d638bf57a8bcfb613b4dc70fcc3b47
+SIZE (xfce4/catfish-4.16.0.tar.bz2) = 261252
diff --git a/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py b/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py
new file mode 100644
index 000000000000..cfd4562a1ca8
--- /dev/null
+++ b/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py
@@ -0,0 +1,37 @@
+--- catfish/CatfishSearchEngine.py.orig	2020-01-15 01:49:54 UTC
++++ catfish/CatfishSearchEngine.py
+@@ -24,6 +24,7 @@ import logging
+ 
+ import io
+ import os
++import platform
+ import re
+ import signal
+ import subprocess
+@@ -649,16 +650,17 @@ class CatfishSearchMethod_Locate(CatfishSearchMethodEx
+             "existing": False,
+             "regex": False
+         }
+-        try:
+-            details = subprocess.check_output(["locate", "--help"])
+-            details = details.decode("utf-8")
+-            if "--existing" in details:
+-                caps["existing"] = True
+-            if "--regex" in details or "--regexp" in details:
+-                caps["regex"] = True
++        if platform.system() != 'FreeBSD':
++            try:
++                details = subprocess.check_output(["locate", "--help"])
++                details = details.decode("utf-8")
++                if "--existing" in details:
++                    caps["existing"] = True
++                if "--regex" in details or "--regexp" in details:
++                    caps["regex"] = True
+ 
+-        except subprocess.CalledProcessError:
+-            pass
++            except subprocess.CalledProcessError:
++                pass
+         return caps
+ 
+     def assemble_query(self, keywords, path):
diff --git a/sysutils/catfish/files/patch-catfish_CatfishWindow.py b/sysutils/catfish/files/patch-catfish_CatfishWindow.py
index 6121c1d8535f..c9ee6b6dacab 100644
--- a/sysutils/catfish/files/patch-catfish_CatfishWindow.py
+++ b/sysutils/catfish/files/patch-catfish_CatfishWindow.py
@@ -1,14 +1,6 @@
---- catfish/CatfishWindow.py.orig	2019-07-27 11:21:22 UTC
+--- catfish/CatfishWindow.py.orig	2020-01-01 18:26:21 UTC
 +++ catfish/CatfishWindow.py
-@@ -22,6 +22,7 @@ import logging
- import mimetypes
- import os
- import subprocess
-+import sys
- import time
- from locale import gettext as _
- from shutil import copy2, rmtree
-@@ -738,9 +739,15 @@ class CatfishWindow(Window):
+@@ -822,9 +822,15 @@ class CatfishWindow(Window):
          self.update_index_unlock.set_sensitive(False)
  
          if SudoDialog.prefer_pkexec():
diff --git a/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py b/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
index 84829a94cce0..b9404c4ece48 100644
--- a/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
+++ b/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
@@ -1,14 +1,6 @@
---- catfish_lib/SudoDialog.py.orig	2019-07-27 11:21:22 UTC
+--- catfish_lib/SudoDialog.py.orig	2020-01-01 17:46:05 UTC
 +++ catfish_lib/SudoDialog.py
-@@ -18,6 +18,7 @@
- 
- from gi.repository import Gtk, GdkPixbuf
- import os
-+import sys
- 
- from locale import gettext as _
- 
-@@ -316,7 +317,11 @@ class SudoDialog(Gtk.Dialog):
+@@ -314,7 +314,11 @@ class SudoDialog(Gtk.Dialog):
          Return True if successful.
          '''
          # Set the pexpect variables and spawn the process.
diff --git a/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py b/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
index 7a0e12220ece..5be228f07005 100644
--- a/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
+++ b/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
@@ -1,4 +1,4 @@
---- catfish_lib/catfishconfig.py.orig	2019-08-11 17:51:09 UTC
+--- catfish_lib/catfishconfig.py.orig	2020-01-01 18:29:00 UTC
 +++ catfish_lib/catfishconfig.py
 @@ -17,6 +17,7 @@
  #   with this program.  If not, see <https://www.gnu.org/licenses/>.
@@ -17,6 +17,6 @@
 +    __locate_db_path__ = '/var/lib/mlocate/mlocate.db'
 +elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
 +    __locate_db_path__ = '/var/db/locate.database'
- __license__ = 'GPL-3+'
- __version__ = '1.4.9'
- 
+ __license__ = 'GPL-2+'
+ __version__ = '1.4.12'
+ __url__ = 'https://docs.xfce.org/apps/catfish/start'
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index c520fa29022c..6623cdf84151 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -1,61 +1,58 @@
 bin/catfish
-man/man1/catfish.1.gz
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.py
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyo
+share/man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.py
-%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py
-%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyo
 %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.py
-%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyc
-%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyo
 %%PYTHON_SITELIBDIR%%/catfish/__init__.py
-%%PYTHON_SITELIBDIR%%/catfish/__init__.pyc
-%%PYTHON_SITELIBDIR%%/catfish/__init__.pyo
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyo
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/Window.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyo
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyo
 share/applications/org.xfce.Catfish.desktop
-%%DATADIR%%/ui/AboutCatfishDialog.ui
 %%DATADIR%%/ui/CatfishPreferences.ui
 %%DATADIR%%/ui/CatfishWindow.ui
-%%DATADIR%%/ui/about_catfish_dialog.xml
 %%DATADIR%%/ui/catfish-wl-headerbar.png
 %%DATADIR%%/ui/catfish-wl-titlebar.png
 %%DATADIR%%/ui/catfish_preferences.xml
 %%DATADIR%%/ui/catfish_window.xml
-%%PORTDOCS%%%%DOCSDIR%%/README
-share/icons/hicolor/scalable/apps/catfish.svg
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+share/icons/hicolor/128x128/apps/org.xfce.catfish.png
+share/icons/hicolor/16x16/apps/org.xfce.catfish.svg
+share/icons/hicolor/48x48/apps/org.xfce.catfish.png
+share/icons/hicolor/48x48/apps/org.xfce.catfish.svg
+share/icons/hicolor/scalable/apps/org.xfce.catfish.svg
 share/locale/af/LC_MESSAGES/catfish.mo
 share/locale/ar/LC_MESSAGES/catfish.mo
 share/locale/be/LC_MESSAGES/catfish.mo
@@ -68,6 +65,7 @@ share/locale/el/LC_MESSAGES/catfish.mo
 share/locale/en_AU/LC_MESSAGES/catfish.mo
 share/locale/eo/LC_MESSAGES/catfish.mo
 share/locale/es/LC_MESSAGES/catfish.mo
+share/locale/et/LC_MESSAGES/catfish.mo
 share/locale/eu/LC_MESSAGES/catfish.mo
 share/locale/fi/LC_MESSAGES/catfish.mo
 share/locale/fr/LC_MESSAGES/catfish.mo
@@ -76,11 +74,13 @@ share/locale/he/LC_MESSAGES/catfish.mo
 share/locale/hr/LC_MESSAGES/catfish.mo
 share/locale/hu/LC_MESSAGES/catfish.mo
 share/locale/hy_AM/LC_MESSAGES/catfish.mo
+share/locale/hye/LC_MESSAGES/catfish.mo
 share/locale/id/LC_MESSAGES/catfish.mo
 share/locale/ie/LC_MESSAGES/catfish.mo
 share/locale/is/LC_MESSAGES/catfish.mo
 share/locale/it/LC_MESSAGES/catfish.mo
 share/locale/ja/LC_MESSAGES/catfish.mo
+share/locale/kab/LC_MESSAGES/catfish.mo
 share/locale/ko/LC_MESSAGES/catfish.mo
 share/locale/ku/LC_MESSAGES/catfish.mo
 share/locale/lt/LC_MESSAGES/catfish.mo
@@ -96,6 +96,7 @@ share/locale/pt_BR/LC_MESSAGES/catfish.mo
 share/locale/ru/LC_MESSAGES/catfish.mo
 share/locale/si/LC_MESSAGES/catfish.mo
 share/locale/sk/LC_MESSAGES/catfish.mo
+share/locale/sl/LC_MESSAGES/catfish.mo
 share/locale/sq/LC_MESSAGES/catfish.mo
 share/locale/sr/LC_MESSAGES/catfish.mo
 share/locale/sv/LC_MESSAGES/catfish.mo
diff --git a/sysutils/cbsd-mq-router/Makefile b/sysutils/cbsd-mq-router/Makefile
new file mode 100644
index 000000000000..b2fd501d4c3f
--- /dev/null
+++ b/sysutils/cbsd-mq-router/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	cbsd-mq-router
+PORTVERSION=	0.2
+CATEGORIES=	sysutils
+
+MAINTAINER=	olevole@olevole.ru
+COMMENT=	CBSD message queue router
+
+LICENSE=	BSD2CLAUSE
+
+RUN_DEPENDS=	beanstalkd:net/beanstalkd
+
+USES=		go
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	cbsd
+GH_PROJECT=	cbsd-mq-router
+USE_RC_SUBR=	cbsd-mq-router
+
+PLIST_FILES=	bin/cbsd-mq-router "@sample etc/cbsd-mq-router.json.sample"
+
+GH_TUPLE=	beanstalkd:go-beanstalk:3bed00be7a17:beanstalkd/src/github.com/beanstalkd/go-beanstalk \
+		golang:crypto:5ea612d1eb83:golang_crypto/vendor/golang.org/x/crypto \
+		golang:term:6a3ed077a48d:golang_term/vendor/golang.org/x/term \
+		golang:sys:9a76102bfb43:golang_sys/vendor/golang.org/x/sys
+
+post-extract:
+	${LN} -sf ${WRKSRC}/src ${WRKDIR}
+	${LN} -sf ${WRKSRC} ${WRKDIR}/src/${PORTNAME}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/cbsd-mq-router
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-${GH_TAGNAME}/etc/cbsd-mq-router.json ${STAGEDIR}${PREFIX}/etc/cbsd-mq-router.json.sample
+
+.include <bsd.port.mk>
diff --git a/sysutils/cbsd-mq-router/distinfo b/sysutils/cbsd-mq-router/distinfo
new file mode 100644
index 000000000000..41421fb0fa5f
--- /dev/null
+++ b/sysutils/cbsd-mq-router/distinfo
@@ -0,0 +1,11 @@
+TIMESTAMP = 1614875038
+SHA256 (cbsd-cbsd-mq-router-0.2_GH0.tar.gz) = 2259347b70dae3ddb86fcd3d0a63a9a64ce0db7a04677a335024bb0669a92312
+SIZE (cbsd-cbsd-mq-router-0.2_GH0.tar.gz) = 7030
+SHA256 (beanstalkd-go-beanstalk-3bed00be7a17_GH0.tar.gz) = 4efb9667cadd4945ec54ccc3caa824ab7fb06f75f8b234c1899c4664dc718bb7
+SIZE (beanstalkd-go-beanstalk-3bed00be7a17_GH0.tar.gz) = 8063
+SHA256 (golang-crypto-5ea612d1eb83_GH0.tar.gz) = ab4d88d6121195632d006705a950adebaf4fa99dd15ea0c508297a17c5d3277e
+SIZE (golang-crypto-5ea612d1eb83_GH0.tar.gz) = 1726242
+SHA256 (golang-term-6a3ed077a48d_GH0.tar.gz) = 6760076add528b90a5e07ad357eef6f11ec03e19eebe66d1b1ef383fd9214e9a
+SIZE (golang-term-6a3ed077a48d_GH0.tar.gz) = 15333
+SHA256 (golang-sys-9a76102bfb43_GH0.tar.gz) = 5bbc9c4e02f8ffa73c0f1baa3d0cbd4fc987b5daf08373f669673b8d651afb1b
+SIZE (golang-sys-9a76102bfb43_GH0.tar.gz) = 1115608
diff --git a/sysutils/cbsd-mq-router/files/cbsd-mq-router.in b/sysutils/cbsd-mq-router/files/cbsd-mq-router.in
new file mode 100644
index 000000000000..791f5733fa85
--- /dev/null
+++ b/sysutils/cbsd-mq-router/files/cbsd-mq-router.in
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# PROVIDE: cbsd_mq_router
+# REQUIRE: NETWORK
+# BEFORE:  DAEMON
+
+. /etc/rc.subr
+
+name="cbsd_mq_router"
+desc="CBSD message queue router"
+rcvar="cbsd_mq_router_enable"
+pidfile="/var/run/${name}.pid"
+daemon_pidfile="/var/run/${name}-daemon.pid"
+logdir="/var/log/${name}"
+logfile="${logdir}/cbsd_mq_router.log"
+extra_commands="reload"
+command="%%PREFIX%%/bin/cbsd-mq-router"
+cbsd_mq_router_config=${cbsd_mq_router_config-"%%PREFIX%%/etc/cbsd-mq-router.json"}
+required_files="${cbsd_mq_router_config}"
+
+cbsd_mq_router_args=${cbsd_mq_router_args-"-config ${cbsd_mq_router_config}"}
+
+load_rc_config ${name}
+
+start_cmd="start"
+stop_cmd="stop"
+status_cmd="status"
+reload_cmd="reload"
+
+stop()
+{
+	if [ -f "${daemon_pidfile}" ]; then
+		pids=$( pgrep -F ${daemon_pidfile} 2>&1 )
+		_err=$?
+		[ ${_err} -eq  0 ] && kill -9 ${pids} && /bin/rm -f ${daemon_pidfile}
+	fi
+	if [ -f "${pidfile}" ]; then
+		pids=$( pgrep -F ${pidfile} 2>&1 )
+		_err=$?
+		[ ${_err} -eq  0 ] && kill -9 ${pids} && /bin/rm -f ${pidfile}
+	fi
+}
+
+start()
+{
+	[ ! -d ${logdir} ] && mkdir -p ${logdir}
+	touch ${logfile}
+	/usr/sbin/daemon -f -R5 -p ${pidfile} -P ${daemon_pidfile} -o ${logfile} ${command} ${cbsd_mq_router_args}
+}
+
+reload()
+{
+	stop
+	start
+}
+
+status()
+{
+	if [ -f "${pidfile}" ]; then
+		pids=$( pgrep -F ${pidfile} 2>&1 )
+		_err=$?
+		if [ ${_err} -eq  0 ]; then
+			echo "${name} is running as pid ${pids}"
+			exit 0
+		else
+			echo "wrong pid: ${pids}"
+			exit 1
+		fi
+	else
+		echo "no pidfile $pidfile"
+		exit 1
+	fi
+}
+
+run_rc_command "$1"
diff --git a/sysutils/cbsd-mq-router/pkg-descr b/sysutils/cbsd-mq-router/pkg-descr
new file mode 100644
index 000000000000..51e12a712182
--- /dev/null
+++ b/sysutils/cbsd-mq-router/pkg-descr
@@ -0,0 +1,4 @@
+Deliver tasks to the CBSD using beanstalkd broker. The service
+acts as an intermediate link between the broker and the CBSD.
+
+WWW: https://github.com/cbsd/cbsd-mq-router
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index d46d2ec2173d..a0bfabd259e2 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,8 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	cbsd
-DISTVERSION=	12.1.1
-PORTREVISION=	1
+DISTVERSION=	13.0.8
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@olevole.ru
@@ -11,29 +8,28 @@ COMMENT=	Yet another FreeBSD Jail, XEN and Bhyve Management Utility
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rsync:net/rsync \
-		sudo:security/sudo \
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libssh2.so:security/libssh2
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
+		rsync:net/rsync \
 		sqlite3:databases/sqlite3 \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-LIB_DEPENDS=	libssh2.so:security/libssh2 \
-		libsqlite3.so:databases/sqlite3
+		sudo:security/sudo
 
-USES=		libedit pkgconfig:both
+USES=		compiler:c++11-lang libedit pkgconfig:both
 USE_GITHUB=	yes
-USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster cbsd-statsd-jail
+USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster \
+		cbsd-statsd-jail
 
-CFLAGS_powerpc64=	-mminimal-toc
+SUB_FILES=	pkg-deinstall pkg-message
 
-SUB_FILES=	pkg-message pkg-deinstall
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
-CBSD_HOME?=	${PREFIX}/cbsd
+BIN_FILES=	bin/cbsdsh/mknodes bin/cbsdsh/mksyntax
 
-USERS=	${PORTNAME}
-GROUPS=	${PORTNAME}
+CBSD_HOME?=	${PREFIX}/cbsd
 
-BIN_FILES=	\
-		bin/cbsdsh/mknodes \
-		bin/cbsdsh/mksyntax
+.include <bsd.port.options.mk>
 
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 09465bb935ed..e45a1adf0bb9 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568407580
-SHA256 (cbsd-cbsd-12.1.1_GH0.tar.gz) = 289c36e47161e4be6712f658ef055a5ac1a6b66a1a05d411dfaab71f8742a484
-SIZE (cbsd-cbsd-12.1.1_GH0.tar.gz) = 5859925
+TIMESTAMP = 1622441282
+SHA256 (cbsd-cbsd-13.0.8_GH0.tar.gz) = ee13dc403429300e54942e41d89dde1596b8a36c1eff20498f5b69487d5ff73e
+SIZE (cbsd-cbsd-13.0.8_GH0.tar.gz) = 5381837
diff --git a/sysutils/cbsd/files/patch-jailctl_bset b/sysutils/cbsd/files/patch-jailctl_bset
deleted file mode 100644
index a0cf7d11f5bb..000000000000
--- a/sysutils/cbsd/files/patch-jailctl_bset
+++ /dev/null
@@ -1,11 +0,0 @@
---- jailctl/bset.orig	2019-09-13 19:50:55 UTC
-+++ jailctl/bset
-@@ -121,7 +121,7 @@ update_jails()
- 			fi
- 			;;
- 		*)
--			cbsdsqlrw ${jailsysdir}/${jname}/local.sqlite UPDATE settings SET ${i}="${VAL}"
-+			cbsdsqlrw ${jailsysdir}/${jname}/local.sqlite UPDATE settings SET ${i}=\"${VAL}\"
- 			# back compatible
- 			cbsdsqlrw local UPDATE bhyve SET ${i}=\"${VAL}\" WHERE jname=\"${jname}\"
- 			;;
diff --git a/sysutils/ccd2iso/Makefile b/sysutils/ccd2iso/Makefile
index eaf588ac9ff7..203ec3b5fd25 100644
--- a/sysutils/ccd2iso/Makefile
+++ b/sysutils/ccd2iso/Makefile
@@ -1,5 +1,4 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	ccd2iso
 PORTVERSION=	0.9
diff --git a/sysutils/cciss_vol_status/Makefile b/sysutils/cciss_vol_status/Makefile
index f005bd5a7f83..f5fbd014afb8 100644
--- a/sysutils/cciss_vol_status/Makefile
+++ b/sysutils/cciss_vol_status/Makefile
@@ -1,5 +1,4 @@
 # Created by: mm
-# $FreeBSD$
 
 PORTNAME=	cciss_vol_status
 PORTVERSION=	1.12
diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile
index ca052420961d..069786eb1041 100644
--- a/sysutils/ccze/Makefile
+++ b/sysutils/ccze/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	ccze
 PORTVERSION=	0.2.1
 PORTREVISION=	5
diff --git a/sysutils/cdargs/Makefile b/sysutils/cdargs/Makefile
index 79199e12ced0..8b23d288ecdb 100644
--- a/sysutils/cdargs/Makefile
+++ b/sysutils/cdargs/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	cdargs
 PORTVERSION=	1.35
 CATEGORIES=	sysutils
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index be8380373019..c2d0a6005a1b 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -1,5 +1,4 @@
 # Created by: Kay Lehmann
-# $FreeBSD$
 
 PORTNAME=	cdbkup
 PORTVERSION=	1.0
diff --git a/sysutils/cdeploy/Makefile b/sysutils/cdeploy/Makefile
index 724994038001..b2f9d13d0b26 100644
--- a/sysutils/cdeploy/Makefile
+++ b/sysutils/cdeploy/Makefile
@@ -1,5 +1,4 @@
 # Created by: jfreund
-# $FreeBSD$
 
 PORTNAME=	cdeploy
 PORTVERSION=	0.2.1
diff --git a/sysutils/cdf/Makefile b/sysutils/cdf/Makefile
deleted file mode 100644
index 43a63f37647d..000000000000
--- a/sysutils/cdf/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Charlie & <root@lame.novel.ru>
-# $FreeBSD$
-
-PORTNAME=	cdf
-PORTVERSION=	0.2
-CATEGORIES=	sysutils
-MASTER_SITES=	SF/bmp-plugins
-
-MAINTAINER=	novel@FreeBSD.org
-COMMENT=	Colorized df
-
-PLIST_FILES=	bin/cdf
-
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/sysutils/cdf/distinfo b/sysutils/cdf/distinfo
deleted file mode 100644
index b05fbc8d22c9..000000000000
--- a/sysutils/cdf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cdf-0.2.tar.gz) = 3659ed779ec335c572f9ccec437469fc9c0e5c193f6b58f9e935bf337a080874
-SIZE (cdf-0.2.tar.gz) = 148488
diff --git a/sysutils/cdf/pkg-descr b/sysutils/cdf/pkg-descr
deleted file mode 100644
index 71f7dd52e030..000000000000
--- a/sysutils/cdf/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-cdf means "colorized df". The main features of cdf are:
-
-    * customazable color schemes
-    * eye-friendly capacity bars
-    * most of such utils needs some 3rd party libraries, python interpreter
-      and so on, while cdf written in pure C
-
-WWW: http://bmp-plugins.berlios.de/misc/cdf/cdf.html
diff --git a/sysutils/cdircmp/Makefile b/sysutils/cdircmp/Makefile
index 67add27a9d2e..c385139d0c63 100644
--- a/sysutils/cdircmp/Makefile
+++ b/sysutils/cdircmp/Makefile
@@ -1,5 +1,4 @@
 # Created by: Emanuel Haupt <ehaupt@critical.ch>
-# $FreeBSD$
 
 PORTNAME=	cdircmp
 PORTVERSION=	0.3
diff --git a/sysutils/cdls/Makefile b/sysutils/cdls/Makefile
deleted file mode 100644
index 154c9ebb2e2f..000000000000
--- a/sysutils/cdls/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Hans de Hartog
-# $FreeBSD$
-
-PORTNAME=	cdls
-PORTVERSION=	4.2
-CATEGORIES=	sysutils
-MASTER_SITES=	ftp://freebsd4ever.xs4all.nl/ ftp://vps337.directvps.nl/
-
-MAINTAINER=	hansdehartog@xs4all.nl
-COMMENT=	Curses based file manager for system managers
-
-PLIST_FILES=	bin/cdls
-
-USES=		ncurses
-
-.include <bsd.port.pre.mk>
-
-.if ${NCURSESBASE} == /usr
-# no need to use ncurses-config if we use ncurses from the base system
-CONFIGURE_ARGS+=	NCURSES_CONFIG=/usr/bin/true
-.endif
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cdls ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/cdls/distinfo b/sysutils/cdls/distinfo
deleted file mode 100644
index 087a9c5354a5..000000000000
--- a/sysutils/cdls/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cdls-4.2.tar.gz) = cf184152823fd1102cdbca8f572d69eca2e582e14ca9bcc46134a2584a8e02fe
-SIZE (cdls-4.2.tar.gz) = 23751
diff --git a/sysutils/cdls/files/patch-Makefile b/sysutils/cdls/files/patch-Makefile
deleted file mode 100644
index 707e9d5b2731..000000000000
--- a/sysutils/cdls/files/patch-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.orig	2012-04-13 16:42:46 UTC
-+++ Makefile
-@@ -1,5 +1,5 @@
- all:
--	cc -O2 -Wall -o cdls cdls.c -lncurses
-+	${CC} ${CFLAGS} -o cdls cdls.c ${LDFLAGS} -lncurses
- install:
- 	install -o root -g wheel cdls /usr/local/bin/cdls
- clean:
diff --git a/sysutils/cdls/pkg-descr b/sysutils/cdls/pkg-descr
deleted file mode 100644
index 0ac9c584c4f1..000000000000
--- a/sysutils/cdls/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-cdls is a curses-based file manager for quickly browsing directories and
-files. The screen can be dynamically adjusted to include all information
-(like 'ls -ail'), or just the filenames (multi-column), or anything in
-between.
-
-All basic file and directory manipulations are possible with 1 keystroke:
-copy, move, delete, view, execute, change owner/group/mode, edit, diff,
-link (hard/symbolic), wc, tail -f, cksum, hexdump and many others.
-Documentation is self-contained in cdls and consists of two screens from
-which each option or subject can be selected to show its info screen.
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 3df85e5c4b0d..95b4bb22b73f 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,5 +1,4 @@
 # Created by: futatuki
-# $FreeBSD$
 
 PORTNAME?=	cdrdao
 PORTVERSION=	1.2.4
@@ -13,6 +12,8 @@ COMMENT?=	Record CD-R[W]s in disk-at-once mode
 
 LICENSE=	GPLv2
 
+BROKEN_riscv64=	../include/mconfig.h:86:2: error: Architecture not defined here
+
 USES=		alias compiler:c++11-lang gmake tar:bzip2
 GNU_CONFIGURE=	yes
 USE_CXXSTD=	c++11
@@ -31,15 +32,6 @@ TOC2MP3_DESC=		Build with toc2mp3 (requires audio/lame)
 .include <bsd.port.options.mk>
 .endif
 
-.if ${PORTNAME} == "gcdmaster"
-USES+=			pkgconfig shared-mime-info
-GCONF_SCHEMAS=		gcdmaster.schemas
-LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS} \
-			libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26
-RUN_DEPENDS+=		${LOCALBASE}/bin/cdrdao:sysutils/cdrdao \
-			${LOCALBASE}/share/mime/packages/freedesktop.org.xml:misc/shared-mime-info
-CONFIGURE_ARGS+=	--with-lame=no
-.else
 CONFIGURE_ARGS+=	--with-gcdmaster=no
 .if ${PORT_OPTIONS:MTOC2MP3}
 LIB_DEPENDS+=		libmp3lame.so:audio/lame
@@ -63,7 +55,6 @@ CONFIGURE_ENV+=		AO_CFLAGS=-I${LOCALBASE}/include \
 .else
 CONFIGURE_ARGS+=	--with-mp3-support=no --with-ogg-support=no
 .endif
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -85,19 +76,6 @@ post-patch:
 	55readcd 55scgcheck 55scgskeleton 55rscsi 85man
 	@${RM} ${WRKSRC}/scsilib/TARGETS/${i}
 .endfor
-.if ${PORTNAME} == "gcdmaster"
-	@${REINPLACE_CMD} -E -e 's|(^SUBDIRS.+) utils|\1|' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -E -e 's|(^gladedir.+=).+|\1 ${DATADIR}|' \
-		${WRKSRC}/gcdmaster/Makefile.in
-	@${REINPLACE_CMD} -E -e \
-		's|(SET_CDRDAO_PATH.+path=)(cdrdao)|\1${LOCALBASE}\/bin\/\2|g' \
-		${WRKSRC}/gcdmaster/Settings.cc
-	@${REINPLACE_CMD} -E -e \
-		's|(icon-filename=).+(gcdmaster-doc.png)|\1${LOCALBASE}\/share\/pixmaps\/document-icons\/\2|g' \
-		${WRKSRC}/gcdmaster/gcdmaster.keys
-	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::ptr_fun|g' \
-		${WRKSRC}/gcdmaster/xcdrdao.cc
-.else
 .for i in cdrdao.man main.cc
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/dao/${i}
 .endfor
@@ -106,41 +84,7 @@ post-patch:
 .for i in toc2cddb.1 toc2cue.1
 	@${REINPLACE_CMD} -e 's|1\.2\.2|${PORTVERSION}|g' ${WRKSRC}/utils/${i}
 .endfor
-.endif
 
-.if ${PORTNAME} == "gcdmaster"
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gcdmaster/gcdmaster \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/gcdmaster/gcdmaster.man \
-		${STAGEDIR}${PREFIX}/man/man1/gcdmaster.1
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster-doc.png \
-		${STAGEDIR}${LOCALBASE}/share/pixmaps/document-icons
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/application-registry
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.applications \
-		${STAGEDIR}${LOCALBASE}/share/application-registry
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.desktop \
-		${STAGEDIR}${LOCALBASE}/share/applications
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime-info
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.keys \
-		${STAGEDIR}${LOCALBASE}/share/mime-info
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.mime \
-		${STAGEDIR}${LOCALBASE}/share/mime-info
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.png \
-		${STAGEDIR}${LOCALBASE}/share/pixmaps
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/gconf/schemas
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.schemas \
-		${STAGEDIR}${LOCALBASE}/etc/gconf/schemas
-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/mime/packages
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/gcdmaster.xml \
-		${STAGEDIR}${LOCALBASE}/share/mime/packages
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/glade/Preferences.glade \
-		${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/gcdmaster/glade/ProjectChooser.glade \
-		${STAGEDIR}${DATADIR}
-.else
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dao/cdrdao ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/dao/cdrdao.man \
@@ -163,6 +107,5 @@ do-install-DOCS-on:
 .for i in CREDITS ChangeLog README README.PlexDAE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index a28cd9dba105..dfa4c8f3a64b 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -1,21 +1,25 @@
 # Created by: Pav Lucistnik <pav@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	cdrkit
 PORTVERSION=	1.1.11
 PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cdrkit.org/releases/ \
-		http://debburn.alioth.debian.org/
+MASTER_SITES=	http://ponce.cc/slackware/sources/repo/ \
+		http://vault.101011010.xyz/distfiles/ \
+		http://freebsd.nsu.ru/distfiles/
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT?=	Command-line CD/DVD writing suite
 
+LICENSE=	GPLv2+
+
 RUN_DEPENDS?=	${PORTNAME}-genisoimage>0:sysutils/genisoimage
 
 USES=		cmake iconv perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	3rd-party/dirsplit/dirsplit
+# Fix build with clang11
+CFLAGS+=	-fcommon
 
 CONFLICTS?=	cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
 
diff --git a/sysutils/cdroot/Makefile b/sysutils/cdroot/Makefile
index a90c8e50e96d..2a2003282f42 100644
--- a/sysutils/cdroot/Makefile
+++ b/sysutils/cdroot/Makefile
@@ -1,10 +1,9 @@
 # Created by: Brian Dean <bsd@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	cdroot
 PORTVERSION=	1.2.6
 CATEGORIES=	sysutils
-MASTER_SITES=	http://BSDforge.com/projects/source/sysutils/cdroot/
+MASTER_SITES=	https://BSDforge.com/projects/source/sysutils/cdroot/
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Scripts automating setup of a bootable CD-ROM based FreeBSD system
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index c1c34429f4ca..9f9ea2d94f32 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 ###########################################################################
 # This makefile was contributed by Marius Strobl.
 ###########################################################################
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index e88337383a7b..39dc2c9ef73c 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,5 +1,4 @@
 # Created by: Dirk Froemberg <dirk@FreeBSD.org>
-# $FreeBSD$
 
 ###########################################################################
 # This makefile was contributed by Marius Strobl.
diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index 8c8c307de4e8..24f20f6c397d 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -1,14 +1,12 @@
 # Created by: jrhett@netconsonance.com
-# $FreeBSD$
 
 PORTNAME=	cfengine
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
-PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-CFENGINE_HASH=		732b7da25
-LIBNTECH_HASH=		19a34e7
-CFENGINE_COMMIT_DATE=	2019.09.22
+CFENGINE_HASH=		384547b27
+LIBNTECH_HASH=		874405f
+CFENGINE_COMMIT_DATE=	2021.05.17
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
@@ -33,11 +31,11 @@ USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf:build \
-		cpe gmake localbase libtool shebangfix ssl
+USES=		autoreconf:build cpe gmake gnome libtool localbase shebangfix \
+		ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
-CFLAGS+=	-Wno-return-type
+CFLAGS+=	-Wno-return-type -fcommon
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo
index ce38a386d72d..2f0244348495 100644
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1569292061
-SHA256 (cfengine-core-3.2019.09.22-732b7da25_GH0.tar.gz) = bf0e2837385bd61521f9c3019d3d2ee94e86f98b6009a53ae2b19801ddba7474
-SIZE (cfengine-core-3.2019.09.22-732b7da25_GH0.tar.gz) = 2157595
-SHA256 (cfengine-libntech-19a34e7_GH0.tar.gz) = 971fff1714d997342a1dcff15abd981ba58638846877b50ec5941ecfe8aed041
-SIZE (cfengine-libntech-19a34e7_GH0.tar.gz) = 348455
+TIMESTAMP = 1621265275
+SHA256 (cfengine-core-3.2021.05.17-384547b27_GH0.tar.gz) = 6b55dff73c38df49e98aa9abcd8a66229f3e64d560b708f9bfca38dafed7585e
+SIZE (cfengine-core-3.2021.05.17-384547b27_GH0.tar.gz) = 2352382
+SHA256 (cfengine-libntech-874405f_GH0.tar.gz) = 9c13ee57123142124a3da682009026517389e6db68b0017fba70cc8d4613f7ce
+SIZE (cfengine-libntech-874405f_GH0.tar.gz) = 368206
diff --git a/sysutils/cfengine-devel/files/cf-execd.in b/sysutils/cfengine-devel/files/cf-execd.in
index 1ee33104e76e..ace1288a92ef 100644
--- a/sysutils/cfengine-devel/files/cf-execd.in
+++ b/sysutils/cfengine-devel/files/cf-execd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-execd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine-devel/files/cf-monitord.in b/sysutils/cfengine-devel/files/cf-monitord.in
index 471ee108622a..efa6aaa6e495 100644
--- a/sysutils/cfengine-devel/files/cf-monitord.in
+++ b/sysutils/cfengine-devel/files/cf-monitord.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-monitord
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine-devel/files/cf-serverd.in b/sysutils/cfengine-devel/files/cf-serverd.in
index 9fbd07cc148a..a53b091ffbf9 100644
--- a/sysutils/cfengine-devel/files/cf-serverd.in
+++ b/sysutils/cfengine-devel/files/cf-serverd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-serverd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c b/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c
new file mode 100644
index 000000000000..2c6b521ef5cf
--- /dev/null
+++ b/sysutils/cfengine-devel/files/patch-cf-execd_cf-execd-runagent.c
@@ -0,0 +1,15 @@
+--- cf-execd/cf-execd-runagent.c.orig	2021-03-19 07:11:45.000000000 -0700
++++ cf-execd/cf-execd-runagent.c	2021-03-24 01:35:29.063038000 -0700
+@@ -22,6 +22,12 @@
+   included file COSL.txt.
+ */
+ 
++/*
++ * XXX: _WITH_GETLINE is required for FreeBSD-11.
++ * Remove when FreeBSD-11 is EOL.
++ */
++#define _WITH_GETLINE
++
+ #include <stdio.h>
+ 
+ #include <logging.h>
diff --git a/sysutils/cfengine-devel/files/patch-libntech_libutils_known_dirs.c b/sysutils/cfengine-devel/files/patch-libntech_libutils_known_dirs.c
new file mode 100644
index 000000000000..ff8fb8adaa81
--- /dev/null
+++ b/sysutils/cfengine-devel/files/patch-libntech_libutils_known_dirs.c
@@ -0,0 +1,10 @@
+--- libntech/libutils/known_dirs.c.orig	2021-03-18 08:19:43.000000000 -0700
++++ libntech/libutils/known_dirs.c	2021-03-22 10:34:40.223648000 -0700
+@@ -22,6 +22,7 @@
+   included file COSL.txt.
+ */
+ 
++#include "../config.h"
+ #include <known_dirs.h>
+ #include <definitions.h>
+ #include <file_lib.h>
diff --git a/sysutils/cfengine-devel/files/patch-m4-strndup.m4 b/sysutils/cfengine-devel/files/patch-m4-strndup.m4
deleted file mode 100644
index 31e4b7e264de..000000000000
--- a/sysutils/cfengine-devel/files/patch-m4-strndup.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine-devel/files/patch-m4__strndup.m4 b/sysutils/cfengine-devel/files/patch-m4__strndup.m4
deleted file mode 100644
index cb6d41d2e7cf..000000000000
--- a/sysutils/cfengine-devel/files/patch-m4__strndup.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: m4/strndup.m4
-===================================================================
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine-devel/pkg-plist b/sysutils/cfengine-devel/pkg-plist
index 717a6ba8c484..6d6f1b48e407 100644
--- a/sysutils/cfengine-devel/pkg-plist
+++ b/sysutils/cfengine-devel/pkg-plist
@@ -6,6 +6,7 @@ bin/cf-monitord
 bin/cf-net
 bin/cf-promises
 bin/cf-runagent
+bin/cf-secret
 bin/cf-serverd
 bin/cf-upgrade
 bin/rpmvercmp
@@ -31,8 +32,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/arrays.cf
 %%DOCSDIR%%/examples/augment.cf
 %%DOCSDIR%%/examples/backreferences_files.cf
-%%DOCSDIR%%/examples/badpromise.cf
-%%DOCSDIR%%/examples/badtype.cf
 %%DOCSDIR%%/examples/bsdflags.cf
 %%DOCSDIR%%/examples/bundle_return_values.cf
 %%DOCSDIR%%/examples/bundlesequence.cf
@@ -53,7 +52,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/container_iteration.cf
 %%DOCSDIR%%/examples/container_key_iteration.cf
 %%DOCSDIR%%/examples/control_expand.cf
-%%DOCSDIR%%/examples/controlclasses.cf
 %%DOCSDIR%%/examples/copy.cf
 %%DOCSDIR%%/examples/copy_classes.cf
 %%DOCSDIR%%/examples/copy_copbl.cf
@@ -108,7 +106,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/execresult.cf
 %%DOCSDIR%%/examples/expand.cf
 %%DOCSDIR%%/examples/failedcommand.cf
-%%DOCSDIR%%/examples/failsafe.cf
 %%DOCSDIR%%/examples/file_change_detection.cf
 %%DOCSDIR%%/examples/file_hash.cf
 %%DOCSDIR%%/examples/file_owner_list_template.cf
@@ -173,8 +170,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/iteration.cf
 %%DOCSDIR%%/examples/join.cf
 %%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
-%%DOCSDIR%%/examples/knowledge_driver.cf
-%%DOCSDIR%%/examples/knowledge_txt.cf
 %%DOCSDIR%%/examples/lastnode.cf
 %%DOCSDIR%%/examples/ldap.cf
 %%DOCSDIR%%/examples/length.cf
@@ -217,10 +212,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/multiple_outcomes.cf
 %%DOCSDIR%%/examples/mustache_classes.cf
 %%DOCSDIR%%/examples/mustache_template_motd.cf
-%%DOCSDIR%%/examples/namespace.cf
-%%DOCSDIR%%/examples/namespace1.cf
-%%DOCSDIR%%/examples/namespace2.cf
-%%DOCSDIR%%/examples/namespace3.cf
 %%DOCSDIR%%/examples/namespace_class1.cf
 %%DOCSDIR%%/examples/namespace_classes.cf
 %%DOCSDIR%%/examples/namespace_var_meta.cf
@@ -229,7 +220,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/none.cf
 %%DOCSDIR%%/examples/nth.cf
 %%DOCSDIR%%/examples/null_config.cf
-%%DOCSDIR%%/examples/occurrences.cf
 %%DOCSDIR%%/examples/orchestrate_chain1.cf
 %%DOCSDIR%%/examples/orchestrate_chain2.cf
 %%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
@@ -271,7 +261,6 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/process_signalling.cf
 %%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
 %%DOCSDIR%%/examples/product.cf
-%%DOCSDIR%%/examples/promise_knowledge.cf
 %%DOCSDIR%%/examples/promises.cf
 %%DOCSDIR%%/examples/quoting.cf
 %%DOCSDIR%%/examples/randomint.cf
@@ -303,9 +292,7 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/rename.cf
 %%DOCSDIR%%/examples/repairedcommand.cf
 %%DOCSDIR%%/examples/report_custom.cf
-%%DOCSDIR%%/examples/report_diffs.cf
 %%DOCSDIR%%/examples/report_state.cf
-%%DOCSDIR%%/examples/reporting.cf
 %%DOCSDIR%%/examples/reports.cf
 %%DOCSDIR%%/examples/reporttofile.cf
 %%DOCSDIR%%/examples/resolveconf.cf
diff --git a/sysutils/cfengine-masterfiles-devel/Makefile b/sysutils/cfengine-masterfiles-devel/Makefile
index 78cff1e28d1e..b6c87dc59a00 100644
--- a/sysutils/cfengine-masterfiles-devel/Makefile
+++ b/sysutils/cfengine-masterfiles-devel/Makefile
@@ -1,12 +1,11 @@
 # Created by: cy@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-HASH=		b9664f8
-CFENGINE_COMMIT_DATE=	2019.09.22
+HASH=		2f0ba289
+CFENGINE_COMMIT_DATE=	2021.05.12
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
@@ -29,11 +28,13 @@ RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		autoreconf:build cpe gmake python:build
+USES=		autoreconf:build cpe gmake python:build shebangfix
 HAS_CONFIGURE=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
 CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
 CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 
+SHEBANG_FILES=	modules/packages/snap
+
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles-devel/distinfo b/sysutils/cfengine-masterfiles-devel/distinfo
index 2e36dbcc80d8..18549bfaa771 100644
--- a/sysutils/cfengine-masterfiles-devel/distinfo
+++ b/sysutils/cfengine-masterfiles-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569197073
-SHA256 (cfengine-masterfiles-3.2019.09.22-b9664f8_GH0.tar.gz) = 8de9516ddc96d4e574e1f0c0c7ef0a2c84be6a58ce959352f03263dedc35830f
-SIZE (cfengine-masterfiles-3.2019.09.22-b9664f8_GH0.tar.gz) = 418962
+TIMESTAMP = 1621265405
+SHA256 (cfengine-masterfiles-3.2021.05.12-2f0ba289_GH0.tar.gz) = f93f01f859a29980e9ffc18cc7c1158ace6ce055e8e538331f7262d25dc741d9
+SIZE (cfengine-masterfiles-3.2021.05.12-2f0ba289_GH0.tar.gz) = 441483
diff --git a/sysutils/cfengine-masterfiles-devel/pkg-plist b/sysutils/cfengine-masterfiles-devel/pkg-plist
index ebdbb115fba0..a89118297e1e 100644
--- a/sysutils/cfengine-masterfiles-devel/pkg-plist
+++ b/sysutils/cfengine-masterfiles-devel/pkg-plist
@@ -90,11 +90,3 @@
 %%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
 %%EXAMPLESDIR%%/masterfiles/update.cf
-%%EXAMPLESDIR%%/modules/packages/apt_get
-%%EXAMPLESDIR%%/modules/packages/freebsd_ports
-%%EXAMPLESDIR%%/modules/packages/nimclient
-%%EXAMPLESDIR%%/modules/packages/pkg
-%%EXAMPLESDIR%%/modules/packages/pkgsrc
-%%EXAMPLESDIR%%/modules/packages/slackpkg
-%%EXAMPLESDIR%%/modules/packages/yum
-%%EXAMPLESDIR%%/modules/packages/zypper
diff --git a/sysutils/cfengine-masterfiles/Makefile b/sysutils/cfengine-masterfiles/Makefile
index ea92e40059ef..4208b2cad61a 100644
--- a/sysutils/cfengine-masterfiles/Makefile
+++ b/sysutils/cfengine-masterfiles/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
-VERSIONS=		310 311 312 313 314
-CFENGINE_VERSION?=	313
+VERSIONS=		315 316 317
+CFENGINE_VERSION?=	317
 
 MASTERDIR=		${.CURDIR}/../cfengine-masterfiles${CFENGINE_VERSION}
 
diff --git a/sysutils/cfengine-masterfiles310/Makefile b/sysutils/cfengine-masterfiles310/Makefile
index dc4a72cf8efc..badd71bf17e6 100644
--- a/sysutils/cfengine-masterfiles310/Makefile
+++ b/sysutils/cfengine-masterfiles310/Makefile
@@ -1,5 +1,4 @@
 # Created by: cy@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.10.3
diff --git a/sysutils/cfengine-masterfiles311/Makefile b/sysutils/cfengine-masterfiles311/Makefile
index 911047105f9a..65b24834398a 100644
--- a/sysutils/cfengine-masterfiles311/Makefile
+++ b/sysutils/cfengine-masterfiles311/Makefile
@@ -1,5 +1,4 @@
 # Created by: cy@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.11.0
diff --git a/sysutils/cfengine-masterfiles312/Makefile b/sysutils/cfengine-masterfiles312/Makefile
deleted file mode 100644
index 63f4336f82ae..000000000000
--- a/sysutils/cfengine-masterfiles312/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: cy@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	cfengine-masterfiles
-PORTVERSION=	3.12.0
-CATEGORIES=	sysutils
-MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
-
-MAINTAINER=	cy@FreeBSD.org
-#		gjb@FreeBSD.org is also committer for this port
-#		skreuzer@FreeBSD.org is also committer for this port
-COMMENT=	cfengine sample policies for installations and upgrades
-
-LICENSE=	GPLv3
-
-CPE_VENDOR=	gnu
-
-CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-*
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX=	312
-CONFLICTS+=	cfengine-masterfiles-3.*
-.endif
-
-RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
-
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
-MAKE_JOBS_UNSAFE=	yes
-USES=		cpe gmake python:build shebangfix
-HAS_CONFIGURE=	yes
-EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
-CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
-SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
-
-.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles312/distinfo b/sysutils/cfengine-masterfiles312/distinfo
deleted file mode 100644
index dae16eb7b481..000000000000
--- a/sysutils/cfengine-masterfiles312/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1530593990
-SHA256 (cfengine-masterfiles-3.12.0.tar.gz) = 1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65
-SIZE (cfengine-masterfiles-3.12.0.tar.gz) = 428463
diff --git a/sysutils/cfengine-masterfiles312/pkg-plist b/sysutils/cfengine-masterfiles312/pkg-plist
deleted file mode 100644
index d57155f07873..000000000000
--- a/sysutils/cfengine-masterfiles312/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_local_git_remote.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
-%%EXAMPLESDIR%%/masterfiles/controls/def.cf
-%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
-%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
-%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
-%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.7/README.md
-%%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
-%%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
-%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
-%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
-%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
-%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
-%%EXAMPLESDIR%%/masterfiles/lib/common.cf
-%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
-%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
-%%EXAMPLESDIR%%/masterfiles/lib/event.cf
-%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
-%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
-%%EXAMPLESDIR%%/masterfiles/lib/files.cf
-%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
-%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
-%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
-%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
-%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
-%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
-%%EXAMPLESDIR%%/masterfiles/lib/services.cf
-%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
-%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
-%%EXAMPLESDIR%%/masterfiles/lib/testing.cf
-%%EXAMPLESDIR%%/masterfiles/lib/users.cf
-%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
-%%EXAMPLESDIR%%/masterfiles/promises.cf
-%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
-%%EXAMPLESDIR%%/masterfiles/services/main.cf
-%%EXAMPLESDIR%%/masterfiles/sketches/meta/api-runfile.cf
-%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
-%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
-%%EXAMPLESDIR%%/masterfiles/update.cf
-%%EXAMPLESDIR%%/modules/packages/apt_get
-%%EXAMPLESDIR%%/modules/packages/freebsd_ports
-%%EXAMPLESDIR%%/modules/packages/nimclient
-%%EXAMPLESDIR%%/modules/packages/pkg
-%%EXAMPLESDIR%%/modules/packages/pkgsrc
-%%EXAMPLESDIR%%/modules/packages/slackpkg
-%%EXAMPLESDIR%%/modules/packages/yum
-%%EXAMPLESDIR%%/modules/packages/zypper
diff --git a/sysutils/cfengine-masterfiles313/Makefile b/sysutils/cfengine-masterfiles313/Makefile
deleted file mode 100644
index 6f6417c8e977..000000000000
--- a/sysutils/cfengine-masterfiles313/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: cy@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	cfengine-masterfiles
-PORTVERSION=	3.13.0
-CATEGORIES=	sysutils
-MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
-
-MAINTAINER=	cy@FreeBSD.org
-#		gjb@FreeBSD.org is also committer for this port
-#		skreuzer@FreeBSD.org is also committer for this port
-COMMENT=	cfengine sample policies for installations and upgrades
-
-LICENSE=	GPLv3
-
-CPE_VENDOR=	gnu
-
-CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-*
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX=	313
-CONFLICTS+=	cfengine-masterfiles-3.*
-.endif
-
-RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
-
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
-MAKE_JOBS_UNSAFE=	yes
-USES=		cpe gmake python:build shebangfix
-HAS_CONFIGURE=	yes
-EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
-CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
-SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
-
-.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles313/distinfo b/sysutils/cfengine-masterfiles313/distinfo
deleted file mode 100644
index f5678cb1c1d0..000000000000
--- a/sysutils/cfengine-masterfiles313/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1543009782
-SHA256 (cfengine-masterfiles-3.13.0.tar.gz) = 0968ace8735919d4f1778ddd1882aae1adc182af0c874510ab6beb0f60f45be5
-SIZE (cfengine-masterfiles-3.13.0.tar.gz) = 432197
diff --git a/sysutils/cfengine-masterfiles313/pkg-plist b/sysutils/cfengine-masterfiles313/pkg-plist
deleted file mode 100644
index a457acd0e6be..000000000000
--- a/sysutils/cfengine-masterfiles313/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/templates/watchdog.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/recommendations.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
-%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
-%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
-%%EXAMPLESDIR%%/masterfiles/controls/def.cf
-%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
-%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
-%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
-%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
-%%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
-%%EXAMPLESDIR%%/masterfiles/lib/3.7/README.md
-%%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
-%%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
-%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
-%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
-%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
-%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
-%%EXAMPLESDIR%%/masterfiles/lib/common.cf
-%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
-%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
-%%EXAMPLESDIR%%/masterfiles/lib/event.cf
-%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
-%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
-%%EXAMPLESDIR%%/masterfiles/lib/files.cf
-%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
-%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
-%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
-%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
-%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
-%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
-%%EXAMPLESDIR%%/masterfiles/lib/services.cf
-%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
-%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
-%%EXAMPLESDIR%%/masterfiles/lib/testing.cf
-%%EXAMPLESDIR%%/masterfiles/lib/users.cf
-%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
-%%EXAMPLESDIR%%/masterfiles/promises.cf
-%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
-%%EXAMPLESDIR%%/masterfiles/services/main.cf
-%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
-%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
-%%EXAMPLESDIR%%/masterfiles/update.cf
-%%EXAMPLESDIR%%/modules/packages/apt_get
-%%EXAMPLESDIR%%/modules/packages/freebsd_ports
-%%EXAMPLESDIR%%/modules/packages/nimclient
-%%EXAMPLESDIR%%/modules/packages/pkg
-%%EXAMPLESDIR%%/modules/packages/pkgsrc
-%%EXAMPLESDIR%%/modules/packages/slackpkg
-%%EXAMPLESDIR%%/modules/packages/yum
-%%EXAMPLESDIR%%/modules/packages/zypper
diff --git a/sysutils/cfengine-masterfiles314/Makefile b/sysutils/cfengine-masterfiles314/Makefile
index 2bd7fd5896ff..9bb8e03896d5 100644
--- a/sysutils/cfengine-masterfiles314/Makefile
+++ b/sysutils/cfengine-masterfiles314/Makefile
@@ -1,5 +1,4 @@
 # Created by: cy@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.14.0
@@ -15,6 +14,9 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
+DEPRECATED=		Expire one year after cfengine 3.16.0 released
+EXPIRATION_DATE=	2021-06-22
+
 CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	314
diff --git a/sysutils/cfengine-masterfiles315/Makefile b/sysutils/cfengine-masterfiles315/Makefile
new file mode 100644
index 000000000000..c3a0ba1a30cd
--- /dev/null
+++ b/sysutils/cfengine-masterfiles315/Makefile
@@ -0,0 +1,37 @@
+# Created by: cy@FreeBSD.org
+
+PORTNAME=	cfengine-masterfiles
+PORTVERSION=	3.15.2
+CATEGORIES=	sysutils
+MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	cfengine sample policies for installations and upgrades
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+DEPRECATED=		Expire one year after cfengine 3.17.0 released
+EXPIRATION_DATE=	2021-11-20
+
+CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	315
+CONFLICTS+=	cfengine-masterfiles-3.*
+.endif
+
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+MAKE_JOBS_UNSAFE=	yes
+USES=		cpe gmake python:build shebangfix
+HAS_CONFIGURE=	yes
+EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
+CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
+SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles315/distinfo b/sysutils/cfengine-masterfiles315/distinfo
new file mode 100644
index 000000000000..0f1b0b5fc398
--- /dev/null
+++ b/sysutils/cfengine-masterfiles315/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1591211511
+SHA256 (cfengine-masterfiles-3.15.2.tar.gz) = 932d882cb6231db0cd9cfcaa8a0130e069355bc1a7307f8038ababd1320d99a8
+SIZE (cfengine-masterfiles-3.15.2.tar.gz) = 483402
diff --git a/sysutils/cfengine-masterfiles312/pkg-descr b/sysutils/cfengine-masterfiles315/pkg-descr
index 5b2d2217b44b..5b2d2217b44b 100644
--- a/sysutils/cfengine-masterfiles312/pkg-descr
+++ b/sysutils/cfengine-masterfiles315/pkg-descr
diff --git a/sysutils/cfengine-masterfiles315/pkg-plist b/sysutils/cfengine-masterfiles315/pkg-plist
new file mode 100644
index 000000000000..ebdbb115fba0
--- /dev/null
+++ b/sysutils/cfengine-masterfiles315/pkg-plist
@@ -0,0 +1,100 @@
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/templates/watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/recommendations.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
+%%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
+%%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
+%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
+%%EXAMPLESDIR%%/masterfiles/lib/common.cf
+%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
+%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
+%%EXAMPLESDIR%%/masterfiles/lib/event.cf
+%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
+%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
+%%EXAMPLESDIR%%/masterfiles/lib/files.cf
+%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
+%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
+%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
+%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
+%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
+%%EXAMPLESDIR%%/masterfiles/lib/services.cf
+%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
+%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
+%%EXAMPLESDIR%%/masterfiles/lib/testing.cf
+%%EXAMPLESDIR%%/masterfiles/lib/users.cf
+%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
+%%EXAMPLESDIR%%/masterfiles/promises.cf
+%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
+%%EXAMPLESDIR%%/masterfiles/services/main.cf
+%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
+%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
+%%EXAMPLESDIR%%/masterfiles/update.cf
+%%EXAMPLESDIR%%/modules/packages/apt_get
+%%EXAMPLESDIR%%/modules/packages/freebsd_ports
+%%EXAMPLESDIR%%/modules/packages/nimclient
+%%EXAMPLESDIR%%/modules/packages/pkg
+%%EXAMPLESDIR%%/modules/packages/pkgsrc
+%%EXAMPLESDIR%%/modules/packages/slackpkg
+%%EXAMPLESDIR%%/modules/packages/yum
+%%EXAMPLESDIR%%/modules/packages/zypper
diff --git a/sysutils/cfengine-masterfiles316/Makefile b/sysutils/cfengine-masterfiles316/Makefile
new file mode 100644
index 000000000000..41ac3d49f13c
--- /dev/null
+++ b/sysutils/cfengine-masterfiles316/Makefile
@@ -0,0 +1,34 @@
+# Created by: cy@FreeBSD.org
+
+PORTNAME=	cfengine-masterfiles
+PORTVERSION=	3.16.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	cfengine sample policies for installations and upgrades
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[013-9]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	316
+CONFLICTS+=	cfengine-masterfiles-3.*
+.endif
+
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+MAKE_JOBS_UNSAFE=	yes
+USES=		cpe gmake python:build shebangfix
+HAS_CONFIGURE=	yes
+EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
+CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
+SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles316/distinfo b/sysutils/cfengine-masterfiles316/distinfo
new file mode 100644
index 000000000000..87cd7e734a9b
--- /dev/null
+++ b/sysutils/cfengine-masterfiles316/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1605329466
+SHA256 (cfengine-masterfiles-3.16.0.tar.gz) = 2f63ad1ee2d49af651c0911fc44778cbebb5a1afd33f5f93fa4644e71322a091
+SIZE (cfengine-masterfiles-3.16.0.tar.gz) = 483251
diff --git a/sysutils/cfengine-masterfiles313/pkg-descr b/sysutils/cfengine-masterfiles316/pkg-descr
index 5b2d2217b44b..5b2d2217b44b 100644
--- a/sysutils/cfengine-masterfiles313/pkg-descr
+++ b/sysutils/cfengine-masterfiles316/pkg-descr
diff --git a/sysutils/cfengine-masterfiles316/pkg-plist b/sysutils/cfengine-masterfiles316/pkg-plist
new file mode 100644
index 000000000000..d3b88e7baf0b
--- /dev/null
+++ b/sysutils/cfengine-masterfiles316/pkg-plist
@@ -0,0 +1,100 @@
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/templates/watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/recommendations.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
+%%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
+%%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
+%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
+%%EXAMPLESDIR%%/masterfiles/lib/common.cf
+%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
+%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
+%%EXAMPLESDIR%%/masterfiles/lib/event.cf
+%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
+%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
+%%EXAMPLESDIR%%/masterfiles/lib/files.cf
+%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
+%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
+%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
+%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
+%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
+%%EXAMPLESDIR%%/masterfiles/lib/services.cf
+%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
+%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
+%%EXAMPLESDIR%%/masterfiles/lib/testing.cf
+%%EXAMPLESDIR%%/masterfiles/lib/users.cf
+%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
+%%EXAMPLESDIR%%/masterfiles/promises.cf
+%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
+%%EXAMPLESDIR%%/masterfiles/services/main.cf
+%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
+%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
+%%EXAMPLESDIR%%/masterfiles/update.cf
+%%EXAMPLESDIR%%/masterfiles/modules/packages/apt_get
+%%EXAMPLESDIR%%/masterfiles/modules/packages/freebsd_ports
+%%EXAMPLESDIR%%/masterfiles/modules/packages/nimclient
+%%EXAMPLESDIR%%/masterfiles/modules/packages/pkg
+%%EXAMPLESDIR%%/masterfiles/modules/packages/pkgsrc
+%%EXAMPLESDIR%%/masterfiles/modules/packages/slackpkg
+%%EXAMPLESDIR%%/masterfiles/modules/packages/yum
+%%EXAMPLESDIR%%/masterfiles/modules/packages/zypper
diff --git a/sysutils/cfengine-masterfiles317/Makefile b/sysutils/cfengine-masterfiles317/Makefile
new file mode 100644
index 000000000000..ed7cd885848d
--- /dev/null
+++ b/sysutils/cfengine-masterfiles317/Makefile
@@ -0,0 +1,34 @@
+# Created by: cy@FreeBSD.org
+
+PORTNAME=	cfengine-masterfiles
+PORTVERSION=	3.17.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	cfengine sample policies for installations and upgrades
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[0-689]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	317
+CONFLICTS+=	cfengine-masterfiles-3.*
+.endif
+
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+MAKE_JOBS_UNSAFE=	yes
+USES=		cpe gmake python:build shebangfix
+HAS_CONFIGURE=	yes
+EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
+CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
+SHEBANG_FILES=	modules/packages/yum  modules/packages/zypper
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine-masterfiles317/distinfo b/sysutils/cfengine-masterfiles317/distinfo
new file mode 100644
index 000000000000..bb9ab640c125
--- /dev/null
+++ b/sysutils/cfengine-masterfiles317/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1605930163
+SHA256 (cfengine-masterfiles-3.17.0.tar.gz) = 03a67dda0dfa8bc060c65e9ae8c6c4e7bf29711aeee5c62ed45dfa570513aa57
+SIZE (cfengine-masterfiles-3.17.0.tar.gz) = 489724
diff --git a/sysutils/cfengine-masterfiles317/pkg-descr b/sysutils/cfengine-masterfiles317/pkg-descr
new file mode 100644
index 000000000000..5b2d2217b44b
--- /dev/null
+++ b/sysutils/cfengine-masterfiles317/pkg-descr
@@ -0,0 +1,10 @@
+CFEngine 3 is a popular open source configuration management system.
+Its primary function is to provide automated configuration and
+maintenance of large-scale computer systems.
+
+The repository is intended to provide a stable base policy for
+installations and upgrades, and is used by CFEngine 3.6 and newer.
+The port installs the repository as examples which should be copied by
+the user to the masterfiles directory (usually /var/cfengine/masterfiles).
+
+WWW: https://cfengine.com/
diff --git a/sysutils/cfengine-masterfiles317/pkg-plist b/sysutils/cfengine-masterfiles317/pkg-plist
new file mode 100644
index 000000000000..d3b88e7baf0b
--- /dev/null
+++ b/sysutils/cfengine-masterfiles317/pkg-plist
@@ -0,0 +1,100 @@
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/CFE_cfengine.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/deprecated/cfengine_processes.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/host_info_report.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/limit_robot_agents.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/log_rotation.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/templates/watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/core/watchdog/watchdog.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_hub_specific.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/CFE_knowledge.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/file_change.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_def.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/ha/ha_update.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/main.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/mission_portal.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/httpd.conf.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.php.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/enterprise/templates/runalerts.sh.mustache
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/recommendations.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_dc_workflow.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/cfe_internal_update_from_repository.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/lib.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/systemd_units.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_bins.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_policy.cf
+%%EXAMPLESDIR%%/masterfiles/cfe_internal/update/update_processes.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_agent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_execd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_hub.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_monitord.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_runagent.cf
+%%EXAMPLESDIR%%/masterfiles/controls/cf_serverd.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/controls/reports.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def.cf
+%%EXAMPLESDIR%%/masterfiles/controls/update_def_inputs.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/aix.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/any.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/debian.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/freebsd.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/generic.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/linux.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/lsb.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/macos.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/os.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/redhat.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/suse.cf
+%%EXAMPLESDIR%%/masterfiles/inventory/windows.cf
+%%EXAMPLESDIR%%/masterfiles/lib/autorun.cf
+%%EXAMPLESDIR%%/masterfiles/lib/bundles.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfe_internal_hub.cf
+%%EXAMPLESDIR%%/masterfiles/lib/cfengine_enterprise_hub_ha.cf
+%%EXAMPLESDIR%%/masterfiles/lib/commands.cf
+%%EXAMPLESDIR%%/masterfiles/lib/common.cf
+%%EXAMPLESDIR%%/masterfiles/lib/databases.cf
+%%EXAMPLESDIR%%/masterfiles/lib/edit_xml.cf
+%%EXAMPLESDIR%%/masterfiles/lib/event.cf
+%%EXAMPLESDIR%%/masterfiles/lib/examples.cf
+%%EXAMPLESDIR%%/masterfiles/lib/feature.cf
+%%EXAMPLESDIR%%/masterfiles/lib/files.cf
+%%EXAMPLESDIR%%/masterfiles/lib/guest_environments.cf
+%%EXAMPLESDIR%%/masterfiles/lib/monitor.cf
+%%EXAMPLESDIR%%/masterfiles/lib/packages.cf
+%%EXAMPLESDIR%%/masterfiles/lib/paths.cf
+%%EXAMPLESDIR%%/masterfiles/lib/processes.cf
+%%EXAMPLESDIR%%/masterfiles/lib/reports.cf
+%%EXAMPLESDIR%%/masterfiles/lib/services.cf
+%%EXAMPLESDIR%%/masterfiles/lib/stdlib.cf
+%%EXAMPLESDIR%%/masterfiles/lib/storage.cf
+%%EXAMPLESDIR%%/masterfiles/lib/testing.cf
+%%EXAMPLESDIR%%/masterfiles/lib/users.cf
+%%EXAMPLESDIR%%/masterfiles/lib/vcs.cf
+%%EXAMPLESDIR%%/masterfiles/promises.cf
+%%EXAMPLESDIR%%/masterfiles/services/autorun/hello.cf
+%%EXAMPLESDIR%%/masterfiles/services/main.cf
+%%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
+%%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/cfengine_watchdog.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/host_info_report.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_multiline.mustache
+%%EXAMPLESDIR%%/masterfiles/templates/json_serial.mustache
+%%EXAMPLESDIR%%/masterfiles/update.cf
+%%EXAMPLESDIR%%/masterfiles/modules/packages/apt_get
+%%EXAMPLESDIR%%/masterfiles/modules/packages/freebsd_ports
+%%EXAMPLESDIR%%/masterfiles/modules/packages/nimclient
+%%EXAMPLESDIR%%/masterfiles/modules/packages/pkg
+%%EXAMPLESDIR%%/masterfiles/modules/packages/pkgsrc
+%%EXAMPLESDIR%%/masterfiles/modules/packages/slackpkg
+%%EXAMPLESDIR%%/masterfiles/modules/packages/yum
+%%EXAMPLESDIR%%/masterfiles/modules/packages/zypper
diff --git a/sysutils/cfengine-masterfiles36/Makefile b/sysutils/cfengine-masterfiles36/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles36/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles36/distinfo b/sysutils/cfengine-masterfiles36/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles36/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles36/pkg-descr b/sysutils/cfengine-masterfiles36/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles36/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles36/pkg-plist b/sysutils/cfengine-masterfiles36/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles36/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles37/Makefile b/sysutils/cfengine-masterfiles37/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles37/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles37/distinfo b/sysutils/cfengine-masterfiles37/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles37/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles37/files/patch-Makefile.in b/sysutils/cfengine-masterfiles37/files/patch-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles37/files/patch-Makefile.in
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles37/files/patch-cfe_internal__update__update_policy.cf b/sysutils/cfengine-masterfiles37/files/patch-cfe_internal__update__update_policy.cf
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles37/files/patch-cfe_internal__update__update_policy.cf
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles37/pkg-descr b/sysutils/cfengine-masterfiles37/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles37/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles37/pkg-plist b/sysutils/cfengine-masterfiles37/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles37/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles38/Makefile b/sysutils/cfengine-masterfiles38/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles38/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles38/distinfo b/sysutils/cfengine-masterfiles38/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles38/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles38/pkg-descr b/sysutils/cfengine-masterfiles38/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles38/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles38/pkg-plist b/sysutils/cfengine-masterfiles38/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles38/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles39/Makefile b/sysutils/cfengine-masterfiles39/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles39/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles39/distinfo b/sysutils/cfengine-masterfiles39/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles39/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles39/files/patch-Makefile.in b/sysutils/cfengine-masterfiles39/files/patch-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles39/files/patch-Makefile.in
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles39/pkg-descr b/sysutils/cfengine-masterfiles39/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles39/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine-masterfiles39/pkg-plist b/sysutils/cfengine-masterfiles39/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine-masterfiles39/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index cd78e00f0e74..358a4ec8e2c4 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
-VERSIONS=		310 311 312 313 314
-CFENGINE_VERSION?=	313
+VERSIONS=		315 316 317
+CFENGINE_VERSION?=	317
 
 MASTERDIR=		${.CURDIR}/../cfengine${CFENGINE_VERSION}
 
diff --git a/sysutils/cfengine310/Makefile b/sysutils/cfengine310/Makefile
index 67e8e0ef572f..32d807a00ad2 100644
--- a/sysutils/cfengine310/Makefile
+++ b/sysutils/cfengine310/Makefile
@@ -1,5 +1,4 @@
 # Created by: jrhett@netconsonance.com
-# $FreeBSD$
 
 PORTNAME=	cfengine
 PORTVERSION=	3.10.5
@@ -19,6 +18,9 @@ CPE_VENDOR=	gnu
 DEPRECATED=		OpenSSL 1.1.X is not supported.
 EXPIRATION_DATE=	2021-09-30
 
+BROKEN_FreeBSD_13=	Fails to build
+BROKEN_FreeBSD_14=	Fails to build
+
 CONFLICTS=	cfengine3[0-9]-* cfengine31[1-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	310
@@ -32,8 +34,7 @@ USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf \
-		cpe gmake localbase libtool shebangfix ssl
+USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
 CFLAGS+=	-Wno-return-type
@@ -77,8 +78,8 @@ LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085
 .if ${SSL_DEFAULT} != "openssl"
-BROKEN_FreeBSD_12=	fails to build with openssl111, install security/openssl
-BROKEN_FreeBSD_13=	fails to build with openssl111, install security/openssl
+BROKEN_FreeBSD_12=	fails to build with openssl
+BROKEN_FreeBSD_13=	fails to build with openssl
 .endif
 .endif
 
diff --git a/sysutils/cfengine310/files/cf-execd.in b/sysutils/cfengine310/files/cf-execd.in
index 1ee33104e76e..ace1288a92ef 100644
--- a/sysutils/cfengine310/files/cf-execd.in
+++ b/sysutils/cfengine310/files/cf-execd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-execd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine310/files/cf-monitord.in b/sysutils/cfengine310/files/cf-monitord.in
index 471ee108622a..efa6aaa6e495 100644
--- a/sysutils/cfengine310/files/cf-monitord.in
+++ b/sysutils/cfengine310/files/cf-monitord.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-monitord
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine310/files/cf-serverd.in b/sysutils/cfengine310/files/cf-serverd.in
index 9fbd07cc148a..a53b091ffbf9 100644
--- a/sysutils/cfengine310/files/cf-serverd.in
+++ b/sysutils/cfengine310/files/cf-serverd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-serverd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine310/files/patch-m4-strndup.m4 b/sysutils/cfengine310/files/patch-m4-strndup.m4
deleted file mode 100644
index 31e4b7e264de..000000000000
--- a/sysutils/cfengine310/files/patch-m4-strndup.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine310/files/patch-m4__strndup.m4 b/sysutils/cfengine310/files/patch-m4__strndup.m4
deleted file mode 100644
index cb6d41d2e7cf..000000000000
--- a/sysutils/cfengine310/files/patch-m4__strndup.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: m4/strndup.m4
-===================================================================
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine311/Makefile b/sysutils/cfengine311/Makefile
index f420c3cfa8fe..b6926de3e5d9 100644
--- a/sysutils/cfengine311/Makefile
+++ b/sysutils/cfengine311/Makefile
@@ -1,5 +1,4 @@
 # Created by: jrhett@netconsonance.com
-# $FreeBSD$
 
 PORTNAME=	cfengine
 PORTVERSION=	3.11.0
@@ -19,6 +18,9 @@ CPE_VENDOR=	gnu
 DEPRECATED=		OpenSSL 1.1.X is not supported.
 EXPIRATION_DATE=	2021-09-30
 
+BROKEN_FreeBSD_13=	Fails to build
+BROKEN_FreeBSD_14=	Fails to build
+
 CONFLICTS=	cfengine3[0-9]-* cfengine31[02-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	311
@@ -32,8 +34,7 @@ USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf \
-		cpe gmake localbase libtool shebangfix ssl
+USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
 CFLAGS+=	-Wno-return-type
@@ -77,8 +78,8 @@ LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085
 .if ${SSL_DEFAULT} != "openssl"
-BROKEN_FreeBSD_12=	fails to build with openssl111, install security/openssl
-BROKEN_FreeBSD_13=	fails to build with openssl111, install security/openssl
+BROKEN_FreeBSD_12=	fails to build with openssl
+BROKEN_FreeBSD_13=	fails to build with openssl
 .endif
 .endif
 
diff --git a/sysutils/cfengine311/files/cf-execd.in b/sysutils/cfengine311/files/cf-execd.in
index 1bffee793948..b40d3507649a 100644
--- a/sysutils/cfengine311/files/cf-execd.in
+++ b/sysutils/cfengine311/files/cf-execd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-execd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine311/files/cf-monitord.in b/sysutils/cfengine311/files/cf-monitord.in
index 50ff312db37e..dd21a0aaed6d 100644
--- a/sysutils/cfengine311/files/cf-monitord.in
+++ b/sysutils/cfengine311/files/cf-monitord.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-monitord
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine311/files/cf-serverd.in b/sysutils/cfengine311/files/cf-serverd.in
index b48c6c05dcba..938274887353 100644
--- a/sysutils/cfengine311/files/cf-serverd.in
+++ b/sysutils/cfengine311/files/cf-serverd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-serverd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine311/files/patch-m4-strndup.m4 b/sysutils/cfengine311/files/patch-m4-strndup.m4
deleted file mode 100644
index 31e4b7e264de..000000000000
--- a/sysutils/cfengine311/files/patch-m4-strndup.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine311/files/patch-m4__strndup.m4 b/sysutils/cfengine311/files/patch-m4__strndup.m4
deleted file mode 100644
index cb6d41d2e7cf..000000000000
--- a/sysutils/cfengine311/files/patch-m4__strndup.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: m4/strndup.m4
-===================================================================
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine312/Makefile b/sysutils/cfengine312/Makefile
deleted file mode 100644
index d764047929e5..000000000000
--- a/sysutils/cfengine312/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: jrhett@netconsonance.com
-# $FreeBSD$
-
-PORTNAME=	cfengine
-PORTVERSION=	3.12.0
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
-
-MAINTAINER=	cy@FreeBSD.org
-#		gjb@FreeBSD.org is also committer for this port
-#		skreuzer@FreeBSD.org is also committer for this port
-COMMENT=	Systems administration tool for networks
-
-LICENSE=	GPLv3
-
-CPE_VENDOR=	gnu
-
-CONFLICTS=	cfengine3[0-9]-* cfengine31[013-9]-*
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX=	312
-CONFLICTS+=	cfengine-3.*
-.endif
-
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
-USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
-
-MAKE_JOBS_UNSAFE=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USES=		autoreconf \
-		cpe gmake localbase libtool shebangfix ssl
-USE_GNOME=	libxml2
-SHEBANG_FILES=	examples/remake_outputs.pl
-CFLAGS+=	-Wno-return-type
-# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
-DOCSDIR=	${PREFIX}/share/doc/cfengine
-MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
-CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--htmldir=${DOCSDIR}/html \
-		--libexecdir=${PREFIX}/libexec \
-		--libdir=${PREFIX}/libexec \
-		--mandir=${PREFIX}/man \
-		--with-workdir=/var/cfengine \
-		--with-pcre=${LOCALBASE} \
-		--with-lmdb=${LOCALBASE} \
-		--enable-fhs
-INSTALL_TARGET=	install-strip
-
-LIB_DEPENDS+=	libpcre.so:devel/pcre \
-		liblmdb.so:databases/lmdb \
-		libyaml.so:textproc/libyaml \
-		libcurl.so:ftp/curl
-
-OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
-
-PGSQL_USES=		pgsql
-PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
-PGSQL_CONFIGURE_OFF=	--without-postgresql
-
-MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
-MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
-MYSQL_CONFIGURE_OFF=	--without-mysql
-MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
-MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
-
-LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
-LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
-
-.include <bsd.port.mk>
diff --git a/sysutils/cfengine312/distinfo b/sysutils/cfengine312/distinfo
deleted file mode 100644
index 146f12c2f7f6..000000000000
--- a/sysutils/cfengine312/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1530590293
-SHA256 (cfengine-3.12.0.tar.gz) = d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec
-SIZE (cfengine-3.12.0.tar.gz) = 2470423
diff --git a/sysutils/cfengine312/files/cf-execd.in b/sysutils/cfengine312/files/cf-execd.in
deleted file mode 100644
index 1bffee793948..000000000000
--- a/sysutils/cfengine312/files/cf-execd.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: cf-execd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
-#
-# cf_execd_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable cf-execd.
-# cf_execd_flags (str):          Custom additional arguments to be passed
-#                               to cf-execd (default empty).
-#
-
-. /etc/rc.subr
-
-name="cf_execd"
-rcvar=cf_execd_enable
-
-command="%%PREFIX%%/bin/cf-execd"
-
-load_rc_config $name
-
-: ${cf_execd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/cfengine312/files/cf-monitord.in b/sysutils/cfengine312/files/cf-monitord.in
deleted file mode 100644
index 50ff312db37e..000000000000
--- a/sysutils/cfengine312/files/cf-monitord.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: cf-monitord
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
-#
-# cf_monitord_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable cf-monitord.
-# cf_monitord_flags (str):          Custom additional arguments to be passed
-#                               to cf-monitord (default empty).
-#
-
-. /etc/rc.subr
-
-name="cf_monitord"
-rcvar=cf_monitord_enable
-
-command="%%PREFIX%%/bin/cf-monitord"
-
-load_rc_config $name
-
-: ${cf_monitord_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/cfengine312/files/cf-serverd.in b/sysutils/cfengine312/files/cf-serverd.in
deleted file mode 100644
index b48c6c05dcba..000000000000
--- a/sysutils/cfengine312/files/cf-serverd.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: cf-serverd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
-#
-# cf_serverd_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable cf-serverd.
-# cf_serverd_flags (str):          Custom additional arguments to be passed
-#                               to cf-serverd (default empty).
-#
-
-. /etc/rc.subr
-
-name="cf_serverd"
-rcvar=cf_serverd_enable
-
-command="%%PREFIX%%/bin/cf-serverd"
-
-load_rc_config $name
-
-: ${cf_serverd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/cfengine312/files/patch-m4-strndup.m4 b/sysutils/cfengine312/files/patch-m4-strndup.m4
deleted file mode 100644
index 31e4b7e264de..000000000000
--- a/sysutils/cfengine312/files/patch-m4-strndup.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine312/files/patch-m4__strndup.m4 b/sysutils/cfengine312/files/patch-m4__strndup.m4
deleted file mode 100644
index cb6d41d2e7cf..000000000000
--- a/sysutils/cfengine312/files/patch-m4__strndup.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: m4/strndup.m4
-===================================================================
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine312/pkg-plist b/sysutils/cfengine312/pkg-plist
deleted file mode 100644
index 68e608df9271..000000000000
--- a/sysutils/cfengine312/pkg-plist
+++ /dev/null
@@ -1,404 +0,0 @@
-bin/cf-agent
-bin/cf-execd
-bin/cf-key
-bin/cf-monitord
-bin/cf-net
-bin/cf-promises
-bin/cf-runagent
-bin/cf-serverd
-bin/cf-upgrade
-bin/rpmvercmp
-libexec/cfengine/libpromises.so
-libexec/cfengine/libpromises.so.3
-libexec/cfengine/libpromises.so.3.0.6
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/README.md
-%%DOCSDIR%%/examples/abort.cf
-%%DOCSDIR%%/examples/accessed_before.cf
-%%DOCSDIR%%/examples/accessedbefore.cf
-%%DOCSDIR%%/examples/accumulated_time.cf
-%%DOCSDIR%%/examples/acl.cf
-%%DOCSDIR%%/examples/acl_generic.cf
-%%DOCSDIR%%/examples/acl_ntfs.cf
-%%DOCSDIR%%/examples/acl_secret.cf
-%%DOCSDIR%%/examples/active_directory.cf
-%%DOCSDIR%%/examples/activedirectory_listusers.cf
-%%DOCSDIR%%/examples/activedirectory_showuser.cf
-%%DOCSDIR%%/examples/ago.cf
-%%DOCSDIR%%/examples/app_baseline.cf
-%%DOCSDIR%%/examples/appgroups.cf
-%%DOCSDIR%%/examples/arrays.cf
-%%DOCSDIR%%/examples/augment.cf
-%%DOCSDIR%%/examples/backreferences_files.cf
-%%DOCSDIR%%/examples/badpromise.cf
-%%DOCSDIR%%/examples/badtype.cf
-%%DOCSDIR%%/examples/bsdflags.cf
-%%DOCSDIR%%/examples/bundle_return_values.cf
-%%DOCSDIR%%/examples/bundlesmatching.cf
-%%DOCSDIR%%/examples/bundlesequence.cf
-%%DOCSDIR%%/examples/bundlestate.cf
-%%DOCSDIR%%/examples/canonify.cf
-%%DOCSDIR%%/examples/cf2_integration.cf
-%%DOCSDIR%%/examples/change_detect.cf
-%%DOCSDIR%%/examples/changedbefore.cf
-%%DOCSDIR%%/examples/chdir.cf
-%%DOCSDIR%%/examples/class-automatic-canonificiation.cf
-%%DOCSDIR%%/examples/classes_global.cf
-%%DOCSDIR%%/examples/classesmatching.cf
-%%DOCSDIR%%/examples/classmatch.cf
-%%DOCSDIR%%/examples/classvar_convergence.cf
-%%DOCSDIR%%/examples/commands.cf
-%%DOCSDIR%%/examples/compare.cf
-%%DOCSDIR%%/examples/container_iteration.cf
-%%DOCSDIR%%/examples/container_key_iteration.cf
-%%DOCSDIR%%/examples/control_expand.cf
-%%DOCSDIR%%/examples/controlclasses.cf
-%%DOCSDIR%%/examples/copy.cf
-%%DOCSDIR%%/examples/copy_classes.cf
-%%DOCSDIR%%/examples/copy_copbl.cf
-%%DOCSDIR%%/examples/copy_edit.cf
-%%DOCSDIR%%/examples/copydir_copbl.cf
-%%DOCSDIR%%/examples/copylinks.cf
-%%DOCSDIR%%/examples/countclassesmatching.cf
-%%DOCSDIR%%/examples/countlinesmatching.cf
-%%DOCSDIR%%/examples/create_filedir.cf
-%%DOCSDIR%%/examples/createdb.cf
-%%DOCSDIR%%/examples/customize_by_named_list.cf
-%%DOCSDIR%%/examples/data_expand.cf
-%%DOCSDIR%%/examples/data_readstringarray.cf
-%%DOCSDIR%%/examples/data_regextract.cf
-%%DOCSDIR%%/examples/datastate.cf
-%%DOCSDIR%%/examples/defaults.cf
-%%DOCSDIR%%/examples/defaults2.cf
-%%DOCSDIR%%/examples/defaults3.cf
-%%DOCSDIR%%/examples/definitions.cf
-%%DOCSDIR%%/examples/deletelines.cf
-%%DOCSDIR%%/examples/depends_on.cf
-%%DOCSDIR%%/examples/depends_on2.cf
-%%DOCSDIR%%/examples/difference.cf
-%%DOCSDIR%%/examples/dirname.cf
-%%DOCSDIR%%/examples/disable.cf
-%%DOCSDIR%%/examples/disable_and_rotate_files.cf
-%%DOCSDIR%%/examples/diskfree.cf
-%%DOCSDIR%%/examples/dollar.cf
-%%DOCSDIR%%/examples/edit_column_files.cf
-%%DOCSDIR%%/examples/edit_comment_lines.cf
-%%DOCSDIR%%/examples/edit_deletenotmatch.cf
-%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
-%%DOCSDIR%%/examples/edit_insert_lines.cf
-%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
-%%DOCSDIR%%/examples/edit_passwd_file.cf
-%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
-%%DOCSDIR%%/examples/edit_replace_string.cf
-%%DOCSDIR%%/examples/edit_sectioned_file.cf
-%%DOCSDIR%%/examples/edit_setvar.cf
-%%DOCSDIR%%/examples/edit_template.cf
-%%DOCSDIR%%/examples/edit_triggerclass.cf
-%%DOCSDIR%%/examples/edit_xml.cf
-%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
-%%DOCSDIR%%/examples/env.cf
-%%DOCSDIR%%/examples/epimenides.cf
-%%DOCSDIR%%/examples/escape.cf
-%%DOCSDIR%%/examples/eval.cf
-%%DOCSDIR%%/examples/every.cf
-%%DOCSDIR%%/examples/exec_args.cf
-%%DOCSDIR%%/examples/exec_in_sequence.cf
-%%DOCSDIR%%/examples/execd.cf
-%%DOCSDIR%%/examples/execresult.cf
-%%DOCSDIR%%/examples/expand.cf
-%%DOCSDIR%%/examples/failedcommand.cf
-%%DOCSDIR%%/examples/failsafe.cf
-%%DOCSDIR%%/examples/file_change_detection.cf
-%%DOCSDIR%%/examples/file_hash.cf
-%%DOCSDIR%%/examples/file_owner_list_template.cf
-%%DOCSDIR%%/examples/fileexists.cf
-%%DOCSDIR%%/examples/filenames.cf
-%%DOCSDIR%%/examples/fileperms.cf
-%%DOCSDIR%%/examples/filesexist.cf
-%%DOCSDIR%%/examples/filesexist2.cf
-%%DOCSDIR%%/examples/filesize.cf
-%%DOCSDIR%%/examples/filestat.cf
-%%DOCSDIR%%/examples/filter.cf
-%%DOCSDIR%%/examples/findfiles.cf
-%%DOCSDIR%%/examples/fix_names.cf
-%%DOCSDIR%%/examples/format.cf
-%%DOCSDIR%%/examples/getclassmetatags.cf
-%%DOCSDIR%%/examples/getenv.cf
-%%DOCSDIR%%/examples/getfields.cf
-%%DOCSDIR%%/examples/getgid.cf
-%%DOCSDIR%%/examples/getindices.cf
-%%DOCSDIR%%/examples/getindices_and_values.cf
-%%DOCSDIR%%/examples/getmacaddress.cf
-%%DOCSDIR%%/examples/getregistry.cf
-%%DOCSDIR%%/examples/getuid.cf
-%%DOCSDIR%%/examples/getuserinfo.cf
-%%DOCSDIR%%/examples/getusers.cf
-%%DOCSDIR%%/examples/getvalues.cf
-%%DOCSDIR%%/examples/getvariablemetatags.cf
-%%DOCSDIR%%/examples/global_list_expansion.cf
-%%DOCSDIR%%/examples/global_list_expansion_2.cf
-%%DOCSDIR%%/examples/grep.cf
-%%DOCSDIR%%/examples/groupexists.cf
-%%DOCSDIR%%/examples/guest_environment_kvm.cf
-%%DOCSDIR%%/examples/hash.cf
-%%DOCSDIR%%/examples/hashcomment.cf
-%%DOCSDIR%%/examples/hashmatch.cf
-%%DOCSDIR%%/examples/hash_to_int.cf
-%%DOCSDIR%%/examples/hashuncomment.cf
-%%DOCSDIR%%/examples/helloworld.cf
-%%DOCSDIR%%/examples/host2ip.cf
-%%DOCSDIR%%/examples/hostrange.cf
-%%DOCSDIR%%/examples/hostsseen.cf
-%%DOCSDIR%%/examples/hostswithclass.cf
-%%DOCSDIR%%/examples/hub.cf
-%%DOCSDIR%%/examples/id.cf
-%%DOCSDIR%%/examples/inherit.cf
-%%DOCSDIR%%/examples/insert_users.cf
-%%DOCSDIR%%/examples/intarray.cf
-%%DOCSDIR%%/examples/intersection.cf
-%%DOCSDIR%%/examples/inventory_cpu.cf
-%%DOCSDIR%%/examples/ip2host.cf
-%%DOCSDIR%%/examples/iprange.cf
-%%DOCSDIR%%/examples/irange.cf
-%%DOCSDIR%%/examples/isdir.cf
-%%DOCSDIR%%/examples/isexecutable.cf
-%%DOCSDIR%%/examples/isgreaterthan.cf
-%%DOCSDIR%%/examples/isipinsubnet.cf
-%%DOCSDIR%%/examples/islessthan.cf
-%%DOCSDIR%%/examples/islink.cf
-%%DOCSDIR%%/examples/isnewerthan.cf
-%%DOCSDIR%%/examples/isplain.cf
-%%DOCSDIR%%/examples/isvariable.cf
-%%DOCSDIR%%/examples/iteration.cf
-%%DOCSDIR%%/examples/join.cf
-%%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
-%%DOCSDIR%%/examples/knowledge_driver.cf
-%%DOCSDIR%%/examples/knowledge_txt.cf
-%%DOCSDIR%%/examples/lastnode.cf
-%%DOCSDIR%%/examples/ldap.cf
-%%DOCSDIR%%/examples/length.cf
-%%DOCSDIR%%/examples/linking.cf
-%%DOCSDIR%%/examples/literal_server.cf
-%%DOCSDIR%%/examples/local_group_present.cf
-%%DOCSDIR%%/examples/local_user_password.cf
-%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
-%%DOCSDIR%%/examples/local_users_absent.cf
-%%DOCSDIR%%/examples/local_users_locked.cf
-%%DOCSDIR%%/examples/local_users_present.cf
-%%DOCSDIR%%/examples/locate_files_and_compress.cf
-%%DOCSDIR%%/examples/log_private.cf
-%%DOCSDIR%%/examples/loops.cf
-%%DOCSDIR%%/examples/lsdir.cf
-%%DOCSDIR%%/examples/main.cf
-%%DOCSDIR%%/examples/main_entry_point.cf
-%%DOCSDIR%%/examples/main_library.cf
-%%DOCSDIR%%/examples/maparray.cf
-%%DOCSDIR%%/examples/mapdata.cf
-%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
-%%DOCSDIR%%/examples/maplist.cf
-%%DOCSDIR%%/examples/max-min-mean-variance.cf
-%%DOCSDIR%%/examples/measure_log.cf
-%%DOCSDIR%%/examples/measurements.cf
-%%DOCSDIR%%/examples/menu.cf
-%%DOCSDIR%%/examples/mergedata.cf
-%%DOCSDIR%%/examples/meta.cf
-%%DOCSDIR%%/examples/method.cf
-%%DOCSDIR%%/examples/method_polymorph.cf
-%%DOCSDIR%%/examples/method_validate.cf
-%%DOCSDIR%%/examples/method_var.cf
-%%DOCSDIR%%/examples/method_var2.cf
-%%DOCSDIR%%/examples/missing_ok.cf
-%%DOCSDIR%%/examples/module_exec.cf
-%%DOCSDIR%%/examples/module_exec_2.cf
-%%DOCSDIR%%/examples/monitord.cf
-%%DOCSDIR%%/examples/mount_fs.cf
-%%DOCSDIR%%/examples/multipassvars.cf
-%%DOCSDIR%%/examples/multiple_outcomes.cf
-%%DOCSDIR%%/examples/mustache_classes.cf
-%%DOCSDIR%%/examples/mustache_template_motd.cf
-%%DOCSDIR%%/examples/namespace.cf
-%%DOCSDIR%%/examples/namespace1.cf
-%%DOCSDIR%%/examples/namespace2.cf
-%%DOCSDIR%%/examples/namespace3.cf
-%%DOCSDIR%%/examples/namespace_class1.cf
-%%DOCSDIR%%/examples/namespace_classes.cf
-%%DOCSDIR%%/examples/namespace_var_meta.cf
-%%DOCSDIR%%/examples/namespace_var_meta2.cf
-%%DOCSDIR%%/examples/neighbourhood_watch.cf
-%%DOCSDIR%%/examples/none.cf
-%%DOCSDIR%%/examples/nth.cf
-%%DOCSDIR%%/examples/null_config.cf
-%%DOCSDIR%%/examples/occurrences.cf
-%%DOCSDIR%%/examples/orchestrate_chain1.cf
-%%DOCSDIR%%/examples/orchestrate_chain2.cf
-%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
-%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
-%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
-%%DOCSDIR%%/examples/orchestrate_dragon.cf
-%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
-%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
-%%DOCSDIR%%/examples/orchestration_hostlist.cf
-%%DOCSDIR%%/examples/ordering.cf
-%%DOCSDIR%%/examples/package_apt.cf
-%%DOCSDIR%%/examples/package_bundles.cf
-%%DOCSDIR%%/examples/package_freebsd.cf
-%%DOCSDIR%%/examples/package_latest.cf
-%%DOCSDIR%%/examples/package_msi_file.cf
-%%DOCSDIR%%/examples/package_msi_version.cf
-%%DOCSDIR%%/examples/package_rpm.cf
-%%DOCSDIR%%/examples/package_solaris.cf
-%%DOCSDIR%%/examples/package_windows_feature.cf
-%%DOCSDIR%%/examples/package_yum.cf
-%%DOCSDIR%%/examples/package_zypper.cf
-%%DOCSDIR%%/examples/packagesmatching.cf
-%%DOCSDIR%%/examples/parallel_exec.cf
-%%DOCSDIR%%/examples/parseintrealstringarray.cf
-%%DOCSDIR%%/examples/parsestringarray.cf
-%%DOCSDIR%%/examples/parsestringarrayidx.cf
-%%DOCSDIR%%/examples/pathtype.cf
-%%DOCSDIR%%/examples/pattern_and_edit.cf
-%%DOCSDIR%%/examples/peerleader.cf
-%%DOCSDIR%%/examples/peerleaders.cf
-%%DOCSDIR%%/examples/peers.cf
-%%DOCSDIR%%/examples/postfix.cf
-%%DOCSDIR%%/examples/process_kill.cf
-%%DOCSDIR%%/examples/process_matching.cf
-%%DOCSDIR%%/examples/process_matching2.cf
-%%DOCSDIR%%/examples/process_matching3.cf
-%%DOCSDIR%%/examples/process_restart.cf
-%%DOCSDIR%%/examples/process_restart_basic.cf
-%%DOCSDIR%%/examples/process_signalling.cf
-%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
-%%DOCSDIR%%/examples/product.cf
-%%DOCSDIR%%/examples/promise_knowledge.cf
-%%DOCSDIR%%/examples/promises.cf
-%%DOCSDIR%%/examples/quoting.cf
-%%DOCSDIR%%/examples/randomint.cf
-%%DOCSDIR%%/examples/readcsv.cf
-%%DOCSDIR%%/examples/readdata.cf
-%%DOCSDIR%%/examples/readfile.cf
-%%DOCSDIR%%/examples/readintarray.cf
-%%DOCSDIR%%/examples/readintrealstringlist.cf
-%%DOCSDIR%%/examples/readlist.cf
-%%DOCSDIR%%/examples/readrealarray.cf
-%%DOCSDIR%%/examples/readstringarray.cf
-%%DOCSDIR%%/examples/readtcp.cf
-%%DOCSDIR%%/examples/reg_multiline.cf
-%%DOCSDIR%%/examples/regarray.cf
-%%DOCSDIR%%/examples/regcmp.cf
-%%DOCSDIR%%/examples/regex_replace.cf
-%%DOCSDIR%%/examples/regex_win.cf
-%%DOCSDIR%%/examples/regextract.cf
-%%DOCSDIR%%/examples/registry.cf
-%%DOCSDIR%%/examples/registry_cache.cf
-%%DOCSDIR%%/examples/registryvalue.cf
-%%DOCSDIR%%/examples/regline.cf
-%%DOCSDIR%%/examples/reglist.cf
-%%DOCSDIR%%/examples/remake_outputs.pl
-%%DOCSDIR%%/examples/remoteclasses.cf
-%%DOCSDIR%%/examples/remoteclasses2.cf
-%%DOCSDIR%%/examples/remotescalar.cf
-%%DOCSDIR%%/examples/remove_deadlinks.cf
-%%DOCSDIR%%/examples/rename.cf
-%%DOCSDIR%%/examples/repairedcommand.cf
-%%DOCSDIR%%/examples/report_custom.cf
-%%DOCSDIR%%/examples/report_diffs.cf
-%%DOCSDIR%%/examples/report_state.cf
-%%DOCSDIR%%/examples/reporting.cf
-%%DOCSDIR%%/examples/reports.cf
-%%DOCSDIR%%/examples/reporttofile.cf
-%%DOCSDIR%%/examples/resolveconf.cf
-%%DOCSDIR%%/examples/returnszero.cf
-%%DOCSDIR%%/examples/reverse.cf
-%%DOCSDIR%%/examples/root_passwd.cf
-%%DOCSDIR%%/examples/select_class.cf
-%%DOCSDIR%%/examples/select_mode.cf
-%%DOCSDIR%%/examples/select_region.cf
-%%DOCSDIR%%/examples/select_size.cf
-%%DOCSDIR%%/examples/selectservers.cf
-%%DOCSDIR%%/examples/server_callback.cf
-%%DOCSDIR%%/examples/server_copy_localhost.cf
-%%DOCSDIR%%/examples/server_copy_purge.cf
-%%DOCSDIR%%/examples/server_copy_remote.cf
-%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
-%%DOCSDIR%%/examples/service_catalogue.cf
-%%DOCSDIR%%/examples/service_catalogue_separate.cf
-%%DOCSDIR%%/examples/service_disable.cf
-%%DOCSDIR%%/examples/service_start.cf
-%%DOCSDIR%%/examples/services.cf
-%%DOCSDIR%%/examples/services_concept.cf
-%%DOCSDIR%%/examples/services_default_service_bundle.cf
-%%DOCSDIR%%/examples/services_win.cf
-%%DOCSDIR%%/examples/setuidlog.cf
-%%DOCSDIR%%/examples/setvar.cf
-%%DOCSDIR%%/examples/shuffle.cf
-%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
-%%DOCSDIR%%/examples/software_dist.cf
-%%DOCSDIR%%/examples/software_update_version_yum.cf
-%%DOCSDIR%%/examples/some.cf
-%%DOCSDIR%%/examples/sort.cf
-%%DOCSDIR%%/examples/splitstring.cf
-%%DOCSDIR%%/examples/sql_table_structure.cf
-%%DOCSDIR%%/examples/storage.cf
-%%DOCSDIR%%/examples/strcmp.cf
-%%DOCSDIR%%/examples/strftime.cf
-%%DOCSDIR%%/examples/string_downcase.cf
-%%DOCSDIR%%/examples/string_head.cf
-%%DOCSDIR%%/examples/string_length.cf
-%%DOCSDIR%%/examples/string_mustache.cf
-%%DOCSDIR%%/examples/string_reverse.cf
-%%DOCSDIR%%/examples/string_split.cf
-%%DOCSDIR%%/examples/string_tail.cf
-%%DOCSDIR%%/examples/string_upcase.cf
-%%DOCSDIR%%/examples/stringarray.cf
-%%DOCSDIR%%/examples/sublist.cf
-%%DOCSDIR%%/examples/sum.cf
-%%DOCSDIR%%/examples/switchcase.cf
-%%DOCSDIR%%/examples/symlink.cf
-%%DOCSDIR%%/examples/symlink_children.cf
-%%DOCSDIR%%/examples/syslog.cf
-%%DOCSDIR%%/examples/syslog2.cf
-%%DOCSDIR%%/examples/template.cf
-%%DOCSDIR%%/examples/template2.cf
-%%DOCSDIR%%/examples/test_environment.cf
-%%DOCSDIR%%/examples/tidy_all_files.cf
-%%DOCSDIR%%/examples/translatepath.cf
-%%DOCSDIR%%/examples/unique.cf
-%%DOCSDIR%%/examples/unpack_method_calls.cf
-%%DOCSDIR%%/examples/update.cf
-%%DOCSDIR%%/examples/user_edit.cf
-%%DOCSDIR%%/examples/user_edit_method.cf
-%%DOCSDIR%%/examples/userexists.cf
-%%DOCSDIR%%/examples/users_type.cf
-%%DOCSDIR%%/examples/varclass.cf
-%%DOCSDIR%%/examples/varexpansion.cf
-%%DOCSDIR%%/examples/variablesmatching.cf
-%%DOCSDIR%%/examples/variablesmatching_as_data.cf
-%%DOCSDIR%%/examples/varnet.cf
-%%DOCSDIR%%/examples/vars.cf
-%%DOCSDIR%%/examples/warnifline.cf
-%%DOCSDIR%%/examples/webserver.cf
-%%DOCSDIR%%/examples/win_dns_client.cf
-%%DOCSDIR%%/examples/win_emergency.cf
-%%DOCSDIR%%/examples/win_registry.cf
-%%DOCSDIR%%/examples/win_schedule.cf
-%%DOCSDIR%%/examples/zenoss.cf
-%%DOCSDIR%%/examples/mustache_comments.cf
-%%DOCSDIR%%/examples/mustache_extension_compact_json.cf
-%%DOCSDIR%%/examples/mustache_extension_expand_key.cf
-%%DOCSDIR%%/examples/mustache_extension_multiline_json.cf
-%%DOCSDIR%%/examples/mustache_extension_top.cf
-%%DOCSDIR%%/examples/mustache_sections_empty_list.cf
-%%DOCSDIR%%/examples/mustache_sections_inverted.cf
-%%DOCSDIR%%/examples/mustache_sections_non_empty_list.cf
-%%DOCSDIR%%/examples/mustache_sections_non_false_value.cf
-%%DOCSDIR%%/examples/mustache_set_delimiters.cf
-%%DOCSDIR%%/examples/mustache_variables.cf
-%%DOCSDIR%%/examples/readenvfile.cf
-%%DOCSDIR%%/examples/with.cf
-@dir /var/cfengine/inputs
-@dir /var/cfengine/modules
-@dir /var/cfengine/outputs
-@dir /var/cfengine/plugins
-@dir(root,wheel,700) /var/cfengine/ppkeys
-@dir /var/cfengine
diff --git a/sysutils/cfengine313/Makefile b/sysutils/cfengine313/Makefile
deleted file mode 100644
index 7a8cada0b825..000000000000
--- a/sysutils/cfengine313/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: jrhett@netconsonance.com
-# $FreeBSD$
-
-PORTNAME=	cfengine
-PORTVERSION=	3.13.0
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
-
-MAINTAINER=	cy@FreeBSD.org
-#		gjb@FreeBSD.org is also committer for this port
-#		skreuzer@FreeBSD.org is also committer for this port
-COMMENT=	Systems administration tool for networks
-
-LICENSE=	GPLv3
-
-CPE_VENDOR=	gnu
-
-CONFLICTS=	cfengine3[0-9]-* cfengine31[013-9]-*
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX=	313
-CONFLICTS+=	cfengine-3.*
-.endif
-
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
-USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
-
-MAKE_JOBS_UNSAFE=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USES=		autoreconf \
-		cpe gmake localbase libtool shebangfix ssl
-USE_GNOME=	libxml2
-SHEBANG_FILES=	examples/remake_outputs.pl
-CFLAGS+=	-Wno-return-type
-# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
-DOCSDIR=	${PREFIX}/share/doc/cfengine
-MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
-CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
-CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
-		--htmldir=${DOCSDIR}/html \
-		--libexecdir=${PREFIX}/libexec \
-		--libdir=${PREFIX}/libexec \
-		--mandir=${PREFIX}/man \
-		--with-workdir=/var/cfengine \
-		--with-pcre=${LOCALBASE} \
-		--with-lmdb=${LOCALBASE} \
-		--enable-fhs
-INSTALL_TARGET=	install-strip
-
-LIB_DEPENDS+=	libpcre.so:devel/pcre \
-		liblmdb.so:databases/lmdb \
-		libyaml.so:textproc/libyaml \
-		libcurl.so:ftp/curl
-
-OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
-
-PGSQL_USES=		pgsql
-PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
-PGSQL_CONFIGURE_OFF=	--without-postgresql
-
-MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
-MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
-MYSQL_CONFIGURE_OFF=	--without-mysql
-MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
-MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
-
-LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
-LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
-
-.include <bsd.port.mk>
diff --git a/sysutils/cfengine313/distinfo b/sysutils/cfengine313/distinfo
deleted file mode 100644
index 272344b7400f..000000000000
--- a/sysutils/cfengine313/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1543009443
-SHA256 (cfengine-3.13.0.tar.gz) = 58efa5cb929a3db21238090506952c0647c064ab35fadbbbdf78138db487986c
-SIZE (cfengine-3.13.0.tar.gz) = 2512254
diff --git a/sysutils/cfengine313/files/cf-execd.in b/sysutils/cfengine313/files/cf-execd.in
deleted file mode 100644
index 1bffee793948..000000000000
--- a/sysutils/cfengine313/files/cf-execd.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: cf-execd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
-#
-# cf_execd_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable cf-execd.
-# cf_execd_flags (str):          Custom additional arguments to be passed
-#                               to cf-execd (default empty).
-#
-
-. /etc/rc.subr
-
-name="cf_execd"
-rcvar=cf_execd_enable
-
-command="%%PREFIX%%/bin/cf-execd"
-
-load_rc_config $name
-
-: ${cf_execd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/cfengine313/files/cf-monitord.in b/sysutils/cfengine313/files/cf-monitord.in
deleted file mode 100644
index 50ff312db37e..000000000000
--- a/sysutils/cfengine313/files/cf-monitord.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: cf-monitord
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
-#
-# cf_monitord_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable cf-monitord.
-# cf_monitord_flags (str):          Custom additional arguments to be passed
-#                               to cf-monitord (default empty).
-#
-
-. /etc/rc.subr
-
-name="cf_monitord"
-rcvar=cf_monitord_enable
-
-command="%%PREFIX%%/bin/cf-monitord"
-
-load_rc_config $name
-
-: ${cf_monitord_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/cfengine313/files/cf-serverd.in b/sysutils/cfengine313/files/cf-serverd.in
deleted file mode 100644
index b48c6c05dcba..000000000000
--- a/sysutils/cfengine313/files/cf-serverd.in
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: cf-serverd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
-#
-# cf_serverd_enable (bool):        Set to "NO" by default.
-#                               Set it to "YES" to enable cf-serverd.
-# cf_serverd_flags (str):          Custom additional arguments to be passed
-#                               to cf-serverd (default empty).
-#
-
-. /etc/rc.subr
-
-name="cf_serverd"
-rcvar=cf_serverd_enable
-
-command="%%PREFIX%%/bin/cf-serverd"
-
-load_rc_config $name
-
-: ${cf_serverd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/cfengine313/files/patch-m4-strndup.m4 b/sysutils/cfengine313/files/patch-m4-strndup.m4
deleted file mode 100644
index 31e4b7e264de..000000000000
--- a/sysutils/cfengine313/files/patch-m4-strndup.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine313/files/patch-m4__strndup.m4 b/sysutils/cfengine313/files/patch-m4__strndup.m4
deleted file mode 100644
index cb6d41d2e7cf..000000000000
--- a/sysutils/cfengine313/files/patch-m4__strndup.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: m4/strndup.m4
-===================================================================
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine313/pkg-plist b/sysutils/cfengine313/pkg-plist
deleted file mode 100644
index 18372b7cda6b..000000000000
--- a/sysutils/cfengine313/pkg-plist
+++ /dev/null
@@ -1,406 +0,0 @@
-bin/cf-agent
-bin/cf-check
-bin/cf-execd
-bin/cf-key
-bin/cf-monitord
-bin/cf-net
-bin/cf-promises
-bin/cf-runagent
-bin/cf-serverd
-bin/cf-upgrade
-bin/rpmvercmp
-libexec/cfengine/libpromises.so
-libexec/cfengine/libpromises.so.3
-libexec/cfengine/libpromises.so.3.0.6
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/README.md
-%%DOCSDIR%%/examples/abort.cf
-%%DOCSDIR%%/examples/accessed_before.cf
-%%DOCSDIR%%/examples/accessedbefore.cf
-%%DOCSDIR%%/examples/accumulated_time.cf
-%%DOCSDIR%%/examples/acl.cf
-%%DOCSDIR%%/examples/acl_generic.cf
-%%DOCSDIR%%/examples/acl_ntfs.cf
-%%DOCSDIR%%/examples/acl_secret.cf
-%%DOCSDIR%%/examples/active_directory.cf
-%%DOCSDIR%%/examples/activedirectory_listusers.cf
-%%DOCSDIR%%/examples/activedirectory_showuser.cf
-%%DOCSDIR%%/examples/ago.cf
-%%DOCSDIR%%/examples/app_baseline.cf
-%%DOCSDIR%%/examples/appgroups.cf
-%%DOCSDIR%%/examples/arrays.cf
-%%DOCSDIR%%/examples/augment.cf
-%%DOCSDIR%%/examples/backreferences_files.cf
-%%DOCSDIR%%/examples/badpromise.cf
-%%DOCSDIR%%/examples/badtype.cf
-%%DOCSDIR%%/examples/bsdflags.cf
-%%DOCSDIR%%/examples/bundle_return_values.cf
-%%DOCSDIR%%/examples/bundlesequence.cf
-%%DOCSDIR%%/examples/bundlesmatching.cf
-%%DOCSDIR%%/examples/bundlestate.cf
-%%DOCSDIR%%/examples/canonify.cf
-%%DOCSDIR%%/examples/cf2_integration.cf
-%%DOCSDIR%%/examples/change_detect.cf
-%%DOCSDIR%%/examples/changedbefore.cf
-%%DOCSDIR%%/examples/chdir.cf
-%%DOCSDIR%%/examples/class-automatic-canonificiation.cf
-%%DOCSDIR%%/examples/classes_global.cf
-%%DOCSDIR%%/examples/classesmatching.cf
-%%DOCSDIR%%/examples/classmatch.cf
-%%DOCSDIR%%/examples/classvar_convergence.cf
-%%DOCSDIR%%/examples/commands.cf
-%%DOCSDIR%%/examples/compare.cf
-%%DOCSDIR%%/examples/container_iteration.cf
-%%DOCSDIR%%/examples/container_key_iteration.cf
-%%DOCSDIR%%/examples/control_expand.cf
-%%DOCSDIR%%/examples/controlclasses.cf
-%%DOCSDIR%%/examples/copy.cf
-%%DOCSDIR%%/examples/copy_classes.cf
-%%DOCSDIR%%/examples/copy_copbl.cf
-%%DOCSDIR%%/examples/copy_edit.cf
-%%DOCSDIR%%/examples/copydir_copbl.cf
-%%DOCSDIR%%/examples/copylinks.cf
-%%DOCSDIR%%/examples/countclassesmatching.cf
-%%DOCSDIR%%/examples/countlinesmatching.cf
-%%DOCSDIR%%/examples/create_filedir.cf
-%%DOCSDIR%%/examples/createdb.cf
-%%DOCSDIR%%/examples/customize_by_named_list.cf
-%%DOCSDIR%%/examples/data_expand.cf
-%%DOCSDIR%%/examples/data_readstringarray.cf
-%%DOCSDIR%%/examples/data_regextract.cf
-%%DOCSDIR%%/examples/datastate.cf
-%%DOCSDIR%%/examples/defaults.cf
-%%DOCSDIR%%/examples/defaults2.cf
-%%DOCSDIR%%/examples/defaults3.cf
-%%DOCSDIR%%/examples/definitions.cf
-%%DOCSDIR%%/examples/deletelines.cf
-%%DOCSDIR%%/examples/depends_on.cf
-%%DOCSDIR%%/examples/depends_on2.cf
-%%DOCSDIR%%/examples/difference.cf
-%%DOCSDIR%%/examples/dirname.cf
-%%DOCSDIR%%/examples/disable.cf
-%%DOCSDIR%%/examples/disable_and_rotate_files.cf
-%%DOCSDIR%%/examples/diskfree.cf
-%%DOCSDIR%%/examples/dollar.cf
-%%DOCSDIR%%/examples/edit_column_files.cf
-%%DOCSDIR%%/examples/edit_comment_lines.cf
-%%DOCSDIR%%/examples/edit_deletenotmatch.cf
-%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
-%%DOCSDIR%%/examples/edit_insert_lines.cf
-%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
-%%DOCSDIR%%/examples/edit_passwd_file.cf
-%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
-%%DOCSDIR%%/examples/edit_replace_string.cf
-%%DOCSDIR%%/examples/edit_sectioned_file.cf
-%%DOCSDIR%%/examples/edit_setvar.cf
-%%DOCSDIR%%/examples/edit_template.cf
-%%DOCSDIR%%/examples/edit_triggerclass.cf
-%%DOCSDIR%%/examples/edit_xml.cf
-%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
-%%DOCSDIR%%/examples/env.cf
-%%DOCSDIR%%/examples/epimenides.cf
-%%DOCSDIR%%/examples/escape.cf
-%%DOCSDIR%%/examples/eval.cf
-%%DOCSDIR%%/examples/every.cf
-%%DOCSDIR%%/examples/exec_args.cf
-%%DOCSDIR%%/examples/exec_in_sequence.cf
-%%DOCSDIR%%/examples/execd.cf
-%%DOCSDIR%%/examples/execresult.cf
-%%DOCSDIR%%/examples/expand.cf
-%%DOCSDIR%%/examples/failedcommand.cf
-%%DOCSDIR%%/examples/failsafe.cf
-%%DOCSDIR%%/examples/file_change_detection.cf
-%%DOCSDIR%%/examples/file_hash.cf
-%%DOCSDIR%%/examples/file_owner_list_template.cf
-%%DOCSDIR%%/examples/fileexists.cf
-%%DOCSDIR%%/examples/filenames.cf
-%%DOCSDIR%%/examples/fileperms.cf
-%%DOCSDIR%%/examples/filesexist.cf
-%%DOCSDIR%%/examples/filesexist2.cf
-%%DOCSDIR%%/examples/filesize.cf
-%%DOCSDIR%%/examples/filestat.cf
-%%DOCSDIR%%/examples/filter.cf
-%%DOCSDIR%%/examples/findfiles.cf
-%%DOCSDIR%%/examples/fix_names.cf
-%%DOCSDIR%%/examples/format.cf
-%%DOCSDIR%%/examples/getclassmetatags.cf
-%%DOCSDIR%%/examples/getenv.cf
-%%DOCSDIR%%/examples/getfields.cf
-%%DOCSDIR%%/examples/getgid.cf
-%%DOCSDIR%%/examples/getindices.cf
-%%DOCSDIR%%/examples/getindices_and_values.cf
-%%DOCSDIR%%/examples/getmacaddress.cf
-%%DOCSDIR%%/examples/getregistry.cf
-%%DOCSDIR%%/examples/getuid.cf
-%%DOCSDIR%%/examples/getuserinfo.cf
-%%DOCSDIR%%/examples/getusers.cf
-%%DOCSDIR%%/examples/getvalues.cf
-%%DOCSDIR%%/examples/getvariablemetatags.cf
-%%DOCSDIR%%/examples/global_list_expansion.cf
-%%DOCSDIR%%/examples/global_list_expansion_2.cf
-%%DOCSDIR%%/examples/grep.cf
-%%DOCSDIR%%/examples/groupexists.cf
-%%DOCSDIR%%/examples/guest_environment_kvm.cf
-%%DOCSDIR%%/examples/hash.cf
-%%DOCSDIR%%/examples/hash_to_int.cf
-%%DOCSDIR%%/examples/hashcomment.cf
-%%DOCSDIR%%/examples/hashmatch.cf
-%%DOCSDIR%%/examples/hashuncomment.cf
-%%DOCSDIR%%/examples/helloworld.cf
-%%DOCSDIR%%/examples/host2ip.cf
-%%DOCSDIR%%/examples/hostrange.cf
-%%DOCSDIR%%/examples/hostsseen.cf
-%%DOCSDIR%%/examples/hostswithclass.cf
-%%DOCSDIR%%/examples/hub.cf
-%%DOCSDIR%%/examples/id.cf
-%%DOCSDIR%%/examples/inherit.cf
-%%DOCSDIR%%/examples/insert_users.cf
-%%DOCSDIR%%/examples/intarray.cf
-%%DOCSDIR%%/examples/intersection.cf
-%%DOCSDIR%%/examples/inventory_cpu.cf
-%%DOCSDIR%%/examples/ip2host.cf
-%%DOCSDIR%%/examples/iprange.cf
-%%DOCSDIR%%/examples/irange.cf
-%%DOCSDIR%%/examples/isdir.cf
-%%DOCSDIR%%/examples/isexecutable.cf
-%%DOCSDIR%%/examples/isgreaterthan.cf
-%%DOCSDIR%%/examples/isipinsubnet.cf
-%%DOCSDIR%%/examples/islessthan.cf
-%%DOCSDIR%%/examples/islink.cf
-%%DOCSDIR%%/examples/isnewerthan.cf
-%%DOCSDIR%%/examples/isplain.cf
-%%DOCSDIR%%/examples/isvariable.cf
-%%DOCSDIR%%/examples/iteration.cf
-%%DOCSDIR%%/examples/join.cf
-%%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
-%%DOCSDIR%%/examples/knowledge_driver.cf
-%%DOCSDIR%%/examples/knowledge_txt.cf
-%%DOCSDIR%%/examples/lastnode.cf
-%%DOCSDIR%%/examples/ldap.cf
-%%DOCSDIR%%/examples/length.cf
-%%DOCSDIR%%/examples/linking.cf
-%%DOCSDIR%%/examples/literal_server.cf
-%%DOCSDIR%%/examples/local_group_present.cf
-%%DOCSDIR%%/examples/local_user_password.cf
-%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
-%%DOCSDIR%%/examples/local_users_absent.cf
-%%DOCSDIR%%/examples/local_users_locked.cf
-%%DOCSDIR%%/examples/local_users_present.cf
-%%DOCSDIR%%/examples/locate_files_and_compress.cf
-%%DOCSDIR%%/examples/log_private.cf
-%%DOCSDIR%%/examples/loops.cf
-%%DOCSDIR%%/examples/lsdir.cf
-%%DOCSDIR%%/examples/main.cf
-%%DOCSDIR%%/examples/main_entry_point.cf
-%%DOCSDIR%%/examples/main_library.cf
-%%DOCSDIR%%/examples/maparray.cf
-%%DOCSDIR%%/examples/mapdata.cf
-%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
-%%DOCSDIR%%/examples/maplist.cf
-%%DOCSDIR%%/examples/max-min-mean-variance.cf
-%%DOCSDIR%%/examples/measure_log.cf
-%%DOCSDIR%%/examples/measurements.cf
-%%DOCSDIR%%/examples/menu.cf
-%%DOCSDIR%%/examples/mergedata.cf
-%%DOCSDIR%%/examples/meta.cf
-%%DOCSDIR%%/examples/method.cf
-%%DOCSDIR%%/examples/method_polymorph.cf
-%%DOCSDIR%%/examples/method_validate.cf
-%%DOCSDIR%%/examples/method_var.cf
-%%DOCSDIR%%/examples/method_var2.cf
-%%DOCSDIR%%/examples/missing_ok.cf
-%%DOCSDIR%%/examples/module_exec.cf
-%%DOCSDIR%%/examples/module_exec_2.cf
-%%DOCSDIR%%/examples/monitord.cf
-%%DOCSDIR%%/examples/mount_fs.cf
-%%DOCSDIR%%/examples/multipassvars.cf
-%%DOCSDIR%%/examples/multiple_outcomes.cf
-%%DOCSDIR%%/examples/mustache_classes.cf
-%%DOCSDIR%%/examples/mustache_template_motd.cf
-%%DOCSDIR%%/examples/namespace.cf
-%%DOCSDIR%%/examples/namespace1.cf
-%%DOCSDIR%%/examples/namespace2.cf
-%%DOCSDIR%%/examples/namespace3.cf
-%%DOCSDIR%%/examples/namespace_class1.cf
-%%DOCSDIR%%/examples/namespace_classes.cf
-%%DOCSDIR%%/examples/namespace_var_meta.cf
-%%DOCSDIR%%/examples/namespace_var_meta2.cf
-%%DOCSDIR%%/examples/neighbourhood_watch.cf
-%%DOCSDIR%%/examples/none.cf
-%%DOCSDIR%%/examples/nth.cf
-%%DOCSDIR%%/examples/null_config.cf
-%%DOCSDIR%%/examples/occurrences.cf
-%%DOCSDIR%%/examples/orchestrate_chain1.cf
-%%DOCSDIR%%/examples/orchestrate_chain2.cf
-%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
-%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
-%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
-%%DOCSDIR%%/examples/orchestrate_dragon.cf
-%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
-%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
-%%DOCSDIR%%/examples/orchestration_hostlist.cf
-%%DOCSDIR%%/examples/ordering.cf
-%%DOCSDIR%%/examples/package_apt.cf
-%%DOCSDIR%%/examples/package_bundles.cf
-%%DOCSDIR%%/examples/package_freebsd.cf
-%%DOCSDIR%%/examples/package_latest.cf
-%%DOCSDIR%%/examples/package_msi_file.cf
-%%DOCSDIR%%/examples/package_msi_version.cf
-%%DOCSDIR%%/examples/package_rpm.cf
-%%DOCSDIR%%/examples/package_solaris.cf
-%%DOCSDIR%%/examples/package_windows_feature.cf
-%%DOCSDIR%%/examples/package_yum.cf
-%%DOCSDIR%%/examples/package_zypper.cf
-%%DOCSDIR%%/examples/packagesmatching.cf
-%%DOCSDIR%%/examples/parallel_exec.cf
-%%DOCSDIR%%/examples/parseintrealstringarray.cf
-%%DOCSDIR%%/examples/parsestringarray.cf
-%%DOCSDIR%%/examples/parsestringarrayidx.cf
-%%DOCSDIR%%/examples/pathtype.cf
-%%DOCSDIR%%/examples/pattern_and_edit.cf
-%%DOCSDIR%%/examples/peerleader.cf
-%%DOCSDIR%%/examples/peerleaders.cf
-%%DOCSDIR%%/examples/peers.cf
-%%DOCSDIR%%/examples/postfix.cf
-%%DOCSDIR%%/examples/process_kill.cf
-%%DOCSDIR%%/examples/process_matching.cf
-%%DOCSDIR%%/examples/process_matching2.cf
-%%DOCSDIR%%/examples/process_matching3.cf
-%%DOCSDIR%%/examples/process_restart.cf
-%%DOCSDIR%%/examples/process_restart_basic.cf
-%%DOCSDIR%%/examples/process_signalling.cf
-%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
-%%DOCSDIR%%/examples/product.cf
-%%DOCSDIR%%/examples/promise_knowledge.cf
-%%DOCSDIR%%/examples/promises.cf
-%%DOCSDIR%%/examples/quoting.cf
-%%DOCSDIR%%/examples/randomint.cf
-%%DOCSDIR%%/examples/readcsv.cf
-%%DOCSDIR%%/examples/readdata.cf
-%%DOCSDIR%%/examples/readfile.cf
-%%DOCSDIR%%/examples/readintarray.cf
-%%DOCSDIR%%/examples/readintrealstringlist.cf
-%%DOCSDIR%%/examples/readlist.cf
-%%DOCSDIR%%/examples/readrealarray.cf
-%%DOCSDIR%%/examples/readstringarray.cf
-%%DOCSDIR%%/examples/readtcp.cf
-%%DOCSDIR%%/examples/reg_multiline.cf
-%%DOCSDIR%%/examples/regarray.cf
-%%DOCSDIR%%/examples/regcmp.cf
-%%DOCSDIR%%/examples/regex_replace.cf
-%%DOCSDIR%%/examples/regex_win.cf
-%%DOCSDIR%%/examples/regextract.cf
-%%DOCSDIR%%/examples/registry.cf
-%%DOCSDIR%%/examples/registry_cache.cf
-%%DOCSDIR%%/examples/registryvalue.cf
-%%DOCSDIR%%/examples/regline.cf
-%%DOCSDIR%%/examples/reglist.cf
-%%DOCSDIR%%/examples/remake_outputs.pl
-%%DOCSDIR%%/examples/remoteclasses.cf
-%%DOCSDIR%%/examples/remoteclasses2.cf
-%%DOCSDIR%%/examples/remotescalar.cf
-%%DOCSDIR%%/examples/remove_deadlinks.cf
-%%DOCSDIR%%/examples/rename.cf
-%%DOCSDIR%%/examples/repairedcommand.cf
-%%DOCSDIR%%/examples/report_custom.cf
-%%DOCSDIR%%/examples/report_diffs.cf
-%%DOCSDIR%%/examples/report_state.cf
-%%DOCSDIR%%/examples/reporting.cf
-%%DOCSDIR%%/examples/reports.cf
-%%DOCSDIR%%/examples/reporttofile.cf
-%%DOCSDIR%%/examples/resolveconf.cf
-%%DOCSDIR%%/examples/returnszero.cf
-%%DOCSDIR%%/examples/reverse.cf
-%%DOCSDIR%%/examples/root_passwd.cf
-%%DOCSDIR%%/examples/select_class.cf
-%%DOCSDIR%%/examples/select_mode.cf
-%%DOCSDIR%%/examples/select_region.cf
-%%DOCSDIR%%/examples/select_size.cf
-%%DOCSDIR%%/examples/selectservers.cf
-%%DOCSDIR%%/examples/server_callback.cf
-%%DOCSDIR%%/examples/server_copy_localhost.cf
-%%DOCSDIR%%/examples/server_copy_purge.cf
-%%DOCSDIR%%/examples/server_copy_remote.cf
-%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
-%%DOCSDIR%%/examples/service_catalogue.cf
-%%DOCSDIR%%/examples/service_catalogue_separate.cf
-%%DOCSDIR%%/examples/service_disable.cf
-%%DOCSDIR%%/examples/service_start.cf
-%%DOCSDIR%%/examples/services.cf
-%%DOCSDIR%%/examples/services_concept.cf
-%%DOCSDIR%%/examples/services_default_service_bundle.cf
-%%DOCSDIR%%/examples/services_win.cf
-%%DOCSDIR%%/examples/setuidlog.cf
-%%DOCSDIR%%/examples/setvar.cf
-%%DOCSDIR%%/examples/shuffle.cf
-%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
-%%DOCSDIR%%/examples/software_dist.cf
-%%DOCSDIR%%/examples/software_update_version_yum.cf
-%%DOCSDIR%%/examples/some.cf
-%%DOCSDIR%%/examples/sort.cf
-%%DOCSDIR%%/examples/splitstring.cf
-%%DOCSDIR%%/examples/sql_table_structure.cf
-%%DOCSDIR%%/examples/storage.cf
-%%DOCSDIR%%/examples/strcmp.cf
-%%DOCSDIR%%/examples/strftime.cf
-%%DOCSDIR%%/examples/string_downcase.cf
-%%DOCSDIR%%/examples/string_head.cf
-%%DOCSDIR%%/examples/string_length.cf
-%%DOCSDIR%%/examples/string_mustache.cf
-%%DOCSDIR%%/examples/string_replace.cf
-%%DOCSDIR%%/examples/string_reverse.cf
-%%DOCSDIR%%/examples/string_split.cf
-%%DOCSDIR%%/examples/string_tail.cf
-%%DOCSDIR%%/examples/string_upcase.cf
-%%DOCSDIR%%/examples/stringarray.cf
-%%DOCSDIR%%/examples/sublist.cf
-%%DOCSDIR%%/examples/sum.cf
-%%DOCSDIR%%/examples/switchcase.cf
-%%DOCSDIR%%/examples/symlink.cf
-%%DOCSDIR%%/examples/symlink_children.cf
-%%DOCSDIR%%/examples/syslog.cf
-%%DOCSDIR%%/examples/syslog2.cf
-%%DOCSDIR%%/examples/template.cf
-%%DOCSDIR%%/examples/template2.cf
-%%DOCSDIR%%/examples/test_environment.cf
-%%DOCSDIR%%/examples/tidy_all_files.cf
-%%DOCSDIR%%/examples/translatepath.cf
-%%DOCSDIR%%/examples/unique.cf
-%%DOCSDIR%%/examples/unpack_method_calls.cf
-%%DOCSDIR%%/examples/update.cf
-%%DOCSDIR%%/examples/user_edit.cf
-%%DOCSDIR%%/examples/user_edit_method.cf
-%%DOCSDIR%%/examples/userexists.cf
-%%DOCSDIR%%/examples/users_type.cf
-%%DOCSDIR%%/examples/varclass.cf
-%%DOCSDIR%%/examples/varexpansion.cf
-%%DOCSDIR%%/examples/variablesmatching.cf
-%%DOCSDIR%%/examples/variablesmatching_as_data.cf
-%%DOCSDIR%%/examples/varnet.cf
-%%DOCSDIR%%/examples/vars.cf
-%%DOCSDIR%%/examples/warnifline.cf
-%%DOCSDIR%%/examples/webserver.cf
-%%DOCSDIR%%/examples/win_dns_client.cf
-%%DOCSDIR%%/examples/win_emergency.cf
-%%DOCSDIR%%/examples/win_registry.cf
-%%DOCSDIR%%/examples/win_schedule.cf
-%%DOCSDIR%%/examples/zenoss.cf
-%%DOCSDIR%%/examples/mustache_comments.cf
-%%DOCSDIR%%/examples/mustache_extension_compact_json.cf
-%%DOCSDIR%%/examples/mustache_extension_expand_key.cf
-%%DOCSDIR%%/examples/mustache_extension_multiline_json.cf
-%%DOCSDIR%%/examples/mustache_extension_top.cf
-%%DOCSDIR%%/examples/mustache_sections_empty_list.cf
-%%DOCSDIR%%/examples/mustache_sections_inverted.cf
-%%DOCSDIR%%/examples/mustache_sections_non_empty_list.cf
-%%DOCSDIR%%/examples/mustache_sections_non_false_value.cf
-%%DOCSDIR%%/examples/mustache_set_delimiters.cf
-%%DOCSDIR%%/examples/mustache_variables.cf
-%%DOCSDIR%%/examples/readenvfile.cf
-%%DOCSDIR%%/examples/with.cf
-@dir /var/cfengine/inputs
-@dir /var/cfengine/modules
-@dir /var/cfengine/outputs
-@dir /var/cfengine/plugins
-@dir(root,wheel,700) /var/cfengine/ppkeys
-@dir /var/cfengine
diff --git a/sysutils/cfengine314/Makefile b/sysutils/cfengine314/Makefile
index 8ee66230007a..2275cf228c0d 100644
--- a/sysutils/cfengine314/Makefile
+++ b/sysutils/cfengine314/Makefile
@@ -1,5 +1,4 @@
 # Created by: jrhett@netconsonance.com
-# $FreeBSD$
 
 PORTNAME=	cfengine
 PORTVERSION=	3.14.0
@@ -16,6 +15,9 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
+DEPRECATED=		Expire one year after cfengine 3.16.0 released
+EXPIRATION_DATE=	2021-06-22
+
 CONFLICTS=	cfengine3[0-9]-* cfengine31[013-9]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	314
@@ -29,11 +31,10 @@ USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf \
-		cpe gmake localbase libtool shebangfix ssl
+USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
-CFLAGS+=	-Wno-return-type
+CFLAGS+=	-Wno-return-type -fcommon
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
diff --git a/sysutils/cfengine314/files/cf-execd.in b/sysutils/cfengine314/files/cf-execd.in
index 1bffee793948..b40d3507649a 100644
--- a/sysutils/cfengine314/files/cf-execd.in
+++ b/sysutils/cfengine314/files/cf-execd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-execd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine314/files/cf-monitord.in b/sysutils/cfengine314/files/cf-monitord.in
index 50ff312db37e..dd21a0aaed6d 100644
--- a/sysutils/cfengine314/files/cf-monitord.in
+++ b/sysutils/cfengine314/files/cf-monitord.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-monitord
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine314/files/cf-serverd.in b/sysutils/cfengine314/files/cf-serverd.in
index b48c6c05dcba..938274887353 100644
--- a/sysutils/cfengine314/files/cf-serverd.in
+++ b/sysutils/cfengine314/files/cf-serverd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: cf-serverd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/cfengine314/files/patch-m4-strndup.m4 b/sysutils/cfengine314/files/patch-m4-strndup.m4
deleted file mode 100644
index 31e4b7e264de..000000000000
--- a/sysutils/cfengine314/files/patch-m4-strndup.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine314/files/patch-m4__strndup.m4 b/sysutils/cfengine314/files/patch-m4__strndup.m4
deleted file mode 100644
index cb6d41d2e7cf..000000000000
--- a/sysutils/cfengine314/files/patch-m4__strndup.m4
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: m4/strndup.m4
-===================================================================
---- /dev/null	2014-07-29 08:00:54.000000000 -0700
-+++ m4/strndup.m4	2014-07-29 08:01:42.499328796 -0700
-@@ -0,0 +1,51 @@
-+# strndup.m4 serial 21
-+dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([cf3_FUNC_STRNDUP],
-+[
-+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-+  AC_CHECK_DECLS([strndup])
-+  AC_REPLACE_FUNCS([strndup])
-+  if test $ac_cv_have_decl_strndup = no; then
-+    HAVE_DECL_STRNDUP=0
-+  fi
-+
-+  if test $ac_cv_func_strndup = yes; then
-+    HAVE_STRNDUP=1
-+    # AIX 5.3 has a function that tries to copy the entire range specified
-+    # by n, instead of just the length of src.
-+    AC_CACHE_CHECK([for working strndup], [cf3_cv_func_strndup_works],
-+      [AC_RUN_IFELSE([
-+         AC_LANG_PROGRAM([[#include <string.h>
-+                           #include <stdlib.h>]], [[
-+#if !HAVE_DECL_STRNDUP
-+  extern
-+  #ifdef __cplusplus
-+  "C"
-+  #endif
-+  char *strndup (const char *, size_t);
-+#endif
-+  char *s;
-+  // Will crash if strndup tries to traverse all 2GB.
-+  s = strndup ("string", 2000000000);
-+  return 0;]])],
-+         [cf3_cv_func_strndup_works=yes],
-+         [cf3_cv_func_strndup_works=no],
-+         [
-+changequote(,)dnl
-+          case $host_os in
-+            aix | aix[3-6]*) cf3_cv_func_strndup_works="guessing no";;
-+            *)               cf3_cv_func_strndup_works="guessing yes";;
-+          esac
-+changequote([,])dnl
-+         ])])
-+    case $cf3_cv_func_strndup_works in
-+      *no) AC_LIBOBJ([strndup]) ;;
-+    esac
-+  else
-+    HAVE_STRNDUP=0
-+  fi
-+])
diff --git a/sysutils/cfengine315/Makefile b/sysutils/cfengine315/Makefile
new file mode 100644
index 000000000000..d8adf084cb6a
--- /dev/null
+++ b/sysutils/cfengine315/Makefile
@@ -0,0 +1,73 @@
+# Created by: jrhett@netconsonance.com
+
+PORTNAME=	cfengine
+PORTVERSION=	3.15.2
+CATEGORIES=	sysutils
+MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	Systems administration tool for networks
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+DEPRECATED=		Expire one year after cfengine 3.17.0 released
+EXPIRATION_DATE=	2021-11-20
+
+CONFLICTS=	cfengine3[0-9]-* cfengine31[013-9]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	315
+CONFLICTS+=	cfengine-3.*
+.endif
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
+
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
+USE_GNOME=	libxml2
+SHEBANG_FILES=	examples/remake_outputs.pl
+CFLAGS+=	-Wno-return-type -fcommon
+# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
+DOCSDIR=	${PREFIX}/share/doc/cfengine
+MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html \
+		--libexecdir=${PREFIX}/libexec \
+		--libdir=${PREFIX}/libexec \
+		--mandir=${PREFIX}/man \
+		--with-workdir=/var/cfengine \
+		--with-pcre=${LOCALBASE} \
+		--with-lmdb=${LOCALBASE} \
+		--enable-fhs
+INSTALL_TARGET=	install-strip
+
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb \
+		libyaml.so:textproc/libyaml \
+		libcurl.so:ftp/curl
+
+OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+
+MYSQL_USES=		mysql
+MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
+MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+
+LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
+LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine315/distinfo b/sysutils/cfengine315/distinfo
new file mode 100644
index 000000000000..1372a61d5642
--- /dev/null
+++ b/sysutils/cfengine315/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1591211477
+SHA256 (cfengine-3.15.2.tar.gz) = d1c570b7a0f47794a92f66e21cccdc86b8f56a7028a389780e705db41bfd3cab
+SIZE (cfengine-3.15.2.tar.gz) = 3099121
diff --git a/sysutils/cfengine315/files/cf-execd.in b/sysutils/cfengine315/files/cf-execd.in
new file mode 100644
index 000000000000..b40d3507649a
--- /dev/null
+++ b/sysutils/cfengine315/files/cf-execd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-execd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
+#
+# cf_execd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-execd.
+# cf_execd_flags (str):          Custom additional arguments to be passed
+#                               to cf-execd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_execd"
+rcvar=cf_execd_enable
+
+command="%%PREFIX%%/bin/cf-execd"
+
+load_rc_config $name
+
+: ${cf_execd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine315/files/cf-monitord.in b/sysutils/cfengine315/files/cf-monitord.in
new file mode 100644
index 000000000000..dd21a0aaed6d
--- /dev/null
+++ b/sysutils/cfengine315/files/cf-monitord.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-monitord
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
+#
+# cf_monitord_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-monitord.
+# cf_monitord_flags (str):          Custom additional arguments to be passed
+#                               to cf-monitord (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_monitord"
+rcvar=cf_monitord_enable
+
+command="%%PREFIX%%/bin/cf-monitord"
+
+load_rc_config $name
+
+: ${cf_monitord_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine315/files/cf-serverd.in b/sysutils/cfengine315/files/cf-serverd.in
new file mode 100644
index 000000000000..938274887353
--- /dev/null
+++ b/sysutils/cfengine315/files/cf-serverd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-serverd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
+#
+# cf_serverd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-serverd.
+# cf_serverd_flags (str):          Custom additional arguments to be passed
+#                               to cf-serverd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_serverd"
+rcvar=cf_serverd_enable
+
+command="%%PREFIX%%/bin/cf-serverd"
+
+load_rc_config $name
+
+: ${cf_serverd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine315/files/patch-libntech_libutils_definitions.h b/sysutils/cfengine315/files/patch-libntech_libutils_definitions.h
new file mode 100644
index 000000000000..376d071fb42b
--- /dev/null
+++ b/sysutils/cfengine315/files/patch-libntech_libutils_definitions.h
@@ -0,0 +1,11 @@
+--- libntech/libutils/definitions.h.orig	2020-05-19 08:05:50.000000000 -0700
++++ libntech/libutils/definitions.h	2020-05-20 19:48:00.299686000 -0700
+@@ -58,7 +58,7 @@
+  *****************************************************************************/
+ #ifdef __FreeBSD__
+ #  define CF_SYSTEM_GROUP "wheel"
+-#elseif __Solaris__
++#elif __Solaris__
+ #  define CF_SYSTEM_GROUP "sys"
+ #else
+ #  define CF_SYSTEM_GROUP "root"
diff --git a/sysutils/cfengine312/pkg-descr b/sysutils/cfengine315/pkg-descr
index 47d900688ceb..47d900688ceb 100644
--- a/sysutils/cfengine312/pkg-descr
+++ b/sysutils/cfengine315/pkg-descr
diff --git a/sysutils/cfengine315/pkg-plist b/sysutils/cfengine315/pkg-plist
new file mode 100644
index 000000000000..333649ddb3d2
--- /dev/null
+++ b/sysutils/cfengine315/pkg-plist
@@ -0,0 +1,393 @@
+bin/cf-agent
+bin/cf-check
+bin/cf-execd
+bin/cf-key
+bin/cf-monitord
+bin/cf-net
+bin/cf-promises
+bin/cf-runagent
+bin/cf-serverd
+bin/cf-upgrade
+bin/rpmvercmp
+libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.3
+libexec/cfengine/libpromises.so.3.0.6
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/examples/abort.cf
+%%DOCSDIR%%/examples/accessed_before.cf
+%%DOCSDIR%%/examples/accessedbefore.cf
+%%DOCSDIR%%/examples/accumulated_time.cf
+%%DOCSDIR%%/examples/acl.cf
+%%DOCSDIR%%/examples/acl_generic.cf
+%%DOCSDIR%%/examples/acl_ntfs.cf
+%%DOCSDIR%%/examples/acl_secret.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/activedirectory_listusers.cf
+%%DOCSDIR%%/examples/activedirectory_showuser.cf
+%%DOCSDIR%%/examples/ago.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/appgroups.cf
+%%DOCSDIR%%/examples/arrays.cf
+%%DOCSDIR%%/examples/augment.cf
+%%DOCSDIR%%/examples/backreferences_files.cf
+%%DOCSDIR%%/examples/bsdflags.cf
+%%DOCSDIR%%/examples/bundle_return_values.cf
+%%DOCSDIR%%/examples/bundlesequence.cf
+%%DOCSDIR%%/examples/bundlesmatching.cf
+%%DOCSDIR%%/examples/bundlestate.cf
+%%DOCSDIR%%/examples/canonify.cf
+%%DOCSDIR%%/examples/cf2_integration.cf
+%%DOCSDIR%%/examples/change_detect.cf
+%%DOCSDIR%%/examples/changedbefore.cf
+%%DOCSDIR%%/examples/chdir.cf
+%%DOCSDIR%%/examples/class-automatic-canonificiation.cf
+%%DOCSDIR%%/examples/classes_global.cf
+%%DOCSDIR%%/examples/classesmatching.cf
+%%DOCSDIR%%/examples/classmatch.cf
+%%DOCSDIR%%/examples/classvar_convergence.cf
+%%DOCSDIR%%/examples/commands.cf
+%%DOCSDIR%%/examples/compare.cf
+%%DOCSDIR%%/examples/container_iteration.cf
+%%DOCSDIR%%/examples/container_key_iteration.cf
+%%DOCSDIR%%/examples/control_expand.cf
+%%DOCSDIR%%/examples/copy.cf
+%%DOCSDIR%%/examples/copy_classes.cf
+%%DOCSDIR%%/examples/copy_copbl.cf
+%%DOCSDIR%%/examples/copy_edit.cf
+%%DOCSDIR%%/examples/copydir_copbl.cf
+%%DOCSDIR%%/examples/copylinks.cf
+%%DOCSDIR%%/examples/countclassesmatching.cf
+%%DOCSDIR%%/examples/countlinesmatching.cf
+%%DOCSDIR%%/examples/create_filedir.cf
+%%DOCSDIR%%/examples/createdb.cf
+%%DOCSDIR%%/examples/customize_by_named_list.cf
+%%DOCSDIR%%/examples/data_expand.cf
+%%DOCSDIR%%/examples/data_readstringarray.cf
+%%DOCSDIR%%/examples/data_regextract.cf
+%%DOCSDIR%%/examples/datastate.cf
+%%DOCSDIR%%/examples/defaults.cf
+%%DOCSDIR%%/examples/defaults2.cf
+%%DOCSDIR%%/examples/defaults3.cf
+%%DOCSDIR%%/examples/definitions.cf
+%%DOCSDIR%%/examples/deletelines.cf
+%%DOCSDIR%%/examples/depends_on.cf
+%%DOCSDIR%%/examples/depends_on2.cf
+%%DOCSDIR%%/examples/difference.cf
+%%DOCSDIR%%/examples/dirname.cf
+%%DOCSDIR%%/examples/disable.cf
+%%DOCSDIR%%/examples/disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/diskfree.cf
+%%DOCSDIR%%/examples/dollar.cf
+%%DOCSDIR%%/examples/edit_column_files.cf
+%%DOCSDIR%%/examples/edit_comment_lines.cf
+%%DOCSDIR%%/examples/edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/edit_insert_lines.cf
+%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/edit_passwd_file.cf
+%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
+%%DOCSDIR%%/examples/edit_replace_string.cf
+%%DOCSDIR%%/examples/edit_sectioned_file.cf
+%%DOCSDIR%%/examples/edit_setvar.cf
+%%DOCSDIR%%/examples/edit_template.cf
+%%DOCSDIR%%/examples/edit_triggerclass.cf
+%%DOCSDIR%%/examples/edit_xml.cf
+%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
+%%DOCSDIR%%/examples/env.cf
+%%DOCSDIR%%/examples/epimenides.cf
+%%DOCSDIR%%/examples/escape.cf
+%%DOCSDIR%%/examples/eval.cf
+%%DOCSDIR%%/examples/every.cf
+%%DOCSDIR%%/examples/exec_args.cf
+%%DOCSDIR%%/examples/exec_in_sequence.cf
+%%DOCSDIR%%/examples/execd.cf
+%%DOCSDIR%%/examples/execresult.cf
+%%DOCSDIR%%/examples/expand.cf
+%%DOCSDIR%%/examples/failedcommand.cf
+%%DOCSDIR%%/examples/file_change_detection.cf
+%%DOCSDIR%%/examples/file_hash.cf
+%%DOCSDIR%%/examples/file_owner_list_template.cf
+%%DOCSDIR%%/examples/fileexists.cf
+%%DOCSDIR%%/examples/filenames.cf
+%%DOCSDIR%%/examples/fileperms.cf
+%%DOCSDIR%%/examples/filesexist.cf
+%%DOCSDIR%%/examples/filesexist2.cf
+%%DOCSDIR%%/examples/filesize.cf
+%%DOCSDIR%%/examples/filestat.cf
+%%DOCSDIR%%/examples/filter.cf
+%%DOCSDIR%%/examples/findfiles.cf
+%%DOCSDIR%%/examples/fix_names.cf
+%%DOCSDIR%%/examples/format.cf
+%%DOCSDIR%%/examples/getclassmetatags.cf
+%%DOCSDIR%%/examples/getenv.cf
+%%DOCSDIR%%/examples/getfields.cf
+%%DOCSDIR%%/examples/getgid.cf
+%%DOCSDIR%%/examples/getindices.cf
+%%DOCSDIR%%/examples/getindices_and_values.cf
+%%DOCSDIR%%/examples/getmacaddress.cf
+%%DOCSDIR%%/examples/getregistry.cf
+%%DOCSDIR%%/examples/getuid.cf
+%%DOCSDIR%%/examples/getuserinfo.cf
+%%DOCSDIR%%/examples/getusers.cf
+%%DOCSDIR%%/examples/getvalues.cf
+%%DOCSDIR%%/examples/getvariablemetatags.cf
+%%DOCSDIR%%/examples/global_list_expansion.cf
+%%DOCSDIR%%/examples/global_list_expansion_2.cf
+%%DOCSDIR%%/examples/grep.cf
+%%DOCSDIR%%/examples/groupexists.cf
+%%DOCSDIR%%/examples/guest_environment_kvm.cf
+%%DOCSDIR%%/examples/hash.cf
+%%DOCSDIR%%/examples/hash_to_int.cf
+%%DOCSDIR%%/examples/hashcomment.cf
+%%DOCSDIR%%/examples/hashmatch.cf
+%%DOCSDIR%%/examples/hashuncomment.cf
+%%DOCSDIR%%/examples/helloworld.cf
+%%DOCSDIR%%/examples/host2ip.cf
+%%DOCSDIR%%/examples/hostrange.cf
+%%DOCSDIR%%/examples/hostsseen.cf
+%%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/hub.cf
+%%DOCSDIR%%/examples/id.cf
+%%DOCSDIR%%/examples/inherit.cf
+%%DOCSDIR%%/examples/insert_users.cf
+%%DOCSDIR%%/examples/intarray.cf
+%%DOCSDIR%%/examples/intersection.cf
+%%DOCSDIR%%/examples/inventory_cpu.cf
+%%DOCSDIR%%/examples/ip2host.cf
+%%DOCSDIR%%/examples/iprange.cf
+%%DOCSDIR%%/examples/irange.cf
+%%DOCSDIR%%/examples/isdir.cf
+%%DOCSDIR%%/examples/isexecutable.cf
+%%DOCSDIR%%/examples/isgreaterthan.cf
+%%DOCSDIR%%/examples/isipinsubnet.cf
+%%DOCSDIR%%/examples/islessthan.cf
+%%DOCSDIR%%/examples/islink.cf
+%%DOCSDIR%%/examples/isnewerthan.cf
+%%DOCSDIR%%/examples/isplain.cf
+%%DOCSDIR%%/examples/isvariable.cf
+%%DOCSDIR%%/examples/iteration.cf
+%%DOCSDIR%%/examples/join.cf
+%%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
+%%DOCSDIR%%/examples/lastnode.cf
+%%DOCSDIR%%/examples/ldap.cf
+%%DOCSDIR%%/examples/length.cf
+%%DOCSDIR%%/examples/linking.cf
+%%DOCSDIR%%/examples/literal_server.cf
+%%DOCSDIR%%/examples/local_group_present.cf
+%%DOCSDIR%%/examples/local_user_password.cf
+%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
+%%DOCSDIR%%/examples/local_users_absent.cf
+%%DOCSDIR%%/examples/local_users_locked.cf
+%%DOCSDIR%%/examples/local_users_present.cf
+%%DOCSDIR%%/examples/locate_files_and_compress.cf
+%%DOCSDIR%%/examples/log_private.cf
+%%DOCSDIR%%/examples/loops.cf
+%%DOCSDIR%%/examples/lsdir.cf
+%%DOCSDIR%%/examples/main.cf
+%%DOCSDIR%%/examples/main_entry_point.cf
+%%DOCSDIR%%/examples/main_library.cf
+%%DOCSDIR%%/examples/maparray.cf
+%%DOCSDIR%%/examples/mapdata.cf
+%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
+%%DOCSDIR%%/examples/maplist.cf
+%%DOCSDIR%%/examples/max-min-mean-variance.cf
+%%DOCSDIR%%/examples/measure_log.cf
+%%DOCSDIR%%/examples/measurements.cf
+%%DOCSDIR%%/examples/menu.cf
+%%DOCSDIR%%/examples/mergedata.cf
+%%DOCSDIR%%/examples/meta.cf
+%%DOCSDIR%%/examples/method.cf
+%%DOCSDIR%%/examples/method_polymorph.cf
+%%DOCSDIR%%/examples/method_validate.cf
+%%DOCSDIR%%/examples/method_var.cf
+%%DOCSDIR%%/examples/method_var2.cf
+%%DOCSDIR%%/examples/missing_ok.cf
+%%DOCSDIR%%/examples/module_exec.cf
+%%DOCSDIR%%/examples/module_exec_2.cf
+%%DOCSDIR%%/examples/monitord.cf
+%%DOCSDIR%%/examples/mount_fs.cf
+%%DOCSDIR%%/examples/multipassvars.cf
+%%DOCSDIR%%/examples/multiple_outcomes.cf
+%%DOCSDIR%%/examples/mustache_classes.cf
+%%DOCSDIR%%/examples/mustache_template_motd.cf
+%%DOCSDIR%%/examples/namespace_class1.cf
+%%DOCSDIR%%/examples/namespace_classes.cf
+%%DOCSDIR%%/examples/namespace_var_meta.cf
+%%DOCSDIR%%/examples/namespace_var_meta2.cf
+%%DOCSDIR%%/examples/neighbourhood_watch.cf
+%%DOCSDIR%%/examples/none.cf
+%%DOCSDIR%%/examples/nth.cf
+%%DOCSDIR%%/examples/null_config.cf
+%%DOCSDIR%%/examples/orchestrate_chain1.cf
+%%DOCSDIR%%/examples/orchestrate_chain2.cf
+%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/orchestrate_dragon.cf
+%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
+%%DOCSDIR%%/examples/orchestration_hostlist.cf
+%%DOCSDIR%%/examples/ordering.cf
+%%DOCSDIR%%/examples/package_apt.cf
+%%DOCSDIR%%/examples/package_bundles.cf
+%%DOCSDIR%%/examples/package_freebsd.cf
+%%DOCSDIR%%/examples/package_latest.cf
+%%DOCSDIR%%/examples/package_msi_file.cf
+%%DOCSDIR%%/examples/package_msi_version.cf
+%%DOCSDIR%%/examples/package_rpm.cf
+%%DOCSDIR%%/examples/package_solaris.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
+%%DOCSDIR%%/examples/package_yum.cf
+%%DOCSDIR%%/examples/package_zypper.cf
+%%DOCSDIR%%/examples/packagesmatching.cf
+%%DOCSDIR%%/examples/parallel_exec.cf
+%%DOCSDIR%%/examples/parseintrealstringarray.cf
+%%DOCSDIR%%/examples/parsestringarray.cf
+%%DOCSDIR%%/examples/parsestringarrayidx.cf
+%%DOCSDIR%%/examples/pathtype.cf
+%%DOCSDIR%%/examples/pattern_and_edit.cf
+%%DOCSDIR%%/examples/peerleader.cf
+%%DOCSDIR%%/examples/peerleaders.cf
+%%DOCSDIR%%/examples/peers.cf
+%%DOCSDIR%%/examples/postfix.cf
+%%DOCSDIR%%/examples/process_kill.cf
+%%DOCSDIR%%/examples/process_matching.cf
+%%DOCSDIR%%/examples/process_matching2.cf
+%%DOCSDIR%%/examples/process_matching3.cf
+%%DOCSDIR%%/examples/process_restart.cf
+%%DOCSDIR%%/examples/process_restart_basic.cf
+%%DOCSDIR%%/examples/process_signalling.cf
+%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
+%%DOCSDIR%%/examples/product.cf
+%%DOCSDIR%%/examples/promises.cf
+%%DOCSDIR%%/examples/quoting.cf
+%%DOCSDIR%%/examples/randomint.cf
+%%DOCSDIR%%/examples/readcsv.cf
+%%DOCSDIR%%/examples/readdata.cf
+%%DOCSDIR%%/examples/readfile.cf
+%%DOCSDIR%%/examples/readintarray.cf
+%%DOCSDIR%%/examples/readintrealstringlist.cf
+%%DOCSDIR%%/examples/readlist.cf
+%%DOCSDIR%%/examples/readrealarray.cf
+%%DOCSDIR%%/examples/readstringarray.cf
+%%DOCSDIR%%/examples/readtcp.cf
+%%DOCSDIR%%/examples/reg_multiline.cf
+%%DOCSDIR%%/examples/regarray.cf
+%%DOCSDIR%%/examples/regcmp.cf
+%%DOCSDIR%%/examples/regex_replace.cf
+%%DOCSDIR%%/examples/regex_win.cf
+%%DOCSDIR%%/examples/regextract.cf
+%%DOCSDIR%%/examples/registry.cf
+%%DOCSDIR%%/examples/registry_cache.cf
+%%DOCSDIR%%/examples/registryvalue.cf
+%%DOCSDIR%%/examples/regline.cf
+%%DOCSDIR%%/examples/reglist.cf
+%%DOCSDIR%%/examples/remake_outputs.pl
+%%DOCSDIR%%/examples/remoteclasses.cf
+%%DOCSDIR%%/examples/remoteclasses2.cf
+%%DOCSDIR%%/examples/remotescalar.cf
+%%DOCSDIR%%/examples/remove_deadlinks.cf
+%%DOCSDIR%%/examples/rename.cf
+%%DOCSDIR%%/examples/repairedcommand.cf
+%%DOCSDIR%%/examples/report_custom.cf
+%%DOCSDIR%%/examples/report_state.cf
+%%DOCSDIR%%/examples/reports.cf
+%%DOCSDIR%%/examples/reporttofile.cf
+%%DOCSDIR%%/examples/resolveconf.cf
+%%DOCSDIR%%/examples/returnszero.cf
+%%DOCSDIR%%/examples/reverse.cf
+%%DOCSDIR%%/examples/root_passwd.cf
+%%DOCSDIR%%/examples/select_class.cf
+%%DOCSDIR%%/examples/select_mode.cf
+%%DOCSDIR%%/examples/select_region.cf
+%%DOCSDIR%%/examples/select_size.cf
+%%DOCSDIR%%/examples/selectservers.cf
+%%DOCSDIR%%/examples/server_callback.cf
+%%DOCSDIR%%/examples/server_copy_localhost.cf
+%%DOCSDIR%%/examples/server_copy_purge.cf
+%%DOCSDIR%%/examples/server_copy_remote.cf
+%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/service_disable.cf
+%%DOCSDIR%%/examples/service_start.cf
+%%DOCSDIR%%/examples/services.cf
+%%DOCSDIR%%/examples/services_concept.cf
+%%DOCSDIR%%/examples/services_default_service_bundle.cf
+%%DOCSDIR%%/examples/services_win.cf
+%%DOCSDIR%%/examples/setuidlog.cf
+%%DOCSDIR%%/examples/setvar.cf
+%%DOCSDIR%%/examples/shuffle.cf
+%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
+%%DOCSDIR%%/examples/software_dist.cf
+%%DOCSDIR%%/examples/software_update_version_yum.cf
+%%DOCSDIR%%/examples/some.cf
+%%DOCSDIR%%/examples/sort.cf
+%%DOCSDIR%%/examples/splitstring.cf
+%%DOCSDIR%%/examples/sql_table_structure.cf
+%%DOCSDIR%%/examples/storage.cf
+%%DOCSDIR%%/examples/strcmp.cf
+%%DOCSDIR%%/examples/strftime.cf
+%%DOCSDIR%%/examples/string_downcase.cf
+%%DOCSDIR%%/examples/string_head.cf
+%%DOCSDIR%%/examples/string_length.cf
+%%DOCSDIR%%/examples/string_mustache.cf
+%%DOCSDIR%%/examples/string_replace.cf
+%%DOCSDIR%%/examples/string_reverse.cf
+%%DOCSDIR%%/examples/string_split.cf
+%%DOCSDIR%%/examples/string_tail.cf
+%%DOCSDIR%%/examples/string_upcase.cf
+%%DOCSDIR%%/examples/stringarray.cf
+%%DOCSDIR%%/examples/sublist.cf
+%%DOCSDIR%%/examples/sum.cf
+%%DOCSDIR%%/examples/switchcase.cf
+%%DOCSDIR%%/examples/symlink.cf
+%%DOCSDIR%%/examples/symlink_children.cf
+%%DOCSDIR%%/examples/syslog.cf
+%%DOCSDIR%%/examples/syslog2.cf
+%%DOCSDIR%%/examples/template.cf
+%%DOCSDIR%%/examples/template2.cf
+%%DOCSDIR%%/examples/test_environment.cf
+%%DOCSDIR%%/examples/tidy_all_files.cf
+%%DOCSDIR%%/examples/translatepath.cf
+%%DOCSDIR%%/examples/unique.cf
+%%DOCSDIR%%/examples/unpack_method_calls.cf
+%%DOCSDIR%%/examples/update.cf
+%%DOCSDIR%%/examples/user_edit.cf
+%%DOCSDIR%%/examples/user_edit_method.cf
+%%DOCSDIR%%/examples/userexists.cf
+%%DOCSDIR%%/examples/users_type.cf
+%%DOCSDIR%%/examples/varclass.cf
+%%DOCSDIR%%/examples/varexpansion.cf
+%%DOCSDIR%%/examples/variablesmatching.cf
+%%DOCSDIR%%/examples/variablesmatching_as_data.cf
+%%DOCSDIR%%/examples/varnet.cf
+%%DOCSDIR%%/examples/vars.cf
+%%DOCSDIR%%/examples/warnifline.cf
+%%DOCSDIR%%/examples/webserver.cf
+%%DOCSDIR%%/examples/win_dns_client.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/zenoss.cf
+%%DOCSDIR%%/examples/mustache_comments.cf
+%%DOCSDIR%%/examples/mustache_extension_compact_json.cf
+%%DOCSDIR%%/examples/mustache_extension_expand_key.cf
+%%DOCSDIR%%/examples/mustache_extension_multiline_json.cf
+%%DOCSDIR%%/examples/mustache_extension_top.cf
+%%DOCSDIR%%/examples/mustache_sections_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_inverted.cf
+%%DOCSDIR%%/examples/mustache_sections_non_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_non_false_value.cf
+%%DOCSDIR%%/examples/mustache_set_delimiters.cf
+%%DOCSDIR%%/examples/mustache_variables.cf
+%%DOCSDIR%%/examples/readenvfile.cf
+%%DOCSDIR%%/examples/with.cf
+@dir /var/cfengine/inputs
+@dir /var/cfengine/modules
+@dir /var/cfengine/outputs
+@dir /var/cfengine/plugins
+@dir /var/cfengine/state
+@dir(root,wheel,700) /var/cfengine/ppkeys
+@dir /var/cfengine
diff --git a/sysutils/cfengine316/Makefile b/sysutils/cfengine316/Makefile
new file mode 100644
index 000000000000..914dc6bddb24
--- /dev/null
+++ b/sysutils/cfengine316/Makefile
@@ -0,0 +1,70 @@
+# Created by: jrhett@netconsonance.com
+
+PORTNAME=	cfengine
+PORTVERSION=	3.16.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	Systems administration tool for networks
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+CONFLICTS=	cfengine3[0-9]-* cfengine31[0-57-9]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	316
+CONFLICTS+=	cfengine-3.*
+.endif
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
+
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
+USE_GNOME=	libxml2
+SHEBANG_FILES=	examples/remake_outputs.pl
+CFLAGS+=	-Wno-return-type -fcommon
+# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
+DOCSDIR=	${PREFIX}/share/doc/cfengine
+MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html \
+		--libexecdir=${PREFIX}/libexec \
+		--libdir=${PREFIX}/libexec \
+		--mandir=${PREFIX}/man \
+		--with-workdir=/var/cfengine \
+		--with-pcre=${LOCALBASE} \
+		--with-lmdb=${LOCALBASE} \
+		--enable-fhs
+INSTALL_TARGET=	install-strip
+
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb \
+		libyaml.so:textproc/libyaml \
+		libcurl.so:ftp/curl
+
+OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+
+MYSQL_USES=		mysql
+MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
+MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+
+LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
+LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine316/distinfo b/sysutils/cfengine316/distinfo
new file mode 100644
index 000000000000..957c596dc167
--- /dev/null
+++ b/sysutils/cfengine316/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1605330935
+SHA256 (cfengine-3.16.0.tar.gz) = f4256e6e1ca04776a9fd48f1388a30edfa8d11fdcf870ba62ce5b0ad62a87372
+SIZE (cfengine-3.16.0.tar.gz) = 3137694
diff --git a/sysutils/cfengine316/files/cf-execd.in b/sysutils/cfengine316/files/cf-execd.in
new file mode 100644
index 000000000000..b40d3507649a
--- /dev/null
+++ b/sysutils/cfengine316/files/cf-execd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-execd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
+#
+# cf_execd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-execd.
+# cf_execd_flags (str):          Custom additional arguments to be passed
+#                               to cf-execd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_execd"
+rcvar=cf_execd_enable
+
+command="%%PREFIX%%/bin/cf-execd"
+
+load_rc_config $name
+
+: ${cf_execd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine316/files/cf-monitord.in b/sysutils/cfengine316/files/cf-monitord.in
new file mode 100644
index 000000000000..dd21a0aaed6d
--- /dev/null
+++ b/sysutils/cfengine316/files/cf-monitord.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-monitord
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
+#
+# cf_monitord_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-monitord.
+# cf_monitord_flags (str):          Custom additional arguments to be passed
+#                               to cf-monitord (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_monitord"
+rcvar=cf_monitord_enable
+
+command="%%PREFIX%%/bin/cf-monitord"
+
+load_rc_config $name
+
+: ${cf_monitord_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine316/files/cf-serverd.in b/sysutils/cfengine316/files/cf-serverd.in
new file mode 100644
index 000000000000..938274887353
--- /dev/null
+++ b/sysutils/cfengine316/files/cf-serverd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-serverd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
+#
+# cf_serverd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-serverd.
+# cf_serverd_flags (str):          Custom additional arguments to be passed
+#                               to cf-serverd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_serverd"
+rcvar=cf_serverd_enable
+
+command="%%PREFIX%%/bin/cf-serverd"
+
+load_rc_config $name
+
+: ${cf_serverd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine313/pkg-descr b/sysutils/cfengine316/pkg-descr
index 47d900688ceb..47d900688ceb 100644
--- a/sysutils/cfengine313/pkg-descr
+++ b/sysutils/cfengine316/pkg-descr
diff --git a/sysutils/cfengine316/pkg-plist b/sysutils/cfengine316/pkg-plist
new file mode 100644
index 000000000000..6d6f1b48e407
--- /dev/null
+++ b/sysutils/cfengine316/pkg-plist
@@ -0,0 +1,394 @@
+bin/cf-agent
+bin/cf-check
+bin/cf-execd
+bin/cf-key
+bin/cf-monitord
+bin/cf-net
+bin/cf-promises
+bin/cf-runagent
+bin/cf-secret
+bin/cf-serverd
+bin/cf-upgrade
+bin/rpmvercmp
+libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.3
+libexec/cfengine/libpromises.so.3.0.6
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/examples/abort.cf
+%%DOCSDIR%%/examples/accessed_before.cf
+%%DOCSDIR%%/examples/accessedbefore.cf
+%%DOCSDIR%%/examples/accumulated_time.cf
+%%DOCSDIR%%/examples/acl.cf
+%%DOCSDIR%%/examples/acl_generic.cf
+%%DOCSDIR%%/examples/acl_ntfs.cf
+%%DOCSDIR%%/examples/acl_secret.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/activedirectory_listusers.cf
+%%DOCSDIR%%/examples/activedirectory_showuser.cf
+%%DOCSDIR%%/examples/ago.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/appgroups.cf
+%%DOCSDIR%%/examples/arrays.cf
+%%DOCSDIR%%/examples/augment.cf
+%%DOCSDIR%%/examples/backreferences_files.cf
+%%DOCSDIR%%/examples/bsdflags.cf
+%%DOCSDIR%%/examples/bundle_return_values.cf
+%%DOCSDIR%%/examples/bundlesequence.cf
+%%DOCSDIR%%/examples/bundlesmatching.cf
+%%DOCSDIR%%/examples/bundlestate.cf
+%%DOCSDIR%%/examples/canonify.cf
+%%DOCSDIR%%/examples/cf2_integration.cf
+%%DOCSDIR%%/examples/change_detect.cf
+%%DOCSDIR%%/examples/changedbefore.cf
+%%DOCSDIR%%/examples/chdir.cf
+%%DOCSDIR%%/examples/class-automatic-canonificiation.cf
+%%DOCSDIR%%/examples/classes_global.cf
+%%DOCSDIR%%/examples/classesmatching.cf
+%%DOCSDIR%%/examples/classmatch.cf
+%%DOCSDIR%%/examples/classvar_convergence.cf
+%%DOCSDIR%%/examples/commands.cf
+%%DOCSDIR%%/examples/compare.cf
+%%DOCSDIR%%/examples/container_iteration.cf
+%%DOCSDIR%%/examples/container_key_iteration.cf
+%%DOCSDIR%%/examples/control_expand.cf
+%%DOCSDIR%%/examples/copy.cf
+%%DOCSDIR%%/examples/copy_classes.cf
+%%DOCSDIR%%/examples/copy_copbl.cf
+%%DOCSDIR%%/examples/copy_edit.cf
+%%DOCSDIR%%/examples/copydir_copbl.cf
+%%DOCSDIR%%/examples/copylinks.cf
+%%DOCSDIR%%/examples/countclassesmatching.cf
+%%DOCSDIR%%/examples/countlinesmatching.cf
+%%DOCSDIR%%/examples/create_filedir.cf
+%%DOCSDIR%%/examples/createdb.cf
+%%DOCSDIR%%/examples/customize_by_named_list.cf
+%%DOCSDIR%%/examples/data_expand.cf
+%%DOCSDIR%%/examples/data_readstringarray.cf
+%%DOCSDIR%%/examples/data_regextract.cf
+%%DOCSDIR%%/examples/datastate.cf
+%%DOCSDIR%%/examples/defaults.cf
+%%DOCSDIR%%/examples/defaults2.cf
+%%DOCSDIR%%/examples/defaults3.cf
+%%DOCSDIR%%/examples/definitions.cf
+%%DOCSDIR%%/examples/deletelines.cf
+%%DOCSDIR%%/examples/depends_on.cf
+%%DOCSDIR%%/examples/depends_on2.cf
+%%DOCSDIR%%/examples/difference.cf
+%%DOCSDIR%%/examples/dirname.cf
+%%DOCSDIR%%/examples/disable.cf
+%%DOCSDIR%%/examples/disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/diskfree.cf
+%%DOCSDIR%%/examples/dollar.cf
+%%DOCSDIR%%/examples/edit_column_files.cf
+%%DOCSDIR%%/examples/edit_comment_lines.cf
+%%DOCSDIR%%/examples/edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/edit_insert_lines.cf
+%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/edit_passwd_file.cf
+%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
+%%DOCSDIR%%/examples/edit_replace_string.cf
+%%DOCSDIR%%/examples/edit_sectioned_file.cf
+%%DOCSDIR%%/examples/edit_setvar.cf
+%%DOCSDIR%%/examples/edit_template.cf
+%%DOCSDIR%%/examples/edit_triggerclass.cf
+%%DOCSDIR%%/examples/edit_xml.cf
+%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
+%%DOCSDIR%%/examples/env.cf
+%%DOCSDIR%%/examples/epimenides.cf
+%%DOCSDIR%%/examples/escape.cf
+%%DOCSDIR%%/examples/eval.cf
+%%DOCSDIR%%/examples/every.cf
+%%DOCSDIR%%/examples/exec_args.cf
+%%DOCSDIR%%/examples/exec_in_sequence.cf
+%%DOCSDIR%%/examples/execd.cf
+%%DOCSDIR%%/examples/execresult.cf
+%%DOCSDIR%%/examples/expand.cf
+%%DOCSDIR%%/examples/failedcommand.cf
+%%DOCSDIR%%/examples/file_change_detection.cf
+%%DOCSDIR%%/examples/file_hash.cf
+%%DOCSDIR%%/examples/file_owner_list_template.cf
+%%DOCSDIR%%/examples/fileexists.cf
+%%DOCSDIR%%/examples/filenames.cf
+%%DOCSDIR%%/examples/fileperms.cf
+%%DOCSDIR%%/examples/filesexist.cf
+%%DOCSDIR%%/examples/filesexist2.cf
+%%DOCSDIR%%/examples/filesize.cf
+%%DOCSDIR%%/examples/filestat.cf
+%%DOCSDIR%%/examples/filter.cf
+%%DOCSDIR%%/examples/findfiles.cf
+%%DOCSDIR%%/examples/fix_names.cf
+%%DOCSDIR%%/examples/format.cf
+%%DOCSDIR%%/examples/getclassmetatags.cf
+%%DOCSDIR%%/examples/getenv.cf
+%%DOCSDIR%%/examples/getfields.cf
+%%DOCSDIR%%/examples/getgid.cf
+%%DOCSDIR%%/examples/getindices.cf
+%%DOCSDIR%%/examples/getindices_and_values.cf
+%%DOCSDIR%%/examples/getmacaddress.cf
+%%DOCSDIR%%/examples/getregistry.cf
+%%DOCSDIR%%/examples/getuid.cf
+%%DOCSDIR%%/examples/getuserinfo.cf
+%%DOCSDIR%%/examples/getusers.cf
+%%DOCSDIR%%/examples/getvalues.cf
+%%DOCSDIR%%/examples/getvariablemetatags.cf
+%%DOCSDIR%%/examples/global_list_expansion.cf
+%%DOCSDIR%%/examples/global_list_expansion_2.cf
+%%DOCSDIR%%/examples/grep.cf
+%%DOCSDIR%%/examples/groupexists.cf
+%%DOCSDIR%%/examples/guest_environment_kvm.cf
+%%DOCSDIR%%/examples/hash.cf
+%%DOCSDIR%%/examples/hash_to_int.cf
+%%DOCSDIR%%/examples/hashcomment.cf
+%%DOCSDIR%%/examples/hashmatch.cf
+%%DOCSDIR%%/examples/hashuncomment.cf
+%%DOCSDIR%%/examples/helloworld.cf
+%%DOCSDIR%%/examples/host2ip.cf
+%%DOCSDIR%%/examples/hostrange.cf
+%%DOCSDIR%%/examples/hostsseen.cf
+%%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/hub.cf
+%%DOCSDIR%%/examples/id.cf
+%%DOCSDIR%%/examples/inherit.cf
+%%DOCSDIR%%/examples/insert_users.cf
+%%DOCSDIR%%/examples/intarray.cf
+%%DOCSDIR%%/examples/intersection.cf
+%%DOCSDIR%%/examples/inventory_cpu.cf
+%%DOCSDIR%%/examples/ip2host.cf
+%%DOCSDIR%%/examples/iprange.cf
+%%DOCSDIR%%/examples/irange.cf
+%%DOCSDIR%%/examples/isdir.cf
+%%DOCSDIR%%/examples/isexecutable.cf
+%%DOCSDIR%%/examples/isgreaterthan.cf
+%%DOCSDIR%%/examples/isipinsubnet.cf
+%%DOCSDIR%%/examples/islessthan.cf
+%%DOCSDIR%%/examples/islink.cf
+%%DOCSDIR%%/examples/isnewerthan.cf
+%%DOCSDIR%%/examples/isplain.cf
+%%DOCSDIR%%/examples/isvariable.cf
+%%DOCSDIR%%/examples/iteration.cf
+%%DOCSDIR%%/examples/join.cf
+%%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
+%%DOCSDIR%%/examples/lastnode.cf
+%%DOCSDIR%%/examples/ldap.cf
+%%DOCSDIR%%/examples/length.cf
+%%DOCSDIR%%/examples/linking.cf
+%%DOCSDIR%%/examples/literal_server.cf
+%%DOCSDIR%%/examples/local_group_present.cf
+%%DOCSDIR%%/examples/local_user_password.cf
+%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
+%%DOCSDIR%%/examples/local_users_absent.cf
+%%DOCSDIR%%/examples/local_users_locked.cf
+%%DOCSDIR%%/examples/local_users_present.cf
+%%DOCSDIR%%/examples/locate_files_and_compress.cf
+%%DOCSDIR%%/examples/log_private.cf
+%%DOCSDIR%%/examples/loops.cf
+%%DOCSDIR%%/examples/lsdir.cf
+%%DOCSDIR%%/examples/main.cf
+%%DOCSDIR%%/examples/main_entry_point.cf
+%%DOCSDIR%%/examples/main_library.cf
+%%DOCSDIR%%/examples/maparray.cf
+%%DOCSDIR%%/examples/mapdata.cf
+%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
+%%DOCSDIR%%/examples/maplist.cf
+%%DOCSDIR%%/examples/max-min-mean-variance.cf
+%%DOCSDIR%%/examples/measure_log.cf
+%%DOCSDIR%%/examples/measurements.cf
+%%DOCSDIR%%/examples/menu.cf
+%%DOCSDIR%%/examples/mergedata.cf
+%%DOCSDIR%%/examples/meta.cf
+%%DOCSDIR%%/examples/method.cf
+%%DOCSDIR%%/examples/method_polymorph.cf
+%%DOCSDIR%%/examples/method_validate.cf
+%%DOCSDIR%%/examples/method_var.cf
+%%DOCSDIR%%/examples/method_var2.cf
+%%DOCSDIR%%/examples/missing_ok.cf
+%%DOCSDIR%%/examples/module_exec.cf
+%%DOCSDIR%%/examples/module_exec_2.cf
+%%DOCSDIR%%/examples/monitord.cf
+%%DOCSDIR%%/examples/mount_fs.cf
+%%DOCSDIR%%/examples/multipassvars.cf
+%%DOCSDIR%%/examples/multiple_outcomes.cf
+%%DOCSDIR%%/examples/mustache_classes.cf
+%%DOCSDIR%%/examples/mustache_template_motd.cf
+%%DOCSDIR%%/examples/namespace_class1.cf
+%%DOCSDIR%%/examples/namespace_classes.cf
+%%DOCSDIR%%/examples/namespace_var_meta.cf
+%%DOCSDIR%%/examples/namespace_var_meta2.cf
+%%DOCSDIR%%/examples/neighbourhood_watch.cf
+%%DOCSDIR%%/examples/none.cf
+%%DOCSDIR%%/examples/nth.cf
+%%DOCSDIR%%/examples/null_config.cf
+%%DOCSDIR%%/examples/orchestrate_chain1.cf
+%%DOCSDIR%%/examples/orchestrate_chain2.cf
+%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/orchestrate_dragon.cf
+%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
+%%DOCSDIR%%/examples/orchestration_hostlist.cf
+%%DOCSDIR%%/examples/ordering.cf
+%%DOCSDIR%%/examples/package_apt.cf
+%%DOCSDIR%%/examples/package_bundles.cf
+%%DOCSDIR%%/examples/package_freebsd.cf
+%%DOCSDIR%%/examples/package_latest.cf
+%%DOCSDIR%%/examples/package_msi_file.cf
+%%DOCSDIR%%/examples/package_msi_version.cf
+%%DOCSDIR%%/examples/package_rpm.cf
+%%DOCSDIR%%/examples/package_solaris.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
+%%DOCSDIR%%/examples/package_yum.cf
+%%DOCSDIR%%/examples/package_zypper.cf
+%%DOCSDIR%%/examples/packagesmatching.cf
+%%DOCSDIR%%/examples/parallel_exec.cf
+%%DOCSDIR%%/examples/parseintrealstringarray.cf
+%%DOCSDIR%%/examples/parsestringarray.cf
+%%DOCSDIR%%/examples/parsestringarrayidx.cf
+%%DOCSDIR%%/examples/pathtype.cf
+%%DOCSDIR%%/examples/pattern_and_edit.cf
+%%DOCSDIR%%/examples/peerleader.cf
+%%DOCSDIR%%/examples/peerleaders.cf
+%%DOCSDIR%%/examples/peers.cf
+%%DOCSDIR%%/examples/postfix.cf
+%%DOCSDIR%%/examples/process_kill.cf
+%%DOCSDIR%%/examples/process_matching.cf
+%%DOCSDIR%%/examples/process_matching2.cf
+%%DOCSDIR%%/examples/process_matching3.cf
+%%DOCSDIR%%/examples/process_restart.cf
+%%DOCSDIR%%/examples/process_restart_basic.cf
+%%DOCSDIR%%/examples/process_signalling.cf
+%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
+%%DOCSDIR%%/examples/product.cf
+%%DOCSDIR%%/examples/promises.cf
+%%DOCSDIR%%/examples/quoting.cf
+%%DOCSDIR%%/examples/randomint.cf
+%%DOCSDIR%%/examples/readcsv.cf
+%%DOCSDIR%%/examples/readdata.cf
+%%DOCSDIR%%/examples/readfile.cf
+%%DOCSDIR%%/examples/readintarray.cf
+%%DOCSDIR%%/examples/readintrealstringlist.cf
+%%DOCSDIR%%/examples/readlist.cf
+%%DOCSDIR%%/examples/readrealarray.cf
+%%DOCSDIR%%/examples/readstringarray.cf
+%%DOCSDIR%%/examples/readtcp.cf
+%%DOCSDIR%%/examples/reg_multiline.cf
+%%DOCSDIR%%/examples/regarray.cf
+%%DOCSDIR%%/examples/regcmp.cf
+%%DOCSDIR%%/examples/regex_replace.cf
+%%DOCSDIR%%/examples/regex_win.cf
+%%DOCSDIR%%/examples/regextract.cf
+%%DOCSDIR%%/examples/registry.cf
+%%DOCSDIR%%/examples/registry_cache.cf
+%%DOCSDIR%%/examples/registryvalue.cf
+%%DOCSDIR%%/examples/regline.cf
+%%DOCSDIR%%/examples/reglist.cf
+%%DOCSDIR%%/examples/remake_outputs.pl
+%%DOCSDIR%%/examples/remoteclasses.cf
+%%DOCSDIR%%/examples/remoteclasses2.cf
+%%DOCSDIR%%/examples/remotescalar.cf
+%%DOCSDIR%%/examples/remove_deadlinks.cf
+%%DOCSDIR%%/examples/rename.cf
+%%DOCSDIR%%/examples/repairedcommand.cf
+%%DOCSDIR%%/examples/report_custom.cf
+%%DOCSDIR%%/examples/report_state.cf
+%%DOCSDIR%%/examples/reports.cf
+%%DOCSDIR%%/examples/reporttofile.cf
+%%DOCSDIR%%/examples/resolveconf.cf
+%%DOCSDIR%%/examples/returnszero.cf
+%%DOCSDIR%%/examples/reverse.cf
+%%DOCSDIR%%/examples/root_passwd.cf
+%%DOCSDIR%%/examples/select_class.cf
+%%DOCSDIR%%/examples/select_mode.cf
+%%DOCSDIR%%/examples/select_region.cf
+%%DOCSDIR%%/examples/select_size.cf
+%%DOCSDIR%%/examples/selectservers.cf
+%%DOCSDIR%%/examples/server_callback.cf
+%%DOCSDIR%%/examples/server_copy_localhost.cf
+%%DOCSDIR%%/examples/server_copy_purge.cf
+%%DOCSDIR%%/examples/server_copy_remote.cf
+%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/service_disable.cf
+%%DOCSDIR%%/examples/service_start.cf
+%%DOCSDIR%%/examples/services.cf
+%%DOCSDIR%%/examples/services_concept.cf
+%%DOCSDIR%%/examples/services_default_service_bundle.cf
+%%DOCSDIR%%/examples/services_win.cf
+%%DOCSDIR%%/examples/setuidlog.cf
+%%DOCSDIR%%/examples/setvar.cf
+%%DOCSDIR%%/examples/shuffle.cf
+%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
+%%DOCSDIR%%/examples/software_dist.cf
+%%DOCSDIR%%/examples/software_update_version_yum.cf
+%%DOCSDIR%%/examples/some.cf
+%%DOCSDIR%%/examples/sort.cf
+%%DOCSDIR%%/examples/splitstring.cf
+%%DOCSDIR%%/examples/sql_table_structure.cf
+%%DOCSDIR%%/examples/storage.cf
+%%DOCSDIR%%/examples/strcmp.cf
+%%DOCSDIR%%/examples/strftime.cf
+%%DOCSDIR%%/examples/string_downcase.cf
+%%DOCSDIR%%/examples/string_head.cf
+%%DOCSDIR%%/examples/string_length.cf
+%%DOCSDIR%%/examples/string_mustache.cf
+%%DOCSDIR%%/examples/string_replace.cf
+%%DOCSDIR%%/examples/string_reverse.cf
+%%DOCSDIR%%/examples/string_split.cf
+%%DOCSDIR%%/examples/string_tail.cf
+%%DOCSDIR%%/examples/string_upcase.cf
+%%DOCSDIR%%/examples/stringarray.cf
+%%DOCSDIR%%/examples/sublist.cf
+%%DOCSDIR%%/examples/sum.cf
+%%DOCSDIR%%/examples/switchcase.cf
+%%DOCSDIR%%/examples/symlink.cf
+%%DOCSDIR%%/examples/symlink_children.cf
+%%DOCSDIR%%/examples/syslog.cf
+%%DOCSDIR%%/examples/syslog2.cf
+%%DOCSDIR%%/examples/template.cf
+%%DOCSDIR%%/examples/template2.cf
+%%DOCSDIR%%/examples/test_environment.cf
+%%DOCSDIR%%/examples/tidy_all_files.cf
+%%DOCSDIR%%/examples/translatepath.cf
+%%DOCSDIR%%/examples/unique.cf
+%%DOCSDIR%%/examples/unpack_method_calls.cf
+%%DOCSDIR%%/examples/update.cf
+%%DOCSDIR%%/examples/user_edit.cf
+%%DOCSDIR%%/examples/user_edit_method.cf
+%%DOCSDIR%%/examples/userexists.cf
+%%DOCSDIR%%/examples/users_type.cf
+%%DOCSDIR%%/examples/varclass.cf
+%%DOCSDIR%%/examples/varexpansion.cf
+%%DOCSDIR%%/examples/variablesmatching.cf
+%%DOCSDIR%%/examples/variablesmatching_as_data.cf
+%%DOCSDIR%%/examples/varnet.cf
+%%DOCSDIR%%/examples/vars.cf
+%%DOCSDIR%%/examples/warnifline.cf
+%%DOCSDIR%%/examples/webserver.cf
+%%DOCSDIR%%/examples/win_dns_client.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/zenoss.cf
+%%DOCSDIR%%/examples/mustache_comments.cf
+%%DOCSDIR%%/examples/mustache_extension_compact_json.cf
+%%DOCSDIR%%/examples/mustache_extension_expand_key.cf
+%%DOCSDIR%%/examples/mustache_extension_multiline_json.cf
+%%DOCSDIR%%/examples/mustache_extension_top.cf
+%%DOCSDIR%%/examples/mustache_sections_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_inverted.cf
+%%DOCSDIR%%/examples/mustache_sections_non_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_non_false_value.cf
+%%DOCSDIR%%/examples/mustache_set_delimiters.cf
+%%DOCSDIR%%/examples/mustache_variables.cf
+%%DOCSDIR%%/examples/readenvfile.cf
+%%DOCSDIR%%/examples/with.cf
+@dir /var/cfengine/inputs
+@dir /var/cfengine/modules
+@dir /var/cfengine/outputs
+@dir /var/cfengine/plugins
+@dir /var/cfengine/state
+@dir(root,wheel,700) /var/cfengine/ppkeys
+@dir /var/cfengine
diff --git a/sysutils/cfengine317/Makefile b/sysutils/cfengine317/Makefile
new file mode 100644
index 000000000000..6d55c47ee83e
--- /dev/null
+++ b/sysutils/cfengine317/Makefile
@@ -0,0 +1,70 @@
+# Created by: jrhett@netconsonance.com
+
+PORTNAME=	cfengine
+PORTVERSION=	3.17.0
+CATEGORIES=	sysutils
+MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+#		skreuzer@FreeBSD.org is also committer for this port
+COMMENT=	Systems administration tool for networks
+
+LICENSE=	GPLv3
+
+CPE_VENDOR=	gnu
+
+CONFLICTS=	cfengine3[0-9]-* cfengine31[0-689]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	317
+CONFLICTS+=	cfengine-3.*
+.endif
+
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
+
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
+USE_GNOME=	libxml2
+SHEBANG_FILES=	examples/remake_outputs.pl
+CFLAGS+=	-Wno-return-type -fcommon
+# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
+DOCSDIR=	${PREFIX}/share/doc/cfengine
+MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html \
+		--libexecdir=${PREFIX}/libexec \
+		--libdir=${PREFIX}/libexec \
+		--mandir=${PREFIX}/man \
+		--with-workdir=/var/cfengine \
+		--with-pcre=${LOCALBASE} \
+		--with-lmdb=${LOCALBASE} \
+		--enable-fhs
+INSTALL_TARGET=	install-strip
+
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb \
+		libyaml.so:textproc/libyaml \
+		libcurl.so:ftp/curl
+
+OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+
+MYSQL_USES=		mysql
+MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
+MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
+MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+
+LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
+LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
+
+.include <bsd.port.mk>
diff --git a/sysutils/cfengine317/distinfo b/sysutils/cfengine317/distinfo
new file mode 100644
index 000000000000..b83da5190c99
--- /dev/null
+++ b/sysutils/cfengine317/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1605930048
+SHA256 (cfengine-3.17.0.tar.gz) = b7def98c2bdf491839a6dfb85ac48c670136cf331984b6c4063551ed3daf1420
+SIZE (cfengine-3.17.0.tar.gz) = 3203190
diff --git a/sysutils/cfengine317/files/cf-execd.in b/sysutils/cfengine317/files/cf-execd.in
new file mode 100644
index 000000000000..b40d3507649a
--- /dev/null
+++ b/sysutils/cfengine317/files/cf-execd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-execd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
+#
+# cf_execd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-execd.
+# cf_execd_flags (str):          Custom additional arguments to be passed
+#                               to cf-execd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_execd"
+rcvar=cf_execd_enable
+
+command="%%PREFIX%%/bin/cf-execd"
+
+load_rc_config $name
+
+: ${cf_execd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine317/files/cf-monitord.in b/sysutils/cfengine317/files/cf-monitord.in
new file mode 100644
index 000000000000..dd21a0aaed6d
--- /dev/null
+++ b/sysutils/cfengine317/files/cf-monitord.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-monitord
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
+#
+# cf_monitord_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-monitord.
+# cf_monitord_flags (str):          Custom additional arguments to be passed
+#                               to cf-monitord (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_monitord"
+rcvar=cf_monitord_enable
+
+command="%%PREFIX%%/bin/cf-monitord"
+
+load_rc_config $name
+
+: ${cf_monitord_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine317/files/cf-serverd.in b/sysutils/cfengine317/files/cf-serverd.in
new file mode 100644
index 000000000000..938274887353
--- /dev/null
+++ b/sysutils/cfengine317/files/cf-serverd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# PROVIDE: cf-serverd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
+#
+# cf_serverd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-serverd.
+# cf_serverd_flags (str):          Custom additional arguments to be passed
+#                               to cf-serverd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_serverd"
+rcvar=cf_serverd_enable
+
+command="%%PREFIX%%/bin/cf-serverd"
+
+load_rc_config $name
+
+: ${cf_serverd_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine317/pkg-descr b/sysutils/cfengine317/pkg-descr
new file mode 100644
index 000000000000..47d900688ceb
--- /dev/null
+++ b/sysutils/cfengine317/pkg-descr
@@ -0,0 +1,10 @@
+Cfengine is an automated suite of programs for configuring and
+maintaining Unix-like computers. It has been used on computing arrays
+of between 1 and 20,000 computers since 1993 by a wide range of
+organizations. Cfengine is supported by active research and was the
+first autonomic, hands-free management system for Unix-like operating
+systems. Cfengine is an autonomic maintenance system not merely a
+change management roll-out tool. Cfengine has a history of security
+and adaptability.
+
+WWW: https://cfengine.com/
diff --git a/sysutils/cfengine317/pkg-plist b/sysutils/cfengine317/pkg-plist
new file mode 100644
index 000000000000..6d6f1b48e407
--- /dev/null
+++ b/sysutils/cfengine317/pkg-plist
@@ -0,0 +1,394 @@
+bin/cf-agent
+bin/cf-check
+bin/cf-execd
+bin/cf-key
+bin/cf-monitord
+bin/cf-net
+bin/cf-promises
+bin/cf-runagent
+bin/cf-secret
+bin/cf-serverd
+bin/cf-upgrade
+bin/rpmvercmp
+libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.3
+libexec/cfengine/libpromises.so.3.0.6
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/examples/abort.cf
+%%DOCSDIR%%/examples/accessed_before.cf
+%%DOCSDIR%%/examples/accessedbefore.cf
+%%DOCSDIR%%/examples/accumulated_time.cf
+%%DOCSDIR%%/examples/acl.cf
+%%DOCSDIR%%/examples/acl_generic.cf
+%%DOCSDIR%%/examples/acl_ntfs.cf
+%%DOCSDIR%%/examples/acl_secret.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/activedirectory_listusers.cf
+%%DOCSDIR%%/examples/activedirectory_showuser.cf
+%%DOCSDIR%%/examples/ago.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/appgroups.cf
+%%DOCSDIR%%/examples/arrays.cf
+%%DOCSDIR%%/examples/augment.cf
+%%DOCSDIR%%/examples/backreferences_files.cf
+%%DOCSDIR%%/examples/bsdflags.cf
+%%DOCSDIR%%/examples/bundle_return_values.cf
+%%DOCSDIR%%/examples/bundlesequence.cf
+%%DOCSDIR%%/examples/bundlesmatching.cf
+%%DOCSDIR%%/examples/bundlestate.cf
+%%DOCSDIR%%/examples/canonify.cf
+%%DOCSDIR%%/examples/cf2_integration.cf
+%%DOCSDIR%%/examples/change_detect.cf
+%%DOCSDIR%%/examples/changedbefore.cf
+%%DOCSDIR%%/examples/chdir.cf
+%%DOCSDIR%%/examples/class-automatic-canonificiation.cf
+%%DOCSDIR%%/examples/classes_global.cf
+%%DOCSDIR%%/examples/classesmatching.cf
+%%DOCSDIR%%/examples/classmatch.cf
+%%DOCSDIR%%/examples/classvar_convergence.cf
+%%DOCSDIR%%/examples/commands.cf
+%%DOCSDIR%%/examples/compare.cf
+%%DOCSDIR%%/examples/container_iteration.cf
+%%DOCSDIR%%/examples/container_key_iteration.cf
+%%DOCSDIR%%/examples/control_expand.cf
+%%DOCSDIR%%/examples/copy.cf
+%%DOCSDIR%%/examples/copy_classes.cf
+%%DOCSDIR%%/examples/copy_copbl.cf
+%%DOCSDIR%%/examples/copy_edit.cf
+%%DOCSDIR%%/examples/copydir_copbl.cf
+%%DOCSDIR%%/examples/copylinks.cf
+%%DOCSDIR%%/examples/countclassesmatching.cf
+%%DOCSDIR%%/examples/countlinesmatching.cf
+%%DOCSDIR%%/examples/create_filedir.cf
+%%DOCSDIR%%/examples/createdb.cf
+%%DOCSDIR%%/examples/customize_by_named_list.cf
+%%DOCSDIR%%/examples/data_expand.cf
+%%DOCSDIR%%/examples/data_readstringarray.cf
+%%DOCSDIR%%/examples/data_regextract.cf
+%%DOCSDIR%%/examples/datastate.cf
+%%DOCSDIR%%/examples/defaults.cf
+%%DOCSDIR%%/examples/defaults2.cf
+%%DOCSDIR%%/examples/defaults3.cf
+%%DOCSDIR%%/examples/definitions.cf
+%%DOCSDIR%%/examples/deletelines.cf
+%%DOCSDIR%%/examples/depends_on.cf
+%%DOCSDIR%%/examples/depends_on2.cf
+%%DOCSDIR%%/examples/difference.cf
+%%DOCSDIR%%/examples/dirname.cf
+%%DOCSDIR%%/examples/disable.cf
+%%DOCSDIR%%/examples/disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/diskfree.cf
+%%DOCSDIR%%/examples/dollar.cf
+%%DOCSDIR%%/examples/edit_column_files.cf
+%%DOCSDIR%%/examples/edit_comment_lines.cf
+%%DOCSDIR%%/examples/edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/edit_insert_lines.cf
+%%DOCSDIR%%/examples/edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/edit_passwd_file.cf
+%%DOCSDIR%%/examples/edit_passwd_file_basic.cf
+%%DOCSDIR%%/examples/edit_replace_string.cf
+%%DOCSDIR%%/examples/edit_sectioned_file.cf
+%%DOCSDIR%%/examples/edit_setvar.cf
+%%DOCSDIR%%/examples/edit_template.cf
+%%DOCSDIR%%/examples/edit_triggerclass.cf
+%%DOCSDIR%%/examples/edit_xml.cf
+%%DOCSDIR%%/examples/ensure_line_present_prepend_append.cf
+%%DOCSDIR%%/examples/env.cf
+%%DOCSDIR%%/examples/epimenides.cf
+%%DOCSDIR%%/examples/escape.cf
+%%DOCSDIR%%/examples/eval.cf
+%%DOCSDIR%%/examples/every.cf
+%%DOCSDIR%%/examples/exec_args.cf
+%%DOCSDIR%%/examples/exec_in_sequence.cf
+%%DOCSDIR%%/examples/execd.cf
+%%DOCSDIR%%/examples/execresult.cf
+%%DOCSDIR%%/examples/expand.cf
+%%DOCSDIR%%/examples/failedcommand.cf
+%%DOCSDIR%%/examples/file_change_detection.cf
+%%DOCSDIR%%/examples/file_hash.cf
+%%DOCSDIR%%/examples/file_owner_list_template.cf
+%%DOCSDIR%%/examples/fileexists.cf
+%%DOCSDIR%%/examples/filenames.cf
+%%DOCSDIR%%/examples/fileperms.cf
+%%DOCSDIR%%/examples/filesexist.cf
+%%DOCSDIR%%/examples/filesexist2.cf
+%%DOCSDIR%%/examples/filesize.cf
+%%DOCSDIR%%/examples/filestat.cf
+%%DOCSDIR%%/examples/filter.cf
+%%DOCSDIR%%/examples/findfiles.cf
+%%DOCSDIR%%/examples/fix_names.cf
+%%DOCSDIR%%/examples/format.cf
+%%DOCSDIR%%/examples/getclassmetatags.cf
+%%DOCSDIR%%/examples/getenv.cf
+%%DOCSDIR%%/examples/getfields.cf
+%%DOCSDIR%%/examples/getgid.cf
+%%DOCSDIR%%/examples/getindices.cf
+%%DOCSDIR%%/examples/getindices_and_values.cf
+%%DOCSDIR%%/examples/getmacaddress.cf
+%%DOCSDIR%%/examples/getregistry.cf
+%%DOCSDIR%%/examples/getuid.cf
+%%DOCSDIR%%/examples/getuserinfo.cf
+%%DOCSDIR%%/examples/getusers.cf
+%%DOCSDIR%%/examples/getvalues.cf
+%%DOCSDIR%%/examples/getvariablemetatags.cf
+%%DOCSDIR%%/examples/global_list_expansion.cf
+%%DOCSDIR%%/examples/global_list_expansion_2.cf
+%%DOCSDIR%%/examples/grep.cf
+%%DOCSDIR%%/examples/groupexists.cf
+%%DOCSDIR%%/examples/guest_environment_kvm.cf
+%%DOCSDIR%%/examples/hash.cf
+%%DOCSDIR%%/examples/hash_to_int.cf
+%%DOCSDIR%%/examples/hashcomment.cf
+%%DOCSDIR%%/examples/hashmatch.cf
+%%DOCSDIR%%/examples/hashuncomment.cf
+%%DOCSDIR%%/examples/helloworld.cf
+%%DOCSDIR%%/examples/host2ip.cf
+%%DOCSDIR%%/examples/hostrange.cf
+%%DOCSDIR%%/examples/hostsseen.cf
+%%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/hub.cf
+%%DOCSDIR%%/examples/id.cf
+%%DOCSDIR%%/examples/inherit.cf
+%%DOCSDIR%%/examples/insert_users.cf
+%%DOCSDIR%%/examples/intarray.cf
+%%DOCSDIR%%/examples/intersection.cf
+%%DOCSDIR%%/examples/inventory_cpu.cf
+%%DOCSDIR%%/examples/ip2host.cf
+%%DOCSDIR%%/examples/iprange.cf
+%%DOCSDIR%%/examples/irange.cf
+%%DOCSDIR%%/examples/isdir.cf
+%%DOCSDIR%%/examples/isexecutable.cf
+%%DOCSDIR%%/examples/isgreaterthan.cf
+%%DOCSDIR%%/examples/isipinsubnet.cf
+%%DOCSDIR%%/examples/islessthan.cf
+%%DOCSDIR%%/examples/islink.cf
+%%DOCSDIR%%/examples/isnewerthan.cf
+%%DOCSDIR%%/examples/isplain.cf
+%%DOCSDIR%%/examples/isvariable.cf
+%%DOCSDIR%%/examples/iteration.cf
+%%DOCSDIR%%/examples/join.cf
+%%DOCSDIR%%/examples/kill_process_running_wrong_user.cf
+%%DOCSDIR%%/examples/lastnode.cf
+%%DOCSDIR%%/examples/ldap.cf
+%%DOCSDIR%%/examples/length.cf
+%%DOCSDIR%%/examples/linking.cf
+%%DOCSDIR%%/examples/literal_server.cf
+%%DOCSDIR%%/examples/local_group_present.cf
+%%DOCSDIR%%/examples/local_user_password.cf
+%%DOCSDIR%%/examples/local_user_secondary_group_member.cf
+%%DOCSDIR%%/examples/local_users_absent.cf
+%%DOCSDIR%%/examples/local_users_locked.cf
+%%DOCSDIR%%/examples/local_users_present.cf
+%%DOCSDIR%%/examples/locate_files_and_compress.cf
+%%DOCSDIR%%/examples/log_private.cf
+%%DOCSDIR%%/examples/loops.cf
+%%DOCSDIR%%/examples/lsdir.cf
+%%DOCSDIR%%/examples/main.cf
+%%DOCSDIR%%/examples/main_entry_point.cf
+%%DOCSDIR%%/examples/main_library.cf
+%%DOCSDIR%%/examples/maparray.cf
+%%DOCSDIR%%/examples/mapdata.cf
+%%DOCSDIR%%/examples/mapdata_jsonpipe.cf
+%%DOCSDIR%%/examples/maplist.cf
+%%DOCSDIR%%/examples/max-min-mean-variance.cf
+%%DOCSDIR%%/examples/measure_log.cf
+%%DOCSDIR%%/examples/measurements.cf
+%%DOCSDIR%%/examples/menu.cf
+%%DOCSDIR%%/examples/mergedata.cf
+%%DOCSDIR%%/examples/meta.cf
+%%DOCSDIR%%/examples/method.cf
+%%DOCSDIR%%/examples/method_polymorph.cf
+%%DOCSDIR%%/examples/method_validate.cf
+%%DOCSDIR%%/examples/method_var.cf
+%%DOCSDIR%%/examples/method_var2.cf
+%%DOCSDIR%%/examples/missing_ok.cf
+%%DOCSDIR%%/examples/module_exec.cf
+%%DOCSDIR%%/examples/module_exec_2.cf
+%%DOCSDIR%%/examples/monitord.cf
+%%DOCSDIR%%/examples/mount_fs.cf
+%%DOCSDIR%%/examples/multipassvars.cf
+%%DOCSDIR%%/examples/multiple_outcomes.cf
+%%DOCSDIR%%/examples/mustache_classes.cf
+%%DOCSDIR%%/examples/mustache_template_motd.cf
+%%DOCSDIR%%/examples/namespace_class1.cf
+%%DOCSDIR%%/examples/namespace_classes.cf
+%%DOCSDIR%%/examples/namespace_var_meta.cf
+%%DOCSDIR%%/examples/namespace_var_meta2.cf
+%%DOCSDIR%%/examples/neighbourhood_watch.cf
+%%DOCSDIR%%/examples/none.cf
+%%DOCSDIR%%/examples/nth.cf
+%%DOCSDIR%%/examples/null_config.cf
+%%DOCSDIR%%/examples/orchestrate_chain1.cf
+%%DOCSDIR%%/examples/orchestrate_chain2.cf
+%%DOCSDIR%%/examples/orchestrate_delay_trigger.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/orchestrate_dragon.cf
+%%DOCSDIR%%/examples/orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/orchestrate_n_of_m.cf
+%%DOCSDIR%%/examples/orchestration_hostlist.cf
+%%DOCSDIR%%/examples/ordering.cf
+%%DOCSDIR%%/examples/package_apt.cf
+%%DOCSDIR%%/examples/package_bundles.cf
+%%DOCSDIR%%/examples/package_freebsd.cf
+%%DOCSDIR%%/examples/package_latest.cf
+%%DOCSDIR%%/examples/package_msi_file.cf
+%%DOCSDIR%%/examples/package_msi_version.cf
+%%DOCSDIR%%/examples/package_rpm.cf
+%%DOCSDIR%%/examples/package_solaris.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
+%%DOCSDIR%%/examples/package_yum.cf
+%%DOCSDIR%%/examples/package_zypper.cf
+%%DOCSDIR%%/examples/packagesmatching.cf
+%%DOCSDIR%%/examples/parallel_exec.cf
+%%DOCSDIR%%/examples/parseintrealstringarray.cf
+%%DOCSDIR%%/examples/parsestringarray.cf
+%%DOCSDIR%%/examples/parsestringarrayidx.cf
+%%DOCSDIR%%/examples/pathtype.cf
+%%DOCSDIR%%/examples/pattern_and_edit.cf
+%%DOCSDIR%%/examples/peerleader.cf
+%%DOCSDIR%%/examples/peerleaders.cf
+%%DOCSDIR%%/examples/peers.cf
+%%DOCSDIR%%/examples/postfix.cf
+%%DOCSDIR%%/examples/process_kill.cf
+%%DOCSDIR%%/examples/process_matching.cf
+%%DOCSDIR%%/examples/process_matching2.cf
+%%DOCSDIR%%/examples/process_matching3.cf
+%%DOCSDIR%%/examples/process_restart.cf
+%%DOCSDIR%%/examples/process_restart_basic.cf
+%%DOCSDIR%%/examples/process_signalling.cf
+%%DOCSDIR%%/examples/processes_define_class_based_on_process_runtime.cf
+%%DOCSDIR%%/examples/product.cf
+%%DOCSDIR%%/examples/promises.cf
+%%DOCSDIR%%/examples/quoting.cf
+%%DOCSDIR%%/examples/randomint.cf
+%%DOCSDIR%%/examples/readcsv.cf
+%%DOCSDIR%%/examples/readdata.cf
+%%DOCSDIR%%/examples/readfile.cf
+%%DOCSDIR%%/examples/readintarray.cf
+%%DOCSDIR%%/examples/readintrealstringlist.cf
+%%DOCSDIR%%/examples/readlist.cf
+%%DOCSDIR%%/examples/readrealarray.cf
+%%DOCSDIR%%/examples/readstringarray.cf
+%%DOCSDIR%%/examples/readtcp.cf
+%%DOCSDIR%%/examples/reg_multiline.cf
+%%DOCSDIR%%/examples/regarray.cf
+%%DOCSDIR%%/examples/regcmp.cf
+%%DOCSDIR%%/examples/regex_replace.cf
+%%DOCSDIR%%/examples/regex_win.cf
+%%DOCSDIR%%/examples/regextract.cf
+%%DOCSDIR%%/examples/registry.cf
+%%DOCSDIR%%/examples/registry_cache.cf
+%%DOCSDIR%%/examples/registryvalue.cf
+%%DOCSDIR%%/examples/regline.cf
+%%DOCSDIR%%/examples/reglist.cf
+%%DOCSDIR%%/examples/remake_outputs.pl
+%%DOCSDIR%%/examples/remoteclasses.cf
+%%DOCSDIR%%/examples/remoteclasses2.cf
+%%DOCSDIR%%/examples/remotescalar.cf
+%%DOCSDIR%%/examples/remove_deadlinks.cf
+%%DOCSDIR%%/examples/rename.cf
+%%DOCSDIR%%/examples/repairedcommand.cf
+%%DOCSDIR%%/examples/report_custom.cf
+%%DOCSDIR%%/examples/report_state.cf
+%%DOCSDIR%%/examples/reports.cf
+%%DOCSDIR%%/examples/reporttofile.cf
+%%DOCSDIR%%/examples/resolveconf.cf
+%%DOCSDIR%%/examples/returnszero.cf
+%%DOCSDIR%%/examples/reverse.cf
+%%DOCSDIR%%/examples/root_passwd.cf
+%%DOCSDIR%%/examples/select_class.cf
+%%DOCSDIR%%/examples/select_mode.cf
+%%DOCSDIR%%/examples/select_region.cf
+%%DOCSDIR%%/examples/select_size.cf
+%%DOCSDIR%%/examples/selectservers.cf
+%%DOCSDIR%%/examples/server_callback.cf
+%%DOCSDIR%%/examples/server_copy_localhost.cf
+%%DOCSDIR%%/examples/server_copy_purge.cf
+%%DOCSDIR%%/examples/server_copy_remote.cf
+%%DOCSDIR%%/examples/server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/service_disable.cf
+%%DOCSDIR%%/examples/service_start.cf
+%%DOCSDIR%%/examples/services.cf
+%%DOCSDIR%%/examples/services_concept.cf
+%%DOCSDIR%%/examples/services_default_service_bundle.cf
+%%DOCSDIR%%/examples/services_win.cf
+%%DOCSDIR%%/examples/setuidlog.cf
+%%DOCSDIR%%/examples/setvar.cf
+%%DOCSDIR%%/examples/shuffle.cf
+%%DOCSDIR%%/examples/simple_ssh_key_distribution.cf
+%%DOCSDIR%%/examples/software_dist.cf
+%%DOCSDIR%%/examples/software_update_version_yum.cf
+%%DOCSDIR%%/examples/some.cf
+%%DOCSDIR%%/examples/sort.cf
+%%DOCSDIR%%/examples/splitstring.cf
+%%DOCSDIR%%/examples/sql_table_structure.cf
+%%DOCSDIR%%/examples/storage.cf
+%%DOCSDIR%%/examples/strcmp.cf
+%%DOCSDIR%%/examples/strftime.cf
+%%DOCSDIR%%/examples/string_downcase.cf
+%%DOCSDIR%%/examples/string_head.cf
+%%DOCSDIR%%/examples/string_length.cf
+%%DOCSDIR%%/examples/string_mustache.cf
+%%DOCSDIR%%/examples/string_replace.cf
+%%DOCSDIR%%/examples/string_reverse.cf
+%%DOCSDIR%%/examples/string_split.cf
+%%DOCSDIR%%/examples/string_tail.cf
+%%DOCSDIR%%/examples/string_upcase.cf
+%%DOCSDIR%%/examples/stringarray.cf
+%%DOCSDIR%%/examples/sublist.cf
+%%DOCSDIR%%/examples/sum.cf
+%%DOCSDIR%%/examples/switchcase.cf
+%%DOCSDIR%%/examples/symlink.cf
+%%DOCSDIR%%/examples/symlink_children.cf
+%%DOCSDIR%%/examples/syslog.cf
+%%DOCSDIR%%/examples/syslog2.cf
+%%DOCSDIR%%/examples/template.cf
+%%DOCSDIR%%/examples/template2.cf
+%%DOCSDIR%%/examples/test_environment.cf
+%%DOCSDIR%%/examples/tidy_all_files.cf
+%%DOCSDIR%%/examples/translatepath.cf
+%%DOCSDIR%%/examples/unique.cf
+%%DOCSDIR%%/examples/unpack_method_calls.cf
+%%DOCSDIR%%/examples/update.cf
+%%DOCSDIR%%/examples/user_edit.cf
+%%DOCSDIR%%/examples/user_edit_method.cf
+%%DOCSDIR%%/examples/userexists.cf
+%%DOCSDIR%%/examples/users_type.cf
+%%DOCSDIR%%/examples/varclass.cf
+%%DOCSDIR%%/examples/varexpansion.cf
+%%DOCSDIR%%/examples/variablesmatching.cf
+%%DOCSDIR%%/examples/variablesmatching_as_data.cf
+%%DOCSDIR%%/examples/varnet.cf
+%%DOCSDIR%%/examples/vars.cf
+%%DOCSDIR%%/examples/warnifline.cf
+%%DOCSDIR%%/examples/webserver.cf
+%%DOCSDIR%%/examples/win_dns_client.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/zenoss.cf
+%%DOCSDIR%%/examples/mustache_comments.cf
+%%DOCSDIR%%/examples/mustache_extension_compact_json.cf
+%%DOCSDIR%%/examples/mustache_extension_expand_key.cf
+%%DOCSDIR%%/examples/mustache_extension_multiline_json.cf
+%%DOCSDIR%%/examples/mustache_extension_top.cf
+%%DOCSDIR%%/examples/mustache_sections_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_inverted.cf
+%%DOCSDIR%%/examples/mustache_sections_non_empty_list.cf
+%%DOCSDIR%%/examples/mustache_sections_non_false_value.cf
+%%DOCSDIR%%/examples/mustache_set_delimiters.cf
+%%DOCSDIR%%/examples/mustache_variables.cf
+%%DOCSDIR%%/examples/readenvfile.cf
+%%DOCSDIR%%/examples/with.cf
+@dir /var/cfengine/inputs
+@dir /var/cfengine/modules
+@dir /var/cfengine/outputs
+@dir /var/cfengine/plugins
+@dir /var/cfengine/state
+@dir(root,wheel,700) /var/cfengine/ppkeys
+@dir /var/cfengine
diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine32/distinfo b/sysutils/cfengine32/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine32/files/cf-execd.in b/sysutils/cfengine32/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine32/files/cf-serverd.in b/sysutils/cfengine32/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine32/files/patch-configure b/sysutils/cfengine32/files/patch-configure
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/files/patch-configure
+++ /dev/null
diff --git a/sysutils/cfengine32/pkg-descr b/sysutils/cfengine32/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine32/pkg-plist b/sysutils/cfengine32/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine32/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine33/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine33/distinfo b/sysutils/cfengine33/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine33/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine33/files/cf-execd.in b/sysutils/cfengine33/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine33/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine33/files/cf-serverd.in b/sysutils/cfengine33/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine33/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine33/pkg-descr b/sysutils/cfengine33/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine33/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine33/pkg-plist b/sysutils/cfengine33/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine33/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine34/distinfo b/sysutils/cfengine34/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine34/files/cf-execd.in b/sysutils/cfengine34/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine34/files/cf-serverd.in b/sysutils/cfengine34/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine34/files/patch-ext-Makefile.am b/sysutils/cfengine34/files/patch-ext-Makefile.am
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/files/patch-ext-Makefile.am
+++ /dev/null
diff --git a/sysutils/cfengine34/files/patch-ext-Makefile.in b/sysutils/cfengine34/files/patch-ext-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/files/patch-ext-Makefile.in
+++ /dev/null
diff --git a/sysutils/cfengine34/pkg-descr b/sysutils/cfengine34/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine34/pkg-plist b/sysutils/cfengine34/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine34/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine35/distinfo b/sysutils/cfengine35/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine35/files/cf-execd.in b/sysutils/cfengine35/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine35/files/cf-monitord.in b/sysutils/cfengine35/files/cf-monitord.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/files/cf-monitord.in
+++ /dev/null
diff --git a/sysutils/cfengine35/files/cf-serverd.in b/sysutils/cfengine35/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine35/files/patch-cf-agent-Makefile.in b/sysutils/cfengine35/files/patch-cf-agent-Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/files/patch-cf-agent-Makefile.in
+++ /dev/null
diff --git a/sysutils/cfengine35/files/patch-libpromises-expand.c b/sysutils/cfengine35/files/patch-libpromises-expand.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/files/patch-libpromises-expand.c
+++ /dev/null
diff --git a/sysutils/cfengine35/files/patch-libpromises-sysinfo.c b/sysutils/cfengine35/files/patch-libpromises-sysinfo.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/files/patch-libpromises-sysinfo.c
+++ /dev/null
diff --git a/sysutils/cfengine35/pkg-descr b/sysutils/cfengine35/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine35/pkg-plist b/sysutils/cfengine35/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine35/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine36/distinfo b/sysutils/cfengine36/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine36/files/cf-execd.in b/sysutils/cfengine36/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine36/files/cf-monitord.in b/sysutils/cfengine36/files/cf-monitord.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/files/cf-monitord.in
+++ /dev/null
diff --git a/sysutils/cfengine36/files/cf-serverd.in b/sysutils/cfengine36/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine36/files/patch-m4-strndup.m4 b/sysutils/cfengine36/files/patch-m4-strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/files/patch-m4-strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine36/files/patch-m4__strndup.m4 b/sysutils/cfengine36/files/patch-m4__strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/files/patch-m4__strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine36/pkg-descr b/sysutils/cfengine36/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine36/pkg-plist b/sysutils/cfengine36/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine36/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine37/distinfo b/sysutils/cfengine37/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine37/files/cf-execd.in b/sysutils/cfengine37/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine37/files/cf-monitord.in b/sysutils/cfengine37/files/cf-monitord.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/files/cf-monitord.in
+++ /dev/null
diff --git a/sysutils/cfengine37/files/cf-serverd.in b/sysutils/cfengine37/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine37/files/patch-m4-strndup.m4 b/sysutils/cfengine37/files/patch-m4-strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/files/patch-m4-strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine37/files/patch-m4__strndup.m4 b/sysutils/cfengine37/files/patch-m4__strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/files/patch-m4__strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine37/pkg-descr b/sysutils/cfengine37/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine37/pkg-plist b/sysutils/cfengine37/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine37/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine38/distinfo b/sysutils/cfengine38/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine38/files/cf-execd.in b/sysutils/cfengine38/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine38/files/cf-monitord.in b/sysutils/cfengine38/files/cf-monitord.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/files/cf-monitord.in
+++ /dev/null
diff --git a/sysutils/cfengine38/files/cf-serverd.in b/sysutils/cfengine38/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine38/files/patch-cf-agent_verify__storage.c b/sysutils/cfengine38/files/patch-cf-agent_verify__storage.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/files/patch-cf-agent_verify__storage.c
+++ /dev/null
diff --git a/sysutils/cfengine38/files/patch-m4-strndup.m4 b/sysutils/cfengine38/files/patch-m4-strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/files/patch-m4-strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine38/files/patch-m4__strndup.m4 b/sysutils/cfengine38/files/patch-m4__strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/files/patch-m4__strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine38/pkg-descr b/sysutils/cfengine38/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine38/pkg-plist b/sysutils/cfengine38/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine38/pkg-plist
+++ /dev/null
diff --git a/sysutils/cfengine39/Makefile b/sysutils/cfengine39/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/Makefile
+++ /dev/null
diff --git a/sysutils/cfengine39/distinfo b/sysutils/cfengine39/distinfo
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/distinfo
+++ /dev/null
diff --git a/sysutils/cfengine39/files/cf-execd.in b/sysutils/cfengine39/files/cf-execd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/files/cf-execd.in
+++ /dev/null
diff --git a/sysutils/cfengine39/files/cf-monitord.in b/sysutils/cfengine39/files/cf-monitord.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/files/cf-monitord.in
+++ /dev/null
diff --git a/sysutils/cfengine39/files/cf-serverd.in b/sysutils/cfengine39/files/cf-serverd.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/files/cf-serverd.in
+++ /dev/null
diff --git a/sysutils/cfengine39/files/patch-libenv_sysinfo.c b/sysutils/cfengine39/files/patch-libenv_sysinfo.c
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/files/patch-libenv_sysinfo.c
+++ /dev/null
diff --git a/sysutils/cfengine39/files/patch-m4-strndup.m4 b/sysutils/cfengine39/files/patch-m4-strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/files/patch-m4-strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine39/files/patch-m4__strndup.m4 b/sysutils/cfengine39/files/patch-m4__strndup.m4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/files/patch-m4__strndup.m4
+++ /dev/null
diff --git a/sysutils/cfengine39/pkg-descr b/sysutils/cfengine39/pkg-descr
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/pkg-descr
+++ /dev/null
diff --git a/sysutils/cfengine39/pkg-plist b/sysutils/cfengine39/pkg-plist
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/cfengine39/pkg-plist
+++ /dev/null
diff --git a/sysutils/chaoskube/Makefile b/sysutils/chaoskube/Makefile
new file mode 100644
index 000000000000..e23eb3c6eab2
--- /dev/null
+++ b/sysutils/chaoskube/Makefile
@@ -0,0 +1,90 @@
+# Created by: Gabriel M. Dutra <0xdutra@gmail.com>
+
+PORTNAME=	chaoskube
+PORTVERSION=	0.21.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	sysutils
+
+MAINTAINER=	0xdutra@gmail.com
+COMMENT=	Chaoskube periodically kills random pods in your Kubernetes cluster
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=	go:modules
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	linki
+
+PLIST_FILES=	bin/${PORTNAME}
+
+GH_TUPLE=	\
+		Azure:go-autorest:5bd9621f41a0:azure_go_autorest_date/vendor/github.com/Azure/go-autorest \
+		Azure:go-autorest:autorest/v0.9.6:azure_go_autorest_autorest \
+		Azure:go-autorest:d3556005bee1:azure_go_autorest_adal \
+		Azure:go-autorest:logger/v0.1.0:azure_go_autorest_logger \
+		Azure:go-autorest:tracing/v0.5.0:azure_go_autorest_tracing \
+		alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
+		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
+		alecthomas:units:c3de453c63f4:alecthomas_units/vendor/github.com/alecthomas/units \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
+		evanphx:json-patch:v4.9.0:evanphx_json_patch/vendor/github.com/evanphx/json-patch \
+		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
+		go-logr:logr:v0.2.0:go_logr_logr/vendor/github.com/go-logr/logr \
+		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
+		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:net:ab3426394381:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:858c2ad4c8b6:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:ed371f2e16b4:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
+		golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \
+		google:gofuzz:v1.1.0:google_gofuzz/vendor/github.com/google/gofuzz \
+		googleapis:gnostic:v0.4.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		googleapis:google-cloud-go:v0.51.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
+		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
+		imdario:mergo:v0.3.5:imdario_mergo/vendor/github.com/imdario/mergo \
+		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
+		konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		kubernetes-sigs:structured-merge-diff:v4.0.1:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff/v4 \
+		kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
+		kubernetes:api:v0.19.1:kubernetes_api/vendor/k8s.io/api \
+		kubernetes:apimachinery:v0.19.1:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
+		kubernetes:client-go:v0.19.1:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:klog:v1.0.0:kubernetes_klog/vendor/k8s.io/klog \
+		kubernetes:klog:v2.2.0:kubernetes_klog_1/vendor/k8s.io/klog/v2 \
+		kubernetes:kube-openapi:6aeccd4b50c6:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
+		kubernetes:utils:d5654de09c73:kubernetes_utils/vendor/k8s.io/utils \
+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
+		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		prometheus:client_golang:v1.7.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.10.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.1.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		protocolbuffers:protobuf-go:v1.24.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify
+
+post-extract:
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
+	@${RLN} ${WRKSRC_azure_go_autorest_autorest}/autorest ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
+	@${RLN} ${WRKSRC_azure_go_autorest_adal}/autorest/adal ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/adal
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
+	@${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
+	@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
+	@${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing
+
+.include <bsd.port.mk>
diff --git a/sysutils/chaoskube/distinfo b/sysutils/chaoskube/distinfo
new file mode 100644
index 000000000000..ae12d4752e9c
--- /dev/null
+++ b/sysutils/chaoskube/distinfo
@@ -0,0 +1,117 @@
+TIMESTAMP = 1602211106
+SHA256 (linki-chaoskube-v0.21.0_GH0.tar.gz) = b0747be3fe27a33e81e8b6b6cbdbf9b5111a65bcadce16bd5eea6aafd58986fd
+SIZE (linki-chaoskube-v0.21.0_GH0.tar.gz) = 198753
+SHA256 (Azure-go-autorest-5bd9621f41a0_GH0.tar.gz) = 1cd0fa3f623475cd94daf16fff33e873d6a8191de89b1306008744fbf78f892b
+SIZE (Azure-go-autorest-5bd9621f41a0_GH0.tar.gz) = 156993
+SHA256 (Azure-go-autorest-autorest-v0.9.6_GH0.tar.gz) = 589787170ff96e23dd929e25ca8844cbbb4d2c152c64f2068d10dda714a65139
+SIZE (Azure-go-autorest-autorest-v0.9.6_GH0.tar.gz) = 166960
+SHA256 (Azure-go-autorest-d3556005bee1_GH0.tar.gz) = 977eb19975da382c795d889c1debba282037213e3a9f3a9db1a3eb9e1a7cdad5
+SIZE (Azure-go-autorest-d3556005bee1_GH0.tar.gz) = 166180
+SHA256 (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = d642ed3d87f3dc9fcde6c7ff7b82a3b3463b70f6ff2d5a7c6c37099d754c464e
+SIZE (Azure-go-autorest-logger-v0.1.0_GH0.tar.gz) = 141423
+SHA256 (Azure-go-autorest-tracing-v0.5.0_GH0.tar.gz) = af322c3ccc73be318dddafd20f43baaa4be95dc58312f8d781cca29931cfa02f
+SIZE (Azure-go-autorest-tracing-v0.5.0_GH0.tar.gz) = 181045
+SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
+SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
+SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
+SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
+SHA256 (alecthomas-units-c3de453c63f4_GH0.tar.gz) = b2eb77de46e677edb150bb4bf81d213416a477525980e315264cbd70b22d0ece
+SIZE (alecthomas-units-c3de453c63f4_GH0.tar.gz) = 3485
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63
+SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960
+SHA256 (evanphx-json-patch-v4.9.0_GH0.tar.gz) = 5ab8b7866d0a11720e3398bb6f3f7246e93d035c8ded49db4f36b017ea9ff235
+SIZE (evanphx-json-patch-v4.9.0_GH0.tar.gz) = 29494
+SHA256 (go-inf-inf-v0.9.1_GH0.tar.gz) = 756e00e87207cb063d305b6e38bf56dba4d76586fbe40b7d6b657d22516d0f71
+SIZE (go-inf-inf-v0.9.1_GH0.tar.gz) = 13072
+SHA256 (go-logr-logr-v0.2.0_GH0.tar.gz) = df1740fe6ff1b09ac4284a5ed6bb94a5299a94c11908cdbac0c5e9c366e28397
+SIZE (go-logr-logr-v0.2.0_GH0.tar.gz) = 12283
+SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
+SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
+SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045
+SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
+SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
+SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
+SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
+SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
+SHA256 (golang-crypto-75b288015ac9_GH0.tar.gz) = 6e74e21bf9dfdbf0a8dac8cb205fbc3bfd8dff308a24080b9d6093a3858f0db2
+SIZE (golang-crypto-75b288015ac9_GH0.tar.gz) = 1729931
+SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70
+SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040
+SHA256 (golang-net-ab3426394381_GH0.tar.gz) = ddf23e17a147972ad0dd11824a912eaa0174cba60ab63da6ae6ced2c76345946
+SIZE (golang-net-ab3426394381_GH0.tar.gz) = 1177700
+SHA256 (golang-oauth2-858c2ad4c8b6_GH0.tar.gz) = 28ae6a15793d97ba980dd318dba21167dd751ca8bbafcb69ffa648b41c7cbf48
+SIZE (golang-oauth2-858c2ad4c8b6_GH0.tar.gz) = 45265
+SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
+SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
+SHA256 (golang-sys-ed371f2e16b4_GH0.tar.gz) = 8c462fe1c70152d82bc7f5c2b5ee0057ab083314b05569d9ed1b6bcb4bf9c720
+SIZE (golang-sys-ed371f2e16b4_GH0.tar.gz) = 1054512
+SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
+SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
+SHA256 (golang-time-555d28b269f0_GH0.tar.gz) = 8ce368da65025dad4e4ed302a5835e2b3579f3a111721f9b275803519a5d10b3
+SIZE (golang-time-555d28b269f0_GH0.tar.gz) = 9577
+SHA256 (google-gofuzz-v1.1.0_GH0.tar.gz) = 29aaa068090a761e6cc10e3722c5cc4c6a09840c50b442e5a53088e95bd3f325
+SIZE (google-gofuzz-v1.1.0_GH0.tar.gz) = 13517
+SHA256 (googleapis-gnostic-v0.4.1_GH0.tar.gz) = cc20ab94cf800fdfe377778aa0e2c640045c80193a873253e97605297801733f
+SIZE (googleapis-gnostic-v0.4.1_GH0.tar.gz) = 362548
+SHA256 (googleapis-google-cloud-go-v0.51.0_GH0.tar.gz) = efee71ab4baf86277c6ceec4633dd606595e4b0fa299c22863dbeb03eed65941
+SIZE (googleapis-google-cloud-go-v0.51.0_GH0.tar.gz) = 2441854
+SHA256 (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 26afc0e5895c6ce87c881c5c02c682ccc9a08174a9c27ca26d4a1e72dbf78128
+SIZE (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 8346
+SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4
+SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084
+SHA256 (imdario-mergo-v0.3.5_GH0.tar.gz) = 0e39c5cb0ee73c1f759d9b9260f3c82cc4ca7757c9f07713e9487c4b126da205
+SIZE (imdario-mergo-v0.3.5_GH0.tar.gz) = 15920
+SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328c12aaed92af462363191fa76e9809a6
+SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
+SHA256 (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3
+SIZE (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983
+SHA256 (kubernetes-sigs-structured-merge-diff-v4.0.1_GH0.tar.gz) = 97fe500d1378fe8cf233f590f10dda77020d34aa789595c13947aa4dbe9fee99
+SIZE (kubernetes-sigs-structured-merge-diff-v4.0.1_GH0.tar.gz) = 275290
+SHA256 (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 80612b8cc63863556906f04df7eca89179bf81e5b3d1133c082bd7e5e35d5514
+SIZE (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 92574
+SHA256 (kubernetes-api-v0.19.1_GH0.tar.gz) = 7a396ef5d4e1ca29429d9214f6d8f4fc36adb6d660ff3a376e68008f54b942d6
+SIZE (kubernetes-api-v0.19.1_GH0.tar.gz) = 2527222
+SHA256 (kubernetes-apimachinery-v0.19.1_GH0.tar.gz) = 2ee56675f80eac9b52d1bc177059736c2f2e280e58f3a59075d45bcafbe5e59f
+SIZE (kubernetes-apimachinery-v0.19.1_GH0.tar.gz) = 538647
+SHA256 (kubernetes-client-go-v0.19.1_GH0.tar.gz) = 52a29bf73d9fe31011778ad9379784aa5c52c4330abdcaf315da42e0752753b5
+SIZE (kubernetes-client-go-v0.19.1_GH0.tar.gz) = 751793
+SHA256 (kubernetes-klog-v1.0.0_GH0.tar.gz) = eb84fc7a8051175f2da4a428360ce70703c8ccdd0e987fddc2f9d5c8fd97cd00
+SIZE (kubernetes-klog-v1.0.0_GH0.tar.gz) = 32366
+SHA256 (kubernetes-klog-v2.2.0_GH0.tar.gz) = f19e617e4fd8372edb951968e8f67c231c06303d3c5d085e6c7318bb30cae9ce
+SIZE (kubernetes-klog-v2.2.0_GH0.tar.gz) = 39963
+SHA256 (kubernetes-kube-openapi-6aeccd4b50c6_GH0.tar.gz) = 75a4bcdd3523b5780e3b28e2336cb9921b2e13d90016751cdc84c9b9885ab617
+SIZE (kubernetes-kube-openapi-6aeccd4b50c6_GH0.tar.gz) = 749007
+SHA256 (kubernetes-utils-d5654de09c73_GH0.tar.gz) = d6827e54235500559b65386fb5dfd1c30f1a0b6e5175fb52e740dc7da97e6c5a
+SIZE (kubernetes-utils-d5654de09c73_GH0.tar.gz) = 92353
+SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
+SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
+SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
+SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
+SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
+SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (prometheus-client_golang-v1.7.1_GH0.tar.gz) = e61fefe06b7ac561c77435c98336f4ccc8cee60420de3a39db6d09fb7b83e9ed
+SIZE (prometheus-client_golang-v1.7.1_GH0.tar.gz) = 160050
+SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
+SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
+SHA256 (prometheus-common-v0.10.0_GH0.tar.gz) = 349381082ea8e66637c2d2475f1ae0e74ca04a7b91eb3b96817c261b87668fd3
+SIZE (prometheus-common-v0.10.0_GH0.tar.gz) = 107763
+SHA256 (prometheus-procfs-v0.1.3_GH0.tar.gz) = 0b0872058bfdef11d9942535c992420150724c3b5a912a48a8d2ea26ac39efa6
+SIZE (prometheus-procfs-v0.1.3_GH0.tar.gz) = 156868
+SHA256 (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 318e54ee12d09e9c76fc11cf85f6297360e6444b74a6a7882450501bb952ba56
+SIZE (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 1227640
+SHA256 (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 536151aa2fed39e2b74925f81c8cd31f0c02c013881ba2d30982731d12424ed0
+SIZE (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 45748
+SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
+SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
diff --git a/sysutils/chaoskube/pkg-descr b/sysutils/chaoskube/pkg-descr
new file mode 100644
index 000000000000..889472f9d792
--- /dev/null
+++ b/sysutils/chaoskube/pkg-descr
@@ -0,0 +1,18 @@
+chaoskube periodically kills random pods in your Kubernetes cluster.
+Running it will kill a pod in any namespace every 10 minutes by default.
+
+$ chaoskube
+INFO[0000] starting up            dryRun=true interval=10m0s version=v0.21.0
+INFO[0000] connecting to cluster  master="https://kube.you.me" serverVersion=v1
+INFO[0000] setting pod filter     annotations= labels= minimumAge=0s namespaces=
+INFO[0000] setting quiet times    daysOfYear="[]" timesOfDay="[]" weekdays="[]"
+INFO[0000] setting timezone       location=UTC name=UTC offset=0
+INFO[0001] terminating pod        name=kube-dns-v20-6ikos namespace=kube-system
+INFO[0601] terminating pod        name=nginx-701339712-u4fr3 namespace=chaoskube
+[...]
+
+chaoskube allows to filter target pods by namespaces, labels, annotations and
+age as well as exclude certain weekdays, times of day and days of a year from
+chaos.
+
+WWW: https://github.com/linki/chaoskube
diff --git a/sysutils/checkrestart/Makefile b/sysutils/checkrestart/Makefile
new file mode 100644
index 000000000000..e2993164017d
--- /dev/null
+++ b/sysutils/checkrestart/Makefile
@@ -0,0 +1,30 @@
+PORTNAME=	checkrestart
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.5.0
+PORTREVISION=	1
+CATEGORIES=	sysutils
+
+MAINTAINER=	tom@hur.st
+COMMENT=	Find processes that need restarting after an upgrade
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	Freaky
+
+SUB_FILES=	checkrestart
+
+PLIST_FILES=	bin/checkrestart \
+		share/man/man1/checkrestart.1.gz \
+		${PERIODIC_SECURITY}/checkrestart
+
+PERIODIC_SECURITY=	etc/periodic/security/
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/checkrestart ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/checkrestart.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_SECURITY}
+	${INSTALL_SCRIPT} ${WRKDIR}/checkrestart ${STAGEDIR}${PREFIX}/${PERIODIC_SECURITY}
+
+.include <bsd.port.mk>
diff --git a/sysutils/checkrestart/distinfo b/sysutils/checkrestart/distinfo
new file mode 100644
index 000000000000..4f36ba52bcd1
--- /dev/null
+++ b/sysutils/checkrestart/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1585601339
+SHA256 (Freaky-checkrestart-v0.5.0_GH0.tar.gz) = c37f40ad618d978fe413c71c367af5aefaeb1d600d72725294df8b3523e20e9c
+SIZE (Freaky-checkrestart-v0.5.0_GH0.tar.gz) = 5659
diff --git a/sysutils/checkrestart/files/checkrestart.in b/sysutils/checkrestart/files/checkrestart.in
new file mode 100644
index 000000000000..4b22ca094f46
--- /dev/null
+++ b/sysutils/checkrestart/files/checkrestart.in
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+if [ -r /etc/defaults/periodic.conf ]; then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: "${security_checkrestart_enable:=NO}"
+: "${security_checkrestart_period:=DAILY}"
+: "${security_checkrestart_users:=}"           # User names or IDs to check
+: "${security_checkrestart_jails:=}"           # Jail names or IDs to check
+: "${security_checkrestart_procs:=}"           # Process names or IDs to check
+
+checkrestartcmd=%%PREFIX%%/bin/checkrestart
+hflag=""
+rc=0
+
+export COLUMNS=80
+
+checkrestart() {
+    local result
+    result="$(${checkrestartcmd} ${hflag} "$@" -- ${security_checkrestart_procs} 2>&1)"
+    if [ "$result" ]; then
+        echo "${result}"
+        rc=3
+    fi
+    hflag="-H"
+}
+
+checkrestart_each_user() {
+    if [ -n "${security_checkrestart_users}" ]; then
+        for user in ${security_checkrestart_users}; do
+            checkrestart -u "${user}" "$@"
+        done
+    else
+        checkrestart "$@"
+    fi
+}
+
+checkrestart_start() {
+    if [ -n "${security_checkrestart_jails}" ]; then
+        for jail in ${security_checkrestart_jails}; do
+            checkrestart_each_user -j "${jail}"
+        done
+    else
+        checkrestart_each_user
+    fi
+}
+
+if check_yesno_period security_checkrestart_enable
+then
+    echo
+    echo 'Checking for stale processes:'
+    checkrestart_start
+fi
+
+exit $rc
diff --git a/sysutils/checkrestart/pkg-descr b/sysutils/checkrestart/pkg-descr
new file mode 100644
index 000000000000..f72a8d0ee8fe
--- /dev/null
+++ b/sysutils/checkrestart/pkg-descr
@@ -0,0 +1,4 @@
+Find processes using stale binaries or shared libraries that may need
+restarting after an upgrade.
+
+WWW: http://github.com/Freaky/checkrestart
diff --git a/sysutils/checkrestart/pkg-message b/sysutils/checkrestart/pkg-message
new file mode 100644
index 000000000000..ea27f981f067
--- /dev/null
+++ b/sysutils/checkrestart/pkg-message
@@ -0,0 +1,36 @@
+[
+{ type: install,
+  message: <<EOM
+In order to enable periodic(8) checks, set the following in /etc/periodic.conf
+
+# Required
+security_checkrestart_enable="YES"
+
+# Optional
+security_checkrestart_period="DAILY"     # or WEEKY, or MONTHLY
+security_checkrestart_jails="0 web"      # limit to jails 0 and web
+security_checkrestart_users="root www"   # limit to root and www users
+security_checkrestart_procs="smbd httpd" # limit to samba and httpd
+EOM,
+},
+{ type: upgrade,
+  maximum_version: "0.5.0_1",
+  message: <<EOM
+The periodic(8) script is now a security script.  All 'daily_checkrestart_'
+instances in /etc/periodic.conf should be changed to 'security_checkrestart_'.
+
+i.e.
+
+daily_checkrestart_enable="YES"
+
+is now:
+
+security_checkrestart_enable="YES"
+
+daily_checkrestart_weekdays is no longer supported.  The security period
+mechanism should be used instead:
+
+security_checkrestart_period="DAILY" # or WEEKLY, or MONTHLY
+EOM
+}
+]
diff --git a/sysutils/chezmoi/Makefile b/sysutils/chezmoi/Makefile
new file mode 100644
index 000000000000..adcae5be8bf4
--- /dev/null
+++ b/sysutils/chezmoi/Makefile
@@ -0,0 +1,141 @@
+# Created by: Samir Noir <samir@noir.im>
+
+PORTNAME=	chezmoi
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.12
+CATEGORIES=	sysutils
+
+MAINTAINER=	samir@noir.im
+COMMENT=	Manage your dotfiles across multiple diverse machines, securely
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	twpayne
+
+GH_TUPLE=	Masterminds:goutils:v1.1.1:masterminds_goutils/vendor/github.com/Masterminds/goutils \
+		Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
+		Masterminds:sprig:v3.2.2:masterminds_sprig_v3/vendor/github.com/Masterminds/sprig/v3 \
+		Microsoft:go-winio:v0.5.0:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		alecthomas:chroma:v0.9.1:alecthomas_chroma/vendor/github.com/alecthomas/chroma \
+		alecthomas:colour:v0.1.0:alecthomas_colour/vendor/github.com/alecthomas/colour \
+		alecthomas:repr:bb82daffcca2:alecthomas_repr/vendor/github.com/alecthomas/repr \
+		aymerick:douceur:v0.2.0:aymerick_douceur/vendor/github.com/aymerick/douceur \
+		bmatcuk:doublestar:v3.0.0:bmatcuk_doublestar_v3/vendor/github.com/bmatcuk/doublestar/v3 \
+		charmbracelet:glamour:v0.3.0:charmbracelet_glamour/vendor/github.com/charmbracelet/glamour \
+		coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \
+		danieljoos:wincred:v1.1.0:danieljoos_wincred/vendor/github.com/danieljoos/wincred \
+		danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
+		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		dlclark:regexp2:v1.4.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
+		emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \
+		etcd-io:bbolt:v1.3.5:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		go-errgo:errgo:v2.1.0:go_errgo_errgo/vendor/gopkg.in/errgo.v2 \
+		go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \
+		go-git:go-billy:v5.3.1:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \
+		go-git:go-git:v5.3.0:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \
+		go-ini:ini:v1.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
+		go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \
+		go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
+		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		godbus:dbus:v5.0.4:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
+		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
+		golang:crypto:38f3c27a63bf:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:16afe75a6701:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:81ed05c6b58c:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:a76c4d0a0096:golang_sys/vendor/golang.org/x/sys \
+		golang:term:a79de5458b56:golang_term/vendor/golang.org/x/term \
+		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
+		google:go-github:v35.2.0:google_go_github_v35/vendor/github.com/google/go-github/v35 \
+		google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \
+		google:renameio:v1.0.1:google_renameio/vendor/github.com/google/renameio \
+		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
+		gopherjs:gopherjs:fce0ec30dd00:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \
+		gorilla:css:v1.0.0:gorilla_css/vendor/github.com/gorilla/css \
+		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
+		huandu:xstrings:v1.3.2:huandu_xstrings/vendor/github.com/huandu/xstrings \
+		imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \
+		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
+		jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \
+		kevinburke:ssh_config:v1.1.0:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
+		lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
+		magiconair:properties:v1.8.5:magiconair_properties/vendor/github.com/magiconair/properties \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.12:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		microcosm-cc:bluemonday:v1.0.9:microcosm_cc_bluemonday/vendor/github.com/microcosm-cc/bluemonday \
+		mitchellh:copystructure:v1.2.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
+		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
+		mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		mitchellh:reflectwalk:v1.0.2:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
+		muesli:combinator:v0.3.0:muesli_combinator/vendor/github.com/muesli/combinator \
+		muesli:reflow:v0.2.0:muesli_reflow/vendor/github.com/muesli/reflow \
+		muesli:termenv:v0.8.1:muesli_termenv/vendor/github.com/muesli/termenv \
+		olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
+		pelletier:go-toml:v1.9.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
+		pkg:diff:20ebb0f2a09e:pkg_diff/vendor/github.com/pkg/diff \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
+		rogpeppe:go-internal:v1.8.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
+		rs:zerolog:v1.21.0:rs_zerolog/vendor/github.com/rs/zerolog \
+		sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
+		shopspring:decimal:v1.2.0:shopspring_decimal/vendor/github.com/shopspring/decimal \
+		smartystreets:assertions:v1.2.0:smartystreets_assertions/vendor/github.com/smartystreets/assertions \
+		spf13:afero:v1.6.0:spf13_afero/vendor/github.com/spf13/afero \
+		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
+		spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		spf13:viper:v1.7.1:spf13_viper/vendor/github.com/spf13/viper \
+		stretchr:objx:v0.3.0:stretchr_objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
+		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
+		twpayne:go-shell:v0.3.0:twpayne_go_shell/vendor/github.com/twpayne/go-shell \
+		twpayne:go-vfs:v2.0.0:twpayne_go_vfs_v2/vendor/github.com/twpayne/go-vfs/v2 \
+		twpayne:go-vfsafero:v2.0.0:twpayne_go_vfsafero_v2/vendor/github.com/twpayne/go-vfsafero/v2 \
+		twpayne:go-xdg:v4.0.0:twpayne_go_xdg_v4/vendor/github.com/twpayne/go-xdg/v4 \
+		uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \
+		uber-go:multierr:v1.7.0:uber_go_multierr/vendor/go.uber.org/multierr \
+		xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
+		yuin:goldmark-emoji:v1.0.1:yuin_goldmark_emoji/vendor/github.com/yuin/goldmark-emoji \
+		yuin:goldmark:v1.3.5:yuin_goldmark/vendor/github.com/yuin/goldmark \
+		zalando:go-keyring:v0.1.1:zalando_go_keyring/vendor/github.com/zalando/go-keyring \
+		DHowett:go-plist:1454fab16a06:go_plist/vendor/howett.net/plist
+
+PLIST_FILES=	bin/chezmoi
+
+OPTIONS_DEFINE=		BASH DOCS FISH ZSH
+OPTIONS_DEFAULT=	BASH FISH ZSH
+
+BASH_PLIST_FILES=	etc/bash_completion.d/chezmoi
+DOCS_PORTDOCS=		*
+FISH_PLIST_FILES=	share/fish/vendor_functions.d/chezmoi.fish
+ZSH_PLIST_FILES=	share/zsh/site-functions/_chezmoi
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/vendor/github.com/chris-ramon
+	@${RLN} ${WRKSRC_aymerick_douceur} ${WRKSRC}/vendor/github.com/chris-ramon/douceur
+
+post-install-BASH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${WRKSRC}/completions/chezmoi-completion.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/chezmoi
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+	    "! -name docs.go")
+
+post-install-FISH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/vendor_functions.d
+	${INSTALL_DATA} ${WRKSRC}/completions/chezmoi.fish ${STAGEDIR}${PREFIX}/share/fish/vendor_functions.d/chezmoi.fish
+
+post-install-ZSH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKSRC}/completions/chezmoi.zsh ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_chezmoi
+
+.include <bsd.port.mk>
diff --git a/sysutils/chezmoi/distinfo b/sysutils/chezmoi/distinfo
new file mode 100644
index 000000000000..ab3bfa41f39f
--- /dev/null
+++ b/sysutils/chezmoi/distinfo
@@ -0,0 +1,185 @@
+TIMESTAMP = 1621602267
+SHA256 (twpayne-chezmoi-v2.0.12_GH0.tar.gz) = 6714ec9ec32fcc0d20d94fffe0f0d8a7555ae46bb59bf53d4398144c1fd43ce9
+SIZE (twpayne-chezmoi-v2.0.12_GH0.tar.gz) = 2282385
+SHA256 (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 6eed023c54f386a71f360e19d34f7a43e640ac44dfc39c22ad4afd7ae04aaa3d
+SIZE (Masterminds-goutils-v1.1.1_GH0.tar.gz) = 14847
+SHA256 (Masterminds-semver-v3.1.1_GH0.tar.gz) = d029a39800f201d5b95ec5dbf653e5b20aab757783a6876be1b3017d1c4a444f
+SIZE (Masterminds-semver-v3.1.1_GH0.tar.gz) = 24506
+SHA256 (Masterminds-sprig-v3.2.2_GH0.tar.gz) = 877f3d46e9eadec5644944ac265dd960f58f2b77355b636b2c0a3308b9a0e6ec
+SIZE (Masterminds-sprig-v3.2.2_GH0.tar.gz) = 55500
+SHA256 (Microsoft-go-winio-v0.5.0_GH0.tar.gz) = 82c90c7289b8885d4ecf8f8739399200f69bf7ff0d6ac9715d9f5b0f29a8f49d
+SIZE (Microsoft-go-winio-v0.5.0_GH0.tar.gz) = 88506
+SHA256 (alecthomas-chroma-v0.9.1_GH0.tar.gz) = 0a5b7aa765473fc37fd1d9ff431e8f250315690bc2e8a06a40c260e485f91c77
+SIZE (alecthomas-chroma-v0.9.1_GH0.tar.gz) = 655564
+SHA256 (alecthomas-colour-v0.1.0_GH0.tar.gz) = fb8eea76e2fbb0aa1f214836d0f7b40b0d0405489c8c67299f0a9753d7415601
+SIZE (alecthomas-colour-v0.1.0_GH0.tar.gz) = 3527
+SHA256 (alecthomas-repr-bb82daffcca2_GH0.tar.gz) = d35c177b07f2f100263ce2fb0ea5c1c0960331385d34b39711c9ace79c443b8f
+SIZE (alecthomas-repr-bb82daffcca2_GH0.tar.gz) = 6317
+SHA256 (aymerick-douceur-v0.2.0_GH0.tar.gz) = ceed015cddc99b600ccbbd6aa0ebe39063554049f70153887d3df7c21fefedbb
+SIZE (aymerick-douceur-v0.2.0_GH0.tar.gz) = 20914
+SHA256 (bmatcuk-doublestar-v3.0.0_GH0.tar.gz) = 0103de61e4bb003942713a93c85d5e121a3526aa3de448536e4a7d3059c7426b
+SIZE (bmatcuk-doublestar-v3.0.0_GH0.tar.gz) = 11366
+SHA256 (charmbracelet-glamour-v0.3.0_GH0.tar.gz) = 159a9fdbc95367ee014ef6eef76e2046f97eee78849234339f61f43a39af670c
+SIZE (charmbracelet-glamour-v0.3.0_GH0.tar.gz) = 533766
+SHA256 (coreos-go-semver-v0.3.0_GH0.tar.gz) = 1b72134483db366fb43f216727d6bc110086d4450ce0d226960cf4ce823d6eb9
+SIZE (coreos-go-semver-v0.3.0_GH0.tar.gz) = 10663
+SHA256 (danieljoos-wincred-v1.1.0_GH0.tar.gz) = fbc111313d66a0a4a80fafb86fb5550b657b5655c439e0cba86ed40efb331682
+SIZE (danieljoos-wincred-v1.1.0_GH0.tar.gz) = 9547
+SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
+SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (dlclark-regexp2-v1.4.0_GH0.tar.gz) = 774718cb87c5cc7b954e4f17056f6a189c8d542ecbf989330296bc7e3885851b
+SIZE (dlclark-regexp2-v1.4.0_GH0.tar.gz) = 205882
+SHA256 (emirpasic-gods-v1.12.0_GH0.tar.gz) = 889d06b5f88db9e2dae19a799a35324c4f59305aa5e966dcdb4b637e70607ff9
+SIZE (emirpasic-gods-v1.12.0_GH0.tar.gz) = 76825
+SHA256 (etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 63fed2e9bbdcc2aa279c2a7ea4a59c39bc21616ec2c96abff0020872beb3dbad
+SIZE (etcd-io-bbolt-v1.3.5_GH0.tar.gz) = 96494
+SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
+SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
+SHA256 (go-errgo-errgo-v2.1.0_GH0.tar.gz) = f6b10d77db65cb5a6c425be0f695e43b98e3e10ec83340209ac5bf4bf5c1b837
+SIZE (go-errgo-errgo-v2.1.0_GH0.tar.gz) = 9927
+SHA256 (go-git-gcfg-v1.5.0_GH0.tar.gz) = 662e46a93aba5ffe383e55597ce5749447e5c8e9409b1452f5790bfd6e1f8a11
+SIZE (go-git-gcfg-v1.5.0_GH0.tar.gz) = 28522
+SHA256 (go-git-go-billy-v5.3.1_GH0.tar.gz) = 7d715d7cf11f731dc0466bf93903ba7fe6ac70d086bb862fc24e718d9ddc209e
+SIZE (go-git-go-billy-v5.3.1_GH0.tar.gz) = 29365
+SHA256 (go-git-go-git-v5.3.0_GH0.tar.gz) = 8f97b5e63d2d331f7502ab2d5d8874d41ab06c80c6052a61445df26764e51e42
+SIZE (go-git-go-git-v5.3.0_GH0.tar.gz) = 465156
+SHA256 (go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c470167d42f0f0bcd6642ff64e
+SIZE (go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
+SHA256 (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8
+SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769
+SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
+SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
+SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
+SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
+SHA256 (godbus-dbus-v5.0.4_GH0.tar.gz) = cc43459f4c165c1f782aea9a1b79405b5a07cab9694a637246dacde9c889bc56
+SIZE (godbus-dbus-v5.0.4_GH0.tar.gz) = 69965
+SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
+SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
+SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31
+SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839
+SHA256 (golang-net-16afe75a6701_GH0.tar.gz) = add2a3e3e96dba7ddecd716513e6b4219d173fdcbbb69e51ecba998b52d4328a
+SIZE (golang-net-16afe75a6701_GH0.tar.gz) = 1251445
+SHA256 (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 84828c3d8d1e1b5fdec9fef502f37308de4244571316063f72beb0bb20f07fe0
+SIZE (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 79557
+SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
+SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
+SHA256 (golang-sys-a76c4d0a0096_GH0.tar.gz) = e0bcc87bd6f23e82bdcfe4c200815fa6ee8862578edd59d00374769e0b798598
+SIZE (golang-sys-a76c4d0a0096_GH0.tar.gz) = 1192386
+SHA256 (golang-term-a79de5458b56_GH0.tar.gz) = e2456003e6399902c70947a068f3e0f043de033c8ade1713d8d7294a5c6521ab
+SIZE (golang-term-a79de5458b56_GH0.tar.gz) = 14927
+SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
+SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
+SHA256 (google-go-github-v35.2.0_GH0.tar.gz) = c4fbf478e97d7e7a68229d668e7e4580d7b31cd0783fa72b0e9baa59903ca60f
+SIZE (google-go-github-v35.2.0_GH0.tar.gz) = 474316
+SHA256 (google-go-querystring-v1.1.0_GH0.tar.gz) = a5641dee688eb2c733608ce5a88d8181c93ad9f5083fd97fadbccb91afad9a56
+SIZE (google-go-querystring-v1.1.0_GH0.tar.gz) = 10423
+SHA256 (google-renameio-v1.0.1_GH0.tar.gz) = 940b6a2f036652a375679afb880f8bb90ade33118e5fdceb3a9ac03e0a5d86b5
+SIZE (google-renameio-v1.0.1_GH0.tar.gz) = 10480
+SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
+SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
+SHA256 (gopherjs-gopherjs-fce0ec30dd00_GH0.tar.gz) = faff30d83ca8680d6f4cc6a63f15c5dad27155b177c886241000020f7625715d
+SIZE (gopherjs-gopherjs-fce0ec30dd00_GH0.tar.gz) = 228662
+SHA256 (gorilla-css-v1.0.0_GH0.tar.gz) = 9decf83063b85bcd5392f645fac322e986b5fc596b3e44c3be02ee5939106f4c
+SIZE (gorilla-css-v1.0.0_GH0.tar.gz) = 6443
+SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
+SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
+SHA256 (huandu-xstrings-v1.3.2_GH0.tar.gz) = 89eed037724f4a2e85da5217faa6d73ae317d066e0e5fd79670a142b83f5eb1b
+SIZE (huandu-xstrings-v1.3.2_GH0.tar.gz) = 17911
+SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302
+SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319
+SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
+SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
+SHA256 (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = b5a5c4fe8d73dea7dc838f1c428c5fff0db9b50a2c014208a2761de4e94fa5ba
+SIZE (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = 5945
+SHA256 (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = a88b03ef5077abe2ad25e7c2cd34800099575712444d71612e0553dd317ac118
+SIZE (kevinburke-ssh_config-v1.1.0_GH0.tar.gz) = 19004
+SHA256 (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = b3ee835cc398287452377266313edcc231043bae4168f8d2706e5d34ce1ce755
+SIZE (lucasb-eyer-go-colorful-v1.2.0_GH0.tar.gz) = 970830
+SHA256 (magiconair-properties-v1.8.5_GH0.tar.gz) = f85ea629d145006f4df18fd8251fa005d95c311b068848043232f52d247ba45c
+SIZE (magiconair-properties-v1.8.5_GH0.tar.gz) = 30514
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (mattn-go-runewidth-v0.0.12_GH0.tar.gz) = 5fe59a999a3dffe33595d8e40806bcba11aa447cd73eb60a8b9a7f8b724a232f
+SIZE (mattn-go-runewidth-v0.0.12_GH0.tar.gz) = 17354
+SHA256 (microcosm-cc-bluemonday-v1.0.9_GH0.tar.gz) = 3892fe14aaa91bc740a00ed3735fe5e885f37c18d45bd08e47b3f9a4a5dfe1c2
+SIZE (microcosm-cc-bluemonday-v1.0.9_GH0.tar.gz) = 162429
+SHA256 (mitchellh-copystructure-v1.2.0_GH0.tar.gz) = 0f3c6a9d91d695470c22acaba390878a03e3c106a453c4b0b8abebfb76c1a009
+SIZE (mitchellh-copystructure-v1.2.0_GH0.tar.gz) = 9951
+SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
+SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
+SHA256 (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = d936baa5006f7dda1346aff863745a110981f7583a1184e93b9077fa52cd4048
+SIZE (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = 27826
+SHA256 (mitchellh-reflectwalk-v1.0.2_GH0.tar.gz) = 62ef93bcd6ef48e5dbb4b3aefffb44b7d7e1d56ab2aa8541734b8448ae9ef996
+SIZE (mitchellh-reflectwalk-v1.0.2_GH0.tar.gz) = 6854
+SHA256 (muesli-combinator-v0.3.0_GH0.tar.gz) = 8117bfae420c5e6027aaea5cd179e945f250df83ece47fe3b8546196106df6be
+SIZE (muesli-combinator-v0.3.0_GH0.tar.gz) = 4177
+SHA256 (muesli-reflow-v0.2.0_GH0.tar.gz) = 41f078180f8d8a3c2bf1fcdf269351088b681b381668c1abd8b4134071d6bd8d
+SIZE (muesli-reflow-v0.2.0_GH0.tar.gz) = 17966
+SHA256 (muesli-termenv-v0.8.1_GH0.tar.gz) = c8b5227225a47f7b163709426f95c25476f58727a999239486f0079cb0c18f62
+SIZE (muesli-termenv-v0.8.1_GH0.tar.gz) = 408132
+SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f
+SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568
+SHA256 (pelletier-go-toml-v1.9.0_GH0.tar.gz) = 037326a9c972cfbcf257e1d1f97a7ade6075cbb7f1e91a59a9a6cf45ebc811ef
+SIZE (pelletier-go-toml-v1.9.0_GH0.tar.gz) = 100816
+SHA256 (pkg-diff-20ebb0f2a09e_GH0.tar.gz) = b3d039b2243fcff8f53fadb13541ca00238599eb2510a04c8cfa54ac0d5195fa
+SIZE (pkg-diff-20ebb0f2a09e_GH0.tar.gz) = 200589
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
+SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
+SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197
+SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) = 44036
+SHA256 (rogpeppe-go-internal-v1.8.0_GH0.tar.gz) = a423c3d03d47d263d7ff1c90ba3911c9025bb7f060b5a46af8229e00962df8ed
+SIZE (rogpeppe-go-internal-v1.8.0_GH0.tar.gz) = 129034
+SHA256 (rs-zerolog-v1.21.0_GH0.tar.gz) = d10b1b6a8e7c1aa391868dfdbb0726a8e0e93f6b9876744e665533c67ef47cc9
+SIZE (rs-zerolog-v1.21.0_GH0.tar.gz) = 160530
+SHA256 (sergi-go-diff-v1.1.0_GH0.tar.gz) = 3d4362670655e970366d555418f3c8d179c217c0499ef5573ab7176352229451
+SIZE (sergi-go-diff-v1.1.0_GH0.tar.gz) = 43552
+SHA256 (shopspring-decimal-v1.2.0_GH0.tar.gz) = 59fa76645f63d7383d3f306fe2f7136d923e2aa514d9a9353938d9654b842f58
+SIZE (shopspring-decimal-v1.2.0_GH0.tar.gz) = 37755
+SHA256 (smartystreets-assertions-v1.2.0_GH0.tar.gz) = b1b6becbca1d6375d426461d95c7daf5532770e4747b4ee600627d97aae10f87
+SIZE (smartystreets-assertions-v1.2.0_GH0.tar.gz) = 82193
+SHA256 (spf13-afero-v1.6.0_GH0.tar.gz) = d1942de010ac7932bd21618aaf478b4f1413980449c061032f18beac7805d068
+SIZE (spf13-afero-v1.6.0_GH0.tar.gz) = 62130
+SHA256 (spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
+SIZE (spf13-cast-v1.3.1_GH0.tar.gz) = 11102
+SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
+SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
+SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d
+SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871
+SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
+SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
+SHA256 (spf13-viper-v1.7.1_GH0.tar.gz) = de85215b50e9fbb2cdf63b0aa9df826a866dff8f718ba2dc3f5866e98d5bd39a
+SIZE (spf13-viper-v1.7.1_GH0.tar.gz) = 82641
+SHA256 (stretchr-objx-v0.3.0_GH0.tar.gz) = 831cb044305e573d9ed18928b87feb1d31d1f17f3f54ec962d037c36f5463e24
+SIZE (stretchr-objx-v0.3.0_GH0.tar.gz) = 80456
+SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
+SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
+SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
+SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
+SHA256 (twpayne-go-shell-v0.3.0_GH0.tar.gz) = 28d951bb4084e562f959ec2f4ba3aaba585ebc230465f256e2dc7815fb85daf7
+SIZE (twpayne-go-shell-v0.3.0_GH0.tar.gz) = 3764
+SHA256 (twpayne-go-vfs-v2.0.0_GH0.tar.gz) = 27c0bf6308e98c7706b8b2cb8e7b469b09927f6edffa420e4a7b620f0e83e47c
+SIZE (twpayne-go-vfs-v2.0.0_GH0.tar.gz) = 16416
+SHA256 (twpayne-go-vfsafero-v2.0.0_GH0.tar.gz) = d85603fb745a03c70005feaea244e1b73741e934c3a4943486fec491b3ec7a42
+SIZE (twpayne-go-vfsafero-v2.0.0_GH0.tar.gz) = 3482
+SHA256 (twpayne-go-xdg-v4.0.0_GH0.tar.gz) = 68441d46261acd6590f394742b0170c6c85725fa68d0b038733cb236b20453cf
+SIZE (twpayne-go-xdg-v4.0.0_GH0.tar.gz) = 5793
+SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1
+SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566
+SHA256 (uber-go-multierr-v1.7.0_GH0.tar.gz) = 7b9b6b812f64ad756ada9dd72db1a8be51cdbfa831defe9111cb4e0877138242
+SIZE (uber-go-multierr-v1.7.0_GH0.tar.gz) = 15054
+SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215b809e50f0a80c78b8730c61582858
+SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
+SHA256 (yuin-goldmark-emoji-v1.0.1_GH0.tar.gz) = 9188fe9ed18f4560fdae3577a4bb63e3cbd20e0ae4ed68ae1058788b6aa0cec0
+SIZE (yuin-goldmark-emoji-v1.0.1_GH0.tar.gz) = 31694
+SHA256 (yuin-goldmark-v1.3.5_GH0.tar.gz) = 0d0c2d0bd5608cb25ec88627a5bc36500919e72c8cd6b6d8fb3e2a4a2b28c905
+SIZE (yuin-goldmark-v1.3.5_GH0.tar.gz) = 232839
+SHA256 (zalando-go-keyring-v0.1.1_GH0.tar.gz) = 08971e1a330ec954b778cde60a8484157f8f5a8e4ee4bd0b05874d624d902f04
+SIZE (zalando-go-keyring-v0.1.1_GH0.tar.gz) = 10007
+SHA256 (DHowett-go-plist-1454fab16a06_GH0.tar.gz) = 9f239acbb8e2994e13e6b309b60c5b9eb8e165158d20f9e9f5f9b36c85811856
+SIZE (DHowett-go-plist-1454fab16a06_GH0.tar.gz) = 52549
diff --git a/sysutils/chezmoi/pkg-descr b/sysutils/chezmoi/pkg-descr
new file mode 100644
index 000000000000..70d7b0508797
--- /dev/null
+++ b/sysutils/chezmoi/pkg-descr
@@ -0,0 +1,7 @@
+chezmoi manages your dotfiles across multiple diverse machines, securely.
+chezmoi is helpful if you have spent time customizing the tools you use and
+want to keep machines running different accounts (e.g. home and work) and/or
+different operating systems in sync, while still being able to easily cope
+with differences from machine to machine.
+
+WWW: https://www.chezmoi.io/
diff --git a/sysutils/chgrep/Makefile b/sysutils/chgrep/Makefile
index 4ed871f9b979..976fae9b2312 100644
--- a/sysutils/chgrep/Makefile
+++ b/sysutils/chgrep/Makefile
@@ -1,5 +1,4 @@
 # Created by: Kirill Ponomarew <ponomarew@oberon.net>
-# $FreeBSD$
 
 PORTNAME=	chgrep
 PORTVERSION=	1.2.4
diff --git a/sysutils/choria/Makefile b/sysutils/choria/Makefile
new file mode 100644
index 000000000000..d53a0685140b
--- /dev/null
+++ b/sysutils/choria/Makefile
@@ -0,0 +1,169 @@
+PORTNAME=	choria
+PORTVERSION=	0.22.0
+DISTVERSIONPREFIX=v
+CATEGORIES=	sysutils
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	Server to host Choria agents, networks, federations and discovery
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+ONLY_FOR_ARCHS=	amd64
+
+USES=		go:modules
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	choria-io
+GH_PROJECT=	go-choria
+USE_RC_SUBR=	choria-broker choria-server
+
+GH_TUPLE=	\
+		AlecAivazis:survey:v2.2.12:alecaivazis_survey_v2/vendor/github.com/AlecAivazis/survey/v2 \
+		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
+		Freman:eventloghook:e4d803b6b48b:freman_eventloghook/vendor/github.com/Freman/eventloghook \
+		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
+		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
+		Masterminds:sprig:v2.22.0:masterminds_sprig/vendor/github.com/Masterminds/sprig \
+		Netflix:go-expect:85d881c3777e:netflix_go_expect/vendor/github.com/Netflix/go-expect \
+		OneOfOne:xxhash:v1.2.8:oneofone_xxhash/vendor/github.com/OneOfOne/xxhash \
+		achanda:go-sysctl:6be7678c45d2:achanda_go_sysctl/vendor/github.com/achanda/go-sysctl \
+		aelsabbahy:GOnetstat:edf89f784e08:aelsabbahy_gonetstat/vendor/github.com/aelsabbahy/GOnetstat \
+		aelsabbahy:go-ps:61c449472dcf:aelsabbahy_go_ps/vendor/github.com/aelsabbahy/go-ps \
+		aelsabbahy:goss:v0.3.16:aelsabbahy_goss/vendor/github.com/aelsabbahy/goss \
+		alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/gopkg.in/alecthomas/kingpin.v2 \
+		alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
+		alecthomas:units:f65c72e2690d:alecthomas_units/vendor/github.com/alecthomas/units \
+		antonmedv:expr:v1.8.9:antonmedv_expr/vendor/github.com/antonmedv/expr \
+		awesome-gocui:gocui:v0.6.0:awesome_gocui_gocui/vendor/github.com/awesome-gocui/gocui \
+		awesome-gocui:termbox-go:c0aef3d18bcc:awesome_gocui_termbox_go/vendor/github.com/awesome-gocui/termbox-go \
+		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
+		blang:semver:v3.5.1:blang_semver/vendor/github.com/blang/semver \
+		brutella:dnssd:v1.2.0:brutella_dnssd/vendor/github.com/brutella/dnssd \
+		brutella:hc:v1.2.4:brutella_hc/vendor/github.com/brutella/hc \
+		bytecodealliance:wasmtime-go:v0.24.0:bytecodealliance_wasmtime_go/vendor/github.com/bytecodealliance/wasmtime-go \
+		census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
+		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
+		choria-io:go-updater:v0.0.3:choria_io_go_updater/vendor/github.com/choria-io/go-updater \
+		cloudevents:sdk-go:v1.2.0:cloudevents_sdk_go/vendor/github.com/cloudevents/sdk-go \
+		dgrijalva:jwt-go:dc14462fd587:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
+		dominikh:go-tools:v0.0.1-2019.2.3:dominikh_go_tools/vendor/honnef.co/go/tools \
+		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
+		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
+		fatih:structtag:v1.2.0:fatih_structtag/vendor/github.com/fatih/structtag \
+		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
+		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
+		go-errors:errors:v1.0.1:go_errors_errors/vendor/github.com/go-errors/errors \
+		go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
+		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
+		gofrs:uuid:v4.0.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
+		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:crypto:e6e6c4f2bb5b:golang_crypto/vendor/golang.org/x/crypto \
+		golang:groupcache:869f871628b6:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \
+		golang:mock:v1.5.0:golang_mock/vendor/github.com/golang/mock \
+		golang:mod:v0.3.0:golang_mod/vendor/golang.org/x/mod \
+		golang:net:e18ecbb05110:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:33663a62ff08:golang_sys/vendor/golang.org/x/sys \
+		golang:term:f5beecf764ed:golang_term/vendor/golang.org/x/term \
+		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
+		golang:time:89c76fbcd5d1:golang_time/vendor/golang.org/x/time \
+		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
+		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
+		google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
+		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
+		gosuri:uilive:v0.0.4:gosuri_uilive/vendor/github.com/gosuri/uilive \
+		gosuri:uiprogress:v0.0.1:gosuri_uiprogress/vendor/github.com/gosuri/uiprogress \
+		guptarohit:asciigraph:v0.5.2:guptarohit_asciigraph/vendor/github.com/guptarohit/asciigraph \
+		hinshun:vt10x:d55458df857c:hinshun_vt10x/vendor/github.com/hinshun/vt10x \
+		huandu:xstrings:v1.3.0:huandu_xstrings/vendor/github.com/huandu/xstrings \
+		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
+		kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \
+		klauspost:compress:v1.11.12:klauspost_compress/vendor/github.com/klauspost/compress \
+		lightstep:tracecontext.go:1757c391b1ac:lightstep_tracecontext_go/vendor/github.com/lightstep/tracecontext.go \
+		looplab:fsm:v0.2.0:looplab_fsm/vendor/github.com/looplab/fsm \
+		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.9:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		mgutz:ansi:9520e82c474b:mgutz_ansi/vendor/github.com/mgutz/ansi \
+		miekg:dns:v1.1.35:miekg_dns/vendor/github.com/miekg/dns \
+		miekg:pkcs11:v1.0.3:miekg_pkcs11/vendor/github.com/miekg/pkcs11 \
+		minio:highwayhash:v1.0.1:minio_highwayhash/vendor/github.com/minio/highwayhash \
+		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
+		mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
+		moby:moby:v1.13.1:moby_moby/vendor/github.com/docker/docker \
+		nats-io:jsm.go:6e5211771ee9:nats_io_jsm_go/vendor/github.com/nats-io/jsm.go \
+		nats-io:jwt:v2.0.1:nats_io_jwt_v2/vendor/github.com/nats-io/jwt \
+		nats-io:nats-server:v2.2.2:nats_io_nats_server_v2/vendor/github.com/nats-io/nats-server/v2 \
+		nats-io:nats-streaming-server:v0.21.2:nats_io_nats_streaming_server/vendor/github.com/nats-io/nats-streaming-server \
+		nats-io:nats.go:6cc31aae93df:nats_io_nats_go/vendor/github.com/nats-io/nats.go \
+		nats-io:nkeys:v0.3.0:nats_io_nkeys/vendor/github.com/nats-io/nkeys \
+		nats-io:nuid:v1.0.1:nats_io_nuid/vendor/github.com/nats-io/nuid \
+		nats-io:stan.go:v0.8.3:nats_io_stan_go/vendor/github.com/nats-io/stan.go \
+		nxadm:tail:v1.4.8:nxadm_tail/vendor/github.com/nxadm/tail \
+		oleiade:reflections:0e86b3c98b2f:oleiade_reflections/vendor/github.com/oleiade/reflections \
+		olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
+		onsi:ginkgo:v1.16.1:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
+		onsi:gomega:v1.11.0:onsi_gomega/vendor/github.com/onsi/gomega \
+		open-policy-agent:opa:v0.27.1:open_policy_agent_opa/vendor/github.com/open-policy-agent/opa \
+		opencontainers:runc:8779fa57eb4a:opencontainers_runc/vendor/github.com/opencontainers/runc \
+		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		prometheus:client_golang:v1.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.18.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		protocolbuffers:protobuf-go:v1.24.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		rcrowley:go-metrics:10cdbea86bc0:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \
+		robfig:cron:v1.2.0:robfig_cron/vendor/github.com/robfig/cron \
+		rsc:goversion:v1.2.0:rsc_goversion/vendor/rsc.io/goversion \
+		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		tadglines:go-pkgs:1f86682992f1:tadglines_go_pkgs/vendor/github.com/tadglines/go-pkgs \
+		tidwall:gjson:v1.7.5:tidwall_gjson/vendor/github.com/tidwall/gjson \
+		tidwall:match:v1.0.3:tidwall_match/vendor/github.com/tidwall/match \
+		tidwall:pretty:v1.1.0:tidwall_pretty/vendor/github.com/tidwall/pretty \
+		uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \
+		uber-go:multierr:v1.3.0:uber_go_multierr/vendor/go.uber.org/multierr \
+		uber-go:tools:2cfd321de3ee:uber_go_tools/vendor/go.uber.org/tools \
+		uber-go:zap:v1.13.0:uber_go_zap/vendor/go.uber.org/zap \
+		xeipuuv:gojsonpointer:02993c407bfb:xeipuuv_gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \
+		xeipuuv:gojsonreference:bd5ef7bd5415:xeipuuv_gojsonreference/vendor/github.com/xeipuuv/gojsonreference \
+		xeipuuv:gojsonschema:v1.2.0:xeipuuv_gojsonschema/vendor/github.com/xeipuuv/gojsonschema \
+		xiam:to:8328998fc0ed:xiam_to/vendor/github.com/xiam/to \
+		yashtewari:glob-intersection:5c77d914dd0b:yashtewari_glob_intersection/vendor/github.com/yashtewari/glob-intersection
+
+x-post-extract:
+	@${RM} -r ${WRKSRC}/vendor/github.com/nats-io/jwt/v2
+	@${RLN} ${WRKSRC_nats_io_jwt_v2}/v2 ${WRKSRC}/vendor/github.com/nats-io/jwt/v2
+
+# Missing dependency
+GH_TUPLE+=	choria-io:go-updater:v0.0.3:choria_io_go_updater/vendor/github.com/choria-io/go-updater \
+		fatih:structtag:v1.2.0:fatih_structtag/vendor/github.com/fatih/structtag
+
+post-patch:
+	${REINPLACE_CMD} -e 's/{{cpkg_name}}/choria-broker/' \
+		${WRKSRC}/packager/templates/debian/global/broker.conf
+	${REINPLACE_CMD} -e 's/{{cpkg_name}}/choria-server/' \
+		${WRKSRC}/packager/templates/debian/global/server.conf
+
+pre-build:
+	(cd ${GO_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate ${GO_BUILDFLAGS})
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/choria
+	${INSTALL_DATA} ${WRKSRC}/packager/templates/debian/global/broker.conf ${STAGEDIR}${PREFIX}/etc/choria/broker.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/packager/templates/debian/global/server.conf ${STAGEDIR}${PREFIX}/etc/choria/server.conf.sample
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/choria
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${STAGEDIR}${PREFIX}/bin/choria completion --zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_choria
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${STAGEDIR}${PREFIX}/bin/choria completion --bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/choria
+
+.include <bsd.port.mk>
diff --git a/sysutils/choria/distinfo b/sysutils/choria/distinfo
new file mode 100644
index 000000000000..a346db104e19
--- /dev/null
+++ b/sysutils/choria/distinfo
@@ -0,0 +1,239 @@
+TIMESTAMP = 1619142720
+SHA256 (choria-io-go-choria-v0.22.0_GH0.tar.gz) = 1d4bacafd69e1dbda3987270246b5b7186f7079f8a6d9b388529c59f0a745504
+SIZE (choria-io-go-choria-v0.22.0_GH0.tar.gz) = 683250
+SHA256 (AlecAivazis-survey-v2.2.12_GH0.tar.gz) = 1ed9b731823356d583e4db71febf07a188a37a07a3873d72b1bbe94bdbf9aa24
+SIZE (AlecAivazis-survey-v2.2.12_GH0.tar.gz) = 1600548
+SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
+SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
+SHA256 (Freman-eventloghook-e4d803b6b48b_GH0.tar.gz) = 3e98b6df8714a08b4ef6f0160f9cea00a72a763d3b0bd814e12ca9ffbb4eb222
+SIZE (Freman-eventloghook-e4d803b6b48b_GH0.tar.gz) = 1290
+SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
+SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
+SHA256 (Masterminds-semver-v1.5.0_GH0.tar.gz) = c9140eddfb03dc862f826e7761561260b9a840afa7519cc0919e89a43b5be5ba
+SIZE (Masterminds-semver-v1.5.0_GH0.tar.gz) = 21188
+SHA256 (Masterminds-sprig-v2.22.0_GH0.tar.gz) = c6d0f6e2a3b2aecc888b62c15defcccf16a44e7435c47c7f158b98946c5ee970
+SIZE (Masterminds-sprig-v2.22.0_GH0.tar.gz) = 42051
+SHA256 (Netflix-go-expect-85d881c3777e_GH0.tar.gz) = e882ca01b96a74036aba05451d2083325b379ffc64befcfb66bbd67351690845
+SIZE (Netflix-go-expect-85d881c3777e_GH0.tar.gz) = 15286
+SHA256 (OneOfOne-xxhash-v1.2.8_GH0.tar.gz) = 93af6ad43643a0c61bd548e4e0f0cf37a389ddcd8651ac16f81f9c45207e1bd2
+SIZE (OneOfOne-xxhash-v1.2.8_GH0.tar.gz) = 15513
+SHA256 (achanda-go-sysctl-6be7678c45d2_GH0.tar.gz) = 7fe45edc53fbb7afeb2767c0514ba8743d39a26844023639cb1122475a356c7f
+SIZE (achanda-go-sysctl-6be7678c45d2_GH0.tar.gz) = 5306
+SHA256 (aelsabbahy-GOnetstat-edf89f784e08_GH0.tar.gz) = 49498aedcef66168dcdd2b8ff0ac4e5d1a04118c786c60a408f03c4f45efc072
+SIZE (aelsabbahy-GOnetstat-edf89f784e08_GH0.tar.gz) = 3970
+SHA256 (aelsabbahy-go-ps-61c449472dcf_GH0.tar.gz) = 969fa40ea0a8f9be47938018b9d182a1570b4d6ef7870b064032b667eb881e27
+SIZE (aelsabbahy-go-ps-61c449472dcf_GH0.tar.gz) = 7554
+SHA256 (aelsabbahy-goss-v0.3.16_GH0.tar.gz) = 8c17a59ba849a55283169589a3d46a922ee52f65d021411d59971b1b073e244a
+SIZE (aelsabbahy-goss-v0.3.16_GH0.tar.gz) = 105517
+SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
+SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
+SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
+SIZE (alecthomas-template-fb15b899a751_GH0.tar.gz) = 55339
+SHA256 (alecthomas-units-f65c72e2690d_GH0.tar.gz) = ece06024b01821e013bd7158dfe8ec8cc697f586ce8d3cfaa22edde8c2f022c3
+SIZE (alecthomas-units-f65c72e2690d_GH0.tar.gz) = 4925
+SHA256 (antonmedv-expr-v1.8.9_GH0.tar.gz) = 687a7d14989754090141683a10a69d5f9d582e706f7daa84ff37ed334aeb3f68
+SIZE (antonmedv-expr-v1.8.9_GH0.tar.gz) = 4007487
+SHA256 (awesome-gocui-gocui-v0.6.0_GH0.tar.gz) = ff2c420ad12b561a1a72dbdc19043489a86c28fb70d3c25d4b999e1290f0ee8a
+SIZE (awesome-gocui-gocui-v0.6.0_GH0.tar.gz) = 37489
+SHA256 (awesome-gocui-termbox-go-c0aef3d18bcc_GH0.tar.gz) = fa29e9a5ab162b6fbdaa5585f7dffede8d436cfc47b635383c4cb8dc0fcd0552
+SIZE (awesome-gocui-termbox-go-c0aef3d18bcc_GH0.tar.gz) = 32384
+SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
+SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
+SHA256 (blang-semver-v3.5.1_GH0.tar.gz) = 3d9da53f4c2d3169bfa9b25f2f36f301a37556a47259c870881524c643c69c57
+SIZE (blang-semver-v3.5.1_GH0.tar.gz) = 14831
+SHA256 (brutella-dnssd-v1.2.0_GH0.tar.gz) = 5bc9127f83a40adfd3da3e50357023459a182446ad5293f5acb9bd8ad7e16f19
+SIZE (brutella-dnssd-v1.2.0_GH0.tar.gz) = 259211
+SHA256 (brutella-hc-v1.2.4_GH0.tar.gz) = 59d6ab032526b6402bef4b4b958926124aca5c6b2c95fcdd13788210ee822e3c
+SIZE (brutella-hc-v1.2.4_GH0.tar.gz) = 123816
+SHA256 (bytecodealliance-wasmtime-go-v0.24.0_GH0.tar.gz) = 4791d430bf856be114d397565b8ebd941a20fd951643a22abaf7e432e368197a
+SIZE (bytecodealliance-wasmtime-go-v0.24.0_GH0.tar.gz) = 46087496
+SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d
+SIZE (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 165321
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73
+SIZE (cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585
+SHA256 (choria-io-go-updater-v0.0.3_GH0.tar.gz) = f6c339dc5c9128c1a647bc516324a27baa25c4fe7f18f265f30dd39a25b167cb
+SIZE (choria-io-go-updater-v0.0.3_GH0.tar.gz) = 14849
+SHA256 (cloudevents-sdk-go-v1.2.0_GH0.tar.gz) = 1b927aaa61de5d258e52c9d7fbc1be54c1639847a7a74b85754afb62930c70fd
+SIZE (cloudevents-sdk-go-v1.2.0_GH0.tar.gz) = 178760
+SHA256 (dgrijalva-jwt-go-dc14462fd587_GH0.tar.gz) = ca6ef85be79d8d990c6fa3057da6b827846b2fd60e1a529afd64827950193fd3
+SIZE (dgrijalva-jwt-go-dc14462fd587_GH0.tar.gz) = 37764
+SHA256 (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 3b16c5bec68f71d13be0216b849ce910aa4a1844db6e08dafe90fb1a439974c7
+SIZE (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 367559
+SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
+SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
+SHA256 (fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e
+SIZE (fatih-color-v1.10.0_GH0.tar.gz) = 1267532
+SHA256 (fatih-structtag-v1.2.0_GH0.tar.gz) = f39a7edcb38f70f8b12f8b4f18b386d508c6a5b7f6fbddcee52d299b795fdaab
+SIZE (fatih-structtag-v1.2.0_GH0.tar.gz) = 5702
+SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
+SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
+SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec16794c839252808392097de44
+SIZE (ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772
+SHA256 (go-errors-errors-v1.0.1_GH0.tar.gz) = f3c4e21affe3f563ab6ab5de4086be9eff38c4b5cfb748602f89e814f65c7705
+SIZE (go-errors-errors-v1.0.1_GH0.tar.gz) = 8647
+SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
+SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
+SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
+SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
+SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850
+SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962
+SHA256 (gofrs-uuid-v4.0.0_GH0.tar.gz) = 7857a4f0c066d2e43a1b7912458b028b6fa351eb1a1d41b022dd6ac347e96b4f
+SIZE (gofrs-uuid-v4.0.0_GH0.tar.gz) = 17824
+SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34
+SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725
+SHA256 (golang-crypto-e6e6c4f2bb5b_GH0.tar.gz) = 06bad34612d7bc2c5ce03762571e55095959f6f725f3e6419051d0fe4aa6a518
+SIZE (golang-crypto-e6e6c4f2bb5b_GH0.tar.gz) = 1726200
+SHA256 (golang-groupcache-869f871628b6_GH0.tar.gz) = c997da82585593a4d69a24e3e25c074bb96a7a84b1ef7d2dad4fa1002e93c928
+SIZE (golang-groupcache-869f871628b6_GH0.tar.gz) = 26041
+SHA256 (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 5014077abbc075c3b4b459f7ad98cc1c28f2ae6bde906a9d8ed19d8c8b97987a
+SIZE (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 31889
+SHA256 (golang-mock-v1.5.0_GH0.tar.gz) = 7a8212b8332072626d1ce440883929a28ab18450926bc5164d926c6e5cae61ff
+SIZE (golang-mock-v1.5.0_GH0.tar.gz) = 66429
+SHA256 (golang-mod-v0.3.0_GH0.tar.gz) = bc97bb300928a00cfe64d97b3240c760668060cda0767e0d0b413e506fc3fa0a
+SIZE (golang-mod-v0.3.0_GH0.tar.gz) = 93941
+SHA256 (golang-net-e18ecbb05110_GH0.tar.gz) = c30374f6fd34c6b77d53224aa3ba7458e3773d7e6e4fa16d88fb05c7d05e0e89
+SIZE (golang-net-e18ecbb05110_GH0.tar.gz) = 1253124
+SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
+SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
+SHA256 (golang-sys-33663a62ff08_GH0.tar.gz) = 8852a1a71508149c303106d9cbd06e645adb4ab05d4936a2bbe3af8ec13697c6
+SIZE (golang-sys-33663a62ff08_GH0.tar.gz) = 1231176
+SHA256 (golang-term-f5beecf764ed_GH0.tar.gz) = 60905cd7d54380fe6954f0e693da134115b2bfb49aeda969336ef6a95a709aa1
+SIZE (golang-term-f5beecf764ed_GH0.tar.gz) = 15022
+SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
+SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
+SHA256 (golang-time-89c76fbcd5d1_GH0.tar.gz) = 376a3855d3a951c848f1d3dc8eddf4b91b035f0e7ec3577359aa490b7b056abb
+SIZE (golang-time-89c76fbcd5d1_GH0.tar.gz) = 9605
+SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2
+SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055
+SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
+SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
+SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e
+SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358
+SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
+SIZE (google-shlex-e7afc7fbc510_GH0.tar.gz) = 7342
+SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
+SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
+SHA256 (gosuri-uilive-v0.0.4_GH0.tar.gz) = d6d60529725b8fe0a75d30361961257f2dc0c99ae567256fb6d9e45bf5243036
+SIZE (gosuri-uilive-v0.0.4_GH0.tar.gz) = 153271
+SHA256 (gosuri-uiprogress-v0.0.1_GH0.tar.gz) = 02c75ecc3f948d33beb2a484deb9566a00fccbdfc55ed52ae3bc6e84af669c3d
+SIZE (gosuri-uiprogress-v0.0.1_GH0.tar.gz) = 1655252
+SHA256 (guptarohit-asciigraph-v0.5.2_GH0.tar.gz) = 0c89a5e402cb491f0257457610be2c622d783d49c83524689f4ecb9621096c72
+SIZE (guptarohit-asciigraph-v0.5.2_GH0.tar.gz) = 9606
+SHA256 (hinshun-vt10x-d55458df857c_GH0.tar.gz) = f62fefbeec2f42d4f270f6d6dcb316a8b72afd52a1a1d4a09a0b4edcf29b14a3
+SIZE (hinshun-vt10x-d55458df857c_GH0.tar.gz) = 1231580
+SHA256 (huandu-xstrings-v1.3.0_GH0.tar.gz) = 9315f3988452cde5b7338b53fcf8707d544080e9d1f8212f05b577fa5b0e2427
+SIZE (huandu-xstrings-v1.3.0_GH0.tar.gz) = 16979
+SHA256 (imdario-mergo-v0.3.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
+SIZE (imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
+SHA256 (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = dde336eb697f7f9c26cf6d1467f75b6cf559262c1b0b110d28fff29790f76bc5
+SIZE (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = 4328
+SHA256 (klauspost-compress-v1.11.12_GH0.tar.gz) = ff477d18e3bb9731f8600a41f56cb34d68d4ea47f5cc55974be978303d129296
+SIZE (klauspost-compress-v1.11.12_GH0.tar.gz) = 17453513
+SHA256 (lightstep-tracecontext.go-1757c391b1ac_GH0.tar.gz) = 6dde1293e6ca5d0a98c031d451f04c64a17b544666556456fc6ef65ef375bb83
+SIZE (lightstep-tracecontext.go-1757c391b1ac_GH0.tar.gz) = 7474
+SHA256 (looplab-fsm-v0.2.0_GH0.tar.gz) = 496e377b8e1b16f5cf22b4f9630ad3a4e0ea132cb97e32d3e1e5901550156b8d
+SIZE (looplab-fsm-v0.2.0_GH0.tar.gz) = 14704
+SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
+SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571
+SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
+SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 4f20a337ad06e071f29535afe9c5207d3e8840c8c86672bbc5f9837c6229c835
+SIZE (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 16714
+SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
+SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
+SHA256 (mgutz-ansi-9520e82c474b_GH0.tar.gz) = f9203c71aceb8b7ffa87181fd8f51dc69acce3d2161c4c017ea92c6840f85093
+SIZE (mgutz-ansi-9520e82c474b_GH0.tar.gz) = 4876
+SHA256 (miekg-dns-v1.1.35_GH0.tar.gz) = f3094e13e492d5fc92e55da170389683ef658afc92d37c1761eeabd2f25fa1b7
+SIZE (miekg-dns-v1.1.35_GH0.tar.gz) = 197766
+SHA256 (miekg-pkcs11-v1.0.3_GH0.tar.gz) = c9cafb5135a6bac16fa757e62bc48fd93e84d23ba5b3b8cb43fe6bef796b0426
+SIZE (miekg-pkcs11-v1.0.3_GH0.tar.gz) = 60103
+SHA256 (minio-highwayhash-v1.0.1_GH0.tar.gz) = aa1fd01cd0c16d362e8e8a522f1bed6ccff76fb55107e6f5478b1b7bd329e951
+SIZE (minio-highwayhash-v1.0.1_GH0.tar.gz) = 22967
+SHA256 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
+SIZE (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903
+SHA256 (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = d936baa5006f7dda1346aff863745a110981f7583a1184e93b9077fa52cd4048
+SIZE (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = 27826
+SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3
+SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143
+SHA256 (moby-moby-v1.13.1_GH0.tar.gz) = 0d24e814f7adf19dc281b29fef69d0dfec7994966de9aaed7d4207d3034b9ee0
+SIZE (moby-moby-v1.13.1_GH0.tar.gz) = 7788124
+SHA256 (nats-io-jsm.go-6e5211771ee9_GH0.tar.gz) = b24791abd41cb0a4dea954b1385af9fe9974890c49419898bd11ff1d1f53c0c6
+SIZE (nats-io-jsm.go-6e5211771ee9_GH0.tar.gz) = 101778
+SHA256 (nats-io-jwt-v2.0.1_GH0.tar.gz) = 2b36425e48b91c7460295f240d7e4e7b03890946d9914af4ce46667a78ec9d85
+SIZE (nats-io-jwt-v2.0.1_GH0.tar.gz) = 78340
+SHA256 (nats-io-nats-server-v2.2.2_GH0.tar.gz) = aa2421da9c0605d3bc70f030e8213a3ff6883a724c4ce23709b2526239785032
+SIZE (nats-io-nats-server-v2.2.2_GH0.tar.gz) = 2457137
+SHA256 (nats-io-nats-streaming-server-v0.21.2_GH0.tar.gz) = 4e116cd50e92eb72583db654d083e993a4f217a2096ddb9c56eff561ca5b90ad
+SIZE (nats-io-nats-streaming-server-v0.21.2_GH0.tar.gz) = 2621419
+SHA256 (nats-io-nats.go-6cc31aae93df_GH0.tar.gz) = f197189282c1cd1a273d32a25342e9cc4c1fb128aa57f6ec04c15f1de86e0405
+SIZE (nats-io-nats.go-6cc31aae93df_GH0.tar.gz) = 189070
+SHA256 (nats-io-nkeys-v0.3.0_GH0.tar.gz) = ea281df5dc380b84f61c3712b367f02957cff4cb7802e73b2b0b7588e4f6b809
+SIZE (nats-io-nkeys-v0.3.0_GH0.tar.gz) = 19986
+SHA256 (nats-io-nuid-v1.0.1_GH0.tar.gz) = a0b4fe5b40781add2a9fdb5d723313be5f5d11c1a79ea1dd2671278826ef078d
+SIZE (nats-io-nuid-v1.0.1_GH0.tar.gz) = 7529
+SHA256 (nats-io-stan.go-v0.8.3_GH0.tar.gz) = b175d306e2e3200dea59b16a703255e65e6d9230b125908b8d9eb839f3ffdb91
+SIZE (nats-io-stan.go-v0.8.3_GH0.tar.gz) = 60423
+SHA256 (nxadm-tail-v1.4.8_GH0.tar.gz) = 8208362046819275a0809000dceacbd7b2a7caa07bcd6547dd2ff9b2104fa56c
+SIZE (nxadm-tail-v1.4.8_GH0.tar.gz) = 1255770
+SHA256 (oleiade-reflections-0e86b3c98b2f_GH0.tar.gz) = 7555f68c949dfc18f2cd7e08d99b0bec23d93a29fa91922b0d5fa8cf203cb879
+SIZE (oleiade-reflections-0e86b3c98b2f_GH0.tar.gz) = 6855
+SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f
+SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568
+SHA256 (onsi-ginkgo-v1.16.1_GH0.tar.gz) = 976ba34e4346d2bc2c6063d3bbab3158b2197af60a99e3af7377ce4e64ceb6b1
+SIZE (onsi-ginkgo-v1.16.1_GH0.tar.gz) = 163382
+SHA256 (onsi-gomega-v1.11.0_GH0.tar.gz) = 474c31779682826b62fed14f7599acb3ac11b6c135b43beda2eca592aa4f74c9
+SIZE (onsi-gomega-v1.11.0_GH0.tar.gz) = 102337
+SHA256 (open-policy-agent-opa-v0.27.1_GH0.tar.gz) = d1f3cee2261adc83df54fba2d62b045549d064ac14b7683031ec3897c2bdbd44
+SIZE (open-policy-agent-opa-v0.27.1_GH0.tar.gz) = 68132034
+SHA256 (opencontainers-runc-8779fa57eb4a_GH0.tar.gz) = f1f19d6ed8169b699e0670c1ee42a39ecc6a122a5a2f6b42b75516cff658fc97
+SIZE (opencontainers-runc-8779fa57eb4a_GH0.tar.gz) = 560910
+SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be
+SIZE (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 13572
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (prometheus-client_golang-v1.10.0_GH0.tar.gz) = e7305f84aa6553d9dd4bfd148d29289df36a9df82dae7be3c6eda62feb56f3d1
+SIZE (prometheus-client_golang-v1.10.0_GH0.tar.gz) = 176316
+SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
+SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
+SHA256 (prometheus-common-v0.18.0_GH0.tar.gz) = 64b0963add6f1945d8da40452d9bf796db263e4d8aba26cf17fdcc3f76b8f940
+SIZE (prometheus-common-v0.18.0_GH0.tar.gz) = 123693
+SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
+SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
+SHA256 (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 318e54ee12d09e9c76fc11cf85f6297360e6444b74a6a7882450501bb952ba56
+SIZE (protocolbuffers-protobuf-go-v1.24.0_GH0.tar.gz) = 1227640
+SHA256 (rcrowley-go-metrics-10cdbea86bc0_GH0.tar.gz) = 3f1c492e20be6214a1211602bf2675d42cff5fa59c452a231557e3add587e57c
+SIZE (rcrowley-go-metrics-10cdbea86bc0_GH0.tar.gz) = 37583
+SHA256 (robfig-cron-v1.2.0_GH0.tar.gz) = c0670687f803388d1655773d097c7c623b4c7e552f5ee5f7dc5e27e313e70c64
+SIZE (robfig-cron-v1.2.0_GH0.tar.gz) = 14978
+SHA256 (rsc-goversion-v1.2.0_GH0.tar.gz) = 65e9c181995ed8c9207ea08d79a148ab53307b7fad2172a5a0764d6aa393a98e
+SIZE (rsc-goversion-v1.2.0_GH0.tar.gz) = 8586
+SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860739cf8f2266958e0c574c7abfdd74
+SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
+SHA256 (tadglines-go-pkgs-1f86682992f1_GH0.tar.gz) = 96cbd9945679d5ac0f53aa513d3f17d2f4db2002d34d5f490a1278b737566d5c
+SIZE (tadglines-go-pkgs-1f86682992f1_GH0.tar.gz) = 11772
+SHA256 (tidwall-gjson-v1.7.5_GH0.tar.gz) = 97d7cc8e7ea056db0f11c846869c7ed67e682c90839be808e0c4c1447aec9cf0
+SIZE (tidwall-gjson-v1.7.5_GH0.tar.gz) = 50355
+SHA256 (tidwall-match-v1.0.3_GH0.tar.gz) = 12f9c257baf7c96eb009b3f814326ef95837bf84a4f9fcc2816cf12e78aa0f9e
+SIZE (tidwall-match-v1.0.3_GH0.tar.gz) = 4829
+SHA256 (tidwall-pretty-v1.1.0_GH0.tar.gz) = 3b29b957afa66beb8eee7cd5910b3f4e3cd1dbe72f93e563c8e8e297d14a87d5
+SIZE (tidwall-pretty-v1.1.0_GH0.tar.gz) = 10503
+SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1
+SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566
+SHA256 (uber-go-multierr-v1.3.0_GH0.tar.gz) = 54bba1d61d996b98ccdf1d353e0fc66bbff599fe202719d1f55e490e127be574
+SIZE (uber-go-multierr-v1.3.0_GH0.tar.gz) = 11537
+SHA256 (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = a7d91d3ddea6d8a83240af46436e02d65b835b60bcb85ad1c5bc6aebad32f567
+SIZE (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = 11054
+SHA256 (uber-go-zap-v1.13.0_GH0.tar.gz) = dcadd2fc1a93124b594e2fd951456bb1727f922f5ef005e388273851d0607ae7
+SIZE (uber-go-zap-v1.13.0_GH0.tar.gz) = 122949
+SHA256 (xeipuuv-gojsonpointer-02993c407bfb_GH0.tar.gz) = 36e17c61a2a9384cfdaa1817327f368a1eec66722a7c72ce26abcf8e36ace446
+SIZE (xeipuuv-gojsonpointer-02993c407bfb_GH0.tar.gz) = 7698
+SHA256 (xeipuuv-gojsonreference-bd5ef7bd5415_GH0.tar.gz) = f99765bc8692e620f8abc3f36e10df36a4161c5634505632599ce88abc2d8f55
+SIZE (xeipuuv-gojsonreference-bd5ef7bd5415_GH0.tar.gz) = 6958
+SHA256 (xeipuuv-gojsonschema-v1.2.0_GH0.tar.gz) = ad47429e26a7078df155bffe2d3ff2e967fb0d6be185b5ffe995d6731916bcf7
+SIZE (xeipuuv-gojsonschema-v1.2.0_GH0.tar.gz) = 73602
+SHA256 (xiam-to-8328998fc0ed_GH0.tar.gz) = 87ab83ecf194543b403ab7105208fbeed7d6ee27b789af0a87f44b0ed8905a56
+SIZE (xiam-to-8328998fc0ed_GH0.tar.gz) = 6925
+SHA256 (yashtewari-glob-intersection-5c77d914dd0b_GH0.tar.gz) = 5b8d8094433316858d60dc34b3c2dfb50f335a580be5b73ef523c48217cd953d
+SIZE (yashtewari-glob-intersection-5c77d914dd0b_GH0.tar.gz) = 12787
diff --git a/sysutils/choria/files/choria-broker.in b/sysutils/choria/files/choria-broker.in
new file mode 100644
index 000000000000..0dd778f040ce
--- /dev/null
+++ b/sysutils/choria/files/choria-broker.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# PROVIDE: choria_broker
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to run the choria broker:
+#
+# choria_broker_enable (bool):	Set it to "YES" to enable the choria broker.
+#				Default is "NO".
+# choria_broker_options:	Options to pass to the choria broker
+#
+
+. /etc/rc.subr
+
+name="choria_broker"
+rcvar=`set_rcvar`
+pidfile="/var/run/${name}.pid"
+
+load_rc_config ${name}
+: ${choria_broker_enable="NO"}
+: ${choria_broker_options="--config=%%PREFIX%%/etc/choria/broker.conf"}
+
+command=/usr/sbin/daemon
+procname=%%PREFIX%%/bin/choria
+command_args="-p ${pidfile} ${procname} broker run ${choria_broker_options}"
+
+PATH="${PATH}:%%PREFIX%%/bin"
+export GODEBUG=x509ignoreCN=0
+
+run_rc_command "$1"
diff --git a/sysutils/choria/files/choria-server.in b/sysutils/choria/files/choria-server.in
new file mode 100644
index 000000000000..c4515bb42371
--- /dev/null
+++ b/sysutils/choria/files/choria-server.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# PROVIDE: choria_server
+# REQUIRE: DAEMON
+#
+# Add the following lines to /etc/rc.conf to run the choria server:
+#
+# choria_server_enable (bool):	Set it to "YES" to enable the choria server.
+#				Default is "NO".
+# choria_server_options:	Options to pass to the choria server
+#
+
+. /etc/rc.subr
+
+name="choria_server"
+rcvar=`set_rcvar`
+pidfile="/var/run/${name}.pid"
+
+load_rc_config ${name}
+: ${choria_server_enable="NO"}
+: ${choria_server_options="--config=%%PREFIX%%/etc/choria/server.conf"}
+
+command=/usr/sbin/daemon
+procname=%%PREFIX%%/bin/choria
+command_args="-p ${pidfile} ${procname} server run ${choria_server_options}"
+
+PATH="${PATH}:%%PREFIX%%/bin"
+export GODEBUG=x509ignoreCN=0
+
+run_rc_command "$1"
diff --git a/sysutils/choria/pkg-descr b/sysutils/choria/pkg-descr
new file mode 100644
index 000000000000..79509c831027
--- /dev/null
+++ b/sysutils/choria/pkg-descr
@@ -0,0 +1,8 @@
+Choria is a framework for building Control Planes, Orchestration Systems and
+Programmable Infrastructure.
+
+This is a daemon and related tools written in Go that hosts services,
+autonomous agents and generally provide a secure hosting environment for
+callable logic that you can interact with from code.
+
+WWW: https://choria.io/
diff --git a/sysutils/choria/pkg-plist b/sysutils/choria/pkg-plist
new file mode 100644
index 000000000000..51b9f2e56357
--- /dev/null
+++ b/sysutils/choria/pkg-plist
@@ -0,0 +1,6 @@
+bin/choria
+etc/bash_completion.d/choria
+@sample etc/choria/broker.conf.sample
+@sample etc/choria/server.conf.sample
+@dir share/choria
+share/zsh/site-functions/_choria
diff --git a/sysutils/chyves/Makefile b/sysutils/chyves/Makefile
index 90b7314cee7e..52234c97a2a0 100644
--- a/sysutils/chyves/Makefile
+++ b/sysutils/chyves/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	chyves
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
@@ -18,7 +16,7 @@ NO_ARCH=	yes
 
 MAKE_ARGS+=	-e
 
-do-patch:
+post-patch:
 	${REINPLACE_CMD} 's%\$$(PREFIX)%${STAGEDIR}/$$(PREFIX)%g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 68003cd316f3..027161ce8449 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -1,79 +1,60 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	cinnamon-control-center
-PORTVERSION=	2.4.2
-PORTREVISION=	8
+PORTVERSION=	4.8.2
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/9363a4a1e121344ae98f22b55fb28623cf0f6038/panels/datetime/data/:tzpng
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR=	gnome3
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for Cinnamon
 
-BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
-		cinnamon-settings-daemon>=0:sysutils/cinnamon-settings-daemon \
-		gnome-autogen.sh:devel/gnome-common
-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
-		libupower-glib.so:sysutils/upower \
-		libcheese.so:multimedia/cheese \
-		libcaribou.so:accessibility/caribou \
-		libgtop-2.0.so:devel/libgtop \
-		libmuffin.so:x11-wm/muffin \
-		libtelepathy-glib.so:net-im/telepathy-glib \
-		libtelepathy-logger.so:net-im/telepathy-logger \
-		libgnomekbdui.so:x11/libgnomekbd \
-		libfolks.so:net-im/folks \
-		libpulse.so:audio/pulseaudio \
-		libcroco-0.6.so:textproc/libcroco \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libclutter-glx-1.0.so:graphics/clutter \
-		libclutter-gst-2.0.so:multimedia/clutter-gst \
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	cinnamon-settings-daemon>=1.0.0:sysutils/cinnamon-settings-daemon \
+		iso-codes>0:misc/iso-codes
+LIB_DEPENDS=	libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libcinnamon-menu-3.so:x11/cinnamon-menus \
-		libgjs.so:lang/gjs
-RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
-		cinnamon-settings-daemon>=0:sysutils/cinnamon-settings-daemon \
-		ca_root_nss>=0:security/ca_root_nss \
-		py*-lxml>=0:devel/py-lxml
+		libdbus-1.so:devel/dbus \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libnotify.so:devel/libnotify \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libxklavier.so:x11/libxklavier \
+		libharfbuzz.so:print/harfbuzz
+RUN_DEPENDS=	iso-codes>0:misc/iso-codes \
+		cinnamon-settings-daemon>=1.0.0:sysutils/cinnamon-settings-daemon
+
+USES=		gettext gnome meson pkgconfig python:3.5+,build shebangfix xorg
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool libgnomekbd libxml2
+USE_XORG=	x11 xfixes sm
 
-USES=		autoreconf gettext gmake libtool pathfix \
-		python:2.7 pkgconfig
-USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
-		gtk30 intlhack libgnomekbd
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_XORG=	x11 xfixes sm
+
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-compile-warnings=no
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
 
+MESON_ARGS=	-Dnetworkmanager=false \
+		-Dmodemmanager=false
+
+SHEBANG_GLOB=	*.py
+
+OPTIONS_DEFINE=	COLORD ONLINEACCOUNTS WACOM
+OPTIONS_DEFAULT=COLORD ONLINEACCOUNTS WACOM
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	CUPS
-OPTIONS_DEFAULT=CUPS
-CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
-MISSING_PNG=timezone_8.5.png timezone_8.5_dim.png
-.for i in ${MISSING_PNG}
-DISTFILES+=${i}:tzpng
-.endfor
+ONLINEACCOUNTS_DESC=	GNOME Online Accounts panel support
+WACOM_DESC=	Wacom management panel support
+
+COLORD_LIB_DEPENDS=	libcolord.so:graphics/colord
+COLORD_MESON_TRUE=	color
 
-post-extract:
-.for i in ${MISSING_PNG}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}/panels/datetime/data/.
-.endfor
+ONLINEACCOUNTS_LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts
+ONLINEACCOUNTS_MESON_TRUE=	onlineaccounts
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
-		${WRKSRC}/files/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g' \
-		${WRKSRC}/panels/common/cc-common-language.c
+WACOM_LIB_DEPENDS=	libwacom.so:x11/libwacom
+WACOM_USE=		xorg=xi
+WACOM_MESON_TRUE=	wacom
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 3e1b80def01d..4bde1594df02 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,6 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-control-center-2.4.2_GH0.tar.gz) = 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188
-SIZE (gnome3/linuxmint-cinnamon-control-center-2.4.2_GH0.tar.gz) = 4305006
-SHA256 (gnome3/timezone_8.5.png) = 36ad1fd33d77271fe686e71054b80ca77eabb0ed1b45f895c7658c7a4b14f8e9
-SIZE (gnome3/timezone_8.5.png) = 16050
-SHA256 (gnome3/timezone_8.5_dim.png) = c46f8fc9d5851ebf32c7f99d3ee245d3201ff3143cbca87f6b3919dc8e2f9ca0
-SIZE (gnome3/timezone_8.5_dim.png) = 9378
+TIMESTAMP = 1612595657
+SHA256 (gnome/linuxmint-cinnamon-control-center-4.8.2_GH0.tar.gz) = 407e88fe458af7b25c0dd91d54aad93a72a1464ced285a741ed1ce6249ed61af
+SIZE (gnome/linuxmint-cinnamon-control-center-4.8.2_GH0.tar.gz) = 3865765
diff --git a/sysutils/cinnamon-control-center/files/patch-configure.ac b/sysutils/cinnamon-control-center/files/patch-configure.ac
deleted file mode 100644
index 5543f51cb6aa..000000000000
--- a/sysutils/cinnamon-control-center/files/patch-configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.ac.orig	2014-11-26 22:11:51.000000000 +0100
-+++ configure.ac	2015-08-09 16:26:26.690975000 +0200
-@@ -35,7 +35,6 @@
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
- 
--GNOME_DEBUG_CHECK
- GNOME_COMPILE_WARNINGS([maximum])
- 
- AC_PATH_XTRA
-@@ -138,13 +137,6 @@
- #----------------------------------------------
- # Network Manager Stuff
- 
--PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
--                  libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
--                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
--                  [have_networkmanager=yes], have_networkmanager=no)
- if test "x$have_networkmanager" = xno ; then
-         AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
- else
diff --git a/sysutils/cinnamon-control-center/files/patch-m4_intltool.m4 b/sysutils/cinnamon-control-center/files/patch-m4_intltool.m4
deleted file mode 100644
index 15a21d7957bd..000000000000
--- a/sysutils/cinnamon-control-center/files/patch-m4_intltool.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/intltool.old.m4	2013-03-01 16:42:44.610216396 +0100
-+++ m4/intltool.m4	2013-03-01 16:43:03.089215905 +0100
-@@ -174,7 +174,7 @@
-       [DATADIRNAME=share], [DATADIRNAME=lib])
-     ;;
-     *)
--    [DATADIRNAME=lib]
-+    [DATADIRNAME=share]
-     ;;
-     esac])
- fi
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_datetime_Makefile.am b/sysutils/cinnamon-control-center/files/patch-panels_datetime_Makefile.am
deleted file mode 100644
index deed1a7c363b..000000000000
--- a/sysutils/cinnamon-control-center/files/patch-panels_datetime_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- panels/datetime/Makefile.am.orig	2014-11-26 21:11:51 UTC
-+++ panels/datetime/Makefile.am
-@@ -93,6 +93,8 @@ dist_ui_DATA = \
- 	data/timezone_-8_dim.png \
- 	data/timezone_8.png \
- 	data/timezone_8_dim.png \
-+	data/timezone_8.5.png \
-+	data/timezone_8.5_dim.png \
- 	data/timezone_8.75.png \
- 	data/timezone_8.75_dim.png \
- 	data/timezone_-9.png \
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 72b738451f4c..5461aa3253fe 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -1,281 +1,45 @@
 bin/cinnamon-control-center
-bin/cinnamon-sound-applet
-etc/xdg/autostart/cinnamon-sound-applet.desktop
-etc/xdg/menus/cinnamoncc.menu
 include/cinnamon-control-center-1/libcinnamon-control-center/cc-editable-entry.h
 include/cinnamon-control-center-1/libcinnamon-control-center/cc-panel.h
 include/cinnamon-control-center-1/libcinnamon-control-center/cc-shell.h
-lib/cinnamon-control-center-1/panels/libcolor.a
-lib/cinnamon-control-center-1/panels/libcolor.so
-lib/cinnamon-control-center-1/panels/libdate_time.a
-lib/cinnamon-control-center-1/panels/libdate_time.so
-lib/cinnamon-control-center-1/panels/libdisplay.a
+%%COLORD%%lib/cinnamon-control-center-1/panels/libcolor.so
 lib/cinnamon-control-center-1/panels/libdisplay.so
-lib/cinnamon-control-center-1/panels/libpower.a
-lib/cinnamon-control-center-1/panels/libpower.so
-lib/cinnamon-control-center-1/panels/libregion.a
+%%ONLINEACCOUNTS%%lib/cinnamon-control-center-1/panels/libonline-accounts.so
 lib/cinnamon-control-center-1/panels/libregion.so
-lib/cinnamon-control-center-1/panels/libscreen.a
-lib/cinnamon-control-center-1/panels/libscreen.so
-lib/cinnamon-control-center-1/panels/libsoundnua.a
-lib/cinnamon-control-center-1/panels/libsoundnua.so
-lib/cinnamon-control-center-1/panels/libuniversal-access.a
-lib/cinnamon-control-center-1/panels/libuniversal-access.so
+%%WACOM%%lib/cinnamon-control-center-1/panels/libwacom-properties.so
 lib/libcinnamon-control-center.so
 lib/libcinnamon-control-center.so.1
 lib/libcinnamon-control-center.so.1.0.0
 libdata/pkgconfig/libcinnamon-control-center.pc
-share/applications/cinnamon-color-panel.desktop
-share/applications/cinnamon-control-center.desktop
-share/applications/cinnamon-datetime-panel.desktop
+%%COLORD%%share/applications/cinnamon-color-panel.desktop
 share/applications/cinnamon-display-panel.desktop
 share/applications/cinnamon-region-panel.desktop
-share/applications/cinnamon-sound-nua-panel.desktop
-share/applications/cinnamon-sound-panel.desktop
-share/applications/cinnamon-universal-access-panel.desktop
-share/cinnamon-control-center/datetime/backward
-share/cinnamon-control-center/icons/hicolor/16x16/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/16x16/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/22x22/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/24x24/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/24x24/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/32x32/devices/cin-audio-headset.svg
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-high.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-low.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-medium.png
-share/cinnamon-control-center/icons/hicolor/32x32/status/cin-audio-input-microphone-muted.png
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center-back.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-center.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-back.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-side-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left-side.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-left.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-back-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-back.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-side-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-side.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-speaker-right.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
-share/cinnamon-control-center/icons/hicolor/48x48/devices/audio-subwoofer.svg
-share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
-share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
-share/cinnamon-control-center/ui/cinnamon-region-panel.ui
-share/cinnamon-control-center/ui/color.ui
-share/cinnamon-control-center/ui/datetime/bg.png
-share/cinnamon-control-center/ui/datetime/bg_dim.png
-share/cinnamon-control-center/ui/datetime/cc.png
-share/cinnamon-control-center/ui/datetime/datetime.ui
-share/cinnamon-control-center/ui/datetime/pin.png
-share/cinnamon-control-center/ui/datetime/timezone_-1.png
-share/cinnamon-control-center/ui/datetime/timezone_-10.png
-share/cinnamon-control-center/ui/datetime/timezone_-10_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-11.png
-share/cinnamon-control-center/ui/datetime/timezone_-11_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-1_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-2.png
-share/cinnamon-control-center/ui/datetime/timezone_-2_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-3.png
-share/cinnamon-control-center/ui/datetime/timezone_-3_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-4.png
-share/cinnamon-control-center/ui/datetime/timezone_-4_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-5.png
-share/cinnamon-control-center/ui/datetime/timezone_-5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-6.png
-share/cinnamon-control-center/ui/datetime/timezone_-6_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-7.png
-share/cinnamon-control-center/ui/datetime/timezone_-7_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-8.png
-share/cinnamon-control-center/ui/datetime/timezone_-8_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.5.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_-9.png
-share/cinnamon-control-center/ui/datetime/timezone_-9_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_0.png
-share/cinnamon-control-center/ui/datetime/timezone_0_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_1.png
-share/cinnamon-control-center/ui/datetime/timezone_10.5.png
-share/cinnamon-control-center/ui/datetime/timezone_10.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_10.png
-share/cinnamon-control-center/ui/datetime/timezone_10_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_11.5.png
-share/cinnamon-control-center/ui/datetime/timezone_11.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_11.png
-share/cinnamon-control-center/ui/datetime/timezone_11_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_12.75.png
-share/cinnamon-control-center/ui/datetime/timezone_12.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_12.png
-share/cinnamon-control-center/ui/datetime/timezone_12_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_13.png
-share/cinnamon-control-center/ui/datetime/timezone_13_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_14.png
-share/cinnamon-control-center/ui/datetime/timezone_14_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_1_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_2.png
-share/cinnamon-control-center/ui/datetime/timezone_2_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_3.5.png
-share/cinnamon-control-center/ui/datetime/timezone_3.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_3.png
-share/cinnamon-control-center/ui/datetime/timezone_3_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_4.5.png
-share/cinnamon-control-center/ui/datetime/timezone_4.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_4.png
-share/cinnamon-control-center/ui/datetime/timezone_4_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.5.png
-share/cinnamon-control-center/ui/datetime/timezone_5.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.75.png
-share/cinnamon-control-center/ui/datetime/timezone_5.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_5.png
-share/cinnamon-control-center/ui/datetime/timezone_5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_6.5.png
-share/cinnamon-control-center/ui/datetime/timezone_6.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_6.png
-share/cinnamon-control-center/ui/datetime/timezone_6_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_7.png
-share/cinnamon-control-center/ui/datetime/timezone_7_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_8.5.png
-share/cinnamon-control-center/ui/datetime/timezone_8.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_8.75.png
-share/cinnamon-control-center/ui/datetime/timezone_8.75_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_8.png
-share/cinnamon-control-center/ui/datetime/timezone_8_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_9.5.png
-share/cinnamon-control-center/ui/datetime/timezone_9.5_dim.png
-share/cinnamon-control-center/ui/datetime/timezone_9.png
-share/cinnamon-control-center/ui/datetime/timezone_9_dim.png
-share/cinnamon-control-center/ui/display-capplet.ui
-share/cinnamon-control-center/ui/language-chooser.ui
-share/cinnamon-control-center/ui/power.ui
-share/cinnamon-control-center/ui/screen.ui
-share/cinnamon-control-center/ui/shell.ui
-share/cinnamon-control-center/ui/uap.ui
-share/cinnamon-control-center/ui/zoom-options.ui
-share/desktop-directories/cinnamoncc.directory
-share/icons/hicolor/16x16/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/16x16/apps/cin-multimedia-volume-control.svg
-share/icons/hicolor/16x16/apps/cinnamon-power-manager.png
-share/icons/hicolor/16x16/apps/cinnamon-preferences-color.png
+%%WACOM%%share/applications/cinnamon-wacom-panel.desktop
+%%DATADIR%%/ui/cinnamon-region-panel-layout-chooser.ui
+%%DATADIR%%/ui/cinnamon-region-panel-options-dialog.ui
+%%DATADIR%%/ui/cinnamon-region-panel.ui
+%%COLORD%%%%DATADIR%%/ui/color.ui
+%%DATADIR%%/ui/display-capplet.ui
+%%DATADIR%%/ui/language-chooser.ui
+%%ONLINEACCOUNTS%%%%DATADIR%%/ui/online-accounts.ui
+%%DATADIR%%/ui/shell.ui
+%%COLORD%%share/icons/hicolor/16x16/apps/cinnamon-preferences-color.png
 share/icons/hicolor/16x16/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/16x16/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.svg
-share/icons/hicolor/22x22/apps/cinnamon-power-manager.png
-share/icons/hicolor/22x22/apps/cinnamon-preferences-color.png
+%%ONLINEACCOUNTS%%share/icons/hicolor/16x16/apps/cs-online-accounts.png
+%%COLORD%%share/icons/hicolor/22x22/apps/cinnamon-preferences-color.png
 share/icons/hicolor/22x22/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/22x22/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/24x24/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/24x24/apps/cinnamon-power-manager.png
-share/icons/hicolor/24x24/apps/cinnamon-preferences-color.png
+%%ONLINEACCOUNTS%%share/icons/hicolor/22x22/apps/cs-online-accounts.png
+%%COLORD%%share/icons/hicolor/24x24/apps/cinnamon-preferences-color.png
 share/icons/hicolor/24x24/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/256x256/apps/cinnamon-power-manager.png
-share/icons/hicolor/256x256/apps/cinnamon-preferences-color.png
-share/icons/hicolor/256x256/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.svg
-share/icons/hicolor/32x32/apps/cinnamon-power-manager.png
-share/icons/hicolor/32x32/apps/cinnamon-preferences-color.png
+%%ONLINEACCOUNTS%%share/icons/hicolor/24x24/apps/cs-online-accounts.png
+%%COLORD%%share/icons/hicolor/256x256/apps/cinnamon-preferences-color.png
+%%ONLINEACCOUNTS%%share/icons/hicolor/256x256/apps/cs-online-accounts.png
+%%COLORD%%share/icons/hicolor/32x32/apps/cinnamon-preferences-color.png
 share/icons/hicolor/32x32/apps/cinnamon-preferences-desktop-display.png
-share/icons/hicolor/32x32/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/48x48/apps/cin-multimedia-volume-control.png
-share/icons/hicolor/48x48/apps/cinnamon-power-manager.png
-share/icons/hicolor/48x48/apps/cinnamon-preferences-color.png
-share/icons/hicolor/48x48/apps/cinnamon-preferences-system-time.png
-share/icons/hicolor/48x48/devices/cin-audio-headset.svg
-share/icons/hicolor/64x64/apps/cinnamon-preferences-color.png
-share/icons/hicolor/scalable/apps/cin-multimedia-volume-control.svg
-share/icons/hicolor/scalable/apps/cinnamon-preferences-color.svg
+%%ONLINEACCOUNTS%%share/icons/hicolor/32x32/apps/cs-online-accounts.png
+%%COLORD%%share/icons/hicolor/48x48/apps/cinnamon-preferences-color.png
+%%ONLINEACCOUNTS%%share/icons/hicolor/48x48/apps/cs-online-accounts.png
+%%ONLINEACCOUNTS%%@dir share/icons/hicolor/64x64/apps
+%%COLORD%%share/icons/hicolor/64x64/apps/cinnamon-preferences-color.png
+%%COLORD%%share/icons/hicolor/scalable/apps/cinnamon-preferences-color.svg
 share/icons/hicolor/scalable/apps/cinnamon-preferences-desktop-display.svg
-share/icons/hicolor/scalable/apps/cinnamon-preferences-system-time.svg
-share/icons/hicolor/scalable/status/cin-audio-input-microphone-high-symbolic.svg
-share/icons/hicolor/scalable/status/cin-audio-input-microphone-low-symbolic.svg
-share/icons/hicolor/scalable/status/cin-audio-input-microphone-medium-symbolic.svg
-share/icons/hicolor/scalable/status/cin-audio-input-microphone-muted-symbolic.svg
-share/locale/am/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ar/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/as/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ast/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/bg/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/bn/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/bs/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ca/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/cs/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/cy/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/da/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/de/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/el/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/es/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/et/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/fa/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/fi/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/fr/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/gl/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/gu/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/he/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/hi/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/hr/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/hu/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/id/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ilo/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/is/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/it/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ja/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ka/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/kn/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ko/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ku/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/lo/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/lt/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/lv/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/mai/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/mk/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ml/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/mr/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ms/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/nb/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/nds/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/nl/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/nn/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/or/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/pa/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/pl/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/pt/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ro/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ru/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/si/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/sk/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/sl/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/sq/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/sr/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/sv/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ta/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/te/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/tr/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/uk/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/ur/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/vi/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-timezones.mo
-share/polkit-1/rules.d/cinnamon-control-center.rules
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index 68b315d16aa0..8ac634a3f8aa 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -1,76 +1,84 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	cinnamon-settings-daemon
-PORTVERSION=	2.4.3
-PORTREVISION=	6
+PORTVERSION=	4.8.5
 CATEGORIES=	sysutils gnome
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 3 settings daemon
+COMMENT=	Cinnamon desktop settings daemon
+
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
 BUILD_DEPENDS=	cinnamon-session:x11/cinnamon-session \
-		gnome-autogen.sh:devel/gnome-common \
-		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
-		docbook-xsl>=0:textproc/docbook-xsl
-LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		xf86-input-wacom>0:x11-drivers/xf86-input-wacom \
+		gln:sysutils/coreutils
+LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libpolkit-gobject-1.so:sysutils/polkit \
-		libibus-1.0.so:textproc/ibus \
+		libgudev-1.0.so:devel/libgudev \
 		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
 		libcolord.so:graphics/colord \
 		liblcms2.so:graphics/lcms2 \
 		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libxklavier.so:x11/libxklavier \
+		libnspr4.so:devel/nspr \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libupower-glib.so:sysutils/upower \
 		libpulse.so:audio/pulseaudio \
-		libgdbm.so:databases/gdbm \
-		libnotify.so:devel/libnotify
-RUN_DEPENDS=	cinnamon-session:x11/cinnamon-session \
-		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-
-USES=		autoreconf gettext gmake libtool pathfix \
-		pkgconfig tar:xz
-USE_GNOME=	gnomeprefix intlhack libgnomekbd \
-		libxslt:build
+		libnotify.so:devel/libnotify \
+		libharfbuzz.so:print/harfbuzz
+RUN_DEPENDS=	cinnamon-session:x11/cinnamon-session
+
+USES=		compiler:c11 gettext-tools gnome localbase meson pkgconfig \
+		python:3.5+,build shebangfix xorg
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool libgnomekbd librsvg2
+USE_XORG=	x11 xext xfixes xi xtst
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-GNU_CONFIGURE=	yes
+
+MESON_ARGS=	-Duse_logind=disabled
+
+SHEBANG_GLOB=	*.py
+BINARY_ALIAS=	ln=gln
+
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gudev \
-		--disable-systemd \
-		--disable-packagekit \
-		--with-gnome-distributor="FreeBSD GNOME Project"
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.cinnamon.settings-daemon.enums.xml \
 		org.cinnamon.settings-daemon.peripherals.gschema.xml \
-		org.cinnamon.settings-daemon.plugins.background.gschema.xml \
+		org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.color.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.housekeeping.gschema.xml \
-		org.cinnamon.settings-daemon.plugins.keyboard.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml \
-		org.cinnamon.settings-daemon.plugins.orientation.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.power.gschema.xml \
-		org.cinnamon.settings-daemon.plugins.print-notifications.gschema.xml \
 		org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml \
-		org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml \
+		org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml
 
+OPTIONS_DEFINE=	CUPS SMARTCARD WACOM
+OPTIONS_DEFAULT=CUPS SMARTCARD WACOM
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	CUPS SMARTCARD
-OPTIONS_DEFAULT=CUPS SMARTCARD
-SMARTCARD_DESC=	Smartcard support
-CUPS_CONFIGURE_ENABLE=	cups
+
+CUPS_MESON_ENABLED=	use_cups
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
-SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
+
+SMARTCARD_DESC=	Smartcard support
+SMARTCARD_MESON_ENABLED=	enable_smartcard
 SMARTCARD_LIB_DEPENDS=	libnss3.so:security/nss
 
+WACOM_DESC=	Tablet support with libwacom
+WACOM_LIB_DEPENDS=	libwacom.so:x11/libwacom
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
-		${WRKSRC}/data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in.in
-	@${REINPLACE_CMD} -e '/wacom/d' \
-		${WRKSRC}/data/Makefile.am
+	# Adhere to our hier(7).
+	@${MKDIR} ${WRKSRC}/files${PREFIX}
+	@${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo
index a4d710bb9d6b..602b5ea391a8 100644
--- a/sysutils/cinnamon-settings-daemon/distinfo
+++ b/sysutils/cinnamon-settings-daemon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/linuxmint-cinnamon-settings-daemon-2.4.3_GH0.tar.gz) = 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2
-SIZE (gnome3/linuxmint-cinnamon-settings-daemon-2.4.3_GH0.tar.gz) = 2998895
+TIMESTAMP = 1612567899
+SHA256 (gnome/linuxmint-cinnamon-settings-daemon-4.8.5_GH0.tar.gz) = f2e770113230e04bb5fe887c33b725ac273dcac912a3825ab6b9c821ce92ff32
+SIZE (gnome/linuxmint-cinnamon-settings-daemon-4.8.5_GH0.tar.gz) = 662123
diff --git a/sysutils/cinnamon-settings-daemon/files/patch-data_org.cinnamon.settings-daemon.plugins.gschema.xml.in.in b/sysutils/cinnamon-settings-daemon/files/patch-data_org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
deleted file mode 100644
index 442f50f8e143..000000000000
--- a/sysutils/cinnamon-settings-daemon/files/patch-data_org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in.orig	2013-11-24 10:35:18.768433206 +0000
-+++ data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in	2013-11-24 10:35:27.389435282 +0000
-@@ -10,7 +10,6 @@
-     <child name="keyboard" schema="org.cinnamon.settings-daemon.plugins.keyboard"/>
-     <child name="media-keys" schema="org.cinnamon.settings-daemon.plugins.media-keys"/>
-     <child name="mouse" schema="org.cinnamon.settings-daemon.plugins.mouse"/>
--    <child name="orientation" schema="org.cinnamon.settings-daemon.plugins.orientation"/>
-     <child name="power" schema="org.cinnamon.settings-daemon.plugins.power"/>
-     <child name="print-notifications" schema="org.cinnamon.settings-daemon.plugins.print-notifications"/>
-     <child name="screensaver-proxy" schema="org.cinnamon.settings-daemon.plugins.screensaver-proxy"/>
diff --git a/sysutils/cinnamon-settings-daemon/files/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in b/sysutils/cinnamon-settings-daemon/files/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
deleted file mode 100644
index f25a5cc57450..000000000000
--- a/sysutils/cinnamon-settings-daemon/files/patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in
+++ /dev/null
@@ -1,56 +0,0 @@
---- data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in.orig	2013-11-24 10:15:52.998513483 +0000
-+++ data/org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in	2013-11-24 10:17:59.232590608 +0000
-@@ -46,7 +46,7 @@
-       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
-     </key>
-     <key name="sleep-inactive-ac-type" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
-       <description>The type of sleeping that should be performed when the computer is inactive.</description>
-     </key>
-@@ -56,12 +56,12 @@
-       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. A value of 0 means never.</description>
-     </key>
-     <key name="sleep-inactive-battery-type" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
-       <description>The type of sleeping that should be performed when the computer is inactive.</description>
-     </key>
-     <key name="button-suspend" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Suspend button action</summary>
-       <description>The action to take when the system suspend button is pressed.</description>
-     </key>
-@@ -76,17 +76,17 @@
-       <description>The action to take when the system sleep (non-specific type) button is pressed.</description>
-     </key>
-     <key name="button-power" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'shutdown'</default>
-       <summary>Power button action</summary>
-       <description>The action to take when the system power button is pressed.</description>
-     </key>
-     <key name="lid-close-battery-action" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Laptop lid close action on battery</summary>
-       <description>The action to take when the laptop lid is closed and the laptop is on battery power.</description>
-     </key>
-     <key name="lid-close-ac-action" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'suspend'</default>
-+      <default>'nothing'</default>
-       <summary>Laptop lid close action when on AC</summary>
-       <description>The action to take when the laptop lid is closed and the laptop is on AC power.</description>
-     </key>
-@@ -102,7 +102,7 @@
- 	lid is closed and regardless of external monitors.</description>
-     </key>
-     <key name="critical-battery-action" enum="org.cinnamon.settings-daemon.CsdPowerActionType">
--      <default>'hibernate'</default>
-+      <default>'shutdown'</default>
-       <summary>Battery critical low action</summary>
-       <description>The action to take when the battery is critically low.</description>
-     </key>
diff --git a/sysutils/cinnamon-settings-daemon/files/patch-plugins_xrandr_csd-xrandr-manager.c b/sysutils/cinnamon-settings-daemon/files/patch-plugins_xrandr_csd-xrandr-manager.c
new file mode 100644
index 000000000000..38dbe7e15fb9
--- /dev/null
+++ b/sysutils/cinnamon-settings-daemon/files/patch-plugins_xrandr_csd-xrandr-manager.c
@@ -0,0 +1,11 @@
+--- plugins/xrandr/csd-xrandr-manager.c.orig	2018-12-29 18:51:26.289097000 +0100
++++ plugins/xrandr/csd-xrandr-manager.c	2018-12-29 18:54:43.819478000 +0100
+@@ -149,6 +149,8 @@
+ static void handle_rotate_windows (CsdXrandrManager *mgr, GnomeRRRotation rotation, guint32 timestamp);
+ static void rotate_touchscreens (CsdXrandrManager *mgr, GnomeRRRotation rotation);
+ 
++void register_manager_dbus (CsdXrandrManager *manager);
++
+ G_DEFINE_TYPE (CsdXrandrManager, csd_xrandr_manager, G_TYPE_OBJECT)
+ 
+ static gpointer manager_object = NULL;
diff --git a/sysutils/cinnamon-settings-daemon/pkg-plist b/sysutils/cinnamon-settings-daemon/pkg-plist
index c370a19f00b1..9c14818e0b55 100644
--- a/sysutils/cinnamon-settings-daemon/pkg-plist
+++ b/sysutils/cinnamon-settings-daemon/pkg-plist
@@ -1,83 +1,112 @@
-etc/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
-include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/cinnamon-settings-plugin.h
+bin/csd-a11y-keyboard
+bin/csd-a11y-settings
+bin/csd-automount
+bin/csd-background
+bin/csd-backlight-helper
+bin/csd-clipboard
+bin/csd-color
+bin/csd-cursor
+bin/csd-datetime-mechanism
+bin/csd-housekeeping
+bin/csd-input-helper
+bin/csd-keyboard
+%%WACOM%%bin/csd-list-wacom
+bin/csd-locate-pointer
+bin/csd-media-keys
+bin/csd-mouse
+bin/csd-orientation
+bin/csd-power
+%%CUPS%%bin/csd-print-notifications
+%%CUPS%%bin/csd-printer
+bin/csd-screensaver-proxy
+%%SMARTCARD%%bin/csd-smartcard
+bin/csd-sound
+%%WACOM%%bin/csd-wacom
+%%WACOM%%bin/csd-wacom-led-helper
+%%WACOM%%bin/csd-wacom-osd
+bin/csd-xrandr
+bin/csd-xsettings
+etc/xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-automount.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-background.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-clipboard.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-color.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-cursor.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-keyboard.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-media-keys.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-mouse.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-orientation.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-power.desktop
+%%CUPS%%etc/xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop
+%%SMARTCARD%%etc/xdg/autostart/cinnamon-settings-daemon-smartcard.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-sound.desktop
+%%WACOM%%etc/xdg/autostart/cinnamon-settings-daemon-wacom.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-xrandr.desktop
+etc/xdg/autostart/cinnamon-settings-daemon-xsettings.desktop
 include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/csd-enums.h
-lib/cinnamon-settings-daemon-3.0/a11y-keyboard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/a11y-settings.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/automount.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/background.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/clipboard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/color.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/cursor.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/housekeeping.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/keyboard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/liba11y-keyboard.a
-lib/cinnamon-settings-daemon-3.0/liba11y-keyboard.so
-lib/cinnamon-settings-daemon-3.0/liba11y-settings.a
-lib/cinnamon-settings-daemon-3.0/liba11y-settings.so
-lib/cinnamon-settings-daemon-3.0/libautomount.a
-lib/cinnamon-settings-daemon-3.0/libautomount.so
-lib/cinnamon-settings-daemon-3.0/libbackground.a
-lib/cinnamon-settings-daemon-3.0/libbackground.so
-lib/cinnamon-settings-daemon-3.0/libclipboard.a
-lib/cinnamon-settings-daemon-3.0/libclipboard.so
-lib/cinnamon-settings-daemon-3.0/libcolor.a
-lib/cinnamon-settings-daemon-3.0/libcolor.so
-lib/cinnamon-settings-daemon-3.0/libcsd.a
 lib/cinnamon-settings-daemon-3.0/libcsd.so
-lib/cinnamon-settings-daemon-3.0/libcursor.a
-lib/cinnamon-settings-daemon-3.0/libcursor.so
-lib/cinnamon-settings-daemon-3.0/libhousekeeping.a
-lib/cinnamon-settings-daemon-3.0/libhousekeeping.so
-lib/cinnamon-settings-daemon-3.0/libkeyboard.a
-lib/cinnamon-settings-daemon-3.0/libkeyboard.so
-lib/cinnamon-settings-daemon-3.0/libmedia-keys.a
-lib/cinnamon-settings-daemon-3.0/libmedia-keys.so
-lib/cinnamon-settings-daemon-3.0/libmouse.a
-lib/cinnamon-settings-daemon-3.0/libmouse.so
-lib/cinnamon-settings-daemon-3.0/libpower.a
-lib/cinnamon-settings-daemon-3.0/libpower.so
-%%CUPS%%lib/cinnamon-settings-daemon-3.0/libprint-notifications.a
-%%CUPS%%lib/cinnamon-settings-daemon-3.0/libprint-notifications.so
-lib/cinnamon-settings-daemon-3.0/libscreensaver-proxy.a
-lib/cinnamon-settings-daemon-3.0/libscreensaver-proxy.so
-%%SMARTCARD%%lib/cinnamon-settings-daemon-3.0/libsmartcard.a
-%%SMARTCARD%%lib/cinnamon-settings-daemon-3.0/libsmartcard.so
-lib/cinnamon-settings-daemon-3.0/libsound.a
-lib/cinnamon-settings-daemon-3.0/libsound.so
-lib/cinnamon-settings-daemon-3.0/libxrandr.a
-lib/cinnamon-settings-daemon-3.0/libxrandr.so
-lib/cinnamon-settings-daemon-3.0/libxsettings.a
-lib/cinnamon-settings-daemon-3.0/libxsettings.so
-lib/cinnamon-settings-daemon-3.0/media-keys.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/mouse.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/power.cinnamon-settings-plugin
-%%CUPS%%lib/cinnamon-settings-daemon-3.0/print-notifications.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/screensaver-proxy.cinnamon-settings-plugin
-%%SMARTCARD%%lib/cinnamon-settings-daemon-3.0/smartcard.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/sound.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/xrandr.cinnamon-settings-plugin
-lib/cinnamon-settings-daemon-3.0/xsettings.cinnamon-settings-plugin
+lib/cinnamon-settings-daemon/csd-a11y-keyboard
+lib/cinnamon-settings-daemon/csd-a11y-settings
+lib/cinnamon-settings-daemon/csd-automount
+lib/cinnamon-settings-daemon/csd-background
+lib/cinnamon-settings-daemon/csd-backlight-helper
+lib/cinnamon-settings-daemon/csd-clipboard
+lib/cinnamon-settings-daemon/csd-color
+lib/cinnamon-settings-daemon/csd-cursor
+lib/cinnamon-settings-daemon/csd-datetime-mechanism
+lib/cinnamon-settings-daemon/csd-housekeeping
+lib/cinnamon-settings-daemon/csd-input-helper
+lib/cinnamon-settings-daemon/csd-keyboard
+%%WACOM%%lib/cinnamon-settings-daemon/csd-list-wacom
+lib/cinnamon-settings-daemon/csd-locate-pointer
+lib/cinnamon-settings-daemon/csd-media-keys
+lib/cinnamon-settings-daemon/csd-mouse
+lib/cinnamon-settings-daemon/csd-orientation
+lib/cinnamon-settings-daemon/csd-power
+%%CUPS%%lib/cinnamon-settings-daemon/csd-print-notifications
+%%CUPS%%lib/cinnamon-settings-daemon/csd-printer
+lib/cinnamon-settings-daemon/csd-screensaver-proxy
+%%SMARTCARD%%lib/cinnamon-settings-daemon/csd-smartcard
+lib/cinnamon-settings-daemon/csd-sound
+%%WACOM%%lib/cinnamon-settings-daemon/csd-wacom
+%%WACOM%%lib/cinnamon-settings-daemon/csd-wacom-led-helper
+%%WACOM%%lib/cinnamon-settings-daemon/csd-wacom-osd
+lib/cinnamon-settings-daemon/csd-xrandr
+lib/cinnamon-settings-daemon/csd-xsettings
 libdata/pkgconfig/cinnamon-settings-daemon.pc
-libexec/csd-test-automount
-libexec/cinnamon-settings-daemon
+libexec/csd-a11y-keyboard
+libexec/csd-a11y-settings
+libexec/csd-automount
+libexec/csd-background
+libexec/csd-backlight-helper
+libexec/csd-clipboard
+libexec/csd-color
+libexec/csd-cursor
 libexec/csd-datetime-mechanism
+libexec/csd-housekeeping
+libexec/csd-input-helper
+libexec/csd-keyboard
+%%WACOM%%libexec/csd-list-wacom
 libexec/csd-locate-pointer
+libexec/csd-media-keys
+libexec/csd-mouse
+libexec/csd-orientation
+libexec/csd-power
+%%CUPS%%libexec/csd-print-notifications
 %%CUPS%%libexec/csd-printer
-libexec/csd-test-a11y-keyboard
-libexec/csd-test-a11y-settings
-libexec/csd-test-background
-libexec/csd-test-input-helper
-libexec/csd-test-media-keys
-libexec/csd-test-mouse
-libexec/csd-test-power
-%%CUPS%%libexec/csd-test-print-notifications
-libexec/csd-test-screensaver-proxy
-%%SMARTCARD%%libexec/csd-test-smartcard
-libexec/csd-test-sound
-libexec/csd-test-xsettings
-man/man1/cinnamon-settings-daemon.1.gz
-share/applications/cinnamon-settings-daemon.desktop
-share/cinnamon-settings-daemon-3.0/input-device-example.sh
+libexec/csd-screensaver-proxy
+%%SMARTCARD%%libexec/csd-smartcard
+libexec/csd-sound
+%%WACOM%%libexec/csd-wacom
+%%WACOM%%libexec/csd-wacom-led-helper
+%%WACOM%%libexec/csd-wacom-osd
+libexec/csd-xrandr
+libexec/csd-xsettings
+share/applications/csd-automount.desktop
+%%DATADIR%%-3.0/input-device-example.sh
 %%DATADIR%%/csd-a11y-preferences-dialog.ui
 %%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
 %%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
@@ -86,103 +115,112 @@ share/cinnamon-settings-daemon-3.0/input-device-example.sh
 %%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
 %%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
 share/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
+share/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf
+share/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy
+%%WACOM%%share/polkit-1/actions/org.cinnamon.settings-daemon.plugins.wacom.policy
+share/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
+share/icons/hicolor/16x16/apps/csd-a11y-keyboard.png
+share/icons/hicolor/16x16/apps/csd-a11y-settings.png
+share/icons/hicolor/16x16/apps/csd-automount.png
+share/icons/hicolor/16x16/apps/csd-background.png
+share/icons/hicolor/16x16/apps/csd-clipboard.png
+share/icons/hicolor/16x16/apps/csd-color.png
+share/icons/hicolor/16x16/apps/csd-cursor.png
+share/icons/hicolor/16x16/apps/csd-datetime.png
+share/icons/hicolor/16x16/apps/csd-housekeeping.png
+share/icons/hicolor/16x16/apps/csd-keyboard.png
+share/icons/hicolor/16x16/apps/csd-media-keys.png
+share/icons/hicolor/16x16/apps/csd-mouse.png
+share/icons/hicolor/16x16/apps/csd-orientation.png
+share/icons/hicolor/16x16/apps/csd-power.png
+share/icons/hicolor/16x16/apps/csd-print-notifications.png
+share/icons/hicolor/16x16/apps/csd-printer.png
+share/icons/hicolor/16x16/apps/csd-screensaver-proxy.png
+share/icons/hicolor/16x16/apps/csd-sound.png
+share/icons/hicolor/16x16/apps/csd-wacom.png
 share/icons/hicolor/16x16/apps/csd-xrandr.png
+share/icons/hicolor/16x16/apps/csd-xsettings.png
+share/icons/hicolor/22x22/apps/csd-a11y-keyboard.png
+share/icons/hicolor/22x22/apps/csd-a11y-settings.png
+share/icons/hicolor/22x22/apps/csd-automount.png
+share/icons/hicolor/22x22/apps/csd-background.png
+share/icons/hicolor/22x22/apps/csd-clipboard.png
+share/icons/hicolor/22x22/apps/csd-color.png
+share/icons/hicolor/22x22/apps/csd-cursor.png
+share/icons/hicolor/22x22/apps/csd-datetime.png
+share/icons/hicolor/22x22/apps/csd-housekeeping.png
+share/icons/hicolor/22x22/apps/csd-keyboard.png
+share/icons/hicolor/22x22/apps/csd-media-keys.png
+share/icons/hicolor/22x22/apps/csd-mouse.png
+share/icons/hicolor/22x22/apps/csd-orientation.png
+share/icons/hicolor/22x22/apps/csd-power.png
+share/icons/hicolor/22x22/apps/csd-print-notifications.png
+share/icons/hicolor/22x22/apps/csd-printer.png
+share/icons/hicolor/22x22/apps/csd-screensaver-proxy.png
+share/icons/hicolor/22x22/apps/csd-sound.png
+share/icons/hicolor/22x22/apps/csd-wacom.png
 share/icons/hicolor/22x22/apps/csd-xrandr.png
+share/icons/hicolor/22x22/apps/csd-xsettings.png
+share/icons/hicolor/24x24/apps/csd-a11y-keyboard.png
+share/icons/hicolor/24x24/apps/csd-a11y-settings.png
+share/icons/hicolor/24x24/apps/csd-automount.png
+share/icons/hicolor/24x24/apps/csd-background.png
+share/icons/hicolor/24x24/apps/csd-clipboard.png
+share/icons/hicolor/24x24/apps/csd-color.png
+share/icons/hicolor/24x24/apps/csd-cursor.png
+share/icons/hicolor/24x24/apps/csd-datetime.png
+share/icons/hicolor/24x24/apps/csd-housekeeping.png
+share/icons/hicolor/24x24/apps/csd-keyboard.png
+share/icons/hicolor/24x24/apps/csd-media-keys.png
+share/icons/hicolor/24x24/apps/csd-mouse.png
+share/icons/hicolor/24x24/apps/csd-orientation.png
+share/icons/hicolor/24x24/apps/csd-power.png
+share/icons/hicolor/24x24/apps/csd-print-notifications.png
+share/icons/hicolor/24x24/apps/csd-printer.png
+share/icons/hicolor/24x24/apps/csd-screensaver-proxy.png
+share/icons/hicolor/24x24/apps/csd-sound.png
+share/icons/hicolor/24x24/apps/csd-wacom.png
 share/icons/hicolor/24x24/apps/csd-xrandr.png
+share/icons/hicolor/24x24/apps/csd-xsettings.png
+share/icons/hicolor/32x32/apps/csd-a11y-keyboard.png
+share/icons/hicolor/32x32/apps/csd-a11y-settings.png
+share/icons/hicolor/32x32/apps/csd-automount.png
+share/icons/hicolor/32x32/apps/csd-background.png
+share/icons/hicolor/32x32/apps/csd-clipboard.png
+share/icons/hicolor/32x32/apps/csd-color.png
+share/icons/hicolor/32x32/apps/csd-cursor.png
+share/icons/hicolor/32x32/apps/csd-datetime.png
+share/icons/hicolor/32x32/apps/csd-housekeeping.png
+share/icons/hicolor/32x32/apps/csd-keyboard.png
+share/icons/hicolor/32x32/apps/csd-media-keys.png
+share/icons/hicolor/32x32/apps/csd-mouse.png
+share/icons/hicolor/32x32/apps/csd-orientation.png
+share/icons/hicolor/32x32/apps/csd-power.png
+share/icons/hicolor/32x32/apps/csd-print-notifications.png
+share/icons/hicolor/32x32/apps/csd-printer.png
+share/icons/hicolor/32x32/apps/csd-screensaver-proxy.png
+share/icons/hicolor/32x32/apps/csd-sound.png
+share/icons/hicolor/32x32/apps/csd-wacom.png
 share/icons/hicolor/32x32/apps/csd-xrandr.png
+share/icons/hicolor/32x32/apps/csd-xsettings.png
+share/icons/hicolor/scalable/apps/csd-a11y-keyboard.svg
+share/icons/hicolor/scalable/apps/csd-a11y-settings.svg
+share/icons/hicolor/scalable/apps/csd-automount.svg
+share/icons/hicolor/scalable/apps/csd-background.svg
+share/icons/hicolor/scalable/apps/csd-clipboard.svg
+share/icons/hicolor/scalable/apps/csd-color.svg
+share/icons/hicolor/scalable/apps/csd-cursor.svg
+share/icons/hicolor/scalable/apps/csd-datetime.svg
+share/icons/hicolor/scalable/apps/csd-housekeeping.svg
+share/icons/hicolor/scalable/apps/csd-keyboard.svg
+share/icons/hicolor/scalable/apps/csd-media-keys.svg
+share/icons/hicolor/scalable/apps/csd-mouse.svg
+share/icons/hicolor/scalable/apps/csd-orientation.svg
+share/icons/hicolor/scalable/apps/csd-power.svg
+share/icons/hicolor/scalable/apps/csd-print-notifications.svg
+share/icons/hicolor/scalable/apps/csd-printer.svg
+share/icons/hicolor/scalable/apps/csd-screensaver-proxy.svg
+share/icons/hicolor/scalable/apps/csd-sound.svg
+share/icons/hicolor/scalable/apps/csd-wacom.svg
 share/icons/hicolor/scalable/apps/csd-xrandr.svg
-share/locale/af/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/am/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ar/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/as/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ast/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/az/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/be/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/be@latin/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bg/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bn_IN/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/br/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/bs/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ca/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ca@valencia/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/crh/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/cs/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/cy/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/da/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/de/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/dz/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/el/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/en@shaw/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/en_CA/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/en_GB/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/eo/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/es/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/et/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/eu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/fa/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/fi/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/fr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ga/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/gl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/gu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/he/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/hi/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/hr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/hu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/id/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/is/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/it/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ja/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ka/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/km/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/kn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ko/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ku/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/lt/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/lv/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mai/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mg/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mk/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ml/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/mr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ms/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nb/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nds/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ne/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nn/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/nso/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/oc/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/or/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pa/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pt/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/pt_BR/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ro/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ru/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/rw/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/si/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sk/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sl/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sq/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sr@latin/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/sv/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ta/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/te/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/th/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/tr/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/ug/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/uk/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/vi/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/wa/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/xh/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zh_CN/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zh_HK/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zh_TW/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/locale/zu/LC_MESSAGES/cinnamon-settings-daemon.mo
-share/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy
-share/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
-@dir %%ETCDIR%%/xrandr
+share/icons/hicolor/scalable/apps/csd-xsettings.svg
diff --git a/sysutils/circonus-agent/Makefile b/sysutils/circonus-agent/Makefile
deleted file mode 100644
index d9d28db8aa67..000000000000
--- a/sysutils/circonus-agent/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	circonus-agent
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.13.0
-CATEGORIES=	sysutils
-
-MAINTAINER=	sam.gwydir@joyent.com
-COMMENT=	Circonus host agent for metric collection
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		go
-
-USE_GITHUB=	yes
-
-GH_ACCOUNT=	circonus-labs
-GH_SUBDIR=	src/github.com/circonus-labs/circonus-agent
-GH_TUPLE=	alecthomas:units:2efee85:units/src/github.com/alecthomas/units \
-		pkg:errors:645ef00:errors/src/github.com/pkg/errors \
-		rs:zerolog:56a970de:zerolog/src/github.com/rs/zerolog \
-		spf13:cobra:c439c4fa:cobra/src/github.com/spf13/cobra \
-		spf13:viper:b5e8006c:viper/src/github.com/spf13/viper \
-		golang:sys:7ceb54c8:sys/src/golang.org/x/sys \
-		xi2:httpgzip:2d8bcdd:httpgzip/src/xi2.org/x/httpgzip \
-		pelletier:go-toml:acdc4509:go_toml/src/github.com/pelletier/go-toml \
-		maier:go-appstats:812a586:go_appstats/src/github.com/maier/go-appstats \
-		circonus-labs:circonus-gometrics:b25d14e:circonus_gometrics/src/github.com/circonus-labs/circonus-gometrics \
-		go-tomb:tomb:d5d1b58:tomb2/src/gopkg.in/tomb.v2 \
-		go-yaml:yaml:7f97868e:yaml2/src/gopkg.in/yaml.v2 \
-		go-ole:go-ole:a41e3c4:go_ole/src/github.com/go-ole/go-ole \
-		circonus-labs:circonusllhist:1e65893c:circonusllhist/src/github.com/circonus-labs/circonusllhist \
-		fsnotify:fsnotify:c2828203:fsnotify/src/github.com/fsnotify/fsnotify \
-		hashicorp:go-retryablehttp:794af36:go_retryablehttp/src/github.com/hashicorp/go-retryablehttp \
-		spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \
-		hashicorp:go-cleanhttp:d5fe4b57:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \
-		hashicorp:hcl:23c074d:hcl/src/github.com/hashicorp/hcl \
-		magiconair:properties:c3beff4c:properties/src/github.com/magiconair/properties \
-		mitchellh:mapstructure:00c29f56:mapstructure/src/github.com/mitchellh/mapstructure \
-		spf13:afero:bb8f1927:afero/src/github.com/spf13/afero \
-		spf13:cast:8965335b:cast/src/github.com/spf13/cast \
-		spf13:jWalterWeatherman:7c0cea34:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \
-		golang:text:f21a4dfb:text/src/golang.org/x/text \
-		tv42:httpunix:b75d861:httpunix/src/github.com/tv42/httpunix \
-		prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \
-		golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \
-		prometheus:common:e4aa40a9:common/src/github.com/prometheus/common \
-		matttproud:golang_protobuf_extensions:3247c845:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions
-
-ETCDIR=		${PREFIX}/etc/circonus-agentd
-PLIST_FILES=	bin/circonus-agentd "@dir ${ETCDIR}"
-
-do-build:
-	( cd ${WRKSRC}; \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
-		go build ${BUILD_FLAGS} -o bin/circonus-agentd )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/circonus-agentd ${STAGEDIR}${PREFIX}/bin/circonus-agentd
-	@${MKDIR} ${STAGEDIR}${ETCDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/circonus-agent/distinfo b/sysutils/circonus-agent/distinfo
deleted file mode 100644
index 57182cac3994..000000000000
--- a/sysutils/circonus-agent/distinfo
+++ /dev/null
@@ -1,63 +0,0 @@
-TIMESTAMP = 1524764076
-SHA256 (circonus-labs-circonus-agent-v0.13.0_GH0.tar.gz) = 8860f75238984d9355aab40a8956f98b26fdeea5f59abe357997f6902bcce64f
-SIZE (circonus-labs-circonus-agent-v0.13.0_GH0.tar.gz) = 135271
-SHA256 (alecthomas-units-2efee85_GH0.tar.gz) = 8e84e0468232e23459212cf84e38164a43b1c8b7a2788a44c9446c01b684c39d
-SIZE (alecthomas-units-2efee85_GH0.tar.gz) = 3445
-SHA256 (pkg-errors-645ef00_GH0.tar.gz) = b2e989515688d916216dd0a1b82cd9b18e8fb4fdf0370473996bdde41b83a41f
-SIZE (pkg-errors-645ef00_GH0.tar.gz) = 11342
-SHA256 (rs-zerolog-56a970de_GH0.tar.gz) = e91e08d7f0a8aae64c24bf4d35b479959eeaa03f3d9dfbd320f673c4db0a7a92
-SIZE (rs-zerolog-56a970de_GH0.tar.gz) = 399634
-SHA256 (spf13-cobra-c439c4fa_GH0.tar.gz) = 6ac84ca2528ac4a1e5e0947fe7c84b0cfba5bef1a0ec62d3c4e7ba80f344ddc5
-SIZE (spf13-cobra-c439c4fa_GH0.tar.gz) = 100782
-SHA256 (spf13-viper-b5e8006c_GH0.tar.gz) = 7b6f00e9d3e486db61df8da06c92ae161ce0475f309cad78ae4d66a4c0e85698
-SIZE (spf13-viper-b5e8006c_GH0.tar.gz) = 32023
-SHA256 (golang-sys-7ceb54c8_GH0.tar.gz) = 80e911f177bab361838833e4eb03ad461c3a604ab6deac3043c2e3e66e1e1303
-SIZE (golang-sys-7ceb54c8_GH0.tar.gz) = 800474
-SHA256 (xi2-httpgzip-2d8bcdd_GH0.tar.gz) = e30dad2544cb20cbc4f495e8d862fdf660bc806027b9e5ede9d1975f240355e4
-SIZE (xi2-httpgzip-2d8bcdd_GH0.tar.gz) = 16338
-SHA256 (pelletier-go-toml-acdc4509_GH0.tar.gz) = c4127e9dfe7f7f46bdcd6764a7caf3ffab3a70fdfadb5885fe228432f03621bb
-SIZE (pelletier-go-toml-acdc4509_GH0.tar.gz) = 56993
-SHA256 (maier-go-appstats-812a586_GH0.tar.gz) = d0fb2ba84882904c55fac6d80fb412f5dbb30785eae2cc263ff1e7b36ae81cc4
-SIZE (maier-go-appstats-812a586_GH0.tar.gz) = 2678
-SHA256 (circonus-labs-circonus-gometrics-b25d14e_GH0.tar.gz) = 6fdfe2aa21688b4bc4ac92211bcdd94277de7ce3f83c7193cb9d69516bbf5f92
-SIZE (circonus-labs-circonus-gometrics-b25d14e_GH0.tar.gz) = 78409
-SHA256 (go-tomb-tomb-d5d1b58_GH0.tar.gz) = 15f81593032433527203ace3277c819f2b4b90fd337ea2193de0c7a515b87f08
-SIZE (go-tomb-tomb-d5d1b58_GH0.tar.gz) = 5513
-SHA256 (go-yaml-yaml-7f97868e_GH0.tar.gz) = 41fd44bc17bab46dc808622bef394b1ee69d4b80a56358326d49f6742c5f380d
-SIZE (go-yaml-yaml-7f97868e_GH0.tar.gz) = 69163
-SHA256 (go-ole-go-ole-a41e3c4_GH0.tar.gz) = f59d960b00c0f368ae4c3ef9ff3d1a617beaf05af097e37cbada412b9c433d1a
-SIZE (go-ole-go-ole-a41e3c4_GH0.tar.gz) = 51323
-SHA256 (circonus-labs-circonusllhist-1e65893c_GH0.tar.gz) = f6c1e67f8fc45b061ef30d8194e6e71f8b2b54a10e2366a68055f2bef5a1d183
-SIZE (circonus-labs-circonusllhist-1e65893c_GH0.tar.gz) = 7743
-SHA256 (fsnotify-fsnotify-c2828203_GH0.tar.gz) = bbe5d7547dab6e65c9e5fc46ddb2b1e519a87600f681ebda5cd461bf4d967c0a
-SIZE (fsnotify-fsnotify-c2828203_GH0.tar.gz) = 31143
-SHA256 (hashicorp-go-retryablehttp-794af36_GH0.tar.gz) = c1f27c275c455e4179c4edd29ec97694051716492e18c4dfbe22a3200cf5a04f
-SIZE (hashicorp-go-retryablehttp-794af36_GH0.tar.gz) = 12288
-SHA256 (spf13-pflag-e57e3ee_GH0.tar.gz) = 16556b4873f12211cffec75aa4d3a6332efa26e64ff0476fdbd99f672ca37d51
-SIZE (spf13-pflag-e57e3ee_GH0.tar.gz) = 38998
-SHA256 (hashicorp-go-cleanhttp-d5fe4b57_GH0.tar.gz) = f7fda6b44f23a55cbc4c8c74c84d5317b9eaa1d205bbc9feacbc357205901c52
-SIZE (hashicorp-go-cleanhttp-d5fe4b57_GH0.tar.gz) = 8003
-SHA256 (hashicorp-hcl-23c074d_GH0.tar.gz) = e1261b44b456f6b496a7aa652cc7359f766c998eef03e1ee36a437ee27f94a5f
-SIZE (hashicorp-hcl-23c074d_GH0.tar.gz) = 69802
-SHA256 (magiconair-properties-c3beff4c_GH0.tar.gz) = 8cd61bb603f743c5ecde4d1d08ded1a6771d41786ba1de381771e4adad0dc1f9
-SIZE (magiconair-properties-c3beff4c_GH0.tar.gz) = 28714
-SHA256 (mitchellh-mapstructure-00c29f56_GH0.tar.gz) = 5aa5b4df55daf287f9e2cc64b11fee86e29c2afe75574fa9307ee5dd4c63d120
-SIZE (mitchellh-mapstructure-00c29f56_GH0.tar.gz) = 18395
-SHA256 (spf13-afero-bb8f1927_GH0.tar.gz) = 1c5e09b73feb9e5dad2c8d2a793e96e14e17e72d86fdfb65434ba004f52ddb78
-SIZE (spf13-afero-bb8f1927_GH0.tar.gz) = 43569
-SHA256 (spf13-cast-8965335b_GH0.tar.gz) = b07a5ad3763bec156957c866020d279987ab4753ba0ca757281e7b564419f5fa
-SIZE (spf13-cast-8965335b_GH0.tar.gz) = 9854
-SHA256 (spf13-jWalterWeatherman-7c0cea34_GH0.tar.gz) = a85d57823166f158d36d3532758eebac33752f665842d5268a0b0d0630a88a42
-SIZE (spf13-jWalterWeatherman-7c0cea34_GH0.tar.gz) = 6347
-SHA256 (golang-text-f21a4dfb_GH0.tar.gz) = 565eda9f2ae3c225bd3f2d8db369e70799c34cc4e2246f57b03a5410cac9a16c
-SIZE (golang-text-f21a4dfb_GH0.tar.gz) = 6102533
-SHA256 (tv42-httpunix-b75d861_GH0.tar.gz) = d61dfb2559a54acaf291816a01ee0ccde7c1dbbd70d04a5d19d7a00121a0e81f
-SIZE (tv42-httpunix-b75d861_GH0.tar.gz) = 2476
-SHA256 (prometheus-client_model-99fa1f4_GH0.tar.gz) = 11c3da0c9a3e4879aa2de15b8e1f494cd74ce3afca831a759f564edeea232f69
-SIZE (prometheus-client_model-99fa1f4_GH0.tar.gz) = 54653
-SHA256 (golang-protobuf-8ee7999_GH0.tar.gz) = 0ce842e7fd80d4e230b0740de2a657172748220050343c6482ed56d6828322af
-SIZE (golang-protobuf-8ee7999_GH0.tar.gz) = 245224
-SHA256 (prometheus-common-e4aa40a9_GH0.tar.gz) = 940d02c1aa4bbbf78ca06f1aa96bf3f4180e08a760a39429b08ec9cb865eb2d9
-SIZE (prometheus-common-e4aa40a9_GH0.tar.gz) = 62944
-SHA256 (matttproud-golang_protobuf_extensions-3247c845_GH0.tar.gz) = c7cc18acdd3bb5db7199b5b4a1c198a5919d94800c110eaf4191bc4635d96178
-SIZE (matttproud-golang_protobuf_extensions-3247c845_GH0.tar.gz) = 9580
diff --git a/sysutils/circonus-agent/pkg-descr b/sysutils/circonus-agent/pkg-descr
deleted file mode 100644
index 06204a9c28a3..000000000000
--- a/sysutils/circonus-agent/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Circonus-agent is a lightweight monitoring agent that collects system,
-user-defined metrics, statsD, or Prometheus. Metrics are forwarded to Circonus
-(SaaS) or can be consumed locally as Prometheus metrics.
-
-The circonus-agent is intelligent about the way it collects metrics in 
-that it deliberately only fork(2)'s utilities once where possible and 
-reads metrics streamed to it from continuously running processes 
-(e.g. iostat(1) or vmstat(1)) or user defined scripts (e.g. PostgreSQL
-or DTrace scripts). circonus-agent is a Go rewrite of the NAD.
-
-WWW: https://www.circonus.com/
diff --git a/sysutils/ciso-maker/Makefile b/sysutils/ciso-maker/Makefile
index 298fce112f30..81c1ebba78e7 100644
--- a/sysutils/ciso-maker/Makefile
+++ b/sysutils/ciso-maker/Makefile
@@ -1,5 +1,4 @@
 # Created by: Lucas Holt <luke@foolishgames.com>
-# $FreeBSD$
 
 PORTNAME=	ciso-maker
 PORTVERSION=	1.02
diff --git a/sysutils/ciso/Makefile b/sysutils/ciso/Makefile
index fd81b8e83b0b..b25dd4be1ccf 100644
--- a/sysutils/ciso/Makefile
+++ b/sysutils/ciso/Makefile
@@ -1,5 +1,4 @@
 # Created by: Vasiliy Ch <blttll@gmail.com>
-# $FreeBSD$
 
 PORTNAME=	ciso
 PORTVERSION=	1.0.0
diff --git a/sysutils/ck4up/Makefile b/sysutils/ck4up/Makefile
index ee3e91a1fca2..886478853a86 100644
--- a/sysutils/ck4up/Makefile
+++ b/sysutils/ck4up/Makefile
@@ -1,5 +1,4 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	ck4up
 PORTVERSION=	1.4
diff --git a/sysutils/clean/Makefile b/sysutils/clean/Makefile
index 8c21b991fcb7..f1aaa5136373 100644
--- a/sysutils/clean/Makefile
+++ b/sysutils/clean/Makefile
@@ -1,5 +1,4 @@
 # Created by: chuck@pkix.net
-# $FreeBSD$
 
 PORTNAME=	clean
 PORTVERSION=	3.4
diff --git a/sysutils/clockspeed/Makefile b/sysutils/clockspeed/Makefile
index b25a73230bb4..900e6275dab9 100644
--- a/sysutils/clockspeed/Makefile
+++ b/sysutils/clockspeed/Makefile
@@ -1,5 +1,4 @@
 # Created by: Mario S F Ferreira <lioux@linf.unb.br> et al.
-# $FreeBSD$
 
 PORTNAME=	clockspeed
 PORTVERSION=	0.62
diff --git a/sysutils/clone/Makefile b/sysutils/clone/Makefile
index 533f2e8977c4..fe1c5f10317c 100644
--- a/sysutils/clone/Makefile
+++ b/sysutils/clone/Makefile
@@ -1,20 +1,20 @@
-# $FreeBSD$
+PORTNAME=		clone
+DISTVERSIONPREFIX=	v
+DISTVERSION=		1.0.8
+CATEGORIES=		sysutils
 
-PORTNAME=	clone
-PORTVERSION=	1.0.7
-PORTREVISION=	5
-CATEGORIES=	sysutils
-MASTER_SITES=	http://cyclaero.com/public/clone/
+MAINTAINER=		cyclaero@gmail.com
+COMMENT=		File tree cloning tool
 
-MAINTAINER=	cyclaero@gmail.com
-COMMENT=	File tree cloning tool
+LICENSE=		BSD2CLAUSE
 
-LICENSE=	BSD2CLAUSE
+USES=			compiler:c11
+USE_GITHUB=		yes
+GH_ACCOUNT=		cyclaero
+GH_PROJECT=		clone
 
-USES=		compiler:c11
-
-PLIST_FILES=	bin/clone \
-		man/man1/clone.1.gz
+PLIST_FILES=		bin/clone \
+			man/man1/clone.1.gz
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/clone
diff --git a/sysutils/clone/distinfo b/sysutils/clone/distinfo
index 1704d8af682c..c4b78b780933 100644
--- a/sysutils/clone/distinfo
+++ b/sysutils/clone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487644110
-SHA256 (clone-1.0.7.tar.gz) = 5210c1b15d7c2012be7358a4a4b6fc68ff0259ed1100eda69dab7a08c63c4f83
-SIZE (clone-1.0.7.tar.gz) = 31067
+TIMESTAMP = 1587423961
+SHA256 (cyclaero-clone-v1.0.8_GH0.tar.gz) = c539388e6f19a009342ff439ed1c637f724036373fc1a8e291a3149f0e0a998c
+SIZE (cyclaero-clone-v1.0.8_GH0.tar.gz) = 31913
diff --git a/sysutils/clonehdd/Makefile b/sysutils/clonehdd/Makefile
index 6889e37c26d6..70dd2fbee36a 100644
--- a/sysutils/clonehdd/Makefile
+++ b/sysutils/clonehdd/Makefile
@@ -1,5 +1,4 @@
 # Created by: Anton Lysenok <bart@tapolsky.net.ua>
-# $FreeBSD$
 
 PORTNAME=	clonehdd
 PORTVERSION=	2.0.3
diff --git a/sysutils/cloop-utils/Makefile b/sysutils/cloop-utils/Makefile
deleted file mode 100644
index 5c341ab9d843..000000000000
--- a/sysutils/cloop-utils/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Max Khon <fjoe@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	cloop-utils
-PORTVERSION=	${CLOOP_VERSION}.${CLOOP_REVISION}
-CATEGORIES=	sysutils
-MASTER_SITES=	http://debian-knoppix.alioth.debian.org/sources/
-DISTNAME=	cloop_${CLOOP_VERSION}-${CLOOP_REVISION}
-
-MAINTAINER=	fjoe@FreeBSD.org
-COMMENT=	Compressed loop FS utils
-
-USES=		gmake
-
-WRKSRC=		${WRKDIR}/cloop-${CLOOP_VERSION}
-MAKE_ENV=	APPSONLY=yes
-PLIST_FILES=	bin/create_compressed_fs bin/extract_compressed_fs
-
-PORTDOCS=	README
-
-CLOOP_VERSION=	2.01
-CLOOP_REVISION=	2
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/^CFLAGS:=/CFLAGS?=/' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/create_compressed_fs ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/extract_compressed_fs ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/cloop-utils/distinfo b/sysutils/cloop-utils/distinfo
deleted file mode 100644
index c6bd7078d3ad..000000000000
--- a/sysutils/cloop-utils/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cloop_2.01-2.tar.gz) = 2c29b82e7d4d3d92c27d874337da4c1880cd4906bf451f64788d1932acd565b2
-SIZE (cloop_2.01-2.tar.gz) = 22440
diff --git a/sysutils/cloop-utils/pkg-descr b/sysutils/cloop-utils/pkg-descr
deleted file mode 100644
index c747b18a0eb8..000000000000
--- a/sysutils/cloop-utils/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Tools for creating and extracting read-only compressed filesystem images
-in cloop V2.0 format.
-
-WWW: http://developer.linuxtag.net/knoppix/sources/
diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile
index 57e21786cfb2..50964d3c94c9 100644
--- a/sysutils/cloudabi-utils/Makefile
+++ b/sysutils/cloudabi-utils/Makefile
@@ -1,9 +1,9 @@
 # Created by: Ed Schouten <ed@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	cloudabi-utils
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.38
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	ed@FreeBSD.org
diff --git a/sysutils/clsync/Makefile b/sysutils/clsync/Makefile
index 8a72ba4eb915..ae5f6ef9e7d9 100644
--- a/sysutils/clsync/Makefile
+++ b/sysutils/clsync/Makefile
@@ -1,5 +1,4 @@
 # Created by: Dmitry Yu Okunev dyokunev@ut.mephi.ru
-# $FreeBSD$
 
 PORTNAME=	clsync
 DISTVERSION=	0.4~rc2
@@ -14,7 +13,7 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 GNU_CONFIGURE=	yes
-USES=		autoreconf compiler:features gmake libtool pkgconfig
+USES=		autoreconf compiler:features gmake gnome libtool pkgconfig
 USE_GNOME=	glib20
 
 USE_RC_SUBR=	clsync
diff --git a/sysutils/clsync/files/clsync.in b/sysutils/clsync/files/clsync.in
index 64c44c1f79c0..b6b0593b9aad 100644
--- a/sysutils/clsync/files/clsync.in
+++ b/sysutils/clsync/files/clsync.in
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $FreeBSD:
 
 # PROVIDE: clsync
 # REQUIRE: FILESYSTEMS
diff --git a/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile
index 74b2ef9cbd24..bc1a1c0acaba 100644
--- a/sysutils/cluster-glue/Makefile
+++ b/sysutils/cluster-glue/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	cluster-glue
 PORTVERSION=	1.0.12
 PORTREVISION=	3
diff --git a/sysutils/cluster-glue/files/ha_logd.in b/sysutils/cluster-glue/files/ha_logd.in
index 72e97e595e4b..2488ead24161 100644
--- a/sysutils/cluster-glue/files/ha_logd.in
+++ b/sysutils/cluster-glue/files/ha_logd.in
@@ -1,7 +1,5 @@
 #!/bin/sh
-#
-# $FreeBSD$
-#
+
 # PROVIDE: ha_logd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
diff --git a/sysutils/cmdwatch/Makefile b/sysutils/cmdwatch/Makefile
index 0076a7a2c914..4ef5bacc48c4 100644
--- a/sysutils/cmdwatch/Makefile
+++ b/sysutils/cmdwatch/Makefile
@@ -1,5 +1,4 @@
 # Created by: bjohnson@wedgie.org
-# $FreeBSD$
 
 PORTNAME=	cmdwatch
 PORTVERSION=	0.2.0
diff --git a/sysutils/cmocka/Makefile b/sysutils/cmocka/Makefile
index b4b9c897a3a8..a092a4f5ac50 100644
--- a/sysutils/cmocka/Makefile
+++ b/sysutils/cmocka/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	cmocka
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.5
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cmocka.org/files/1.1/ \
 		LOCAL/dteske
@@ -20,7 +18,7 @@ PLIST_FILES=	include/cmocka.h \
 		lib/cmake/cmocka/cmocka-config.cmake \
 		lib/libcmocka.so \
 		lib/libcmocka.so.0 \
-		lib/libcmocka.so.0.5.1 \
+		lib/libcmocka.so.0.7.0 \
 		libdata/pkgconfig/cmocka.pc
 
 OPTIONS_DEFINE=	STATIC
diff --git a/sysutils/cmocka/distinfo b/sysutils/cmocka/distinfo
index 65d127fda96b..daba23502fd0 100644
--- a/sysutils/cmocka/distinfo
+++ b/sysutils/cmocka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559782392
-SHA256 (cmocka-1.1.3.tar.xz) = 43eabcf72a9c80e3d03f7c8a1c04e408c18d2db5121eb058a3ef732a9dfabfaf
-SIZE (cmocka-1.1.3.tar.xz) = 78744
+TIMESTAMP = 1572277190
+SHA256 (cmocka-1.1.5.tar.xz) = f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6
+SIZE (cmocka-1.1.5.tar.xz) = 81004
diff --git a/sysutils/cmockery2/Makefile b/sysutils/cmockery2/Makefile
index bf8b9cfc4a1e..85777bcedd0d 100644
--- a/sysutils/cmockery2/Makefile
+++ b/sysutils/cmockery2/Makefile
@@ -1,5 +1,4 @@
 # Created by: Harshavardhana
-# $FreeBSD$
 #
 
 PORTNAME=	cmockery2
diff --git a/sysutils/cmogstored/Makefile b/sysutils/cmogstored/Makefile
index 6d55ba96dcb9..e0b4d768ede7 100644
--- a/sysutils/cmogstored/Makefile
+++ b/sysutils/cmogstored/Makefile
@@ -1,11 +1,9 @@
 # Created by: Mikolaj Golub <trociny@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	cmogstored
-PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTVERSION=	1.8.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://bogomips.org/cmogstored/files/
+MASTER_SITES=	http://yhbt.net/cmogstored/files/
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Alternative mogstored implementation for MogileFS
diff --git a/sysutils/cmogstored/distinfo b/sysutils/cmogstored/distinfo
index b510d6f3d69d..e084ca67d99d 100644
--- a/sysutils/cmogstored/distinfo
+++ b/sysutils/cmogstored/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558443627
-SHA256 (cmogstored-1.7.1.tar.gz) = 603c163e133c656feebf1055364eb153664fafcb053696f7b86da511bf02a893
-SIZE (cmogstored-1.7.1.tar.gz) = 1088327
+TIMESTAMP = 1614544971
+SHA256 (cmogstored-1.8.1.tar.gz) = e1c762d41f96a44457589fa2cb843a2fbc83a1086a9c4a7f87517334644b62eb
+SIZE (cmogstored-1.8.1.tar.gz) = 1139791
diff --git a/sysutils/cmogstored/files/cmogstored.in b/sysutils/cmogstored/files/cmogstored.in
index 72c182d25c4a..0fec5e88db54 100644
--- a/sysutils/cmogstored/files/cmogstored.in
+++ b/sysutils/cmogstored/files/cmogstored.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: cmogstored
 # REQUIRE: LOGIN cleanvar
 # KEYWORD: shutdown
diff --git a/sysutils/cmogstored/pkg-descr b/sysutils/cmogstored/pkg-descr
index 16836b6130a8..341464fc20b0 100644
--- a/sysutils/cmogstored/pkg-descr
+++ b/sysutils/cmogstored/pkg-descr
@@ -3,4 +3,4 @@ component of MogileFS.  cmogstored is implemented in C and does not
 use Perl at runtime.  cmogstored is the only component you need to
 install on a MogileFS storage node.
 
-WWW: https://bogomips.org/cmogstored/
+WWW: https://yhbt.net/cmogstored/
diff --git a/sysutils/cmospwd/Makefile b/sysutils/cmospwd/Makefile
index 35832fd0353a..b774799f7e0c 100644
--- a/sysutils/cmospwd/Makefile
+++ b/sysutils/cmospwd/Makefile
@@ -1,5 +1,4 @@
 # Created by: Emanuel Haupt <ehaupt@critical.ch>
-# $FreeBSD$
 
 PORTNAME=	cmospwd
 PORTVERSION=	5.1
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index 57cfb94b9d9e..731353f1896a 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -1,5 +1,4 @@
 # Created by: petef@FreeBSD.org
-# $FreeBSD$
 
 PORTNAME=	colorize
 PORTVERSION=	0.3.4
diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile
new file mode 100644
index 000000000000..f573904b9366
--- /dev/null
+++ b/sysutils/conan/Makefile
@@ -0,0 +1,40 @@
+PORTNAME=	conan
+DISTVERSION=	1.36.0
+CATEGORIES=	sysutils python
+MASTER_SITES=	CHEESESHOP
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C/C++ package manager
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+PY_DEPENDS=	\
+		${PYTHON_PKGNAMEPREFIX}bottle>=0.12.8:www/py-bottle@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3,<0.5.0:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0,<3:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}deprecation>=2.0:devel/py-deprecation@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}distro>=1.0.2:sysutils/py-distro@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fasteners>=0.14.1:devel/py-fasteners@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}future>=0.16.0,<0.19.0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9,<3:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}node-semver>=0.6.1:devel/py-node-semver@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4,<1.18:devel/py-patch-ng@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0,<3.0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0,<2.0.0:www/py-pyjwt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1,<3.0.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1:misc/py-tqdm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_DEPENDS}
+RUN_DEPENDS=	${PY_DEPENDS}
+
+USES=		python
+USE_PYTHON=	distutils noflavors autoplist
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/sysutils/conan/distinfo b/sysutils/conan/distinfo
new file mode 100644
index 000000000000..7af2a6a40dcb
--- /dev/null
+++ b/sysutils/conan/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1619660359
+SHA256 (conan-1.36.0.tar.gz) = e76c5e1c483b8072267a57787a1400da298a26d37786aad78a12fa45d180f56c
+SIZE (conan-1.36.0.tar.gz) = 668114
diff --git a/sysutils/conan/files/patch-conans_requirements.txt b/sysutils/conan/files/patch-conans_requirements.txt
new file mode 100644
index 000000000000..4e69a0aff7c7
--- /dev/null
+++ b/sysutils/conan/files/patch-conans_requirements.txt
@@ -0,0 +1,17 @@
+--- conans/requirements.txt.orig	2020-09-02 09:40:01 UTC
++++ conans/requirements.txt
+@@ -6,11 +6,11 @@ PyYAML>=3.11, <6.0
+ patch-ng>=1.17.4, <1.18
+ fasteners>=0.14.1
+ six>=1.10.0,<=1.15.0
+-node-semver==0.6.1
+-distro>=1.0.2, <=1.5.0
++node-semver>=0.6.1
++distro>=1.0.2
+ future>=0.16.0, <0.19.0
+ pygments>=2.0, <3.0
+-deprecation>=2.0, <2.1
++deprecation>=2.0
+ tqdm>=4.28.1, <5
+ Jinja2>=2.3, <3
+ python-dateutil>=2.7.0, <3
diff --git a/sysutils/conan/files/patch-conans_requirements__server.txt b/sysutils/conan/files/patch-conans_requirements__server.txt
new file mode 100644
index 000000000000..c4106b65c0e2
--- /dev/null
+++ b/sysutils/conan/files/patch-conans_requirements__server.txt
@@ -0,0 +1,9 @@
+--- conans/requirements_server.txt.orig	2020-06-11 21:59:08 UTC
++++ conans/requirements_server.txt
+@@ -1,3 +1,3 @@
+ # Server
+-bottle>=0.12.8, < 0.13
+-pluginbase>=0.5, < 1.0
+\ No newline at end of file
++bottle>=0.12.8
++pluginbase>=0.5
diff --git a/sysutils/conan/pkg-descr b/sysutils/conan/pkg-descr
new file mode 100644
index 000000000000..76cdf581e7d7
--- /dev/null
+++ b/sysutils/conan/pkg-descr
@@ -0,0 +1,5 @@
+Conan is a MIT-licensed, Open Source package manager for C and C++ development,
+allowing development teams to easily and efficiently manage their packages and
+dependencies across platforms and build systems.
+
+WWW: https://conan.io/
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
deleted file mode 100644
index 31c71ebcfbb9..000000000000
--- a/sysutils/condor/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# Created by: Andy Pavlo
-# $FreeBSD$
-
-# Note: Make sure there are no other versions of HTCondor installed during
-#       build.  The build system may pick up incompatible headers and libs.
-
-PORTNAME=	condor
-DISTVERSION=	8.4.12
-PORTREVISION=	8
-CATEGORIES=	sysutils net
-MASTER_SITES=	http://www.acadix.biz/Ports/distfiles/
-DISTNAME=	condor_src-${PORTVERSION}-all-all
-
-MAINTAINER=	jwb@FreeBSD.org
-COMMENT=	High-throughput computing on distributively owned resources
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
-
-LIB_DEPENDS=	libkrb5support.so:security/krb5 \
-		libpcre.so:devel/pcre \
-		libcurl.so:ftp/curl \
-		libexpat.so:textproc/expat2 \
-		${PY_BOOST}
-
-# Does not work with Python 3
-USES=		cmake:noninja compiler:c++11-lang cpe perl5 pgsql \
-		python:2.7 shebangfix ssl
-USE_LDCONFIG=	yes
-
-CPE_VENDOR=	condor_project
-SHEBANG_FILES=	src/condor_scripts/condor_qsub \
-		src/condor_gridmanager/remote_gahp \
-		src/condor_examples/condor_limits_wrapper.sh \
-		src/condor_examples/condor_schedd.init \
-		src/condor_starter.V6.1/condor_ssh_to_job_shell_setup \
-		src/condor_job_router/condor_router_history
-
-WRKSRC=		${WRKDIR}/condor-${PORTVERSION}
-WANT_PGSQL=	server
-CXXFLAGS+=	-I${LOCALBASE}/include -fPIC
-LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME}:${LOCALBASE}/lib:/usr/lib:/lib -fPIC
-CMAKE_ARGS=	-DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING=${LDFLAGS} \
-		-DPYTHON_BOOST_LIB:STRING=${PY_BOOST_LIB} \
-		-DPYTHON_INCLUDE_DIR:PATH=${LOCALBASE}/include/${PYTHON_VERSION} \
-		-DPYTHON_LIBRARY:FILEPATH=${LOCALBASE}/lib/lib${PYTHON_VERSION}.so
-
-SUB_FILES=	condor-config condor_config.local pkg-message
-PLIST_SUB=	CONDOR_UVER=${PORTVERSION:S/./_/g}
-
-USERS=		condor
-GROUPS=		${USERS}
-
-USE_RC_SUBR=	condor
-
-PORTEXAMPLES=	*
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-pre-everything::
-	@( ${PRINTF} "\nWARNING: Condor needs approximately 3GB to build!"; \
-	   ${PRINTF} "         Please make sure your build environment has that much space before continuing.\n" )
-
-pre-configure:
-	@${REINPLACE_CMD} \
-		-e 's,\(set( C_SHARE_EXAMPLES	\)share/condor,\1${EXAMPLESDIR_REL},' \
-		${WRKSRC}/build/cmake/CondorPackageConfig.cmake
-	@${REINPLACE_CMD} \
-		-e '/create_symlink/d' \
-		${WRKSRC}/src/condor_scripts/CMakeLists.txt
-	@${REINPLACE_CMD} \
-		-e 's|/usr/local/condor|${PREFIX}|g' \
-		-e 's|$$(LOCAL_DIR)/condor_config.local|$$(RELEASE_DIR)/etc/condor_config.local|g' \
-		-e 's|/bin/mail|/usr/bin/mail|g' \
-		-e 's|/usr/bin/java|${LOCALBASE}/bin/java|g' \
-		-e 's|^CONDOR_HOST|##  CONDOR_HOST|' \
-		-e 's|#CONDOR_IDS=x.x|CONDOR_IDS=466.466|' \
-		${WRKSRC}/src/condor_examples/condor_config.annotated
-
-post-install:
-	${INSTALL_DATA} \
-		${STAGEDIR}${ETCDIR}/examples/condor_config.annotated \
-		${STAGEDIR}${PREFIX}/etc/condor_config.sample
-	${INSTALL_DATA} ${WRKDIR}/condor_config.local \
-		${STAGEDIR}${PREFIX}/etc/condor_config.local.sample
-	${INSTALL_SCRIPT} ${WRKDIR}/condor-config ${STAGEDIR}${PREFIX}/sbin
-
-.include <bsd.port.mk>
diff --git a/sysutils/condor/distinfo b/sysutils/condor/distinfo
deleted file mode 100644
index 86dfe46983b4..000000000000
--- a/sysutils/condor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1522374768
-SHA256 (condor_src-8.4.12-all-all.tar.gz) = d1544f41f31931fdaa9bfed8cb5f7e669b6e1e53c300888fda05cb29b6091c2a
-SIZE (condor_src-8.4.12-all-all.tar.gz) = 17391439
diff --git a/sysutils/condor/files/condor-config.in b/sysutils/condor/files/condor-config.in
deleted file mode 100644
index 960222cf4ada..000000000000
--- a/sysutils/condor/files/condor-config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-
-if [ -z $EDITOR ]; then
-    EDITOR=vi
-    export EDITOR
-fi
-
-for file in condor_config condor_config.local; do
-    if [ ! -e %%PREFIX%%/etc/$file ]; then
-	cp %%PREFIX%%/etc/$file.sample %%PREFIX%%/etc/$file
-    fi
-done
-
-$EDITOR %%PREFIX%%/etc/condor_config.local
-
-printf "Restart HTCondor? (y/[n]) "
-read restart
-
-if [ 0$restart = 0y ]; then
-    service condor stop
-    printf "\nCondor processes running after stop:\n\n"
-    ps ax | grep condor
-
-    service condor start
-    printf "\nCondor processes running after start:\n\n"
-    ps ax | grep condor
-fi
diff --git a/sysutils/condor/files/condor.in b/sysutils/condor/files/condor.in
deleted file mode 100644
index 048f973689f7..000000000000
--- a/sysutils/condor/files/condor.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: condor_master
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# condor_enable (bool):   Set to NO by default.
-#               Set it to YES to enable condor.
-#
-
-. /etc/rc.subr
-
-name="condor"
-rcvar=condor_enable
-
-pidfile=/var/run/${name}.pid
-
-load_rc_config $name
-
-: ${condor_enable="NO"}
-
-start_cmd=condor_start
-stop_cmd=condor_stop
-
-condor_start() {
-    checkyesno condor_enable && echo "Starting condor_master." && \
-	%%PREFIX%%/sbin/condor_master ${condor_flags}
-    while ! ps ax | egrep -v 'grep|rc\.d' | grep -q condor; do
-        echo 'Waiting for daemons to start...'
-        sleep 2
-    done
-}
-
-condor_stop() {
-    # FIXME: condor_off with no arguments should be the same as
-    # -daemon master according to the man page, but it doesn't work
-    checkyesno condor_enable && echo "Stopping condor_master." && \
-	/usr/local/sbin/condor_off -daemon master
-    # Prevent restart command from issuing start before daemons are down
-    tries=1
-    while ps ax | egrep -v 'grep|rc\.d' | grep -q condor; do
-        echo 'Waiting for daemons to shut down...'
-        sleep 2
-        tries=$(($tries + 1))
-        if [ $tries = 10 ]; then
-            printf "condor_off has failed.  Force killing condor_master...\n"
-            killall condor_master
-            sleep 2
-        fi
-    done
-}
-
-run_rc_command "$1"
diff --git a/sysutils/condor/files/condor_config.local.in b/sysutils/condor/files/condor_config.local.in
deleted file mode 100644
index 990d1b5739ae..000000000000
--- a/sysutils/condor/files/condor_config.local.in
+++ /dev/null
@@ -1,166 +0,0 @@
-############################################################################
-# condor_config.local
-# Settings here override the defaults in condor_config.
-# Make changes/additions here and leave condor_config unchanged so
-# that defaults are documented.
-############################################################################
-
-############################################################################
-# What machine is your central manager?
-# Use $(FULL_HOSTNAME) if this is the central manager, or the central
-# manager's hostname otherwise.
-
-CONDOR_HOST = $(FULL_HOSTNAME)
-
-############################################################################
-# Pool's short description
-
-COLLECTOR_NAME = Condor pool at $(CONDOR_HOST)
-
-############################################################################
-# If node is behind a firewall or NAT and cannot be directly reached, use
-# CCB (Condor Connection Broker) or SHARED_PORTS.  The collector host is
-# by default a connection broker, so it's usually the easiest way.
-
-# CCB_ADDRESS = $(COLLECTOR_HOST)
-
-############################################################################
-# Location of logs, job output, etc.
-# Put this on a local partition with plenty of space for job output.
-# $(TILDE) = /home/condor.
-
-LOCAL_DIR               = $(TILDE)
-
-# If /home is shared by cluster compute nodes, log files would collide
-# when using $(TILDE).  Put LOCAL_DIR on some other large, local partition.
-
-# LOCAL_DIR               = /usr/condor
-
-############################################################################
-# Use dynamic provisioning to allow multicore jobs (e.g. openmp) on
-# hosts with multiple cores available to HTCondor.
-
-NUM_SLOTS=1
-NUM_SLOTS_TYPE_1=1
-SLOT_TYPE_1=100%
-SLOT_TYPE_1_PARTITIONABLE=true
-
-############################################################################
-# When is this machine willing to start a job? 
-
-# For compute hosts dedicated to HTCondor
-# START = TRUE
-
-# For compute hosts used primarily for other purposes
-START = (KeyboardIdle > 15 * 60) && ((LoadAvg - CondorLoadAvg) <= 0.5)
-
-# For VM host, assuming we only want to run jobs in the VM
-# START = False
-
-# For VM guest, run jobs only when the host is not being used by owner
-# START = ( HOST_KeyboardIdle > 150 ) && ( HOST_LoadAvg <= 0.5 ) )
-
-############################################################################
-# When to suspend a job?
-
-SUSPEND = FALSE
-
-############################################################################
-# When to nicely stop a job?
-# (as opposed to killing it instantaneously)
-
-# PREEMPT = FALSE
-
-# Compute host used mainly for non-Condor activities
-PREEMPT = (KeyboardIdle < 60) || (LoadAvg - CondorLoadAvg > 0.5)
-
-############################################################################
-# When to instantaneously kill a preempting job
-# (e.g. if a job is in the pre-empting stage for too long)
-# Should normally be set to FALSE
-
-KILL = FALSE
-
-###########################################################################
-# DAEMON LIST:
-#
-# All hosts:            MASTER
-# Central manager:      COLLECTOR, NEGOTIATOR
-# Submit hosts:         SCHEDD
-# Execute hosts:        STARTD
-# Hosts behind NAT:     SHARED_PORT
-
-# This macro determines what daemons the condor_master will start and 
-# keep its watchful eyes on.
-# The list is a comma or space separated list of subsystem names
-
-# Central manager
-# DAEMON_LIST = MASTER, COLLECTOR, NEGOTIATOR, SCHEDD
-
-# Submit and execute host
-# DAEMON_LIST = MASTER, SCHEDD, STARTD
-# DAEMON_LIST = MASTER, SCHEDD, STARTD, SHARED_PORT
-
-# Execute-only host
-DAEMON_LIST = MASTER, STARTD
-# DAEMON_LIST = MASTER, STARTD, SHARED_PORT
-
-###########################################################################
-# Permissions for this host
-#
-# *.your.domain, x.y.z.*, hostname, $(MACRO)
-#
-# ALLOW_ADMINISTRATOR is required by condor_off
-# If central manager is not this host, this entry allows both the central
-# manager and this host to manage the pool.
-#
-# For central manager, allow all other hosts, e.g. 192.168.0.*, to
-# read and write.
-
-ALLOW_ADMINISTRATOR = $(CONDOR_HOST), $(FULL_HOSTNAME)
-
-#
-# Enables condor_status, condor_q, ...
-
-ALLOW_READ = $(CONDOR_HOST), $(FULL_HOSTNAME)
-
-#
-# Enables scheduling jobs here
-
-ALLOW_WRITE = $(CONDOR_HOST), $(FULL_HOSTNAME)
-
-###########################################################################
-# Use the settings below for compute hosts behind a NAT firewall relative
-# to the scheduler.  This includes virtual machines not using bridged
-# networking.  See also CCB.
-
-# USE_SHARED_PORT = True
-
-# Use a different shared port for each host behind the same NAT gateway
-# SHARED_PORT_ARGS = -p 9616
-
-# Public IP of NAT gateway
-# TCP_FORWARDING_HOST = 1.2.3.4
-
-# Arbitrary name for private network behind NAT using SHARED_PORT or CCB.
-# Nodes with same network name will talk to each other directly.
-# PRIVATE_NETWORK_NAME = mypool
-
-# Network device on private network, if multihomed
-# PRIVATE_NETWORK_INTERFACE = bge0
-
-###########################################################################
-# For virtual machines to get keyboard activity and load from the host
-# http://research.cs.wisc.edu/htcondor/manual/v8.2/3_12Setting_Up.html
-
-########
-# Host:
-
-# Indicate hostnames or IPs of virtual machines in host condor_config:
-# VMP_VM_LIST = 1.2.3.4
-
-######
-# VM:
-
-# Indicate hostname or IP of host in virtual machine condor_config:
-# VMP_HOST_MACHINE = 1.2.3.4
diff --git a/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake b/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake
deleted file mode 100644
index 8d121f6f054c..000000000000
--- a/sysutils/condor/files/patch-build_cmake_macros_SystemSpecificInformations.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- build/cmake/macros/SystemSpecificInformations.cmake.orig	2017-07-06 19:22:42 UTC
-+++ build/cmake/macros/SystemSpecificInformations.cmake
-@@ -265,6 +265,8 @@ if(UNIX)
-     set( SYSTEM_NAME "freebsd_${FREEBSD_RELEASE}" )
-     set( CONDOR_FREEBSD ON )
-     set( BSD_UNIX ON )
-+    # FreeBSD 8 and later just use CONDOR_FREEBSD
-+    # FreeBSD 9 and later require utmpx
-     if(FREEBSD_MAJOR MATCHES "4" )
-       set( CONDOR_FREEBSD4 ON )
-     elseif(FREEBSD_MAJOR MATCHES "5" )
-@@ -273,16 +275,7 @@ if(UNIX)
-       set( CONDOR_FREEBSD6 ON )
-     elseif(FREEBSD_MAJOR MATCHES "7" )
-       set( CONDOR_FREEBSD7 ON )
--    elseif(FREEBSD_MAJOR MATCHES "8" )
--      set( CONDOR_FREEBSD8 ON )
--    elseif(FREEBSD_MAJOR MATCHES "9" )
--      set( CONDOR_FREEBSD9 ON )
--      set( CONDOR_UTMPX ON )
--    elseif(FREEBSD_MAJOR MATCHES "10" )
--      set( CONDOR_FREEBSD10 ON )
--      set( CONDOR_UTMPX ON )
--    elseif(FREEBSD_MAJOR MATCHES "11" )
--      set( CONDOR_FREEBSD11 ON )
-+    elseif(FREEBSD_MAJOR GREATER "8" )
-       set( CONDOR_UTMPX ON )
-     endif()
-     if( CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" )
diff --git a/sysutils/condor/files/patch-src_condor__includes_config.h.cmake b/sysutils/condor/files/patch-src_condor__includes_config.h.cmake
deleted file mode 100644
index 9395bf9e069e..000000000000
--- a/sysutils/condor/files/patch-src_condor__includes_config.h.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/condor_includes/config.h.cmake.orig	2018-12-10 14:54:32 UTC
-+++ src/condor_includes/config.h.cmake
-@@ -49,10 +49,6 @@
- #cmakedefine CONDOR_FREEBSD6
- /* Define if on FreeBSD 7 */
- #cmakedefine CONDOR_FREEBSD7
--///* Define if on FreeBSD 8 */
--#cmakedefine CONDOR_FREEBSD8
--///* Define if on FreeBSD 9 */
--#cmakedefine CONDOR_FREEBSD9
- ///* Define if on FreeBSD 9 or later, which use utmpx insead of utmp */
- #cmakedefine CONDOR_UTMPX
- ///* Define if on FreeBSD */
diff --git a/sysutils/condor/files/patch-src_condor__io_condor__auth__kerberos.cpp b/sysutils/condor/files/patch-src_condor__io_condor__auth__kerberos.cpp
deleted file mode 100644
index c7926a748a11..000000000000
--- a/sysutils/condor/files/patch-src_condor__io_condor__auth__kerberos.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/condor_io/condor_auth_kerberos.cpp.orig	2018-03-29 12:44:08 UTC
-+++ src/condor_io/condor_auth_kerberos.cpp
-@@ -80,7 +80,7 @@ static void (KRB5_CALLCONV *krb5_free_cr
- static void (KRB5_CALLCONV *krb5_free_keyblock_ptr)(krb5_context, register krb5_keyblock *) = NULL;
- static void (KRB5_CALLCONV *krb5_free_principal_ptr)(krb5_context, krb5_principal) = NULL;
- static void (KRB5_CALLCONV *krb5_free_ticket_ptr)(krb5_context, krb5_ticket *) = NULL;
--static krb5_error_code (KRB5_CALLCONV *krb5_fwd_tgt_creds_ptr)(krb5_context, krb5_auth_context, char *, krb5_principal, krb5_principal, krb5_ccache, int, krb5_data *) = NULL;
-+static krb5_error_code (KRB5_CALLCONV *krb5_fwd_tgt_creds_ptr)(krb5_context, krb5_auth_context, const char *, krb5_principal, krb5_principal, krb5_ccache, int, krb5_data *) = NULL;
- static krb5_error_code (KRB5_CALLCONV *krb5_get_credentials_ptr)(krb5_context, krb5_flags, krb5_ccache, krb5_creds *, krb5_creds **) = NULL;
- // The presence of KRB5_RESPONDER_QUESTION_PASSWORD is a hacky substitute
- // for detecting the version of Kerberos where the function signature
diff --git a/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt b/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt
deleted file mode 100644
index 86fff6ae10f6..000000000000
--- a/sysutils/condor/files/patch-src_python-bindings_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/python-bindings/CMakeLists.txt.orig	2017-07-06 19:22:42 UTC
-+++ src/python-bindings/CMakeLists.txt
-@@ -108,11 +108,13 @@ else()
-     set ( CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/lib64 )
-     set ( CMAKE_LIBRARY_PATH CMAKE_LIBRARY_PATH_ORIG)
- 
-+    if (NOT PYTHON_BOOST_LIB)
-     if (PROPER AND "${PYTHON_VERSION_MAJOR}" MATCHES "3")
-       set ( PYTHON_BOOST_LIB boost_python3 )
-     else()
-       set ( PYTHON_BOOST_LIB boost_python )
-     endif()
-+    endif(NOT PYTHON_BOOST_LIB)
- 
-     include_directories(${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE})
-     link_directories(${BOOST_LD})
diff --git a/sysutils/condor/files/pkg-message.in b/sysutils/condor/files/pkg-message.in
deleted file mode 100644
index d4d63544720d..000000000000
--- a/sysutils/condor/files/pkg-message.in
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Edit %%PREFIX%%/etc/condor_config.local to taste to get started.
-
-Settings in condor_config.local override the defaults in condor_config.
-Use condor_config as a reference, and make all changes to condor_config.local.
-
-Unless this is the central manager host, you will need to at least change
-CONDOR_HOST.  Also ensure that DAEMON_LIST and ALLOW_* are appropriate for
-this host.
-
-To start the condor daemons, add 'condor_enable="YES"' to
-
-	/etc/rc.conf
-
-and run
-
-	service condor start
-EOM
-}
-]
diff --git a/sysutils/condor/pkg-deinstall b/sysutils/condor/pkg-deinstall
deleted file mode 100644
index aafa011025fa..000000000000
--- a/sysutils/condor/pkg-deinstall
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-##########################################################################
-#   Script description:
-#       Install script for Condor scheduler
-#
-#   Arguments:
-#       $1 = port name
-#       $2 = mode (e.g. 'POST-INSTALL')
-#
-#   Returns:
-#       Standard
-#
-#   History:
-#   Date        Name        Modification
-#   2011-11-22  J Bacon     Derived from Ganglia pkg-install
-##########################################################################
-
-case $2 in
-DEINSTALL)
-    # Old log, spool, etc. in /home/condor are deleted if empty, otherwise
-    # left in place, this could leave incompatible
-    # older files in place when Condor is upgraded.  Not sure how backward
-    # compatible condor versions are with respect to logs, etc.  For now,
-    # the syadmin is left to deal with this.
-
-    # Remove the link to /home/condor
-    rm -f /var/db/condor
-    # Remove /home/condor, if empty
-    rmdir /home/condor/config
-    rmdir /home/condor/execute
-    rmdir /home/condor/log
-    rmdir /home/condor/spool
-    rmdir /home/condor
-    ;;
-esac
diff --git a/sysutils/condor/pkg-descr b/sysutils/condor/pkg-descr
deleted file mode 100644
index 450acd780fc9..000000000000
--- a/sysutils/condor/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Condor is a open-source, specialized workload management system for
-compute-intensive jobs. Like other full-featured batch systems, Condor provides
-a job queuing mechanism, scheduling policy, priority scheme, resource
-monitoring, and resource management. Users submit their serial or parallel jobs
-to Condor, Condor places them into a queue, chooses when and where to run the
-jobs based upon a policy, carefully monitors their progress, and ultimately
-informs the user upon completion. Condor also contains mechanisms to submit
-jobs to grid-sites and supports many different grid toolkits.
-
-It is developed at the University of Wisconsin-Madison's Department of Computer
-Sciences.
-
-WWW: https://research.cs.wisc.edu/htcondor/
diff --git a/sysutils/condor/pkg-install b/sysutils/condor/pkg-install
deleted file mode 100644
index 0c256dcfe898..000000000000
--- a/sysutils/condor/pkg-install
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-##########################################################################
-#   Script description:
-#       Install script for Condor scheduler
-#
-#   Arguments:
-#       $1 = port name
-#       $2 = mode (e.g. 'POST-INSTALL')
-#
-#   Returns:
-#       Standard
-#
-#   History:
-#   Date        Name        Modification
-#   2011-11-22  J Bacon     Derived from Ganglia pkg-install
-##########################################################################
-
-u=condor
-g=condor
-
-# Place condor on a large partition so it can accommodate output files from
-# jobs.  The default /var/db/condor could result in /var filling up with
-# job output.
-# Note that /home may be linked to a shared partition on a cluster built
-# with sysutils/cluster-admin, which could cause collisions between
-# condor daemons on compute nodes sharing this space.  In this case,
-# override by setting LOCAL_DIR in your condor_config file.
-LOCAL_DIR=/home/condor
-
-case $2 in
-PRE-INSTALL)
-    ;;
-POST-INSTALL)
-    for dir in log spool config execute; do
-	mkdir -p $LOCAL_DIR/$dir
-    done
-    chown -Rh $u:$g $LOCAL_DIR
-    ;;
-esac
diff --git a/sysutils/condor/pkg-plist b/sysutils/condor/pkg-plist
deleted file mode 100644
index 9bed21921a38..000000000000
--- a/sysutils/condor/pkg-plist
+++ /dev/null
@@ -1,273 +0,0 @@
-bin/classad_functional_tester
-bin/classad_version
-bin/condor_check_userlogs
-bin/condor_cod
-bin/condor_config_val
-bin/condor_continue
-bin/condor_dagman
-bin/condor_drain
-bin/condor_findhost
-bin/condor_gather_info
-bin/condor_history
-bin/condor_hold
-bin/condor_job_router_info
-bin/condor_ping
-bin/condor_pool_job_report
-bin/condor_power
-bin/condor_prio
-bin/condor_q
-bin/condor_qedit
-bin/condor_qsub
-bin/condor_%%CMAKE_BUILD_TYPE%%
-bin/condor_reschedule
-bin/condor_rm
-bin/condor_router_history
-bin/condor_router_q
-bin/condor_router_rm
-bin/condor_run
-bin/condor_ssh_to_job
-bin/condor_stats
-bin/condor_status
-bin/condor_submit
-bin/condor_submit_dag
-bin/condor_suspend
-bin/condor_tail
-bin/condor_test_match
-bin/condor_transfer_data
-bin/condor_update_machine_ad
-bin/condor_userlog
-bin/condor_userlog_job_counter
-bin/condor_userprio
-bin/condor_vacate
-bin/condor_vacate_job
-bin/condor_version
-bin/condor_wait
-bin/condor_who
-%%ETCDIR%%/condor
-%%ETCDIR%%/condor_config
-%%ETCDIR%%/examples/README
-%%ETCDIR%%/examples/condor-tmpfiles.conf
-%%ETCDIR%%/examples/condor.boot.generic
-%%ETCDIR%%/examples/condor.boot.rpm
-%%ETCDIR%%/examples/condor.init
-%%ETCDIR%%/examples/condor.plist
-%%ETCDIR%%/examples/condor.service
-%%ETCDIR%%/examples/condor.sysconfig
-%%ETCDIR%%/examples/condor_config.annotated
-%%ETCDIR%%/examples/condor_config.generic
-%%ETCDIR%%/examples/condor_config.generic.redhat
-%%ETCDIR%%/examples/condor_config.local.central.manager
-%%ETCDIR%%/examples/condor_config.local.ckpt.server
-%%ETCDIR%%/examples/condor_config.local.dedicated.resource
-%%ETCDIR%%/examples/condor_config.local.dedicated.submit
-%%ETCDIR%%/examples/condor_config.local.ha_condor_client
-%%ETCDIR%%/examples/condor_config.local.ha_condor_had
-%%ETCDIR%%/examples/condor_config.local.view_server
-%%ETCDIR%%/examples/condor_config.submit.generic
-%%ETCDIR%%/examples/lamscript
-%%ETCDIR%%/examples/mp1script
-%%ETCDIR%%/examples/mp2script
-%%ETCDIR%%/examples/openmpiscript
-%%ETCDIR%%/sysconfig/condor
-@sample etc/condor_config.local.sample
-@sample etc/condor_config.sample
-include/MyString.h
-include/chirp_client.h
-include/classad/attrrefs.h
-include/classad/cclassad.h
-include/classad/classad.h
-include/classad/classadCache.h
-include/classad/classadErrno.h
-include/classad/classadItor.h
-include/classad/classad_distribution.h
-include/classad/classad_stl.h
-include/classad/collection.h
-include/classad/collectionBase.h
-include/classad/common.h
-include/classad/debug.h
-include/classad/exprList.h
-include/classad/exprTree.h
-include/classad/fnCall.h
-include/classad/indexfile.h
-include/classad/lexer.h
-include/classad/lexerSource.h
-include/classad/literals.h
-include/classad/matchClassad.h
-include/classad/operators.h
-include/classad/query.h
-include/classad/sink.h
-include/classad/source.h
-include/classad/transaction.h
-include/classad/util.h
-include/classad/value.h
-include/classad/view.h
-include/classad/xmlLexer.h
-include/classad/xmlSink.h
-include/classad/xmlSource.h
-include/compat_classad.h
-include/compat_classad_list.h
-include/compat_classad_util.h
-include/condor_classad.h
-include/condor_constants.h
-include/condor_event.h
-include/condor_header_features.h
-include/condor_holdcodes.h
-include/file_lock.h
-include/iso_dates.h
-include/read_user_log.h
-include/stl_string_utils.h
-include/user_log.README
-include/user_log.c++.h
-include/write_user_log.h
-lib/Chirp.jar
-lib/Condor.pm
-lib/CondorJavaInfo.class
-lib/CondorJavaWrapper.class
-lib/CondorPersonal.pm
-lib/CondorTest.pm
-lib/CondorUtils.pm
-lib/condor_ssh_to_job_sshd_config_template
-lib/libchirp_client.a
-lib/libclassad.a
-lib/libcondorapi.a
-lib/libpyclassad%%PYTHON_VER%%_%%CONDOR_UVER%%.a
-lib/python/classad.so
-lib/python/htcondor.so
-lib/scimark2lib.jar
-libexec/accountant_log_fixer
-libexec/condor_chirp
-libexec/condor_dagman_metrics_reporter
-libexec/condor_defrag
-libexec/condor_history_helper
-libexec/condor_job_router
-libexec/condor_kflops
-libexec/condor_limits_wrapper.sh
-libexec/condor_mips
-libexec/condor_power_state
-libexec/condor_rooster
-libexec/condor_schedd.init
-libexec/condor_shared_port
-libexec/condor_sinful
-libexec/condor_ssh
-libexec/condor_ssh_to_job_shell_setup
-libexec/condor_ssh_to_job_sshd_setup
-libexec/condor_testingd
-libexec/condor_transferer
-libexec/condor_urlfetch
-libexec/curl_plugin
-libexec/data_plugin
-libexec/interactive.sub
-libexec/libclassad_python_user.so
-libexec/libvirt_simple_script.awk
-libexec/sshd.sh
-man/man1/bosco_cluster.1.gz
-man/man1/bosco_findplatform.1.gz
-man/man1/bosco_install.1.gz
-man/man1/bosco_ssh_start.1.gz
-man/man1/bosco_start.1.gz
-man/man1/bosco_stop.1.gz
-man/man1/bosco_uninstall.1.gz
-man/man1/condor_advertise.1.gz
-man/man1/condor_check_userlogs.1.gz
-man/man1/condor_checkpoint.1.gz
-man/man1/condor_chirp.1.gz
-man/man1/condor_cod.1.gz
-man/man1/condor_compile.1.gz
-man/man1/condor_config_val.1.gz
-man/man1/condor_configure.1.gz
-man/man1/condor_continue.1.gz
-man/man1/condor_dagman.1.gz
-man/man1/condor_dagman_metrics_reporter.1.gz
-man/man1/condor_drain.1.gz
-man/man1/condor_fetchlog.1.gz
-man/man1/condor_findhost.1.gz
-man/man1/condor_gather_info.1.gz
-man/man1/condor_gpu_discovery.1.gz
-man/man1/condor_history.1.gz
-man/man1/condor_hold.1.gz
-man/man1/condor_install.1.gz
-man/man1/condor_job_router_info.1.gz
-man/man1/condor_master.1.gz
-man/man1/condor_off.1.gz
-man/man1/condor_on.1.gz
-man/man1/condor_ping.1.gz
-man/man1/condor_pool_job_report.1.gz
-man/man1/condor_power.1.gz
-man/man1/condor_preen.1.gz
-man/man1/condor_prio.1.gz
-man/man1/condor_procd.1.gz
-man/man1/condor_q.1.gz
-man/man1/condor_qedit.1.gz
-man/man1/condor_qsub.1.gz
-man/man1/condor_reconfig.1.gz
-man/man1/condor_%%CMAKE_BUILD_TYPE%%.1.gz
-man/man1/condor_reschedule.1.gz
-man/man1/condor_restart.1.gz
-man/man1/condor_rm.1.gz
-man/man1/condor_rmdir.1.gz
-man/man1/condor_router_history.1.gz
-man/man1/condor_router_q.1.gz
-man/man1/condor_router_rm.1.gz
-man/man1/condor_run.1.gz
-man/man1/condor_set_shutdown.1.gz
-man/man1/condor_sos.1.gz
-man/man1/condor_ssh_to_job.1.gz
-man/man1/condor_stats.1.gz
-man/man1/condor_status.1.gz
-man/man1/condor_store_cred.1.gz
-man/man1/condor_submit.1.gz
-man/man1/condor_submit_dag.1.gz
-man/man1/condor_suspend.1.gz
-man/man1/condor_tail.1.gz
-man/man1/condor_transfer_data.1.gz
-man/man1/condor_update_machine_ad.1.gz
-man/man1/condor_updates_stats.1.gz
-man/man1/condor_urlfetch.1.gz
-man/man1/condor_userlog.1.gz
-man/man1/condor_userprio.1.gz
-man/man1/condor_vacate.1.gz
-man/man1/condor_vacate_job.1.gz
-man/man1/condor_version.1.gz
-man/man1/condor_wait.1.gz
-man/man1/condor_who.1.gz
-man/man1/gidd_alloc.1.gz
-man/man1/procd_ctl.1.gz
-sbin/bosco_install
-sbin/condor-config
-sbin/condor_advertise
-sbin/condor_c-gahp
-sbin/condor_c-gahp_worker_thread
-sbin/condor_collector
-sbin/condor_configure
-sbin/condor_credd
-sbin/condor_fetchlog
-sbin/condor_ft-gahp
-sbin/condor_gridmanager
-sbin/condor_had
-sbin/condor_init
-sbin/condor_install
-sbin/condor_master
-sbin/condor_negotiator
-sbin/condor_off
-sbin/condor_on
-sbin/condor_preen
-sbin/condor_procd
-sbin/condor_reconfig
-sbin/condor_replication
-sbin/condor_restart
-sbin/condor_root_switchboard
-sbin/condor_schedd
-sbin/condor_set_shutdown
-sbin/condor_shadow
-sbin/condor_sos
-sbin/condor_startd
-sbin/condor_starter
-sbin/condor_store_cred
-sbin/condor_testwritelog
-sbin/condor_transferd
-sbin/condor_updates_stats
-sbin/condor_vm-gahp
-sbin/remote_gahp
-src/chirp/chirp_client.c
-src/chirp/chirp_client.h
-src/chirp/chirp_protocol.h
diff --git a/sysutils/confctl/Makefile b/sysutils/confctl/Makefile
index 92d0337fa8d6..d0f904247b89 100644
--- a/sysutils/confctl/Makefile
+++ b/sysutils/confctl/Makefile
@@ -1,17 +1,15 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	confctl
 PORTVERSION=	1.2
 CATEGORIES=	sysutils
-MASTER_SITES=	GHC \
-		LOCAL/trasz
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Utility to parse and modify C-like configuration files
 
 LICENSE=	BSD2CLAUSE
 
+USES=		autoreconf
 USE_GITHUB=	yes
 GH_ACCOUNT=	trasz
 GNU_CONFIGURE=	yes
diff --git a/sysutils/confctl/distinfo b/sysutils/confctl/distinfo
index e1cf0601aa37..a4622d090c22 100644
--- a/sysutils/confctl/distinfo
+++ b/sysutils/confctl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (confctl-1.2.tar.gz) = 9c75d5157f8207bd70c5cafff48495b7b8f903ee488cdb64e8aea2ede2547e96
-SIZE (confctl-1.2.tar.gz) = 112039
+TIMESTAMP = 1575294048
+SHA256 (trasz-confctl-1.2_GH0.tar.gz) = 3489ef035f9adda0e99b8204f029ccf8b22b08afb109c554c2db16de84a1efa2
+SIZE (trasz-confctl-1.2_GH0.tar.gz) = 32361
diff --git a/sysutils/confman/Makefile b/sysutils/confman/Makefile
deleted file mode 100644
index ea2b653139c2..000000000000
--- a/sysutils/confman/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: ccowart@timesinks.net
-# $FreeBSD$
-
-PORTNAME=	confman
-PORTVERSION=	1.9.4b
-PORTREVISION=	2
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.timesinks.net/distfiles/
-
-MAINTAINER=	ccowart@timesinks.net
-COMMENT=	Revision controlled configuration manager
-
-BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	bash:shells/bash \
-		svn:devel/subversion \
-		sudo:security/sudo \
-		greadlink:sysutils/coreutils \
-		wget:ftp/wget
-
-GNU_CONFIGURE=	yes
-
-CONFIGURE_ARGS+=	--localstatedir=/var
-
-.include <bsd.port.mk>
diff --git a/sysutils/confman/distinfo b/sysutils/confman/distinfo
deleted file mode 100644
index a6f9ecebe5c7..000000000000
--- a/sysutils/confman/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (confman-1.9.4b.tar.gz) = 25c9ed7f3d93acdd6b7202c91af8988812856cc8c432fc4338d00ef6857daaf4
-SIZE (confman-1.9.4b.tar.gz) = 91766
diff --git a/sysutils/confman/pkg-descr b/sysutils/confman/pkg-descr
deleted file mode 100644
index 09b38553cfc1..000000000000
--- a/sysutils/confman/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-confman is a configuration manager written in bash. confman uses Subversion to
-provide a revision-controlled environment for editing and deploying
-configuration files. With confman, you can easily manage configuration files
-for all or any subset of your machines.
-
-WWW: http://www.timesinks.net/projects/confman
diff --git a/sysutils/confman/pkg-plist b/sysutils/confman/pkg-plist
deleted file mode 100644
index a9a4583651e0..000000000000
--- a/sysutils/confman/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-etc/bash_completion.d/confman_completion
-etc/confman.conf.sample
-etc/defaults/confman.conf
-etc/defaults/recipe.template
-libexec/confman/abspath
-libexec/confman/confaudit
-libexec/confman/confexport
-libexec/confman/conflock
-libexec/confman/confman_precommit
-libexec/confman/confsync
-man/man5/confman.conf.5.gz
-man/man8/confadmin.8.gz
-man/man8/confaudit.8.gz
-man/man8/confexport.8.gz
-man/man8/confman.8.gz
-man/man8/confsync.8.gz
-sbin/confadmin
-sbin/confman
-%%DATADIR%%/confadmindoc.sh
-%%DATADIR%%/confmancommon.sh
-%%DATADIR%%/confmandoc.sh
-%%DATADIR%%/confmanlib.sh
-%%DATADIR%%/libfiledb.sh
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 338edd2cd4cc..0fa433e97f31 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -1,5 +1,4 @@
 # Created by: Roman Bogorodskiy <novel@FreeBSD.org>
-# $FreeBSD$
 
 PKGNAMESUFFIX=	-awesome
 
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index de0fb05a776a..fb1132843560 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,10 +1,8 @@
 # Created by: Roman Bogorodskiy <novel@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	conky
-PORTVERSION=	1.11.5
+PORTVERSION=	1.12.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -13,17 +11,19 @@ COMMENT?=	Advanced, highly configurable system monitor for X11
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 BUILD_DEPENDS=	db2x_xsltproc:textproc/docbook2X \
 		docbook-xsl>=0:textproc/docbook-xsl \
-		xsltproc:textproc/libxslt
+		xsltproc:textproc/libxslt \
+		gsed:textproc/gsed
 
 USES=		cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \
-		localbase lua:52 pkgconfig tar:bzip2
+		localbase lua:52-53 pkgconfig tar:bzip2
 
 CMAKE_ARGS=	-DBUILD_PORT_MONITORS:BOOL=false \
 		-DBUILD_IBM:BOOL=false \
 		-DBUILD_HDDTEMP:BOOL=false \
 		-DBUILD_IOSTATS:BOOL=false \
 		-DBUILD_AUDACIOUS:BOOL=false \
-		-DBUILD_DOCS:BOOL=true
+		-DBUILD_DOCS:BOOL=true \
+		-DAPP_SED=${LOCALBASE}/bin/gsed
 CONFLICTS?=	conky-awesome-[0-9]*
 
 SLAVEDIRS=	sysutils/conky-awesome
@@ -63,6 +63,7 @@ IPV6_CMAKE_BOOL=	BUILD_IPV6
 
 LUA_CAIRO_DESC=		Lua-Cairo binding
 LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
+LUA_CAIRO_USES=		gnome
 LUA_CAIRO_USE=		gnome=cairo
 LUA_CAIRO_PLIST_FILES=	lib/conky/libcairo.so
 LUA_CAIRO_IMPLIES=	X11
@@ -74,6 +75,7 @@ LUA_IMLIB2_IMPLIES=	IMLIB2 X11
 
 LUA_RSVG_DESC=		Lua-rsvg binding
 LUA_RSVG_CMAKE_BOOL=	BUILD_LUA_RSVG
+LUA_RSVG_USES=		gnome
 LUA_RSVG_USE=		gnome=librsvg2
 LUA_RSVG_PLIST_FILES=	lib/conky/librsvg.so
 LUA_RSVG_IMPLIES=	X11
@@ -94,9 +96,11 @@ NCURSES_USES=		ncurses:port
 
 RSS_DESC=		Display RSS feeds
 RSS_CMAKE_BOOL=		BUILD_RSS
+RSS_USES=		gnome
 RSS_USE=		gnome=glib20,libxml2
 RSS_IMPLIES=		CURL
 
+X11_USES=		xorg
 X11_USE=		xorg=x11,xext,xdamage,xfixes
 X11_CMAKE_BOOL=		BUILD_X11 OWN_WINDOW
 X11_VARS=		EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf
@@ -117,6 +121,7 @@ XMMS2_LIB_DEPENDS=	libxmmsclient.so:audio/xmms2
 XOAP_DESC=		Display XOAP weather reports
 XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
 XOAP_IMPLIES=		CURL METAR
+XOAP_USES=		gnome
 XOAP_USE=		gnome=libxml2
 
 .include <bsd.port.options.mk>
@@ -139,6 +144,15 @@ post-patch:
 		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
 	@${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \
 		${WRKSRC}/doc/docgen.sh
+.if ${LUA_DEFAULT} == 5.2
+	# Force using lua 5.2
+	@${REINPLACE_CMD} -e 's/lua.*5\.*3//' \
+		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
+.elif ${LUA_DEFAULT} == 5.3
+	# Force using lua 5.3
+	@${REINPLACE_CMD} -e 's/lua.*5\.*2//' \
+		${WRKSRC}/cmake/ConkyPlatformChecks.cmake
+.endif
 
 post-build:
 	(cd ${WRKSRC}/doc && ${SH} docgen.sh)
diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo
index 8046786bed4c..5cd0b050a1a1 100644
--- a/sysutils/conky/distinfo
+++ b/sysutils/conky/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565781705
-SHA256 (brndnmtthws-conky-v1.11.5_GH0.tar.gz) = 4cefdd92219a90934c28297e4ac7448a3f69d6aeec5d48c5763b23f6b214ef13
-SIZE (brndnmtthws-conky-v1.11.5_GH0.tar.gz) = 2400965
+TIMESTAMP = 1619365300
+SHA256 (brndnmtthws-conky-v1.12.2_GH0.tar.gz) = a7eb112fe7a6bcd6c44706a53cbf6222e640cd1e585492fc654aa9e05a7bbc94
+SIZE (brndnmtthws-conky-v1.12.2_GH0.tar.gz) = 2407428
diff --git a/sysutils/conky/files/patch-src_conky.cc b/sysutils/conky/files/patch-src_conky.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/conky/files/patch-src_conky.cc
+++ /dev/null
diff --git a/sysutils/conky/files/patch-src_luamm.cc b/sysutils/conky/files/patch-src_luamm.cc
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/conky/files/patch-src_luamm.cc
+++ /dev/null
diff --git a/sysutils/conky/files/patch-src_luamm.hh b/sysutils/conky/files/patch-src_luamm.hh
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sysutils/conky/files/patch-src_luamm.hh
+++ /dev/null
diff --git a/sysutils/conman/Makefile b/sysutils/conman/Makefile
index e67d7f705dac..b2eb4349f3ee 100644
--- a/sysutils/conman/Makefile
+++ b/sysutils/conman/Makefile
@@ -1,5 +1,4 @@
 # Created by: John Hixson <jhixson@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	conman
 PORTVERSION=	0.3.0
diff --git a/sysutils/conman/files/conmand.in b/sysutils/conman/files/conmand.in
index 522766fb4b74..fece97cb8453 100644
--- a/sysutils/conman/files/conmand.in
+++ b/sysutils/conman/files/conmand.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: conmand
 # REQUIRE: NETWORKING
 # KEYWORD: shutdown
diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile
index b27077e2bceb..14c0de9a2224 100644
--- a/sysutils/consolehm/Makefile
+++ b/sysutils/consolehm/Makefile
@@ -1,5 +1,4 @@
 # Created by: Mike Muir <mmuir@es.co.nz>
-# $FreeBSD$
 
 PORTNAME=	consolehm
 PORTVERSION=	1.31
diff --git a/sysutils/consolehm/files/patch-chm.c b/sysutils/consolehm/files/patch-chm.c
index 38a169867eb0..f6bb2ddb6d28 100644
--- a/sysutils/consolehm/files/patch-chm.c
+++ b/sysutils/consolehm/files/patch-chm.c
@@ -5,7 +5,7 @@
   */
  
 +#include <osreldate.h>
-+#if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) && defined(__FreeBSD__)
++#if (defined(__aarch64__) || defined(__powerpc__) || defined(__riscv)) && defined(__FreeBSD__)
 +#include <sys/types.h>
 +#include <machine/pio.h>
 +#endif
diff --git a/sysutils/consolekit2/Makefile b/sysutils/consolekit2/Makefile
index 57f2a4af2d0b..c33aaf765735 100644
--- a/sysutils/consolekit2/Makefile
+++ b/sysutils/consolekit2/Makefile
@@ -1,27 +1,50 @@
 # Created by: FreeBSD GNOME Team <gnome@freebsd.org>
-# $FreeBSD$
 
 PORTNAME=	consolekit
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	2
-DISTNAME=	ConsoleKit2-${PORTVERSION}
 
-MAINTAINER=	gnome@FreeBSD.org
+# Support for DRM/evdev
+PATCH_SITES=	https://github.com/unrelentingtech/ConsoleKit2/commit/
+PATCHFILES=	03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch:-p1 \
+		05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch:-p1 \
+		ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch:-p1 \
+		18a058576d118dec428d81c7e2e3369d9ec939d0.patch:-p1 \
+		42b8c93b2b7c2a57a74580531c73ab736e95336a.patch:-p1
+
+MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Framework for defining and tracking users
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libpolkit-gobject-1.so:sysutils/polkit
+		libdrm.so:graphics/libdrm \
+		libevdev.so:devel/libevdev \
+		libudev.so:devel/libudev-devd
+
+OPTIONS_DEFINE=	POLKIT X11
+OPTIONS_DEFAULT=POLKIT X11
+OPTIONS_SUB=	yes
+
+POLKIT_DESC=	Build with Polkit support
+
+POLKIT_LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
+POLKIT_CONFIGURE_ENABLE=	polkit
+
+X11_USES=		xorg
+X11_USE=		XORG=x11
+X11_CONFIGURE_WITH=	x
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	ConsoleKit2
+GH_PROJECT=	ConsoleKit2
+GH_TAGNAME=	51c11c1  # v1.2.2
 
-WRKSRC=		${WRKDIR}/ConsoleKit2-${PORTVERSION}
-USES=		gettext gmake libtool localbase pathfix pkgconfig tar:bzip2
+USES=		autoreconf gettext gmake gnome libtool localbase pathfix pkgconfig \
+		tar:bzip2
 USE_CSTD=	gnu99
-USE_XORG=	x11
 USE_GNOME=	glib20 libxslt introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -29,14 +52,12 @@ CONFIGURE_ARGS=	--with-pid-file=/var/run/${PORTNAME}.pid \
 		--enable-pam-module \
 		--with-pam-module-dir=${PREFIX}/lib \
 		--localstatedir=/var \
-		--enable-polkit \
 		--enable-introspection \
-		--without-html-dir \
+		--enable-libdrm \
+		--enable-libevdev \
+		--enable-libudev \
 		--disable-udev-acl \
 		--disable-libcgmanager \
-		--disable-libdrm \
-		--disable-libevdev \
-		--disable-libudev \
 		--without-systemdsystemunitdir
 INSTALL_TARGET=	install-strip
 
diff --git a/sysutils/consolekit2/distinfo b/sysutils/consolekit2/distinfo
index 015c84f0835c..f0b639d32442 100644
--- a/sysutils/consolekit2/distinfo
+++ b/sysutils/consolekit2/distinfo
@@ -1,3 +1,13 @@
-TIMESTAMP = 1516458395
-SHA256 (ConsoleKit2-1.2.1.tar.bz2) = 9af223096ece88b217bcd3fe85093390a8d1527b6492124b0e90ea7688ec934b
-SIZE (ConsoleKit2-1.2.1.tar.bz2) = 1182946
+TIMESTAMP = 1610903180
+SHA256 (ConsoleKit2-ConsoleKit2-1.2.2-51c11c1_GH0.tar.gz) = 88ec6d7b5fdfbf735e054cba8168fbcdd2a3bf36ee09926779d203c65f6bd435
+SIZE (ConsoleKit2-ConsoleKit2-1.2.2-51c11c1_GH0.tar.gz) = 254801
+SHA256 (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = efcf04ccaba47ad4c979fa694baab3abe7f04fc24c90838b6cbf1e7d709056e6
+SIZE (03eaa9779f2c9c7b0acf0521a5547036bdec2245.patch) = 1457
+SHA256 (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = 36eb5011e29173f955e27f9b6987eecae27e1793b24e09a09bacda7db9fc2296
+SIZE (05f26e99539e7a442e57035ed6d64fdd9a50feb9.patch) = 1409
+SHA256 (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = 37ce4fc9a2360089e3d3fadb1ea581fd2d4bcbc68d5981fdedf7baa1a6ad91e6
+SIZE (ea4a569100dfa44a0c9d42b1cf7381fd8f88c837.patch) = 2336
+SHA256 (18a058576d118dec428d81c7e2e3369d9ec939d0.patch) = 46a79687dd3736469086fa68928d4914152b0c00eee994e03b418700ba115e96
+SIZE (18a058576d118dec428d81c7e2e3369d9ec939d0.patch) = 810
+SHA256 (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = 7a2a144352f137acbd933b48c1f465b3b3f17104eb163e7b2371220510ff2976
+SIZE (42b8c93b2b7c2a57a74580531c73ab736e95336a.patch) = 916
diff --git a/sysutils/consolekit2/files/patch-Makefile.am b/sysutils/consolekit2/files/patch-Makefile.am
new file mode 100644
index 000000000000..cdcdecd95ebc
--- /dev/null
+++ b/sysutils/consolekit2/files/patch-Makefile.am
@@ -0,0 +1,17 @@
+--- Makefile.am.orig	2020-12-07 11:27:30 UTC
++++ Makefile.am
+@@ -27,7 +27,6 @@ EXTRA_DIST = config.rpath \
+ 	NEWS			\
+ 	ChangeLog		\
+ 	m4				\
+-	gtk-doc.make	\
+ 	$(NULL)
+ 
+ DISTCLEANFILES =		\
+@@ -73,5 +72,5 @@ $(srcdir)/ChangeLog:
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+ 	--enable-introspection \
+-	--enable-gtk-doc \
++	--disable-gtk-doc \
+ 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
diff --git a/sysutils/consolekit2/files/patch-configure.ac b/sysutils/consolekit2/files/patch-configure.ac
new file mode 100644
index 000000000000..b2b800bbedc3
--- /dev/null
+++ b/sysutils/consolekit2/files/patch-configure.ac
@@ -0,0 +1,23 @@
+--- configure.ac.orig	2020-12-07 11:27:30 UTC
++++ configure.ac
+@@ -96,7 +96,11 @@ AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_40,
+ 
+ 
+ # Check for X11 installed
+-XDT_CHECK_LIBX11_REQUIRE()
++XDT_CHECK_LIBX11()
++if test "x$with_x" = "xyes" ; then
++        XDT_CHECK_LIBX11_REQUIRE()
++fi
++AM_CONDITIONAL([USE_LIBX11], [test "x$with_x" = xyes])
+ 
+ # Check for Polkit/PolicyKit
+ XDT_CHECK_OPTIONAL_PACKAGE([POLKIT], [polkit-gobject-1], [polkit_minimum_version],
+@@ -553,7 +557,6 @@ doc/Makefile
+ doc/console-kit-daemon.1m
+ doc/dbus/ConsoleKit.xml
+ doc/dbus/Makefile
+-doc/libconsolekit/Makefile
+ libconsolekit/Makefile
+ libconsolekit/libconsolekit.pc
+ libck-connector/Makefile
diff --git a/sysutils/consolekit2/files/patch-doc_Makefile.am b/sysutils/consolekit2/files/patch-doc_Makefile.am
new file mode 100644
index 000000000000..6748e03c6a5c
--- /dev/null
+++ b/sysutils/consolekit2/files/patch-doc_Makefile.am
@@ -0,0 +1,8 @@
+--- doc/Makefile.am.orig	2020-12-07 11:27:30 UTC
++++ doc/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = dbus libconsolekit
++SUBDIRS = dbus
+ 
+ manpagedir = $(mandir)/man1
+ manpage_DATA =            \
diff --git a/sysutils/consolekit2/files/patch-tools_Makefile.am b/sysutils/consolekit2/files/patch-tools_Makefile.am
new file mode 100644
index 000000000000..fdc8efa10f08
--- /dev/null
+++ b/sysutils/consolekit2/files/patch-tools_Makefile.am
@@ -0,0 +1,19 @@
+--- tools/Makefile.am.orig	2020-04-11 15:14:59 UTC
++++ tools/Makefile.am
+@@ -148,10 +148,14 @@ ck_log_system_stop_LDADD =		\
+ 
+ libexec_PROGRAMS = 			\
+ 	ck-collect-session-info		\
+-	ck-get-x11-server-pid		\
+-	ck-get-x11-display-device	\
+ 	ck-remove-directory			\
+ 	$(NULL)
++
++if USE_LIBX11
++libexec_PROGRAMS += 			\
++	ck-get-x11-server-pid		\
++	ck-get-x11-display-device
++endif
+ 
+ ck_collect_session_info_SOURCES =	\
+ 	ck-collect-session-info.c	\
diff --git a/sysutils/consolekit2/pkg-plist b/sysutils/consolekit2/pkg-plist
index 110873b5fd6d..469d998582c2 100644
--- a/sysutils/consolekit2/pkg-plist
+++ b/sysutils/consolekit2/pkg-plist
@@ -25,8 +25,8 @@ lib/pam_ck_connector.so
 libdata/pkgconfig/ck-connector.pc
 libdata/pkgconfig/libconsolekit.pc
 libexec/ck-collect-session-info
-@(,,4755) libexec/ck-get-x11-display-device
-libexec/ck-get-x11-server-pid
+%%X11%%@(,,4755) libexec/ck-get-x11-display-device
+%%X11%%libexec/ck-get-x11-server-pid
 libexec/ck-remove-directory
 man/man1/ck-history.1.gz
 man/man1/ck-launch-session.1.gz
@@ -46,7 +46,7 @@ share/locale/bg/LC_MESSAGES/ConsoleKit2.mo
 share/locale/es/LC_MESSAGES/ConsoleKit2.mo
 share/locale/es_419/LC_MESSAGES/ConsoleKit2.mo
 share/locale/ru/LC_MESSAGES/ConsoleKit2.mo
-share/polkit-1/actions/org.freedesktop.consolekit.policy
+%%POLKIT%%share/polkit-1/actions/org.freedesktop.consolekit.policy
 @dir etc/ConsoleKit/run-seat.d
 @dir etc/ConsoleKit/run-session.d
 @dir lib/ConsoleKit/run-seat.d
diff --git a/sysutils/consul-alerts/Makefile b/sysutils/consul-alerts/Makefile
index 7d82e534f8bd..5902b5cac072 100644
--- a/sysutils/consul-alerts/Makefile
+++ b/sysutils/consul-alerts/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	consul-alerts
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -10,32 +8,19 @@ COMMENT=	Simple daemon to send notifications based on Consul health checks
 
 LICENSE=	GPLv2+
 
-USES=		compiler go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcalephStorage
 GH_SUBDIR=	src/github.com/AcalephStorage/consul-alerts
-GH_TUPLE=	aws:aws-sdk-go:v1.8.30:aws_sdk_go/src/github.com/aws/aws-sdk-go \
-		imdario:mergo:0.2.2:mergo/src/github.com/imdario/mergo \
-		mitchellh:hashstructure:9204ce5:hashstructure/src/github.com/mitchellh/hashstructure
+GH_TUPLE=	aws:aws-sdk-go:v1.8.30:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		imdario:mergo:0.2.2:mergo/vendor/github.com/imdario/mergo \
+		mitchellh:hashstructure:9204ce5:hashstructure/vendor/github.com/mitchellh/hashstructure
+
+GO_BUILDFLAGS=	-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}"
 
 PLIST_FILES=	${PREFIX}/bin/${PORTNAME}
 
 USE_RC_SUBR=	${PORTNAME}
 
-do-build:
-	cd ${GO_WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
-			-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/bin/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-.include <bsd.port.pre.mk>
-
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/consul-alerts/distinfo b/sysutils/consul-alerts/distinfo
index 57c9442b2e94..eaad2c003122 100644
--- a/sysutils/consul-alerts/distinfo
+++ b/sysutils/consul-alerts/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1495844279
-SHA256 (AcalephStorage-consul-alerts-v0.5.0_GH0.tar.gz) = 2f6b8e1c0c58a1b84ff0b24655f86da1325f4124eaa24fd45bc1b4cc324ef360
-SIZE (AcalephStorage-consul-alerts-v0.5.0_GH0.tar.gz) = 242042
+TIMESTAMP = 1572029714
+SHA256 (AcalephStorage-consul-alerts-v0.6.0_GH0.tar.gz) = 720be44a0faca480e4561f792852e1425ceb391428a8843e37b793fdc9881c97
+SIZE (AcalephStorage-consul-alerts-v0.6.0_GH0.tar.gz) = 456751
 SHA256 (aws-aws-sdk-go-v1.8.30_GH0.tar.gz) = 8467f39202e19299738eae2c0ec1e5475798b2bd02110d64efe824abe912210e
 SIZE (aws-aws-sdk-go-v1.8.30_GH0.tar.gz) = 6784740
 SHA256 (imdario-mergo-0.2.2_GH0.tar.gz) = 06ff82ceeea1a2d5e5064867a8e3c581ad9c1fc8e243afc673b7b8c94f28d4cf
diff --git a/sysutils/consul-alerts/files/consul-alerts.in b/sysutils/consul-alerts/files/consul-alerts.in
index abe88e3351df..68066a178bcd 100644
--- a/sysutils/consul-alerts/files/consul-alerts.in
+++ b/sysutils/consul-alerts/files/consul-alerts.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: consul-alerts
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/consul-replicate/Makefile b/sysutils/consul-replicate/Makefile
index bb881fc72cea..6c9b7e1245a7 100644
--- a/sysutils/consul-replicate/Makefile
+++ b/sysutils/consul-replicate/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	consul-replicate
 PORTVERSION=	0.4.0
 DISTVERSIONPREFIX=	v
diff --git a/sysutils/consul-replicate/files/consul-replicate.in b/sysutils/consul-replicate/files/consul-replicate.in
index ee6ab52cc43c..021bfd1a3958 100644
--- a/sysutils/consul-replicate/files/consul-replicate.in
+++ b/sysutils/consul-replicate/files/consul-replicate.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: consul-replicate
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index b93d1c6e2ad6..78d4646c4a73 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	consul
-PORTVERSION=	1.5.1
+PORTVERSION=	1.9.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -16,7 +14,7 @@ USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 
-GO_BUILDFLAGS=	-ldflags="\
+GO_BUILDFLAGS=	-ldflags=" \
 		-X github.com/hashicorp/consul/version.Version=${PORTVERSION} \
 		-X github.com/hashicorp/consul/version.VersionPrerelease= \
 		-X github.com/hashicorp/consul/version.GitDescribe=v${PORTVERSION} \
@@ -26,8 +24,17 @@ USE_RC_SUBR=	consul
 
 PLIST_FILES=	bin/consul
 
-USERS=		consul
-GROUPS=		consul
+ETCDIR=			${PREFIX}/etc/${PORTNAME}.d
+CONSUL_USER?=		consul
+CONSUL_GROUP?=		consul
+CONSUL_DBDIR?=		/var/db/${PORTNAME}
+
+USERS=		${CONSUL_USER}
+GROUPS=		${CONSUL_GROUP}
+
+SUB_LIST=	CONSUL_DBDIR=${CONSUL_DBDIR} \
+		GROUP=${CONSUL_GROUP} \
+		USER=${CONSUL_USER}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/vendor/github.com/${GH_ACCOUNT}/${PORTNAME}
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index d88849506796..f9aa2064cfb4 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558709843
-SHA256 (hashicorp-consul-v1.5.1_GH0.tar.gz) = b8376369b16987e87d3fcda20eb9463144737dbc7dfddd13cba6db9f8f427fd9
-SIZE (hashicorp-consul-v1.5.1_GH0.tar.gz) = 21123963
+TIMESTAMP = 1615393537
+SHA256 (hashicorp-consul-v1.9.4_GH0.tar.gz) = 4f8f61d4449bb28ef857957e3dbb1926edfb0e5d2818e8ffec2677ae969b8956
+SIZE (hashicorp-consul-v1.9.4_GH0.tar.gz) = 30350632
diff --git a/sysutils/consul/files/consul.in b/sysutils/consul/files/consul.in
index 081c07526d64..894917e11fee 100644
--- a/sysutils/consul/files/consul.in
+++ b/sysutils/consul/files/consul.in
@@ -1,52 +1,88 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: consul
-# REQUIRE: LOGIN
+# REQUIRE: NETWORKING FILESYSTEMS defaultroute netwait resolv
 # KEYWORD: shutdown
 #
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
+# Add consul_enable="YES" to /etc/rc.conf to enable Consul
+#
+# Additional variables you can define are:
+#
+# consul_user (string):                Set user to run consul.
+#                                      Default is "%%USER%%".
+# consul_group (string):               Set group to run consul.
+#                                      Default is "%%GROUP%%".
+# consul_pidfile (string):             Set full path to pid file
+#                                      Default is "/var/run/consul.pid"
+# consul_datadir (dir):                Set dir to run consul in.
+#                                      Default is "%%CONSUL_DBDIR%%"
+# consul_syslog_output_enable (bool):  Set to YES to enable syslog output
+#                                      Default is "NO". See daemon(8).
+# consul_syslog_output_tag (str):      Set syslog tag if syslog enabled.
+#                                      Default is "consul". See daemon(8).
+# consul_syslog_output_priority (str): Set syslog priority if syslog enabled.
+#                                      Default is "info". See daemon(8).
+# consul_syslog_output_facility (str): Set to YES to enable syslog output
+#                                      Default is "daemon". See daemon(8).
+#
+# see rc.subr(8) for additional variables and options
 #
-# consul_enable (bool):	Set to NO by default.
-#				Set it to YES to enable consul.
-# consul_user (user):        Set user to run consul.
-#                               Default is "consul".
-# consul_group (group):      Set group to run consul.
-#                               Default is "consul".
-# consul_dir (dir):          Set dir to run consul in.
-#                               Default is "/var/db/consul".
 
 . /etc/rc.subr
 
 name=consul
 rcvar=consul_enable
-extra_commands="reload configtest"
 
 load_rc_config $name
 
 : ${consul_enable:="NO"}
-: ${consul_user:="consul"}
-: ${consul_group:="consul"}
-: ${consul_dir:="/var/db/consul"}
+: ${consul_syslog_output_enable:="NO"}
+: ${consul_user:="%%USER%%"}
+: ${consul_group:="%%GROUP%%"}
+: ${consul_pidfile:="/var/run/${name}.pid"}
+: ${consul_datadir:="%%CONSUL_DBDIR%%"}
+
+start_precmd="consul_start_precmd"
+extra_commands="reload"
 
-pidfile=/var/run/consul.pid
+# backwards compatibility
+if [ -n "${consul_dir}" ]; then
+    consul_datadir=${consul_dir}
+fi
+
+if checkyesno consul_syslog_output_enable; then
+    if [ -n "${consul_syslog_output_tag}" ]; then
+        consul_syslog_output_flags="-T ${consul_syslog_output_tag}"
+    else
+        consul_syslog_output_flags="-T ${name}"
+    fi
+    if [ -n "${consul_syslog_output_priority}" ]; then
+        consul_syslog_output_flags="${consul_syslog_output_flags} -s ${consul_syslog_output_priority}"
+    fi  
+
+    if [ -n "${consul_syslog_output_facility}" ]; then
+        consul_syslog_output_flags="${consul_syslog_output_flags} -l ${consul_syslog_output_facility}"
+    fi  
+fi  
+
+pidfile=${consul_pidfile}
 procname="%%PREFIX%%/bin/consul"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} /usr/bin/env ${consul_env} ${procname} agent -data-dir=${consul_dir} -config-dir=%%PREFIX%%/etc/consul.d ${consul_args}"
+command_args="-f -t ${name} ${consul_syslog_output_flags} -p ${pidfile} /usr/bin/env ${consul_env} ${procname} agent -data-dir=${consul_datadir} -config-dir=%%ETCDIR%% ${consul_args}"
 
-start_precmd=consul_startprecmd
-
-consul_startprecmd()
+consul_start_precmd()
 {
-        if [ ! -e ${pidfile} ]; then
-                install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile};
-        fi
+    if [ ! -e ${pidfile} ]; then
+        install -o ${consul_user} -g ${consul_group} /dev/null ${pidfile}
+    fi
+
+    if [ ! -d ${consul_datadir} ]; then
+        install -d -m 0750 -o ${consul_user} -g ${consul_group} ${consul_datadir}
+    fi
 
-        if [ ! -d ${consul_dir} ]; then
-                install -d -o ${consul_user} -g ${consul_group} ${consul_dir}
-        fi
+    if [ ! -d %%ETCDIR%% ]; then
+        install -d -m 0750 -o ${consul_user} -g ${consul_group} %%ETCDIR%%
+    fi
 }
 
 run_rc_command "$1"
diff --git a/sysutils/consul/pkg-message b/sysutils/consul/pkg-message
new file mode 100644
index 000000000000..c3e5cd7950ca
--- /dev/null
+++ b/sysutils/consul/pkg-message
@@ -0,0 +1,12 @@
+[
+{
+	message: <<EOD
+Warning! Version 1.9.0 of consul contains breaking changes. See:
+
+https://github.com/hashicorp/consul/blob/master/CHANGELOG.md
+
+for details.
+EOD,
+	type : upgrade
+}
+]
diff --git a/sysutils/consul_exporter/Makefile b/sysutils/consul_exporter/Makefile
index fdc9c6ba6c35..e94ca0ee7a1f 100644
--- a/sysutils/consul_exporter/Makefile
+++ b/sysutils/consul_exporter/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	consul_exporter
 PORTVERSION=	0.3.0
 DISTVERSIONPREFIX=	v
@@ -10,37 +8,19 @@ COMMENT=	Exporter for Consul metrics
 
 LICENSE=	APACHE20
 
-USES=		compiler go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	prometheus
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/consul_exporter
 
-USE_RC_SUBR=	consul_exporter
-
-PLIST_FILES=	bin/consul_exporter
-
-post-extract:
-	@${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/prometheus/consul_exporter; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 ${BUILD_ENV} GOPATH=${WRKSRC} go build \
-		-ldflags "\
+GO_BUILDFLAGS=	-ldflags "\
 		-X github.com/prometheus/consul_exporter/version.Version=${PORTVERSION}  \
 		-X github.com/prometheus/consul_exporter/version.VersionPrerelease=  \
-		-X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION} \
-		" \
-		-o bin/consul_exporter
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/prometheus/consul_exporter/bin/consul_exporter ${STAGEDIR}${PREFIX}/bin/consul_exporter
+		-X github.com/prometheus/consul_exporter/version.GitDescribe=v${PORTVERSION}"
 
-.include <bsd.port.pre.mk>
+USE_RC_SUBR=	consul_exporter
 
-# golang assumes that if clang is in use, it is called "clang" and not "cc". If
-# it's called "cc", go fails.
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
+PLIST_FILES=	bin/consul_exporter
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/consul_exporter/files/consul_exporter.in b/sysutils/consul_exporter/files/consul_exporter.in
index 0a460d928b35..3fee08d585a7 100644
--- a/sysutils/consul_exporter/files/consul_exporter.in
+++ b/sysutils/consul_exporter/files/consul_exporter.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD$
-#
 # PROVIDE: consul_exporter
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
diff --git a/sysutils/container-diff/Makefile b/sysutils/container-diff/Makefile
index e8372dc712cf..5739dad4f8ce 100644
--- a/sysutils/container-diff/Makefile
+++ b/sysutils/container-diff/Makefile
@@ -1,8 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	container-diff
-PORTVERSION=	0.15.0
+PORTVERSION=	0.16.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -21,7 +20,4 @@ PLIST_FILES=	bin/container-diff
 GH_ACCOUNT=	GoogleContainerTools
 USE_GITHUB=	yes
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/container-diff ${STAGEDIR}${PREFIX}/bin/container-diff
-
 .include <bsd.port.mk>
diff --git a/sysutils/container-diff/distinfo b/sysutils/container-diff/distinfo
index 7fa1d94827c0..39e68a7836f3 100644
--- a/sysutils/container-diff/distinfo
+++ b/sysutils/container-diff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550687391
-SHA256 (GoogleContainerTools-container-diff-v0.15.0_GH0.tar.gz) = 4bdd73a81b6f7a988cf270236471016525d0541f5fe04286043f3db28e4b250c
-SIZE (GoogleContainerTools-container-diff-v0.15.0_GH0.tar.gz) = 2137869
+TIMESTAMP = 1609598849
+SHA256 (GoogleContainerTools-container-diff-v0.16.0_GH0.tar.gz) = 255e08e82ffb9139b78054cd0caf0c20b1e6ab8fc359a9a8558da3912b70aba5
+SIZE (GoogleContainerTools-container-diff-v0.16.0_GH0.tar.gz) = 2565216
diff --git a/sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
new file mode 100644
index 000000000000..0e0603b77cee
--- /dev/null
+++ b/sysutils/container-diff/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
@@ -0,0 +1,24 @@
+From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001
+From: Tobias Klauser <tklauser@distanz.ch>
+Date: Fri, 25 Oct 2019 21:13:51 +0200
+Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64
+
+CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a
+type uint128. This type doesn't exist in Go.
+
+Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b
+Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419
+Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
+TryBot-Result: Gobot Gobot <gobot@golang.org>
+Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
+--- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2019-08-18 13:42:05 UTC
++++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
+@@ -397,7 +397,7 @@ type Reg struct {
+ }
+ 
+ type FpReg struct {
+-	Fp_q  [32]uint128
++	Fp_q  [512]uint8
+ 	Fp_sr uint32
+ 	Fp_cr uint32
+ }
diff --git a/sysutils/containerd/Makefile b/sysutils/containerd/Makefile
new file mode 100644
index 000000000000..644ffe4c62d1
--- /dev/null
+++ b/sysutils/containerd/Makefile
@@ -0,0 +1,33 @@
+PORTNAME=	containerd
+DISTVERSIONPREFIX=v
+DISTVERSION=	1.5.2
+CATEGORIES=	sysutils
+
+MAINTAINER=	decke@FreeBSD.org
+COMMENT=	Open and reliable container runtime
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	bash:shells/bash \
+		go:lang/go
+
+USES=		gmake
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	containerd
+GH_SUBDIR=	src/github.com/containerd/containerd
+
+MAKE_ENV=	${GO_ENV} \
+		GOFLAGS="${GO_BUILDFLAGS}" \
+		VERSION="${DISTVERSION}"
+
+PLIST_FILES=	bin/containerd \
+		bin/containerd-shim \
+		bin/containerd-stress \
+		bin/ctr
+
+do-install:
+	@(cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}${PREFIX}" ${MAKE_CMD} install)
+
+.include <bsd.port.mk>
diff --git a/sysutils/containerd/distinfo b/sysutils/containerd/distinfo
new file mode 100644
index 000000000000..094af6257c4e
--- /dev/null
+++ b/sysutils/containerd/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1621754173
+SHA256 (containerd-containerd-v1.5.2_GH0.tar.gz) = d72a85cbcd60009f41637e97e37a372a2451b369c183e2b58fdab00e1c9fe894
+SIZE (containerd-containerd-v1.5.2_GH0.tar.gz) = 7667262
diff --git a/sysutils/containerd/files/patch-Makefile b/sysutils/containerd/files/patch-Makefile
new file mode 100644
index 000000000000..b97ef729e828
--- /dev/null
+++ b/sysutils/containerd/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	2021-05-03 20:52:36 UTC
++++ Makefile
+@@ -21,8 +21,8 @@ DESTDIR ?= /usr/local
+ TEST_IMAGE_LIST ?=
+ 
+ # Used to populate variables in version package.
+-VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
+-REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
++VERSION?=unknown
++REVISION?=unknown
+ PACKAGE=github.com/containerd/containerd
+ SHIM_CGO_ENABLED ?= 0
+ 
diff --git a/sysutils/containerd/pkg-descr b/sysutils/containerd/pkg-descr
new file mode 100644
index 000000000000..dfa12c0425ba
--- /dev/null
+++ b/sysutils/containerd/pkg-descr
@@ -0,0 +1,7 @@
+containerd is an industry-standard container runtime with an emphasis on
+simplicity, robustness and portability. It is available as a daemon for
+Linux and Windows, which can manage the complete container lifecycle of
+its host system: image transfer and storage, container execution and
+supervision, low-level storage and network attachments, etc.
+
+WWW: https://containerd.io/
diff --git a/sysutils/contractor/Makefile b/sysutils/contractor/Makefile
index 5f050e350628..1130eab15672 100644
--- a/sysutils/contractor/Makefile
+++ b/sysutils/contractor/Makefile
@@ -1,11 +1,10 @@
 # Created by: Olivier Duchateau
-# $FreeBSD$
 
 PORTNAME=	contractor
 PORTVERSION=	0.3.4
 CATEGORIES=	sysutils
 
-MAINTAINER=	tobik@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop-wide extension service
 
 LICENSE=	GPLv3
@@ -15,7 +14,7 @@ BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libgee-0.8.so:devel/libgee
 
-USES=		gettext-runtime meson pkgconfig tar:xz
+USES=		gettext-runtime gnome meson pkgconfig tar:xz
 USE_GITHUB=	yes
 GH_ACCOUNT=	elementary
 USE_GNOME=	glib20
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index 547a6170054f..11b7dfccf980 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -1,5 +1,4 @@
 # Created by: Stephen J. Roznowski <sjr@home.net>
-# $FreeBSD$
 
 PORTNAME=		copytape
 PORTVERSION=		1.0
diff --git a/sysutils/coreos-ct/Makefile b/sysutils/coreos-ct/Makefile
index 252bdd8e6db7..a4a78bc8e34a 100644
--- a/sysutils/coreos-ct/Makefile
+++ b/sysutils/coreos-ct/Makefile
@@ -1,5 +1,3 @@
-# $FreeBSD$
-
 PORTNAME=	coreos-ct
 PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
@@ -18,18 +16,13 @@ GH_ACCOUNT=	coreos
 GH_PROJECT=	container-linux-config-transpiler
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-GO_LDFLAGS=	-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION}
+GO_BUILDFLAGS=	-ldflags "-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal/version.Raw=${PORTVERSION}"
+GO_TARGET=	./internal:ct
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.md NEWS doc/*
 
-do-build:
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${WRKDIR}/bin/ct -ldflags "${GO_LDFLAGS}" ./internal)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/ct ${STAGEDIR}${PREFIX}/bin
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 3821f8f87efc..e4dc0b77b2f5 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,7 +1,5 @@
-# $FreeBSD$
-
 PORTNAME=	coreutils
-PORTVERSION=	8.31
+PORTVERSION=	8.32
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	GNU
 
@@ -11,8 +9,6 @@ COMMENT=	Free Software Foundation core utilities
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	idutils-[0-9]*
-
 USES=		cpe gmake iconv perl5 charsetfix tar:xz
 CPE_VENDOR=	gnu
 USE_PERL5=	build	# required for tests and man page generation
@@ -25,10 +21,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g	\
 		--program-transform-name=s/stat/nustat/
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
 
 INFO=		coreutils
 
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index 38d5dfad86b4..f47c0b02fa73 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552263868
-SHA256 (coreutils-8.31.tar.xz) = ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd
-SIZE (coreutils-8.31.tar.xz) = 5410140
+TIMESTAMP = 1592354850
+SHA256 (coreutils-8.32.tar.xz) = 4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+SIZE (coreutils-8.32.tar.xz) = 5547836
diff --git a/sysutils/cotty/Makefile b/sysutils/cotty/Makefile
deleted file mode 100644
index 63bbf358ca93..000000000000
--- a/sysutils/cotty/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Oliver Breuninger <ob@breuninger.org>
-# $FreeBSD$
-
-PORTNAME=	cotty
-PORTVERSION=	0.4c
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.breuninger.org/files/distfiles/
-EXTRACT_SUFX=	.c.gz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple command-line pseudo terminal manager
-
-BROKEN=		unfetchable
-DEPRECATED=	Unfetchable, unmaintained
-EXPIRATION_DATE=	2019-10-16
-
-NO_WRKSUBDIR=	yes
-PLIST_FILES=	bin/cotty
-EXTRACT_CMD=	${GZCAT}
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${DISTNAME}.c
-
-do-build:
-	${CC} ${CFLAGS} -o ${WRKSRC}/cotty ${WRKSRC}/${DISTNAME}.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cotty ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/sysutils/cotty/distinfo b/sysutils/cotty/distinfo
deleted file mode 100644
index e048298c5f31..000000000000
--- a/sysutils/cotty/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cotty-0.4c.c.gz) = e157927da3f66ada472f65a941726068f2230b60c3cff0c7c274ac72a3b49eb2
-SIZE (cotty-0.4c.c.gz) = 9846
diff --git a/sysutils/cotty/files/patch-cotty-0.4c.c b/sysutils/cotty/files/patch-cotty-0.4c.c
deleted file mode 100644
index a35d448380db..000000000000
--- a/sysutils/cotty/files/patch-cotty-0.4c.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- cotty-0.4c.c.orig	Sun Aug 22 21:39:06 2004
-+++ cotty-0.4c.c	Sun Aug 22 21:40:01 2004
-@@ -748,6 +748,7 @@
- 		return 1;
- 	case normal:
- 	case keep_current:
-+	break;
- 	}
- 	return 2;
- }
-@@ -762,7 +763,8 @@
- 	case normal:
- 	case keep_current:
- 	case direct:
--	}
-+	break;
-+	}	
- 	return 2;
- }
- 
-@@ -989,8 +991,8 @@
- 		strcpy(tty_name[1],pty_name[0]);
- 		strcpy(pty_name[1],tty_name[0]);
- 		break;
--	case normal:
--	case keep_current:
-+	case normal: break;
-+	case keep_current: break;
- 	}
- 	/* we don't need those null fds anymore */
- 	for (j=0;j<3;j++) {
diff --git a/sysutils/cotty/pkg-descr b/sysutils/cotty/pkg-descr
deleted file mode 100644
index 19f2c95e211c..000000000000
--- a/sysutils/cotty/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Simple command-line pseudo terminal manager:
-allows to run coprocesses talking to each other thru their tty and/or pty.
-
-Most useful to drive from scripts programs that want a tty, as in
-	cotty -d -- pppd silent 192.168.0.1:192.168.0.2 \
-		-- ssh -t root@remote pppd
-This particular use has been obsoleted under Linux
-(but probably not under the various free BSDs and proprietary Unices),
-as it can be done without cotty with
-	pppd pty 'ssh -t root@remote pppd' silent 192.168.0.1:192.168.0.2
diff --git a/sysutils/cpdup/Makefile b/sysutils/cpdup/Makefile
index c63564f47f21..9b0b6a27231a 100644
--- a/sysutils/cpdup/Makefile
+++ b/sysutils/cpdup/Makefile
@@ -1,25 +1,29 @@
 # Created by: Matthew Dillon <dillon@backplane.com>
-# $FreeBSD$
 
 PORTNAME=	cpdup
-PORTVERSION=	1.20
+PORTVERSION=	1.22
 CATEGORIES=	sysutils
-MASTER_SITES=	http://utenti.gufi.org/~gmarco/files/distfiles/ \
-		https://www.madpilot.net/~mad/
 
-MAINTAINER=	gmarco@gufi.org
+MAINTAINER=	gmarco@giovannelli.it
 COMMENT=	Comprehensive filesystem mirroring and backup program
 
 LICENSE=	BSD2CLAUSE # clarified by Matthew Dillon himself
 
-USES=		tar:xz
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-CFLAGS+=	-D_ST_FLAGS_PRESENT_
+USES=		gmake ssl tar:xz
+USE_GITHUB=	yes
+GH_TUPLE=	DragonFlyBSD:${PORTNAME}:v${PORTVERSION}
+MAKEFILE=	GNUmakefile
+MAKE_ARGS+=	LIBS="-L${OPENSSLLIB} -lcrypto"
 
 PLIST_FILES=	bin/cpdup man/man1/cpdup.1.gz
 
+post-patch:
+	${REINPLACE_CMD} \
+		-e 's}^CFLAGS=\(.*\)}& ${CFLAGS}}' \
+		-e '/^CFLAGS+=.*pkg-config.*openssl/s}^CFLAGS.*}CFLAGS+=-I${OPENSSLINC}}' \
+		-e '/^LIBS+=.*pkg-config.*openssl/s}^LIBS.*}LIBS+=-L${OPENSSLLIB} -Wl,--as-needed -lssl -lcrypto}' \
+		${WRKSRC}/GNUmakefile
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cpdup ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cpdup.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/sysutils/cpdup/distinfo b/sysutils/cpdup/distinfo
index ca72d25577a2..6b8e62d1d530 100644
--- a/sysutils/cpdup/distinfo
+++ b/sysutils/cpdup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550687246
-SHA256 (cpdup-1.20.tar.xz) = 6c79c0785d29fe611156f1f572db866fa41b52518a181f22e1ed45eae6887169
-SIZE (cpdup-1.20.tar.xz) = 37568
+TIMESTAMP = 1613861241
+SHA256 (DragonFlyBSD-cpdup-1.22-v1.22_GH0.tar.gz) = 2dbfa16a080f8dce1be64a511e785b8491e59be8a0f3d1cef035d08147cc4793
+SIZE (DragonFlyBSD-cpdup-1.22-v1.22_GH0.tar.gz) = 44126
diff --git a/sysutils/cpdup/pkg-descr b/sysutils/cpdup/pkg-descr
index 2d28433d0f1d..8cbc9c55c988 100644
--- a/sysutils/cpdup/pkg-descr
+++ b/sysutils/cpdup/pkg-descr
@@ -2,4 +2,7 @@ This is the distribution of "cpdup", a powerful filesystem mirroring and
 backup utility which also has file integrity testing features, supports
 incremental backups, and remote mirroring via ssh.
 
-WWW: http://apollo.backplane.com/FreeBSDPorts/
+Note: This port does not copy (or mirror) FreeBSD ACLs, extended
+ACLs nor MAC labels.
+
+WWW: https://github.com/DragonFlyBSD/cpdup
diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile
index 551869b0dec8..e6edfc6ebdae 100644
--- a/sysutils/cpu-x/Makefile
+++ b/sysutils/cpu-x/Makefile
@@ -1,8 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	cpu-x
-PORTVERSION=	3.2.4
+PORTVERSION=	4.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -14,17 +13,15 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	nasm:devel/nasm
 LIB_DEPENDS=	libcpuid.so:sysutils/libcpuid \
 		libpci.so:devel/libpci \
-		libstatgrab.so:devel/libstatgrab \
-		libcurl.so:ftp/curl
+		libstatgrab.so:devel/libstatgrab
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	X0rg
 GH_PROJECT=	${PORTNAME:tu}
 
 USES=		cmake gettext ncurses pkgconfig
-CMAKE_ARGS=	-DWITH_LIBJSONC:BOOL=OFF
 
-PORTDOCS=	ChangeLog README.md
+PORTDOCS=	ChangeLog.md README.md
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=	X11
@@ -32,12 +29,14 @@ OPTIONS_SUB=	yes
 
 X11_DESC=	Build GTK+3 frontend in addition to ncurses one
 
+X11_USES=	gnome
 X11_USE=	GNOME=gtk30
 X11_CMAKE_OFF=	-DWITH_GTK:BOOL=OFF
-X11_VARS=	INSTALLS_ICONS=yes
+X11_VARS=	GLIB_SCHEMAS=org.cpu-x.gschema.xml INSTALLS_ICONS=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's, -Wno-unused-result,,' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e '23s,^,#include <sys/wait.h>,' ${WRKSRC}/src/gui_gtk.c
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/cpu-x/distinfo b/sysutils/cpu-x/distinfo
index 67ddb15feb55..7b380c427348 100644
--- a/sysutils/cpu-x/distinfo
+++ b/sysutils/cpu-x/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547409869
-SHA256 (X0rg-CPU-X-v3.2.4_GH0.tar.gz) = f266388e13c527a5d1d98ec70957b1284f67aa89470cf71bc98ecb41c21542eb
-SIZE (X0rg-CPU-X-v3.2.4_GH0.tar.gz) = 1834895
+TIMESTAMP = 1592070555
+SHA256 (X0rg-CPU-X-v4.0.1_GH0.tar.gz) = c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf
+SIZE (X0rg-CPU-X-v4.0.1_GH0.tar.gz) = 1719474
diff --git a/sysutils/cpu-x/pkg-plist b/sysutils/cpu-x/pkg-plist
index 37f73af1406e..29c4a6a50852 100644
--- a/sysutils/cpu-x/pkg-plist
+++ b/sysutils/cpu-x/pkg-plist
@@ -1,7 +1,8 @@
 bin/cpu-x
-%%X11%%bin/cpu-x_polkit
+libexec/cpu-x-daemon
 %%X11%%share/applications/cpu-x.desktop
-%%X11%%share/applications/cpu-x-root.desktop
+share/bash-completion/completions/cpu-x
+share/fish/vendor_completions.d/cpu-x.fish
 %%X11%%share/icons/hicolor/16x16/apps/cpu-x.png
 %%X11%%share/icons/hicolor/22x22/apps/cpu-x.png
 %%X11%%share/icons/hicolor/24x24/apps/cpu-x.png
@@ -16,15 +17,31 @@ bin/cpu-x
 %%X11%%share/icons/hicolor/256x256/apps/cpu-x.png
 %%X11%%share/icons/hicolor/384x384/apps/cpu-x.png
 %%X11%%share/icons/hicolor/512x512/apps/cpu-x.png
+share/locale/ar/LC_MESSAGES/cpu-x.mo
 share/locale/cs_CZ/LC_MESSAGES/cpu-x.mo
+share/locale/de/LC_MESSAGES/cpu-x.mo
+share/locale/el/LC_MESSAGES/cpu-x.mo
+share/locale/es/LC_MESSAGES/cpu-x.mo
 share/locale/fr/LC_MESSAGES/cpu-x.mo
 share/locale/id/LC_MESSAGES/cpu-x.mo
+share/locale/it/LC_MESSAGES/cpu-x.mo
+share/locale/ja/LC_MESSAGES/cpu-x.mo
+share/locale/ko/LC_MESSAGES/cpu-x.mo
+share/locale/lv/LC_MESSAGES/cpu-x.mo
+share/locale/mr/LC_MESSAGES/cpu-x.mo
+share/locale/ms/LC_MESSAGES/cpu-x.mo
+share/locale/nb_NO/LC_MESSAGES/cpu-x.mo
 share/locale/pl/LC_MESSAGES/cpu-x.mo
+share/locale/pt/LC_MESSAGES/cpu-x.mo
 share/locale/pt_BR/LC_MESSAGES/cpu-x.mo
 share/locale/ru/LC_MESSAGES/cpu-x.mo
+share/locale/tr/LC_MESSAGES/cpu-x.mo
+share/locale/uk/LC_MESSAGES/cpu-x.mo
 share/locale/zh/LC_MESSAGES/cpu-x.mo
-%%X11%%share/metainfo/cpu-x.appdata.xml
-%%X11%%share/polkit-1/actions/org.pkexec.cpu-x.policy
+share/locale/zh_Hant/LC_MESSAGES/cpu-x.mo
+%%X11%%share/metainfo/org.cpu-x.appdata.xml
+%%X11%%share/polkit-1/actions/org.cpu-x-daemon.policy
+share/zsh/site-functions/_cpu-x
 %%X11%%%%DATADIR%%/AMD.png
 %%X11%%%%DATADIR%%/CPU-X.png
 %%X11%%%%DATADIR%%/Centaur.png
diff --git a/sysutils/cpu/Makefile b/sysutils/cpu/Makefile
deleted file mode 100644
index 4ebdb2661302..000000000000
--- a/sysutils/cpu/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: Hye-Shik Chang <perky@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	cpu
-PORTVERSION=	1.4.3
-PORTREVISION=	6
-CATEGORIES=	sysutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Change Password Utility for LDAP
-
-USES=		tar:bzip2 libtool
-GNU_CONFIGURE=	yes
-USE_OPENLDAP=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/cpu --with-ldap=${LOCALBASE}
-INSTALL_TARGET=	install-strip
-CPPFLAGS+=	-DLDAP_DEPRECATED
-
-.include <bsd.port.mk>
diff --git a/sysutils/cpu/distinfo b/sysutils/cpu/distinfo
deleted file mode 100644
index 833fa8f3a99d..000000000000
--- a/sysutils/cpu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cpu-1.4.3.tar.bz2) = ea958f8086fe08df69b884fd49d3d172d3934b9b3d5fd1bd526294b7927b3478
-SIZE (cpu-1.4.3.tar.bz2) = 255668
diff --git a/sysutils/cpu/files/patch-doc__Makefile.in b/sysutils/cpu/files/patch-doc__Makefile.in
deleted file mode 100644
index 1923a4567591..000000000000
--- a/sysutils/cpu/files/patch-doc__Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/Makefile.in.orig	2014-06-06 22:53:04.849107374 +0800
-+++ doc/Makefile.in	2014-06-06 22:54:12.397081995 +0800
-@@ -447,13 +447,9 @@ uninstall-info: uninstall-info-recursive
- 
- 
- install-data-local:
--	@if test -f $(sysconfdir)/cpu.conf ; then \
--		echo "$@ will not overwrite existing $(sysconfdir)/cpu.conf"; \
--	else \
--		$(mkinstalldirs) $(sysconfdir); \
--		echo "$(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf"; \
--		$(INSTALL_DATA) cpu.conf $(sysconfdir)/cpu.conf; \
--	fi
-+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
-+	echo "$(INSTALL_DATA) cpu.conf $(DESTDIR)$(sysconfdir)/cpu.conf.sample"; \
-+	$(INSTALL_DATA) cpu.conf $(DESTDIR)$(sysconfdir)/cpu.conf.sample;
- 
- uninstall-local:
- 	@if test -f $(sysconfdir)/cpu.conf ; then \
diff --git a/sysutils/cpu/files/patch-src-plugins-ldap-commandline.c b/sysutils/cpu/files/patch-src-plugins-ldap-commandline.c
deleted file mode 100644
index 1b54ea968dbe..000000000000
--- a/sysutils/cpu/files/patch-src-plugins-ldap-commandline.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/ldap/commandline.c.orig	2007-07-13 22:41:51.000000000 +0200
-+++ src/plugins/ldap/commandline.c	2007-07-13 22:40:43.000000000 +0200
-@@ -83,7 +83,7 @@
-   if (passent == NULL)
-     return -1;
-   bzero (passent, sizeof (struct cpass));
--  (int) passent->sp_lstchg = passent->sp_min = passent->sp_max = -10;
-+  passent->sp_lstchg = passent->sp_min = passent->sp_max = -10;
-   passent->sp_warn = passent->sp_inact = passent->sp_expire = -10;
-   passent->sp_flag = -10;
-   passent->pw_gid = -10;
diff --git a/sysutils/cpu/pkg-descr b/sysutils/cpu/pkg-descr
deleted file mode 100644
index 79b899743f9c..000000000000
--- a/sysutils/cpu/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-CPU is an LDAP user management tool written in C and loosely based
-on FreeBSD's pw(8). The goal of CPU is to be a suitable replacement
-of the useradd/usermod/userdel utilities for administrators using
-an LDAP backend and wishing to have a suite of command line tools
-for doing the administration.
-
-WWW: http://cpu.sourceforge.net/
diff --git a/sysutils/cpu/pkg-plist b/sysutils/cpu/pkg-plist
deleted file mode 100644
index 46e5de4e0d26..000000000000
--- a/sysutils/cpu/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-@sample etc/cpu.conf.sample
-lib/libcpu_ldap.a
-lib/libcpu_ldap.so
-lib/libcpu_ldap.so.0
-lib/libcpu_ldap.so.0.0.0
-lib/libcputil.a
-lib/libcputil.so
-lib/libcputil.so.0
-lib/libcputil.so.0.0.0
-man/man5/cpu.conf.5.gz
-man/man8/cpu-ldap.8.gz
-man/man8/cpu.8.gz
-sbin/cpu
-%%DATADIR%%/cpu.conf.doc
-%%DATADIR%%/test.ldif
diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile
index b7e76b7fb74c..4e92a8ad81eb 100644
--- a/sysutils/cpuburn/Makefile
+++ b/sysutils/cpuburn/Makefile
@@ -1,5 +1,4 @@
 # Created by: Mark Pulford <mark@kyne.com.au>
-# $FreeBSD$
 
 PORTNAME=	cpuburn
 DISTVERSION=	1_4
diff --git a/sysutils/cpuid/Makefile b/sysutils/cpuid/Makefile
index d80519b6a2c3..edb5680786da 100644
--- a/sysutils/cpuid/Makefile
+++ b/sysutils/cpuid/Makefile
@@ -1,14 +1,13 @@
 # Created by: uffe@uffe.org
-# $FreeBSD$
 
 PORTNAME=	cpuid
-DISTVERSION=	20180519
+DISTVERSION=	20201006
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.etallen.com/cpuid/
 PKGNAMESUFFIX=	${CPUID_SUFFIX}
 
-MAINTAINER=	pkubaj@anongoth.pl
+MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Tool to dump x86 CPUID information about the CPU(s)
 
 LICENSE=	GPLv2
diff --git a/sysutils/cpuid/distinfo b/sysutils/cpuid/distinfo
index e6a9c43f0ec5..2d9e507925d1 100644
--- a/sysutils/cpuid/distinfo
+++ b/sysutils/cpuid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526817399
-SHA256 (cpuid-20180519.src.tar.gz) = 967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a
-SIZE (cpuid-20180519.src.tar.gz) = 84784
+TIMESTAMP = 1621374124
+SHA256 (cpuid-20201006.src.tar.gz) = 13c53f16408341d11ed489b352f218ec4dbb5bedb796a9d059e924770a9c56a6
+SIZE (cpuid-20201006.src.tar.gz) = 118994
diff --git a/sysutils/cpuid/files/patch-cpuid.c b/sysutils/cpuid/files/patch-cpuid.c
index 9ff83057649b..5898fafa1ca9 100644
--- a/sysutils/cpuid/files/patch-cpuid.c
+++ b/sysutils/cpuid/files/patch-cpuid.c
@@ -1,6 +1,6 @@
---- cpuid.c.orig	2018-04-19 14:15:07 UTC
+--- cpuid.c.orig	2020-01-22 16:55:23 UTC
 +++ cpuid.c
-@@ -21,17 +21,19 @@
+@@ -33,12 +33,15 @@
  #ifdef __linux__
  #define USE_CPUID_MODULE
  #define USE_KERNEL_SCHED_SETAFFINITY
@@ -13,7 +13,10 @@
  
 +#define CPUID_MAJOR 0
 +
- #define _GNU_SOURCE
+ #if defined(__GNUC__)
+ #define UNUSED __attribute((unused))
+ #else
+@@ -49,7 +52,6 @@
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -21,26 +24,18 @@
  #include <fcntl.h>
  #include <errno.h>
  #include <unistd.h>
-@@ -39,6 +41,8 @@
+@@ -57,6 +59,8 @@
  #include <string.h>
  #include <regex.h>
  #include <getopt.h>
 +#include <pthread.h>
 +#include <pthread_np.h>
  
- #ifdef USE_CPUID_MODULE
- #include <linux/major.h>
-@@ -67,6 +71,7 @@ typedef const char* const  ccstring;
- #define XSTR(x)  STR(x)
- 
- 
-+#undef MAX
- #define MAX(l,r)            ((l) > (r) ? (l) : (r))
- 
- #define LENGTH(array, type) (sizeof(array) / sizeof(type))
-@@ -6622,11 +6627,16 @@ real_setup(unsigned int  cpu,
-          int  status;
-          status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
+ #if defined(__sun)
+ #include <sys/processor.h>
+@@ -8123,12 +8127,17 @@ real_setup(unsigned int  cpu,
+          pthread_t thread = pthread_self();
+          int status = processor_bind(P_LWPID, thread, cpu, NULL);
  #else
 -         cpu_set_t  cpuset;
 +         cpuset_t  cpuset;
@@ -53,11 +48,12 @@
 +	    -1, sizeof(cpuset_t), &cpuset);
 +#else
 +         status = sched_setaffinity(0, sizeof(cpuset_t), &cpuset);
-+#endif
  #endif
++#endif
           if (status == -1) {
              if (cpu > 0) {
-@@ -6749,11 +6759,14 @@ static int real_get (int           cpuid
+                if (errno == EINVAL) return -1;
+@@ -8250,11 +8259,14 @@ static int real_get (int           cpuid_fd,
              "c" (ecx));
  #endif
     } else {
@@ -75,7 +71,7 @@
        if (result == -1) {
           if (quiet) {
              return FALSE;
-@@ -7307,7 +7320,7 @@ main(int     argc,
+@@ -8819,7 +8831,7 @@ main(int     argc,
     };
  
     boolean        opt_one_cpu     = FALSE;
@@ -84,7 +80,7 @@
     boolean        opt_kernel      = FALSE;
     boolean        opt_raw         = FALSE;
     boolean        opt_debug       = FALSE;
-@@ -7437,7 +7450,8 @@ main(int     argc,
+@@ -8950,7 +8962,8 @@ main(int     argc,
     }
  
     // Default to -i.  So use inst unless -k is specified.
diff --git a/sysutils/cpuid2cpuflags/Makefile b/sysutils/cpuid2cpuflags/Makefile
new file mode 100644
index 000000000000..454144e605db
--- /dev/null
+++ b/sysutils/cpuid2cpuflags/Makefile
@@ -0,0 +1,32 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+
+PORTNAME=	cpuid2cpuflags
+PORTVERSION=	11
+DISTVERSIONPREFIX=	v
+CATEGORIES=	sysutils
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Tool to generate CPU_FLAGS_* for your CPU
+
+LICENSE=	BSD2CLAUSE
+
+BROKEN_powerpc64=	fails to build: error "Platform not supported (only Linux supported at the moment)"
+BROKEN_powerpc64le=	fails to build: error "Platform not supported (only Linux supported at the moment)"
+BROKEN_riscv64=		fails to build: src/platforms.h:15:4: error: "Unsupported platform, please report"
+
+USES=		autoreconf
+USE_GITHUB=	yes
+GH_ACCOUNT=	mgorny
+GNU_CONFIGURE=	yes
+TEST_TARGET=	check
+
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/sysutils/cpuid2cpuflags/distinfo b/sysutils/cpuid2cpuflags/distinfo
new file mode 100644
index 000000000000..edff79113d39
--- /dev/null
+++ b/sysutils/cpuid2cpuflags/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1594660495
+SHA256 (mgorny-cpuid2cpuflags-v11_GH0.tar.gz) = d602a1951cc28066dde664eacc81fe889e015b83d4b338f303cbe3fc5932ccc0
+SIZE (mgorny-cpuid2cpuflags-v11_GH0.tar.gz) = 10321
diff --git a/sysutils/cpuid2cpuflags/pkg-descr b/sysutils/cpuid2cpuflags/pkg-descr
new file mode 100644
index 000000000000..2f344c208957
--- /dev/null
+++ b/sysutils/cpuid2cpuflags/pkg-descr
@@ -0,0 +1,15 @@
+The program attempts to obtain the identification and capabilities
+of the currently used CPU, and print the matching set of CPU_FLAGS_*
+flags for Gentoo Linux, but it could be useful for FreeBSD as well.
+
+The output format is compatible both with Portage (package.use) and
+Paludis (use.conf/options.conf).
+
+On x86 platforms, the program issues the CPUID instruction to obtain
+processor capabilities.
+
+On ARM platforms, the userspace processes are not allowed to obtain
+processor information directly.  Instead, the program is relying on
+kernel identification of the CPU provided via the system interfaces.
+
+WWW: https://github.com/mgorny/cpuid2cpuflags
diff --git a/sysutils/cpulimit/Makefile b/sysutils/cpulimit/Makefile
index d5b4946b9182..86edb42b9cf2 100644
--- a/sysutils/cpulimit/Makefile
+++ b/sysutils/cpulimit/Makefile
@@ -1,5 +1,4 @@
 # Created by: Jesse Smith <jessefrgsmith@yahoo.ca>
-# $FreeBSD$
 
 PORTNAME=	cpulimit
 PORTVERSION=	2.2
diff --git a/sysutils/cpupdate/Makefile b/sysutils/cpupdate/Makefile
index cccec18bd442..9217e551482a 100644
--- a/sysutils/cpupdate/Makefile
+++ b/sysutils/cpupdate/Makefile
@@ -1,9 +1,8 @@
 # Created by: Eugene Grosbein <eugen@FreeBSD.org>
-# $FreeBSD$
 
 PORTNAME=	cpupdate
 DISTVERSION=	g20180513
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	eugen@FreeBSD.org
@@ -25,7 +24,10 @@ ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	specific to x86 processors
 
 SUB_FILES=	pkg-message
-SUB_LIST=	CPM_DIR=${CPM_DIR} INTEL_DIR=${INTEL_DIR}
+SUB_LIST=	CPM_DIR="${CPM_DIR}" INTEL_DIR="${INTEL_DIR}" \
+		CPM_DATADIR="${CPM_DATADIR}" INTEL_DATADIR="${INTEL_DATADIR}" \
+		FETCH_CMD="${FETCH_CMD}" MASTER_SITES="${MASTER_SITES}" \
+		DISTFILES="${DISTFILES}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kernschmelze
@@ -34,10 +36,10 @@ GH_TAGNAME=	48e42d5
 
 PLIST_FILES=	sbin/${PORTNAME} man/man8/${PORTNAME}.8.gz
 
-# MCE DB r126
+# MCE DB r181
 CPM_ACCOUNT=	platomav
 CPM_PROJECT=	CPUMicrocodes
-CPM_TAGNAME=	9c82fd7
+CPM_TAGNAME=	044f53b
 
 OPTIONS_DEFINE=		CPM INTEL
 CPM_DESC=		Download platomav/CPUMicrocodes collection
@@ -47,11 +49,12 @@ CPM_GH_TAGNAME=		${CPM_TAGNAME}:cpm
 CPM_DIR=		${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME}
 CPM_DATADIR=		${DATADIR}/CPUMicrocodes/secondary/Intel
 
-INTEL_PACK=		microcode-20180807.tgz
+INTEL_PACK=		microcode-20210216
 INTEL_DESC=		Download Intel microcode pack ${INTEL_PACK}
-INTEL_MASTER_SITES=	https://downloadmirror.intel.com/28039/eng/:intel
+INTEL_PROJECT=		Intel-Linux-Processor-Microcode-Data-Files
+INTEL_MASTER_SITES=	https://codeload.github.com/intel/${INTEL_PROJECT}/tar.gz/:intel
 INTEL_DISTFILES=	${INTEL_PACK}:intel
-INTEL_DIR=		${WRKDIR}/intel-ucode
+INTEL_DIR=		${WRKDIR}/${INTEL_PROJECT}-${INTEL_PACK}/intel-ucode
 INTEL_DATADIR=		${DATADIR}/CPUMicrocodes/primary/Intel
 
 post-patch:
@@ -73,7 +76,7 @@ install-microcodes:
 .if ${PORT_OPTIONS:MCPM}
 	${RM} -rf ${CPM_DATADIR}
 	${MKDIR} ${CPM_DATADIR}
-	cpupdate -IC -S ${CPM_DIR}/Intel -T ${CPM_DATADIR}
+	cpupdate -q -IC -S ${CPM_DIR}/Intel -T ${CPM_DATADIR} >/dev/null
 .endif
 .for _o in INTEL CPM
 .if ${PORT_OPTIONS:M${_o}}
diff --git a/sysutils/cpupdate/distinfo b/sysutils/cpupdate/distinfo
index eefa2d73ad2a..3c38ffbd9125 100644