--- b/net/frr/Makefile	
+++ b/net/frr/Makefile	
@@ -1,7 +1,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	frr
-PORTVERSION=	2.0
+PORTVERSION=	3.0
 CATEGORIES=	net ipv6
 
 MAINTAINER=	olivier@FreeBSD.org
@@ -13,16 +13,16 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	gawk:lang/gawk
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
-CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]* quagga-[0-9]*
+CONFLICTS=	openbgpd openospfd zebra quagga-esr quagga
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FRRouting
 GH_PROJECT=	frr
-GH_TAGNAME=	frr-2.0
+GH_TAGNAME=	frr-3.0
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		autoreconf gmake pkgconfig libtool makeinfo readline
+USES=		autoreconf bison gmake pkgconfig libtool makeinfo readline
 USE_LDCONFIG=	yes
 
 INFO=		frr
--- b/net/frr/distinfo	
+++ b/net/frr/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1497785263
-SHA256 (FRRouting-frr-2.0-frr-2.0_GH0.tar.gz) = 70259dc379678a7b0c32abd30173034f31876612451e2ffd7d09c52ab22ac05b
-SIZE (FRRouting-frr-2.0-frr-2.0_GH0.tar.gz) = 3025536
+TIMESTAMP = 1508053336
+SHA256 (FRRouting-frr-3.0-frr-3.0_GH0.tar.gz) = 9335c83c2c0a21e64b4e64a130ee95c1f90d76103cff05e816f452a8ba0603d9
+SIZE (FRRouting-frr-3.0-frr-3.0_GH0.tar.gz) = 3166434
--- b/net/frr/files/patch-Makefile.am	
+++ b/net/frr/files/patch-Makefile.am	
@@ -1,9 +1,9 @@ 
---- Makefile.am.orig	2017-04-02 05:22:47 UTC
+--- Makefile.am.orig	2017-10-13 23:17:26 UTC
 +++ Makefile.am
-@@ -3,7 +3,7 @@
- SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
+@@ -4,7 +4,7 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @
  	 @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
-          @ISISD@ @PIMD@ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
+          @ISISD@ @PIMD@ @NHRPD@ \
+ 	 @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
 -         redhat @SOLARIS@ tests tools cumulus snapcraft
 +         redhat @SOLARIS@ tests cumulus snapcraft
  
--- b/net/frr/files/patch-vtysh_vtysh.c	
+++ b/net/frr/files/patch-vtysh_vtysh.c	
@@ -1,11 +1,11 @@ 
---- vtysh/vtysh.c.orig	2017-06-27 14:48:26 UTC
+--- vtysh/vtysh.c.orig	2017-10-13 23:17:26 UTC
 +++ vtysh/vtysh.c
-@@ -261,7 +261,7 @@ vtysh_pager_init (void)
-   if (pager_defined)
-     vtysh_pager_name = strdup (pager_defined);
-   else
--    vtysh_pager_name = strdup ("more");
-+    vtysh_pager_name = strdup ("cat");
+@@ -249,7 +249,7 @@ void vtysh_pager_init(void)
+ 	if (pager_defined)
+ 		vtysh_pager_name = strdup(pager_defined);
+ 	else
+-		vtysh_pager_name = strdup("more");
++		vtysh_pager_name = strdup("cat");
  }
  
  /* Command execution over the vty interface. */
--- b/net/frr/pkg-plist	
+++ b/net/frr/pkg-plist	
@@ -41,11 +41,18 @@ 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/command_match.h
+include/frr/graph.h
+include/frr/hook.h
+include/frr/libfrr.h
+include/frr/module.h
+include/frr/monotime.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/qobj.h
 include/frr/route_types.h
 include/frr/routemap.h
@@ -54,6 +61,8 @@ include/frr/skiplist.h
 include/frr/smux.h
 include/frr/sockopt.h
 include/frr/sockunion.h
+include/frr/spf_backoff.h
+include/frr/srcdest_table.h
 include/frr/stream.h
 include/frr/systemd.h
 include/frr/table.h
@@ -62,6 +71,7 @@ include/frr/vector.h
 include/frr/version.h
 include/frr/vrf.h
 include/frr/vty.h
+include/frr/wheel.h
 include/frr/workqueue.h
 include/frr/zassert.h
 include/frr/zclient.h
@@ -70,14 +80,6 @@ lib/libfrr.a
 lib/libfrr.so
 lib/libfrr.so.0
 lib/libfrr.so.0.0.0
-lib/libfrr_pb.a
-lib/libfrr_pb.so
-lib/libfrr_pb.so.0
-lib/libfrr_pb.so.0.0.0
-lib/libfrrfpm_pb.a
-lib/libfrrfpm_pb.so
-lib/libfrrfpm_pb.so.0
-lib/libfrrfpm_pb.so.0.0.0
 lib/libfrrospfapiclient.a
 lib/libfrrospfapiclient.so
 lib/libfrrospfapiclient.so.0