aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormatthew <matthew@FreeBSD.org>2016-09-22 20:58:06 +0800
committermatthew <matthew@FreeBSD.org>2016-09-22 20:58:06 +0800
commit23af3e3d51ddfaae60a61650632782ec3c1705d1 (patch)
treea4297cd5865ba369fc92adeaa0c192ad639e0031 /sysutils
parent1ca90446396ced4b16aef453e1da9f2990847001 (diff)
downloadfreebsd-ports-gnome-23af3e3d51ddfaae60a61650632782ec3c1705d1.tar.gz
freebsd-ports-gnome-23af3e3d51ddfaae60a61650632782ec3c1705d1.tar.zst
freebsd-ports-gnome-23af3e3d51ddfaae60a61650632782ec3c1705d1.zip
Update to 8.21.0
- Add license - Placate portlint somewhat - Add new GCRYPT option (default on): this is required is the GNUTLS option is enabled - Delete obsolete '--enable-cached-man-pages' from CONFIGURE_ARGS
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/rsyslog8/Makefile30
-rw-r--r--sysutils/rsyslog8/distinfo6
-rw-r--r--sysutils/rsyslog8/pkg-plist2
3 files changed, 23 insertions, 15 deletions
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index e2a065fbe39f..f30279915273 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= rsyslog
-PORTVERSION= 8.19.0
-PORTREVISION= 1
+PORTVERSION= 8.21.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
MAINTAINER= matthew@FreeBSD.org
COMMENT= Syslogd supporting SQL, TCP, and TLS
-BUILD_DEPENDS= libgcrypt-config:security/libgcrypt \
- rst2man:textproc/py-docutils
+LICENSE= GPLv3 LGPL3 APACHE20
+LICENSE_COMB= multi
LIB_DEPENDS= libee.so:devel/libee \
libestr.so:devel/libestr \
@@ -18,14 +17,19 @@ LIB_DEPENDS= libee.so:devel/libee \
liblogging-stdlog.so:devel/liblogging \
libuuid.so:misc/e2fsprogs-libuuid
-USE_LDCONFIG= yes
+BUILD_DEPENDS= rst2man:textproc/py-docutils
PORTSCOUT= limit:^8\.
-OPTIONS_DEFINE= DBI DOCS GNUTLS GSSAPI MYSQL PGSQL RELP SNMP \
- NORMALIZE
+USE_LDCONFIG= yes
+
+OPTIONS_DEFINE= DBI DOCS GCRYPT GNUTLS GSSAPI MYSQL PGSQL RELP \
+ SNMP NORMALIZE
+OPTIONS_DEFAULT=GCRYPT
+OPTIONS_SUB= yes
DBI_DESC= LibDBI output module for rsyslog
+GCRYPT_DESC= Enable support for encrypted logfiles
GNUTLS_DESC= GNUTLS module for rsyslog
GSSAPI_DESC= GSS API input/output module for rsyslog
MYSQL_DESC= MySQL output module for rsyslog
@@ -40,8 +44,13 @@ DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
DBI_CONFIGURE_ENABLE= libdbi
DBI_PLIST_FILES= lib/rsyslog/omlibdbi.so
-GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \
- libgcrypt.so:security/libgcrypt
+GCRYPT_CONFIGURE_ENABLE=libgcrypt
+GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error
+GCRYPT_BUILD_DEPENDS= libgcrypt-config:security/libgcrypt
+
+GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
+GNUTLS_IMPLIES= GCRYPT
GNUTLS_CONFIGURE_ENABLE=gnutls
GNUTLS_PLIST_FILES= lib/rsyslog/lmnsd_gtls.so
@@ -81,7 +90,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mysql-microseconds
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
@@ -104,7 +112,7 @@ CFLAGS+= ${CPPFLAGS}
USE_RC_SUBR= ${PORTNAME}d
SUB_FILES= pkg-message
-CONFIGURE_ARGS+= --enable-cached-man-pages --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench
+CONFIGURE_ARGS+= --enable-imdiag --enable-imfile --enable-impstats --enable-mail --enable-omprog --enable-omstdout --enable-omuxsock --enable-rfc3195 --disable-testbench
post-patch:
@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index b58d205e9fba..74208946d38e 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465480650
-SHA256 (rsyslog-8.19.0.tar.gz) = 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e
-SIZE (rsyslog-8.19.0.tar.gz) = 2279714
+TIMESTAMP = 1474304109
+SHA256 (rsyslog-8.21.0.tar.gz) = bdb1fde87b75107b58d1cd5d00408822fb15b9f3efb8d9dbb93a1dee128339ab
+SIZE (rsyslog-8.21.0.tar.gz) = 2290993
diff --git a/sysutils/rsyslog8/pkg-plist b/sysutils/rsyslog8/pkg-plist
index 75c2d2a40cd0..0f998aa5f46c 100644
--- a/sysutils/rsyslog8/pkg-plist
+++ b/sysutils/rsyslog8/pkg-plist
@@ -7,7 +7,7 @@ lib/rsyslog/impstats.so
lib/rsyslog/imtcp.so
lib/rsyslog/imudp.so
lib/rsyslog/imuxsock.so
-lib/rsyslog/lmcry_gcry.so
+%%GCRYPT%%lib/rsyslog/lmcry_gcry.so
lib/rsyslog/lmnet.so
lib/rsyslog/lmnetstrms.so
lib/rsyslog/lmnsd_ptcp.so