Fix build with flex 2.6.0

6 files changed, 97 insertions, 1 deletions

diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index 1b352aebcff..339dd984966 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.59 2015/11/03 03:27:24 agc Exp $
+$NetBSD: distinfo,v 1.60 2016/01/15 18:04:06 tron Exp $
 
 SHA1 (doxygen-1.8.9.1.src.tar.gz) = eb6b7e5f8dc8302e67053aba841f485017f246fd
 RMD160 (doxygen-1.8.9.1.src.tar.gz) = 103d45b36129a0a04b809050b7251acf6f9dacde
@@ -10,6 +10,11 @@ SHA1 (patch-ac) = 87c68a2ce598c10d90d775764f4c05739eb51435
 SHA1 (patch-af) = 878aabc8bcd800e691edabf664f5c50c70af57a0
 SHA1 (patch-ah) = c1a7f35fe2adcfd094c3ba0f81fee47a027bcf82
 SHA1 (patch-aj) = 504dfce5474e017e7872208b15a436be669c293c
+SHA1 (patch-src_code.l) = 4793f3b6cd908921dfb73652b47b70af0cf8bc7f
+SHA1 (patch-src_commentscan.l) = 755458f2b603bbb3de4414025bbbe75a455082fd
+SHA1 (patch-src_fortrancode.l) = d28b2d4e34170ceb0af96a46069e58bac076803d
 SHA1 (patch-src_latexgen.cpp) = c9fd545284c99adac3c292aa1395a316f90c7c80
 SHA1 (patch-src_portable__c.c) = 88bb2ae294f8eaf16d48d9f07a1e95e754647947
+SHA1 (patch-src_pycode.l) = d40e0089eb26d886787188971e40654b94d0343e
+SHA1 (patch-src_vhdlcode.l) = b878e9169ddd7f0ee489fc2c447f463865513efc
 SHA1 (patch-tmake_lib_macosx-c++_tmake.conf) = 6f5278524ee1c62fb45b23996bc34e37d0e63c51
diff --git a/devel/doxygen/patches/patch-src_code.l b/devel/doxygen/patches/patch-src_code.l
new file mode 100644
index 00000000000..2fce2a60c67
--- /dev/null
+++ b/devel/doxygen/patches/patch-src_code.l
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_code.l,v 1.1 2016/01/15 18:04:06 tron Exp $
+
+Remove bogus flex version check that breaks the build with flex 2.6.0.
+
+--- src/code.l.orig	2015-01-03 22:38:57.000000000 +0000
++++ src/code.l	2016-01-15 14:04:12.810214262 +0000
+@@ -3695,7 +3695,5 @@
+ extern "C" { // some bogus code to keep the compiler happy
+   void codeYYdummy() { yy_flex_realloc(0,0); } 
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
+-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+ 
diff --git a/devel/doxygen/patches/patch-src_commentscan.l b/devel/doxygen/patches/patch-src_commentscan.l
new file mode 100644
index 00000000000..4cfa2dffca1
--- /dev/null
+++ b/devel/doxygen/patches/patch-src_commentscan.l
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_commentscan.l,v 1.1 2016/01/15 18:04:06 tron Exp $
+
+Fix build with flex 2.6.0.
+
+--- src/commentscan.l.orig	2014-12-22 14:01:20.000000000 +0000
++++ src/commentscan.l	2016-01-15 14:17:37.661978862 +0000
+@@ -1098,11 +1098,7 @@
+ 					      // but we need to know the position in the input buffer where this 
+ 					      // rule matched.
+ 					      // for flex 2.5.33+ we should use YY_CURRENT_BUFFER_LVALUE
+-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+ 					      inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf);
+-#else
+-					      inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf);
+-#endif
+ 					      yyterminate();
+ 					    }
+ 					    else if (cmdPtr->func==0)
+@@ -1160,11 +1156,7 @@
+                                           g_memberGroupHeader.resize(0);
+ 					  parseMore=TRUE;
+                                           needNewEntry = TRUE;
+-#if YY_FLEX_MINOR_VERSION>=5 && YY_FLEX_SUBMINOR_VERSION>=33
+ 				          inputPosition=prevPosition + (int)(yy_bp - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf) + strlen(yytext);
+-#else
+-				          inputPosition=prevPosition + (int)(yy_bp - yy_current_buffer->yy_ch_buf) + strlen(yytext);
+-#endif
+ 					  yyterminate();
+                                         }
+ <Comment>{B}*{CMD}[$@\\&~<>#%]		{ // escaped character
diff --git a/devel/doxygen/patches/patch-src_fortrancode.l b/devel/doxygen/patches/patch-src_fortrancode.l
new file mode 100644
index 00000000000..3474a7016f7
--- /dev/null
+++ b/devel/doxygen/patches/patch-src_fortrancode.l
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_fortrancode.l,v 1.1 2016/01/15 18:04:06 tron Exp $
+
+Remove bogus flex version check that breaks the build with flex 2.6.0.
+
+--- src/fortrancode.l.orig	2015-01-03 22:38:57.000000000 +0000
++++ src/fortrancode.l	2016-01-15 14:05:04.598856168 +0000
+@@ -1289,11 +1289,5 @@
+ extern "C" { // some bogus code to keep the compiler happy
+   void fortrancodeYYdummy() { yy_flex_realloc(0,0); } 
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
+-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+-#else
+-extern "C" { // some bogus code to keep the compiler happy
+-  void fortrancodeYYdummy() { yy_top_state(); } 
+-}
+ #endif
+ 
diff --git a/devel/doxygen/patches/patch-src_pycode.l b/devel/doxygen/patches/patch-src_pycode.l
new file mode 100644
index 00000000000..d3056d7c86a
--- /dev/null
+++ b/devel/doxygen/patches/patch-src_pycode.l
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_pycode.l,v 1.1 2016/01/15 18:04:06 tron Exp $
+
+Remove bogus flex version check that breaks the build with flex 2.6.0.
+
+--- src/pycode.l.orig	2015-01-03 22:38:57.000000000 +0000
++++ src/pycode.l	2016-01-15 14:05:15.828019703 +0000
+@@ -1503,7 +1503,5 @@
+ extern "C" { // some bogus code to keep the compiler happy
+   void pycodeYYdummy() { yy_flex_realloc(0,0); } 
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
+-#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
+ #endif
+ 
diff --git a/devel/doxygen/patches/patch-src_vhdlcode.l b/devel/doxygen/patches/patch-src_vhdlcode.l
new file mode 100644
index 00000000000..fa0aad76f40
--- /dev/null
+++ b/devel/doxygen/patches/patch-src_vhdlcode.l
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_vhdlcode.l,v 1.1 2016/01/15 18:04:06 tron Exp $
+
+Remove bogus flex version check that breaks the build with flex 2.6.0.
+
+--- src/vhdlcode.l.orig	2015-01-03 22:38:57.000000000 +0000
++++ src/vhdlcode.l	2016-01-15 14:00:14.774796788 +0000
+@@ -1613,8 +1613,6 @@
+ extern "C" { // some bogus code to keep the compiler happy
+   void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } 
+ }
+-#elif YY_FLEX_SUBMINOR_VERSION<33
+-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
+ #endif
+ 
+