net/xorp: fix build

PR:		217152
Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
Reported by:	O. Hartmann <ohartmann@walstatt.org>
Approved by:	hrs (maintainer timeout)

22 files changed, 996 insertions, 4 deletions

diff --git a/net/xorp/files/patch-SConstruct b/net/xorp/files/patch-SConstruct
index 100b45bb6315..c90d20c9f08e 100644
--- a/net/xorp/files/patch-SConstruct
+++ b/net/xorp/files/patch-SConstruct
@@ -1,4 +1,4 @@
---- SConstruct.orig	2012-01-11 17:56:10 UTC
+--- SConstruct.orig	2018-07-11 16:37:51 UTC
 +++ SConstruct
 @@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
  
@@ -25,11 +25,55 @@
  		  variables = vars)
  
  prefix = env['prefix']
-@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [
-     '-Wcast-align',
+@@ -853,20 +844,6 @@ if env['enable_boost']:
+ 
+ # Some platforms have alignment warnings that cannot easily be
+ # fixed, so we can't enable Werror for them.
+-if ((build != "i386-pc-mingw32") and
+-    (host_cpu == "i686" or
+-     host_cpu == "i386" or
+-     host_cpu == "x86_64")):
+-        env.AppendUnique(CFLAGS = [
+-	        '-Werror',
+-		])
+-	env.AppendUnique(CXXFLAGS = [
+-		'-Werror',
+-		])
+-else:
+-	print "WARNING:  Detected funky platform, will not enable -Werror compile option: ", host_cpu
+-	
+-
+ # NOTE: gcc specific flags.
+ env.AppendUnique(CFLAGS = [
+     '-W',
+@@ -874,12 +851,14 @@ env.AppendUnique(CFLAGS = [
+     '-Wwrite-strings',
+     '-Wbad-function-cast',
+     '-Wmissing-prototypes',
+-    '-Wcast-qual',
++    '-Wno-cast-qual',
++    '-Wno-sign-compare',
+     '-Wmissing-declarations',
+     '-Wpointer-arith',
+-    '-Wcast-align',
      '-Wstrict-prototypes',
      '-Wnested-externs',
 +    '-Wno-unused-function',
++    '-Wno-unused-parameter',
+     '-pipe',
+     ])
+ 
+@@ -887,11 +866,10 @@ env.AppendUnique(CXXFLAGS = [
+     '-W',
+     '-Wall',
+     '-Wwrite-strings',
+-    '-Wcast-qual',
++    '-Wno-cast-qual',
++    '-Wno-sign-compare', 
+     '-Wpointer-arith',
+-    '-Wcast-align',
+     '-Woverloaded-virtual',
+-    '-ftemplate-depth-25',
      '-pipe',
      ])
  
diff --git a/net/xorp/files/patch-cplfile.c b/net/xorp/files/patch-cplfile.c
new file mode 100644
index 000000000000..8ea108c3e38e
--- /dev/null
+++ b/net/xorp/files/patch-cplfile.c
@@ -0,0 +1,35 @@
+--- cli/libtecla/cplfile.c.orig	2018-07-11 16:49:26 UTC
++++ cli/libtecla/cplfile.c
+@@ -314,7 +314,7 @@ int _cf_complete_file(WordCompletion *cp
+  * might be the start of the last component, and mark the character
+  * that follows it as the start of the name that is to be completed.
+  */
+-      if(nleft >= FS_DIR_SEP_LEN &&
++      if((unsigned long)(nleft) >= FS_DIR_SEP_LEN &&
+ 	 strncmp(lptr + seglen, FS_DIR_SEP, FS_DIR_SEP_LEN)==0) {
+ 	word_start = (lptr + seglen) - line + FS_DIR_SEP_LEN;
+       };
+@@ -394,12 +394,12 @@ int _cf_complete_file(WordCompletion *cp
+ /*
+  * Prevent extra directory separators from being added.
+  */
+-	if(nleft >= FS_DIR_SEP_LEN &&
++	if((unsigned long)(nleft) >= FS_DIR_SEP_LEN &&
+ 	   strcmp(cf->path->name, FS_ROOT_DIR) == 0 &&
+ 	   strncmp(lptr, FS_DIR_SEP, FS_DIR_SEP_LEN) == 0) {
+ 	  lptr += FS_DIR_SEP_LEN;
+ 	  nleft -= FS_DIR_SEP_LEN;
+-	} else if(vlen > FS_DIR_SEP_LEN &&
++	} else if((unsigned long)(vlen) > FS_DIR_SEP_LEN &&
+ 		  strcmp(value + vlen - FS_DIR_SEP_LEN, FS_DIR_SEP)==0) {
+ 	  cf->path->name[vlen-FS_DIR_SEP_LEN] = '\0';
+ 	};
+@@ -781,7 +781,7 @@ static char *cf_read_name(CompleteFile *
+  * Get the environment variable name that follows the dollar.
+  */
+   for(sptr=string,namlen=0;
+-      namlen < nmax && (slen-namlen < FS_DIR_SEP_LEN ||
++      namlen < nmax && ((unsigned long)(slen-namlen) < FS_DIR_SEP_LEN ||
+ 			strncmp(sptr, FS_DIR_SEP, FS_DIR_SEP_LEN) != 0);
+       namlen++) {
+     nambuf[namlen] = *sptr++;
diff --git a/net/xorp/files/patch-element.hh b/net/xorp/files/patch-element.hh
new file mode 100644
index 000000000000..a8eb1e679034
--- /dev/null
+++ b/net/xorp/files/patch-element.hh
@@ -0,0 +1,11 @@
+--- policy/common/element.hh.orig	2018-07-03 02:07:04 UTC
++++ policy/common/element.hh
+@@ -24,6 +24,7 @@
+ #define __POLICY_COMMON_ELEMENT_HH__
+ 
+ 
++#pragma clang diagnostic ignored "-Wundefined-var-template"
+ 
+ #include "libxorp/ipv4.hh"
+ #include "libxorp/ipv6.hh"
+
diff --git a/net/xorp/files/patch-expand.c b/net/xorp/files/patch-expand.c
new file mode 100644
index 000000000000..6860698f32bb
--- /dev/null
+++ b/net/xorp/files/patch-expand.c
@@ -0,0 +1,11 @@
+--- cli/libtecla/expand.c.orig	2018-07-11 16:57:16 UTC
++++ cli/libtecla/expand.c
+@@ -322,7 +322,7 @@ FileExpansion *ef_expand_file(ExpandFile
+  * If the caller specified that the whole of path[] be matched,
+  * work out the corresponding length.
+  */
+-  if(pathlen < 0 || pathlen > strlen(path))
++  if(pathlen < 0 || (unsigned long)(pathlen) > strlen(path))
+     pathlen = strlen(path);
+ /*
+  * Discard previous expansion results.
diff --git a/net/xorp/files/patch-getline.c b/net/xorp/files/patch-getline.c
new file mode 100644
index 000000000000..9f8d7af463d5
--- /dev/null
+++ b/net/xorp/files/patch-getline.c
@@ -0,0 +1,56 @@
+--- cli/libtecla/getline.c.orig	2018-07-11 18:33:06 UTC
++++ cli/libtecla/getline.c
+@@ -2180,7 +2180,7 @@ static int gl_add_char_to_line(GetLine *
+  * If not, simply return, leaving it up to the calling program
+  * to check for the absence of a newline character.
+  */
+-  if((gl->insert || buff_curpos >= gl->ntotal) && gl->ntotal >= gl->linelen)
++  if((gl->insert || buff_curpos >= gl->ntotal) && (unsigned long)(gl->ntotal) >= gl->linelen)
+     return 0;
+ /*
+  * Are we adding characters to the line (ie. inserting or appending)?
+@@ -2310,7 +2310,7 @@ static int gl_add_string_to_line(GetLine
+  * If not, simply return, leaving it up to the calling program
+  * to check for the absence of a newline character.
+  */
+-  if(gl->ntotal + buff_slen > gl->linelen)
++  if((unsigned long)((gl->ntotal + buff_slen)) > gl->linelen)
+     return 0;
+ /*
+  * Move the characters that follow the cursor in the buffer by
+@@ -4581,7 +4581,7 @@ static KT_KEY_FN(gl_complete_word)
+ /*
+  * Will there be space for the expansion in the line buffer?
+  */
+-      if(gl->ntotal + nextra < gl->linelen) {
++      if((unsigned long)((gl->ntotal + nextra)) < gl->linelen) {
+ /*
+  * Make room to insert the filename extension.
+  */
+@@ -4726,7 +4726,7 @@ static KT_KEY_FN(gl_expand_filename)
+ /*
+  * Will there be space for the expansion in the line buffer?
+  */
+-  if(gl->ntotal + nextra >= gl->linelen) {
++  if((unsigned long)((gl->ntotal + nextra)) >= gl->linelen) {
+     fprintf(stderr, "\r\nInsufficient room in line for file expansion.\r\n");
+     redisplay = 1;
+   } else {
+@@ -7104,7 +7104,7 @@ static int gl_interpret_char(GetLine *gl
+  * input line buffer, and watch for the end of the line.
+  */
+   if(gl->editor == GL_NO_EDITOR) {
+-    if(gl->ntotal >= gl->linelen) {
++    if((unsigned long)(gl->ntotal) >= gl->linelen) {
+       ret = 0;
+       goto ret_label;
+     }
+@@ -7813,7 +7813,7 @@ int gl_group_history(GetLine *gl, unsign
+ /*
+  * If the group isn't being changed, do nothing.
+  */
+-  if(_glh_get_group(gl->glh) == id)
++  if((unsigned int)((_glh_get_group(gl->glh))) == id)
+     return 0;
+ /*
+  * Establish the new group.
diff --git a/net/xorp/files/patch-history.c b/net/xorp/files/patch-history.c
new file mode 100644
index 000000000000..3f12f88f1359
--- /dev/null
+++ b/net/xorp/files/patch-history.c
@@ -0,0 +1,48 @@
+--- cli/libtecla/history.c.orig	2018-07-11 18:08:59 UTC
++++ cli/libtecla/history.c
+@@ -253,7 +253,7 @@ int _glh_add_history(GlHistory *glh, con
+ /*
+  * If the line is too big to fit in the buffer, truncate it.
+  */
+-  if(nchar > glh->buflen)
++  if((unsigned long)(nchar) > glh->buflen)
+     nchar = glh->buflen;
+ /*
+  * Is the line empty?
+@@ -272,7 +272,7 @@ int _glh_add_history(GlHistory *glh, con
+  * don't add it again, unless explicitly told to.
+  */
+   if(!force &&
+-     list->tail && strlen(glh->buffer + list->tail->start) == nchar-1 &&
++     list->tail && strlen(glh->buffer + list->tail->start) == (unsigned long)((nchar-1)) &&
+      strncmp(line, glh->buffer + list->tail->start, nchar-1)==0)
+     return 0;
+ /*
+@@ -311,7 +311,7 @@ int _glh_add_history(GlHistory *glh, con
+  * at the end of the buffer, then shift the remaining contents
+  * of the buffer to the end of the buffer.
+  */
+-    if(start + nchar >= glh->buflen) {
++    if(start + (unsigned long)(nchar) >= glh->buflen) {
+       GlLineNode *last; /* The last line in the buffer */
+       GlLineNode *ln;   /* A member of the list of line locations */
+       int shift;        /* The shift needed to move the contents of the */
+@@ -1897,15 +1897,15 @@ static GlLineNode *_glh_find_id(GlHistor
+ /*
+  * Search forwards from 'node'?
+  */
+-  if(node->id < id) {
+-    while(node && node->id != id)
++  if((unsigned long)(node->id) < id) {
++    while(node && (unsigned long)(node->id) != id)
+       node = node->next;
+     glh->id_node = node ? node : glh->list.tail;
+ /*
+  * Search backwards from 'node'?
+  */
+   } else {
+-    while(node && node->id != id)
++    while(node && (unsigned long)(node->id) != id)
+       node = node->prev;
+     glh->id_node = node ? node : glh->list.head;
+   };
diff --git a/net/xorp/files/patch-homedir.c b/net/xorp/files/patch-homedir.c
new file mode 100644
index 000000000000..9810a53ba03b
--- /dev/null
+++ b/net/xorp/files/patch-homedir.c
@@ -0,0 +1,11 @@
+--- cli/libtecla/homedir.c.orig	2018-07-11 18:41:32 UTC
++++ cli/libtecla/homedir.c
+@@ -146,7 +146,7 @@ HomeDir *_new_HomeDir(void)
+  * a pathname, increase its length.
+  */
+   pathlen = _pu_pathname_dim();
+-  if(pathlen > home->buflen)
++  if(pathlen > (unsigned long)(home->buflen))
+     home->buflen = pathlen;
+ /*
+  * Allocate a work buffer.
diff --git a/net/xorp/files/patch-io__ip__socket.cc b/net/xorp/files/patch-io__ip__socket.cc
new file mode 100644
index 000000000000..2a8fe35a5f12
--- /dev/null
+++ b/net/xorp/files/patch-io__ip__socket.cc
@@ -0,0 +1,16 @@
+--- fea/data_plane/io/io_ip_socket.cc.orig	2018-07-10 15:49:50 UTC
++++ fea/data_plane/io/io_ip_socket.cc
+@@ -2293,10 +2293,10 @@ IoIpSocket::send_packet(const string& if
+ 	    //
+ 	    struct sockaddr_in sin;
+ 	    src_address.copy_out(sin);
+-	    if (bind(_proto_socket_out,
++	    bind(_proto_socket_out,
+ 		     reinterpret_cast<struct sockaddr*>(&sin),
+-		     sizeof(sin))
+-		< 0) {
++		     sizeof(sin));
++		if ( reinterpret_cast<struct sockaddr*>(&sin) < ((void*)0)) {
+ 		error_msg = c_format("raw socket bind(%s) failed: %s",
+ 				     cstring(src_address), XSTRERROR);
+ 		XLOG_ERROR("%s", error_msg.c_str());
diff --git a/net/xorp/files/patch-lex.boot.cc b/net/xorp/files/patch-lex.boot.cc
new file mode 100644
index 000000000000..2a6f0f1b046d
--- /dev/null
+++ b/net/xorp/files/patch-lex.boot.cc
@@ -0,0 +1,119 @@
+--- rtrmgr/lex.boot.cc.orig	2018-07-12 14:00:49 UTC
++++ rtrmgr/lex.boot.cc
+@@ -9674,9 +9674,9 @@ YY_MALLOC_DECL
+ 
+ YY_DECL
+ 	{
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp, *yy_bp;
+-	register int yy_act;
++	yy_state_type yy_current_state;
++	char *yy_cp, *yy_bp;
++	int yy_act;
+ 
+ #line 242 "boot.ll"
+ 
+@@ -9723,7 +9723,7 @@ YY_DECL
+ yy_match:
+ 		do
+ 			{
+-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
++			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ 			if ( yy_accept[yy_current_state] )
+ 				{
+ 				yy_last_accepting_state = yy_current_state;
+@@ -10246,9 +10246,9 @@ case YY_STATE_EOF(arith):
+ 
+ static int yy_get_next_buffer()
+ 	{
+-	register char *dest = yy_current_buffer->yy_ch_buf;
+-	register char *source = yytext_ptr;
+-	register int number_to_move, i;
++	char *dest = yy_current_buffer->yy_ch_buf;
++	char *source = yytext_ptr;
++	int number_to_move, i;
+ 	int ret_val;
+ 
+ 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+@@ -10378,14 +10378,14 @@ static int yy_get_next_buffer()
+ 
+ static yy_state_type yy_get_previous_state()
+ 	{
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp;
++	yy_state_type yy_current_state;
++	char *yy_cp;
+ 
+ 	yy_current_state = yy_start;
+ 
+ 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+ 		{
+-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
++		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ 		if ( yy_accept[yy_current_state] )
+ 			{
+ 			yy_last_accepting_state = yy_current_state;
+@@ -10417,10 +10417,10 @@ static yy_state_type yy_try_NUL_trans( y
+ yy_state_type yy_current_state;
+ #endif
+ 	{
+-	register int yy_is_jam;
+-	register char *yy_cp = yy_c_buf_p;
++	int yy_is_jam;
++	char *yy_cp = yy_c_buf_p;
+ 
+-	register YY_CHAR yy_c = 1;
++	YY_CHAR yy_c = 1;
+ 	if ( yy_accept[yy_current_state] )
+ 		{
+ 		yy_last_accepting_state = yy_current_state;
+@@ -10441,14 +10441,14 @@ yy_state_type yy_current_state;
+ 
+ #ifndef YY_NO_UNPUT
+ #ifdef YY_USE_PROTOS
+-static void yyunput( int c, register char *yy_bp )
++static void yyunput( int c, char *yy_bp )
+ #else
+ static void yyunput( c, yy_bp )
+ int c;
+-register char *yy_bp;
++char *yy_bp;
+ #endif
+ 	{
+-	register char *yy_cp = yy_c_buf_p;
++	char *yy_cp = yy_c_buf_p;
+ 
+ 	/* undo effects of setting up yytext */
+ 	*yy_cp = yy_hold_char;
+@@ -10456,10 +10456,10 @@ register char *yy_bp;
+ 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ 		{ /* need to shift things up to make room */
+ 		/* +2 for EOB chars. */
+-		register int number_to_move = yy_n_chars + 2;
+-		register char *dest = &yy_current_buffer->yy_ch_buf[
++		int number_to_move = yy_n_chars + 2;
++		char *dest = &yy_current_buffer->yy_ch_buf[
+ 					yy_current_buffer->yy_buf_size + 2];
+-		register char *source =
++		char *source =
+ 				&yy_current_buffer->yy_ch_buf[number_to_move];
+ 
+ 		while ( source > yy_current_buffer->yy_ch_buf )
+@@ -10921,7 +10921,7 @@ yyconst char *s2;
+ int n;
+ #endif
+ 	{
+-	register int i;
++	int i;
+ 	for ( i = 0; i < n; ++i )
+ 		s1[i] = s2[i];
+ 	}
+@@ -10935,7 +10935,7 @@ static int yy_flex_strlen( s )
+ yyconst char *s;
+ #endif
+ 	{
+-	register int n;
++	int n;
+ 	for ( n = 0; s[n]; ++n )
+ 		;
+ 
diff --git a/net/xorp/files/patch-lex.opcmd.cc b/net/xorp/files/patch-lex.opcmd.cc
new file mode 100644
index 000000000000..7250b0359593
--- /dev/null
+++ b/net/xorp/files/patch-lex.opcmd.cc
@@ -0,0 +1,119 @@
+--- rtrmgr/lex.opcmd.cc.orig	2018-07-12 13:48:34 UTC
++++ rtrmgr/lex.opcmd.cc
+@@ -640,9 +640,9 @@ YY_MALLOC_DECL
+ 
+ YY_DECL
+ 	{
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp, *yy_bp;
+-	register int yy_act;
++	yy_state_type yy_current_state;
++	char *yy_cp, *yy_bp;
++	int yy_act;
+ 
+ #line 31 "op_commands.ll"
+ 
+@@ -689,7 +689,7 @@ YY_DECL
+ yy_match:
+ 		do
+ 			{
+-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
++			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ 			if ( yy_accept[yy_current_state] )
+ 				{
+ 				yy_last_accepting_state = yy_current_state;
+@@ -1085,9 +1085,9 @@ case YY_STATE_EOF(string):
+ 
+ static int yy_get_next_buffer()
+ 	{
+-	register char *dest = yy_current_buffer->yy_ch_buf;
+-	register char *source = yytext_ptr;
+-	register int number_to_move, i;
++	char *dest = yy_current_buffer->yy_ch_buf;
++	char *source = yytext_ptr;
++	int number_to_move, i;
+ 	int ret_val;
+ 
+ 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+@@ -1217,14 +1217,14 @@ static int yy_get_next_buffer()
+ 
+ static yy_state_type yy_get_previous_state()
+ 	{
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp;
++	yy_state_type yy_current_state;
++	char *yy_cp;
+ 
+ 	yy_current_state = yy_start;
+ 
+ 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+ 		{
+-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
++		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ 		if ( yy_accept[yy_current_state] )
+ 			{
+ 			yy_last_accepting_state = yy_current_state;
+@@ -1256,10 +1256,10 @@ static yy_state_type yy_try_NUL_trans( y
+ yy_state_type yy_current_state;
+ #endif
+ 	{
+-	register int yy_is_jam;
+-	register char *yy_cp = yy_c_buf_p;
++	int yy_is_jam;
++	char *yy_cp = yy_c_buf_p;
+ 
+-	register YY_CHAR yy_c = 1;
++	YY_CHAR yy_c = 1;
+ 	if ( yy_accept[yy_current_state] )
+ 		{
+ 		yy_last_accepting_state = yy_current_state;
+@@ -1280,14 +1280,14 @@ yy_state_type yy_current_state;
+ 
+ #ifndef YY_NO_UNPUT
+ #ifdef YY_USE_PROTOS
+-static void yyunput( int c, register char *yy_bp )
++static void yyunput( int c, char *yy_bp )
+ #else
+ static void yyunput( c, yy_bp )
+ int c;
+-register char *yy_bp;
++char *yy_bp;
+ #endif
+ 	{
+-	register char *yy_cp = yy_c_buf_p;
++	char *yy_cp = yy_c_buf_p;
+ 
+ 	/* undo effects of setting up yytext */
+ 	*yy_cp = yy_hold_char;
+@@ -1295,10 +1295,10 @@ register char *yy_bp;
+ 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ 		{ /* need to shift things up to make room */
+ 		/* +2 for EOB chars. */
+-		register int number_to_move = yy_n_chars + 2;
+-		register char *dest = &yy_current_buffer->yy_ch_buf[
++		int number_to_move = yy_n_chars + 2;
++		char *dest = &yy_current_buffer->yy_ch_buf[
+ 					yy_current_buffer->yy_buf_size + 2];
+-		register char *source =
++		char *source =
+ 				&yy_current_buffer->yy_ch_buf[number_to_move];
+ 
+ 		while ( source > yy_current_buffer->yy_ch_buf )
+@@ -1760,7 +1760,7 @@ yyconst char *s2;
+ int n;
+ #endif
+ 	{
+-	register int i;
++	int i;
+ 	for ( i = 0; i < n; ++i )
+ 		s1[i] = s2[i];
+ 	}
+@@ -1774,7 +1774,7 @@ static int yy_flex_strlen( s )
+ yyconst char *s;
+ #endif
+ 	{
+-	register int n;
++	int n;
+ 	for ( n = 0; s[n]; ++n )
+ 		;
+ 
diff --git a/net/xorp/files/patch-lex.tplt.cc b/net/xorp/files/patch-lex.tplt.cc
new file mode 100644
index 000000000000..3a8127b35f69
--- /dev/null
+++ b/net/xorp/files/patch-lex.tplt.cc
@@ -0,0 +1,119 @@
+--- rtrmgr/lex.tplt.cc.orig	2018-07-12 13:54:23 UTC
++++ rtrmgr/lex.tplt.cc
+@@ -8789,9 +8789,9 @@ YY_MALLOC_DECL
+ 
+ YY_DECL
+ 	{
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp, *yy_bp;
+-	register int yy_act;
++	yy_state_type yy_current_state;
++	char *yy_cp, *yy_bp;
++	int yy_act;
+ 
+ #line 230 "template.ll"
+ 
+@@ -8838,7 +8838,7 @@ YY_DECL
+ yy_match:
+ 		do
+ 			{
+-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
++			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ 			if ( yy_accept[yy_current_state] )
+ 				{
+ 				yy_last_accepting_state = yy_current_state;
+@@ -9471,9 +9471,9 @@ case YY_STATE_EOF(string):
+ 
+ static int yy_get_next_buffer()
+ 	{
+-	register char *dest = yy_current_buffer->yy_ch_buf;
+-	register char *source = yytext_ptr;
+-	register int number_to_move, i;
++	char *dest = yy_current_buffer->yy_ch_buf;
++	char *source = yytext_ptr;
++	int number_to_move, i;
+ 	int ret_val;
+ 
+ 	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+@@ -9603,14 +9603,14 @@ static int yy_get_next_buffer()
+ 
+ static yy_state_type yy_get_previous_state()
+ 	{
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp;
++	yy_state_type yy_current_state;
++	char *yy_cp;
+ 
+ 	yy_current_state = yy_start;
+ 
+ 	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+ 		{
+-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
++		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ 		if ( yy_accept[yy_current_state] )
+ 			{
+ 			yy_last_accepting_state = yy_current_state;
+@@ -9642,10 +9642,10 @@ static yy_state_type yy_try_NUL_trans( y
+ yy_state_type yy_current_state;
+ #endif
+ 	{
+-	register int yy_is_jam;
+-	register char *yy_cp = yy_c_buf_p;
++	int yy_is_jam;
++	char *yy_cp = yy_c_buf_p;
+ 
+-	register YY_CHAR yy_c = 1;
++	YY_CHAR yy_c = 1;
+ 	if ( yy_accept[yy_current_state] )
+ 		{
+ 		yy_last_accepting_state = yy_current_state;
+@@ -9666,14 +9666,14 @@ yy_state_type yy_current_state;
+ 
+ #ifndef YY_NO_UNPUT
+ #ifdef YY_USE_PROTOS
+-static void yyunput( int c, register char *yy_bp )
++static void yyunput( int c, char *yy_bp )
+ #else
+ static void yyunput( c, yy_bp )
+ int c;
+-register char *yy_bp;
++char *yy_bp;
+ #endif
+ 	{
+-	register char *yy_cp = yy_c_buf_p;
++	char *yy_cp = yy_c_buf_p;
+ 
+ 	/* undo effects of setting up yytext */
+ 	*yy_cp = yy_hold_char;
+@@ -9681,10 +9681,10 @@ register char *yy_bp;
+ 	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+ 		{ /* need to shift things up to make room */
+ 		/* +2 for EOB chars. */
+-		register int number_to_move = yy_n_chars + 2;
+-		register char *dest = &yy_current_buffer->yy_ch_buf[
++		int number_to_move = yy_n_chars + 2;
++		char *dest = &yy_current_buffer->yy_ch_buf[
+ 					yy_current_buffer->yy_buf_size + 2];
+-		register char *source =
++		char *source =
+ 				&yy_current_buffer->yy_ch_buf[number_to_move];
+ 
+ 		while ( source > yy_current_buffer->yy_ch_buf )
+@@ -10146,7 +10146,7 @@ yyconst char *s2;
+ int n;
+ #endif
+ 	{
+-	register int i;
++	int i;
+ 	for ( i = 0; i < n; ++i )
+ 		s1[i] = s2[i];
+ 	}
+@@ -10160,7 +10160,7 @@ static int yy_flex_strlen( s )
+ yyconst char *s;
+ #endif
+ 	{
+-	register int n;
++	int n;
+ 	for ( n = 0; s[n]; ++n )
+ 		;
+ 
diff --git a/net/xorp/files/patch-lex.yy__policy__backend__parser.cc b/net/xorp/files/patch-lex.yy__policy__backend__parser.cc
new file mode 100644
index 000000000000..2983dfb4120c
--- /dev/null
+++ b/net/xorp/files/patch-lex.yy__policy__backend__parser.cc
@@ -0,0 +1,87 @@
+--- policy/backend/lex.yy_policy_backend_parser.cc.orig	2018-07-10 15:46:56 UTC
++++ policy/backend/lex.yy_policy_backend_parser.cc
+@@ -728,9 +728,9 @@ extern int yy_policy_backend_parserlex (
+  */
+ YY_DECL
+ {
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp, *yy_bp;
+-	register int yy_act;
++	yy_state_type yy_current_state;
++	char *yy_cp, *yy_bp;
++	int yy_act;
+     
+ #line 40 "backend.l"
+ 
+@@ -779,7 +779,7 @@ YY_DECL
+ yy_match:
+ 		do
+ 			{
+-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
++			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ 			if ( yy_accept[yy_current_state] )
+ 				{
+ 				(yy_last_accepting_state) = yy_current_state;
+@@ -1171,9 +1171,9 @@ case YY_STATE_EOF(STR):
+  */
+ static int yy_get_next_buffer (void)
+ {
+-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+-	register char *source = (yytext_ptr);
+-	register int number_to_move, i;
++    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
++	char *source = (yytext_ptr);
++	int number_to_move, i;
+ 	int ret_val;
+ 
+ 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+@@ -1297,14 +1297,14 @@ static int yy_get_next_buffer (void)
+ 
+     static yy_state_type yy_get_previous_state (void)
+ {
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp;
++	yy_state_type yy_current_state;
++	char *yy_cp;
+     
+ 	yy_current_state = (yy_start);
+ 
+ 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+ 		{
+-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
++		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ 		if ( yy_accept[yy_current_state] )
+ 			{
+ 			(yy_last_accepting_state) = yy_current_state;
+@@ -1329,10 +1329,10 @@ static int yy_get_next_buffer (void)
+  */
+     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+ {
+-	register int yy_is_jam;
+-    	register char *yy_cp = (yy_c_buf_p);
++	int yy_is_jam;
++    	char *yy_cp = (yy_c_buf_p);
+ 
+-	register YY_CHAR yy_c = 1;
++	YY_CHAR yy_c = 1;
+ 	if ( yy_accept[yy_current_state] )
+ 		{
+ 		(yy_last_accepting_state) = yy_current_state;
+@@ -1933,7 +1933,7 @@ int yy_policy_backend_parserlex_destroy 
+ #ifndef yytext_ptr
+ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+ {
+-	register int i;
++	int i;
+ 	for ( i = 0; i < n; ++i )
+ 		s1[i] = s2[i];
+ }
+@@ -1942,7 +1942,7 @@ static void yy_flex_strncpy (char* s1, y
+ #ifdef YY_NEED_STRLEN
+ static int yy_flex_strlen (yyconst char * s )
+ {
+-	register int n;
++	int n;
+ 	for ( n = 0; s[n]; ++n )
+ 		;
+ 
diff --git a/net/xorp/files/patch-lex.yy__policy__parser.cc b/net/xorp/files/patch-lex.yy__policy__parser.cc
new file mode 100644
index 000000000000..b740e2442f92
--- /dev/null
+++ b/net/xorp/files/patch-lex.yy__policy__parser.cc
@@ -0,0 +1,87 @@
+--- policy/lex.yy_policy_parser.cc.orig	2018-07-12 13:40:14 UTC
++++ policy/lex.yy_policy_parser.cc
+@@ -3092,9 +3092,9 @@ extern int yy_policy_parserlex (void);
+  */
+ YY_DECL
+ {
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp, *yy_bp;
+-	register int yy_act;
++	yy_state_type yy_current_state;
++	char *yy_cp, *yy_bp;
++	int yy_act;
+     
+ #line 62 "policy.l"
+ 
+@@ -3143,7 +3143,7 @@ YY_DECL
+ yy_match:
+ 		do
+ 			{
+-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
++			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ 			if ( yy_accept[yy_current_state] )
+ 				{
+ 				(yy_last_accepting_state) = yy_current_state;
+@@ -3667,9 +3667,9 @@ case YY_STATE_EOF(STR):
+  */
+ static int yy_get_next_buffer (void)
+ {
+-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+-	register char *source = (yytext_ptr);
+-	register int number_to_move, i;
++    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
++	char *source = (yytext_ptr);
++	int number_to_move, i;
+ 	int ret_val;
+ 
+ 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+@@ -3793,14 +3793,14 @@ static int yy_get_next_buffer (void)
+ 
+     static yy_state_type yy_get_previous_state (void)
+ {
+-	register yy_state_type yy_current_state;
+-	register char *yy_cp;
++	yy_state_type yy_current_state;
++	char *yy_cp;
+     
+ 	yy_current_state = (yy_start);
+ 
+ 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+ 		{
+-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
++		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+ 		if ( yy_accept[yy_current_state] )
+ 			{
+ 			(yy_last_accepting_state) = yy_current_state;
+@@ -3825,10 +3825,10 @@ static int yy_get_next_buffer (void)
+  */
+     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+ {
+-	register int yy_is_jam;
+-    	register char *yy_cp = (yy_c_buf_p);
++	int yy_is_jam;
++    	char *yy_cp = (yy_c_buf_p);
+ 
+-	register YY_CHAR yy_c = 1;
++	YY_CHAR yy_c = 1;
+ 	if ( yy_accept[yy_current_state] )
+ 		{
+ 		(yy_last_accepting_state) = yy_current_state;
+@@ -4429,7 +4429,7 @@ int yy_policy_parserlex_destroy  (void)
+ #ifndef yytext_ptr
+ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+ {
+-	register int i;
++	int i;
+ 	for ( i = 0; i < n; ++i )
+ 		s1[i] = s2[i];
+ }
+@@ -4438,7 +4438,7 @@ static void yy_flex_strncpy (char* s1, y
+ #ifdef YY_NEED_STRLEN
+ static int yy_flex_strlen (yyconst char * s )
+ {
+-	register int n;
++	int n;
+ 	for ( n = 0; s[n]; ++n )
+ 		;
+ 
diff --git a/net/xorp/files/patch-libproto__packet.cc b/net/xorp/files/patch-libproto__packet.cc
index 15d166b23fcb..8ce7f5a83c28 100644
--- a/net/xorp/files/patch-libproto__packet.cc
+++ b/net/xorp/files/patch-libproto__packet.cc
@@ -1,5 +1,16 @@
---- libproto/packet.cc.orig	2012-01-11 17:56:10 UTC
+--- libproto/packet.cc.orig	2018-07-10 12:55:07 UTC
 +++ libproto/packet.cc
+@@ -88,8 +88,8 @@ IpHeader4::fragment(size_t mtu, list<vec
+     //
+     memcpy(&frag_buf[0], _data, IpHeader4::SIZE);
+     {
+-	register const u_char *cp;
+-	register u_char *dp;
++	const u_char *cp;
++	u_char *dp;
+ 	int opt, optlen, cnt;
+ 
+ 	cp = (const u_char *)(orig_ip4.data() + orig_ip4.size());
 @@ -233,7 +233,7 @@ IpHeader4Writer::compute_checksum()
  }
  
diff --git a/net/xorp/files/patch-netstream__access.h b/net/xorp/files/patch-netstream__access.h
new file mode 100644
index 000000000000..407cca2d2c7c
--- /dev/null
+++ b/net/xorp/files/patch-netstream__access.h
@@ -0,0 +1,74 @@
+--- mrt/netstream_access.h.orig	2018-07-12 13:27:04 UTC
++++ mrt/netstream_access.h
+@@ -120,7 +120,7 @@ do {									\
+ 
+ #define GET_HOST_16(val, cp, rcvlen)					\
+ do {									\
+-	register uint16_t v_;						\
++	uint16_t v_;						\
+ 									\
+ 	if ((size_t)(rcvlen) < (size_t)2)				\
+ 		goto rcvlen_error;					\
+@@ -132,7 +132,7 @@ do {									\
+ 
+ #define PUT_HOST_16(val, cp, buflen)					\
+ do {									\
+-	register uint16_t v_;						\
++	uint16_t v_;						\
+ 									\
+ 	if ((size_t)(buflen) < (size_t)2)				\
+ 		goto buflen_error;					\
+@@ -145,7 +145,7 @@ do {									\
+ #if defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN)
+ #define GET_NET_16(val, cp, rcvlen)					\
+ do {									\
+-	register uint16_t v_;						\
++	uint16_t v_;						\
+ 									\
+ 	if ((size_t)(rcvlen) < (size_t)2)				\
+ 		goto rcvlen_error;					\
+@@ -156,7 +156,7 @@ do {									\
+ } while (0)
+ #define PUT_NET_16(val, cp, buflen)					\
+ do {									\
+-	register uint16_t v_;						\
++	uint16_t v_;						\
+ 									\
+ 	if ((size_t)(buflen) < (size_t)2)				\
+ 		goto buflen_error;					\
+@@ -174,7 +174,7 @@ do {									\
+ 
+ #define GET_HOST_32(val, cp, rcvlen)					\
+ do {									\
+-	register uint32_t v_;						\
++	uint32_t v_;						\
+ 									\
+ 	if ((size_t)(rcvlen) < (size_t)4)				\
+ 		goto rcvlen_error;					\
+@@ -188,7 +188,7 @@ do {									\
+ 
+ #define PUT_HOST_32(val, cp, buflen)					\
+ do {									\
+-	register uint32_t v_;						\
++	uint32_t v_;						\
+ 									\
+ 	if ((size_t)(buflen) < (size_t)4)				\
+ 		goto buflen_error;					\
+@@ -203,7 +203,7 @@ do {									\
+ #if defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN)
+ #define GET_NET_32(val, cp, rcvlen)					\
+ do {									\
+-	register uint32_t v_;						\
++	uint32_t v_;						\
+ 									\
+ 	if ((size_t)(rcvlen) < (size_t)4)				\
+ 		goto rcvlen_error;					\
+@@ -217,7 +217,7 @@ do {									\
+ 
+ #define PUT_NET_32(val, cp, buflen)					\
+ do {									\
+-	register uint32_t v_;						\
++	uint32_t v_;						\
+ 									\
+ 	if ((size_t)(buflen) < (size_t)4)				\
+ 		goto buflen_error;					\
diff --git a/net/xorp/files/patch-pathutil.c b/net/xorp/files/patch-pathutil.c
new file mode 100644
index 000000000000..123f7dfdd752
--- /dev/null
+++ b/net/xorp/files/patch-pathutil.c
@@ -0,0 +1,38 @@
+--- cli/libtecla/pathutil.c.orig	2018-07-10 13:09:21 UTC
++++ cli/libtecla/pathutil.c
+@@ -168,7 +168,7 @@ char *_pn_append_to_path(PathName *path,
+ /*
+  * How many characters should be appended?
+  */
+-  if(slen < 0 || slen > strlen(string))
++  if(slen < 0 || (unsigned long)(slen) > strlen(string))
+     slen = strlen(string);
+ /*
+  * Resize the pathname if needed.
+@@ -239,7 +239,7 @@ char *_pn_prepend_to_path(PathName *path
+ /*
+  * How many characters should be appended?
+  */
+-  if(slen < 0 || slen > strlen(string))
++  if(slen < 0 || (unsigned long)(slen) > strlen(string))
+     slen = strlen(string);
+ /*
+  * Work out how far we need to shift the original path string to make
+@@ -494,7 +494,7 @@ char *_pu_start_of_path(const char *stri
+ 	break;
+     };
+   };
+-  return (char *)string + i + 1;
++  return (char *)(string + i + 1);
+ }
+ 
+ /*.......................................................................
+@@ -534,7 +534,7 @@ char *_pu_end_of_path(const char *string
+       escaped = 1;
+     };
+   };
+-  return (char *)string + i;
++  return (char *)(string + i);
+ }
+ 
+ /*.......................................................................
diff --git a/net/xorp/files/patch-pcache.c b/net/xorp/files/patch-pcache.c
new file mode 100644
index 000000000000..5157e29df603
--- /dev/null
+++ b/net/xorp/files/patch-pcache.c
@@ -0,0 +1,38 @@
+--- cli/libtecla/pcache.c.orig	2018-07-11 18:23:55 UTC
++++ cli/libtecla/pcache.c
+@@ -601,7 +601,7 @@ static int pca_extract_dir(PathCache *pc
+  */
+   {
+     int dirlen = strlen(pc->path->name);
+-    if(dirlen < FS_DIR_SEP_LEN ||
++    if((unsigned long)(dirlen) < FS_DIR_SEP_LEN ||
+        strncmp(pc->path->name + dirlen - FS_DIR_SEP_LEN, FS_DIR_SEP,
+ 	       FS_DIR_SEP_LEN) != 0) {
+       if(_pn_append_to_path(pc->path, FS_DIR_SEP, FS_DIR_SEP_LEN, 0) == NULL) {
+@@ -1500,7 +1500,7 @@ static int cpa_cmd_contains_path(const c
+  * If the filename starts with the root directory, then it obviously
+  * starts with a pathname.
+  */
+-  if(prefix_len >= FS_ROOT_DIR_LEN && 
++  if((unsigned long)(prefix_len) >= FS_ROOT_DIR_LEN && 
+      strncmp(prefix, FS_ROOT_DIR, FS_ROOT_DIR_LEN) == 0)
+     return 1;
+ /*
+@@ -1509,7 +1509,7 @@ static int cpa_cmd_contains_path(const c
+  * starts with a pathname specification (valid or otherwise).
+  */
+   for(i=0; i<prefix_len; i++) {
+-    if(prefix_len - i >= FS_DIR_SEP_LEN &&
++    if((unsigned long)((prefix_len - i)) >= FS_DIR_SEP_LEN &&
+        strncmp(prefix + i, FS_DIR_SEP, FS_DIR_SEP_LEN) == 0)
+       return 1;
+   };
+@@ -1653,7 +1653,7 @@ static int pca_expand_tilde(PathCache *p
+  * skip over it so that it doesn't get copied into the output pathname
+  */
+   if(homedir && strcmp(homedir, FS_ROOT_DIR) == 0 &&
+-     (pptr-path) + FS_DIR_SEP_LEN < pathlen &&
++     (pptr-path) + FS_DIR_SEP_LEN < (unsigned long)(pathlen) &&
+      strncmp(pptr, FS_DIR_SEP, FS_DIR_SEP_LEN) == 0) {
+     pptr += FS_DIR_SEP_LEN;
+   };
diff --git a/net/xorp/files/patch-popen.cc b/net/xorp/files/patch-popen.cc
new file mode 100644
index 000000000000..a0274f8d4251
--- /dev/null
+++ b/net/xorp/files/patch-popen.cc
@@ -0,0 +1,11 @@
+--- libxorp/popen.cc.orig	2018-07-10 12:54:42 UTC
++++ libxorp/popen.cc
+@@ -424,7 +424,7 @@ popen2(const string& command, const list
+ int
+ pclose2(FILE *iop_out, bool dont_wait)
+ {
+-    register struct pid_s *cur, *last;
++    struct pid_s *cur, *last;
+     int pstat = 0;
+     pid_t pid = 0;
+ 
diff --git a/net/xorp/files/patch-strptime.c b/net/xorp/files/patch-strptime.c
new file mode 100644
index 000000000000..a1173200ca33
--- /dev/null
+++ b/net/xorp/files/patch-strptime.c
@@ -0,0 +1,15 @@
+--- libxorp/strptime.c.orig	2018-07-10 12:54:53 UTC
++++ libxorp/strptime.c
+@@ -85,10 +85,10 @@
+ #define TM_YEAR_BASE 1900
+ #endif
+ 
+-static inline void *
++static inline const char *
+ UNCONST(const void *a)
+ {
+-	return ((const char *)a - (const char *)0) + (char *)0;
++	return ((const char *)a - sizeof((const char *)0)) + sizeof((char *)0);
+ }
+ 
+ 
diff --git a/net/xorp/files/patch-y.boot__tab.cc b/net/xorp/files/patch-y.boot__tab.cc
new file mode 100644
index 000000000000..c8373a635898
--- /dev/null
+++ b/net/xorp/files/patch-y.boot__tab.cc
@@ -0,0 +1,14 @@
+--- rtrmgr/y.boot_tab.cc.orig	2018-07-12 14:14:48 UTC
++++ rtrmgr/y.boot_tab.cc
+@@ -474,9 +474,9 @@ int
+ yyparse (YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+ {
+-    register int yym, yyn, yystate;
++    int yym, yyn, yystate;
+ #if YYDEBUG
+-    register const char *yys;
++    const char *yys;
+ 
+     if ((yys = getenv("YYDEBUG")))
+     {
diff --git a/net/xorp/files/patch-y.opcmd__tab.cc b/net/xorp/files/patch-y.opcmd__tab.cc
new file mode 100644
index 000000000000..b730b46b93ed
--- /dev/null
+++ b/net/xorp/files/patch-y.opcmd__tab.cc
@@ -0,0 +1,14 @@
+--- rtrmgr/y.opcmd_tab.cc.orig	2018-07-12 14:13:19 UTC
++++ rtrmgr/y.opcmd_tab.cc
+@@ -684,9 +684,9 @@ int
+ yyparse (YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+ {
+-    register int yym, yyn, yystate;
++    int yym, yyn, yystate;
+ #if YYDEBUG
+-    register const char *yys;
++    const char *yys;
+ 
+     if ((yys = getenv("YYDEBUG")))
+     {
diff --git a/net/xorp/files/patch-y.tplt__tab.cc b/net/xorp/files/patch-y.tplt__tab.cc
new file mode 100644
index 000000000000..4efc46cf5531
--- /dev/null
+++ b/net/xorp/files/patch-y.tplt__tab.cc
@@ -0,0 +1,14 @@
+--- rtrmgr/y.tplt_tab.cc.orig	2018-07-12 14:20:17 UTC
++++ rtrmgr/y.tplt_tab.cc
+@@ -552,9 +552,9 @@ int
+ yyparse (YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+ {
+-    register int yym, yyn, yystate;
++    int yym, yyn, yystate;
+ #if YYDEBUG
+-    register const char *yys;
++    const char *yys;
+ 
+     if ((yys = getenv("YYDEBUG")))
+     {