summaryrefslogtreecommitdiff
path: root/audio/spiralloops
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2014-02-19 09:00:34 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2014-02-19 09:00:34 +0000
commitb23ce6574a991f3a9738f2dd888cd567ac31fb23 (patch)
treeb61c35c36523accca0db75e3aa289cb463d7668a /audio/spiralloops
parent- Stage support (diff)
- Fix build on 10.x
Notes
Notes: svn path=/head/; revision=345032
Diffstat (limited to 'audio/spiralloops')
-rw-r--r--audio/spiralloops/Makefile5
-rw-r--r--audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h12
2 files changed, 15 insertions, 2 deletions
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 4fb28f6c9a96..ad02e62fc82b 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -33,12 +33,13 @@ post-patch:
s:CFLAGS =:CFLAGS +=:g; \
s:CXXFLAGS=:CXXFLAGS+=:g; \
s:-lm:${PTHREAD_LIBS} -lm:g; \
- s:/usr/X11R6:${LOCALBASE}:g" \
+ s:/usr/X11R6:${LOCALBASE}:g; \
+ s:gcc:${CC}:; s:g\+\+:${CXX}:" \
< ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in
@${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" | ${XARGS} \
${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; /^#include "FL/s|.h"$$|.H"|; \
- s|fl_file_chooser.H|Fl_File_Chooser.H|g'
+ s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|iostream.h|iostream|; s|fstream.h|fstream|'
pre-install:
${ECHO_CMD} bin/SpiralLoops > ${PLIST}
diff --git a/audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h b/audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h
new file mode 100644
index 000000000000..db0452cef7da
--- /dev/null
+++ b/audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h
@@ -0,0 +1,12 @@
+--- GUI/Widgets/Fl_Trigger.h.orig 2001-04-20 00:48:10.000000000 +0400
++++ GUI/Widgets/Fl_Trigger.h 2014-02-13 05:50:41.290374838 +0400
+@@ -24,6 +24,9 @@
+ #ifndef TRIGGERWIDGET
+ #define TRIGGERWIDGET
+
++using std::istream;
++using std::ostream;
++
+ class Fl_Trigger : public Fl_Widget
+ {
+ public: