27 files changed, 0 insertions, 830 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 5e3f90ef0b4d..8179590cc115 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -802,9 +802,7 @@
     SUBDIR += rsyncmanager
     SUBDIR += rsyncrypto
     SUBDIR += rsyslog7
-    SUBDIR += rsyslog7-devel
     SUBDIR += rsyslog8
-    SUBDIR += rsyslog8-devel
     SUBDIR += rtty
     SUBDIR += ruby-quota
     SUBDIR += rubygem-SyslogLogger
diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile
deleted file mode 100644
index 52d343acb272..000000000000
--- a/sysutils/rsyslog7-devel/Makefile
+++ /dev/null
@@ -1,161 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rsyslog
-PORTVERSION=	7.5.8
-PORTREVISION=	5
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
-
-MAINTAINER=	brd@FreeBSD.org
-COMMENT=	Syslogd supporting SQL, TCP, and TLS
-
-DEPRECATED=	EoL, use sysutils/rsyslog8
-EXPIRATION_DATE=	2015-02-13
-
-BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt
-
-LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
-		libestr.so:${PORTSDIR}/devel/libestr \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf
-
-PORTSCOUT=	limit:^7\.5
-PORTDOCS=	*
-PORTEXAMPLES=	*
-PKGNAMESUFFIX=	7-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=		alias 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}
-USES+=		pgsql
-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:
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/
-	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR}
-.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 omruleset
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/rsyslog/${l}.so
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/rsyslog7-devel/distinfo b/sysutils/rsyslog7-devel/distinfo
deleted file mode 100644
index d2b48fdf11aa..000000000000
--- a/sysutils/rsyslog7-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rsyslog-7.5.8.tar.gz) = 38a8b5be53feaae9225e46f2c93d7cc87954ead58ac9526ffc63de71f3d4a542
-SIZE (rsyslog-7.5.8.tar.gz) = 2595061
diff --git a/sysutils/rsyslog7-devel/files/extra-patch-mysql-microseconds b/sysutils/rsyslog7-devel/files/extra-patch-mysql-microseconds
deleted file mode 100644
index ec248b064741..000000000000
--- a/sysutils/rsyslog7-devel/files/extra-patch-mysql-microseconds
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./runtime/datetime.c.orig	2010-05-04 18:57:25.588028725 -0400
-+++ ./runtime/datetime.c	2010-05-04 18:59:12.390680038 -0400
-@@ -644,18 +644,30 @@
- 	pBuf[1] = (ts->year / 100) % 10 + '0';
- 	pBuf[2] = (ts->year / 10) % 10 + '0';
- 	pBuf[3] = ts->year % 10 + '0';
--	pBuf[4] = (ts->month / 10) % 10 + '0';
--	pBuf[5] = ts->month % 10 + '0';
--	pBuf[6] = (ts->day / 10) % 10 + '0';
--	pBuf[7] = ts->day % 10 + '0';
--	pBuf[8] = (ts->hour / 10) % 10 + '0';
--	pBuf[9] = ts->hour % 10 + '0';
--	pBuf[10] = (ts->minute / 10) % 10 + '0';
--	pBuf[11] = ts->minute % 10 + '0';
--	pBuf[12] = (ts->second / 10) % 10 + '0';
--	pBuf[13] = ts->second % 10 + '0';
--	pBuf[14] = '\0';
--	return 15;
-+    pBuf[4] = '-';
-+    pBuf[5] = (ts->month / 10) % 10 + '0';
-+    pBuf[6] = ts->month % 10 + '0';
-+    pBuf[7] = '-';
-+    pBuf[8] = (ts->day / 10) % 10 + '0';
-+    pBuf[9] = ts->day % 10 + '0';
-+    pBuf[10] = ' ';
-+    pBuf[11] = (ts->hour / 10) % 10 + '0';
-+    pBuf[12] = ts->hour % 10 + '0';
-+    pBuf[13] = ':';
-+    pBuf[14] = (ts->minute / 10) % 10 + '0';
-+    pBuf[15] = ts->minute % 10 + '0';
-+    pBuf[16] = ':';
-+    pBuf[17] = (ts->second / 10) % 10 + '0';
-+    pBuf[18] = ts->second % 10 + '0';
-+    pBuf[19] = '.';
-+    pBuf[20] = (ts->secfrac / 100000) % 10 + '0';
-+    pBuf[21] = (ts->secfrac / 10000) % 10 + '0';
-+    pBuf[22] = (ts->secfrac / 1000) % 10 + '0';
-+    pBuf[23] = (ts->secfrac / 100) % 10 + '0';
-+    pBuf[24] = (ts->secfrac / 10) % 10 + '0';
-+    pBuf[25] = ts->secfrac % 10 + '0';
-+    pBuf[26] = '\0';
-+	return 26;
- 
- }
- 
---- ./runtime/msg.c.orig	2010-05-04 19:00:20.241528788 -0400
-+++ ./runtime/msg.c	2010-05-04 19:00:06.136349680 -0400
-@@ -1293,7 +1293,7 @@
- 	case tplFmtMySQLDate:
- 		MsgLock(pM);
- 		if(pM->pszTIMESTAMP_MySQL == NULL) {
--			if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) {
-+			if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) {
- 				MsgUnlock(pM);
- 				return "";
- 			}
diff --git a/sysutils/rsyslog7-devel/files/extra-patch-sane-hostname b/sysutils/rsyslog7-devel/files/extra-patch-sane-hostname
deleted file mode 100644
index bc7251475d81..000000000000
--- a/sysutils/rsyslog7-devel/files/extra-patch-sane-hostname
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./tools/syslogd.c.orig	2010-05-04 19:02:05.548362478 -0400
-+++ ./tools/syslogd.c	2010-05-04 19:02:27.452450741 -0400
-@@ -2611,37 +2611,6 @@
- 	net.getLocalHostname(&LocalFQDNName);
- 	CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName));
- 	glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */
--	if((p = (uchar*)strchr((char*)LocalHostName, '.'))) {
--		*p++ = '\0';
--		LocalDomain = p;
--	} else {
--		LocalDomain = (uchar*)"";
--
--		/* It's not clearly defined whether gethostname()
--		 * should return the simple hostname or the fqdn. A
--		 * good piece of software should be aware of both and
--		 * we want to distribute good software.  Joey
--		 *
--		 * Good software also always checks its return values...
--		 * If syslogd starts up before DNS is up & /etc/hosts
--		 * doesn't have LocalHostName listed, gethostbyname will
--		 * return NULL. 
--		 */
--		/* TODO: gethostbyname() is not thread-safe, but replacing it is
--		 * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25
--		 */
--		hent = gethostbyname((char*)LocalHostName);
--		if(hent) {
--			free(LocalHostName);
--			CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name));
--				
--			if((p = (uchar*)strchr((char*)LocalHostName, '.')))
--			{
--				*p++ = '\0';
--				LocalDomain = p;
--			}
--		}
--	}
- 
- 	/* Convert to lower case to recognize the correct domain laterly */
- 	for(p = LocalDomain ; *p ; p++)
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c b/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c
deleted file mode 100644
index f9aaece39e33..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.c
+++ /dev/null
@@ -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)
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c b/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c
deleted file mode 100644
index 48986ab690a3..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime--lmcry_gcry.c
+++ /dev/null
@@ -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);
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--queue.c b/sysutils/rsyslog7-devel/files/patch-runtime--queue.c
deleted file mode 100644
index 698020bfff9a..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime--queue.c
+++ /dev/null
@@ -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);
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--stream.h b/sysutils/rsyslog7-devel/files/patch-runtime--stream.h
deleted file mode 100644
index 4427e6a1d705..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime--stream.h
+++ /dev/null
@@ -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 */
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c b/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c
deleted file mode 100644
index 530996d60b0a..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime__lookup.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./runtime/lookup.c.orig	2014-08-20 11:50:14.000000000 -0400
-+++ ./runtime/lookup.c	2014-08-20 11:52:52.000000000 -0400
-@@ -26,8 +26,8 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <json/json.h>
--#include <json/json.h>
-+#include <json-c/json.h>
-+#include <json-c/json.h>
- #include <assert.h>
- 
- #include "rsyslog.h"
diff --git a/sysutils/rsyslog7-devel/files/pkg-message.in b/sysutils/rsyslog7-devel/files/pkg-message.in
deleted file mode 100644
index abb08006e491..000000000000
--- a/sysutils/rsyslog7-devel/files/pkg-message.in
+++ /dev/null
@@ -1,25 +0,0 @@
-===================================================================
-To start using rsyslogd(8), stop syslogd(8) if it's running and
-add the following lines to rc.conf(5):
-
-  syslogd_enable="NO"
-  rsyslogd_enable="YES"
-
-It's recommended to copy syslog.conf(5) to
-%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
-this:
-
-  rsyslogd_config="/etc/syslog.conf"
-
-Add the following (3) lines to the beginning of the config file, for
-basic functionality:
-
-  $ModLoad immark.so   # provides --MARK-- message capability
-  $ModLoad imuxsock.so # provides support for local system logging
-  $ModLoad imklog.so   # kernel logging
-
-newsyslog(8) has the path of syslogd's pid file hardcoded. To
-make it work seamlessly with rsyslog, add this:
-
-  rsyslogd_pidfile="/var/run/syslog.pid"
-===================================================================
diff --git a/sysutils/rsyslog7-devel/files/rsyslogd.in b/sysutils/rsyslog7-devel/files/rsyslogd.in
deleted file mode 100644
index 8730470c65fc..000000000000
--- a/sysutils/rsyslog7-devel/files/rsyslogd.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-
-# PROVIDE: rsyslogd
-# REQUIRE: mountcritremote cleanvar newsyslog ldconfig
-# BEFORE:  SERVERS
-
-. /etc/rc.subr
-
-name=rsyslogd
-rcvar=rsyslogd_enable
-command="%%PREFIX%%/sbin/${name}"
-load_rc_config $name
-: ${rsyslogd_enable:="NO"}
-: ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"}
-: ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"}
-pidfile="${rsyslogd_pidfile}"
-command_args="-i ${pidfile} -f ${rsyslogd_config}"
-required_files="${rsyslogd_config}"
-extra_commands="reload"
-
-run_rc_command "$1"
diff --git a/sysutils/rsyslog7-devel/pkg-descr b/sysutils/rsyslog7-devel/pkg-descr
deleted file mode 100644
index 38ffe7aaa43d..000000000000
--- a/sysutils/rsyslog7-devel/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Rsyslog is an enhanced multi-threaded syslogd with a focus on
-security and reliability.
-
-Among others, it offers support for on-demand disk buffering,
-reliable syslog over TCP, SSL, TLS and RELP, writing to databases
-(MySQL, PostgreSQL, Oracle, and many more), email alerting, fully
-configurable output formats (including high-precision timestamps),
-the ability to filter on any part of the syslog message, on-the-wire
-message compression, and the ability to convert text files to syslog.
-
-It is a drop-in replacement for stock syslogd and able to work with
-the same configuration file syntax. Its advanced features make it
-suitable for enterprise-class, encryption protected syslog relay
-chains while at the same time being very easy to setup for the
-novice user.
-
-Tracking v7-devel
-
-WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog7-devel/pkg-plist b/sysutils/rsyslog7-devel/pkg-plist
deleted file mode 100644
index ce354be1972c..000000000000
--- a/sysutils/rsyslog7-devel/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-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/ommail.so
-lib/rsyslog/omruleset.so
-lib/rsyslog/omstdout.so
-lib/rsyslog/omtesting.so
-man/man5/rsyslog.conf.5.gz
-man/man8/rsyslogd.8.gz
-sbin/rsyslogd
diff --git a/sysutils/rsyslog8-devel/Makefile b/sysutils/rsyslog8-devel/Makefile
deleted file mode 100644
index 05055ebdb5b7..000000000000
--- a/sysutils/rsyslog8-devel/Makefile
+++ /dev/null
@@ -1,157 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	rsyslog
-PORTVERSION=	8.5.0
-PORTREVISION=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
-
-MAINTAINER=	brd@FreeBSD.org
-COMMENT=	Syslogd supporting SQL, TCP, and TLS
-
-DEPRECATED=	EoL, use sysutils/rsyslog8
-EXPIRATION_DATE=	2015-02-13
-
-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
-
-.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}
-USES+=		pgsql
-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>
diff --git a/sysutils/rsyslog8-devel/distinfo b/sysutils/rsyslog8-devel/distinfo
deleted file mode 100644
index d02cc5cfaa67..000000000000
--- a/sysutils/rsyslog8-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rsyslog-8.5.0.tar.gz) = 0d20144be8a5d107a172418b1a39cdd48d7ef921b94e7ea45c58b12bce8caa52
-SIZE (rsyslog-8.5.0.tar.gz) = 1981432
diff --git a/sysutils/rsyslog8-devel/files/extra-patch-mysql-microseconds b/sysutils/rsyslog8-devel/files/extra-patch-mysql-microseconds
deleted file mode 100644
index ec248b064741..000000000000
--- a/sysutils/rsyslog8-devel/files/extra-patch-mysql-microseconds
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./runtime/datetime.c.orig	2010-05-04 18:57:25.588028725 -0400
-+++ ./runtime/datetime.c	2010-05-04 18:59:12.390680038 -0400
-@@ -644,18 +644,30 @@
- 	pBuf[1] = (ts->year / 100) % 10 + '0';
- 	pBuf[2] = (ts->year / 10) % 10 + '0';
- 	pBuf[3] = ts->year % 10 + '0';
--	pBuf[4] = (ts->month / 10) % 10 + '0';
--	pBuf[5] = ts->month % 10 + '0';
--	pBuf[6] = (ts->day / 10) % 10 + '0';
--	pBuf[7] = ts->day % 10 + '0';
--	pBuf[8] = (ts->hour / 10) % 10 + '0';
--	pBuf[9] = ts->hour % 10 + '0';
--	pBuf[10] = (ts->minute / 10) % 10 + '0';
--	pBuf[11] = ts->minute % 10 + '0';
--	pBuf[12] = (ts->second / 10) % 10 + '0';
--	pBuf[13] = ts->second % 10 + '0';
--	pBuf[14] = '\0';
--	return 15;
-+    pBuf[4] = '-';
-+    pBuf[5] = (ts->month / 10) % 10 + '0';
-+    pBuf[6] = ts->month % 10 + '0';
-+    pBuf[7] = '-';
-+    pBuf[8] = (ts->day / 10) % 10 + '0';
-+    pBuf[9] = ts->day % 10 + '0';
-+    pBuf[10] = ' ';
-+    pBuf[11] = (ts->hour / 10) % 10 + '0';
-+    pBuf[12] = ts->hour % 10 + '0';
-+    pBuf[13] = ':';
-+    pBuf[14] = (ts->minute / 10) % 10 + '0';
-+    pBuf[15] = ts->minute % 10 + '0';
-+    pBuf[16] = ':';
-+    pBuf[17] = (ts->second / 10) % 10 + '0';
-+    pBuf[18] = ts->second % 10 + '0';
-+    pBuf[19] = '.';
-+    pBuf[20] = (ts->secfrac / 100000) % 10 + '0';
-+    pBuf[21] = (ts->secfrac / 10000) % 10 + '0';
-+    pBuf[22] = (ts->secfrac / 1000) % 10 + '0';
-+    pBuf[23] = (ts->secfrac / 100) % 10 + '0';
-+    pBuf[24] = (ts->secfrac / 10) % 10 + '0';
-+    pBuf[25] = ts->secfrac % 10 + '0';
-+    pBuf[26] = '\0';
-+	return 26;
- 
- }
- 
---- ./runtime/msg.c.orig	2010-05-04 19:00:20.241528788 -0400
-+++ ./runtime/msg.c	2010-05-04 19:00:06.136349680 -0400
-@@ -1293,7 +1293,7 @@
- 	case tplFmtMySQLDate:
- 		MsgLock(pM);
- 		if(pM->pszTIMESTAMP_MySQL == NULL) {
--			if((pM->pszTIMESTAMP_MySQL = MALLOC(15)) == NULL) {
-+			if((pM->pszTIMESTAMP_MySQL = MALLOC(26)) == NULL) {
- 				MsgUnlock(pM);
- 				return "";
- 			}
diff --git a/sysutils/rsyslog8-devel/files/extra-patch-sane-hostname b/sysutils/rsyslog8-devel/files/extra-patch-sane-hostname
deleted file mode 100644
index bc7251475d81..000000000000
--- a/sysutils/rsyslog8-devel/files/extra-patch-sane-hostname
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./tools/syslogd.c.orig	2010-05-04 19:02:05.548362478 -0400
-+++ ./tools/syslogd.c	2010-05-04 19:02:27.452450741 -0400
-@@ -2611,37 +2611,6 @@
- 	net.getLocalHostname(&LocalFQDNName);
- 	CHKmalloc(LocalHostName = (uchar*) strdup((char*)LocalFQDNName));
- 	glbl.SetLocalFQDNName(LocalFQDNName); /* set the FQDN before we modify it */
--	if((p = (uchar*)strchr((char*)LocalHostName, '.'))) {
--		*p++ = '\0';
--		LocalDomain = p;
--	} else {
--		LocalDomain = (uchar*)"";
--
--		/* It's not clearly defined whether gethostname()
--		 * should return the simple hostname or the fqdn. A
--		 * good piece of software should be aware of both and
--		 * we want to distribute good software.  Joey
--		 *
--		 * Good software also always checks its return values...
--		 * If syslogd starts up before DNS is up & /etc/hosts
--		 * doesn't have LocalHostName listed, gethostbyname will
--		 * return NULL. 
--		 */
--		/* TODO: gethostbyname() is not thread-safe, but replacing it is
--		 * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25
--		 */
--		hent = gethostbyname((char*)LocalHostName);
--		if(hent) {
--			free(LocalHostName);
--			CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name));
--				
--			if((p = (uchar*)strchr((char*)LocalHostName, '.')))
--			{
--				*p++ = '\0';
--				LocalDomain = p;
--			}
--		}
--	}
- 
- 	/* Convert to lower case to recognize the correct domain laterly */
- 	for(p = LocalDomain ; *p ; p++)
diff --git a/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c b/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c
deleted file mode 100644
index 9b4a736a7936..000000000000
--- a/sysutils/rsyslog8-devel/files/patch-plugins__mmexternal__mmexternal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./plugins/mmexternal/mmexternal.c.orig	2014-05-15 11:34:32.462046745 -0600
-+++ ./plugins/mmexternal/mmexternal.c	2014-05-15 11:34:44.101043805 -0600
-@@ -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-devel/files/patch-runtime--libgcry.c b/sysutils/rsyslog8-devel/files/patch-runtime--libgcry.c
deleted file mode 100644
index f9aaece39e33..000000000000
--- a/sysutils/rsyslog8-devel/files/patch-runtime--libgcry.c
+++ /dev/null
@@ -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)
diff --git a/sysutils/rsyslog8-devel/files/patch-runtime--lmcry_gcry.c b/sysutils/rsyslog8-devel/files/patch-runtime--lmcry_gcry.c
deleted file mode 100644
index 48986ab690a3..000000000000
--- a/sysutils/rsyslog8-devel/files/patch-runtime--lmcry_gcry.c
+++ /dev/null
@@ -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);
diff --git a/sysutils/rsyslog8-devel/files/patch-runtime--queue.c b/sysutils/rsyslog8-devel/files/patch-runtime--queue.c
deleted file mode 100644
index 698020bfff9a..000000000000
--- a/sysutils/rsyslog8-devel/files/patch-runtime--queue.c
+++ /dev/null
@@ -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);
diff --git a/sysutils/rsyslog8-devel/files/patch-runtime--stream.h b/sysutils/rsyslog8-devel/files/patch-runtime--stream.h
deleted file mode 100644
index 4427e6a1d705..000000000000
--- a/sysutils/rsyslog8-devel/files/patch-runtime--stream.h
+++ /dev/null
@@ -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 */
diff --git a/sysutils/rsyslog8-devel/files/pkg-message.in b/sysutils/rsyslog8-devel/files/pkg-message.in
deleted file mode 100644
index abb08006e491..000000000000
--- a/sysutils/rsyslog8-devel/files/pkg-message.in
+++ /dev/null
@@ -1,25 +0,0 @@
-===================================================================
-To start using rsyslogd(8), stop syslogd(8) if it's running and
-add the following lines to rc.conf(5):
-
-  syslogd_enable="NO"
-  rsyslogd_enable="YES"
-
-It's recommended to copy syslog.conf(5) to
-%%PREFIX%%/etc/rsyslog.conf and edit it there. Otherwise add
-this:
-
-  rsyslogd_config="/etc/syslog.conf"
-
-Add the following (3) lines to the beginning of the config file, for
-basic functionality:
-
-  $ModLoad immark.so   # provides --MARK-- message capability
-  $ModLoad imuxsock.so # provides support for local system logging
-  $ModLoad imklog.so   # kernel logging
-
-newsyslog(8) has the path of syslogd's pid file hardcoded. To
-make it work seamlessly with rsyslog, add this:
-
-  rsyslogd_pidfile="/var/run/syslog.pid"
-===================================================================
diff --git a/sysutils/rsyslog8-devel/files/rsyslogd.in b/sysutils/rsyslog8-devel/files/rsyslogd.in
deleted file mode 100644
index 8730470c65fc..000000000000
--- a/sysutils/rsyslog8-devel/files/rsyslogd.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-
-# PROVIDE: rsyslogd
-# REQUIRE: mountcritremote cleanvar newsyslog ldconfig
-# BEFORE:  SERVERS
-
-. /etc/rc.subr
-
-name=rsyslogd
-rcvar=rsyslogd_enable
-command="%%PREFIX%%/sbin/${name}"
-load_rc_config $name
-: ${rsyslogd_enable:="NO"}
-: ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"}
-: ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"}
-pidfile="${rsyslogd_pidfile}"
-command_args="-i ${pidfile} -f ${rsyslogd_config}"
-required_files="${rsyslogd_config}"
-extra_commands="reload"
-
-run_rc_command "$1"
diff --git a/sysutils/rsyslog8-devel/pkg-descr b/sysutils/rsyslog8-devel/pkg-descr
deleted file mode 100644
index 38ffe7aaa43d..000000000000
--- a/sysutils/rsyslog8-devel/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Rsyslog is an enhanced multi-threaded syslogd with a focus on
-security and reliability.
-
-Among others, it offers support for on-demand disk buffering,
-reliable syslog over TCP, SSL, TLS and RELP, writing to databases
-(MySQL, PostgreSQL, Oracle, and many more), email alerting, fully
-configurable output formats (including high-precision timestamps),
-the ability to filter on any part of the syslog message, on-the-wire
-message compression, and the ability to convert text files to syslog.
-
-It is a drop-in replacement for stock syslogd and able to work with
-the same configuration file syntax. Its advanced features make it
-suitable for enterprise-class, encryption protected syslog relay
-chains while at the same time being very easy to setup for the
-novice user.
-
-Tracking v7-devel
-
-WWW: http://www.rsyslog.com/
diff --git a/sysutils/rsyslog8-devel/pkg-plist b/sysutils/rsyslog8-devel/pkg-plist
deleted file mode 100644
index 1d25ca31f6ce..000000000000
--- a/sysutils/rsyslog8-devel/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-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