diff options
| -rw-r--r-- | sysutils/rsyslog6-devel-gnutls/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/rsyslog6-devel/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/rsyslog6-devel/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c | 13 | ||||
| -rw-r--r-- | sysutils/rsyslog6-devel/pkg-plist | 3 |
5 files changed, 9 insertions, 24 deletions
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile index 2a6a3f495ff5..e852132c6b19 100644 --- a/sysutils/rsyslog6-devel-gnutls/Makefile +++ b/sysutils/rsyslog6-devel-gnutls/Makefile @@ -5,8 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 2 - COMMENT= GNUTLS module for rsyslog MASTERDIR= ${.CURDIR}/../rsyslog6-devel @@ -14,6 +12,8 @@ MNAME= gnutls LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls \ gcrypt.18:${PORTSDIR}/security/libgcrypt +USE_PKGCONFIG= yes + CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index 83f76d039e68..3d1c51361d6a 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsyslog -PORTVERSION= 6.3.6 +PORTVERSION= 6.3.12 PORTREVISION?= 0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -14,13 +14,14 @@ MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ PKGNAMESUFFIX?= -${MNAME} .endif -MAINTAINER= pgollucci@FreeBSD.org +MAINTAINER= brd@FreeBSD.org COMMENT?= Syslogd supporting SQL, TCP, and TLS USE_LDCONFIG= yes LIB_DEPENDS+= ee:${PORTSDIR}/devel/libee \ - estr:${PORTSDIR}/devel/libestr + estr:${PORTSDIR}/devel/libestr \ + sysinfo:${PORTSDIR}/devel/libsysinfo .ifdef MNAME RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6-devel @@ -56,7 +57,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" +CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lsysinfo -lkvm" CFLAGS+= ${CPPFLAGS} .ifndef MNAME diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo index 11436f5bcf4b..ea8d37846a19 100644 --- a/sysutils/rsyslog6-devel/distinfo +++ b/sysutils/rsyslog6-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (rsyslog-6.3.6.tar.gz) = 5674ccb45cf57670a24eeeed8a713962b9706b3ea5e7cebcee3ca51ee6d59108 -SIZE (rsyslog-6.3.6.tar.gz) = 2472350 +SHA256 (rsyslog-6.3.12.tar.gz) = 15461a648f4801577e3e407912c696618d15a84c25f44be864ff3101d5d8fdc1 +SIZE (rsyslog-6.3.12.tar.gz) = 2528257 diff --git a/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c b/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c deleted file mode 100644 index a20cda530f68..000000000000 --- a/sysutils/rsyslog6-devel/files/patch-plugins__im3195__im3195.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ./plugins/im3195/im3195.c.orig 2011-09-15 06:01:15.000000000 +0000 -+++ ./plugins/im3195/im3195.c 2012-01-17 01:17:22.083763800 +0000 -@@ -195,8 +195,8 @@ - CODEmodInit_QueryRegCFSLineHdlr - CHKiRet(objUse(errmsg, CORE_COMPONENT)); - -- CHKiRet(omsdRegCFSLineHdlr((uchar *)"input3195listenport", 0, eCmdHdlrInt, NULL, &listenPort, STD_LOADABLE_MODULE_ID)); -- CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID)); -+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"input3195listenport", 0, eCmdHdlrInt, NULL, &listenPort, STD_LOADABLE_MODULE_ID, eConfObjAction)); -+ CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction)); - ENDmodInit - /* vim:set ai: - */ diff --git a/sysutils/rsyslog6-devel/pkg-plist b/sysutils/rsyslog6-devel/pkg-plist index 3aa297cf1f2d..061bf7f68ef3 100644 --- a/sysutils/rsyslog6-devel/pkg-plist +++ b/sysutils/rsyslog6-devel/pkg-plist @@ -6,8 +6,6 @@ lib/rsyslog/immark.la lib/rsyslog/immark.so lib/rsyslog/imtcp.la lib/rsyslog/imtcp.so -lib/rsyslog/imtemplate.la -lib/rsyslog/imtemplate.so lib/rsyslog/imudp.la lib/rsyslog/imudp.so lib/rsyslog/imuxsock.la @@ -141,7 +139,6 @@ sbin/rsyslogd %%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html %%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html %%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html -%%PORTDOCS%%%%DOCSDIR%%/scoping.html %%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html %%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html %%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg |