diff --git a/security/ossec-hids-local-config/Makefile b/security/ossec-hids-local-config/Makefile
index c021e6464248..fa4509d26524 100644
--- a/security/ossec-hids-local-config/Makefile
+++ b/security/ossec-hids-local-config/Makefile
@@ -1,454 +1,455 @@
+PORTREVISION?=	2
 PKGNAMESUFFIX?=	-${OSSEC_TYPE}-config
 COMMENT?=	Configuration manager for ossec-hids-${OSSEC_TYPE}
 OSSEC_TYPE?=	local
 
 .include "${.CURDIR}/../ossec-hids/version.mk"
 
 MASTERDIR?=	${.CURDIR}
 DISTINFO_FILE?=	${MASTERDIR}/../ossec-hids-local/distinfo
 
 .if ${OSSEC_TYPE} == local
 CONFLICTS_INSTALL=	ossec-hids-client \
 			ossec-hids-agent \
 			ossec-hids-server
 .elif ${OSSEC_TYPE} == agent
 CONFLICTS_INSTALL=	ossec-hids-client \
 			ossec-hids-local \
 			ossec-hids-server
 .elif ${OSSEC_TYPE} == server
 CONFLICTS_INSTALL=	ossec-hids-client \
 			ossec-hids-agent \
 			ossec-hids-local
 .endif
 
 .if !defined(MAINTAINER_MODE)
 RUN_DEPENDS=	ossec-hids-${OSSEC_TYPE}>=${PORTVERSION}:security/ossec-hids-${OSSEC_TYPE}
 .endif
 
 .if defined(MAINTAINER_MODE)
 USE_GITHUB=	yes
 GH_ACCOUNT=	ossec
 .else
 MASTER_SITES=	#
 DISTFILES=	#
 EXTRACT_ONLY=	#
 .endif
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 OPTIONS_SUB=			yes
 
 OPTIONS_SINGLE=			FIREWALL
 OPTIONS_SINGLE_FIREWALL=	NOFW IPF IPFW PF
 
 OPTIONS_DEFAULT+=		NOFW
 
 FIREWALL_DESC=		Active Response Firewall
 PF_DESC=		Packet Filter
 IPFW_DESC=		ipfirewall
 IPF_DESC=		ipfilter
 NOFW_DESC=		Custom or no firewall
 
 TEMPL_ENABLED_HEADER=		template-header-enabled.xml
 TEMPL_DISABLED_HEADER=		template-header-disabled.xml
 TEMPL_SAMPLE_HEADER=		template-header-sample.xml
 TEMPL_PUSHED_ENABLED_HEADER=	${TEMPL_ENABLED_HEADER}
 TEMPL_PUSHED_DISABLED_HEADER=	${TEMPL_DISABLED_HEADER}
 
 TEMPL_SAMPLE=		template-sample-${OSSEC_TYPE}.xml
 TEMPL_SAMPLE_DB=	template-sample-database.xml
 
 PF_VARS=		FW_DROP=pf.sh PKGMSG_FILES+=message-pf
 IPFW_VARS=		FW_DROP=ipfw.sh
 IPF_VARS=		FW_DROP=ipfilter.sh
 NOFW_VARS=		FW_DROP=
 
 .if defined(MAINTAINER_MODE)
 OSSEC_HOME=		${PREFIX}/${PORTNAME}
 .else
 OSSEC_HOME?=		${PREFIX}/${PORTNAME}
 .endif
 OSSEC_RC=		${PREFIX}/etc/rc.d/ossec-hids
 TEMPL_TO_OSSEC=		${SCRIPTDIR}/template-to-ossec.sh ${OSSEC_TYPE} ${OSSEC_HOME}
 TEMPL_TO_AGENT=		${SCRIPTDIR}/template-to-agent.sh ${OSSEC_TYPE} ${OSSEC_HOME}
 
 OSSEC_DIR=		${STAGEDIR}${OSSEC_HOME}
 BIN_DIR=		${OSSEC_DIR}/bin
 CONF_BIN_DIR=		${BIN_DIR}/config
 OSSEC_CONF_BIN=		${CONF_BIN_DIR}/ossec-conf
 AGENT_CONF_BIN=		${CONF_BIN_DIR}/agent-conf
 COMMAND_BIN_DIR=	${BIN_DIR}/command
 
 AR_BIN_DIR=		${OSSEC_DIR}/active-response/bin
 MERGE_CONFIG_BIN=	${AR_BIN_DIR}/merge-config.sh
 
 ETC_DIR=		${OSSEC_DIR}/etc
 OSSEC_CONF_DIR=		${ETC_DIR}/ossec.conf.d
 AGENT_CONF_DIR=		${ETC_DIR}/agent.conf.d
 OSSEC_LOCAL_CONF_DIR=	${OSSEC_CONF_DIR}/disabled
 AGENT_LOCAL_CONF_DIR=	${AGENT_CONF_DIR}/disabled
 OSSEC_SAMPLE_CONF=	${OSSEC_CONF_DIR}/900.local.conf.sample
 COMMAND_CONF_DIR=	${ETC_DIR}
 COMMAND_CONF=		${COMMAND_CONF_DIR}/command.conf.sample
 RULES_DIR=		${OSSEC_DIR}/rules
 
 .if empty(USER)
 USER=$$(${ID} -un)
 .endif
 .if empty(GROUP)
 GROUP=$$(${ID} -gn)
 .endif
 
 OSSEC_USER=	ossec
 OSSEC_GROUP=	ossec
 
 SUB_LIST+=	PORTNAME=${PORTNAME} \
 		OSSEC_TYPE=${OSSEC_TYPE} \
 		OSSEC_HOME=${OSSEC_HOME} \
 		VERSION=${PORTVERSION} \
 		USER=${USER} \
 		OSSEC_USER=${OSSEC_USER} \
 		OSSEC_GROUP=${OSSEC_GROUP} \
 		OSSEC_RC=${OSSEC_RC} \
 		FW_DROP=${FW_DROP}
 SUB_FILES=	pkg-install \
 		pkg-deinstall \
 		${PKGMSG_FILES} \
 		${TEMPL_ENABLED_HEADER} \
 		${TEMPL_DISABLED_HEADER} \
 		${TEMPL_SAMPLE_HEADER} \
 		${TEMPL_PUSHED_ENABLED_HEADER} \
 		${TEMPL_PUSHED_DISABLED_HEADER} \
 		${TEMPL_SAMPLE} \
 		merge-config.sh \
 		ossec-conf \
 		command.conf
 .if ${OSSEC_TYPE} == server
 SUB_FILES+=	agent-conf
 .endif
 
 .if defined(MAINTAINER_MODE)
 PLIST_SUB=	OSSEC_HOME=${PORTNAME}
 .else
 PLIST_SUB=	OSSEC_HOME=${OSSEC_HOME}
 .endif
 PLIST=		${PKGDIR}/pkg-plist-${OSSEC_TYPE}
 PKGHELP=	${PKGDIR}/pkg-help-${OSSEC_TYPE}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGMSG_FILES=	message-ossec-conf
 .if ${OSSEC_TYPE} == server
 PKGMSG_FILES+=	message-agent-conf
 .endif
 
 CONF_GROUPS=	RULES AR ROOTCHECK SYSCHECK CMDOUT LOGS
 
 ############################################################
 
 .for conf_group in ${CONF_GROUPS}
 . include "${MASTERDIR}/opt-${conf_group:tl}.mk"
 ${conf_group}_INSTANCE_OPTIONS=
 ${conf_group}_PUSHED_OPTIONS=
 . for option in ${${conf_group}_OPTIONS}
 .  if ${${option}_DEFINE:M${OSSEC_TYPE}}
 ${conf_group}_INSTANCE_OPTIONS+=		${option}
 ${conf_group}_ALL_OPTIONS+=			${option}
 .  endif
 .  if ${${option}_DEFINE:Mpushed}
 .   if ${OSSEC_TYPE} == server
 ${conf_group}_PUSHED_OPTIONS+=			${option}
 .   endif
 .   if !${${conf_group}_ALL_OPTIONS:M${option}}
 ${conf_group}_ALL_OPTIONS+=			${option}
 .   endif
 .  endif
 . endfor
 .endfor
 
 ############################################################
 
 CONFIG_PROFILES=
 .for conf_group in ${CONF_GROUPS}
 . if !empty(${conf_group}_PROFILE)
 .  if ${OSSEC_TYPE} == agent
 .   if !${CONFIG_PROFILES:M${${conf_group}_PROFILE}}
 CONFIG_PROFILES+=	${${conf_group}_PROFILE}
 .   endif
 .  endif
 SUB_LIST+=		${conf_group}_PROFILE=${${conf_group}_PROFILE}
 . endif
 . for option in ${${conf_group}_ALL_OPTIONS}
 .  if !empty(${option}_PROFILE)
 .   if ${OSSEC_TYPE} == agent
 .    if !${CONFIG_PROFILES:M${${option}_PROFILE}}
 CONFIG_PROFILES+=	${${option}_PROFILE}
 .    endif
 .   endif
 SUB_LIST+=		${option}_PROFILE=${${option}_PROFILE}
 .  endif
 . endfor
 .endfor
 
 .for profile in ${CONFIG_PROFILES}
 . if empty(CONFIG_PROFILE_VALUE)
 CONFIG_PROFILE_VALUE:=	${profile}
 . else
 CONFIG_PROFILE_VALUE:=	${CONFIG_PROFILE_VALUE}, ${profile}
 . endif
 .endfor
 SUB_LIST+=		CONFIG_PROFILES="${CONFIG_PROFILE_VALUE}"
 
 ############################################################
 
 .for conf_group in ${CONF_GROUPS}
 . for option in ${${conf_group}_ALL_OPTIONS}
 .  if !defined(${option}_TEMPLATE)
 ${option}_TEMPLATE=	template-${option:tl:S/_/-/g}.xml
 .  endif
 .  if !empty(${option}_TEMPLATE) && !${SUB_FILES:M${${option}_TEMPLATE}}
 SUB_FILES+=		${${option}_TEMPLATE}
 .  endif
 . endfor
 .endfor
 
 .for file_name in ${RULES_FILES}
 SUB_FILES+=		rules-${file_name}.xml
 .endfor
 
 .for file_name in ${CMDOUT_SCRIPTS}
 SUB_FILES+=		command-${file_name}.sh
 .endfor
 
 ############################################################
 
 .for conf_group in ${CONF_GROUPS}
 . for option in ${${conf_group}_INSTANCE_OPTIONS}
 .  if !empty(${option}_DEPENDS) && !empty(${${option}_DEPENDS}_OPTION) && ${${${option}_DEPENDS:S/_/ /:[1]}_INSTANCE_OPTIONS:M${${option}_DEPENDS}}
 ${${${option}_DEPENDS}_OPTION}_VARS+=		${conf_group}_INSTANCE_OPTIONS_ENABLED+=${option}
 ${${${option}_DEPENDS}_OPTION}_VARS_OFF+=	${conf_group}_INSTANCE_OPTIONS_DISABLED+=${option}
 .  elif !empty(${option}_OPTION)
 OPTIONS_GROUP_G_${conf_group}+=			${${option}_OPTION}
 ${${option}_OPTION}_DESC=			${${option}_DESC}
 .   if ${${option}_DEFAULT:M${OSSEC_TYPE}}
 OPTIONS_DEFAULT+=				${${option}_OPTION}
 .   endif
 ${${option}_OPTION}_VARS+=			${conf_group}_INSTANCE_OPTIONS_ENABLED+=${option}
 ${${option}_OPTION}_VARS_OFF+=			${conf_group}_INSTANCE_OPTIONS_DISABLED+=${option}
 .  endif
 . endfor
 . if !empty(OPTIONS_GROUP_G_${conf_group})
 OPTIONS_GROUP+=			G_${conf_group}
 G_${conf_group}_DESC=		${${conf_group}_DESC}
 . endif
 .endfor
 
 ############################################################
 
 .for conf_group in ${CONF_GROUPS}
 . for option in ${${conf_group}_PUSHED_OPTIONS}
 .  if !empty(${option}_DEPENDS) && !empty(${${option}_DEPENDS}_OPTION) && ${${${option}_DEPENDS:S/_/ /:[1]}_PUSHED_OPTIONS:M${${option}_DEPENDS}}
 ${${${option}_DEPENDS}_OPTION}_P_VARS+=		${conf_group}_PUSHED_OPTIONS_ENABLED+=${option}
 ${${${option}_DEPENDS}_OPTION}_P_VARS_OFF+=	${conf_group}_PUSHED_OPTIONS_DISABLED+=${option}
 .  elif !empty(${option}_DEPENDS) && !empty(${${option}_DEPENDS}_OPTION) && ${${${option}_DEPENDS:S/_/ /:[1]}_INSTANCE_OPTIONS:M${${option}_DEPENDS}}
 ${${${option}_DEPENDS}_OPTION}_VARS+=		${conf_group}_PUSHED_OPTIONS_ENABLED+=${option}
 ${${${option}_DEPENDS}_OPTION}_VARS_OFF+=	${conf_group}_PUSHED_OPTIONS_DISABLED+=${option}
 .  elif !empty(${option}_OPTION)
 OPTIONS_GROUP_G_${conf_group}_P+=		${${option}_OPTION}_P
 ${${option}_OPTION}_P_DESC=			${${option}_DESC}
 .   if !empty(${option}_PROFILE)
 ${${option}_OPTION}_P_DESC+=			(profile: ${${option}_PROFILE})
 .   endif
 .   if ${${option}_DEFAULT:Mpushed}
 OPTIONS_DEFAULT+=				${${option}_OPTION}_P
 .   endif
 ${${option}_OPTION}_P_VARS+=			${conf_group}_PUSHED_OPTIONS_ENABLED+=${option}
 ${${option}_OPTION}_P_VARS_OFF+=		${conf_group}_PUSHED_OPTIONS_DISABLED+=${option}
 .  endif
 . endfor
 . if !empty(OPTIONS_GROUP_G_${conf_group}_P)
 OPTIONS_GROUP+=			G_${conf_group}_P
 G_${conf_group}_P_DESC=		Pushed ${${conf_group}_DESC}
 .  if !empty(${conf_group}_PROFILE)
 G_${conf_group}_P_DESC+=	(profile: ${${conf_group}_PROFILE})
 .  endif
 . endif
 .endfor
 
 ############################################################
 
 .include <bsd.port.pre.mk>
 
 show-opts:
 .for conf_group in ${CONF_GROUPS}
 	@${ECHO_CMD} "${conf_group}: ${${conf_group}_DESC}"
 . for option in ${${conf_group}_INSTANCE_OPTIONS}
 	@${ECHO_CMD} "  ${option}: ${${option}_DESC}"
 .  if empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "    Template: -"
 .  else
 	@${ECHO_CMD} "    Template: ${${option}_TEMPLATE}"
 .  endif
 .  if !empty(${conf_group}_INSTANCE_OPTIONS_ENABLED) && ${${conf_group}_INSTANCE_OPTIONS_ENABLED:M${option}}
 	@${ECHO_CMD} "    Enabled:  true"
 .  endif
 .  if !empty(${conf_group}_INSTANCE_OPTIONS_DISABLED) && ${${conf_group}_INSTANCE_OPTIONS_DISABLED:M${option}}
 	@${ECHO_CMD} "    Enabled:  false"
 .  endif
 .  if !empty(${conf_group}_PUSHED_OPTIONS_ENABLED) && ${${conf_group}_PUSHED_OPTIONS_ENABLED:M${option}}
 	@${ECHO_CMD} "    Pushed:   true"
 .  endif
 .  if !empty(${conf_group}_PUSHED_OPTIONS_DISABLED) && ${${conf_group}_PUSHED_OPTIONS_DISABLED:M${option}}
 	@${ECHO_CMD} "    Pushed:   false"
 .  endif
 . endfor
 .endfor
 
 pre-install:
 	@-${OSSEC_HOME}/bin/ossec-dbd -h 2>&1 | ${GREP} -q 'PostgreSQL' && \
 		${SED} -e 's|%%OSSEC_HOME%%|${OSSEC_HOME}|g' -e 's|%%DB_TYPE%%|postgresql|g' \
 		${FILESDIR}/${TEMPL_SAMPLE_DB}.in > ${WRKDIR}/${TEMPL_SAMPLE_DB}
 	@-${OSSEC_HOME}/bin/ossec-dbd -h 2>&1 | ${GREP} -q 'MySQL' && \
 		${SED} -e 's|%%OSSEC_HOME%%|${OSSEC_HOME}|g' -e 's|%%DB_TYPE%%|mysql|g' \
 		${FILESDIR}/${TEMPL_SAMPLE_DB}.in > ${WRKDIR}/${TEMPL_SAMPLE_DB}
 
 ossec-dirs:
 	@${MKDIR} ${CONF_BIN_DIR} ${COMMAND_BIN_DIR} ${AR_BIN_DIR} ${OSSEC_CONF_DIR} ${OSSEC_LOCAL_CONF_DIR} ${COMMAND_CONF_DIR}
 .if ${OSSEC_TYPE} != agent
 	@${MKDIR} ${RULES_DIR}
 .endif
 .if ${OSSEC_TYPE} == server
 	@${MKDIR} ${AGENT_CONF_DIR} ${AGENT_LOCAL_CONF_DIR}
 .endif
 
 ossec-scripts:
 	@${CP} ${WRKDIR}/ossec-conf ${OSSEC_CONF_BIN}
 .if ${OSSEC_TYPE} == server
 	@${CP} ${WRKDIR}/agent-conf ${AGENT_CONF_BIN}
 .endif
 .for file_name in ${CMDOUT_SCRIPTS}
 	@${CP} ${WRKDIR}/command-${file_name}.sh ${COMMAND_BIN_DIR}/${file_name}.sh
 .endfor
 	@${CP} ${WRKDIR}/command.conf ${COMMAND_CONF}
 	@${CP} ${WRKDIR}/merge-config.sh ${MERGE_CONFIG_BIN}
 
 ossec-rules:
 .if ${OSSEC_TYPE} != agent
 . for file_name in ${RULES_FILES}
 	@${SED} -e 's|<?xml.*?>||' ${WRKDIR}/rules-${file_name}.xml > ${RULES_DIR}/freebsd_${file_name}_rules.xml
 . endfor
 .endif
 
 ossec-conf-managed:
 .for conf_group in ${CONF_GROUPS}
 . if !empty(${conf_group}_INSTANCE_OPTIONS)
 	@${CAT} ${WRKDIR}/${TEMPL_ENABLED_HEADER} > ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 .  if !empty(${conf_group}_INSTANCE_OPTIONS_ENABLED)
 .   for option in ${${conf_group}_INSTANCE_OPTIONS}
 .    if ${${conf_group}_INSTANCE_OPTIONS_ENABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Enabled ${${option}_OPTION} -->" >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 	@${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${${option}_TEMPLATE} >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 	@${ECHO_CMD} >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 .     endif
 .    endif
 .   endfor
 .  endif
 . endif
 .endfor
 
 ossec-conf-local:
 .for conf_group in ${CONF_GROUPS}
 . if !empty(${conf_group}_INSTANCE_OPTIONS)
 	@${CAT} ${WRKDIR}/${TEMPL_DISABLED_HEADER} > ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 .  if !empty(${conf_group}_INSTANCE_OPTIONS_DISABLED)
 .   for option in ${${conf_group}_INSTANCE_OPTIONS}
 .    if ${${conf_group}_INSTANCE_OPTIONS_DISABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Disabled ${${option}_OPTION} -->" >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 	@${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${${option}_TEMPLATE} >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 	@${ECHO_CMD} >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 .     endif
 .    endif
 .   endfor
 .  endif
 . endif
 .endfor
 
 ossec-conf-sample:
 	@${CAT} ${WRKDIR}/${TEMPL_SAMPLE_HEADER} > ${OSSEC_SAMPLE_CONF}
 	@${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF}
 	@${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE} >> ${OSSEC_SAMPLE_CONF}
 	@${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF}
 	@-${TEST} -f ${WRKDIR}/${TEMPL_SAMPLE_DB} && \
 		${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE_DB} >> ${OSSEC_SAMPLE_CONF} && \
 		${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF}
 
 agent-conf-managed:
 .for conf_group in ${CONF_GROUPS}
 . if !empty(${conf_group}_PUSHED_OPTIONS)
 	@${CAT} ${WRKDIR}/${TEMPL_PUSHED_ENABLED_HEADER} > ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 .  if !empty(${conf_group}_PUSHED_OPTIONS_ENABLED)
 .   for option in ${${conf_group}_PUSHED_OPTIONS}
 .    if ${${conf_group}_PUSHED_OPTIONS_ENABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Enabled ${${option}_OPTION}_P -->" >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 	@${SH} ${TEMPL_TO_AGENT} ${WRKDIR}/${${option}_TEMPLATE} >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 	@${ECHO_CMD} >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 .     endif
 .    endif
 .   endfor
 .  endif
 . endif
 .endfor
 
 agent-conf-local:
 .for conf_group in ${CONF_GROUPS}
 . if !empty(${conf_group}_PUSHED_OPTIONS)
 	@${CAT} ${WRKDIR}/${TEMPL_PUSHED_DISABLED_HEADER} > ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 .  if !empty(${conf_group}_PUSHED_OPTIONS_DISABLED)
 .   for option in ${${conf_group}_PUSHED_OPTIONS}
 .    if ${${conf_group}_PUSHED_OPTIONS_DISABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Disabled ${${option}_OPTION}_P -->" >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 	@${SH} ${TEMPL_TO_AGENT} ${WRKDIR}/${${option}_TEMPLATE} >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 	@${ECHO_CMD} >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 .     endif
 .    endif
 .   endfor
 .  endif
 . endif
 .endfor
 
 do-install: ossec-dirs ossec-scripts ossec-rules ossec-conf-managed ossec-conf-local ossec-conf-sample agent-conf-managed agent-conf-local
 
 ossec-permissions:
 .if defined(MAINTAINER_MODE)
 	@${CHMOD} -R 550 ${OSSEC_DIR}
 	@${CHMOD} 640 ${COMMAND_CONF} ${OSSEC_LOCAL_CONF_DIR}/* ${OSSEC_CONF_DIR}/*
 	@${CHMOD} 550 ${OSSEC_LOCAL_CONF_DIR} ${OSSEC_CONF_DIR}
 . if ${OSSEC_TYPE} != agent
 	@${CHMOD} 640 ${RULES_DIR}/*
 . endif
 . if ${OSSEC_TYPE} == server
 	@${CHMOD} 640 ${AGENT_LOCAL_CONF_DIR}/* ${AGENT_CONF_DIR}/*
 	@${CHMOD} 550 ${AGENT_LOCAL_CONF_DIR} ${AGENT_CONF_DIR}
 . endif
 	@${CHOWN} -R ${USER}:${OSSEC_GROUP} ${OSSEC_DIR}
 	@${CHOWN} -R ${USER}:${GROUP} ${BIN_DIR}
 .endif
 
 post-install: ossec-permissions
 	@${ECHO_CMD} -n > ${PKGMESSAGE}
 .for file_name in ${PKGMSG_FILES}
 	@${CAT} ${WRKDIR}/${file_name} >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 .endfor
 
 .if defined(MAINTAINER_MODE)
 plist: makeplist
 	@${SH} ${SCRIPTDIR}/plist.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${PLIST} ${WRKDIR} ${STAGEDIR}
 
 rules: extract
 	@${SH} ${SCRIPTDIR}/rules.sh ${FILESDIR}/${RULES_DEFAULT_TEMPLATE}.in ${WRKSRC}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/ossec-hids-local-config/files/agent-conf.in b/security/ossec-hids-local-config/files/agent-conf.in
index 673d0f668631..a1da79d894b5 100644
--- a/security/ossec-hids-local-config/files/agent-conf.in
+++ b/security/ossec-hids-local-config/files/agent-conf.in
@@ -1,33 +1,33 @@
 #!/bin/sh
 
 ossec_type="%%OSSEC_TYPE%%"
 ossec_home="%%OSSEC_HOME%%"
 
 agent_conf_dir="${ossec_home}/etc/agent.conf.d"
 agent_conf_files="${agent_conf_dir}/*.conf"
 
 select_elements() {
     local element="$1"
-    sed -n "/<${element}.*>/,/<\/${element}>/p"
+    sed -En "/<${element}.*>/,/<\/${element}>/p"
 }
 
 remove_comments() {
     # Comments must be on separate lines i.e. not next to uncommented code
     awk '/<!--/ {off=1} /-->/ {off=2} /([\s\S]*)/ {if (off==0) print; if (off==2) off=0}'
 }
 
 remove_empty_lines() {
-    sed '/^\s*$/d'
+    sed -E '/^[[:space:]]*$/d'
 }
 
 agent_conf() {
 
     echo "<!-- OSSEC HIDS %%VERSION%% -->"
     echo
     echo "<!-- DO NOT EDIT - file generated automatically - edit \"agent.conf.d/900.local.conf\" instead -->"
     echo
 
     cat $@ | remove_comments | select_elements "agent_config" | remove_empty_lines
 }
 
 agent_conf "${agent_conf_files}"
diff --git a/security/ossec-hids-local-config/files/ossec-conf.in b/security/ossec-hids-local-config/files/ossec-conf.in
index d28d238bc212..1afdb5466774 100644
--- a/security/ossec-hids-local-config/files/ossec-conf.in
+++ b/security/ossec-hids-local-config/files/ossec-conf.in
@@ -1,60 +1,60 @@
 #!/bin/sh
 
 ossec_type="%%OSSEC_TYPE%%"
 ossec_home="%%OSSEC_HOME%%"
 
 ossec_conf_dir="${ossec_home}/etc/ossec.conf.d"
 ossec_conf_files="${ossec_conf_dir}/*.conf"
 
 select_elements_content() {
     local element="$1"
-    sed -n "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }"
+    sed -En "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }"
 }
 
 remove_elements() {
     local element="$1"
-    sed -e "/<${element}>/,/<\/${element}>/d"
+    sed -E "/<${element}>/,/<\/${element}>/d"
 }
 
 remove_comments() {
     # Comments must be on separate lines i.e. not next to uncommented code
     awk '/<!--/ {off=1} /-->/ {off=2} /([\s\S]*)/ {if (off==0) print; if (off==2) off=0}'
 }
 
 remove_empty_lines() {
-    sed '/^\s*$/d'
+    sed -E '/^[[:space:]]*$/d'
 }
 
 ossec_conf() {
     echo "<!-- OSSEC HIDS %%VERSION%% -->"
     echo
     echo "<!-- DO NOT EDIT - file generated automatically - edit \"ossec.conf.d/900.local.conf\" instead -->"
     echo
     echo "<ossec_config>"
 
     if [ "${ossec_type}" != "agent"  ]; then
         if cat $@ | remove_comments | grep -q "<rules>"; then
             echo "  <rules>"
             cat $@ | remove_comments | select_elements_content "rules" | remove_empty_lines
             echo "  </rules>"
         fi
     fi
 
     if cat $@ | remove_comments | grep -q "<rootcheck>"; then
         echo "  <rootcheck>"
         cat $@ | remove_comments | select_elements_content "rootcheck" | remove_empty_lines
         echo "  </rootcheck>"
     fi
 
     if cat $@ | remove_comments | grep -q "<syscheck>"; then
         echo "  <syscheck>"
         cat $@ | remove_comments | select_elements_content "syscheck" | remove_empty_lines
         echo "  </syscheck>"
     fi
 
     cat $@ | remove_comments | select_elements_content "ossec_config" | remove_elements "rules" | remove_elements "rootcheck" |  remove_elements "syscheck" | remove_empty_lines
 
     echo "</ossec_config>"
 }
 
 ossec_conf "${ossec_conf_files}"
diff --git a/security/ossec-hids-local-config/scripts/plist.sh b/security/ossec-hids-local-config/scripts/plist.sh
index b1915c47ce7b..07fbcd5d4097 100644
--- a/security/ossec-hids-local-config/scripts/plist.sh
+++ b/security/ossec-hids-local-config/scripts/plist.sh
@@ -1,97 +1,97 @@
 #!/bin/sh
 
 # Script generates entries for pkg-plist.
 # Do not use it directly. Use the following command instead:
 #
 # make MAINTAINER_MODE=yes clean plist
 
 OSSEC_TYPE=$1
 OSSEC_HOME=$2
 PLIST=$3
 WORKDIR=$4
 STAGEDIR=$5
 
 . $(dirname "$0")/plist.conf
 
 NL=$'\n'
 IFS=${NL}
 
 print_path() {
     local path="$1"
     local command="$2"
     local full_path="${STAGEDIR}${OSSEC_HOME}${path}"
     if [ -z "${command}" ]; then
         command="@"
         if [ -d "${full_path}" ]; then
             command="@dir"
         fi
     fi
     local user=`stat -f "%Su" "${full_path}"`
     if [ "${user}" = "${USER}" ]; then
         user=""
     fi
     local group=`stat -f "%Sg" "${full_path}"`
     if [ "${group}" = "${GROUP}" ]; then
         group=""
     fi
     local mode=`stat -f "%p" "${full_path}" | tail -c 5`
     echo "${command}(${user},${group},${mode}) %%OSSEC_HOME%%${path}" >> "${PLIST}"
 }
 
 contains() {
     local list="$1"
     local word="$2"
 
     for e in ${list}; do
         if [ "${e}" = "${word}" ]; then
             return 0
         fi
     done
 
     return 1
 }
 
 echo -n > "${PLIST}"
 
 print_path
 
 done_paths=""
 while read line; do
     if ! contains "${skip_lines}" "${line}"; then
         path=""
         case ${line} in
             "@dir %%OSSEC_HOME%%"*)
-                path=`echo "${line}" | sed -e "s|@dir %%OSSEC_HOME%%||g"`
+                path=`echo "${line}" | sed -E 's|@dir %%OSSEC_HOME%%||g'`
                 ;;
             "%%OSSEC_HOME%%"*)
-                path=`echo "${line}" | sed -e "s|%%OSSEC_HOME%%||g"`
+                path=`echo "${line}" | sed -E 's|%%OSSEC_HOME%%||g'`
                 ;;
             "%%"*)
                 unchanged_lines="${unchanged_lines}${NL}${line}"
                 ;;
         esac
         if [ -n "${path}" ]; then
             segments=`echo "${path}" | tr "/" "\n"`
             path=""
             for segment in ${segments}; do
                 path="${path}/${segment}"
                 if contains "${skip_paths}" "${path}"; then
                     break
                 fi
                 if ! contains "${done_paths}" "${path}"; then
                     done_paths="${done_paths}${NL}${path}"
                     if contains "${sample_paths}" "${path}"; then
                         print_path "${path}" @sample
                     else
                         print_path "${path}"
                     fi
                 fi
             done
         fi
     fi
 done < "${WORKDIR}/.staged-plist"
 
 unchanged_lines="${unchanged_lines}${NL}${fixed_lines}"
 for line in ${unchanged_lines}; do
     echo "${line}" >> "${PLIST}"
 done
diff --git a/security/ossec-hids-local-config/scripts/template-to-agent.sh b/security/ossec-hids-local-config/scripts/template-to-agent.sh
index 3034b1fe1254..7c11b820f646 100644
--- a/security/ossec-hids-local-config/scripts/template-to-agent.sh
+++ b/security/ossec-hids-local-config/scripts/template-to-agent.sh
@@ -1,33 +1,34 @@
 #!/bin/sh
 
 if [ $# -lt 3 ]; then
     echo "Too few arguments"
     echo "Usage: `basename $0` <ossec_type> <ossec_prefix> <ossec_file>"
     exit 1
 fi
 
 ossec_type="$1"
 ossec_prefix="$2"
 ossec_file="$3"
 
 if [ ! -f "${ossec_file}" ]; then
     echo "File \"${ossec_file}\" does not exist"
     exit 1
 fi
 
 ossec_syscheck_bin_dirs="${ossec_prefix}/bin,${ossec_prefix}/active-response"
 ossec_syscheck_etc_dirs="${ossec_prefix}/etc"
 
 replace() {
-    sed -e 's|<template_config \(.*\)>|<agent_config \1>|' \
+    sed -E \
+        -e 's|<template_config (.*)>|<agent_config \1>|' \
         -e 's|</template_config>|</agent_config>|' \
         -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \
         -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \
         "${ossec_file}"
 }
 
 extract() {
-    sed -n '/^<agent_config .*>$/,/^<\/agent_config>$/p'
+    sed -En '/^<agent_config .*>$/,/^<\/agent_config>$/p'
 }
 
 replace | extract
diff --git a/security/ossec-hids-local-config/scripts/template-to-ossec.sh b/security/ossec-hids-local-config/scripts/template-to-ossec.sh
index 39334462a987..5ad322893370 100644
--- a/security/ossec-hids-local-config/scripts/template-to-ossec.sh
+++ b/security/ossec-hids-local-config/scripts/template-to-ossec.sh
@@ -1,45 +1,47 @@
 #!/bin/sh
 
 if [ $# -lt 3 ]; then
     echo "Too few arguments"
     echo "Usage: `basename $0` <ossec_type> <ossec_prefix> <ossec_file>"
     exit 1
 fi
 
 ossec_type="$1"
 ossec_prefix="$2"
 ossec_file="$3"
 
 if [ ! -f "${ossec_file}" ]; then
     echo "File \"${ossec_file}\" does not exist"
     exit 1
 fi
 
 ossec_syscheck_bin_dirs="${ossec_prefix}/bin,${ossec_prefix}/active-response"
 ossec_syscheck_etc_dirs="${ossec_prefix}/etc"
 if [ "${ossec_type}" != "agent" ]; then
     ossec_syscheck_bin_dirs="${ossec_syscheck_bin_dirs},${ossec_prefix}/agentless"
     ossec_syscheck_etc_dirs="${ossec_syscheck_etc_dirs},${ossec_prefix}/rules"
 fi
 
 replace() {
     if grep -q "<template_config>" "${ossec_file}"; then
-        sed -e 's|<template_config>|<ossec_config>|' \
+        sed -E \
+            -e 's|<template_config>|<ossec_config>|' \
             -e 's|</template_config>|</ossec_config>|' \
             -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \
             -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \
             "${ossec_file}"
     else
-        sed -e 's|<template_config .*os="FreeBSD".*>|<ossec_config>|' \
+        sed -E \
+            -e 's|<template_config .*os="FreeBSD".*>|<ossec_config>|' \
             -e 's|</template_config>|</ossec_config>|' \
             -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \
             -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \
             "${ossec_file}"
     fi
 }
 
 extract() {
-    sed -n '/^<ossec_config.*>$/,/^<\/ossec_config>$/p'
+    sed -En '/^<ossec_config.*>$/,/^<\/ossec_config>$/p'
 }
 
 replace | extract
diff --git a/security/ossec-hids-local/files/ossec-hids.in b/security/ossec-hids-local/files/ossec-hids.in
index 6c580f268b37..87783766b839 100644
--- a/security/ossec-hids-local/files/ossec-hids.in
+++ b/security/ossec-hids-local/files/ossec-hids.in
@@ -1,548 +1,548 @@
 #!/bin/sh
 #
 # PROVIDE: ossec_hids
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
 # KEYWORD: shutdown
 
 # ossec_hids_enable (bool):             Set it to YES to enable %%PORTNAME%%.
 #                                       Default: NO
 # ossec_hids_clear_log (bool):          Set it to YES to clear ossec.log before %%PORTNAME%% startup.
 #                                       Default: NO
 # ossec_hids_clear_ar_log (bool):       Set it to YES to clear active-responses.log before %%PORTNAME%% startup.
 #                                       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: 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
 
 . /etc/rc.subr
 
 name="ossec_hids"
 rcvar=ossec_hids_enable
 
 load_rc_config $name
 
 : ${ossec_hids_enable="NO"}
 : ${ossec_hids_clear_log="NO"}
 : ${ossec_hids_clear_ar_log="NO"}
 : ${ossec_hids_fetch_connect_time=40}
 : ${ossec_hids_fetch_read_time=10}
 
 ossec_type="%%OSSEC_TYPE%%"
 ossec_home="%%OSSEC_HOME%%"
 
 if [ -z "${ossec_hids_user}" ]; then
     ossec_hids_user=$(stat -f '%Su' "${ossec_home}")
 fi
 
 ossec_conf="${ossec_home}/etc/ossec.conf"
 ossec_conf_dir="${ossec_home}/etc/ossec.conf.d"
 ossec_conf_bin="${ossec_home}/bin/config/ossec-conf"
 
 agent_conf="${ossec_home}/etc/shared/agent.conf"
 agent_conf_dir="${ossec_home}/etc/agent.conf.d"
 agent_conf_bin="${ossec_home}/bin/config/agent-conf"
 
 ossec_client_keys="${ossec_home}/etc/client.keys"
 ossec_ar_tmp="${ossec_home}/active-response"
 ossec_log="${ossec_home}/logs/ossec.log"
 ossec_ar_log="${ossec_home}/logs/active-responses.log"
 ossec_merged="${ossec_home}/etc/shared/merged.mg"
 
 ossec_local_time="/etc/localtime"
 ossec_resolv_conf="/etc/resolv.conf"
 
 extra_commands="help status reload ossec_conf"
 case ${ossec_type} in
     server)
         extra_commands="${extra_commands} agent_conf manage_agent reset_counter"
         ;;
     agent)
         extra_commands="${extra_commands} agent_conf manage_agent reset_counter config_profile fetch_config"
         ;;
 esac
 if [ -x "${ossec_conf_bin}" ]; then
     extra_commands="${extra_commands} merge_config"
 fi
 
 ossec_rc_command=$1
 shift 1
 
 help_cmd="ossec_hids_help $@"
 start_cmd="ossec_hids_command start $@"
 stop_cmd="ossec_hids_command stop $@"
 restart_cmd="ossec_hids_command restart $@"
 status_cmd="ossec_hids_command status $@"
 reload_cmd="ossec_hids_command reload $@"
 manage_agent_cmd="ossec_hids_manage_agent $@"
 reset_counter_cmd="ossec_hids_reset_counter $@"
 config_profile_cmd="ossec_hids_config_profile $@"
 fetch_config_cmd="ossec_hids_fetch_config $@"
 merge_config_cmd="ossec_hids_create_config force $@"
 ossec_conf_cmd="ossec_hids_ossec_conf $@"
 agent_conf_cmd="ossec_hids_agent_conf $@"
 
 start_precmd="ossec_hids_create_env && ossec_hids_create_config && ossec_hids_clean && ossec_hids_check"
 restart_precmd="${start_precmd}"
 reload_precmd="ossec_hids_create_env && ossec_hids_create_config"
 config_profile_precmd="ossec_hids_check"
 fetch_config_precmd="${start_precmd}"
 
 agent_ids_cmd="${ossec_home}/bin/manage_agents -l | sed -En -e 's|.*ID:[[:space:]]*([[:digit:]]+).*|\1|p'"
 agent_names_cmd="${ossec_home}/bin/manage_agents -l | sed -En -e 's|.*Name:[[:space:]]*([^,]+).*|\1|p'"
 
 ossec_hids_help() {
     local indent="    "
 
     echo "Additional commands:"
     echo
 
     for command in ${extra_commands}; do
         case ${command} in
             ossec_conf)
                 echo "${command}"
                 if [ -x "${ossec_conf_bin}" ]; then
                     echo "${indent}Displays the \"ossec.conf\" as it would have been produced"
                     echo "${indent}by merging files from \"ossec.conf.d\" directory."
                     echo "${indent}Does not overwrite the actual \"ossec.conf\"."
                 else
                     echo "${indent}Displays the current \"ossec.conf\"."
                 fi
                 echo
             ;;
             agent_conf)
                 echo "${command}"
                 if [ -x "${agent_conf_bin}" ]; then
                     echo "${indent}Displays the \"agent.conf\" as it would have been produced"
                     echo "${indent}by merging files from \"agent.conf.d\" directory."
                     echo "${indent}Does not overwrite the actual \"agent.conf\"."
                 else
                     echo "${indent}Displays the current \"agent.conf\"."
                 fi
                 echo
             ;;
             manage_agent)
                 echo "${command} [...]"
                 echo "${indent}Executes OSSEC Agent Manager."
                 echo "${indent}Any additional arguments will be passed along (-h for help)."
                 echo "${indent}Use this command to export and import agent keys."
                 echo
             ;;
             reset_counter)
                 case ${ossec_type} in
                     server)
                         echo "${command} <agent_name>"
                         echo "${indent}Stops the OSSEC and resets (removes) the replay attack prevention counter(s)."
                         echo "${indent}Only the counter for the given <agent_name> is reset."
                         echo "${indent}If the <agent_name> is \"-\", then counters for all agents are reset."
                     ;;
                     agent)
                         echo "${command}"
                         echo "${indent}Stops the OSSEC and resets (removes) the replay attack prevention counter."
                     ;;
                 esac
                 echo "${indent}Use this command on both the server and the agent to bring back connectivity."
                 echo "${indent}The typical scenario for desynchronization of counters is one of the OSSEC"
                 echo "${indent}instances has been restored from backup."
                 echo "${indent}Use the following procedure:"
                 echo "${indent}1. Reset counter on the agent."
                 echo "${indent}2. Reset counter on the server for that specific agent."
                 echo "${indent}3. Start the server."
                 echo "${indent}4. Start the agent."
                 echo
             ;;
             config_profile)
                 echo "${command}"
                 echo "${indent}Displays a list (i.e. union of sets) of applicable (to this agent) configuration"
                 echo "${indent}profiles sent by the server (current \"agent.conf\") merged with configuration"
                 echo "${indent}profiles enabled on this agent (current \"ossec.conf\"). Each entry on the list"
                 echo "${indent}is marked with one of the following markers:"
                 echo "${indent}(+) - The profile is sent by the server and is enabled on this agent."
                 echo "${indent}(-) - The profile is sent by the server and is applicable for this agent, but is"
                 echo "${indent}      not enabled in the \"ossec.conf\"."
                 echo "${indent}(?) - The profile is enabled on this agent, but is not sent by the server or is"
                 echo "${indent}      not applicable to this agent."
                 echo
             ;;
             fetch_config)
                 echo "${command}"
                 echo "${indent}(Re)starts the agent with a fresh copy of server shared configuration (including"
                 echo "${indent}\"agent.conf\"). Command can also be used to ensure server connectivity."
                 echo
             ;;
             merge_config)
                 echo "${command}"
                 echo "${indent}Creates \"ossec.conf\" by merging files from \"ossec.conf.d\" directory."
                 case ${ossec_type} in
                     server)
                         echo "${indent}Creates \"agent.conf\" by merging files from \"agent.conf.d\" directory."
                     ;;
                 esac
                 echo "${indent}Usually you do not need to run this command, because configuration files will"
                 echo "${indent}be merged before OSSEC startup if any of them has been modified/created/deleted"
                 echo "${indent}since the last merging. This command, however, does merging unconditionally."
                 echo
             ;;
         esac
     done
 
     echo "To avoid problems with this script and the port in general, keep your XML-like"
     echo "configuration pretty printed. Place element tags in single and separate lines."
     echo "Comments can span on multiple but still separate lines."
     echo "Do NOT use the following formatting:"
     echo
     echo "${indent}<elementA"
     echo "${indent}${indent}attribute=\"value\"><!-- I am a long and"
     echo "${indent}${indent}${indent}descriptive comment -->"
     echo "${indent}${indent}<elementB>"
     echo "${indent}${indent}${indent}Some content"
     echo "${indent}${indent}</elementB><elementC>"
     echo "${indent}${indent}${indent}Another content</elementC>"
     echo "${indent}</elementA>"
     echo
     echo "Use instead:"
     echo
     echo "${indent}<elementA attribute=\"value\">"
     echo "${indent}${indent}<!-- I am a long and"
     echo "${indent}${indent}descriptive comment -->"
     echo "${indent}${indent}<elementB>Some content</elementB>"
     echo "${indent}${indent}<elementC>Another content</elementC>"
     echo "${indent}</elementA>"
     echo
 }
 
 ossec_hids_create_file() {
     local path=$1
     local owner=$2
     local mode=$3
 
     if [ ! -e "${path}" ]; then
         touch "${path}" && chown ${owner} "${path}" && chmod ${mode} "${path}"
     fi
 }
 
 ossec_hids_check() {
     case ${ossec_type} in
         server)
             if [ ! -s "${ossec_client_keys}" ]; then
                 echo "WARNING: There are no client keys created - remote connections will be disabled."
                 echo
             fi
             ;;
         agent)
             if [ ! -s "${ossec_client_keys}" ]; then
                 echo "WARNING: There are is no client key imported - connection to server not possible."
                 echo
             else
                 if [ $(eval ${agent_ids_cmd} | wc -l) -gt 1 ]; then
                     echo "ERROR: There are multiple client keys imported - only one is allowed."
                     echo
                     return 1
                 fi
             fi
             ;;
     esac
 
     return 0
 }
 
 ossec_hids_inline_content() {
     local element="$1"
     sed -En "s|.*<${element}>(.*)</${element}>.*|\1|p"
 }
 
 ossec_hids_remove_comments() {
     # Comments must be on separate lines i.e. not next to uncommented code
     awk '/<!--/ {off=1} /-->/ {off=2} /([\s\S]*)/ {if (off==0) print; if (off==2) off=0}'
 }
 
 ossec_hids_config_profile() {
     if [ ! -f "${ossec_conf}" ]; then
         echo -n "ERROR: The \"${ossec_conf}\" is missing."
         if [ -x "${ossec_conf_bin}" ]; then
             echo " Run:"
             echo "$(realpath $0) merge_config"
         else
             echo
         fi
         echo
         return 1
     fi
     if [ ! -f "${agent_conf}" ]; then
         echo "ERROR: The \"${agent_conf}\" is missing. Run:"
         echo "$(realpath $0) fetch_config"
         echo
         return 1
     fi
 
     local os="FreeBSD"
     local name=$(eval ${agent_names_cmd})
 
     local server_profiles=`ossec_hids_remove_comments < "${agent_conf}" | sed -En \
         -e "s|.*<agent_config[[:space:]]+profile=\"([^\"]+)\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+profile=\"([^\"]+)\"[[:space:]]+os=\"${os}\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+os=\"${os}\"[[:space:]]+profile=\"([^\"]+)\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+profile=\"([^\"]+)\"[[:space:]]+name=\"${name}\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+name=\"${name}\"[[:space:]]+profile=\"([^\"]+)\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+profile=\"([^\"]+)\"[[:space:]]+os=\"${os}\"[[:space:]]+name=\"${name}\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+profile=\"([^\"]+)\"[[:space:]]+name=\"${name}\"[[:space:]]+os=\"${os}\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+os=\"${os}\"[[:space:]]+profile=\"([^\"]+)\"[[:space:]]+name=\"${name}\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+os=\"${os}\"[[:space:]]+name=\"${name}\"[[:space:]]+profile=\"([^\"]+)\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+name=\"${name}\"[[:space:]]+profile=\"([^\"]+)\"[[:space:]]+os=\"${os}\"[[:space:]]*>.*|\1|p" \
         -e "s|.*<agent_config[[:space:]]+name=\"${name}\"[[:space:]]+os=\"${os}\"[[:space:]]+profile=\"([^\"]+)\"[[:space:]]*>.*|\1|p" \
         | sort -u`
 
     local agent_profiles=$(ossec_hids_remove_comments < "${ossec_conf}" | ossec_hids_inline_content "config-profile" | sed -E 's|[[:space:]]*,[[:space:]]*| |g')
 
     local output=""
     for server_profile in ${server_profiles}; do
         local matching_profile=""
         for agent_profile in ${agent_profiles}; do
             if [ "${agent_profile}" == "${server_profile}" ]; then
                 matching_profile="${agent_profile}"
                 break
             fi
         done
         if [ -n "${matching_profile}" ]; then
             output="${output}(+) ${server_profile}
 "
         else
             output="${output}(-) ${server_profile}
 "
         fi
     done
     for agent_profile in ${agent_profiles}; do
         local matching_profile=""
         for server_profile in ${server_profiles}; do
             if [ "${server_profile}" == "${agent_profile}" ]; then
                 matching_profile="${server_profile}"
                 break
             fi
         done
         if [ -z "${matching_profile}" ]; then
             output="${output}(?) ${agent_profile}
 "
         fi
     done
 
     echo -n "${output}" | sort -k 2
 }
 
 ossec_hids_config_is_outdated() {
     local dst_file="$1"
     local src_dir="$2"
 
     if [ ! -e "${dst_file}" ]; then
         return 0
     fi
 
     if [ "${src_dir}" -nt "${dst_file}" ]; then
         return 0
     fi
 
     for src_file in $(find "${src_dir}" -maxdepth 1 -type f -name "*.conf"); do
         if [ "${src_file}" -nt "${dst_file}" ]; then
             return 0
         fi
     done
 
     return 1
 }
 
 ossec_hids_create_config() {
     case ${ossec_type} in
         server)
             if [ -x "${agent_conf_bin}" ]; then
                 # Merge agent.conf.d files into agent.conf
                 if [ "$1" == "force" ] || ossec_hids_config_is_outdated "${agent_conf}" "${agent_conf_dir}"; then
                     ossec_hids_create_file "${agent_conf}" ${ossec_hids_user}:%%OSSEC_GROUP%% 0640
                     "${agent_conf_bin}" > "${agent_conf}"
                 fi
             fi
             ;;
     esac
 
     if [ -x "${ossec_conf_bin}" ]; then
         # Merge ossec.conf.d files into ossec.conf
         if [ "$1" == "force" ] || ossec_hids_config_is_outdated "${ossec_conf}" "${ossec_conf_dir}"; then
             ossec_hids_create_file "${ossec_conf}" ${ossec_hids_user}:%%OSSEC_GROUP%% 0640
             "${ossec_conf_bin}" > "${ossec_conf}"
         fi
     fi
 
     return 0
 }
 
 ossec_hids_create_env() {
     # Copy required files from outside of home directory
     if [ ! -e "${ossec_local_time}" ]; then
         echo "ERROR: Missing \"${ossec_local_time}\". Run command \"tzsetup\"."
         echo
         return 1
     fi
     if [ ! -e "${ossec_resolv_conf}" ]; then
         echo "ERROR: Missing \"${ossec_resolv_conf}\"."
         echo
         return 1
     fi
     install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_local_time}" "${ossec_home}${ossec_local_time}"
     install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_resolv_conf}" "${ossec_home}${ossec_resolv_conf}"
 
     return 0
 }
 
 ossec_hids_clean() {
     if [ "${ossec_type}" == "server" ]; then
         rm -f "${ossec_merged}"
     fi
 
     if checkyesno ossec_hids_clear_log && [ -e "${ossec_log}" ]; then
         echo -n > "${ossec_log}"
     fi
 
     if checkyesno ossec_hids_clear_ar_log && [ -e "${ossec_ar_log}" ]; then
         echo -n > "${ossec_ar_log}"
     fi
 
     return 0
 }
 
 ossec_hids_reset_counter() {
     local agent_name="$1"
 
     ossec_hids_command stop
     sleep 1
     echo
 
     case ${ossec_type} in
         server)
             if [ -z "${agent_name}" ]; then
                 echo "ERROR: Specify agent name to reset counter for this agent or \"-\" to reset counters for all agents."
                 echo
                 return 1
             fi
             local agent_counter=0
             if [ "${agent_name}" == "-" ]; then
                 for agent_id in $(eval ${agent_ids_cmd}); do
                     if [ -e "${ossec_home}/queue/rids/${agent_id}" ]; then
                         rm "${ossec_home}/queue/rids/${agent_id}" && agent_counter=$((agent_counter + 1))
                     fi
                 done
             else
                 local agent_id=`${ossec_home}/bin/manage_agents -l | sed -En -e "s|.*ID:[[:space:]]*([[:digit:]]+),[[:space:]]*Name:[[:space:]]${agent_name},.*|\1|p"`
                 if [ -n "${agent_id}" ]; then
                     if [ -e "${ossec_home}/queue/rids/${agent_id}" ]; then
                         rm "${ossec_home}/queue/rids/${agent_id}" && agent_counter=$((agent_counter + 1))
                     fi
                 fi
             fi
             echo "Removed ${agent_counter} counter(s)."
             echo
             ;;
         agent)
             local agent_counter=0
             for agent_id in $(eval ${agent_ids_cmd}); do
                 # Should be executed only once
                 if [ -e "${ossec_home}/queue/rids/${agent_id}" ]; then
                     rm "${ossec_home}/queue/rids/${agent_id}" && agent_counter=$((agent_counter + 1))
                 fi
             done
             echo "Removed ${agent_counter} counter(s)."
             echo
             ;;
     esac
 
     return 0
 }
 
 ossec_hids_fetch_config() {
     ossec_hids_command stop
     sleep 1
     echo
     rm -f "${ossec_merged}"
     ossec_hids_command start || return 1
     echo
     echo "Waiting ${ossec_hids_fetch_connect_time} seconds for the shared configuration download to start."
     sleep ${ossec_hids_fetch_connect_time}
     if [ ! -s "${ossec_merged}" ]; then
         echo "ERROR: Failed to download shared configuration from the OSSEC server."
         echo
         local ossec_log_tail=$(tail "${ossec_log}")
         echo "Portion of the \"${ossec_log}\":"
         echo "${ossec_log_tail}"
         echo
         if echo "${ossec_log_tail}" | grep -q "ERROR: Unable to send message to"; then
             echo "Check if your configuration contains the correct server address in \"server-ip\" option."
             echo
         else
             local ossec_rc_path="$(realpath $0)"
             echo "Is the imported agent key correct? To import it run:"
             echo "${ossec_rc_path} manage_agent"
             echo
             echo "If you are certain the imported agent key is correct, then run:"
             echo "${ossec_rc_path} reset_counter"
             echo "${ossec_rc_path} fetch_config"
             echo
-            echo "If this does't help, you need to reset counter on the server."
+            echo "If this doesn't help, you need to reset counter on the server."
             echo "If the server runs FreeBSD port of OSSEC, run:"
             echo "On the agent:"
             echo "${ossec_rc_path} reset_counter"
             echo "On the server:"
             echo "${ossec_rc_path} reset_counter $(eval ${agent_names_cmd})"
             echo "${ossec_rc_path} start"
             echo "On the agent:"
             echo "${ossec_rc_path} fetch_config"
             echo
         fi
         ossec_hids_command stop
         return 1
     else
         # The download has started
         while true; do
             local current_time=$(date +%s)
             local modification_time=$(stat -f %m "${ossec_merged}")
             if [ $((current_time - modification_time)) -gt ${ossec_hids_fetch_read_time} ]; then
                 echo "Download finished."
                 echo
                 ossec_hids_command restart || return 1
                 break;
             else
                 echo "Download in progress..."
                 sleep ${ossec_hids_fetch_read_time}
             fi
         done
     fi
 
     return 0
 }
 
 ossec_hids_ossec_conf() {
     if [ -x "${ossec_conf_bin}" ]; then
         "${ossec_conf_bin}"
     elif [ -f "${ossec_conf}" ]; then
         cat "${ossec_conf}"
     fi
 }
 
 ossec_hids_agent_conf() {
     if [ -x "${agent_conf_bin}" ]; then
         "${agent_conf_bin}"
     elif [ -f "${agent_conf}" ]; then
         cat "${agent_conf}"
     fi
 }
 
 ossec_hids_manage_agent() {
     "${ossec_home}/bin/manage_agents" $@
     return $?
 }
 
 ossec_hids_command() {
     "${ossec_home}/bin/ossec-control" $1
     return $?
 }
 
 run_rc_command "${ossec_rc_command}"
diff --git a/security/ossec-hids-local/scripts/plist.sh b/security/ossec-hids-local/scripts/plist.sh
index b1915c47ce7b..07fbcd5d4097 100644
--- a/security/ossec-hids-local/scripts/plist.sh
+++ b/security/ossec-hids-local/scripts/plist.sh
@@ -1,97 +1,97 @@
 #!/bin/sh
 
 # Script generates entries for pkg-plist.
 # Do not use it directly. Use the following command instead:
 #
 # make MAINTAINER_MODE=yes clean plist
 
 OSSEC_TYPE=$1
 OSSEC_HOME=$2
 PLIST=$3
 WORKDIR=$4
 STAGEDIR=$5
 
 . $(dirname "$0")/plist.conf
 
 NL=$'\n'
 IFS=${NL}
 
 print_path() {
     local path="$1"
     local command="$2"
     local full_path="${STAGEDIR}${OSSEC_HOME}${path}"
     if [ -z "${command}" ]; then
         command="@"
         if [ -d "${full_path}" ]; then
             command="@dir"
         fi
     fi
     local user=`stat -f "%Su" "${full_path}"`
     if [ "${user}" = "${USER}" ]; then
         user=""
     fi
     local group=`stat -f "%Sg" "${full_path}"`
     if [ "${group}" = "${GROUP}" ]; then
         group=""
     fi
     local mode=`stat -f "%p" "${full_path}" | tail -c 5`
     echo "${command}(${user},${group},${mode}) %%OSSEC_HOME%%${path}" >> "${PLIST}"
 }
 
 contains() {
     local list="$1"
     local word="$2"
 
     for e in ${list}; do
         if [ "${e}" = "${word}" ]; then
             return 0
         fi
     done
 
     return 1
 }
 
 echo -n > "${PLIST}"
 
 print_path
 
 done_paths=""
 while read line; do
     if ! contains "${skip_lines}" "${line}"; then
         path=""
         case ${line} in
             "@dir %%OSSEC_HOME%%"*)
-                path=`echo "${line}" | sed -e "s|@dir %%OSSEC_HOME%%||g"`
+                path=`echo "${line}" | sed -E 's|@dir %%OSSEC_HOME%%||g'`
                 ;;
             "%%OSSEC_HOME%%"*)
-                path=`echo "${line}" | sed -e "s|%%OSSEC_HOME%%||g"`
+                path=`echo "${line}" | sed -E 's|%%OSSEC_HOME%%||g'`
                 ;;
             "%%"*)
                 unchanged_lines="${unchanged_lines}${NL}${line}"
                 ;;
         esac
         if [ -n "${path}" ]; then
             segments=`echo "${path}" | tr "/" "\n"`
             path=""
             for segment in ${segments}; do
                 path="${path}/${segment}"
                 if contains "${skip_paths}" "${path}"; then
                     break
                 fi
                 if ! contains "${done_paths}" "${path}"; then
                     done_paths="${done_paths}${NL}${path}"
                     if contains "${sample_paths}" "${path}"; then
                         print_path "${path}" @sample
                     else
                         print_path "${path}"
                     fi
                 fi
             done
         fi
     fi
 done < "${WORKDIR}/.staged-plist"
 
 unchanged_lines="${unchanged_lines}${NL}${fixed_lines}"
 for line in ${unchanged_lines}; do
     echo "${line}" >> "${PLIST}"
 done