a) Fix build on gcc-3.3.x

b) Update to 1.0.4

Submitted by:	Simon Barner <barner@in.tum.de>

7 files changed, 63 insertions, 6 deletions

diff --git a/math/surf/Makefile b/math/surf/Makefile
index ced07f21f031..5e9101b5617d 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	surf
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,8 +28,4 @@ MAN1=	surf.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/math/surf/distinfo b/math/surf/distinfo
index d7b46d0099fd..b331c07bee16 100644
--- a/math/surf/distinfo
+++ b/math/surf/distinfo
@@ -1 +1 @@
-MD5 (surf-1.0.3.tar.gz) = 4d0cea15d9e771e60920dbb25979d1f3
+MD5 (surf-1.0.4.tar.gz) = 4880ecf3d4207ab0a4f2a2f017383b65
diff --git a/math/surf/files/patch-gtkgui::MainWindowController.cc b/math/surf/files/patch-gtkgui::MainWindowController.cc
new file mode 100644
index 000000000000..79718910cf04
--- /dev/null
+++ b/math/surf/files/patch-gtkgui::MainWindowController.cc
@@ -0,0 +1,11 @@
+--- gtkgui/MainWindowController.cc.orig	Tue Jul 22 16:23:20 2003
++++ gtkgui/MainWindowController.cc	Tue Jul 22 16:23:30 2003
+@@ -28,7 +28,7 @@
+ 
+ #include <gtk/gtkitemfactory.h>
+ 
+-#include <strstream.h>
++#include <strstream>
+ 
+ // #define DEBUG
+ #include "debug.h"
diff --git a/math/surf/files/patch-gtkgui::Requester.cc b/math/surf/files/patch-gtkgui::Requester.cc
new file mode 100644
index 000000000000..87391bd7a22d
--- /dev/null
+++ b/math/surf/files/patch-gtkgui::Requester.cc
@@ -0,0 +1,11 @@
+--- gtkgui/Requester.cc.orig	Tue Jul 22 16:23:45 2003
++++ gtkgui/Requester.cc	Tue Jul 22 16:24:01 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <assert.h>
+ #include <iostream.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ #include <gtk/gtk.h>
+ 
diff --git a/math/surf/files/patch-gtkgui::SaveImageDiaglog.cc b/math/surf/files/patch-gtkgui::SaveImageDiaglog.cc
new file mode 100644
index 000000000000..f49e9aaa05e5
--- /dev/null
+++ b/math/surf/files/patch-gtkgui::SaveImageDiaglog.cc
@@ -0,0 +1,15 @@
+--- gtkgui/SaveImageDialog.cc.orig	Tue Jul 22 16:24:13 2003
++++ gtkgui/SaveImageDialog.cc	Tue Jul 22 16:26:31 2003
+@@ -23,9 +23,11 @@
+  */
+ 
+ 
+-#include <strstream.h>
++#include <strstream>
+ 
+ #include "SaveImageDialog.h"
++
++using std::ostrstream;
+ 
+ void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
+ {
diff --git a/math/surf/files/patch-gtkgui::mycolor.cc b/math/surf/files/patch-gtkgui::mycolor.cc
new file mode 100644
index 000000000000..f09e258d4e44
--- /dev/null
+++ b/math/surf/files/patch-gtkgui::mycolor.cc
@@ -0,0 +1,11 @@
+--- gtkgui/mycolor.cc.orig	Tue Jul 22 16:22:12 2003
++++ gtkgui/mycolor.cc	Tue Jul 22 16:22:26 2003
+@@ -26,7 +26,7 @@
+ #include <assert.h>
+ #include <iostream.h>
+ #include <stdlib.h>
+-#include <strstream.h>
++#include <strstream>
+ 
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
diff --git a/math/surf/files/patch-misc::Misc.h b/math/surf/files/patch-misc::Misc.h
new file mode 100644
index 000000000000..60b3963565c1
--- /dev/null
+++ b/math/surf/files/patch-misc::Misc.h
@@ -0,0 +1,13 @@
+--- misc/Misc.h.orig	Tue Jul 22 16:14:35 2003
++++ misc/Misc.h	Tue Jul 22 16:14:59 2003
+@@ -26,7 +26,9 @@
+ #ifndef MISC_H
+ #define MISC_H
+ 
+-#include <strstream.h>
++#include <strstream>
++
++using std::ostrstream;
+ 
+ class Misc
+ {