Index: security/ossec-hids/Makefile
===================================================================
--- security/ossec-hids/Makefile	(revision 518034)
+++ security/ossec-hids/Makefile	(working copy)
@@ -1,15 +1,7 @@
 # $FreeBSD$
 
-PORTNAME=	ossec-hids
-PORTVERSION=	3.3.0
-PORTREVISION=	0
-CATEGORIES=	security
+.include "${.CURDIR}/version.mk"
 
-MAINTAINER=	dominik.lisiak@bemsoft.pl
-COMMENT=	Security tool to monitor and check logs and intrusions
-
-LICENSE=	GPLv2
-
 RUN_DEPENDS=	ossec-hids-${OSSEC_TYPE}>=${PORTVERSION}:security/ossec-hids-${OSSEC_TYPE}
 
 USES=		metaport
Index: security/ossec-hids/version.mk
===================================================================
--- security/ossec-hids/version.mk	(nonexistent)
+++ security/ossec-hids/version.mk	(working copy)
@@ -0,0 +1,9 @@
+PORTNAME=	ossec-hids
+PORTVERSION=	3.5.0
+PORTREVISION?=	0
+CATEGORIES=	security
+
+MAINTAINER=	dominik.lisiak@bemsoft.pl
+COMMENT?=	Security tool to monitor and check logs and intrusions
+
+LICENSE=	GPLv2

Property changes on: security/ossec-hids/version.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: security/ossec-hids-agent/Makefile
===================================================================
--- security/ossec-hids-agent/Makefile	(revision 518034)
+++ security/ossec-hids-agent/Makefile	(working copy)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+COMMENT=	Security tool to monitor and check logs and intrusions - agent installation
 OSSEC_TYPE=	agent
 
 MASTERDIR=	${.CURDIR}/../ossec-hids-local
Index: security/ossec-hids-local/Makefile
===================================================================
--- security/ossec-hids-local/Makefile	(revision 518034)
+++ security/ossec-hids-local/Makefile	(working copy)
@@ -1,21 +1,15 @@
 # $FreeBSD$
 
-PORTNAME=	ossec-hids
-PORTVERSION=	3.3.0
-PORTREVISION=	0
-CATEGORIES=	security
-PKGNAMESUFFIX=	-${OSSEC_TYPE}
+PKGNAMESUFFIX?=	-${OSSEC_TYPE}
+COMMENT?=	Security tool to monitor and check logs and intrusions - local (standalone) installation
+OSSEC_TYPE?=	local
 
-MAINTAINER=	dominik.lisiak@bemsoft.pl
-COMMENT=	Security tool to monitor and check logs and intrusions
+.include "${.CURDIR}/../ossec-hids/version.mk"
 
-LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler gmake ssl
 
-OSSEC_TYPE?=	local
-
 .if ${OSSEC_TYPE} == local
 CONFLICTS_INSTALL=	ossec-hids-client-* \
 			ossec-hids-agent-* \
@@ -30,7 +24,7 @@
 			ossec-hids-local-*
 .endif
 
-LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 libevent.so:devel/libevent
 .if ${OSSEC_TYPE} != agent
 RUN_DEPENDS=	expect:lang/expect
 .endif
@@ -41,7 +35,7 @@
 
 INOTIFY_USES=	pkgconfig
 LUA_USES=	readline
-MYSQL_USES=	mysql
+MYSQL_USE=	mysql
 PGSQL_USES=	pgsql
 
 USE_GITHUB=	yes
@@ -135,8 +129,13 @@
 IPFILTER_BIN=		${OSSEC_HOME}/active-response/bin/ipfilter.sh
 RESTART_OSSEC_BIN=	${OSSEC_HOME}/active-response/bin/restart-ossec.sh
 SHARED_DIR=		${OSSEC_HOME}/etc/shared
-INTERNAL_OPTS_CONF=	${OSSEC_HOME}/etc/local_internal_options.conf
 
