When building in sim/ucsim/cmd.src:

  * cmdlex.cc needs to include <cstdio> for the EOF macro.
  * Search $(srcdir) before directorys in CXXFLAGS so that the "FlexLexer.h"
    in $(srcdir) is found before the one under PREFIX (from CXXFLAGS).

4 files changed, 50 insertions, 1 deletions

diff --git a/devel/sdcc/distinfo b/devel/sdcc/distinfo
index 7beca573833..f3f7e8535a7 100644
--- a/devel/sdcc/distinfo
+++ b/devel/sdcc/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.14 2008/10/17 07:20:23 gson Exp $
+$NetBSD: distinfo,v 1.15 2012/01/24 06:06:32 sbd Exp $
 
 SHA1 (sdcc-src-2.8.0.tar.bz2) = 487a9c576130bb1bfb225fe36984f485aac0f513
 RMD160 (sdcc-src-2.8.0.tar.bz2) = b91d6ca5642011f0e735c63e0ed4bc6b33128b9f
 Size (sdcc-src-2.8.0.tar.bz2) = 3460693 bytes
 SHA1 (patch-aa) = 3ba9283124837b1b174a79413e71d1d14f626f46
+SHA1 (patch-sim_ucsim_cmd.src_Makefile.in) = e31d041b38fc372ffd513522ec33c12a61c6c67c
+SHA1 (patch-sim_ucsim_cmd.src_cmdlex.cc) = e02bdf0d70d060646f6473bad6477687c4360144
+SHA1 (patch-sim_ucsim_cmd.src_cmdlex.l) = 4efc91e3c1a0beefded5be5cce256c23e216319f
diff --git a/devel/sdcc/patches/patch-sim_ucsim_cmd.src_Makefile.in b/devel/sdcc/patches/patch-sim_ucsim_cmd.src_Makefile.in
new file mode 100644
index 00000000000..d1edba76a45
--- /dev/null
+++ b/devel/sdcc/patches/patch-sim_ucsim_cmd.src_Makefile.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-sim_ucsim_cmd.src_Makefile.in,v 1.1 2012/01/24 06:06:32 sbd Exp $
+
+Search $(srcdir) before directorys in CXXFLAGS so that the "FlexLexer.h"
+in $(srcdir) is found before the one under PREFIX (from CXXFLAGS).
+
+--- sim/ucsim/cmd.src/Makefile.in.orig	2007-06-03 20:38:18.000000000 +0000
++++ sim/ucsim/cmd.src/Makefile.in
+@@ -23,8 +23,8 @@ top_srcdir	= @top_srcdir@
+ DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
+ CPPFLAGS        = @CPPFLAGS@ -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) \
+ 		  -I$(top_srcdir)/sim.src -I$(top_srcdir)/gui.src
+-CFLAGS          = @CFLAGS@ -Wall
+-CXXFLAGS        = @CXXFLAGS@ -Wall
++CFLAGS          = -I$(srcdir) @CFLAGS@ -Wall
++CXXFLAGS        = -I$(srcdir) @CXXFLAGS@ -Wall
+ M_OR_MM         = @M_OR_MM@
+ WINSOCK_AVAIL	= @WINSOCK_AVAIL@
+
diff --git a/devel/sdcc/patches/patch-sim_ucsim_cmd.src_cmdlex.cc b/devel/sdcc/patches/patch-sim_ucsim_cmd.src_cmdlex.cc
new file mode 100644
index 00000000000..f7d4a10c21e
--- /dev/null
+++ b/devel/sdcc/patches/patch-sim_ucsim_cmd.src_cmdlex.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-sim_ucsim_cmd.src_cmdlex.cc,v 1.1 2012/01/24 06:06:32 sbd Exp $
+
+Include <cstdio> for the EOF macro.
+
+--- sim/ucsim/cmd.src/cmdlex.cc.orig	2004-07-16 16:32:30.000000000 +0000
++++ sim/ucsim/cmd.src/cmdlex.cc
+@@ -409,6 +409,7 @@ static yyconst flex_int16_t yy_chk[56] =
+ #line 2 "cmdlex.l"
+ #include "cmdlexcl.h"
+ #include "cmdpars.h"
++#include <cstdio>
+ 
+ static YY_cl_ucsim_parser_STYPE *yylval;
+ 
diff --git a/devel/sdcc/patches/patch-sim_ucsim_cmd.src_cmdlex.l b/devel/sdcc/patches/patch-sim_ucsim_cmd.src_cmdlex.l
new file mode 100644
index 00000000000..6d9a08f0a6d
--- /dev/null
+++ b/devel/sdcc/patches/patch-sim_ucsim_cmd.src_cmdlex.l
@@ -0,0 +1,14 @@
+$NetBSD: patch-sim_ucsim_cmd.src_cmdlex.l,v 1.1 2012/01/24 06:06:32 sbd Exp $
+
+Include <cstdio> for the EOF macro.
+
+--- sim/ucsim/cmd.src/cmdlex.l.orig	2004-07-16 16:32:30.000000000 +0000
++++ sim/ucsim/cmd.src/cmdlex.l
+@@ -1,6 +1,7 @@
+ %{
+ #include "cmdlexcl.h"
+ #include "cmdpars.h"
++#include <cstdio>
+ 
+ static YY_cl_ucsim_parser_STYPE *yylval;
+