aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/syslog-ng-devel/Makefile64
-rw-r--r--sysutils/syslog-ng-devel/distinfo6
-rw-r--r--sysutils/syslog-ng-devel/pkg-plist2
-rw-r--r--sysutils/syslog-ng3-devel/Makefile64
-rw-r--r--sysutils/syslog-ng3-devel/distinfo6
-rw-r--r--sysutils/syslog-ng3-devel/pkg-plist2
-rw-r--r--sysutils/syslog-ng3/Makefile64
-rw-r--r--sysutils/syslog-ng3/distinfo6
-rw-r--r--sysutils/syslog-ng3/pkg-plist2
9 files changed, 165 insertions, 51 deletions
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 9fa5deea3f12..858c829e21c0 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= syslog-ng
-PORTVERSION= 3.0.3
-PORTREVISION= 3
+PORTVERSION= 3.1.1
CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
PKGNAMESUFFIX= 3
@@ -16,12 +15,19 @@ DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz
MAINTAINER= cy@FreeBSD.org
COMMENT= A powerful syslogd replacement
-OPTIONS= SSL "Build with OpenSSL support (requires >= 7.x)" on \
- TCP_WRAPPERS "Build with TCP Wrappers" off
+OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
+ TCP_WRAPPERS "Build with TCP Wrappers" off \
+ SPOOF "Build with spoof source support" on \
+ IPV6 "Build with IPV6 support" on \
+ PCRE "Build with PCRE support" on \
+ SQL "Build with database (libdbi) support" off
+
+.include <bsd.port.options.mk>
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog
+MAN1= pdbtool.1
MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8
@@ -29,23 +35,54 @@ USE_RC_SUBR= syslog-ng.sh
GNU_CONFIGURE= yes
USE_GNOME= glib20
SUB_FILES= pkg-message
-USE_OPENSSL= yes
-
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` ${CFLAGS}" \
- LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
-
-.if defined (WITH_SSL)
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}include ${CFLAGS}" \
+ LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+
+.if defined(WITH_SSL)
+USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
+CONFIGURE_ARGS+= --enable-ssl
+CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
+ OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+.else
+CONFIGURE_args+= --disable-ssl
.endif
.if defined(WITH_TCP_WRAPPERS)
-CONFIGURE_ARGS+=--enable-tcp-wrapper
+CONFIGURE_ARGS+= --enable-tcp-wrapper
+.else
+CONFIGURE_ARGS+= --disable-tcp-wrapper
+.endif
+
+.if defined(WITH_SPOOF)
+CONFIGURE_ARGS+= --enable-spoof-source
+.else
+CONFIGURE_ARGS+= --disable-spoof-source
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+.if defined(WITH_PCRE)
+CONFIGURE_ARGS+= --enable-pcre
+.else
+CONFIGURE_ARGS+= --disable-pcre
+.endif
+
+.if defined(WITH_SQL)
+LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi
+CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi"
+CONFIGURE_ARGS+= --enable-sql
+.else
+CONFIGURE_ARGS+= --disable-sql
.endif
.include <bsd.port.pre.mk>
@@ -61,7 +98,6 @@ post-patch:
${WRKSRC}/src/utils.c ${WRKSRC}/src/utils.h
.endif
-
post-install:
.if !defined(NOPORTDOCS)
${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 27241692d4d5..3c0373736313 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (syslog-ng_3.0.3.tar.gz) = b8b3c9af28696bce48ceca0de6444426
-SHA256 (syslog-ng_3.0.3.tar.gz) = bf6e9f84747ff4a7d2181f67716d434b924da3eee7f199ad5f3c526cbb121bb8
-SIZE (syslog-ng_3.0.3.tar.gz) = 546397
+MD5 (syslog-ng_3.1.1.tar.gz) = 4fdc64ff0ad964dc811a746228609412
+SHA256 (syslog-ng_3.1.1.tar.gz) = 4ad01ddecb7845604df22fc31b8704da8fc30334d2f383b8637eb50a581c983e
+SIZE (syslog-ng_3.1.1.tar.gz) = 700577
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index 7a7e44b6ca6c..9c24fb963daf 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -1,7 +1,9 @@
@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
etc/syslog-ng.conf.sample
bin/loggen
+bin/pdbtool
sbin/syslog-ng
+sbin/syslog-ng-ctl
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile
index 9fa5deea3f12..858c829e21c0 100644
--- a/sysutils/syslog-ng3-devel/Makefile
+++ b/sysutils/syslog-ng3-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= syslog-ng
-PORTVERSION= 3.0.3
-PORTREVISION= 3
+PORTVERSION= 3.1.1
CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
PKGNAMESUFFIX= 3
@@ -16,12 +15,19 @@ DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz
MAINTAINER= cy@FreeBSD.org
COMMENT= A powerful syslogd replacement
-OPTIONS= SSL "Build with OpenSSL support (requires >= 7.x)" on \
- TCP_WRAPPERS "Build with TCP Wrappers" off
+OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
+ TCP_WRAPPERS "Build with TCP Wrappers" off \
+ SPOOF "Build with spoof source support" on \
+ IPV6 "Build with IPV6 support" on \
+ PCRE "Build with PCRE support" on \
+ SQL "Build with database (libdbi) support" off
+
+.include <bsd.port.options.mk>
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog
+MAN1= pdbtool.1
MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8
@@ -29,23 +35,54 @@ USE_RC_SUBR= syslog-ng.sh
GNU_CONFIGURE= yes
USE_GNOME= glib20
SUB_FILES= pkg-message
-USE_OPENSSL= yes
-
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` ${CFLAGS}" \
- LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
-
-.if defined (WITH_SSL)
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}include ${CFLAGS}" \
+ LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+
+.if defined(WITH_SSL)
+USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
+CONFIGURE_ARGS+= --enable-ssl
+CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
+ OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+.else
+CONFIGURE_args+= --disable-ssl
.endif
.if defined(WITH_TCP_WRAPPERS)
-CONFIGURE_ARGS+=--enable-tcp-wrapper
+CONFIGURE_ARGS+= --enable-tcp-wrapper
+.else
+CONFIGURE_ARGS+= --disable-tcp-wrapper
+.endif
+
+.if defined(WITH_SPOOF)
+CONFIGURE_ARGS+= --enable-spoof-source
+.else
+CONFIGURE_ARGS+= --disable-spoof-source
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+.if defined(WITH_PCRE)
+CONFIGURE_ARGS+= --enable-pcre
+.else
+CONFIGURE_ARGS+= --disable-pcre
+.endif
+
+.if defined(WITH_SQL)
+LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi
+CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi"
+CONFIGURE_ARGS+= --enable-sql
+.else
+CONFIGURE_ARGS+= --disable-sql
.endif
.include <bsd.port.pre.mk>
@@ -61,7 +98,6 @@ post-patch:
${WRKSRC}/src/utils.c ${WRKSRC}/src/utils.h
.endif
-
post-install:
.if !defined(NOPORTDOCS)
${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
diff --git a/sysutils/syslog-ng3-devel/distinfo b/sysutils/syslog-ng3-devel/distinfo
index 27241692d4d5..3c0373736313 100644
--- a/sysutils/syslog-ng3-devel/distinfo
+++ b/sysutils/syslog-ng3-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (syslog-ng_3.0.3.tar.gz) = b8b3c9af28696bce48ceca0de6444426
-SHA256 (syslog-ng_3.0.3.tar.gz) = bf6e9f84747ff4a7d2181f67716d434b924da3eee7f199ad5f3c526cbb121bb8
-SIZE (syslog-ng_3.0.3.tar.gz) = 546397
+MD5 (syslog-ng_3.1.1.tar.gz) = 4fdc64ff0ad964dc811a746228609412
+SHA256 (syslog-ng_3.1.1.tar.gz) = 4ad01ddecb7845604df22fc31b8704da8fc30334d2f383b8637eb50a581c983e
+SIZE (syslog-ng_3.1.1.tar.gz) = 700577
diff --git a/sysutils/syslog-ng3-devel/pkg-plist b/sysutils/syslog-ng3-devel/pkg-plist
index 7a7e44b6ca6c..9c24fb963daf 100644
--- a/sysutils/syslog-ng3-devel/pkg-plist
+++ b/sysutils/syslog-ng3-devel/pkg-plist
@@ -1,7 +1,9 @@
@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
etc/syslog-ng.conf.sample
bin/loggen
+bin/pdbtool
sbin/syslog-ng
+sbin/syslog-ng-ctl
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/sysutils/syslog-ng3/Makefile b/sysutils/syslog-ng3/Makefile
index 9fa5deea3f12..858c829e21c0 100644
--- a/sysutils/syslog-ng3/Makefile
+++ b/sysutils/syslog-ng3/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= syslog-ng
-PORTVERSION= 3.0.3
-PORTREVISION= 3
+PORTVERSION= 3.1.1
CATEGORIES= sysutils
MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
PKGNAMESUFFIX= 3
@@ -16,12 +15,19 @@ DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz
MAINTAINER= cy@FreeBSD.org
COMMENT= A powerful syslogd replacement
-OPTIONS= SSL "Build with OpenSSL support (requires >= 7.x)" on \
- TCP_WRAPPERS "Build with TCP Wrappers" off
+OPTIONS= SSL "Build with OpenSSL support (from ports)" off \
+ TCP_WRAPPERS "Build with TCP Wrappers" off \
+ SPOOF "Build with spoof source support" on \
+ IPV6 "Build with IPV6 support" on \
+ PCRE "Build with PCRE support" on \
+ SQL "Build with database (libdbi) support" off
+
+.include <bsd.port.options.mk>
BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog
+MAN1= pdbtool.1
MAN5= syslog-ng.conf.5
MAN8= syslog-ng.8
@@ -29,23 +35,54 @@ USE_RC_SUBR= syslog-ng.sh
GNU_CONFIGURE= yes
USE_GNOME= glib20
SUB_FILES= pkg-message
-USE_OPENSSL= yes
-
LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` ${CFLAGS}" \
- LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
-
-.if defined (WITH_SSL)
-CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
- OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}include ${CFLAGS}" \
+ LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+
+.if defined(WITH_SSL)
+USE_OPENSSL= yes
+WITH_OPENSSL_PORT= yes
+CONFIGURE_ARGS+= --enable-ssl
+CONFIGURE_ENV+= OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
+ OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+.else
+CONFIGURE_args+= --disable-ssl
.endif
.if defined(WITH_TCP_WRAPPERS)
-CONFIGURE_ARGS+=--enable-tcp-wrapper
+CONFIGURE_ARGS+= --enable-tcp-wrapper
+.else
+CONFIGURE_ARGS+= --disable-tcp-wrapper
+.endif
+
+.if defined(WITH_SPOOF)
+CONFIGURE_ARGS+= --enable-spoof-source
+.else
+CONFIGURE_ARGS+= --disable-spoof-source
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+.if defined(WITH_PCRE)
+CONFIGURE_ARGS+= --enable-pcre
+.else
+CONFIGURE_ARGS+= --disable-pcre
+.endif
+
+.if defined(WITH_SQL)
+LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi
+CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi"
+CONFIGURE_ARGS+= --enable-sql
+.else
+CONFIGURE_ARGS+= --disable-sql
.endif
.include <bsd.port.pre.mk>
@@ -61,7 +98,6 @@ post-patch:
${WRKSRC}/src/utils.c ${WRKSRC}/src/utils.h
.endif
-
post-install:
.if !defined(NOPORTDOCS)
${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
diff --git a/sysutils/syslog-ng3/distinfo b/sysutils/syslog-ng3/distinfo
index 27241692d4d5..3c0373736313 100644
--- a/sysutils/syslog-ng3/distinfo
+++ b/sysutils/syslog-ng3/distinfo
@@ -1,3 +1,3 @@
-MD5 (syslog-ng_3.0.3.tar.gz) = b8b3c9af28696bce48ceca0de6444426
-SHA256 (syslog-ng_3.0.3.tar.gz) = bf6e9f84747ff4a7d2181f67716d434b924da3eee7f199ad5f3c526cbb121bb8
-SIZE (syslog-ng_3.0.3.tar.gz) = 546397
+MD5 (syslog-ng_3.1.1.tar.gz) = 4fdc64ff0ad964dc811a746228609412
+SHA256 (syslog-ng_3.1.1.tar.gz) = 4ad01ddecb7845604df22fc31b8704da8fc30334d2f383b8637eb50a581c983e
+SIZE (syslog-ng_3.1.1.tar.gz) = 700577
diff --git a/sysutils/syslog-ng3/pkg-plist b/sysutils/syslog-ng3/pkg-plist
index 7a7e44b6ca6c..9c24fb963daf 100644
--- a/sysutils/syslog-ng3/pkg-plist
+++ b/sysutils/syslog-ng3/pkg-plist
@@ -1,7 +1,9 @@
@unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
etc/syslog-ng.conf.sample
bin/loggen
+bin/pdbtool
sbin/syslog-ng
+sbin/syslog-ng-ctl
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog