Update net/bird,net/bird6 to 1.6.0

Add sk_setup / io loop fixes from git.
Remove agg patch - new version with different syntax is comingTimeout, server noc-myt.yandex.net not responding.

PR:		211413
Submitted by:	zeising (original version)
Approved by:	az (implicit)

net/bird/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	bird
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
 		http://bird.mpls.in/distfiles/bird/
@@ -17,9 +16,8 @@ USES=		bison gmake readline
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=/var
 
-OPTIONS_DEFINE?=	FIREWALL AGG
+OPTIONS_DEFINE?=	FIREWALL
 FIREWALL_DESC=	Enable firewall protocol
-AGG_DESC=	Enable aggregation protocol (EXPERIMENTAL)
 NO_OPTIONS_SORT=	yes
 
 MAKE_JOBS_UNSAFE=	yes
@@ -31,17 +29,10 @@ SUB_LIST+=	PORTNAME=${PORTNAME}
 PLIST_SUB?=	VER=""
 
 FIREWALL_EXTRA_PATCHES+=	${FILESDIR}/firewall_support.patch
-AGG_EXTRA_PATCHES+=	${FILESDIR}/agg_support.patch
 
 .include <bsd.port.options.mk>
 
 post-patch:
-.if ${PORT_OPTIONS:MAGG}
-	@${REINPLACE_CMD} -e 's/^\(all_protocols=".*\)"/\1 agg"/' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/proto_build(&proto_device);/{G;s/$$/  proto_build(\&proto_agg);/;}' ${WRKSRC}/nest/proto.c
-	@${REINPLACE_CMD} -e '/CONFIG_BFD/{G;s/$$/#undef CONFIG_AGG/;}' ${WRKSRC}/sysdep/autoconf.h.in
-	@${REINPLACE_CMD} -e 's/\(proto_bfd\)/\1, proto_agg/' ${WRKSRC}/nest/protocol.h
-.endif
 .if ${PORT_OPTIONS:MFIREWALL}
 	@${REINPLACE_CMD} -e 's/^\(all_protocols=".*\)"/\1 firewall"/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/proto_build(&proto_device);/{G;s/$$/  proto_build(\&proto_firewall);/;}' ${WRKSRC}/nest/proto.c

net/bird/distinfo

@@ -1,2 +1,3 @@
-SHA256 (bird-1.5.0.tar.gz) = 79d5c4254e25f5890626830ca42aae03735716bdf152ddd8368473d2b3c17b5d
-SIZE (bird-1.5.0.tar.gz) = 1300141
+TIMESTAMP = 1469633743
+SHA256 (bird-1.6.0.tar.gz) = db3dfe37deac73b38b7d6966e577985f7b8e23f246760cb095ad13b0d8010e13
+SIZE (bird-1.6.0.tar.gz) = 1273899

net/bird/files/firewall_support.patch

@@ -101,12 +101,12 @@ index 524e69b..f3062a2 100644
 --- nest/route.h
 +++ nest/route.h
 @@ -361,7 +361,8 @@ typedef struct eattr {
- #define EAP_RIP 2			/* RIP */
  #define EAP_OSPF 3			/* OSPF */
  #define EAP_KRT 4			/* Kernel route attributes */
--#define EAP_MAX 5
-+#define EAP_FIREWALL 5			/* Abstact firewall interface */
-+#define EAP_MAX 6
+ #define EAP_BABEL 5			/* Babel attributes */
+-#define EAP_MAX 6
++#define EAP_FIREWALL 6			/* Abstact firewall interface */
++#define EAP_MAX 7
  
  #define EA_CODE(proto,id) (((proto) << 8) | (id))
  #define EA_PROTO(ea) ((ea) >> 8)

net/bird/files/patch-tools-Makefile.in

@@ -1,8 +1,8 @@
---- tools/Makefile.in.orig	2012-08-07 13:15:45.000000000 +0400
-+++ tools/Makefile.in	2012-08-15 15:51:51.000000000 +0400
-@@ -61,11 +61,7 @@
+--- tools/Makefile.in.orig	2016-04-29 09:13:23 UTC
++++ tools/Makefile.in
+@@ -77,11 +77,7 @@ install: all
  	if test -n "@CLIENT@" ; then								\
- 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
+ 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
  	fi
 -	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
 -		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\

net/bird/files/patch-tools-Rules.in

@@ -1,12 +1,13 @@
---- tools/Rules.in.orig	2010-10-10 21:48:20.000000000 +0200
-+++ tools/Rules.in	2010-12-18 15:00:27.000000000 +0100
-@@ -66,9 +66,7 @@
+--- tools/Rules.in.orig	2016-04-29 09:13:23 UTC
++++ tools/Rules.in
+@@ -66,10 +66,8 @@ else
  subdir: all.o
  
  all.o: $(objs)
 -#       $(LD) -r -o $@ $^
 -#	Changed to $(CC) because $(LD) has problems with crosscompiling
--	$(CC) -nostdlib -r -o $@ $^
+ 	@echo LD -r -o $@ $^
+-	@$(CC) -nostdlib -r -o $@ $^
 +	$(LD) -r -o $@ $^
  
  endif

net/bird6/Makefile

@@ -7,8 +7,6 @@ DISTNAME=	bird-${PORTVERSION}
 
 MASTERDIR=	${.CURDIR}/../bird
 
-OPTIONS_DEFINE=	EXP
-
 USE_RC_SUBR=	${PORTNAME}
 
 PLIST_SUB=	VER="6"