summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--net/Makefile1
-rw-r--r--net/frr5/Makefile91
-rw-r--r--net/frr5/distinfo3
-rw-r--r--net/frr5/files/frr.in159
-rw-r--r--net/frr5/files/patch-Makefile.am11
-rw-r--r--net/frr5/files/patch-bgpd_bgp__routemap.c16
-rw-r--r--net/frr5/files/patch-bgpd_bgpd.c61
-rw-r--r--net/frr5/files/patch-configure.ac11
-rw-r--r--net/frr5/files/patch-ospfd_ospf__vty.c110
-rw-r--r--net/frr5/files/patch-zebra_ioctl.c20
-rw-r--r--net/frr5/files/watchfrr.in33
-rw-r--r--net/frr5/pkg-descr5
-rw-r--r--net/frr5/pkg-message13
-rw-r--r--net/frr5/pkg-plist166
15 files changed, 1 insertions, 700 deletions
diff --git a/MOVED b/MOVED
index d44441c1e83f..62180210f2c3 100644
--- a/MOVED
+++ b/MOVED
@@ -15375,3 +15375,4 @@ net-im/telepathy-haze||2020-08-15|Has expired: Uses deprecated version of python
www/halberd||2020-08-15|Has expired: Uses deprecated version of python
x11-toolkits/py-wxPython28||2020-08-15|Has expired: Uses deprecated version of python
devel/codeblocks-devel||2020-08-22|Removed
+net/frr5|net/frr7|2020-08-25|Has expired: Upstream no longer maintained
diff --git a/net/Makefile b/net/Makefile
index 217b3971ef4a..91b28b6403c7 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -169,7 +169,6 @@
SUBDIR += freerdp
SUBDIR += freeswitch
SUBDIR += freevrrpd
- SUBDIR += frr5
SUBDIR += frr6
SUBDIR += frr7
SUBDIR += frr7-pythontools
diff --git a/net/frr5/Makefile b/net/frr5/Makefile
deleted file mode 100644
index 3c572bd08901..000000000000
--- a/net/frr5/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= frr
-PORTVERSION= 5.0.2
-DISTVERSIONPREFIX= frr-
-PORTREVISION= 4
-CATEGORIES= net
-PKGNAMESUFFIX= 5
-
-MAINTAINER= olivier@FreeBSD.org
-COMMENT= IP routing protocol suite including BGP, IS-IS, OSPF and RIP
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-DEPRECATED= Uses deprecated version of python
-EXPIRATION_DATE= 2020-09-15
-
-USES= autoreconf bison compiler:c++11-lang gmake pkgconfig libtool \
- makeinfo python:2.7,build readline
-
-BUILD_DEPENDS= gawk:lang/gawk
-LIB_DEPENDS= libjson-c.so:devel/json-c
-
-CONFLICTS= openbgpd openospfd zebra quagga frr6 frr7
-
-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
-
-# 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= ${PY_SPHINX}
-MANPAGES_MAKE_ENV= SPHINXBUILD=sphinx-build-${PYTHON_VER}
-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
deleted file mode 100644
index 8368af86bd0e..000000000000
--- a/net/frr5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1546957578
-SHA256 (FRRouting-frr-frr-5.0.2_GH0.tar.gz) = dd779061d95027419e02454a2b2893fb8f15281161db7e270def8b39618506f4
-SIZE (FRRouting-frr-frr-5.0.2_GH0.tar.gz) = 4367050
diff --git a/net/frr5/files/frr.in b/net/frr5/files/frr.in
deleted file mode 100644
index 81bd04f3934a..000000000000
--- a/net/frr5/files/frr.in
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: frr dynamicrouting
-# 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 daemons a chance to catchup before
-# continuing, 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
- frr_cmd=$1
- for daemon in ${frr_daemons}; do
- command=%%PREFIX%%/sbin/${daemon}
- if checkyesno frr_vtysh_boot; then
- required_files=%%ETCDIR%%/frr.conf
- else
- required_files=%%ETCDIR%%/${daemon}.conf
- fi
- pidfile=/var/run/frr/${daemon}.pid
- if [ ${frr_cmd} = "restart" ] || [ ${frr_cmd} = "start" ]; then
- check_config
- fi
- if [ ${frr_cmd} = "start" ] && ! [ -f ${required_files} ] && ! checkyesno frr_vtysh_boot; 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|quietstart)
- 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
deleted file mode 100644
index d83d3d0620d3..000000000000
--- a/net/frr5/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2019-01-08 08:53:23 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-bgpd_bgp__routemap.c b/net/frr5/files/patch-bgpd_bgp__routemap.c
deleted file mode 100644
index 8df1905a7af6..000000000000
--- a/net/frr5/files/patch-bgpd_bgp__routemap.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- bgpd/bgp_routemap.c.orig 2019-01-08 08:53:23 UTC
-+++ bgpd/bgp_routemap.c
-@@ -2432,11 +2432,11 @@ route_set_ipv6_nexthop_prefer_global(void *rule, struc
- && peer->su_remote
- && sockunion_family(peer->su_remote) == AF_INET6) {
- /* Set next hop preference to global */
-- bgp_info->attr->mp_nexthop_prefer_global = TRUE;
-+ bgp_info->attr->mp_nexthop_prefer_global = true;
- SET_FLAG(bgp_info->attr->rmap_change_flags,
- BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
- } else {
-- bgp_info->attr->mp_nexthop_prefer_global = FALSE;
-+ bgp_info->attr->mp_nexthop_prefer_global = false;
- SET_FLAG(bgp_info->attr->rmap_change_flags,
- BATTR_RMAP_IPV6_PREFER_GLOBAL_CHANGED);
- }
diff --git a/net/frr5/files/patch-bgpd_bgpd.c b/net/frr5/files/patch-bgpd_bgpd.c
deleted file mode 100644
index 3464ec2727c9..000000000000
--- a/net/frr5/files/patch-bgpd_bgpd.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- bgpd/bgpd.c.orig 2019-01-08 08:53:23 UTC
-+++ bgpd/bgpd.c
-@@ -243,7 +243,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
-
- /* EVPN uses router id in RD, withdraw them */
- if (is_evpn_enabled())
-- bgp_evpn_handle_router_id_update(bgp, TRUE);
-+ bgp_evpn_handle_router_id_update(bgp, true);
-
- IPV4_ADDR_COPY(&bgp->router_id, id);
-
-@@ -260,7 +260,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
-
- /* EVPN uses router id in RD, update them */
- if (is_evpn_enabled())
-- bgp_evpn_handle_router_id_update(bgp, FALSE);
-+ bgp_evpn_handle_router_id_update(bgp, false);
-
- return 0;
- }
-@@ -3098,7 +3098,7 @@ int bgp_handle_socket(struct bgp *bgp, struct vrf *vrf
- /*
- * suppress vrf socket
- */
-- if (create == FALSE) {
-+ if (create == false) {
- bgp_close_vrf_socket(bgp);
- return 0;
- }
-@@ -6861,8 +6861,8 @@ static void bgp_config_write_peer_global(struct vty *v
- struct peer *g_peer = NULL;
- char buf[SU_ADDRSTRLEN];
- char *addr;
-- int if_pg_printed = FALSE;
-- int if_ras_printed = FALSE;
-+ int if_pg_printed = false;
-+ int if_ras_printed = false;
-
- /* Skip dynamic neighbors. */
- if (peer_dynamic_neighbor(peer))
-@@ -6884,16 +6884,16 @@ static void bgp_config_write_peer_global(struct vty *v
-
- if (peer_group_active(peer)) {
- vty_out(vty, " peer-group %s", peer->group->name);
-- if_pg_printed = TRUE;
-+ if_pg_printed = true;
- } else if (peer->as_type == AS_SPECIFIED) {
- vty_out(vty, " remote-as %u", peer->as);
-- if_ras_printed = TRUE;
-+ if_ras_printed = true;
- } else if (peer->as_type == AS_INTERNAL) {
- vty_out(vty, " remote-as internal");
-- if_ras_printed = TRUE;
-+ if_ras_printed = true;
- } else if (peer->as_type == AS_EXTERNAL) {
- vty_out(vty, " remote-as external");
-- if_ras_printed = TRUE;
-+ if_ras_printed = true;
- }
-
- vty_out(vty, "\n");
diff --git a/net/frr5/files/patch-configure.ac b/net/frr5/files/patch-configure.ac
deleted file mode 100644
index 3d8951bf709c..000000000000
--- a/net/frr5/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-ospfd_ospf__vty.c b/net/frr5/files/patch-ospfd_ospf__vty.c
deleted file mode 100644
index b3f849d82b05..000000000000
--- a/net/frr5/files/patch-ospfd_ospf__vty.c
+++ /dev/null
@@ -1,110 +0,0 @@
---- ospfd/ospf_vty.c.orig 2019-01-08 08:53:23 UTC
-+++ ospfd/ospf_vty.c
-@@ -3267,7 +3267,7 @@ DEFUN (show_ip_ospf,
- uint8_t uj = use_json(argc, argv);
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -3940,7 +3940,7 @@ DEFUN (show_ip_ospf_interface,
- uint8_t uj = use_json(argc, argv);
- struct listnode *node = NULL;
- char *vrf_name = NULL, *intf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0, idx_intf = 0;
-@@ -4067,7 +4067,7 @@ DEFUN (show_ip_ospf_interface_traffic,
- struct ospf *ospf = NULL;
- struct listnode *node = NULL;
- char *vrf_name = NULL, *intf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int inst = 0;
- int idx_vrf = 0, idx_intf = 0;
- uint8_t uj = use_json(argc, argv);
-@@ -4322,7 +4322,7 @@ DEFUN (show_ip_ospf_neighbor,
- uint8_t uj = use_json(argc, argv);
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -4535,7 +4535,7 @@ DEFUN (show_ip_ospf_neighbor_all,
- uint8_t uj = use_json(argc, argv);
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -5233,7 +5233,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
- uint8_t uj = use_json(argc, argv);
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -5422,7 +5422,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
- uint8_t uj = use_json(argc, argv);
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -6305,7 +6305,7 @@ DEFUN (show_ip_ospf_database_max,
- struct ospf *ospf = NULL;
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -6362,7 +6362,7 @@ DEFUN (show_ip_ospf_instance_database,
- unsigned short instance = 0;
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx = 0;
-@@ -6512,7 +6512,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
- unsigned short instance = 0;
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx = 0, idx_vrf = 0;
-@@ -9299,7 +9299,7 @@ DEFUN (show_ip_ospf_border_routers,
- struct ospf *ospf = NULL;
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
-@@ -9425,7 +9425,7 @@ DEFUN (show_ip_ospf_route,
- struct ospf *ospf = NULL;
- struct listnode *node = NULL;
- char *vrf_name = NULL;
-- bool all_vrf = FALSE;
-+ bool all_vrf = false;
- int ret = CMD_SUCCESS;
- int inst = 0;
- int idx_vrf = 0;
diff --git a/net/frr5/files/patch-zebra_ioctl.c b/net/frr5/files/patch-zebra_ioctl.c
deleted file mode 100644
index 64443af4cd9c..000000000000
--- a/net/frr5/files/patch-zebra_ioctl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 253214c8bc8f..000000000000
--- a/net/frr5/files/watchfrr.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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
deleted file mode 100644
index 6ac4ad877355..000000000000
--- a/net/frr5/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 75a34016adef..000000000000
--- a/net/frr5/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
- message: <<EOM
-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
-EOM
-}
-]
diff --git a/net/frr5/pkg-plist b/net/frr5/pkg-plist
deleted file mode 100644
index cbb0827e6725..000000000000
--- a/net/frr5/pkg-plist
+++ /dev/null
@@ -1,166 +0,0 @@
-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