Index: head/sysutils/rsyslog7/distinfo
===================================================================
--- head/sysutils/rsyslog7/distinfo	(revision 369853)
+++ head/sysutils/rsyslog7/distinfo	(revision 369854)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-7.6.6.tar.gz) = c77ae0db6204c5bd670fa96c354ee5fe1c62c876bd84ec06ed429138c78885bb
-SIZE (rsyslog-7.6.6.tar.gz) = 3027663
+SHA256 (rsyslog-7.6.7.tar.gz) = fc29d2d9cbf3396091dd0bab2eb6f847aed4a44ef73138a97ddf9447446125ee
+SIZE (rsyslog-7.6.7.tar.gz) = 3028684
Index: head/sysutils/rsyslog8/Makefile
===================================================================
--- head/sysutils/rsyslog8/Makefile	(revision 369853)
+++ head/sysutils/rsyslog8/Makefile	(revision 369854)
@@ -1,152 +1,153 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.4.1
+PORTVERSION=	8.4.2
 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\.2
 PKGNAMESUFFIX=	8
 
 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
 
 .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 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/distinfo
===================================================================
--- head/sysutils/rsyslog8/distinfo	(revision 369853)
+++ head/sysutils/rsyslog8/distinfo	(revision 369854)
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-8.4.1.tar.gz) = 1c7f3e8ebb7f9865dd4100c4982d50567dded2218177086d1e02d698e352d8ac
-SIZE (rsyslog-8.4.1.tar.gz) = 1938151
+SHA256 (rsyslog-8.4.2.tar.gz) = 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a
+SIZE (rsyslog-8.4.2.tar.gz) = 1938563
Index: head/sysutils/rsyslog8/files/patch-runtime--stream.h
===================================================================
--- head/sysutils/rsyslog8/files/patch-runtime--stream.h	(revision 369853)
+++ head/sysutils/rsyslog8/files/patch-runtime--stream.h	(nonexistent)
@@ -1,10 +0,0 @@
---- runtime/stream.h.ori	2013-05-24 20:21:51.000000000 -0600
-+++ runtime/stream.h	2013-05-24 20:21:11.000000000 -0600
-@@ -207,6 +207,6 @@
- 
- /* prototypes */
- PROTOTYPEObjClassInit(strm);
--rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off64_t offs, off64_t *bytesDel);
-+rsRetVal strmMultiFileSeek(strm_t *pThis, int fileNum, off_t offs, off_t *bytesDel);
- 
- #endif /* #ifndef STREAM_H_INCLUDED */

Property changes on: head/sysutils/rsyslog8/files/patch-runtime--stream.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c	(revision 369853)
+++ head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c	(nonexistent)
@@ -1,11 +0,0 @@
---- runtime/lmcry_gcry.c.ori	2013-05-24 20:25:10.000000000 -0600
-+++ runtime/lmcry_gcry.c	2013-05-24 20:25:25.000000000 -0600
-@@ -216,7 +216,7 @@
- }
- 
- static rsRetVal
--OnFileClose(void *pF, off64_t offsLogfile)
-+OnFileClose(void *pF, off_t offsLogfile)
- {
- 	DEFiRet;
- 	gcryfileDestruct(pF, offsLogfile);

Property changes on: head/sysutils/rsyslog8/files/patch-runtime--lmcry_gcry.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/rsyslog8/files/patch-runtime--queue.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-runtime--queue.c	(revision 369853)
+++ head/sysutils/rsyslog8/files/patch-runtime--queue.c	(nonexistent)
@@ -1,11 +0,0 @@
---- runtime/queue.c.ori	2013-05-24 20:22:54.000000000 -0600
-+++ runtime/queue.c	2013-05-24 20:23:07.000000000 -0600
-@@ -1449,7 +1449,7 @@
- DoDeleteBatchFromQStore(qqueue_t *pThis, int nElem)
- {
- 	int i;
--	off64_t bytesDel;
-+	off_t bytesDel;
- 	DEFiRet;
- 
- 	ISOBJ_TYPE_assert(pThis, qqueue);

Property changes on: head/sysutils/rsyslog8/files/patch-runtime--queue.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/rsyslog8/files/patch-runtime--libgcry.c
===================================================================
--- head/sysutils/rsyslog8/files/patch-runtime--libgcry.c	(revision 369853)
+++ head/sysutils/rsyslog8/files/patch-runtime--libgcry.c	(nonexistent)
@@ -1,20 +0,0 @@
---- runtime/libgcry.c.ori	2013-05-24 20:24:27.000000000 -0600
-+++ runtime/libgcry.c	2013-05-24 20:24:52.000000000 -0600
-@@ -171,7 +171,7 @@
-  * no matter what happens.
-  */
- static void
--eiClose(gcryfile gf, off64_t offsLogfile)
-+eiClose(gcryfile gf, off_t offsLogfile)
- {
- 	char offs[21];
- 	size_t len;
-@@ -213,7 +213,7 @@
- }
- 
- int
--gcryfileDestruct(gcryfile gf, off64_t offsLogfile)
-+gcryfileDestruct(gcryfile gf, off_t offsLogfile)
- {
- 	int r = 0;
- 	if(gf == NULL)

Property changes on: head/sysutils/rsyslog8/files/patch-runtime--libgcry.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/rsyslog8/pkg-plist
===================================================================
--- head/sysutils/rsyslog8/pkg-plist	(revision 369853)
+++ head/sysutils/rsyslog8/pkg-plist	(revision 369854)
@@ -1,24 +1,25 @@
 lib/rsyslog/imdiag.so
 lib/rsyslog/imfile.so
 lib/rsyslog/imklog.so
 lib/rsyslog/immark.so
 lib/rsyslog/impstats.so
 lib/rsyslog/imtcp.so
 lib/rsyslog/imudp.so
 lib/rsyslog/imuxsock.so
 lib/rsyslog/lmcry_gcry.so
 lib/rsyslog/lmnet.so
 lib/rsyslog/lmnetstrms.so
 lib/rsyslog/lmnsd_ptcp.so
 lib/rsyslog/lmregexp.so
 lib/rsyslog/lmstrmsrv.so
 lib/rsyslog/lmtcpclt.so
 lib/rsyslog/lmtcpsrv.so
 lib/rsyslog/lmzlibw.so
+lib/rsyslog/mmexternal.so
 lib/rsyslog/ommail.so
 lib/rsyslog/omstdout.so
 lib/rsyslog/omtesting.so
 man/man5/rsyslog.conf.5.gz
 man/man8/rsyslogd.8.gz
 sbin/rsyslogd
 @dirrmtry lib/rsyslog