<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134346] trunk/dports/games/nwntools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134346">134346</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-03-23 08:23:02 -0700 (Mon, 23 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>nwntools: Fix build with Bison 3 (#47184)

Based on Akim Demaille's patch
(attachment:nwntools.2.3.2-bison-3.patch:ticket:41600)

Also:
- Use autoreconf.
- Reorganize patches.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgamesnwntoolsPortfile">trunk/dports/games/nwntools/Portfile</a></li>
<li><a href="#trunkdportsgamesnwntoolsfilesremovefnodefaultinlinepatch">trunk/dports/games/nwntools/files/remove-fno-default-inline.patch</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgamesnwntoolsfilesbisonpatch">trunk/dports/games/nwntools/files/bison.patch</a></li>
<li><a href="#trunkdportsgamesnwntoolsfilespython27patch">trunk/dports/games/nwntools/files/python2.7.patch</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgamesnwntoolsfiles_NscLib__NscCompilercpppatch">trunk/dports/games/nwntools/files/_NscLib__NscCompiler.cpp.patch</a></li>
<li><a href="#trunkdportsgamesnwntoolsfiles_NscLib__NscContextcpppatch">trunk/dports/games/nwntools/files/_NscLib__NscContext.cpp.patch</a></li>
<li><a href="#trunkdportsgamesnwntoolsfiles_NscLib__NscParserypppatch">trunk/dports/games/nwntools/files/_NscLib__NscParser.ypp.patch</a></li>
<li><a href="#trunkdportsgamesnwntoolsfiles_NscLib__NscParserRoutinescpppatch">trunk/dports/games/nwntools/files/_NscLib__NscParserRoutines.cpp.patch</a></li>
<li><a href="#trunkdportsgamesnwntoolsfilesconfigurepatch">trunk/dports/games/nwntools/files/configure.patch</a></li>
<li><a href="#trunkdportsgamesnwntoolsfilesnwnnsscomp__python__Makefileinpatch">trunk/dports/games/nwntools/files/nwnnsscomp__python__Makefile.in.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgamesnwntoolsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/nwntools/Portfile (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/Portfile        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/Portfile        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -21,10 +21,8 @@
</span><span class="cx"> checksums                  sha1 cab2c8af5b0b2834444a018d87663614f8c057cf
</span><span class="cx"> use_parallel_build         no
</span><span class="cx"> 
</span><ins>+use_autoreconf             yes
+
</ins><span class="cx"> patchfiles                 remove-fno-default-inline.patch \
</span><del>-                           _NscLib__NscCompiler.cpp.patch \
-                           _NscLib__NscContext.cpp.patch \
-                           _NscLib__NscParserRoutines.cpp.patch \
-                           _NscLib__NscParser.ypp.patch \
-                           configure.patch \
-                           nwnnsscomp__python__Makefile.in.patch
</del><ins>+                           python2.7.patch \
+                           bison.patch
</ins></span></pre></div>
<a id="trunkdportsgamesnwntoolsfiles_NscLib__NscCompilercpppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/nwntools/files/_NscLib__NscCompiler.cpp.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/_NscLib__NscCompiler.cpp.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/_NscLib__NscCompiler.cpp.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>---- _NscLib/NscCompiler.cpp.orig        2005-11-12 10:25:46.000000000 +1100
-+++ _NscLib/NscCompiler.cpp        2014-12-17 14:21:42.000000000 +1100
-@@ -107,31 +107,31 @@ bool NscCompilerInitialize (CNwnLoader *
-         // Add the reserved words
-         //

--        NscAddToken (&quot;int&quot;,            INT_TYPE);
--        NscAddToken (&quot;float&quot;,          FLOAT_TYPE);
--        NscAddToken (&quot;object&quot;,         OBJECT_TYPE);
--        NscAddToken (&quot;string&quot;,         STRING_TYPE);
--        NscAddToken (&quot;struct&quot;,         STRUCT_TYPE);
--        NscAddToken (&quot;void&quot;,           VOID_TYPE);
--        NscAddToken (&quot;vector&quot;,         VECTOR_TYPE);
--        NscAddToken (&quot;action&quot;,         ACTION_TYPE);
--
--        NscAddToken (&quot;break&quot;,          BREAK);
--        NscAddToken (&quot;case&quot;,           CASE);
--        NscAddToken (&quot;continue&quot;,       CONTINUE);
--        NscAddToken (&quot;default&quot;,        DEFAULT);
--        NscAddToken (&quot;do&quot;,             DO);
--        NscAddToken (&quot;else&quot;,           ELSE);
--        NscAddToken (&quot;for&quot;,            FOR);
--        NscAddToken (&quot;if&quot;,             IF);
--        NscAddToken (&quot;return&quot;,         RETURN);
--        NscAddToken (&quot;switch&quot;,         SWITCH);
--        NscAddToken (&quot;while&quot;,          WHILE);
-+        NscAddToken (&quot;int&quot;,            yy::parser::token::INT_TYPE);
-+        NscAddToken (&quot;float&quot;,          yy::parser::token::FLOAT_TYPE);
-+        NscAddToken (&quot;object&quot;,         yy::parser::token::OBJECT_TYPE);
-+        NscAddToken (&quot;string&quot;,         yy::parser::token::STRING_TYPE);
-+        NscAddToken (&quot;struct&quot;,         yy::parser::token::STRUCT_TYPE);
-+        NscAddToken (&quot;void&quot;,           yy::parser::token::VOID_TYPE);
-+        NscAddToken (&quot;vector&quot;,         yy::parser::token::VECTOR_TYPE);
-+        NscAddToken (&quot;action&quot;,         yy::parser::token::ACTION_TYPE);
-+
-+        NscAddToken (&quot;break&quot;,          yy::parser::token::BREAK);
-+        NscAddToken (&quot;case&quot;,           yy::parser::token::CASE);
-+        NscAddToken (&quot;continue&quot;,       yy::parser::token::CONTINUE);
-+        NscAddToken (&quot;default&quot;,        yy::parser::token::DEFAULT);
-+        NscAddToken (&quot;do&quot;,             yy::parser::token::DO);
-+        NscAddToken (&quot;else&quot;,           yy::parser::token::ELSE);
-+        NscAddToken (&quot;for&quot;,            yy::parser::token::FOR);
-+        NscAddToken (&quot;if&quot;,             yy::parser::token::IF);
-+        NscAddToken (&quot;return&quot;,         yy::parser::token::RETURN);
-+        NscAddToken (&quot;switch&quot;,         yy::parser::token::SWITCH);
-+        NscAddToken (&quot;while&quot;,          yy::parser::token::WHILE);
-         if (fEnableExtensions || nVersion &gt;= 999)
--        NscAddToken (&quot;const&quot;,      NWCONST);
-+        NscAddToken (&quot;const&quot;,      yy::parser::token::NWCONST);

--        NscAddToken (&quot;OBJECT_SELF&quot;,    OBJECT_SELF_CONST);
--        NscAddToken (&quot;OBJECT_INVALID&quot;, OBJECT_INVALID_CONST);
-+        NscAddToken (&quot;OBJECT_SELF&quot;,    yy::parser::token::OBJECT_SELF_CONST);
-+        NscAddToken (&quot;OBJECT_INVALID&quot;, yy::parser::token::OBJECT_INVALID_CONST);

-         //
-         // Read NWSCRIPT
</del></span></pre></div>
<a id="trunkdportsgamesnwntoolsfiles_NscLib__NscContextcpppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/nwntools/files/_NscLib__NscContext.cpp.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/_NscLib__NscContext.cpp.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/_NscLib__NscContext.cpp.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,243 +0,0 @@
</span><del>---- _NscLib/NscContext.cpp.orig        2005-11-12 10:25:46.000000000 +1100
-+++ _NscLib/NscContext.cpp        2014-12-17 14:30:38.000000000 +1100
-@@ -230,7 +230,7 @@ read_another_line:;
-                 if (pSymbol != NULL)
-                 {
-                         assert (pSymbol -&gt;nSymType == NscSymType_Token);
--                        if (pSymbol -&gt;nToken == ENGINE_TYPE)
-+                        if (pSymbol -&gt;nToken == yy::parser::token::ENGINE_TYPE)
-                         {
-                                 CNscPStackEntry *pEntry = GetPStackEntry (__FILE__, __LINE__);
-                                 pEntry -&gt;SetType ((NscType) (
-@@ -246,7 +246,7 @@ read_another_line:;
-                         CNscPStackEntry *pEntry = GetPStackEntry (__FILE__, __LINE__);
-                         pEntry -&gt;SetIdentifier (pszStart, nCount);
-                         *yylval = pEntry;
--                        return IDENTIFIER;
-+                        return yy::parser::token::IDENTIFIER;
-                 }
-         }

-@@ -305,7 +305,7 @@ read_another_line:;
-                         pEntry -&gt;SetType (NscType_Integer);
-                         pEntry -&gt;PushConstantInteger (nValue);
-                         *yylval = pEntry;
--                        return INTEGER_CONST; 
-+                        return yy::parser::token::INTEGER_CONST; 
-                 }

-                 //
-@@ -359,13 +359,13 @@ read_another_line:;
-                         {
-                                 pEntry -&gt;SetType (NscType_Float);
-                                 pEntry -&gt;PushConstantFloat ((float) atof (psz));
--                                return FLOAT_CONST;
-+                                return yy::parser::token::FLOAT_CONST;
-                         }
-                         else
-                         {
-                                 pEntry -&gt;SetType (NscType_Integer);
-                                 pEntry -&gt;PushConstantInteger (atol (psz));
--                                return INTEGER_CONST;
-+                                return yy::parser::token::INTEGER_CONST;
-                         }
-                 }
-         }
-@@ -414,7 +414,7 @@ read_another_line:;
-                                 else if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return DIVEQ;
-+                                        return yy::parser::token::DIVEQ;
-                                 }
-                                 else 
-                                 {
-@@ -441,12 +441,12 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return ADDEQ;
-+                                        return yy::parser::token::ADDEQ;
-                                 }
-                                 else if (c == '+')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return PLUSPLUS;
-+                                        return yy::parser::token::PLUSPLUS;
-                                 }
-                                 else
-                                         return '+';
-@@ -457,12 +457,12 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return SUBEQ;
-+                                        return yy::parser::token::SUBEQ;
-                                 }
-                                 else if (c == '-')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return MINUSMINUS;
-+                                        return yy::parser::token::MINUSMINUS;
-                                 }
-                                 else
-                                         return '-';
-@@ -473,7 +473,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return MULEQ;
-+                                        return yy::parser::token::MULEQ;
-                                 }
-                                 else
-                                         return '*';
-@@ -484,7 +484,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return MODEQ;
-+                                        return yy::parser::token::MODEQ;
-                                 }
-                                 else
-                                         return '%';
-@@ -495,7 +495,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return XOREQ;
-+                                        return yy::parser::token::XOREQ;
-                                 }
-                                 else
-                                         return '^';
-@@ -506,12 +506,12 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return ANDEQ;
-+                                        return yy::parser::token::ANDEQ;
-                                 }
-                                 else if (c == '&amp;')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return ANDAND;
-+                                        return yy::parser::token::ANDAND;
-                                 }
-                                 else
-                                         return '&amp;';
-@@ -522,12 +522,12 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return OREQ;
-+                                        return yy::parser::token::OREQ;
-                                 }
-                                 else if (c == '|')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return OROR;
-+                                        return yy::parser::token::OROR;
-                                 }
-                                 else
-                                         return '|';
-@@ -538,7 +538,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return NOTEQ;
-+                                        return yy::parser::token::NOTEQ;
-                                 }
-                                 else
-                                         return '!';
-@@ -549,7 +549,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return EQ;
-+                                        return yy::parser::token::EQ;
-                                 }
-                                 else
-                                         return '=';
-@@ -560,7 +560,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return LTEQ;
-+                                        return yy::parser::token::LTEQ;
-                                 }
-                                 else if (c == '&lt;')
-                                 {
-@@ -569,10 +569,10 @@ read_another_line:;
-                                         if (c == '=')
-                                         {
-                                                 m_pStreamTop -&gt;pszNextTokenPos++;
--                                                return SLEQ;
-+                                                return yy::parser::token::SLEQ;
-                                         }
-                                         else
--                                                return SL;
-+                                                return yy::parser::token::SL;
-                                 }
-                                 else
-                                         return '&lt;';
-@@ -583,7 +583,7 @@ read_another_line:;
-                                 if (c == '=')
-                                 {
-                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                        return GTEQ;
-+                                        return yy::parser::token::GTEQ;
-                                 }
-                                 else if (c == '&gt;')
-                                 {
-@@ -592,7 +592,7 @@ read_another_line:;
-                                         if (c == '=')
-                                         {
-                                                 m_pStreamTop -&gt;pszNextTokenPos++;
--                                                return SREQ;
-+                                                return yy::parser::token::SREQ;
-                                         }
-                                         else if (c == '&gt;')
-                                         {
-@@ -601,13 +601,13 @@ read_another_line:;
-                                                 if (c == '=')
-                                                 {
-                                                         m_pStreamTop -&gt;pszNextTokenPos++;
--                                                        return USREQ;
-+                                                        return yy::parser::token::USREQ;
-                                                 }
-                                                 else
--                                                        return USR;
-+                                                        return yy::parser::token::USR;
-                                         }
-                                         else
--                                                return SR;
-+                                                return yy::parser::token::SR;
-                                 }
-                                 else
-                                         return '&gt;';
-@@ -626,7 +626,7 @@ read_another_line:;
-                                                         pEntry -&gt;SetType (NscType_String);
-                                                         pEntry -&gt;PushConstantString (pszStart, (int) (pszOut - pszStart));
-                                                         *yylval = pEntry;
--                                                        return STRING_CONST;
-+                                                        return yy::parser::token::STRING_CONST;
-                                                 }
-                                                 else if (c == '\\')
-                                                 {
-@@ -646,7 +646,7 @@ read_another_line:;
-                                                         pEntry -&gt;PushConstantString (pszStart, (int) (pszOut - pszStart));
-                                                         *yylval = pEntry;
-                                                         GenerateError (&quot;Unterminated string&quot;);
--                                                        return STRING_CONST; 
-+                                                        return yy::parser::token::STRING_CONST; 
-                                                 }
-                                                 else
-                                                         *pszOut++ = c;
-@@ -898,7 +898,7 @@ try_again:;
-                                         {
-                                                 NscSymbol *pSymbol = g_sNscReservedWords .Add (
-                                                         pszVTmp, NscSymType_Token);
--                                                pSymbol -&gt;nToken = ENGINE_TYPE;
-+                                                pSymbol -&gt;nToken = yy::parser::token::ENGINE_TYPE;
-                                                 pSymbol -&gt;nEngineObject = nIndex;
-                                         }
-                                 }
</del></span></pre></div>
<a id="trunkdportsgamesnwntoolsfiles_NscLib__NscParserypppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/nwntools/files/_NscLib__NscParser.ypp.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/_NscLib__NscParser.ypp.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/_NscLib__NscParser.ypp.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,326 +0,0 @@
</span><del>---- _NscLib/NscParser.ypp.orig        2005-11-12 10:25:46.000000000 +1100
-+++ _NscLib/NscParser.ypp        2014-12-17 15:29:03.000000000 +1100
-@@ -273,15 +273,15 @@ shift_expression:
-                 }
-         | shift_expression SL additive_expression
-                 { 
--                        $$ = NscBuildBinaryOp (SL, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::SL, $1, $3); 
-                 }
-         | shift_expression SR additive_expression
-                 { 
--                        $$ = NscBuildBinaryOp (SR, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::SR, $1, $3); 
-                 }
-         | shift_expression USR additive_expression
-                 { 
--                        $$ = NscBuildBinaryOp (USR, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::USR, $1, $3); 
-                 }
-         

