- Fix build on head after r263203 removed some unused defines.

- Try again to make portscout ignore this.

2 files changed, 18 insertions, 5 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 1afad14b6fa5..24ba06949d1d 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -28,7 +28,7 @@ USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/zebra
 
-PORTSCOUT=	ignore:0.95
+PORTSCOUT=	ignore:1
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
 
diff --git a/net/zebra/files/patch-zebra-kernel_socket.c b/net/zebra/files/patch-zebra-kernel_socket.c
index ef9a61cea8b7..d8868e362e9c 100644
--- a/net/zebra/files/patch-zebra-kernel_socket.c
+++ b/net/zebra/files/patch-zebra-kernel_socket.c
@@ -1,6 +1,19 @@
---- zebra/kernel_socket.c.orig	2003-11-28 01:35:50.000000000 +0900
-+++ zebra/kernel_socket.c	2010-01-26 15:13:19.000000000 +0900
-@@ -91,9 +91,13 @@
+--- ./zebra/kernel_socket.c.orig	2003-11-27 10:35:50.000000000 -0600
++++ ./zebra/kernel_socket.c	2014-06-13 12:53:05.553677585 -0500
+@@ -58,8 +58,12 @@
+   {RTM_REDIRECT, "RTM_REDIRECT"},
+   {RTM_MISS,     "RTM_MISS"},
+   {RTM_LOCK,     "RTM_LOCK"},
++#ifdef RTM_OLDADD
+   {RTM_OLDADD,   "RTM_OLDADD"},
++#endif
++#ifdef RTM_OLDDEL
+   {RTM_OLDDEL,   "RTM_OLDDEL"},
++#endif
+   {RTM_RESOLVE,  "RTM_RESOLVE"},
+   {RTM_NEWADDR,  "RTM_NEWADDR"},
+   {RTM_DELADDR,  "RTM_DELADDR"},
+@@ -91,9 +95,13 @@
  #ifdef RTF_MASK
    {RTF_MASK,      "MASK"},
  #endif /* RTF_MASK */
@@ -14,7 +27,7 @@
    {RTF_STATIC,    "STATIC"},
    {RTF_BLACKHOLE, "BLACKHOLE"},
    {RTF_PROTO1,    "PROTO1"},
-@@ -593,9 +597,11 @@
+@@ -593,9 +601,11 @@
    if (gate && message == RTM_ADD)
      msg.rtm.rtm_flags |= RTF_GATEWAY;