New port: net/frr5 (5.0.1).

PR:		229397
Reported by: 	pi
Sponsored by:	Orange

Fix build with SNMP option.

PR:		228159
Reported by:	pautina@kharkiv.net

Fix crash with gif/tun/gre interface.

PR:		228643
Reported by:	mike@sentex.net

14 files changed, 500 insertions, 3 deletions

diff --git a/net/Makefile b/net/Makefile
index 390390b47aae..d1230bdc5605 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -168,6 +168,7 @@
     SUBDIR += freevrrpd
     SUBDIR += frr3
     SUBDIR += frr4
+    SUBDIR += frr5
     SUBDIR += fspclient
     SUBDIR += fspd
     SUBDIR += fsplib
diff --git a/net/frr3/Makefile b/net/frr3/Makefile
index dd500741a769..16ae47ee7b5f 100644
--- a/net/frr3/Makefile
+++ b/net/frr3/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
-CONFLICTS=	openbgpd openospfd zebra quagga frr4
+CONFLICTS=	openbgpd openospfd zebra quagga frr4 frr5
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FRRouting
diff --git a/net/frr4/Makefile b/net/frr4/Makefile
index c1891e7c2def..25943a8da827 100644
--- a/net/frr4/Makefile
+++ b/net/frr4/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
-CONFLICTS=	openbgpd openospfd zebra quagga frr3
+CONFLICTS=	openbgpd openospfd zebra quagga frr3 frr4
 
 USES=		autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
 		makeinfo python:2.7,build readline