-@@ -300,11 +300,11 @@ relational_expression:
-                 }
-         | relational_expression LTEQ shift_expression
-                 { 
--                        $$ = NscBuildBinaryOp (LTEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::LTEQ, $1, $3); 
-                 }
-         | relational_expression GTEQ shift_expression
-                 { 
--                        $$ = NscBuildBinaryOp (GTEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::GTEQ, $1, $3); 
-                 }
-         

-@@ -315,11 +315,11 @@ equality_expression:
-                 }
-         | equality_expression EQ relational_expression
-                 { 
--                        $$ = NscBuildBinaryOp (EQ, $1, $3);
-+                        $$ = NscBuildBinaryOp (token::EQ, $1, $3);
-                 }
-         | equality_expression NOTEQ relational_expression
-                 { 
--                        $$ = NscBuildBinaryOp (NOTEQ, $1, $3);
-+                        $$ = NscBuildBinaryOp (token::NOTEQ, $1, $3);
-                 }
-         

-@@ -363,7 +363,7 @@ logical_and_expression:
-                 }
-         | logical_and_expression ANDAND inclusive_or_expression
-                 { 
--                        $$ = NscBuildLogicalOp (ANDAND, $1, $3); 
-+                        $$ = NscBuildLogicalOp (token::ANDAND, $1, $3); 
-                 }
-         

-@@ -374,7 +374,7 @@ logical_or_expression:
-                 }
-         | logical_or_expression OROR logical_and_expression
-                 { 
--                        $$ = NscBuildLogicalOp (OROR, $1, $3); 
-+                        $$ = NscBuildLogicalOp (token::OROR, $1, $3); 
-                 }
-         

-@@ -400,47 +400,47 @@ assignment_expression:
-                 }
-         | unary_expression MULEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (MULEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::MULEQ, $1, $3); 
-                 }
-         | unary_expression DIVEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (DIVEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::DIVEQ, $1, $3); 
-                 }
-         | unary_expression MODEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (MODEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::MODEQ, $1, $3); 
-                 }
-         | unary_expression ADDEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (ADDEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::ADDEQ, $1, $3); 
-                 }
-         | unary_expression SUBEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (SUBEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::SUBEQ, $1, $3); 
-                 }
-         | unary_expression SLEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (SLEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::SLEQ, $1, $3); 
-                 }
-         | unary_expression SREQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (SREQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::SREQ, $1, $3); 
-                 }
-         | unary_expression USREQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (USREQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::USREQ, $1, $3); 
-                 }
-         | unary_expression ANDEQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (ANDEQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::ANDEQ, $1, $3); 
-                 }
-         | unary_expression XOREQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (XOREQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::XOREQ, $1, $3); 
-                 }
-         | unary_expression OREQ assignment_expression
-                 { 
--                        $$ = NscBuildBinaryOp (OREQ, $1, $3); 
-+                        $$ = NscBuildBinaryOp (token::OREQ, $1, $3); 
-                 }
-         

