Index: head/sysutils/rsyslog8-devel/Makefile
===================================================================
--- head/sysutils/rsyslog8-devel/Makefile	(revision 371521)
+++ head/sysutils/rsyslog8-devel/Makefile	(revision 371522)
@@ -1,155 +1,153 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.3.2
-PORTREVISION=	4
+PORTVERSION=	8.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Syslogd supporting SQL, TCP, and TLS
 
-BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt \
+		rst2man:${PORTSDIR}/textproc/py-docutils
 
 LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
 		libestr.so:${PORTSDIR}/devel/libestr \
 		libjson-c.so:${PORTSDIR}/devel/json-c \
 		liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 
 PORTSCOUT=	limit:^8\.3
 PKGNAMESUFFIX=	8-devel
 
 OPTIONS_DEFINE=	DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP
 
 DBI_DESC=	LibDBI output module for rsyslog
 GNUTLS_DESC=	GNUTLS module for rsyslog
 GSSAPI_DESC=	GSS API input/output module for rsyslog
 MYSQL_DESC=	MySQL output module for rsyslog
 PGSQL_DESC=	PostgreSQL output module for rsyslog
 RELP_DESC=	RELP input/output module for rsyslog
 RFC3195_DESC=	RFC3195 input support for rsyslog
 SNMP_DESC=	SNMP trap sender for rsyslog
 
 USES=		libtool pkgconfig
-
-BROKEN=		fails to build with new json-c
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBI}
 LIB_DEPENDS+=	libdbi.so:${PORTSDIR}/databases/libdbi
 CONFIGURE_ARGS+=--enable-libdbi
 PLIST_FILES+=	lib/rsyslog/omlibdbi.so
 .else
 CONFIGURE_ARGS+=--disable-libdbi
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.so
 .else
 CONFIGURE_ARGS+=--disable-gnutls
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI}
 CONFIGURE_ARGS+=--enable-gssapi-krb5
 PLIST_FILES+=	lib/rsyslog/imgssapi.so \
 		lib/rsyslog/lmgssutil.so \
 		lib/rsyslog/omgssapi.so
 .else
 CONFIGURE_ARGS+=--disable-gssapi-krb5
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--enable-mysql
 PLIST_FILES+=	lib/rsyslog/ommysql.so
 .else
 CONFIGURE_ARGS+=--disable-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--enable-pgsql
 PLIST_FILES+=	lib/rsyslog/ompgsql.so
 .else
 CONFIGURE_ARGS+=--disable-pgsql
 .endif
 
 .if ${PORT_OPTIONS:MRELP}
 LIB_DEPENDS+=	librelp.so:${PORTSDIR}/devel/librelp
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.so \
 		lib/rsyslog/omrelp.so
 .else
 CONFIGURE_ARGS+=--disable-relp
 .endif
 
 .if ${PORT_OPTIONS:MRFC3195}
 LIB_DEPENDS+=	liblogging.so:${PORTSDIR}/devel/liblogging
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.so
 .else
 CONFIGURE_ARGS+=--disable-rfc3195
 .endif
 
 .if ${PORT_OPTIONS:MSNMP}
 LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=--enable-snmp
 PLIST_FILES+=	lib/rsyslog/omsnmp.so
 .else
 CONFIGURE_ARGS+=--disable-snmp
 .endif
 
 .ifdef WITH_MYSQL_MICROSECONDS
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 .endif
 
 .ifdef WITH_SANE_HOSTNAME
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
 CONFLICTS=	rsyslog6-* rsyslog-[0-9].*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 
 .ifdef WITH_DEBUG
 CONFIGURE_ARGS+=--enable-rtinst --enable-debug
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 CPPFLAGS+=-march=i686
 .endif
 
 CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS+=	--enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
 		${WRKSRC}/tools/syslogd.c
 	@${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\
 		's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|'
 	@${REINPLACE_CMD} -e 's,/lib/rsyslog,${PREFIX}/lib/rsyslog,' ${WRKSRC}/tools/syslogd.c
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
 .for l in lmregexp lmzlibw lmnet lmnetstrms lmstrmsrv lmnsd_ptcp lmcry_gcry lmtcpsrv lmtcpclt mmexternal immark imuxsock imtcp imudp omtesting imklog impstats omstdout imfile imdiag ommail
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/sysutils/rsyslog8-devel/distinfo
===================================================================
--- head/sysutils/rsyslog8-devel/distinfo	(revision 371521)
+++ head/sysutils/rsyslog8-devel/distinfo	(revision 371522)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.3.2.tar.gz) = 544593192651fbf7e758068c94c7e0aad3871970700916231f94efd32fc80139
-SIZE (rsyslog-8.3.2.tar.gz) = 1962748
+SHA256 (rsyslog-8.5.0.tar.gz) = 0d20144be8a5d107a172418b1a39cdd48d7ef921b94e7ea45c58b12bce8caa52
+SIZE (rsyslog-8.5.0.tar.gz) = 1981432