Index: mail/Makefile
===================================================================
--- mail/Makefile
+++ mail/Makefile
@@ -615,6 +615,7 @@
     SUBDIR += sigrot
     SUBDIR += simscan
     SUBDIR += slapd-cyrus
+    SUBDIR += slimta
     SUBDIR += sma
     SUBDIR += smfsav
     SUBDIR += smfsav-devel
Index: mail/slimta/Makefile
===================================================================
--- /dev/null
+++ mail/slimta/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+PORTNAME=	slimta
+PORTVERSION=	0.7.8
+CATEGORIES=	mail
+MASTER_SITES=	CHEESESHOP
+
+MAINTAINER=	nc@FreeBSD.org
+COMMENT=	Configurable MTA based on the python-slimta libraries
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-slimta>0:mail/py-python-slimta@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+
+USES=		python:3.6+
+USE_PYTHON=	autoplist concurrent distutils
+USE_RC_SUBR=	${PORTNAME}
+
+NO_ARCH=	yes
+SUB_FILES=	pkg-message
+
+post-patch:
+.for file in setup main state
+	@${REINPLACE_CMD} -i '' -e 's|/etc/|${PREFIX}/etc/|' ${WRKSRC}/${PORTNAME}/app/${file}.py
+.endfor
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+
+.include <bsd.port.mk>
Index: mail/slimta/distinfo
===================================================================
--- /dev/null
+++ mail/slimta/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1609989855
+SHA256 (slimta-0.7.8.tar.gz) = 506ee680f6accd14d48f85faf1ff8a64f53b64be19555077cdff54ba38a70501
+SIZE (slimta-0.7.8.tar.gz) = 17095
Index: mail/slimta/files/pkg-message.in
===================================================================
--- /dev/null
+++ mail/slimta/files/pkg-message.in
@@ -0,0 +1,21 @@
+[
+{ type: install
+  message: <<EOM
+In order to be able to use slimta, you will need to run the following command
+to create the configuration file:
+
+  - slimta-setup config
+
+If you chose a directory other than %%PREFIX%%/etc/slimta, set the directory
+in /etc/rc.conf as follows:
+
+  - sysrc slimta_conf="/path/to/slimta/dir/slimta.yaml"
+
+After running slimta-setup, edit slimta.yaml in the directory you set.
+
+Then, you can enable slimta at startup:
+
+  - sysrc slimta_enable="YES"
+EOM
+}
+]
Index: mail/slimta/files/slimta.in
===================================================================
--- /dev/null
+++ mail/slimta/files/slimta.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: slimta
+# REQUIRE: DAEMON FILESYSTEMS NETWORKING
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable slimta.
+#
+#slimta_enable="YES"
+
+. /etc/rc.subr
+
+name="slimta"
+rcvar="slimta_enable"
+
+load_rc_config $name
+
+: ${slimta_enable:="NO"}
+: ${slimta_conf:="%%PREFIX%%/etc/slimta/slimta.yaml"}
+
+command="%%PREFIX%%/bin/slimta"
+pidfile=/var/run/${name}.pid
+start_cmd="slimta_start"
+
+slimta_start()
+{
+	check_startmsgs && echo "Starting ${name}."
+	/usr/sbin/daemon \
+		-p ${pidfile} \
+		${command} -c ${slimta_conf}
+}
+
+run_rc_command "$1"
Index: mail/slimta/pkg-descr
===================================================================
--- /dev/null
+++ mail/slimta/pkg-descr
@@ -0,0 +1,5 @@
+The slimta project is a traditional application built on top of the
+python-slimta library. It allows a more "out-of-the-box" MTA that offers
+all the useful, built-in features needed for a normal mail system setup.
+
+WWW: https://www.slimta.org/
Index: mail/slimta/pkg-plist
===================================================================
--- /dev/null
+++ mail/slimta/pkg-plist
@@ -0,0 +1 @@
+@dir etc/slimta
Index: net/cloudquery/Makefile
===================================================================
--- net/cloudquery/Makefile
+++ net/cloudquery/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cloudquery
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.7
+DISTVERSION=	0.7.10
 CATEGORIES=	net
 
 MAINTAINER=	nc@FreeBSD.org
@@ -35,12 +35,14 @@
 		denisenkom:go-mssqldb:06a60b6afbbc:denisenkom_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \
 		dimchansky:utfbom:v1.1.0:dimchansky_utfbom/vendor/github.com/dimchansky/utfbom \
 		form3tech-oss:jwt-go:v3.2.2:form3tech_oss_jwt_go/vendor/github.com/form3tech-oss/jwt-go \
+		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-gorm:gorm:v1.20.9:go_gorm_gorm/vendor/gorm.io/gorm \
 		go-gorm:mysql:v1.0.2:go_gorm_mysql/vendor/gorm.io/driver/mysql \
 		go-gorm:postgres:v1.0.2:go_gorm_postgres/vendor/gorm.io/driver/postgres \
 		go-gorm:sqlite:v1.1.3:go_gorm_sqlite/vendor/gorm.io/driver/sqlite \
 		go-gorm:sqlserver:v1.0.4:go_gorm_sqlserver/vendor/gorm.io/driver/sqlserver \
 		go-inf:inf:v0.9.1:go_inf_inf/vendor/gopkg.in/inf.v0 \