-@@ -480,39 +480,39 @@ qualified_type_specifier:
- type_specifier:
-         VOID_TYPE 
-                 {
--                        $$ = NscBuildType (VOID_TYPE, NULL); 
-+                        $$ = NscBuildType (token::VOID_TYPE, NULL); 
-                 }
-         | INT_TYPE 
-                 {
--                        $$ = NscBuildType (INT_TYPE, NULL); 
-+                        $$ = NscBuildType (token::INT_TYPE, NULL); 
-                 }
-         | FLOAT_TYPE 
-                 {
--                        $$ = NscBuildType (FLOAT_TYPE, NULL); 
-+                        $$ = NscBuildType (token::FLOAT_TYPE, NULL); 
-                 }
-         | OBJECT_TYPE 
-                 { 
--                        $$ = NscBuildType (OBJECT_TYPE, NULL); 
-+                        $$ = NscBuildType (token::OBJECT_TYPE, NULL); 
-                 }
-         | STRING_TYPE 
-                 { 
--                        $$ = NscBuildType (STRING_TYPE, NULL); 
-+                        $$ = NscBuildType (token::STRING_TYPE, NULL); 
-                 }
-         | ACTION_TYPE 
-                 { 
--                        $$ = NscBuildType (ACTION_TYPE, NULL); 
-+                        $$ = NscBuildType (token::ACTION_TYPE, NULL); 
-                 }
-         | VECTOR_TYPE 
-                 { 
--                        $$ = NscBuildType (VECTOR_TYPE, NULL); 
-+                        $$ = NscBuildType (token::VECTOR_TYPE, NULL); 
-                 }
-         | struct_type_start IDENTIFIER 
-                 { 
--                        $$ = NscBuildType (STRUCT_TYPE, $2); 
-+                        $$ = NscBuildType (token::STRUCT_TYPE, $2); 
-                 }
-         | ENGINE_TYPE 
-                 {
--                        $$ = NscBuildType (ENGINE_TYPE, $1); 
-+                        $$ = NscBuildType (token::ENGINE_TYPE, $1); 
-                 }
-         
-         
-@@ -600,11 +600,11 @@ labeled_statement:
- case_statement:
-         CASE { NscBuildSaveLine (0); } constant_expression ':' 
-                 { 
--                        $$ = NscBuildCase (CASE, $3); 
-+                        $$ = NscBuildCase (token::CASE, $3); 
-                 }
-         | DEFAULT { NscBuildSaveLine (0); } ':' 
-                 {
--                        $$ = NscBuildCase (DEFAULT, NULL); 
-+                        $$ = NscBuildCase (token::DEFAULT, NULL); 
-                 }
-         
-         
-@@ -680,15 +680,15 @@ expression_statement:
- selection_statement:
-         if_start statement_blank_error
-                 { 
--                        $$ = NscBuild5Block (IF, $1, 0, NULL, NULL, NULL, $2, NULL); 
-+                        $$ = NscBuild5Block (token::IF, $1, 0, NULL, NULL, NULL, $2, NULL); 
-                 }
-         | if_else_start statement_blank_error 
-                 {
--                        $$ = NscBuild5Block (IF, $1, 0, NULL, NULL, NULL, NULL, $2);
-+                        $$ = NscBuild5Block (token::IF, $1, 0, NULL, NULL, NULL, NULL, $2);
-                 }
-         | switch_start statement 
-                 {
--                        $$ = NscBuild5Block (SWITCH, $1, 0, NULL, NULL, NULL, $2, NULL); 
-+                        $$ = NscBuild5Block (token::SWITCH, $1, 0, NULL, NULL, NULL, $2, NULL); 
-                 }
-         
-         
-@@ -696,21 +696,21 @@ if_else_start:
-         if_start statement_blank_error ELSE 
-                 {
-                         NscBuildSaveLine (0); 
--                        $$ = NscBuild5Block (IF, $1, 1, NULL, NULL, NULL, $2, NULL); 
-+                        $$ = NscBuild5Block (token::IF, $1, 1, NULL, NULL, NULL, $2, NULL); 
-                 }
-         
-                 
- if_start:
-         IF '(' { NscBuildSaveLine (0); } expression ')' 
-                 { 
--                        $$ = NscBuild5Block (IF, NULL, 1, NULL, $4, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::IF, NULL, 1, NULL, $4, NULL, NULL, NULL); 
-                 }
-         
-         
- switch_start:
-         SWITCH { NscBuildSaveLine (0); } '(' expression ')' 
-                 {
--                        $$ = NscBuild5Block (SWITCH, NULL, 1, NULL, $4, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::SWITCH, NULL, 1, NULL, $4, NULL, NULL, NULL); 
-                 }
-         
-         
-@@ -723,50 +723,50 @@ switch_start:
- iteration_statement:
-         while_start statement 
-                 {
--                        $$ = NscBuild5Block (WHILE, $1, 0, NULL, NULL, NULL, $2, NULL); 
-+                        $$ = NscBuild5Block (token::WHILE, $1, 0, NULL, NULL, NULL, $2, NULL); 
-                 }
-         | do_start statement WHILE { NscBuildSaveLine (0); } '(' expression ')' ';' 
-                 {
--                        $$ = NscBuild5Block (DO, $1, 0, NULL, $6, NULL, $2, NULL); 
-+                        $$ = NscBuild5Block (token::DO, $1, 0, NULL, $6, NULL, $2, NULL); 
-                 }
-         | for_start statement 
-                 {
--                        $$ = NscBuild5Block (FOR, $1, 0, NULL, NULL, NULL, $2, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, $1, 0, NULL, NULL, NULL, $2, NULL); 
-                 }
-         
-         
- for_start:
-         for_start_start ';' ';' ')' 
-                 {
--                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
-                 }
-         | for_start_start expression ';' ';' ')' 
-                 { 
--                        $$ = NscBuild5Block (FOR, NULL, 1, $2, NULL, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, NULL, NULL, NULL, NULL); 
-                 }
-         | for_start_start ';' expression ';' ')'
-                 { 
--                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, $3, NULL, NULL, NULL);
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, $3, NULL, NULL, NULL);
-                 }
-         | for_start_start expression ';' expression ';' ')' 
-                 {
--                        $$ = NscBuild5Block (FOR, NULL, 1, $2, $4, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, $4, NULL, NULL, NULL); 
-                 }
-         | for_start_start ';' ';' expression ')' 
-                 {
--                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, NULL, $4, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, NULL, $4, NULL, NULL); 
-                 }
-         | for_start_start expression ';' ';' expression ')' 
-                 {
--                        $$ = NscBuild5Block (FOR, NULL, 1, $2, NULL, $5, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, NULL, $5, NULL, NULL); 
-                 }
-         | for_start_start ';' expression ';' expression ')' 
-                 {
--                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, $3, $5, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, $3, $5, NULL, NULL); 
-                 }
-         | for_start_start expression ';' expression ';' expression ')' 
-                 {
--                        $$ = NscBuild5Block (FOR, NULL, 1, $2, $4, $6, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, $4, $6, NULL, NULL); 
-                 }
-         
-         
-@@ -780,14 +780,14 @@ for_start_start:
- while_start:
-         WHILE '(' { NscBuildSaveLine (0); } expression ')' 
-                 { 
--                        $$ = NscBuild5Block (WHILE, NULL, 1, NULL, $4, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::WHILE, NULL, 1, NULL, $4, NULL, NULL, NULL); 
-                 }
-         
-         
- do_start:
-         DO 
-                 { 
--                        $$ = NscBuild5Block (DO, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
-+                        $$ = NscBuild5Block (token::DO, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
-                 }
-         
-                 
-@@ -800,11 +800,11 @@ do_start:
- jump_statement:
-         CONTINUE { NscBuildSaveLine (0); } ';'
-                 {
--                        $$ = NscBuildBreakContinue (CONTINUE);
-+                        $$ = NscBuildBreakContinue (token::CONTINUE);
-                 }
-         | BREAK { NscBuildSaveLine (0); } ';' 
-                 {
--                        $$ = NscBuildBreakContinue (BREAK); 
-+                        $$ = NscBuildBreakContinue (token::BREAK); 
-                 }
-         | return_start ';' 
-                 {
</del></span></pre></div>
<a id="trunkdportsgamesnwntoolsfiles_NscLib__NscParserRoutinescpppatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/nwntools/files/_NscLib__NscParserRoutines.cpp.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/_NscLib__NscParserRoutines.cpp.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/_NscLib__NscParserRoutines.cpp.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,627 +0,0 @@
</span><del>---- _NscLib/NscParserRoutines.cpp.orig        2005-02-05 08:33:24.000000000 +1100
-+++ _NscLib/NscParserRoutines.cpp        2014-12-17 14:39:36.000000000 +1100
-@@ -396,142 +396,142 @@ bool NscBuildSyntaxError (int nToken, YY

-                 switch (nToken)
-                 {
--                        case IDENTIFIER:
-+                        case yy::parser::token::IDENTIFIER:
-                                 if (yylval)
-                                         pszToken = yylval -&gt;GetIdentifier ();
-                                 else
-                                         pszToken = &quot;identifier&quot;;
-                                 break;

--                        case INTEGER_CONST:
-+                        case yy::parser::token::INTEGER_CONST:
-                                 pszToken = &quot;integer constant&quot;;
-                                 break;

--                        case FLOAT_CONST:
-+                        case yy::parser::token::FLOAT_CONST:
-                                 pszToken = &quot;float constant&quot;;
-                                 break;

--                        case STRING_CONST:
-+                        case yy::parser::token::STRING_CONST:
-                                 pszToken = &quot;string constant&quot;;
-                                 break;

--                        case ADDEQ:
-+                        case yy::parser::token::ADDEQ:
-                                 pszToken = &quot;+=&quot;;
-                                 break;

--                        case SUBEQ:
-+                        case yy::parser::token::SUBEQ:
-                                 pszToken = &quot;-=&quot;;
-                                 break;

--                        case MULEQ:
-+                        case yy::parser::token::MULEQ:
-                                 pszToken = &quot;*=&quot;;
-                                 break;

--                        case DIVEQ:
-+                        case yy::parser::token::DIVEQ:
-                                 pszToken = &quot;/=&quot;;
-                                 break;

--                        case MODEQ:
-+                        case yy::parser::token::MODEQ:
-                                 pszToken = &quot;%=&quot;;
-                                 break;

--                        case XOREQ:
-+                        case yy::parser::token::XOREQ:
-                                 pszToken = &quot;^=&quot;;
-                                 break;

--                        case ANDEQ:
-+                        case yy::parser::token::ANDEQ:
-                                 pszToken = &quot;&amp;=&quot;;
-                                 break;

--                        case OREQ:
-+                        case yy::parser::token::OREQ:
-                                 pszToken = &quot;|=&quot;;
-                                 break;

--                        case SL:
-+                        case yy::parser::token::SL:
-                                 pszToken = &quot;&lt;&lt;&quot;;
-                                 break;

--                        case SR:
-+                        case yy::parser::token::SR:
-                                 pszToken = &quot;&gt;&gt;&quot;;
-                                 break;

--                        case USR:
-+                        case yy::parser::token::USR:
-                                 pszToken = &quot;&gt;&gt;&gt;&quot;;
-                                 break;

--                        case SLEQ:
-+                        case yy::parser::token::SLEQ:
-                                 pszToken = &quot;&lt;&lt;=&quot;;
-                                 break;

--                        case SREQ:
-+                        case yy::parser::token::SREQ:
-                                 pszToken = &quot;&gt;&gt;=&quot;;
-                                 break;

--                        case USREQ:
-+                        case yy::parser::token::USREQ:
-                                 pszToken = &quot;&gt;&gt;&gt;=&quot;;
-                                 break;

--                        case EQ:
-+                        case yy::parser::token::EQ:
-                                 pszToken = &quot;==&quot;;
-                                 break;

--                        case NOTEQ:
-+                        case yy::parser::token::NOTEQ:
-                                 pszToken = &quot;!=&quot;;
-                                 break;

--                        case LTEQ:
-+                        case yy::parser::token::LTEQ:
-                                 pszToken = &quot;&lt;=&quot;;
-                                 break;

--                        case GTEQ:
-+                        case yy::parser::token::GTEQ:
-                                 pszToken = &quot;&gt;=&quot;;
-                                 break;

--                        case ANDAND:
-+                        case yy::parser::token::ANDAND:
-                                 pszToken = &quot;&amp;&amp;&quot;;
-                                 break;

--                        case OROR:
-+                        case yy::parser::token::OROR:
-                                 pszToken = &quot;||&quot;;
-                                 break;

--                        case PLUSPLUS:
-+                        case yy::parser::token::PLUSPLUS:
-                                 pszToken = &quot;++&quot;;
-                                 break;

--                        case MINUSMINUS:
-+                        case yy::parser::token::MINUSMINUS:
-                                 pszToken = &quot;--&quot;;
-                                 break;

--                        case FLOAT_TYPE:
-+                        case yy::parser::token::FLOAT_TYPE:
-                                 pszToken = &quot;float&quot;;
-                                 break;

--                        case INT_TYPE:
-+                        case yy::parser::token::INT_TYPE:
-                                 pszToken = &quot;int&quot;;
-                                 break;

--                        case OBJECT_TYPE:
-+                        case yy::parser::token::OBJECT_TYPE:
-                                 pszToken = &quot;object&quot;;
-                                 break;

--                        case STRING_TYPE:
-+                        case yy::parser::token::STRING_TYPE:
-                                 pszToken = &quot;string&quot;;
-                                 break;

--                        case VOID_TYPE:
-+                        case yy::parser::token::VOID_TYPE:
-                                 pszToken = &quot;void&quot;;
-                                 break;

--                        case STRUCT_TYPE:
-+                        case yy::parser::token::STRUCT_TYPE:
-                                 pszToken = &quot;struct&quot;;
-                                 break;

--                        case VECTOR_TYPE:
-+                        case yy::parser::token::VECTOR_TYPE:
-                                 pszToken = &quot;vector&quot;;
-                                 break;

--                        case ENGINE_TYPE:
-+                        case yy::parser::token::ENGINE_TYPE:
-                                 if (yylval)
-                                 {
-                                         int nIndex = yylval -&gt;GetType () - NscType_Engine_0;
-@@ -541,63 +541,63 @@ bool NscBuildSyntaxError (int nToken, YY
-                                         pszToken = &quot;engine-type&quot;;
-                                 break;

--                        case ACTION_TYPE:
-+                        case yy::parser::token::ACTION_TYPE:
-                                 pszToken = &quot;action&quot;;
-                                 break;

--                        case OBJECT_SELF_CONST:
-+                        case yy::parser::token::OBJECT_SELF_CONST:
-                                 pszToken = &quot;OBJECT_SELF&quot;;
-                                 break;

--                        case OBJECT_INVALID_CONST:
-+                        case yy::parser::token::OBJECT_INVALID_CONST:
-                                 pszToken = &quot;OBJECT_INVALID&quot;;
-                                 break;

--                        case BREAK:
-+                        case yy::parser::token::BREAK:
-                                 pszToken = &quot;break&quot;;
-                                 break;

--                        case CASE:
-+                        case yy::parser::token::CASE:
-                                 pszToken = &quot;case&quot;;
-                                 break;

--                        case CONTINUE:
-+                        case yy::parser::token::CONTINUE:
-                                 pszToken = &quot;continue&quot;;
-                                 break;

--                        case DEFAULT:
-+                        case yy::parser::token::DEFAULT:
-                                 pszToken = &quot;default&quot;;
-                                 break;

--                        case DO:
-+                        case yy::parser::token::DO:
-                                 pszToken = &quot;do&quot;;
-                                 break;

--                        case ELSE:
-+                        case yy::parser::token::ELSE:
-                                 pszToken = &quot;else&quot;;
-                                 break;

--                        case FOR:
-+                        case yy::parser::token::FOR:
-                                 pszToken = &quot;for&quot;;
-                                 break;

--                        case IF:
-+                        case yy::parser::token::IF:
-                                 pszToken = &quot;if&quot;;
-                                 break;

--                        case RETURN:
-+                        case yy::parser::token::RETURN:
-                                 pszToken = &quot;return&quot;;
-                                 break;

--                        case SWITCH:
-+                        case yy::parser::token::SWITCH:
-                                 pszToken = &quot;switch&quot;;
-                                 break;

--                        case WHILE:
-+                        case yy::parser::token::WHILE:
-                                 pszToken = &quot;while&quot;;
-                                 break;

--                        case NWCONST:
-+                        case yy::parser::token::NWCONST:
-                                 pszToken = &quot;const&quot;;
-                                 break;

-@@ -657,31 +657,31 @@ YYSTYPE NscBuildType (int nType, YYSTYPE

-         switch (nType)
-         {
--                case VOID_TYPE:
-+                case yy::parser::token::VOID_TYPE:
-                         pOut -&gt;SetType (NscType_Void);
-                         break;

--                case INT_TYPE:
-+                case yy::parser::token::INT_TYPE:
-                         pOut -&gt;SetType (NscType_Integer);
-                         break;

--                case FLOAT_TYPE:
-+                case yy::parser::token::FLOAT_TYPE:
-                         pOut -&gt;SetType (NscType_Float);
-                         break;

--                case OBJECT_TYPE:
-+                case yy::parser::token::OBJECT_TYPE:
-                         pOut -&gt;SetType (NscType_Object);
-                         break;

--                case STRING_TYPE:
-+                case yy::parser::token::STRING_TYPE:
-                         pOut -&gt;SetType (NscType_String);
-                         break;

--                case VECTOR_TYPE:
-+                case yy::parser::token::VECTOR_TYPE:
-                         pOut -&gt;SetType (NscType_Vector);
-                         break;

--                case ACTION_TYPE:
-+                case yy::parser::token::ACTION_TYPE:
-                         if (!g_pCtx -&gt;IsNWScript ())
-                         {
-                                 g_pCtx -&gt;GenerateError (&quot;\&quot;action\&quot; identifier only &quot;
-@@ -692,7 +692,7 @@ YYSTYPE NscBuildType (int nType, YYSTYPE
-                 pOut -&gt;SetType (NscType_Action);
-                         break;

--                case STRUCT_TYPE:
-+                case yy::parser::token::STRUCT_TYPE:
-                         assert (pId != NULL);
-                         {
-                                 if (!g_pCtx -&gt;IsPhase2 () &amp;&amp; !g_pCtx -&gt;IsNWScript ())
-@@ -723,7 +723,7 @@ YYSTYPE NscBuildType (int nType, YYSTYPE
-                         }
-                         break;

--                case ENGINE_TYPE:
-+                case yy::parser::token::ENGINE_TYPE:
-                         assert (pId != NULL);
-                         {
-                                 pOut -&gt;SetType (pId -&gt;GetType ());
-@@ -2923,7 +2923,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case SL:
-+                case yy::parser::token::SL:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
-                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
-@@ -2948,7 +2948,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case SR:
-+                case yy::parser::token::SR:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
- #ifdef NOT_ENABLED_YET
-@@ -2975,7 +2975,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case USR:
-+                case yy::parser::token::USR:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
- #ifdef NOT_ENABLED_YET
-@@ -3086,7 +3086,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case LTEQ:
-+                case yy::parser::token::LTEQ:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
-                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
-@@ -3128,7 +3128,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case GTEQ:
-+                case yy::parser::token::GTEQ:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
-                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
-@@ -3170,7 +3170,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case EQ:
-+                case yy::parser::token::EQ:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
-                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
-@@ -3260,7 +3260,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case NOTEQ:
-+                case yy::parser::token::NOTEQ:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
-                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
-@@ -3440,7 +3440,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case MULEQ:
-+                case yy::parser::token::MULEQ:
-                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Float)
-                         {
-                                 NscPushAssignment (pOut, NscPCode_AsnMultiply, 
-@@ -3468,7 +3468,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case DIVEQ:
-+                case yy::parser::token::DIVEQ:
-                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Float)
-                         {
-                                 NscPushAssignment (pOut, NscPCode_AsnDivide, 
-@@ -3496,7 +3496,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case MODEQ:
-+                case yy::parser::token::MODEQ:
-                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
-                         {
-                                 NscPushAssignment (pOut, NscPCode_AsnModulus, 
-@@ -3509,7 +3509,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case ADDEQ:
-+                case yy::parser::token::ADDEQ:
-                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Vector)
-                         {
-                                 NscPushAssignment (pOut, NscPCode_AsnAdd, 
-@@ -3542,7 +3542,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case SUBEQ:
-+                case yy::parser::token::SUBEQ:
-                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Vector)
-                         {
-                                 NscPushAssignment (pOut, NscPCode_AsnSubtract, 
-@@ -3570,7 +3570,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
-                         }
-                         break;

--                case SLEQ:
-+                case yy::parser::token::SLEQ:
-                         pszOp = &quot;&lt;&lt;=&quot;;
-                         nOp = NscPCode_AsnShiftLeft;
- asn_shift_operator:;
-@@ -3586,17 +3586,17 @@ asn_shift_operator:;
-                         }
-                         break;

--                case SREQ:
-+                case yy::parser::token::SREQ:
-                         pszOp = &quot;&gt;&gt;=&quot;;
-                         nOp = NscPCode_AsnShiftRight;
-                         goto asn_shift_operator;

--                case USREQ:
-+                case yy::parser::token::USREQ:
-                         pszOp = &quot;&gt;&gt;&gt;=&quot;;
-                         nOp = NscPCode_AsnUnsignedShiftRight;
-                         goto asn_shift_operator;

--                case ANDEQ:
-+                case yy::parser::token::ANDEQ:
-                         pszOp = &quot;&amp;=&quot;;
-                         nOp = NscPCode_AsnBitwiseAND;
- asn_bitwise_expression:;
-@@ -3612,12 +3612,12 @@ asn_bitwise_expression:;
-                         }
-                         break;

--                case XOREQ:
-+                case yy::parser::token::XOREQ:
-                         pszOp = &quot;^=&quot;;
-                         nOp = NscPCode_AsnBitwiseXOR;
-                         goto asn_bitwise_expression;

--                case OREQ:
-+                case yy::parser::token::OREQ:
-                         pszOp = &quot;|=&quot;;
-                         nOp = NscPCode_AsnBitwiseOR;
-                         goto asn_bitwise_expression;
-@@ -3696,12 +3696,12 @@ YYSTYPE NscBuildLogicalOp (int nToken, Y

-                 const char *pszOp;
-                 NscPCode nOp;
--                if (nToken == ANDAND)
-+                if (nToken == yy::parser::token::ANDAND)
-                 {
-                         pszOp = &quot;&amp;&amp;&quot;;
-                         nOp = NscPCode_LogicalAND;
-                 }
--                else if (nToken == OROR)
-+                else if (nToken == yy::parser::token::OROR)
-                 {
-                         pszOp = &quot;||&quot;;
-                         nOp = NscPCode_LogicalOR;
-@@ -3750,12 +3750,12 @@ YYSTYPE NscBuildLogicalOp (int nToken, Y
-                         // If the operation is known to be true or false by the lhs
-                         //

--                        else if (nToken == ANDAND &amp;&amp; nLhsConstant == 0)
-+                        else if (nToken == yy::parser::token::ANDAND &amp;&amp; nLhsConstant == 0)
-                         {
-                                 pOut -&gt;PushConstantInteger (0);
-                                 pOut -&gt;SetType (NscType_Integer);
-                         }
--                        else if (nToken == OROR &amp;&amp; nLhsConstant == 1)
-+                        else if (nToken == yy::parser::token::OROR &amp;&amp; nLhsConstant == 1)
-                         {
-                                 pOut -&gt;PushConstantInteger (1);
-                                 pOut -&gt;SetType (NscType_Integer);
-@@ -4706,7 +4706,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-         bool fCheckCond;
-         switch (nToken)
-         {
--                case IF:
-+                case yy::parser::token::IF:
-                         nPCode = NscPCode_If;
-                         nFenceType = NscFenceType_If;
-                         pszToken = &quot;if&quot;;
-@@ -4714,7 +4714,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-                         fCheckCond = pPrev == NULL;
-                         break;

--                case WHILE:
-+                case yy::parser::token::WHILE:
-                         nPCode = NscPCode_While;
-                         nFenceType = NscFenceType_While;
-                         pszToken = &quot;while&quot;;
-@@ -4722,7 +4722,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-                         fCheckCond = pPrev == NULL;
-                         break;

--                case DO:
-+                case yy::parser::token::DO:
-                         nPCode = NscPCode_Do;
-                         nFenceType = NscFenceType_Do;
-                         pszToken = &quot;do&quot;;
-@@ -4730,7 +4730,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-                         fCheckCond = pPrev != NULL;
-                         break;

--                case FOR:
-+                case yy::parser::token::FOR:
-                         nPCode = NscPCode_For;
-                         nFenceType = NscFenceType_For;
-                         pszToken = &quot;for&quot;;
-@@ -4738,7 +4738,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-                         fCheckCond = pPrev == NULL;
-                         break;

--                case SWITCH:
-+                case yy::parser::token::SWITCH:
-                         nPCode = NscPCode_Switch;
-                         nFenceType = NscFenceType_Switch;
-                         pszToken = &quot;switch&quot;;
-@@ -4787,7 +4787,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-                 // for this
-                 //

--                if (nToken == SWITCH)
-+                if (nToken == yy::parser::token::SWITCH)
-                 {
-                         NscSymbolFence *pFence = g_pCtx -&gt;GetCurrentFence ();
-                         pFence -&gt;nPrevLocals++;
-@@ -4806,7 +4806,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
-         // then set return
-         //

--        if (nToken == IF &amp;&amp; pFalse)
-+        if (nToken == yy::parser::token::IF &amp;&amp; pFalse)
-         {
-                 if (fHadReturn)
-                         NscSetFenceReturn (true);
-@@ -4992,7 +4992,7 @@ YYSTYPE NscBuildCase (int nToken, YYSTYP
-                 // If this is a case
-                 //

--                if (nToken == CASE)
-+                if (nToken == yy::parser::token::CASE)
-                 {

-                         //
-@@ -5061,7 +5061,7 @@ YYSTYPE NscBuildCase (int nToken, YYSTYP
-                         // Test for only one default
-                         //

--                        if (nToken == DEFAULT)
-+                        if (nToken == yy::parser::token::DEFAULT)
-                         {
-                                 if (pFence -&gt;fHasDefault)
-                                 {
-@@ -5086,9 +5086,9 @@ YYSTYPE NscBuildCase (int nToken, YYSTYP
-                         //

-                         NscPCode nPCode;
--                        if (nToken == CASE)
-+                        if (nToken == yy::parser::token::CASE)
-                                 nPCode = NscPCode_Case;
--                        else if (nToken == DEFAULT)
-+                        else if (nToken == yy::parser::token::DEFAULT)
-                                 nPCode = NscPCode_Default;
-                         else
-                         {
-@@ -5262,9 +5262,9 @@ YYSTYPE NscBuildBreakContinue (int nToke
-         //

-         NscPCode nPCode;
--        if (nToken == BREAK)
-+        if (nToken == yy::parser::token::BREAK)
-                 nPCode = NscPCode_Break;
--        else if (nToken == CONTINUE)
-+        else if (nToken == yy::parser::token::CONTINUE)
-                 nPCode = NscPCode_Continue;
-         else
-         {
-@@ -5279,7 +5279,7 @@ YYSTYPE NscBuildBreakContinue (int nToke
-         NscSymbolFence *pFence = g_pCtx -&gt;GetCurrentFence ();
-         while (pFence)
-         {
--                if ((pFence -&gt;nFenceType == NscFenceType_Switch &amp;&amp; nToken == BREAK) ||
-+                if ((pFence -&gt;nFenceType == NscFenceType_Switch &amp;&amp; nToken == yy::parser::token::BREAK) ||
-                         pFence -&gt;nFenceType == NscFenceType_Do ||
-                         pFence -&gt;nFenceType == NscFenceType_While ||
-                         pFence -&gt;nFenceType == NscFenceType_For)
-@@ -5288,12 +5288,12 @@ YYSTYPE NscBuildBreakContinue (int nToke
-         }
-         if (pFence == NULL)
-         {
--                if (nToken == BREAK)
-+                if (nToken == yy::parser::token::BREAK)
-                 {
-             g_pCtx -&gt;GenerateError (&quot;\&quot;break\&quot; statement only allowed in &quot;
-                             &quot;\&quot;switch\&quot;, \&quot;do\&quot;, \&quot;while\&quot;, and \&quot;for\&quot; statements&quot;);
-                 }
--                else if (nToken == CONTINUE)
-+                else if (nToken == yy::parser::token::CONTINUE)
-                 {
-             g_pCtx -&gt;GenerateError (&quot;\&quot;continue\&quot; statement only allowed in &quot;
-                             &quot;\&quot;do\&quot;, \&quot;while\&quot;, and \&quot;for\&quot; statements&quot;);
</del></span></pre></div>
<a id="trunkdportsgamesnwntoolsfilesbisonpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/games/nwntools/files/bison.patch (0 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/bison.patch                                (rev 0)
+++ trunk/dports/games/nwntools/files/bison.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -0,0 +1,1392 @@
</span><ins>+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -19,22 +19,24 @@ AC_PROG_YACC

+ # Check bison version, substitute name for yychar
+ bison_version=`bison -V | grep &quot;^bison&quot; | awk '{print $4}'`
+-bison_v=`echo $bison_version | awk 'BEGIN { FS=&quot;.&quot; } {printf &quot;%d&quot;, $1*10+$2;}'`
+ AC_MSG_RESULT([checking bison version: $bison_version])

+-if test -n &quot;$bison_v&quot; &amp;&amp; test &quot;$bison_v&quot; -lt 20
+-then
++case $bison_version in
++    1.*)
+         AC_MSG_ERROR([need a bison version &gt;= 2.0])
+-fi
+-
+-if test -n &quot;$bison_v&quot; &amp;&amp; test &quot;$bison_v&quot; -eq 20
+-then
++        ;;
++    2.0|2.0.*)
+         AC_MSG_RESULT([setting bison lalr1 yychar variable name to yylooka_])
+         AC_DEFINE(YYCHAR_NAME,yylooka_,[name of yychar lookahead var in bison lalr1.cc])
+-else
++        ;;
++    2.*)
+         AC_MSG_RESULT([setting bison lalr1 yychar variable name to yylooka])
+         AC_DEFINE(YYCHAR_NAME,yylooka,[name of yychar lookahead var in bison lalr1.cc])
+-fi
++        ;;
++    *)
++        AC_MSG_RESULT([setting bison lalr1 to use symbols])
++        ;;
++esac

+ # Check for python
+ AM_PATH_PYTHON(2.2,, :)
+Index: _NscLib/NscCompiler.cpp
+===================================================================
+--- _NscLib/NscCompiler.cpp.orig
++++ _NscLib/NscCompiler.cpp
+@@ -44,6 +44,9 @@
+ #include &quot;NscSymbolTable.h&quot;
+ #include &quot;NscCodeGenerator.h&quot;

++// &quot;Import&quot; token definitions.
++typedef yy::parser::token token;
++
+ //
+ // Globals
+ //
+@@ -107,31 +110,31 @@ bool NscCompilerInitialize (CNwnLoader *
+         // Add the reserved words
+         //

+-        NscAddToken (&quot;int&quot;,            INT_TYPE);
+-        NscAddToken (&quot;float&quot;,          FLOAT_TYPE);
+-        NscAddToken (&quot;object&quot;,         OBJECT_TYPE);
+-        NscAddToken (&quot;string&quot;,         STRING_TYPE);
+-        NscAddToken (&quot;struct&quot;,         STRUCT_TYPE);
+-        NscAddToken (&quot;void&quot;,           VOID_TYPE);
+-        NscAddToken (&quot;vector&quot;,         VECTOR_TYPE);
+-        NscAddToken (&quot;action&quot;,         ACTION_TYPE);
+-
+-        NscAddToken (&quot;break&quot;,          BREAK);
+-        NscAddToken (&quot;case&quot;,           CASE);
+-        NscAddToken (&quot;continue&quot;,       CONTINUE);
+-        NscAddToken (&quot;default&quot;,        DEFAULT);
+-        NscAddToken (&quot;do&quot;,             DO);
+-        NscAddToken (&quot;else&quot;,           ELSE);
+-        NscAddToken (&quot;for&quot;,            FOR);
+-        NscAddToken (&quot;if&quot;,             IF);
+-        NscAddToken (&quot;return&quot;,         RETURN);
+-        NscAddToken (&quot;switch&quot;,         SWITCH);
+-        NscAddToken (&quot;while&quot;,          WHILE);
++        NscAddToken (&quot;int&quot;,            token::INT_TYPE);
++        NscAddToken (&quot;float&quot;,          token::FLOAT_TYPE);
++        NscAddToken (&quot;object&quot;,         token::OBJECT_TYPE);
++        NscAddToken (&quot;string&quot;,         token::STRING_TYPE);
++        NscAddToken (&quot;struct&quot;,         token::STRUCT_TYPE);
++        NscAddToken (&quot;void&quot;,           token::VOID_TYPE);
++        NscAddToken (&quot;vector&quot;,         token::VECTOR_TYPE);
++        NscAddToken (&quot;action&quot;,         token::ACTION_TYPE);
++
++        NscAddToken (&quot;break&quot;,          token::BREAK);
++        NscAddToken (&quot;case&quot;,           token::CASE);
++        NscAddToken (&quot;continue&quot;,       token::CONTINUE);
++        NscAddToken (&quot;default&quot;,        token::DEFAULT);
++        NscAddToken (&quot;do&quot;,             token::DO);
++        NscAddToken (&quot;else&quot;,           token::ELSE);
++        NscAddToken (&quot;for&quot;,            token::FOR);
++        NscAddToken (&quot;if&quot;,             token::IF);
++        NscAddToken (&quot;return&quot;,         token::RETURN);
++        NscAddToken (&quot;switch&quot;,         token::SWITCH);
++        NscAddToken (&quot;while&quot;,          token::WHILE);
+         if (fEnableExtensions || nVersion &gt;= 999)
+-        NscAddToken (&quot;const&quot;,      NWCONST);
++        NscAddToken (&quot;const&quot;,      token::NWCONST);

+-        NscAddToken (&quot;OBJECT_SELF&quot;,    OBJECT_SELF_CONST);
+-        NscAddToken (&quot;OBJECT_INVALID&quot;, OBJECT_INVALID_CONST);
++        NscAddToken (&quot;OBJECT_SELF&quot;,    token::OBJECT_SELF_CONST);
++        NscAddToken (&quot;OBJECT_INVALID&quot;, token::OBJECT_INVALID_CONST);

+         //
+         // Read NWSCRIPT
+@@ -373,8 +376,7 @@ const char *NscGetActionName (int nActio
+ //
+ //----------------------------------------------------------------------------

+-void yy::parser::error (const yy::parser::location_type&amp; l,
+-                        const std::string&amp; m) {
++void yy::parser::error (const std::string&amp; m) {
+     context.yyerror(m.c_str());
+ }

+Index: _NscLib/NscContext.cpp
+===================================================================
+--- _NscLib/NscContext.cpp.orig
++++ _NscLib/NscContext.cpp
+@@ -43,6 +43,9 @@
+ #include &quot;NscPStackEntry.h&quot;
+ #include &quot;NscSymbolTable.h&quot;

++// &quot;Import&quot; token definitions.
++typedef yy::parser::token token;
++
+ //
+ // Externals
+ //
+@@ -230,7 +233,7 @@ read_another_line:;
+                 if (pSymbol != NULL)
+                 {
+                         assert (pSymbol -&gt;nSymType == NscSymType_Token);
+-                        if (pSymbol -&gt;nToken == ENGINE_TYPE)
++                        if (pSymbol -&gt;nToken == token::ENGINE_TYPE)
+                         {
+                                 CNscPStackEntry *pEntry = GetPStackEntry (__FILE__, __LINE__);
+                                 pEntry -&gt;SetType ((NscType) (
+@@ -246,7 +249,7 @@ read_another_line:;
+                         CNscPStackEntry *pEntry = GetPStackEntry (__FILE__, __LINE__);
+                         pEntry -&gt;SetIdentifier (pszStart, nCount);
+                         *yylval = pEntry;
+-                        return IDENTIFIER;
++                        return token::IDENTIFIER;
+                 }
+         }

+@@ -305,7 +308,7 @@ read_another_line:;
+                         pEntry -&gt;SetType (NscType_Integer);
+                         pEntry -&gt;PushConstantInteger (nValue);
+                         *yylval = pEntry;
+-                        return INTEGER_CONST; 
++                        return token::INTEGER_CONST; 
+                 }

+                 //
+@@ -359,13 +362,13 @@ read_another_line:;
+                         {
+                                 pEntry -&gt;SetType (NscType_Float);
+                                 pEntry -&gt;PushConstantFloat ((float) atof (psz));
+-                                return FLOAT_CONST;
++                                return token::FLOAT_CONST;
+                         }
+                         else
+                         {
+                                 pEntry -&gt;SetType (NscType_Integer);
+                                 pEntry -&gt;PushConstantInteger (atol (psz));
+-                                return INTEGER_CONST;
++                                return token::INTEGER_CONST;
+                         }
+                 }
+         }
+@@ -414,7 +417,7 @@ read_another_line:;
+                                 else if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return DIVEQ;
++                                        return token::DIVEQ;
+                                 }
+                                 else 
+                                 {
+@@ -441,12 +444,12 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return ADDEQ;
++                                        return token::ADDEQ;
+                                 }
+                                 else if (c == '+')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return PLUSPLUS;
++                                        return token::PLUSPLUS;
+                                 }
+                                 else
+                                         return '+';
+@@ -457,12 +460,12 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return SUBEQ;
++                                        return token::SUBEQ;
+                                 }
+                                 else if (c == '-')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return MINUSMINUS;
++                                        return token::MINUSMINUS;
+                                 }
+                                 else
+                                         return '-';
+@@ -473,7 +476,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return MULEQ;
++                                        return token::MULEQ;
+                                 }
+                                 else
+                                         return '*';
+@@ -484,7 +487,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return MODEQ;
++                                        return token::MODEQ;
+                                 }
+                                 else
+                                         return '%';
+@@ -495,7 +498,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return XOREQ;
++                                        return token::XOREQ;
+                                 }
+                                 else
+                                         return '^';
+@@ -506,12 +509,12 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return ANDEQ;
++                                        return token::ANDEQ;
+                                 }
+                                 else if (c == '&amp;')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return ANDAND;
++                                        return token::ANDAND;
+                                 }
+                                 else
+                                         return '&amp;';
+@@ -522,12 +525,12 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return OREQ;
++                                        return token::OREQ;
+                                 }
+                                 else if (c == '|')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return OROR;
++                                        return token::OROR;
+                                 }
+                                 else
+                                         return '|';
+@@ -538,7 +541,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return NOTEQ;
++                                        return token::NOTEQ;
+                                 }
+                                 else
+                                         return '!';
+@@ -549,7 +552,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return EQ;
++                                        return token::EQ;
+                                 }
+                                 else
+                                         return '=';
+@@ -560,7 +563,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return LTEQ;
++                                        return token::LTEQ;
+                                 }
+                                 else if (c == '&lt;')
+                                 {
+@@ -569,10 +572,10 @@ read_another_line:;
+                                         if (c == '=')
+                                         {
+                                                 m_pStreamTop -&gt;pszNextTokenPos++;
+-                                                return SLEQ;
++                                                return token::SLEQ;
+                                         }
+                                         else
+-                                                return SL;
++                                                return token::SL;
+                                 }
+                                 else
+                                         return '&lt;';
+@@ -583,7 +586,7 @@ read_another_line:;
+                                 if (c == '=')
+                                 {
+                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                        return GTEQ;
++                                        return token::GTEQ;
+                                 }
+                                 else if (c == '&gt;')
+                                 {
+@@ -592,7 +595,7 @@ read_another_line:;
+                                         if (c == '=')
+                                         {
+                                                 m_pStreamTop -&gt;pszNextTokenPos++;
+-                                                return SREQ;
++                                                return token::SREQ;
+                                         }
+                                         else if (c == '&gt;')
+                                         {
+@@ -601,13 +604,13 @@ read_another_line:;
+                                                 if (c == '=')
+                                                 {
+                                                         m_pStreamTop -&gt;pszNextTokenPos++;
+-                                                        return USREQ;
++                                                        return token::USREQ;
+                                                 }
+                                                 else
+-                                                        return USR;
++                                                        return token::USR;
+                                         }
+                                         else
+-                                                return SR;
++                                                return token::SR;
+                                 }
+                                 else
+                                         return '&gt;';
+@@ -626,7 +629,7 @@ read_another_line:;
+                                                         pEntry -&gt;SetType (NscType_String);
+                                                         pEntry -&gt;PushConstantString (pszStart, (int) (pszOut - pszStart));
+                                                         *yylval = pEntry;
+-                                                        return STRING_CONST;
++                                                        return token::STRING_CONST;
+                                                 }
+                                                 else if (c == '\\')
+                                                 {
+@@ -646,7 +649,7 @@ read_another_line:;
+                                                         pEntry -&gt;PushConstantString (pszStart, (int) (pszOut - pszStart));
+                                                         *yylval = pEntry;
+                                                         GenerateError (&quot;Unterminated string&quot;);
+-                                                        return STRING_CONST; 
++                                                        return token::STRING_CONST; 
+                                                 }
+                                                 else
+                                                         *pszOut++ = c;
+@@ -898,7 +901,7 @@ try_again:;
+                                         {
+                                                 NscSymbol *pSymbol = g_sNscReservedWords .Add (
+                                                         pszVTmp, NscSymType_Token);
+-                                                pSymbol -&gt;nToken = ENGINE_TYPE;
++                                                pSymbol -&gt;nToken = token::ENGINE_TYPE;
+                                                 pSymbol -&gt;nEngineObject = nIndex;
+                                         }
+                                 }
+Index: _NscLib/NscParser.ypp
+===================================================================
+--- _NscLib/NscParser.ypp.orig
++++ _NscLib/NscParser.ypp
+@@ -273,15 +273,15 @@ shift_expression:
+                 }
+         | shift_expression SL additive_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (SL, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::SL, $1, $3); 
+                 }
+         | shift_expression SR additive_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (SR, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::SR, $1, $3); 
+                 }
+         | shift_expression USR additive_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (USR, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::USR, $1, $3); 
+                 }
+         

+@@ -300,11 +300,11 @@ relational_expression:
+                 }
+         | relational_expression LTEQ shift_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (LTEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::LTEQ, $1, $3); 
+                 }
+         | relational_expression GTEQ shift_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (GTEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::GTEQ, $1, $3); 
+                 }
+         

+@@ -315,11 +315,11 @@ equality_expression:
+                 }
+         | equality_expression EQ relational_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (EQ, $1, $3);
++                        $$ = NscBuildBinaryOp (token::EQ, $1, $3);
+                 }
+         | equality_expression NOTEQ relational_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (NOTEQ, $1, $3);
++                        $$ = NscBuildBinaryOp (token::NOTEQ, $1, $3);
+                 }
+         

+@@ -363,7 +363,7 @@ logical_and_expression:
+                 }
+         | logical_and_expression ANDAND inclusive_or_expression
+                 { 
+-                        $$ = NscBuildLogicalOp (ANDAND, $1, $3); 
++                        $$ = NscBuildLogicalOp (token::ANDAND, $1, $3); 
+                 }
+         

+@@ -374,7 +374,7 @@ logical_or_expression:
+                 }
+         | logical_or_expression OROR logical_and_expression
+                 { 
+-                        $$ = NscBuildLogicalOp (OROR, $1, $3); 
++                        $$ = NscBuildLogicalOp (token::OROR, $1, $3); 
+                 }
+         

+@@ -400,47 +400,47 @@ assignment_expression:
+                 }
+         | unary_expression MULEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (MULEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::MULEQ, $1, $3); 
+                 }
+         | unary_expression DIVEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (DIVEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::DIVEQ, $1, $3); 
+                 }
+         | unary_expression MODEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (MODEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::MODEQ, $1, $3); 
+                 }
+         | unary_expression ADDEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (ADDEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::ADDEQ, $1, $3); 
+                 }
+         | unary_expression SUBEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (SUBEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::SUBEQ, $1, $3); 
+                 }
+         | unary_expression SLEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (SLEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::SLEQ, $1, $3); 
+                 }
+         | unary_expression SREQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (SREQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::SREQ, $1, $3); 
+                 }
+         | unary_expression USREQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (USREQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::USREQ, $1, $3); 
+                 }
+         | unary_expression ANDEQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (ANDEQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::ANDEQ, $1, $3); 
+                 }
+         | unary_expression XOREQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (XOREQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::XOREQ, $1, $3); 
+                 }
+         | unary_expression OREQ assignment_expression
+                 { 
+-                        $$ = NscBuildBinaryOp (OREQ, $1, $3); 
++                        $$ = NscBuildBinaryOp (token::OREQ, $1, $3); 
+                 }
+         