+SAMPLE_FILES=		${OSSEC_HOME}/etc/local_internal_options.conf \
+			${OSSEC_HOME}/active-response/bin/cloudflare-ban.sh \
+			${OSSEC_HOME}/active-response/bin/ossec-pagerduty.sh \
+			${OSSEC_HOME}/active-response/bin/ossec-slack.sh \
+			${OSSEC_HOME}/active-response/bin/ossec-tweeter.sh
+
 .if empty(USER)
 USER=$$(${ID} -un)
 .endif
@@ -187,6 +186,9 @@
 INOTIFY_LDFLAGS=$$(${PKG_CONFIG} --libs libinotify)
 
 OSSEC_ARGS+=	TARGET=${OSSEC_TYPE} PCRE2_SYSTEM=yes INSTALL_LOCALTIME=no INSTALL_RESOLVCONF=no
+.if defined(OSSEC_MAX_AGENTS)
+OSSEC_ARGS+=	MAXAGENTS=${OSSEC_MAX_AGENTS}
+.endif
 .if !defined(MAINTAINER_MODE)
 OSSEC_ARGS+=	INSTALL_CMD=install
 .endif
@@ -212,7 +214,9 @@
 	@cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_ARGS} install
 
 post-install:
-	@${MV} -f ${STAGEDIR}${INTERNAL_OPTS_CONF} ${STAGEDIR}${INTERNAL_OPTS_CONF}.sample
+.for file_path in ${SAMPLE_FILES}
+	@${MV} -f ${STAGEDIR}${file_path} ${STAGEDIR}${file_path}.sample
+.endfor
 	@${MV} -f ${STAGEDIR}${FIREWALL_DROP_BIN} ${STAGEDIR}${IPFILTER_BIN}
 	@${CP} ${WRKDIR}/restart-ossec.sh ${STAGEDIR}${RESTART_OSSEC_BIN}
 	@${CHMOD} 550 ${STAGEDIR}${RESTART_OSSEC_BIN}
Index: security/ossec-hids-local/distinfo
===================================================================
--- security/ossec-hids-local/distinfo	(revision 518034)
+++ security/ossec-hids-local/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555773447
-SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
-SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070
+TIMESTAMP = 1574094213
+SHA256 (ossec-ossec-hids-3.5.0_GH0.tar.gz) = 720458e7da9fb1437efab3030a3bd42ca84dc652dd1931dedce745456d40e1ad
+SIZE (ossec-ossec-hids-3.5.0_GH0.tar.gz) = 1920232
Index: security/ossec-hids-local/files/ossec-hids.in
===================================================================
--- security/ossec-hids-local/files/ossec-hids.in	(revision 518034)
+++ security/ossec-hids-local/files/ossec-hids.in	(working copy)
@@ -13,7 +13,7 @@
 #                                       Default: NO
 # ossec_hids_fetch_connect_time (int):  Time in seconds to wait for the download of the shared configuration to start.
 #                                       Used only by agent installation.
-#                                       Default: 30
+#                                       Default: 40
 # ossec_hids_fetch_read_time (int):     Time in seconds to wait for subsequent download chunks of the shared configuration.
 #                                       Used only by agent installation.
 #                                       Default: 10
@@ -28,7 +28,7 @@
 : ${ossec_hids_enable="NO"}
 : ${ossec_hids_clear_log="NO"}
 : ${ossec_hids_clear_ar_log="NO"}
-: ${ossec_hids_fetch_connect_time=30}
+: ${ossec_hids_fetch_connect_time=40}
 : ${ossec_hids_fetch_read_time=10}
 
 ossec_type="%%OSSEC_TYPE%%"