+		go-ini:ini:v1.51.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-logr:logr:v0.2.0:go_logr_logr/vendor/github.com/go-logr/logr \
 		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
@@ -66,6 +68,7 @@
 		googleapis:google-api-go-client:v0.35.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:v0.65.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
 		grpc:grpc-go:v1.31.1:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		iancoleman:strcase:v0.1.2:iancoleman_strcase/vendor/github.com/iancoleman/strcase \
 		imdario:mergo:v0.3.5:imdario_mergo/vendor/github.com/imdario/mergo \
 		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
@@ -89,6 +92,7 @@
 		kubernetes:client-go:v0.19.0:kubernetes_client_go/vendor/k8s.io/client-go \
 		kubernetes:klog:v2.2.0:kubernetes_klog/vendor/k8s.io/klog/v2 \
 		kubernetes:utils:d5654de09c73:kubernetes_utils/vendor/k8s.io/utils \
+		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
 		mattn:go-runewidth:v0.0.7:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		mattn:go-sqlite3:v1.14.3:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
@@ -99,12 +103,18 @@
 		okta:okta-sdk-golang:v2.2.1:okta_okta_sdk_golang_v2/vendor/github.com/okta/okta-sdk-golang/v2 \
 		olekukonko:tablewriter:v0.0.4:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
 		patrickmn:go-cache:5633e0862627:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
+		pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
 		shopspring:decimal:v1.2.0:shopspring_decimal/vendor/github.com/shopspring/decimal \
+		spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
+		spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \
 		spf13:cobra:v1.1.1:spf13_cobra/vendor/github.com/spf13/cobra \
+		spf13:jwalterweatherman:v1.0.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
+		spf13:viper:v1.7.0:spf13_viper/vendor/github.com/spf13/viper \
 		square:go-jose:v2.5.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \
+		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
 		uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
 		uber-go:multierr:v1.5.0:uber_go_multierr/vendor/go.uber.org/multierr \
 		uber-go:zap:v1.10.0:uber_go_zap/vendor/go.uber.org/zap
Index: net/cloudquery/distinfo
===================================================================
--- net/cloudquery/distinfo
+++ net/cloudquery/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1610123728
-SHA256 (cloudquery-cloudquery-v0.7.7_GH0.tar.gz) = 6f2ee3ac11413b3a442259541c0dcddd479f57b3fc3532ec974aabae288c07c4
-SIZE (cloudquery-cloudquery-v0.7.7_GH0.tar.gz) = 153849
+TIMESTAMP = 1610383070
+SHA256 (cloudquery-cloudquery-v0.7.10_GH0.tar.gz) = eb4e99f34484cc73c2fc0fb83f85380861b6f6e85380c50c5cb0fc1f2e4c9097
+SIZE (cloudquery-cloudquery-v0.7.10_GH0.tar.gz) = 154562
 SHA256 (Azure-azure-sdk-for-go-v49.0.0_GH0.tar.gz) = 33ef1526e54efe4dd8c2e720a676e5d991bedf5d35b39795e22e4de97fc4ee9c
 SIZE (Azure-azure-sdk-for-go-v49.0.0_GH0.tar.gz) = 31443658
 SHA256 (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 883e2603529a907a3da25d5e2389ab6473a80e6d79daf0d9ffc6385494e0da0a
@@ -35,6 +35,8 @@
 SIZE (dimchansky-utfbom-v1.1.0_GH0.tar.gz) = 8422
 SHA256 (form3tech-oss-jwt-go-v3.2.2_GH0.tar.gz) = 179ca725463e7f13be8591bc285f4048da6887b1056d96848b16e137c995a2e2
 SIZE (form3tech-oss-jwt-go-v3.2.2_GH0.tar.gz) = 38248
+SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
+SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
 SHA256 (go-gorm-gorm-v1.20.9_GH0.tar.gz) = 48db52bbbcb7498ba0c848beb7ad2d0324fd1634157971753d56298213a71e5b
 SIZE (go-gorm-gorm-v1.20.9_GH0.tar.gz) = 126215
 SHA256 (go-gorm-mysql-v1.0.2_GH0.tar.gz) = fc197930c6e566b7f38c52802c7cdda40e1fe339eff0847d3f41f1b93428ea39
@@ -47,6 +49,8 @@
 SIZE (go-gorm-sqlserver-v1.0.4_GH0.tar.gz) = 6665
 SHA256 (go-inf-inf-v0.9.1_GH0.tar.gz) = 756e00e87207cb063d305b6e38bf56dba4d76586fbe40b7d6b657d22516d0f71
 SIZE (go-inf-inf-v0.9.1_GH0.tar.gz) = 13072
+SHA256 (go-ini-ini-v1.51.0_GH0.tar.gz) = 6c98311d375afbe36a246c5d29acb5cb428634a4186e591ce9b7fe2fa4f2a471
+SIZE (go-ini-ini-v1.51.0_GH0.tar.gz) = 43536
 SHA256 (go-logr-logr-v0.2.0_GH0.tar.gz) = df1740fe6ff1b09ac4284a5ed6bb94a5299a94c11908cdbac0c5e9c366e28397
 SIZE (go-logr-logr-v0.2.0_GH0.tar.gz) = 12283
 SHA256 (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
@@ -97,6 +101,8 @@
 SIZE (googleapis-google-cloud-go-v0.65.0_GH0.tar.gz) = 2858914
 SHA256 (grpc-grpc-go-v1.31.1_GH0.tar.gz) = 44a4e63122c1f7cbb5d891d915fd690d3ff5fd92f5fd30032e78492a0270764e
 SIZE (grpc-grpc-go-v1.31.1_GH0.tar.gz) = 969900
+SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
+SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
 SHA256 (iancoleman-strcase-v0.1.2_GH0.tar.gz) = aa3dd69a473e497783f1af98a0f029cd00a9b1b2d28044b6a7bf0108fec36ed2
 SIZE (iancoleman-strcase-v0.1.2_GH0.tar.gz) = 4178
 SHA256 (imdario-mergo-v0.3.5_GH0.tar.gz) = 0e39c5cb0ee73c1f759d9b9260f3c82cc4ca7757c9f07713e9487c4b126da205
@@ -143,6 +149,8 @@
 SIZE (kubernetes-klog-v2.2.0_GH0.tar.gz) = 39963
 SHA256 (kubernetes-utils-d5654de09c73_GH0.tar.gz) = d6827e54235500559b65386fb5dfd1c30f1a0b6e5175fb52e740dc7da97e6c5a
 SIZE (kubernetes-utils-d5654de09c73_GH0.tar.gz) = 92353
+SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd
+SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735
 SHA256 (mattn-go-runewidth-v0.0.7_GH0.tar.gz) = 09270ddb93b2d77d4b3903bbadacbb3a3d4f0cce93c373fb21503840829d8697
 SIZE (mattn-go-runewidth-v0.0.7_GH0.tar.gz) = 16089
 SHA256 (mattn-go-sqlite3-v1.14.3_GH0.tar.gz) = 5987e775ed94c4e50058a41b4e0e96ee33f854cbd9290b3f6eb6ab1be086a1b2
@@ -163,18 +171,30 @@
 SIZE (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = 19252
 SHA256 (patrickmn-go-cache-5633e0862627_GH0.tar.gz) = 35c7d03d62e302f7acbe4f1509267aee328af196786c6055fe59ab8e1c1afb02
 SIZE (patrickmn-go-cache-5633e0862627_GH0.tar.gz) = 13593
+SHA256 (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 1a5a620f680033f17e34148bee8f26d96d8c27ff1d7f56f0fe1c7253595b5244
+SIZE (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 57496
 SHA256 (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = c1c04d6e36c0d0fb6f3374197f9025d7e6df13f38a974098be020617c00fbaf2
 SIZE (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = 1258804
 SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7
 SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297
 SHA256 (shopspring-decimal-v1.2.0_GH0.tar.gz) = 59fa76645f63d7383d3f306fe2f7136d923e2aa514d9a9353938d9654b842f58
 SIZE (shopspring-decimal-v1.2.0_GH0.tar.gz) = 37755
+SHA256 (spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570
+SIZE (spf13-afero-v1.2.2_GH0.tar.gz) = 46157
+SHA256 (spf13-cast-v1.3.0_GH0.tar.gz) = e685282ea33f89e9354d148ad1886f532bcebe86b0b60a167988f7c6d081085f
+SIZE (spf13-cast-v1.3.0_GH0.tar.gz) = 11085
 SHA256 (spf13-cobra-v1.1.1_GH0.tar.gz) = 9bf1769caad54bc5a8bd738ddbcceeb57a19fc3158af30e44b3bbb6b8e63ab6d
 SIZE (spf13-cobra-v1.1.1_GH0.tar.gz) = 143402
+SHA256 (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 2ece12b964e0d230b10851555185d42d3c81b401efda044265ae716eb1d0bc2d
+SIZE (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 6392
 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.0_GH0.tar.gz) = 95ce28f25d50b0a484479d46ec1576e786b92c70efdc2ad58089505c4ee0850d
+SIZE (spf13-viper-v1.7.0_GH0.tar.gz) = 82340
 SHA256 (square-go-jose-v2.5.1_GH0.tar.gz) = 74c65592183c542b254eb2933f7a99ee869abdf9e7ac02aad4d9f0dce980ace8
 SIZE (square-go-jose-v2.5.1_GH0.tar.gz) = 309860
+SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
+SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
 SHA256 (uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
 SIZE (uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
 SHA256 (uber-go-multierr-v1.5.0_GH0.tar.gz) = 15fdd69d5f35e1c5c472d02b58fe3e229795d930398f9017c6c43a108504eaf1