8 files changed, 15 insertions, 77 deletions
diff --git a/UPDATING b/UPDATING
index a21d2923ee15..0c4aa722dc3f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,13 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160627:
+  AFFECTS: users of sysutils/rsyslog7
+  AUTHOR: brd@FreeBSD.org
+
+  Rsyslog 7.x has reached end of life status and is being marked as
+  depreciated.  Rsyslog 8 has been made the default.
+
 20160626
   AFFECTS: users of www/calendarserver
   AUTHOR: pi@FreeBSD.org
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index 8cdd1f6c5706..cec86ba3093b 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -5,6 +5,7 @@ PORTVERSION=	7.6.7
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
+PKGNAMESUFFIX=	7
 
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Syslogd supporting SQL, TCP, and TLS
@@ -20,6 +21,9 @@ LIB_DEPENDS=	libee.so:devel/libee \
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 
+DEPRECATED=	Upgrade to rsyslog 8
+EXPIRATION_DATE=2016-08-23
+
 PORTSCOUT=	limit:^7\.4
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index 95dd8dee8518..61f72d75214f 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.11.0
-PORTREVISION=	1
+PORTVERSION=	8.19.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -21,7 +20,6 @@ LIB_DEPENDS=	libee.so:devel/libee \
 USE_LDCONFIG=	yes
 
 PORTSCOUT=	limit:^8\.
-PKGNAMESUFFIX=	8
 
 OPTIONS_DEFINE=	DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP \
 		NORMALIZE
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index ffd19053bab0..b58d205e9fba 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rsyslog-8.11.0.tar.gz) = bc64d8ba1e3fb8cfe21eadd5fb0938381bb37ed72cef9d6f14d376d2bac9bf78
-SIZE (rsyslog-8.11.0.tar.gz) = 2060890
+TIMESTAMP = 1465480650
+SHA256 (rsyslog-8.19.0.tar.gz) = 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e
+SIZE (rsyslog-8.19.0.tar.gz) = 2279714
diff --git a/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c b/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c
deleted file mode 100644
index c9c92cfcebe6..000000000000
--- a/sysutils/rsyslog8/files/patch-plugins__mmexternal__mmexternal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/mmexternal/mmexternal.c.orig	2015-04-30 08:50:16 UTC
-+++ plugins/mmexternal/mmexternal.c
-@@ -31,7 +31,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <wait.h>
-+#include <sys/wait.h>
- #include <sys/uio.h>
- #include "conf.h"
- #include "syslogd-types.h"
diff --git a/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c b/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c
deleted file mode 100644
index 04df04f65898..000000000000
--- a/sysutils/rsyslog8/files/patch-plugins__omprog__omprog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/omprog/omprog.c.orig	2015-04-30 08:50:16 UTC
-+++ plugins/omprog/omprog.c
-@@ -36,7 +36,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <wait.h>
-+#include <sys/wait.h>
- #include <pthread.h>
- #include "conf.h"
- #include "syslogd-types.h"
diff --git a/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c b/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c
deleted file mode 100644
index 41a27788d595..000000000000
--- a/sysutils/rsyslog8/files/patch-plugins_imfile_imfile.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- plugins/imfile/imfile.c.orig	2015-06-30 12:26:24 UTC
-+++ plugins/imfile/imfile.c
-@@ -1869,12 +1869,14 @@ CODESTARTmodExit
- 	objRelease(errmsg, CORE_COMPONENT);
- 	objRelease(prop, CORE_COMPONENT);
- 	objRelease(ruleset, CORE_COMPONENT);
-+#ifdef HAVE_SYS_INOTIFY_H
- 	if(dirs != NULL) {
- 		free(dirs->active.listeners);
- 		free(dirs->configured.listeners);
- 		free(dirs);
- 	}
- 	free(wdmap);
-+#endif
- ENDmodExit
- 
- 
diff --git a/sysutils/rsyslog8/files/patch-runtime_stream.c b/sysutils/rsyslog8/files/patch-runtime_stream.c
deleted file mode 100644
index dfd7f1ccd59d..000000000000
--- a/sysutils/rsyslog8/files/patch-runtime_stream.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- runtime/stream.c.orig	2015-06-30 12:26:24 UTC
-+++ runtime/stream.c
-@@ -1097,12 +1097,30 @@ doWriteCall(strm_t *pThis, uchar *pBuf, 
- 	char *pWriteBuf;
- 	DEFiRet;
- 	ISOBJ_TYPE_assert(pThis, strm);
-+#ifdef __FreeBSD__
-+	sbool crnlNow = 0;
-+#endif /* __FreeBSD__ */
- 
- 	lenBuf = *pLenBuf;
- 	pWriteBuf = (char*) pBuf;
- 	iTotalWritten = 0;
- 	do {
-+#ifdef __FreeBSD__
-+		if (pThis->bIsTTY && !pThis->iZipLevel && !pThis->cryprov) {
-+			char *pNl = NULL;
-+			if (crnlNow == 0) pNl = strchr(pWriteBuf, '\n');
-+			else crnlNow = 0;
-+			if (pNl == pWriteBuf) {
-+		  		iWritten = write(pThis->fd, "\r", 1);
-+		  		if (iWritten > 0) {
-+		      			crnlNow = 1;
-+		      			iWritten = 0;
-+		    		}
-+		  	} else iWritten = write(pThis->fd, pWriteBuf, pNl ? pNl - pWriteBuf : lenBuf);
-+		} else
-+#endif /* __FreeBSD__ */
- 		iWritten = write(pThis->fd, pWriteBuf, lenBuf);
-+	
- 		if(iWritten < 0) {
- 			char errStr[1024];
- 			int err = errno;