View | Details | Raw Unified | Return to bug 223116
Collapse All | Expand All

(-)b/net/frr/Makefile (-4 / +4 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	frr
3
PORTNAME=	frr
4
PORTVERSION=	2.0
4
PORTVERSION=	3.0
5
CATEGORIES=	net ipv6
5
CATEGORIES=	net ipv6
6
6
7
MAINTAINER=	olivier@FreeBSD.org
7
MAINTAINER=	olivier@FreeBSD.org
Lines 13-28 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
13
BUILD_DEPENDS=	gawk:lang/gawk
13
BUILD_DEPENDS=	gawk:lang/gawk
14
LIB_DEPENDS=	libjson-c.so:devel/json-c
14
LIB_DEPENDS=	libjson-c.so:devel/json-c
15
15
16
CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]* quagga-[0-9]*
16
CONFLICTS=	openbgpd openospfd zebra quagga-esr quagga
17
17
18
USE_GITHUB=	yes
18
USE_GITHUB=	yes
19
GH_ACCOUNT=	FRRouting
19
GH_ACCOUNT=	FRRouting
20
GH_PROJECT=	frr
20
GH_PROJECT=	frr
21
GH_TAGNAME=	frr-2.0
21
GH_TAGNAME=	frr-3.0
22
22
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
INSTALL_TARGET=	install-strip
24
INSTALL_TARGET=	install-strip
25
USES=		autoreconf gmake pkgconfig libtool makeinfo readline
25
USES=		autoreconf bison gmake pkgconfig libtool makeinfo readline
26
USE_LDCONFIG=	yes
26
USE_LDCONFIG=	yes
27
27
28
INFO=		frr
28
INFO=		frr
(-)b/net/frr/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1497785263
1
TIMESTAMP = 1508053336
2
SHA256 (FRRouting-frr-2.0-frr-2.0_GH0.tar.gz) = 70259dc379678a7b0c32abd30173034f31876612451e2ffd7d09c52ab22ac05b
2
SHA256 (FRRouting-frr-3.0-frr-3.0_GH0.tar.gz) = 9335c83c2c0a21e64b4e64a130ee95c1f90d76103cff05e816f452a8ba0603d9
3
SIZE (FRRouting-frr-2.0-frr-2.0_GH0.tar.gz) = 3025536
3
SIZE (FRRouting-frr-3.0-frr-3.0_GH0.tar.gz) = 3166434
(-)b/net/frr/files/patch-Makefile.am (-4 / +4 lines)
Lines 1-9 Link Here
1
--- Makefile.am.orig	2017-04-02 05:22:47 UTC
1
--- Makefile.am.orig	2017-10-13 23:17:26 UTC
2
+++ Makefile.am
2
+++ Makefile.am
3
@@ -3,7 +3,7 @@
3
@@ -4,7 +4,7 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @
4
 SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
5
 	 @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
4
 	 @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
6
          @ISISD@ @PIMD@ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
5
          @ISISD@ @PIMD@ @NHRPD@ \
6
 	 @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
7
-         redhat @SOLARIS@ tests tools cumulus snapcraft
7
-         redhat @SOLARIS@ tests tools cumulus snapcraft
8
+         redhat @SOLARIS@ tests cumulus snapcraft
8
+         redhat @SOLARIS@ tests cumulus snapcraft
9
 
9
 
(-)b/net/frr/files/patch-vtysh_vtysh.c (-7 / +7 lines)
Lines 1-11 Link Here
1
--- vtysh/vtysh.c.orig	2017-06-27 14:48:26 UTC
1
--- vtysh/vtysh.c.orig	2017-10-13 23:17:26 UTC
2
+++ vtysh/vtysh.c
2
+++ vtysh/vtysh.c
3
@@ -261,7 +261,7 @@ vtysh_pager_init (void)
3
@@ -249,7 +249,7 @@ void vtysh_pager_init(void)
4
   if (pager_defined)
4
 	if (pager_defined)
5
     vtysh_pager_name = strdup (pager_defined);
5
 		vtysh_pager_name = strdup(pager_defined);
6
   else
6
 	else
7
-    vtysh_pager_name = strdup ("more");
7
-		vtysh_pager_name = strdup("more");
8
+    vtysh_pager_name = strdup ("cat");
8
+		vtysh_pager_name = strdup("cat");
9
 }
9
 }
10
 
10
 
11
 /* Command execution over the vty interface. */
11
 /* Command execution over the vty interface. */
(-)b/net/frr/pkg-plist (-8 / +10 lines)
Lines 41-51 include/frr/ospfd/ospf_lsdb.h Link Here
41
include/frr/ospfd/ospf_nsm.h
41
include/frr/ospfd/ospf_nsm.h
42
include/frr/ospfd/ospf_opaque.h
42
include/frr/ospfd/ospf_opaque.h
43
include/frr/ospfd/ospfd.h
43
include/frr/ospfd/ospfd.h
44
include/frr/command_match.h
45
include/frr/graph.h
46
include/frr/hook.h
47
include/frr/libfrr.h
48
include/frr/module.h
49
include/frr/monotime.h
44
include/frr/plist.h
50
include/frr/plist.h
45
include/frr/pqueue.h
51
include/frr/pqueue.h
46
include/frr/prefix.h
52
include/frr/prefix.h
47
include/frr/privs.h
53
include/frr/privs.h
48
include/frr/ptm_lib.h
54
include/frr/ptm_lib.h
55
include/frr/pw.h
49
include/frr/qobj.h
56
include/frr/qobj.h
50
include/frr/route_types.h
57
include/frr/route_types.h
51
include/frr/routemap.h
58
include/frr/routemap.h
Lines 54-59 include/frr/skiplist.h Link Here
54
include/frr/smux.h
61
include/frr/smux.h
55
include/frr/sockopt.h
62
include/frr/sockopt.h
56
include/frr/sockunion.h
63
include/frr/sockunion.h
64
include/frr/spf_backoff.h
65
include/frr/srcdest_table.h
57
include/frr/stream.h
66
include/frr/stream.h
58
include/frr/systemd.h
67
include/frr/systemd.h
59
include/frr/table.h
68
include/frr/table.h
Lines 62-67 include/frr/vector.h Link Here
62
include/frr/version.h
71
include/frr/version.h
63
include/frr/vrf.h
72
include/frr/vrf.h
64
include/frr/vty.h
73
include/frr/vty.h
74
include/frr/wheel.h
65
include/frr/workqueue.h
75
include/frr/workqueue.h
66
include/frr/zassert.h
76
include/frr/zassert.h
67
include/frr/zclient.h
77
include/frr/zclient.h
Lines 70-83 lib/libfrr.a Link Here
70
lib/libfrr.so
80
lib/libfrr.so
71
lib/libfrr.so.0
81
lib/libfrr.so.0
72
lib/libfrr.so.0.0.0
82
lib/libfrr.so.0.0.0
73
lib/libfrr_pb.a
74
lib/libfrr_pb.so
75
lib/libfrr_pb.so.0
76
lib/libfrr_pb.so.0.0.0
77
lib/libfrrfpm_pb.a
78
lib/libfrrfpm_pb.so
79
lib/libfrrfpm_pb.so.0
80
lib/libfrrfpm_pb.so.0.0.0
81
lib/libfrrospfapiclient.a
83
lib/libfrrospfapiclient.a
82
lib/libfrrospfapiclient.so
84
lib/libfrrospfapiclient.so
83
lib/libfrrospfapiclient.so.0
85
lib/libfrrospfapiclient.so.0

Return to bug 223116