- Update sysutils/rsyslog7-devel to 7.5.3. Supersedes PR: ports/179902

Reviewed by:	bapt@

5 files changed, 8 insertions, 43 deletions

diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile
index 0bdf72eac8d0..a57b661643ea 100644
--- a/sysutils/rsyslog7-devel/Makefile
+++ b/sysutils/rsyslog7-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	7.3.15
+PORTVERSION=	7.5.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -14,16 +14,14 @@ USE_LDCONFIG=	yes
 LIB_DEPENDS=	ee:${PORTSDIR}/devel/libee \
 		estr:${PORTSDIR}/devel/libestr \
 		json.0:${PORTSDIR}/devel/json-c \
-		sysinfo:${PORTSDIR}/devel/libsysinfo \
 		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 
-BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt \
-		rst2man:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt
 
-PORTSCOUT=	limit:^7\.3
+PORTSCOUT=	limit:^7\.5
 PORTDOCS=	*
 PORTEXAMPLES=	*
-LATEST_LINK=	rsyslog-devel
+PKGNAMESUFFIX=	-devel
 
 OPTIONS_DEFINE=	DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP RFC3195 SNMP
 
@@ -141,7 +139,7 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug
 CPPFLAGS+=-march=i686
 .endif
 
-CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm"
+CONFIGURE_ENV+=	LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm"
 CFLAGS+=	${CPPFLAGS}
 
 MAN8=	rsyslogd.8
@@ -150,7 +148,7 @@ MAN5=	rsyslog.conf.5
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message
 
-CONFIGURE_ARGS+=	--enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout
+CONFIGURE_ARGS+=	--enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
diff --git a/sysutils/rsyslog7-devel/distinfo b/sysutils/rsyslog7-devel/distinfo
index 1ed5d2089ec4..a61211507187 100644
--- a/sysutils/rsyslog7-devel/distinfo
+++ b/sysutils/rsyslog7-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rsyslog-7.3.15.tar.gz) = 8468c58ae28b713bfb19073fba7335644ea26e18aebcb5b83af679d3e5702cbd
-SIZE (rsyslog-7.3.15.tar.gz) = 2920543
+SHA256 (rsyslog-7.5.3.tar.gz) = 0d756d0f6ff6fdb8a60075f15a24149446c3d57db746967c054924b1976d6eb1
+SIZE (rsyslog-7.5.3.tar.gz) = 2942277
diff --git a/sysutils/rsyslog7-devel/files/patch-grammar__lexer.l b/sysutils/rsyslog7-devel/files/patch-grammar__lexer.l
deleted file mode 100644
index c9597edcf735..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-grammar__lexer.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- grammar/lexer.l.ori	2012-12-31 21:57:37.000000000 -0700
-+++ grammar/lexer.l	2012-12-31 21:57:51.000000000 -0700
-@@ -88,7 +88,7 @@
- /* somehow, I need these prototype even though the headers are 
-  * included. I guess that's some autotools magic I don't understand...
-  */
--int fileno(FILE *stream);
-+//int fileno(FILE *stream);
- 
- %}
- 
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h b/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h
deleted file mode 100644
index 28432a658e25..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime--cryprov.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- runtime/cryprov.h.ori	2013-05-24 19:47:48.000000000 -0600
-+++ runtime/cryprov.h	2013-05-24 20:20:40.000000000 -0600
-@@ -33,7 +33,7 @@
- 	rsRetVal (*Destruct)(void *ppThis);
- 	rsRetVal (*OnFileOpen)(void *pThis, uchar *fn, void *pFileInstData);
- 	rsRetVal (*Encrypt)(void *pFileInstData, uchar *buf, size_t *lenBuf);
--	rsRetVal (*OnFileClose)(void *pFileInstData, off64_t offsLogfile);
-+	rsRetVal (*OnFileClose)(void *pFileInstData, off_t offsLogfile);
- ENDinterface(cryprov)
- #define cryprovCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */
- #endif /* #ifndef INCLUDED_CRYPROV_H */
diff --git a/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h b/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h
deleted file mode 100644
index f29f6d267eb9..000000000000
--- a/sysutils/rsyslog7-devel/files/patch-runtime--libgcry.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- runtime/libgcry.h.ori	2013-05-24 20:23:45.000000000 -0600
-+++ runtime/libgcry.h	2013-05-24 20:24:03.000000000 -0600
-@@ -49,7 +49,7 @@
- rsRetVal rsgcrySetAlgo(gcryctx ctx, uchar *modename);
- gcryctx gcryCtxNew(void);
- void rsgcryCtxDel(gcryctx ctx);
--int gcryfileDestruct(gcryfile gf, off64_t offsLogfile);
-+int gcryfileDestruct(gcryfile gf, off_t offsLogfile);
- rsRetVal rsgcryInitCrypt(gcryctx ctx, gcryfile *pgf, uchar *fname);
- int rsgcryEncrypt(gcryfile pF, uchar *buf, size_t *len);
-