Index: head/net/frr6/Makefile =================================================================== --- head/net/frr6/Makefile (revision 489702) +++ head/net/frr6/Makefile (revision 489703) @@ -1,86 +1,85 @@ # $FreeBSD$ PORTNAME= frr -PORTVERSION= 6.0 -PORTREVISION= 2 +PORTVERSION= 6.0.2 DISTVERSIONPREFIX= frr- CATEGORIES= net ipv6 PKGNAMESUFFIX= 6 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 frr5 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 # 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 Index: head/net/frr6/distinfo =================================================================== --- head/net/frr6/distinfo (revision 489702) +++ head/net/frr6/distinfo (revision 489703) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539258252 -SHA256 (FRRouting-frr-frr-6.0_GH0.tar.gz) = 3835d87e2329c1c08d1b2657312c0ba0155d8f442c338d60f0ddb51090f2f182 -SIZE (FRRouting-frr-frr-6.0_GH0.tar.gz) = 4547807 +TIMESTAMP = 1546953642 +SHA256 (FRRouting-frr-frr-6.0.2_GH0.tar.gz) = dde97d012b6068a1230c0c6a03b38015befae37f617b9ffbd17024c71a170d94 +SIZE (FRRouting-frr-frr-6.0.2_GH0.tar.gz) = 4476089 Index: head/net/frr6/files/patch-Makefile.am =================================================================== --- head/net/frr6/files/patch-Makefile.am (revision 489702) +++ head/net/frr6/files/patch-Makefile.am (revision 489703) @@ -1,11 +1,11 @@ ---- Makefile.am.orig 2018-10-08 12:32:57 UTC -+++ Makefile.am -@@ -40,7 +40,7 @@ include zebra/subdir.am +--- Makefile.am.orig 2019-01-08 14:24:52.207825000 +0100 ++++ Makefile.am 2019-01-08 14:25:02.214572000 +0100 +@@ -117,7 +117,7 @@ include watchfrr/subdir.am include qpb/subdir.am include fpm/subdir.am -include tools/subdir.am +#include tools/subdir.am + include solaris/subdir.am - include ripd/subdir.am - include ripngd/subdir.am + include bgpd/subdir.am Index: head/net/frr6/pkg-plist =================================================================== --- head/net/frr6/pkg-plist (revision 489702) +++ head/net/frr6/pkg-plist (revision 489703) @@ -1,173 +1,167 @@ -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/frrstr.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/lib_errors.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/smux.h include/frr/spf_backoff.h include/frr/skiplist.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/bfdd.8.gz %%MANPAGES%%man/man8/eigrpd.8.gz %%MANPAGES%%man/man8/isisd.8.gz %%MANPAGES%%man/man8/staticd.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/bfdd sbin/bgpd %%LDPD%%sbin/ldpd sbin/eigrpd sbin/ospf6d -sbin/ospfclient sbin/ospfd sbin/pbrd sbin/ripd sbin/ripngd sbin/staticd sbin/zebra sbin/isisd -sbin/rfptest sbin/watchfrr %%ETCDIR%%/babeld.conf.sample %%ETCDIR%%/bfdd.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 %%ETCDIR%%/staticd.conf.sample %%VTYSH%%%%ETCDIR%%/vtysh.conf.sample %%ETCDIR%%/zebra.conf.sample @dir(frr,frr,750) /var/run/frr