Index: security/ossec-hids-local/pkg-plist-agent
===================================================================
--- security/ossec-hids-local/pkg-plist-agent	(revision 518034)
+++ security/ossec-hids-local/pkg-plist-agent	(working copy)
@@ -1,6 +1,7 @@
 @dir(,ossec,0550) %%OSSEC_HOME%%
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response/bin
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/cloudflare-ban.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/disable-account.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/firewalld-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/host-deny.sh
@@ -9,9 +10,9 @@
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw_mac.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/npf.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh.sample
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh.sample
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/pf.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/restart-ossec.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/route-null.sh
Index: security/ossec-hids-local/pkg-plist-local
===================================================================
--- security/ossec-hids-local/pkg-plist-local	(revision 518034)
+++ security/ossec-hids-local/pkg-plist-local	(working copy)
@@ -1,6 +1,7 @@
 @dir(,ossec,0550) %%OSSEC_HOME%%
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response/bin
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/cloudflare-ban.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/disable-account.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/firewalld-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/host-deny.sh
@@ -9,9 +10,9 @@
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw_mac.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/npf.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh.sample
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh.sample
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/pf.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/restart-ossec.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/route-null.sh
Index: security/ossec-hids-local/pkg-plist-server
===================================================================
--- security/ossec-hids-local/pkg-plist-server	(revision 518034)
+++ security/ossec-hids-local/pkg-plist-server	(working copy)
@@ -1,6 +1,7 @@
 @dir(,ossec,0550) %%OSSEC_HOME%%
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response
 @dir(,ossec,0550) %%OSSEC_HOME%%/active-response/bin
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/cloudflare-ban.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/disable-account.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/firewalld-drop.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/host-deny.sh
@@ -9,9 +10,9 @@
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ipfw_mac.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/npf.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh
-@(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-pagerduty.sh.sample
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-slack.sh.sample
+@sample(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/ossec-tweeter.sh.sample
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/pf.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/restart-ossec.sh
 @(,ossec,0550) %%OSSEC_HOME%%/active-response/bin/route-null.sh
Index: security/ossec-hids-local/scripts/plist.conf
===================================================================
--- security/ossec-hids-local/scripts/plist.conf	(revision 518034)
+++ security/ossec-hids-local/scripts/plist.conf	(working copy)
@@ -27,4 +27,8 @@
 fi
 
 sample_paths="
-/etc/local_internal_options.conf.sample"
+/etc/local_internal_options.conf.sample
+/active-response/bin/cloudflare-ban.sh.sample
+/active-response/bin/ossec-pagerduty.sh.sample
+/active-response/bin/ossec-slack.sh.sample
+/active-response/bin/ossec-tweeter.sh.sample"
Index: security/ossec-hids-local-config/Makefile
===================================================================
--- security/ossec-hids-local-config/Makefile	(revision 518034)
+++ security/ossec-hids-local-config/Makefile	(working copy)
@@ -1,19 +1,13 @@
 # $FreeBSD$
 
-PORTNAME=	ossec-hids
-PORTVERSION=	3.3.0
-PORTREVISION=	0
-CATEGORIES=	security
-PKGNAMESUFFIX=	-${OSSEC_TYPE}-config
+PKGNAMESUFFIX?=	-${OSSEC_TYPE}-config
+COMMENT?=	Configuration manager for ossec-hids-${OSSEC_TYPE}
+OSSEC_TYPE?=	local
 
-MAINTAINER=	dominik.lisiak@bemsoft.pl
-COMMENT=	Configuration manager for ossec-hids
+.include "${.CURDIR}/../ossec-hids/version.mk"
 
-LICENSE=	GPLv2
-
-OSSEC_TYPE?=	local
-
 MASTERDIR?=	${.CURDIR}
+DISTINFO_FILE?=	${MASTERDIR}/../ossec-hids-local/distinfo
 
 .if ${OSSEC_TYPE} == local
 CONFLICTS_INSTALL=	ossec-hids-client-* \
Index: security/ossec-hids-local-config/distinfo
===================================================================
--- security/ossec-hids-local-config/distinfo	(revision 518034)
+++ security/ossec-hids-local-config/distinfo	(nonexistent)
@@ -1,3 +0,0 @@
-TIMESTAMP = 1555773476
-SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
-SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070

Property changes on: security/ossec-hids-local-config/distinfo
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: security/ossec-hids-server/Makefile
===================================================================
--- security/ossec-hids-server/Makefile	(revision 518034)
+++ security/ossec-hids-server/Makefile	(working copy)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+COMMENT=	Security tool to monitor and check logs and intrusions - server installation
 OSSEC_TYPE=	server
 
 MASTERDIR=	${.CURDIR}/../ossec-hids-local