svn commit: r464843 - in head/net/bird-devel: . files

[Yuri Victorovich]

Author: yuri
Date: Sat Mar 17 19:04:07 2018
New Revision: 464843
URL: https://svnweb.freebsd.org/changeset/ports/464843

Log:
  net/bird-devel: Update to 2.0.1
  
  Maintainer's timeout expired: melifaro at ipfw.ru
  
  Port changes:
  * Update MASTER_SITES
  * Add LICENSE
  * Add LIB_DEPENDS
  * Add CONFLICTS=bird6 for the IPv6 variant
  * Add USES=ncurses
  * Add options for individual protocols
  * Update WWW
  * Add patch for proto/babel/config.Y
  
  PR:		225962
  Submitted by:	Leo Vandewoestijne <freebsd at dns.company>

Added:
  head/net/bird-devel/files/patch-proto_babel_config.Y   (contents, props changed)
Modified:
  head/net/bird-devel/Makefile
  head/net/bird-devel/distinfo
  head/net/bird-devel/pkg-descr

Modified: head/net/bird-devel/Makefile
==============================================================================
--- head/net/bird-devel/Makefile	Sat Mar 17 18:54:13 2018	(r464842)
+++ head/net/bird-devel/Makefile	Sat Mar 17 19:04:07 2018	(r464843)
@@ -2,24 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	bird
-DISTVERSION=	2.0.0-pre1
+DISTVERSION=	2.0.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
-		http://bird.mpls.in/distfiles/bird/
+MASTER_SITES=	ftp://bird.network.cz/pub/bird/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	melifaro at ipfw.ru
 COMMENT=	Dynamic IP routing daemon (devel version)
 
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libssh.so:security/libssh
+
 CONFLICTS=	bird-[0-9]*
+CONFLICTS+=	bird6-[0-9]*
 
-USES=		bison gmake readline
+USES=		bison gmake ncurses readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_CSTD=	gnu89
+USE_RC_SUBR=	bird
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_RC_SUBR=	bird
+OPTIONS_MULTI=	RP
+RP_DESC=	Routing Protocols
+OPTIONS_MULTI_RP=	BFD BABEL BGP OSPF PIPE RADV RIP STATIC
+OPTIONS_DEFAULT=	${OPTIONS_MULTI_RP}
+
+BFD_DESC=	Bidirectional Forwarding Detection
+BABEL_DESC=	Babel routing protocol
+BGP_DESC=	Border Gateway Protocol
+OSPF_DESC=	Open Short Path First
+PIPE_DESC=	PIPE routing
+RADV_DESC=	Router Advertisement
+RIP_DESC=	Routing Information Protocol
+STATIC_DESC=	Static routing
+
+BFD_VARS=	rt_prot+=bfd
+BABEL_VARS=	rt_prot+=babel
+BGP_VARS=	rt_prot+=bgp
+OSPF_VARS=	rt_prot+=ospf
+PIPE_VARS=	rt_prot+=pipe
+RADV_VARS=	rt_prot+=radv
+RIP_VARS=	rt_prot+=rip
+STATIC_VARS=	rt_prot+=static
+
+CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
 
 .include <bsd.port.mk>

Modified: head/net/bird-devel/distinfo
==============================================================================
--- head/net/bird-devel/distinfo	Sat Mar 17 18:54:13 2018	(r464842)
+++ head/net/bird-devel/distinfo	Sat Mar 17 19:04:07 2018	(r464843)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512568931
-SHA256 (bird-2.0.0-pre1.tar.gz) = f1d75703dd22e5d203e8bafc2d8266c4fdc823ea517c57ec36055dd32a62f369
-SIZE (bird-2.0.0-pre1.tar.gz) = 1101988
+TIMESTAMP = 1518802884
+SHA256 (bird-2.0.1.tar.gz) = 5614b60d31a0e224a7e484126641dee7a5386a939f59373a48dfc1233b13d063
+SIZE (bird-2.0.1.tar.gz) = 1006261

Added: head/net/bird-devel/files/patch-proto_babel_config.Y
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/bird-devel/files/patch-proto_babel_config.Y	Sat Mar 17 19:04:07 2018	(r464843)
@@ -0,0 +1,13 @@
+--- proto/babel/config.Y.orig	2018-03-05 12:15:52 UTC
++++ proto/babel/config.Y
+@@ -23,8 +23,8 @@ CF_DEFINES
+ CF_DECLS
+ 
+ CF_KEYWORDS(BABEL, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT, WIRED,
+-	WIRELESS, RX, TX, BUFFER, LENGTH, CHECK, LINK, BABEL_METRIC, NEXT, HOP,
+-	IPV4, IPV6)
++	WIRELESS, RX, TX, BUFFER, LENGTH, PRIORITY, CHECK, LINK, BABEL_METRIC,
++	NEXT, HOP, IPV4, IPV6)
+ 
+ CF_GRAMMAR
+ 

Modified: head/net/bird-devel/pkg-descr
==============================================================================
--- head/net/bird-devel/pkg-descr	Sat Mar 17 18:54:13 2018	(r464842)
+++ head/net/bird-devel/pkg-descr	Sat Mar 17 19:04:07 2018	(r464843)
@@ -13,4 +13,4 @@ The BIRD project aims to develop a fully functional dy
 - Soft reconfiguration
 - Powerful language for route filtering
 
-WWW: http://bird.mpls.in/
+WWW: http://bird.network.cz/