Index: head/sysutils/rsyslog8/Makefile
===================================================================
--- head/sysutils/rsyslog8/Makefile
+++ head/sysutils/rsyslog8/Makefile
@@ -27,8 +27,8 @@
 
 CONFLICTS_BUILD=	libinotify-*
 
-OPTIONS_DEFINE=	DBI DOCS ELASTIC GCRYPT GSSAPI JSONPARSE  MYSQL PGSQL \
-		RELP SNMP NORMALIZE
+OPTIONS_DEFINE=	DBI DOCS ELASTIC GCRYPT GSSAPI HTTP JSONPARSE KAFKA \
+		MYSQL NORMALIZE PGSQL RABBITMQ RELP SNMP
 OPTIONS_RADIO=	SSLLIB
 OPTIONS_RADIO_SSLLIB=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=GCRYPT
@@ -62,29 +62,48 @@
 			lib/rsyslog/lmgssutil.so \
 			lib/rsyslog/omgssapi.so
 
+HTTP_DESC=		HTTP output module for rsyslog
+HTTP_CONFIGURE_ENABLE=	omhttp
+HTTP_PLIST_FILES=	lib/rsyslog/omhttp.so
+
 JSONPARSE_DESC=		JSONPARSE module for rsyslog
 JSONPARSE_CONFIGURE_ENABLE=	mmjsonparse
 JSONPARSE_PLIST_FILES=	lib/rsyslog/mmjsonparse.so
 
+KAFKA_DESC=		Kafka input/output module for rsyslog
+KAFKA_LIB_DEPENDS=	librdkafka.so:net/librdkafka
+KAFKA_CONFIGURE_ENABLE=	 imkafka omkafka
+KAFKA_PLIST_FILES=	lib/rsyslog/imkafka.so \
+			lib/rsyslog/omkafka.so
+
 MYSQL_DESC=		MySQL output module for rsyslog
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_PLIST_FILES=	lib/rsyslog/ommysql.so
 MYSQL_PORTDOCS=		plugins/ommysql/createDB.sql
 
+NORMALIZE_DESC=		Message normalization module for rsyslog
+NORMALIZE_LIB_DEPENDS=	liblognorm.so:devel/liblognorm
+NORMALIZE_CONFIGURE_ENABLE=	mmnormalize
+NORMALIZE_PLIST_FILES=	lib/rsyslog/mmnormalize.so
+
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ENABLE=	openssl
 OPENSSL_CONFIGURE_ENV=	OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 			OPENSSL_CFLAGS="-I ${OPENSSLINC}"
 OPENSSL_PLIST_FILES=	lib/rsyslog/lmnsd_ossl.so
 
-
 PGSQL_DESC=		PostgreSQL output module for rsyslog
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	pgsql
 PGSQL_PLIST_FILES=	lib/rsyslog/ompgsql.so
 PGSQL_PORTDOCS=		plugins/ompgsql/createDB.sql
 
+RABBITMQ_DESC=		RabbitMQ output module for rsyslog
+RABBITMQ_LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c
+RABBITMQ_CONFIGURE_ENABLE=	omrabbitmq
+RABBITMQ_PLIST_FILES=	lib/rsyslog/omrabbitmq.so
+
 RELP_DESC=		RELP input/output module for rsyslog
 RELP_LIB_DEPENDS=	librelp.so:devel/librelp
 RELP_CONFIGURE_ENABLE=	relp
@@ -96,11 +115,6 @@
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_PLIST_FILES=	lib/rsyslog/omsnmp.so
 
-NORMALIZE_DESC=		Message normalization module for rsyslog
-NORMALIZE_LIB_DEPENDS=	liblognorm.so:devel/liblognorm
-NORMALIZE_CONFIGURE_ENABLE=	mmnormalize
-NORMALIZE_PLIST_FILES=	lib/rsyslog/mmnormalize.so
-
 .ifdef WITH_MYSQL_MICROSECONDS
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 .endif
@@ -131,7 +145,9 @@
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS+=	--enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench
+CONFIGURE_ARGS+=	--enable-imdiag --enable-imfile --enable-impstats \
+			--enable-mail --enable-omprog --enable-omstdout \
+			--enable-omuxsock --enable-rfc3195 --disable-testbench
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200061
 CONFIGURE_ARGS+=	--enable-imuxsock-rfc5424