+@@ -480,39 +480,39 @@ qualified_type_specifier:
+ type_specifier:
+         VOID_TYPE 
+                 {
+-                        $$ = NscBuildType (VOID_TYPE, NULL); 
++                        $$ = NscBuildType (token::VOID_TYPE, NULL); 
+                 }
+         | INT_TYPE 
+                 {
+-                        $$ = NscBuildType (INT_TYPE, NULL); 
++                        $$ = NscBuildType (token::INT_TYPE, NULL); 
+                 }
+         | FLOAT_TYPE 
+                 {
+-                        $$ = NscBuildType (FLOAT_TYPE, NULL); 
++                        $$ = NscBuildType (token::FLOAT_TYPE, NULL); 
+                 }
+         | OBJECT_TYPE 
+                 { 
+-                        $$ = NscBuildType (OBJECT_TYPE, NULL); 
++                        $$ = NscBuildType (token::OBJECT_TYPE, NULL); 
+                 }
+         | STRING_TYPE 
+                 { 
+-                        $$ = NscBuildType (STRING_TYPE, NULL); 
++                        $$ = NscBuildType (token::STRING_TYPE, NULL); 
+                 }
+         | ACTION_TYPE 
+                 { 
+-                        $$ = NscBuildType (ACTION_TYPE, NULL); 
++                        $$ = NscBuildType (token::ACTION_TYPE, NULL); 
+                 }
+         | VECTOR_TYPE 
+                 { 
+-                        $$ = NscBuildType (VECTOR_TYPE, NULL); 
++                        $$ = NscBuildType (token::VECTOR_TYPE, NULL); 
+                 }
+         | struct_type_start IDENTIFIER 
+                 { 
+-                        $$ = NscBuildType (STRUCT_TYPE, $2); 
++                        $$ = NscBuildType (token::STRUCT_TYPE, $2); 
+                 }
+         | ENGINE_TYPE 
+                 {
+-                        $$ = NscBuildType (ENGINE_TYPE, $1); 
++                        $$ = NscBuildType (token::ENGINE_TYPE, $1); 
+                 }
+         
+         
+@@ -600,11 +600,11 @@ labeled_statement:
+ case_statement:
+         CASE { NscBuildSaveLine (0); } constant_expression ':' 
+                 { 
+-                        $$ = NscBuildCase (CASE, $3); 
++                        $$ = NscBuildCase (token::CASE, $3); 
+                 }
+         | DEFAULT { NscBuildSaveLine (0); } ':' 
+                 {
+-                        $$ = NscBuildCase (DEFAULT, NULL); 
++                        $$ = NscBuildCase (token::DEFAULT, NULL); 
+                 }
+         
+         
+@@ -657,6 +657,7 @@ expression_statement:
+         | error 
+                 {
+                         $$ = NULL;
++#ifdef YYCHAR_NAME
+                         if (NscBuildSyntaxError (YYCHAR_NAME, yylval))
+                                 YYABORT;
+                         while (YYCHAR_NAME != EOF &amp;&amp; YYCHAR_NAME != ';' &amp;&amp; YYCHAR_NAME != '{' &amp;&amp; YYCHAR_NAME != '}')
+@@ -668,6 +669,18 @@ expression_statement:
+                         }
+                         if (YYCHAR_NAME == ';')
+                                 YYCHAR_NAME = yyempty_;
++#else
++                        if (NscBuildSyntaxError (yyla.type, yyla.value))
++                                YYABORT;
++                        while (yyla.type != EOF &amp;&amp; yyla.type != ';' &amp;&amp; yyla.type != '{' &amp;&amp; yyla.type != '}')
++                        {
++                                if (yyla.value != NULL)
++                                        yyla.value; //FIXME
++                                yyla.type = yytranslate_ (yylex (&amp;yyla.value, context));
++                        }
++                        if (yyla.type == ';')
++                                yyla.clear ();
++#endif // YYCHAR_NAME
+                 }         
+         
+         
+@@ -680,15 +693,15 @@ expression_statement:
+ selection_statement:
+         if_start statement_blank_error
+                 { 
+-                        $$ = NscBuild5Block (IF, $1, 0, NULL, NULL, NULL, $2, NULL); 
++                        $$ = NscBuild5Block (token::IF, $1, 0, NULL, NULL, NULL, $2, NULL); 
+                 }
+         | if_else_start statement_blank_error 
+                 {
+-                        $$ = NscBuild5Block (IF, $1, 0, NULL, NULL, NULL, NULL, $2);
++                        $$ = NscBuild5Block (token::IF, $1, 0, NULL, NULL, NULL, NULL, $2);
+                 }
+         | switch_start statement 
+                 {
+-                        $$ = NscBuild5Block (SWITCH, $1, 0, NULL, NULL, NULL, $2, NULL); 
++                        $$ = NscBuild5Block (token::SWITCH, $1, 0, NULL, NULL, NULL, $2, NULL); 
+                 }
+         
+         
+@@ -696,21 +709,21 @@ if_else_start:
+         if_start statement_blank_error ELSE 
+                 {
+                         NscBuildSaveLine (0); 
+-                        $$ = NscBuild5Block (IF, $1, 1, NULL, NULL, NULL, $2, NULL); 
++                        $$ = NscBuild5Block (token::IF, $1, 1, NULL, NULL, NULL, $2, NULL); 
+                 }
+         
+                 
+ if_start:
+         IF '(' { NscBuildSaveLine (0); } expression ')' 
+                 { 
+-                        $$ = NscBuild5Block (IF, NULL, 1, NULL, $4, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::IF, NULL, 1, NULL, $4, NULL, NULL, NULL); 
+                 }
+         
+         
+ switch_start:
+         SWITCH { NscBuildSaveLine (0); } '(' expression ')' 
+                 {
+-                        $$ = NscBuild5Block (SWITCH, NULL, 1, NULL, $4, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::SWITCH, NULL, 1, NULL, $4, NULL, NULL, NULL); 
+                 }
+         
+         
+@@ -723,50 +736,50 @@ switch_start:
+ iteration_statement:
+         while_start statement 
+                 {
+-                        $$ = NscBuild5Block (WHILE, $1, 0, NULL, NULL, NULL, $2, NULL); 
++                        $$ = NscBuild5Block (token::WHILE, $1, 0, NULL, NULL, NULL, $2, NULL); 
+                 }
+         | do_start statement WHILE { NscBuildSaveLine (0); } '(' expression ')' ';' 
+                 {
+-                        $$ = NscBuild5Block (DO, $1, 0, NULL, $6, NULL, $2, NULL); 
++                        $$ = NscBuild5Block (token::DO, $1, 0, NULL, $6, NULL, $2, NULL); 
+                 }
+         | for_start statement 
+                 {
+-                        $$ = NscBuild5Block (FOR, $1, 0, NULL, NULL, NULL, $2, NULL); 
++                        $$ = NscBuild5Block (token::FOR, $1, 0, NULL, NULL, NULL, $2, NULL); 
+                 }
+         
+         
+ for_start:
+         for_start_start ';' ';' ')' 
+                 {
+-                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
+                 }
+         | for_start_start expression ';' ';' ')' 
+                 { 
+-                        $$ = NscBuild5Block (FOR, NULL, 1, $2, NULL, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, NULL, NULL, NULL, NULL); 
+                 }
+         | for_start_start ';' expression ';' ')'
+                 { 
+-                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, $3, NULL, NULL, NULL);
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, $3, NULL, NULL, NULL);
+                 }
+         | for_start_start expression ';' expression ';' ')' 
+                 {
+-                        $$ = NscBuild5Block (FOR, NULL, 1, $2, $4, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, $4, NULL, NULL, NULL); 
+                 }
+         | for_start_start ';' ';' expression ')' 
+                 {
+-                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, NULL, $4, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, NULL, $4, NULL, NULL); 
+                 }
+         | for_start_start expression ';' ';' expression ')' 
+                 {
+-                        $$ = NscBuild5Block (FOR, NULL, 1, $2, NULL, $5, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, NULL, $5, NULL, NULL); 
+                 }
+         | for_start_start ';' expression ';' expression ')' 
+                 {
+-                        $$ = NscBuild5Block (FOR, NULL, 1, NULL, $3, $5, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, NULL, $3, $5, NULL, NULL); 
+                 }
+         | for_start_start expression ';' expression ';' expression ')' 
+                 {
+-                        $$ = NscBuild5Block (FOR, NULL, 1, $2, $4, $6, NULL, NULL); 
++                        $$ = NscBuild5Block (token::FOR, NULL, 1, $2, $4, $6, NULL, NULL); 
+                 }
+         
+         
+@@ -780,14 +793,14 @@ for_start_start:
+ while_start:
+         WHILE '(' { NscBuildSaveLine (0); } expression ')' 
+                 { 
+-                        $$ = NscBuild5Block (WHILE, NULL, 1, NULL, $4, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::WHILE, NULL, 1, NULL, $4, NULL, NULL, NULL); 
+                 }
+         
+         
+ do_start:
+         DO 
+                 { 
+-                        $$ = NscBuild5Block (DO, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
++                        $$ = NscBuild5Block (token::DO, NULL, 1, NULL, NULL, NULL, NULL, NULL); 
+                 }
+         
+                 
+@@ -800,11 +813,11 @@ do_start:
+ jump_statement:
+         CONTINUE { NscBuildSaveLine (0); } ';'
+                 {
+-                        $$ = NscBuildBreakContinue (CONTINUE);
++                        $$ = NscBuildBreakContinue (token::CONTINUE);
+                 }
+         | BREAK { NscBuildSaveLine (0); } ';' 
+                 {
+-                        $$ = NscBuildBreakContinue (BREAK); 
++                        $$ = NscBuildBreakContinue (token::BREAK); 
+                 }
+         | return_start ';' 
+                 {
+@@ -984,6 +997,7 @@ translation_unit:
+         | error 
+                 {
+                         $$ = NULL;
++#ifdef YYCHAR_NAME
+                         if (NscBuildSyntaxError (YYCHAR_NAME, yylval))
+                                 YYABORT;
+                         while (YYCHAR_NAME != EOF &amp;&amp; YYCHAR_NAME != ';' &amp;&amp; YYCHAR_NAME != '{' &amp;&amp; YYCHAR_NAME != '}')
+@@ -994,6 +1008,17 @@ translation_unit:
+                                 YYCHAR_NAME = yylex (&amp;yylval, context);
+                         }
+                         YYCHAR_NAME = yyempty_;
++#else
++                        if (NscBuildSyntaxError (yyla.type, yyla.value))
++                                YYABORT;
++                        while (yyla.type != EOF &amp;&amp; yyla.type != ';' &amp;&amp; yyla.type != '{' &amp;&amp; yyla.type != '}')
++                        {
++                                if (yyla.value != NULL)
++                                        yyla.value; //FIXME
++                                yyla.type = yytranslate_ (yylex (&amp;yyla.value, context));
++                        }
++                        yyla.clear ();
++#endif // YYCHAR_NAME
+                 }         
+         

+Index: _NscLib/NscParserRoutines.cpp
+===================================================================
+--- _NscLib/NscParserRoutines.cpp.orig
++++ _NscLib/NscParserRoutines.cpp
+@@ -43,6 +43,9 @@
+ #include &quot;NscPStackEntry.h&quot;
+ #include &quot;NscSymbolTable.h&quot;

++// &quot;Import&quot; token definitions.
++typedef yy::parser::token token;
++
+ //
+ // Externals
+ //
+@@ -396,142 +399,142 @@ bool NscBuildSyntaxError (int nToken, YY

+                 switch (nToken)
+                 {
+-                        case IDENTIFIER:
++                        case token::IDENTIFIER:
+                                 if (yylval)
+                                         pszToken = yylval -&gt;GetIdentifier ();
+                                 else
+                                         pszToken = &quot;identifier&quot;;
+                                 break;

+-                        case INTEGER_CONST:
++                        case token::INTEGER_CONST:
+                                 pszToken = &quot;integer constant&quot;;
+                                 break;

+-                        case FLOAT_CONST:
++                        case token::FLOAT_CONST:
+                                 pszToken = &quot;float constant&quot;;
+                                 break;

+-                        case STRING_CONST:
++                        case token::STRING_CONST:
+                                 pszToken = &quot;string constant&quot;;
+                                 break;

+-                        case ADDEQ:
++                        case token::ADDEQ:
+                                 pszToken = &quot;+=&quot;;
+                                 break;

+-                        case SUBEQ:
++                        case token::SUBEQ:
+                                 pszToken = &quot;-=&quot;;
+                                 break;

+-                        case MULEQ:
++                        case token::MULEQ:
+                                 pszToken = &quot;*=&quot;;
+                                 break;

+-                        case DIVEQ:
++                        case token::DIVEQ:
+                                 pszToken = &quot;/=&quot;;
+                                 break;

+-                        case MODEQ:
++                        case token::MODEQ:
+                                 pszToken = &quot;%=&quot;;
+                                 break;

+-                        case XOREQ:
++                        case token::XOREQ:
+                                 pszToken = &quot;^=&quot;;
+                                 break;

+-                        case ANDEQ:
++                        case token::ANDEQ:
+                                 pszToken = &quot;&amp;=&quot;;
+                                 break;

+-                        case OREQ:
++                        case token::OREQ:
+                                 pszToken = &quot;|=&quot;;
+                                 break;

+-                        case SL:
++                        case token::SL:
+                                 pszToken = &quot;&lt;&lt;&quot;;
+                                 break;

+-                        case SR:
++                        case token::SR:
+                                 pszToken = &quot;&gt;&gt;&quot;;
+                                 break;

+-                        case USR:
++                        case token::USR:
+                                 pszToken = &quot;&gt;&gt;&gt;&quot;;
+                                 break;

+-                        case SLEQ:
++                        case token::SLEQ:
+                                 pszToken = &quot;&lt;&lt;=&quot;;
+                                 break;

+-                        case SREQ:
++                        case token::SREQ:
+                                 pszToken = &quot;&gt;&gt;=&quot;;
+                                 break;

+-                        case USREQ:
++                        case token::USREQ:
+                                 pszToken = &quot;&gt;&gt;&gt;=&quot;;
+                                 break;

+-                        case EQ:
++                        case token::EQ:
+                                 pszToken = &quot;==&quot;;
+                                 break;

+-                        case NOTEQ:
++                        case token::NOTEQ:
+                                 pszToken = &quot;!=&quot;;
+                                 break;

+-                        case LTEQ:
++                        case token::LTEQ:
+                                 pszToken = &quot;&lt;=&quot;;
+                                 break;

+-                        case GTEQ:
++                        case token::GTEQ:
+                                 pszToken = &quot;&gt;=&quot;;
+                                 break;

+-                        case ANDAND:
++                        case token::ANDAND:
+                                 pszToken = &quot;&amp;&amp;&quot;;
+                                 break;

+-                        case OROR:
++                        case token::OROR:
+                                 pszToken = &quot;||&quot;;
+                                 break;

+-                        case PLUSPLUS:
++                        case token::PLUSPLUS:
+                                 pszToken = &quot;++&quot;;
+                                 break;

+-                        case MINUSMINUS:
++                        case token::MINUSMINUS:
+                                 pszToken = &quot;--&quot;;
+                                 break;

+-                        case FLOAT_TYPE:
++                        case token::FLOAT_TYPE:
+                                 pszToken = &quot;float&quot;;
+                                 break;

+-                        case INT_TYPE:
++                        case token::INT_TYPE:
+                                 pszToken = &quot;int&quot;;
+                                 break;

+-                        case OBJECT_TYPE:
++                        case token::OBJECT_TYPE:
+                                 pszToken = &quot;object&quot;;
+                                 break;

+-                        case STRING_TYPE:
++                        case token::STRING_TYPE:
+                                 pszToken = &quot;string&quot;;
+                                 break;

+-                        case VOID_TYPE:
++                        case token::VOID_TYPE:
+                                 pszToken = &quot;void&quot;;
+                                 break;

+-                        case STRUCT_TYPE:
++                        case token::STRUCT_TYPE:
+                                 pszToken = &quot;struct&quot;;
+                                 break;

+-                        case VECTOR_TYPE:
++                        case token::VECTOR_TYPE:
+                                 pszToken = &quot;vector&quot;;
+                                 break;

+-                        case ENGINE_TYPE:
++                        case token::ENGINE_TYPE:
+                                 if (yylval)
+                                 {
+                                         int nIndex = yylval -&gt;GetType () - NscType_Engine_0;
+@@ -541,63 +544,63 @@ bool NscBuildSyntaxError (int nToken, YY
+                                         pszToken = &quot;engine-type&quot;;
+                                 break;

+-                        case ACTION_TYPE:
++                        case token::ACTION_TYPE:
+                                 pszToken = &quot;action&quot;;
+                                 break;

+-                        case OBJECT_SELF_CONST:
++                        case token::OBJECT_SELF_CONST:
+                                 pszToken = &quot;OBJECT_SELF&quot;;
+                                 break;

+-                        case OBJECT_INVALID_CONST:
++                        case token::OBJECT_INVALID_CONST:
+                                 pszToken = &quot;OBJECT_INVALID&quot;;
+                                 break;

+-                        case BREAK:
++                        case token::BREAK:
+                                 pszToken = &quot;break&quot;;
+                                 break;

+-                        case CASE:
++                        case token::CASE:
+                                 pszToken = &quot;case&quot;;
+                                 break;

+-                        case CONTINUE:
++                        case token::CONTINUE:
+                                 pszToken = &quot;continue&quot;;
+                                 break;

+-                        case DEFAULT:
++                        case token::DEFAULT:
+                                 pszToken = &quot;default&quot;;
+                                 break;

+-                        case DO:
++                        case token::DO:
+                                 pszToken = &quot;do&quot;;
+                                 break;

+-                        case ELSE:
++                        case token::ELSE:
+                                 pszToken = &quot;else&quot;;
+                                 break;

+-                        case FOR:
++                        case token::FOR:
+                                 pszToken = &quot;for&quot;;
+                                 break;

+-                        case IF:
++                        case token::IF:
+                                 pszToken = &quot;if&quot;;
+                                 break;

+-                        case RETURN:
++                        case token::RETURN:
+                                 pszToken = &quot;return&quot;;
+                                 break;

+-                        case SWITCH:
++                        case token::SWITCH:
+                                 pszToken = &quot;switch&quot;;
+                                 break;

+-                        case WHILE:
++                        case token::WHILE:
+                                 pszToken = &quot;while&quot;;
+                                 break;

+-                        case NWCONST:
++                        case token::NWCONST:
+                                 pszToken = &quot;const&quot;;
+                                 break;

+@@ -657,31 +660,31 @@ YYSTYPE NscBuildType (int nType, YYSTYPE

+         switch (nType)
+         {
+-                case VOID_TYPE:
++                case token::VOID_TYPE:
+                         pOut -&gt;SetType (NscType_Void);
+                         break;

+-                case INT_TYPE:
++                case token::INT_TYPE:
+                         pOut -&gt;SetType (NscType_Integer);
+                         break;

+-                case FLOAT_TYPE:
++                case token::FLOAT_TYPE:
+                         pOut -&gt;SetType (NscType_Float);
+                         break;

+-                case OBJECT_TYPE:
++                case token::OBJECT_TYPE:
+                         pOut -&gt;SetType (NscType_Object);
+                         break;

+-                case STRING_TYPE:
++                case token::STRING_TYPE:
+                         pOut -&gt;SetType (NscType_String);
+                         break;

+-                case VECTOR_TYPE:
++                case token::VECTOR_TYPE:
+                         pOut -&gt;SetType (NscType_Vector);
+                         break;

+-                case ACTION_TYPE:
++                case token::ACTION_TYPE:
+                         if (!g_pCtx -&gt;IsNWScript ())
+                         {
+                                 g_pCtx -&gt;GenerateError (&quot;\&quot;action\&quot; identifier only &quot;
+@@ -692,7 +695,7 @@ YYSTYPE NscBuildType (int nType, YYSTYPE
+                 pOut -&gt;SetType (NscType_Action);
+                         break;

+-                case STRUCT_TYPE:
++                case token::STRUCT_TYPE:
+                         assert (pId != NULL);
+                         {
+                                 if (!g_pCtx -&gt;IsPhase2 () &amp;&amp; !g_pCtx -&gt;IsNWScript ())
+@@ -723,7 +726,7 @@ YYSTYPE NscBuildType (int nType, YYSTYPE
+                         }
+                         break;

+-                case ENGINE_TYPE:
++                case token::ENGINE_TYPE:
+                         assert (pId != NULL);
+                         {
+                                 pOut -&gt;SetType (pId -&gt;GetType ());
+@@ -2923,7 +2926,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case SL:
++                case token::SL:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
+@@ -2948,7 +2951,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case SR:
++                case token::SR:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+ #ifdef NOT_ENABLED_YET
+@@ -2975,7 +2978,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case USR:
++                case token::USR:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+ #ifdef NOT_ENABLED_YET
+@@ -3086,7 +3089,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case LTEQ:
++                case token::LTEQ:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
+@@ -3128,7 +3131,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case GTEQ:
++                case token::GTEQ:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
+@@ -3170,7 +3173,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case EQ:
++                case token::EQ:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
+@@ -3260,7 +3263,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case NOTEQ:
++                case token::NOTEQ:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+                                 if (g_pCtx -&gt;GetOptExpression () &amp;&amp;
+@@ -3440,7 +3443,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case MULEQ:
++                case token::MULEQ:
+                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Float)
+                         {
+                                 NscPushAssignment (pOut, NscPCode_AsnMultiply, 
+@@ -3468,7 +3471,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case DIVEQ:
++                case token::DIVEQ:
+                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Float)
+                         {
+                                 NscPushAssignment (pOut, NscPCode_AsnDivide, 
+@@ -3496,7 +3499,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case MODEQ:
++                case token::MODEQ:
+                         if (nLhsType == NscType_Integer &amp;&amp; nRhsType == NscType_Integer)
+                         {
+                                 NscPushAssignment (pOut, NscPCode_AsnModulus, 
+@@ -3509,7 +3512,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case ADDEQ:
++                case token::ADDEQ:
+                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Vector)
+                         {
+                                 NscPushAssignment (pOut, NscPCode_AsnAdd, 
+@@ -3542,7 +3545,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case SUBEQ:
++                case token::SUBEQ:
+                         if (nLhsType == NscType_Vector &amp;&amp; nRhsType == NscType_Vector)
+                         {
+                                 NscPushAssignment (pOut, NscPCode_AsnSubtract, 
+@@ -3570,7 +3573,7 @@ YYSTYPE NscBuildBinaryOp (int nToken, YY
+                         }
+                         break;

+-                case SLEQ:
++                case token::SLEQ:
+                         pszOp = &quot;&lt;&lt;=&quot;;
+                         nOp = NscPCode_AsnShiftLeft;
+ asn_shift_operator:;
+@@ -3586,17 +3589,17 @@ asn_shift_operator:;
+                         }
+                         break;

+-                case SREQ:
++                case token::SREQ:
+                         pszOp = &quot;&gt;&gt;=&quot;;
+                         nOp = NscPCode_AsnShiftRight;
+                         goto asn_shift_operator;

+-                case USREQ:
++                case token::USREQ:
+                         pszOp = &quot;&gt;&gt;&gt;=&quot;;
+                         nOp = NscPCode_AsnUnsignedShiftRight;
+                         goto asn_shift_operator;

+-                case ANDEQ:
++                case token::ANDEQ:
+                         pszOp = &quot;&amp;=&quot;;
+                         nOp = NscPCode_AsnBitwiseAND;
+ asn_bitwise_expression:;
+@@ -3612,12 +3615,12 @@ asn_bitwise_expression:;
+                         }
+                         break;

+-                case XOREQ:
++                case token::XOREQ:
+                         pszOp = &quot;^=&quot;;
+                         nOp = NscPCode_AsnBitwiseXOR;
+                         goto asn_bitwise_expression;

+-                case OREQ:
++                case token::OREQ:
+                         pszOp = &quot;|=&quot;;
+                         nOp = NscPCode_AsnBitwiseOR;
+                         goto asn_bitwise_expression;
+@@ -3696,12 +3699,12 @@ YYSTYPE NscBuildLogicalOp (int nToken, Y

+                 const char *pszOp;
+                 NscPCode nOp;
+-                if (nToken == ANDAND)
++                if (nToken == token::ANDAND)
+                 {
+                         pszOp = &quot;&amp;&amp;&quot;;
+                         nOp = NscPCode_LogicalAND;
+                 }
+-                else if (nToken == OROR)
++                else if (nToken == token::OROR)
+                 {
+                         pszOp = &quot;||&quot;;
+                         nOp = NscPCode_LogicalOR;
+@@ -3750,12 +3753,12 @@ YYSTYPE NscBuildLogicalOp (int nToken, Y
+                         // If the operation is known to be true or false by the lhs
+                         //

+-                        else if (nToken == ANDAND &amp;&amp; nLhsConstant == 0)
++                        else if (nToken == token::ANDAND &amp;&amp; nLhsConstant == 0)
+                         {
+                                 pOut -&gt;PushConstantInteger (0);
+                                 pOut -&gt;SetType (NscType_Integer);
+                         }
+-                        else if (nToken == OROR &amp;&amp; nLhsConstant == 1)
++                        else if (nToken == token::OROR &amp;&amp; nLhsConstant == 1)
+                         {
+                                 pOut -&gt;PushConstantInteger (1);
+                                 pOut -&gt;SetType (NscType_Integer);
+@@ -4706,7 +4709,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+         bool fCheckCond;
+         switch (nToken)
+         {
+-                case IF:
++                case token::IF:
+                         nPCode = NscPCode_If;
+                         nFenceType = NscFenceType_If;
+                         pszToken = &quot;if&quot;;
+@@ -4714,7 +4717,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+                         fCheckCond = pPrev == NULL;
+                         break;

+-                case WHILE:
++                case token::WHILE:
+                         nPCode = NscPCode_While;
+                         nFenceType = NscFenceType_While;
+                         pszToken = &quot;while&quot;;
+@@ -4722,7 +4725,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+                         fCheckCond = pPrev == NULL;
+                         break;

+-                case DO:
++                case token::DO:
+                         nPCode = NscPCode_Do;
+                         nFenceType = NscFenceType_Do;
+                         pszToken = &quot;do&quot;;
+@@ -4730,7 +4733,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+                         fCheckCond = pPrev != NULL;
+                         break;

+-                case FOR:
++                case token::FOR:
+                         nPCode = NscPCode_For;
+                         nFenceType = NscFenceType_For;
+                         pszToken = &quot;for&quot;;
+@@ -4738,7 +4741,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+                         fCheckCond = pPrev == NULL;
+                         break;

+-                case SWITCH:
++                case token::SWITCH:
+                         nPCode = NscPCode_Switch;
+                         nFenceType = NscFenceType_Switch;
+                         pszToken = &quot;switch&quot;;
+@@ -4787,7 +4790,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+                 // for this
+                 //

+-                if (nToken == SWITCH)
++                if (nToken == token::SWITCH)
+                 {
+                         NscSymbolFence *pFence = g_pCtx -&gt;GetCurrentFence ();
+                         pFence -&gt;nPrevLocals++;
+@@ -4806,7 +4809,7 @@ YYSTYPE NscBuild5Block (int nToken, YYST
+         // then set return
+         //

+-        if (nToken == IF &amp;&amp; pFalse)
++        if (nToken == token::IF &amp;&amp; pFalse)
+         {
+                 if (fHadReturn)
+                         NscSetFenceReturn (true);
+@@ -4992,7 +4995,7 @@ YYSTYPE NscBuildCase (int nToken, YYSTYP
+                 // If this is a case
+                 //

+-                if (nToken == CASE)
++                if (nToken == token::CASE)
+                 {

+                         //
+@@ -5061,7 +5064,7 @@ YYSTYPE NscBuildCase (int nToken, YYSTYP
+                         // Test for only one default
+                         //

+-                        if (nToken == DEFAULT)
++                        if (nToken == token::DEFAULT)
+                         {
+                                 if (pFence -&gt;fHasDefault)
+                                 {
+@@ -5086,9 +5089,9 @@ YYSTYPE NscBuildCase (int nToken, YYSTYP
+                         //

+                         NscPCode nPCode;
+-                        if (nToken == CASE)
++                        if (nToken == token::CASE)
+                                 nPCode = NscPCode_Case;
+-                        else if (nToken == DEFAULT)
++                        else if (nToken == token::DEFAULT)
+                                 nPCode = NscPCode_Default;
+                         else
+                         {
+@@ -5262,9 +5265,9 @@ YYSTYPE NscBuildBreakContinue (int nToke
+         //

+         NscPCode nPCode;
+-        if (nToken == BREAK)
++        if (nToken == token::BREAK)
+                 nPCode = NscPCode_Break;
+-        else if (nToken == CONTINUE)
++        else if (nToken == token::CONTINUE)
+                 nPCode = NscPCode_Continue;
+         else
+         {
+@@ -5279,7 +5282,7 @@ YYSTYPE NscBuildBreakContinue (int nToke
+         NscSymbolFence *pFence = g_pCtx -&gt;GetCurrentFence ();
+         while (pFence)
+         {
+-                if ((pFence -&gt;nFenceType == NscFenceType_Switch &amp;&amp; nToken == BREAK) ||
++                if ((pFence -&gt;nFenceType == NscFenceType_Switch &amp;&amp; nToken == token::BREAK) ||
+                         pFence -&gt;nFenceType == NscFenceType_Do ||
+                         pFence -&gt;nFenceType == NscFenceType_While ||
+                         pFence -&gt;nFenceType == NscFenceType_For)
+@@ -5288,12 +5291,12 @@ YYSTYPE NscBuildBreakContinue (int nToke
+         }
+         if (pFence == NULL)
+         {
+-                if (nToken == BREAK)
++                if (nToken == token::BREAK)
+                 {
+             g_pCtx -&gt;GenerateError (&quot;\&quot;break\&quot; statement only allowed in &quot;
+                             &quot;\&quot;switch\&quot;, \&quot;do\&quot;, \&quot;while\&quot;, and \&quot;for\&quot; statements&quot;);
+                 }
+-                else if (nToken == CONTINUE)
++                else if (nToken == token::CONTINUE)
+                 {
+             g_pCtx -&gt;GenerateError (&quot;\&quot;continue\&quot; statement only allowed in &quot;
+                             &quot;\&quot;do\&quot;, \&quot;while\&quot;, and \&quot;for\&quot; statements&quot;);
</ins></span></pre></div>
<a id="trunkdportsgamesnwntoolsfilesconfigurepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/nwntools/files/configure.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/configure.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/configure.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>---- configure.orig        2006-01-31 11:39:11.000000000 +1100
-+++ configure        2014-12-17 15:40:45.000000000 +1100
-@@ -3541,7 +3541,16 @@
-    { (exit 1); exit 1; }; }
- fi

--if test -n &quot;$bison_v&quot; &amp;&amp; test &quot;$bison_v&quot; -eq 20
-+if test -n &quot;$bison_v&quot; &amp;&amp; test &quot;$bison_v&quot; -gt 21
-+then
-+        echo &quot;$as_me:$LINENO: result: setting bison lalr1 yychar variable name to yychar&quot; &gt;&amp;5
-+echo &quot;${ECHO_T}setting bison lalr1 yychar variable name to yychar&quot; &gt;&amp;6
-+
-+cat &gt;&gt;confdefs.h &lt;&lt;\_ACEOF
-+#define YYCHAR_NAME yychar
-+_ACEOF
-+
-+elif test -n &quot;$bison_v&quot; &amp;&amp; test &quot;$bison_v&quot; -eq 20
- then
-         echo &quot;$as_me:$LINENO: result: setting bison lalr1 yychar variable name to yylooka_&quot; &gt;&amp;5
- echo &quot;${ECHO_T}setting bison lalr1 yychar variable name to yylooka_&quot; &gt;&amp;6
-@@ -3711,7 +3720,7 @@
- if test &quot;${am_cv_python_pythondir+set}&quot; = set; then
-   echo $ECHO_N &quot;(cached) $ECHO_C&quot; &gt;&amp;6
- else
--  am_cv_python_pythondir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')&quot; 2&gt;/dev/null ||
-+  am_cv_python_pythondir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(0,0)&quot; 2&gt;/dev/null ||
-      echo &quot;$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages&quot;`
- fi
- echo &quot;$as_me:$LINENO: result: $am_cv_python_pythondir&quot; &gt;&amp;5
-@@ -3728,7 +3737,7 @@
- if test &quot;${am_cv_python_pyexecdir+set}&quot; = set; then
-   echo $ECHO_N &quot;(cached) $ECHO_C&quot; &gt;&amp;6
- else
--  am_cv_python_pyexecdir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')&quot; 2&gt;/dev/null ||
-+  am_cv_python_pyexecdir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(1,0)&quot; 2&gt;/dev/null ||
-      echo &quot;${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages&quot;`
- fi
- echo &quot;$as_me:$LINENO: result: $am_cv_python_pyexecdir&quot; &gt;&amp;5
</del></span></pre></div>
<a id="trunkdportsgamesnwntoolsfilesnwnnsscomp__python__Makefileinpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/nwntools/files/nwnnsscomp__python__Makefile.in.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/nwnnsscomp__python__Makefile.in.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/nwnnsscomp__python__Makefile.in.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- nwnnsscomp/python/Makefile.in.orig        2006-02-01 04:08:31.000000000 +1100
-+++ nwnnsscomp/python/Makefile.in        2014-12-17 15:53:57.000000000 +1100
-@@ -302,10 +302,10 @@
-         pdf-am ps ps-am uninstall uninstall-am uninstall-info-am

- all-local: setup.py compiler.cpp __init__.py
--        $(PYTHON) setup.py build
-+        $(PYTHON) setup.py --no-user-cfg build

- install-exec-local: 
--        $(PYTHON) setup.py install --prefix=${DESTDIR}${prefix}
-+        $(PYTHON) setup.py --no-user-cfg install --root=$(DESTDIR)

- distclean: clean

</del></span></pre></div>
<a id="trunkdportsgamesnwntoolsfilespython27patch"></a>
<div class="addfile"><h4>Added: trunk/dports/games/nwntools/files/python2.7.patch (0 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/python2.7.patch                                (rev 0)
+++ trunk/dports/games/nwntools/files/python2.7.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+Index: aclocal.m4
+===================================================================
+--- aclocal.m4.orig
++++ aclocal.m4
+@@ -786,7 +786,7 @@ python2.1 python2.0 python1.6 python1.5]
+   dnl doesn't work.
+   AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+     [am_cv_python_pythondir],
+-    [am_cv_python_pythondir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')&quot; 2&gt;/dev/null ||
++    [am_cv_python_pythondir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(0,0)&quot; 2&gt;/dev/null ||
+      echo &quot;$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages&quot;`])
+   AC_SUBST([pythondir], [$am_cv_python_pythondir])

+@@ -803,7 +803,7 @@ python2.1 python2.0 python1.6 python1.5]
+   dnl doesn't work.
+   AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+     [am_cv_python_pyexecdir],
+-    [am_cv_python_pyexecdir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')&quot; 2&gt;/dev/null ||
++    [am_cv_python_pyexecdir=`$PYTHON -c &quot;from distutils import sysconfig; print sysconfig.get_python_lib(1,0)&quot; 2&gt;/dev/null ||
+      echo &quot;${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages&quot;`])
+   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])

+Index: nwnnsscomp/python/Makefile.am
+===================================================================
+--- nwnnsscomp/python/Makefile.am.orig
++++ nwnnsscomp/python/Makefile.am
+@@ -1,8 +1,8 @@
+ all-local: setup.py compiler.cpp __init__.py
+-        $(PYTHON) setup.py build
++        $(PYTHON) setup.py --no-user-cfg build

+ install-exec-local: 
+-        $(PYTHON) setup.py install --prefix=${DESTDIR}${prefix}
++        $(PYTHON) setup.py --no-user-cfg install --root=${DESTDIR}

+ EXTRA_DIST = \
+         compiler.cpp \
</ins></span></pre></div>
<a id="trunkdportsgamesnwntoolsfilesremovefnodefaultinlinepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/nwntools/files/remove-fno-default-inline.patch (134345 => 134346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/nwntools/files/remove-fno-default-inline.patch        2015-03-23 14:36:20 UTC (rev 134345)
+++ trunk/dports/games/nwntools/files/remove-fno-default-inline.patch        2015-03-23 15:23:02 UTC (rev 134346)
</span><span class="lines">@@ -1,50 +1,63 @@
</span><del>---- _MathLib/Makefile.in.orig        2006-01-31 11:39:10.000000000 +1100
-+++ _MathLib/Makefile.in        2014-12-17 14:02:09.000000000 +1100
-@@ -193,7 +193,6 @@
-         Vector4.h
</del><ins>+Index: _MathLib/Makefile.am
+===================================================================
+--- _MathLib/Makefile.am.orig
++++ _MathLib/Makefile.am
+@@ -19,8 +19,6 @@ libmath_a_SOURCES = \
</ins><span class="cx">  
</span><span class="cx">  libmath_a_LIBADD = @LIBOBJS@
</span><ins>+ 
</ins><span class="cx"> -AM_CXXFLAGS = -fno-default-inline
</span><ins>+-
</ins><span class="cx">  EXTRA_DIST = \
</span><span class="cx">          _MathLib.vcproj
</span><span class="cx">  
</span><del>---- _NscLib/Makefile.in.orig        2006-01-31 11:39:10.000000000 +1100
-+++ _NscLib/Makefile.in        2014-12-17 14:04:25.000000000 +1100
-@@ -178,7 +178,6 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
</del><ins>+Index: _NscLib/Makefile.am
+===================================================================
+--- _NscLib/Makefile.am.orig
++++ _NscLib/Makefile.am
+@@ -1,6 +1,3 @@
+-
</ins><span class="cx"> -AM_CXXFLAGS = -fno-default-inline
</span><ins>+-
</ins><span class="cx">  AM_YFLAGS = --defines=NscParser.h --skeleton=lalr1.cc
</span><ins>+ 
</ins><span class="cx">  noinst_LIBRARIES = libnsc.a
</span><del>- libnsc_a_SOURCES = \
---- _NwnLib/Makefile.in.orig        2006-01-31 11:39:10.000000000 +1100
-+++ _NwnLib/Makefile.in        2014-12-17 14:03:39.000000000 +1100
-@@ -212,7 +212,6 @@
-         NwnTexturePlt.h
</del><ins>+Index: _NwnLib/Makefile.am
+===================================================================
+--- _NwnLib/Makefile.am.orig
++++ _NwnLib/Makefile.am
+@@ -35,8 +35,6 @@ libnwn_a_SOURCES = \
</ins><span class="cx">  
</span><span class="cx">  libnwn_a_LIBADD = @LIBOBJS@
</span><ins>+ 
</ins><span class="cx"> -AM_CXXFLAGS = -fno-default-inline
</span><ins>+-
</ins><span class="cx">  EXTRA_DIST = \
</span><span class="cx">          _NwnLib.vcproj
</span><span class="cx">  
</span><del>---- nwnmdlcomp/Makefile.in.orig        2006-01-31 11:39:10.000000000 +1100
-+++ nwnmdlcomp/Makefile.in        2014-12-17 15:18:37.000000000 +1100
-@@ -172,7 +172,6 @@
- target_alias = @target_alias@
- nwnmdlcomp_SOURCES = nwnmdlcomp.cpp
</del><ins>+Index: nwnmdlcomp/Makefile.am
+===================================================================
+--- nwnmdlcomp/Makefile.am.orig
++++ nwnmdlcomp/Makefile.am
+@@ -4,8 +4,6 @@ nwnmdlcomp_SOURCES = nwnmdlcomp.cpp

</ins><span class="cx">  nwnmdlcomp_LDADD = ../_NmcLib/libnmc.a ../_NwnLib/libnwn.a ../_MathLib/libmath.a
</span><ins>+ 
</ins><span class="cx"> -AM_CXXFLAGS = -fno-default-inline
</span><ins>+-
</ins><span class="cx">  EXTRA_DIST = \
</span><span class="cx">                  nwnmdlcomp.vcproj
</span><span class="cx">  
</span><del>---- nwnnsscomp/Makefile.in.orig        2006-01-31 11:39:11.000000000 +1100
-+++ nwnnsscomp/Makefile.in        2014-12-17 15:17:23.000000000 +1100
-@@ -179,7 +179,6 @@
- SUBDIRS = python
- nwnnsscomp_SOURCES = nwnnsscomp.cpp
</del><ins>+Index: nwnnsscomp/Makefile.am
+===================================================================
+--- nwnnsscomp/Makefile.am.orig
++++ nwnnsscomp/Makefile.am
+@@ -6,8 +6,6 @@ nwnnsscomp_SOURCES = nwnnsscomp.cpp

</ins><span class="cx">  nwnnsscomp_LDADD = ../_NwnLib/libnwn.a ../_NscLib/libnsc.a
</span><ins>+ 
</ins><span class="cx"> -AM_CXXFLAGS = -fno-default-inline
</span><ins>+-
</ins><span class="cx">  EXTRA_DIST = \
</span><span class="cx">          nwnnsscomp.vcproj
</span><span class="cx">  
</span></span></pre>
</div>
</div>

</body>
</html>