diff --git a/net/frr5/Makefile b/net/frr5/Makefile
new file mode 100644
index 000000000000..99d550d40034
--- /dev/null
+++ b/net/frr5/Makefile
@@ -0,0 +1,86 @@
+# $FreeBSD$
+
+PORTNAME=	frr
+PORTVERSION=	5.0.1
+DISTVERSIONPREFIX=	frr-
+CATEGORIES=	net ipv6
+PKGNAMESUFFIX=	5
+
+MAINTAINER=	olivier@FreeBSD.org
+COMMENT=	IP routing protocol suite including BGP, IS-IS, OSPF and RIP
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	gawk:lang/gawk
+LIB_DEPENDS=	libjson-c.so:devel/json-c
+
+CONFLICTS=	openbgpd openospfd zebra quagga frr3 frr4
+
+USES=		autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
+		makeinfo python:2.7,build readline
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	FRRouting
+
+INFO=		frr
+
+OPTIONS_DEFINE=		FPM LDPD PAM SHELLACCESS TCPSOCKETS VTYSH MANPAGES \
+					MULTIPATH TCMALLOC RPKI SNMP
+OPTIONS_DEFAULT=	VTYSH RPKI FPM MANPAGES
+OPTIONS_SUB=	yes
+
+FPM_DESC=		Enable Forwarding Plane Manager support
+LDPD_DESC=		Build ldpd
+MULTIPATH_DESC=		Enable multipath function
+PAM_DESC=		Use libpam for PAM support in vtysh
+RPKI_DESC=		Add BGP RPKI (RFC 6810) support
+SHELLACCESS_DESC=	Allow users to access shell/telnet/ssh
+SNMP_DESC=		SNMP support
+TCMALLOC_DESC=		Use tcmalloc
+TCPSOCKETS_DESC=	Use TCP/IP sockets for protocol daemons
+VTYSH_DESC=		Build integrated vty shell
+
+USERS=	frr
+GROUPS=	frr frrvty
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+
+# PIM compile but didn't work on FreeBSD
+CONFIGURE_ARGS=	--enable-user=frr \
+		--enable-group=frr \
+		--enable-vty-group=frrvty \
+		--sysconfdir=${ETCDIR} \
+		--localstatedir=/var/run/frr \
+		--disable-nhrpd \
+		--disable-pimd
+
+MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+MANPAGES_CONFIGURE_OFF=	--disable-doc
+SHELLACCESS_CONFIGURE_ENABLE=	shell-access
+FPM_CONFIGURE_ENABLE=		fpm
+PAM_CONFIGURE_WITH=		libpam
+LDPD_CONFIGURE_ENABLE=		ldpd
+MULTIPATH_CONFIGURE_ON=		--enable-multipath=64
+RPKI_CONFIGURE_ENABLE=	rpki
+RPKI_LIB_DEPENDS=		librtr.so:net-mgmt/rtrlib \
+						libssh.so:security/libssh
+TCMALLOC_CONFIGURE_ENABLE=	tcmalloc
+TCMALLOC_LIB_DEPENDS=		libtcmalloc.so:devel/google-perftools
+SNMP_CONFIGURE_ENABLE=		snmp
+SNMP_CFLAGS=	"-std=gnu99"
+SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
+TCPSOCKETS_CONFIGURE_ENABLE=	tcp-zebra
+VTYSH_CONFIGURE_ENABLE=		vtysh
+
+USE_RC_SUBR=	frr watchfrr
+
+post-install:
+	${MKDIR} ${STAGEDIR}/var/run/frr
+
+.include <bsd.port.mk>
diff --git a/net/frr5/distinfo b/net/frr5/distinfo
new file mode 100644
index 000000000000..843c5d744636
--- /dev/null
+++ b/net/frr5/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1530788283
+SHA256 (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14
+SIZE (FRRouting-frr-frr-5.0.1_GH0.tar.gz) = 4360689
diff --git a/net/frr5/files/frr.in b/net/frr5/files/frr.in
new file mode 100644
index 000000000000..20dbdd3248e8
--- /dev/null
+++ b/net/frr5/files/frr.in
@@ -0,0 +1,154 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: frr
+# REQUIRE: netif routing
+# KEYWORD: nojailvnet shutdown
+
+# Add the following line to /etc/rc.conf to enable frr:
+#  frr_enable="YES"
+#
+# You may also wish to use the following variables to fine-tune startup:
+#  frr_flags=""
+#  frr_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"
+#  frr_vysh_boot="YES"
+# Per daemon tuning may be done with daemon_name_flags
+#  zebra_flags="-P 0"
+#  bgpd_flags="-nrP 0" and so on
+# If you want to give the routing deamons a chance to catchup before
+# continueing, set frr_wait_for to a "default" or certain prefix.
+#  frr_wait_for="default"
+# Set the time limit for the wait.
+#  frr_wait_seconds="90"
+#
+# If the frr daemons require additional shared libraries to start,
+# use the following variable to run ldconfig(8) in advance:
+#  frr_extralibs_path="/usr/local/lib ..."
+#
+# This RC script was adapted from the net/quagga port
+
+. /etc/rc.subr
+
+name=frr
+rcvar=$name_enable
+
+start_postcmd=start_postcmd
+stop_postcmd="rm -f $pidfile"
+configtest_cmd=check_config
+extra_commands=configtest
+command_args="-d"
+
+load_rc_config $name
+: ${frr_enable:="NO"}
+: ${frr_flags:=""}
+: ${frr_daemons:="zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"}
+: ${frr_vtysh_boot:="NO"}
+: ${frr_wait_for:=""}
+: ${frr_wait_seconds:="90"}
+
+check_config()
+{
+    echo "Checking $daemon.conf"
+	# pimd doesn't support -C
+	if [ "$daemon" = "pimd" ]; then
+		echo "Ignored"
+	else
+    	$command $daemon_flags -C
+    	result=$?
+    	if [ "$result" -eq "0" ]; then
+			echo "OK"
+    	else
+			echo "FAILED"
+			exit
+    	fi
+	fi
+}
+
+start_postcmd()
+{
+	local waited_for
+	waited_for=0
+	# Wait only when last daemon has started.
+	if [ "${frr_daemons}" = "${frr_daemons% ${name}}" ]; then
+		return;
+	fi
+        if [ -n "${frr_wait_for}" ]; then
+		echo Waiting for ${frr_wait_for} route...
+		while [ ${waited_for} -lt ${frr_wait_seconds} ]; do
+			/sbin/route -n get ${frr_wait_for} >/dev/null 2>&1 && break;
+			waited_for=$((waited_for+1))
+			sleep 1;
+		done
+		[ ${waited_for} -lt ${frr_wait_seconds} ] || echo Giving up...
+	fi
+}
+
+do_cmd()
+{
+	local ret
+	ret=0
+	for daemon in ${frr_daemons}; do
+	    command=%%PREFIX%%/sbin/${daemon}
+	    required_files=%%ETCDIR%%/${daemon}.conf
+	    pidfile=/var/run/frr/${daemon}.pid
+	    if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
+		check_config
+	    fi
+	    if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ]; then
+			continue
+	    fi
+	    if [ ${frr_cmd} = "stop" ] && [ -z $(check_process ${command}) ]; then
+			continue
+	    fi
+	    eval flags=\$\{${daemon}_flags:-\"${frr_flags}\"\}
+	    name=${daemon}
+	    _rc_restart_done=false
+	    run_rc_command "$1" || ret=1
+	done
+	if checkyesno frr_vtysh_boot; then
+	    echo "Booting for integrated-vtysh-config..."
+	    %%PREFIX%%/bin/vtysh -b
+	fi
+	return ${ret}
+}
+
+frr_cmd=$1
+
+case "$1" in
+    force*)
+	frr_cmd=${frr_cmd#force}
+	;;
+    fast*)
+	frr_cmd=${frr_cmd#fast}
+	;;
+esac
+shift
+
+if [ $# -ge 1 ]; then
+	frr_daemons="$*"
+fi
+
+case "${frr_cmd}" in
+    start)
+	if [ -n "${frr_extralibs_path}" ]; then
+	    /sbin/ldconfig -m ${frr_extralibs_path}
+	fi
+	# Why should I need to add this check ?
+	checkyesno frr_enable && do_cmd "start"
+	;;
+    stop)
+	frr_daemons=$(reverse_list ${frr_daemons})
+	do_cmd "stop"
+	;;
+    restart)
+	frr_daemons=$(reverse_list ${frr_daemons})
+    	do_cmd "stop"
+	frr_daemons=$(reverse_list ${frr_daemons})
+	checkyesno frr_enable && do_cmd "start"
+	;;
+    *)
+	do_cmd "${frr_cmd}"
+	;;
+esac
diff --git a/net/frr5/files/patch-Makefile.am b/net/frr5/files/patch-Makefile.am
new file mode 100644
index 000000000000..47cefba72bdd
--- /dev/null
+++ b/net/frr5/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2018-06-08 01:39:07 UTC
++++ Makefile.am
+@@ -42,7 +42,7 @@ include zebra/subdir.am
+ include watchfrr/subdir.am
+ include qpb/subdir.am
+ include fpm/subdir.am
+-include tools/subdir.am
++#include tools/subdir.am
+ 
+ include ripd/subdir.am
+ include ripngd/subdir.am
diff --git a/net/frr5/files/patch-configure.ac b/net/frr5/files/patch-configure.ac
new file mode 100644
index 000000000000..3d8951bf709c
--- /dev/null
+++ b/net/frr5/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2018-06-08 01:39:07 UTC
++++ configure.ac
+@@ -322,7 +322,7 @@ AC_ARG_WITH(pkg-git-version,
+ 	[ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
+ AC_ARG_WITH(vtysh_pager,
+ 	AS_HELP_STRING([--with-vtysh-pager=PAGER], [control what pager is compiled in as default]),
+-	VTYSH_PAGER=$withval, VTYSH_PAGER="more")
++	VTYSH_PAGER=$withval, VTYSH_PAGER="cat")
+ AC_ARG_ENABLE(vtysh,
+   AS_HELP_STRING([--disable-vtysh], [do not build integrated vty shell for FRR]))
+ AC_ARG_ENABLE(doc,
diff --git a/net/frr5/files/patch-zebra_ioctl.c b/net/frr5/files/patch-zebra_ioctl.c
new file mode 100644
index 000000000000..64443af4cd9c
--- /dev/null
+++ b/net/frr5/files/patch-zebra_ioctl.c
@@ -0,0 +1,20 @@
+--- zebra/ioctl.c.orig	2018-06-08 01:39:07 UTC
++++ zebra/ioctl.c
+@@ -430,10 +430,13 @@ void if_get_flags(struct interface *ifp)
+ 		strncpy(ifmr.ifm_name, ifp->name, IFNAMSIZ);
+ 
+ 		/* Seems not all interfaces implement this ioctl */
+-		if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0)
+-			zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s",
+-				 safe_strerror(errno));
+-		else if (ifmr.ifm_status & IFM_AVALID) /* Link state is valid */
++		if (if_ioctl(SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
++			/* Ignore EINVAL to avoid being too verbose */
++			if (errno != EINVAL)
++				zlog_err("if_ioctl(SIOCGIFMEDIA) failed: %s",
++					 safe_strerror(errno));
++		} else if (ifmr.ifm_status
++			   & IFM_AVALID) /* Link state is valid */
+ 		{
+ 			if (ifmr.ifm_status & IFM_ACTIVE)
+ 				SET_FLAG(ifreq.ifr_flags, IFF_RUNNING);
diff --git a/net/frr5/files/watchfrr.in b/net/frr5/files/watchfrr.in
new file mode 100644
index 000000000000..253214c8bc8f
--- /dev/null
+++ b/net/frr5/files/watchfrr.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: watchfrr
+# REQUIRE: NETWORKING frr
+# KEYWORD: nojailvtnet shutdown
+
+# Add the following line to /etc/rc.conf to enable watchfrr:
+# watchfrr_enable="YES"
+#
+# You may also wish to use the following variables to fine-tune startup:
+# watchfrr_flags
+# Example of flags usage:
+# watchfrr_flags=" -d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"
+
+. /etc/rc.subr
+
+name=watchfrr
+rcvar=${name}_enable
+
+load_rc_config $name
+
+stop_postcmd="rm -f $pidfile"
+
+watchfrr_enable=${watchfrr_enable:-"NO"}
+watchfrr_flags=${watchfrr_flags:-"-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30 zebra ripd ripngd ospfd ospf6d bgpd isisd eigrpd babeld"}
+
+command=%%PREFIX%%/sbin/watchfrr
+pidfile=/var/run/frr/watchfrr.pid
+
+run_rc_command "$1"
diff --git a/net/frr5/pkg-descr b/net/frr5/pkg-descr
new file mode 100644
index 000000000000..6ac4ad877355
--- /dev/null
+++ b/net/frr5/pkg-descr
@@ -0,0 +1,5 @@
+FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms
+which includes protocol daemons for BGP, IS-IS, OSPF and RIP. FRR has its roots
+in the Quagga project.
+
+WWW: https://frrouting.org/
diff --git a/net/frr5/pkg-message b/net/frr5/pkg-message
new file mode 100644
index 000000000000..2e3fa0f0df71
--- /dev/null
+++ b/net/frr5/pkg-message
@@ -0,0 +1,7 @@
+FRR's OSPF daemons tries to allocate big socket buffer, so generate warning
+messages like:
+"setsockopt_so_sendbuf: fd 6: SO_SNDBUF set to 1048576 (requested 8388608)"
+To prevent such message kern.ipc.maxsockbuf can be increased:
+sysctl kern.ipc.maxsockbuf=16777216
+
+Error message "ifam_read() doesn't read all socket data" is under investigation
diff --git a/net/frr5/pkg-plist b/net/frr5/pkg-plist
new file mode 100644
index 000000000000..cbb0827e6725
--- /dev/null
+++ b/net/frr5/pkg-plist
@@ -0,0 +1,166 @@
+bin/bgp_btoa
+%%VTYSH%%bin/vtysh
+include/frr/bfd.h
+include/frr/bitfield.h
+include/frr/buffer.h
+include/frr/checksum.h
+include/frr/command.h
+include/frr/command_graph.h
+include/frr/command_match.h
+include/frr/compiler.h
+include/frr/csv.h
+include/frr/debug.h
+include/frr/distribute.h
+include/frr/eigrpd/eigrp_dump.h
+include/frr/eigrpd/eigrp_topology.h
+include/frr/eigrpd/eigrpd.h
+include/frr/event_counter.h
+include/frr/ferr.h
+include/frr/fifo.h
+include/frr/filter.h
+include/frr/freebsd-queue.h
+include/frr/frr_pthread.h
+include/frr/frratomic.h
+include/frr/getopt.h
+include/frr/graph.h
+include/frr/hash.h
+include/frr/hook.h
+include/frr/if.h
+include/frr/if_rmap.h
+include/frr/imsg.h
+include/frr/ipaddr.h
+include/frr/jhash.h
+include/frr/json.h
+include/frr/keychain.h
+include/frr/libfrr.h
+include/frr/libospf.h
+include/frr/linklist.h
+include/frr/log.h
+include/frr/logicalrouter.h
+include/frr/md5.h
+include/frr/memory.h
+include/frr/memory_vty.h
+include/frr/module.h
+include/frr/monotime.h
+include/frr/mpls.h
+include/frr/network.h
+include/frr/nexthop.h
+include/frr/nexthop_group.h
+include/frr/ns.h
+include/frr/openbsd-queue.h
+include/frr/openbsd-tree.h
+include/frr/ospfapi/ospf_apiclient.h
+include/frr/ospfd/ospf_api.h
+include/frr/ospfd/ospf_asbr.h
+include/frr/ospfd/ospf_dump.h
+include/frr/ospfd/ospf_dump_api.h
+include/frr/ospfd/ospf_ism.h
+include/frr/ospfd/ospf_lsa.h
+include/frr/ospfd/ospf_lsdb.h
+include/frr/ospfd/ospf_nsm.h
+include/frr/ospfd/ospf_opaque.h
+include/frr/ospfd/ospfd.h
+include/frr/pbr.h
+include/frr/plist.h
+include/frr/pqueue.h
+include/frr/prefix.h
+include/frr/privs.h
+include/frr/ptm_lib.h
+include/frr/pw.h
+include/frr/queue.h
+include/frr/qobj.h
+include/frr/ringbuf.h
+include/frr/route_types.h
+include/frr/routemap.h
+include/frr/sbuf.h
+include/frr/sha256.h
+include/frr/sigevent.h
+include/frr/spf_backoff.h
+include/frr/skiplist.h
+include/frr/smux.h
+include/frr/sockopt.h
+include/frr/sockunion.h
+include/frr/srcdest_table.h
+include/frr/stream.h
+include/frr/systemd.h
+include/frr/table.h
+include/frr/termtable.h
+include/frr/thread.h
+include/frr/vector.h
+include/frr/version.h
+include/frr/vlan.h
+include/frr/vrf_int.h
+include/frr/vrf.h
+include/frr/vty.h
+include/frr/vxlan.h
+include/frr/wheel.h
+include/frr/workqueue.h
+include/frr/zassert.h
+include/frr/zclient.h
+include/frr/zebra.h
+lib/libfrr.a
+lib/libfrr.so
+lib/libfrr.so.0
+lib/libfrr.so.0.0.0
+lib/libfrrospfapiclient.a
+lib/libfrrospfapiclient.so
+lib/libfrrospfapiclient.so.0
+lib/libfrrospfapiclient.so.0.0.0
+%%SNMP%%lib/frr/modules/bgpd_snmp.so
+%%SNMP%%lib/frr/modules/ospf6d_snmp.so
+%%SNMP%%lib/frr/modules/ospfd_snmp.so
+%%SNMP%%lib/frr/modules/ripd_snmp.so
+%%SNMP%%lib/frr/modules/zebra_snmp.so
+%%FPM%%lib/frr/modules/zebra_fpm.so
+%%FPM%%lib/libfrrfpm_pb.a
+%%FPM%%lib/libfrrfpm_pb.so
+%%FPM%%lib/libfrrfpm_pb.so.0
+%%FPM%%lib/libfrrfpm_pb.so.0.0.0
+%%SNMP%%lib/libfrrsnmp.a
+%%SNMP%%lib/libfrrsnmp.so
+%%SNMP%%lib/libfrrsnmp.so.0
+%%SNMP%%lib/libfrrsnmp.so.0.0.0
+%%RPKI%%lib/frr/modules/bgpd_rpki.so
+%%MANPAGES%%man/man1/frr.1.gz
+%%MANPAGES%%man/man8/eigrpd.8.gz
+%%MANPAGES%%man/man8/isisd.8.gz
+%%MANPAGES%%man/man8/watchfrr.8.gz
+%%MANPAGES%%%%VTYSH%%man/man1/vtysh.1.gz
+%%MANPAGES%%man/man8/bgpd.8.gz
+%%MANPAGES%%%%LDPD%%man/man8/ldpd.8.gz
+%%MANPAGES%%man/man8/ospf6d.8.gz
+%%MANPAGES%%man/man8/ospfclient.8.gz
+%%MANPAGES%%man/man8/ospfd.8.gz
+%%MANPAGES%%man/man8/pbrd.8.gz
+%%MANPAGES%%man/man8/ripd.8.gz
+%%MANPAGES%%man/man8/ripngd.8.gz
+%%MANPAGES%%man/man8/zebra.8.gz
+sbin/babeld
+sbin/bgpd
+%%LDPD%%sbin/ldpd
+sbin/eigrpd
+sbin/ospf6d
+sbin/ospfclient
+sbin/ospfd
+sbin/pbrd
+sbin/ripd
+sbin/ripngd
+sbin/zebra
+sbin/isisd
+sbin/rfptest
+sbin/watchfrr
+%%ETCDIR%%/babeld.conf.sample
+%%ETCDIR%%/bgpd.conf.sample
+%%ETCDIR%%/bgpd.conf.sample2
+%%ETCDIR%%/bgpd.conf.vnc.sample
+%%ETCDIR%%/eigrpd.conf.sample
+%%ETCDIR%%/isisd.conf.sample
+%%LDPD%%%%ETCDIR%%/ldpd.conf.sample
+%%ETCDIR%%/ospf6d.conf.sample
+%%ETCDIR%%/ospfd.conf.sample
+%%ETCDIR%%/pbrd.conf.sample
+%%ETCDIR%%/ripd.conf.sample
+%%ETCDIR%%/ripngd.conf.sample
+%%VTYSH%%%%ETCDIR%%/vtysh.conf.sample
+%%ETCDIR%%/zebra.conf.sample
+@dir(frr,frr,750) /var/run/frr
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 1fcea119f6d5..0ee11eb1033f 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	gawk:lang/gawk
 
-CONFLICTS=	frr3 frr4 openbgpd pimd zebra
+CONFLICTS=	frr3 frr4 frr5 openbgpd pimd zebra
 
 USES=		compiler:c11 cpe gmake libtool makeinfo \
 		perl5 readline ssl