Fix build on gcc-3.3.x

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

56 files changed, 708 insertions, 15 deletions

diff --git a/games/xjumpjump/files/patch-texts.h b/games/xjumpjump/files/patch-texts.h
new file mode 100644
index 0000000..371b534
--- /dev/null
+++ b/games/xjumpjump/files/patch-texts.h
@@ -0,0 +1,19 @@
+--- texts.h.orig	Wed Jul 23 03:48:19 2003
++++ texts.h	Wed Jul 23 03:48:56 2003
+@@ -1,6 +1,6 @@
+ 
+ #define E_MY_PRGNAME     "xjumpjump"
+-#define E_VERSION        "JumpJump-0.12 for X, Feb 26th 1997 by 
++#define E_VERSION        "JumpJump-0.12 for X, Feb 26th 1997 by \
+ nihil (nihil@makosteszta.sote.hu)"
+ #define E_MY_TITLE       "XJumpJump v0.12"
+ #define E_MY_TITLE2      "by nihil\nHungary\n1997.02.26"
+@@ -9,7 +9,7 @@
+ #define E_STR_PRACTISE   "Hmm... practise a bit more!"
+ #define H_STR_PRACTISE   "Hmm... gyakorolj még egy picit!"
+ #define E_STR_CONGRAT    "Congratulations! You have succeed!"
+-#define H_STR_CONGRAT    "Gratulálok! Sikerült ezt a pályát 
++#define H_STR_CONGRAT    "Gratulálok! Sikerült ezt a pályát \
+ leküzdened!"
+ 
+ #define E_STR_BUT_NEW    "New Game"
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index a92f386..c0accc9 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -23,10 +23,6 @@ USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \
 		s,gtk-config,${GTK_CONFIG},g ; \
diff --git a/graphics/gsculpt/files/patch-Makefile b/graphics/gsculpt/files/patch-Makefile
new file mode 100644
index 0000000..7612dd4
--- /dev/null
+++ b/graphics/gsculpt/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.orig	Mon Jul 21 19:59:12 2003
++++ Makefile	Mon Jul 21 19:59:38 2003
+@@ -27,7 +27,6 @@
+ 
+ # C
+ 
+-CC     := gcc
+ CFLAGS  = ${DEPENDFLAGS}
+ 
+ %.o : %.c
+@@ -35,7 +34,6 @@
+ 
+ # C++
+ 
+-CXX      := g++
+ CXXFLAGS  = ${DEPENDFLAGS}
+ 
+ %.o : %.cc
+@@ -57,7 +55,7 @@
+ 
+ # linker
+ 
+-LINKER    := g++
++LINKER    := ${CXX}
+ LDFLAGS    = 
+ LOADLIBES := -O3 -lm `gtk-config --libs`
+ 
diff --git a/graphics/gsculpt/files/patch-src::Edges::CEdgeContainer.h b/graphics/gsculpt/files/patch-src::Edges::CEdgeContainer.h
new file mode 100644
index 0000000..41590d5
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Edges::CEdgeContainer.h
@@ -0,0 +1,10 @@
+--- ./src/Edges/CEdgeContainer.h.orig	Mon Jul 21 18:32:59 2003
++++ ./src/Edges/CEdgeContainer.h	Mon Jul 21 18:33:24 2003
+@@ -13,6 +13,7 @@
+ 
+ #include "CEdge.h"
+ 
++using std::set;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::Editor::StatusBar.h b/graphics/gsculpt/files/patch-src::Editor::StatusBar.h
new file mode 100644
index 0000000..0528804
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Editor::StatusBar.h
@@ -0,0 +1,11 @@
+--- ./src/Editor/StatusBar.h.orig	Mon Jul 21 16:36:37 2003
++++ ./src/Editor/StatusBar.h	Mon Jul 21 16:36:49 2003
+@@ -9,7 +9,7 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
+-
++using std::string;
+ 
+ class StatusBar
+ {
diff --git a/graphics/gsculpt/files/patch-src::Editor::Toolbox.h b/graphics/gsculpt/files/patch-src::Editor::Toolbox.h
new file mode 100644
index 0000000..9912d16
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Editor::Toolbox.h
@@ -0,0 +1,11 @@
+--- ./src/Editor/Toolbox.h.orig	Mon Jul 21 18:37:37 2003
++++ ./src/Editor/Toolbox.h	Mon Jul 21 18:37:46 2003
+@@ -13,7 +13,7 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
+-
++using std::string;
+ 
+ class Toolbox
+ {
diff --git a/graphics/gsculpt/files/patch-src::Events::Event.h b/graphics/gsculpt/files/patch-src::Events::Event.h
new file mode 100644
index 0000000..e79de7b
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Events::Event.h
@@ -0,0 +1,11 @@
+--- ./src/Events/Event.h.orig	Mon Jul 21 16:31:20 2003
++++ ./src/Events/Event.h	Mon Jul 21 16:31:32 2003
+@@ -10,7 +10,7 @@
+ #define EVENTH
+ 
+ #include <string>
+-
++using std::string;
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-src::Faces::CFace.h b/graphics/gsculpt/files/patch-src::Faces::CFace.h
new file mode 100644
index 0000000..24f6eb5
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Faces::CFace.h
@@ -0,0 +1,10 @@
+--- ./src/Faces/CFace.h.orig	Mon Jul 21 18:33:51 2003
++++ ./src/Faces/CFace.h	Mon Jul 21 18:34:02 2003
+@@ -17,6 +17,7 @@
+ 
+ #include "Point3.h"
+ 
++using std::vector;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::FileIO::fileio.h b/graphics/gsculpt/files/patch-src::FileIO::fileio.h
new file mode 100644
index 0000000..3c0ad90
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::FileIO::fileio.h
@@ -0,0 +1,11 @@
+--- ./src/FileIO/fileio.h.orig	Mon Jul 21 16:28:28 2003
++++ ./src/FileIO/fileio.h	Mon Jul 21 16:28:40 2003
+@@ -8,7 +8,7 @@
+ #include <stdio.h>
+ 
+ #include <string>
+-
++using std::string;
+ 
+ string readString(FILE *f);
+ void writeString(FILE *f, const string& s);
diff --git a/graphics/gsculpt/files/patch-src::Journal::JournalTaskProgress.h b/graphics/gsculpt/files/patch-src::Journal::JournalTaskProgress.h
new file mode 100644
index 0000000..572aeed
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Journal::JournalTaskProgress.h
@@ -0,0 +1,11 @@
+--- ./src/Journal/JournalTaskProgress.h.orig	Mon Jul 21 16:38:59 2003
++++ ./src/Journal/JournalTaskProgress.h	Mon Jul 21 16:39:09 2003
+@@ -10,7 +10,7 @@
+ 
+ #include "MultiThreading.h"
+ 
+-
++using std::string;
+ 
+ 
+ class JournalTaskProgress
diff --git a/graphics/gsculpt/files/patch-src::LogGrid::CGrid.h b/graphics/gsculpt/files/patch-src::LogGrid::CGrid.h
new file mode 100644
index 0000000..409b3b1
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::LogGrid::CGrid.h
@@ -0,0 +1,11 @@
+--- ./src/LogGrid/CGrid.h.orig	Mon Jul 21 16:32:01 2003
++++ ./src/LogGrid/CGrid.h	Mon Jul 21 16:32:11 2003
+@@ -6,7 +6,7 @@
+ #define CGRIDH

+ 

+ #include <list>

+-

++using std::list;

+ 

+ #include "array.h"

+ 

diff --git a/graphics/gsculpt/files/patch-src::Math::BBox.h b/graphics/gsculpt/files/patch-src::Math::BBox.h
new file mode 100644
index 0000000..2747163
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Math::BBox.h
@@ -0,0 +1,10 @@
+--- ./src/Math/BBox.h.orig	Mon Jul 21 16:29:27 2003
++++ ./src/Math/BBox.h	Mon Jul 21 16:30:21 2003
+@@ -12,6 +12,7 @@
+ #include "Point3.h"

+ #include "Plane.h"

+ #include "Line3.h"

++using std::vector;
+ 

+ 

+ 

diff --git a/graphics/gsculpt/files/patch-src::Model::CModel.cpp b/graphics/gsculpt/files/patch-src::Model::CModel.cpp
new file mode 100644
index 0000000..9461fdb
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Model::CModel.cpp
@@ -0,0 +1,23 @@
+--- ./src/Model/CModel.cpp.orig	Mon Jul 21 18:40:40 2003
++++ ./src/Model/CModel.cpp	Mon Jul 21 18:41:05 2003
+@@ -68,17 +68,17 @@
+ }
+ 
+ 
+-BBox CModel::getBBox(bool selectedOnly = true) const
++BBox CModel::getBBox(bool selectedOnly) const
+ {
+ 	return BBox();
+ }
+ 
+-BBox CModel::getBBox(const Matrix4& m, bool selectedOnly = true) const
++BBox CModel::getBBox(const Matrix4& m, bool selectedOnly) const
+ {
+ 	return BBox();
+ }
+ 
+-BBox CModel::getBBox(const Transformation *x, bool selectedOnly = true) const
++BBox CModel::getBBox(const Transformation *x, bool selectedOnly) const
+ {
+ 	return BBox();
+ }
diff --git a/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.cpp b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.cpp
new file mode 100644
index 0000000..e24a6a1
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.cpp
@@ -0,0 +1,19 @@
+--- ./src/ObjEdit/ObjectCollection.cpp.orig	Mon Jul 21 18:47:55 2003
++++ ./src/ObjEdit/ObjectCollection.cpp	Mon Jul 21 19:44:26 2003
+@@ -326,11 +326,14 @@
+ UniqueId ObjectCollection::getUniqueId(const string& name) const
+ {
+ 	IdTable::const_iterator iter = nameToId.find(name);
+-	if ( iter != objects.end() )
++
++	//if (iter != objects.end() )
++	// Is this correct? 21.7.03, barner@in.tum.de
++	if (iter != nameToId.end())
+ 	{
+ 		return (*iter).second;
+ 	}
+-	else
++	else 
+ 	{
+ 		return -1;
+ 	}
diff --git a/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.h b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.h
new file mode 100644
index 0000000..055cced
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::ObjEdit::ObjectCollection.h
@@ -0,0 +1,14 @@
+--- ./src/ObjEdit/ObjectCollection.h.orig	Mon Jul 21 18:43:57 2003
++++ ./src/ObjEdit/ObjectCollection.h	Mon Jul 21 18:47:09 2003
+@@ -23,7 +23,10 @@
+ #include "Journal.h"
+ #include "ListManager.h"
+ 
+-
++using std::string;
++using std::map;
++using std::set;
++using std::list;
+ 
+ 
+ class ObjectCollection : public JournalCollection
diff --git a/graphics/gsculpt/files/patch-src::Patch::Patch.h b/graphics/gsculpt/files/patch-src::Patch::Patch.h
new file mode 100644
index 0000000..8ce79f8
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Patch::Patch.h
@@ -0,0 +1,11 @@
+--- ./src/Patch/Patch.h.orig	Mon Jul 21 16:20:46 2003
++++ ./src/Patch/Patch.h	Mon Jul 21 16:27:54 2003
+@@ -7,6 +7,8 @@
+ 
+ #include <vector>
+ 
++using std::vector;
++
+ //generates the indices of the vertices which make up quadrilateral faces, which
+ //form a rectangular patch
+ void patchGenerateQuadList(vector<int>& quads, int widthFaces, int heightFaces,
diff --git a/graphics/gsculpt/files/patch-src::PolylineTools::ToolPolyDraw.cpp b/graphics/gsculpt/files/patch-src::PolylineTools::ToolPolyDraw.cpp
new file mode 100644
index 0000000..be37e1b
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::PolylineTools::ToolPolyDraw.cpp
@@ -0,0 +1,11 @@
+--- ./src/PolylineTools/ToolPolyDraw.cpp.orig	Mon Jul 21 19:13:35 2003
++++ ./src/PolylineTools/ToolPolyDraw.cpp	Mon Jul 21 19:14:06 2003
+@@ -27,7 +27,7 @@
+ 
+ #include "Point3.h"
+ 
+-
++using std::ostrstream;
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-src::SelectTools::ToolSelectBase.cpp b/graphics/gsculpt/files/patch-src::SelectTools::ToolSelectBase.cpp
new file mode 100644
index 0000000..bd87ff6
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::SelectTools::ToolSelectBase.cpp
@@ -0,0 +1,11 @@
+--- ./src/SelectTools/ToolSelectBase.cpp.orig	Mon Jul 21 19:10:28 2003
++++ ./src/SelectTools/ToolSelectBase.cpp	Mon Jul 21 19:11:17 2003
+@@ -146,7 +146,7 @@
+ ToolSelectBase::ToolSelectBase( CadView *v,
+ 										  ObjPainterManager *pman,
+ 										  const string& funcName, const string& optTitle,
+-										  int tableWidth = 1 )
++										  int tableWidth )
+ 				: ToolSelectModel( v, pman, funcName, optTitle, tableWidth ),
+ 				  CadClickAndDragEventHandler( v->getCadArea() )
+ {
diff --git a/graphics/gsculpt/files/patch-src::Tools::ToolGroup.h b/graphics/gsculpt/files/patch-src::Tools::ToolGroup.h
new file mode 100644
index 0000000..b75f2d3
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Tools::ToolGroup.h
@@ -0,0 +1,12 @@
+--- ./src/Tools/ToolGroup.h.orig	Mon Jul 21 18:34:42 2003
++++ ./src/Tools/ToolGroup.h	Mon Jul 21 18:34:57 2003
+@@ -13,7 +13,8 @@
+ 
+ #include "GridLayout.h"
+ 
+-
++using std::vector;
++using std::string;
+ 
+ class ToolGroup
+ {
diff --git a/graphics/gsculpt/files/patch-src::Tools::Toolset.h b/graphics/gsculpt/files/patch-src::Tools::Toolset.h
new file mode 100644
index 0000000..709d10b
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Tools::Toolset.h
@@ -0,0 +1,12 @@
+--- ./src/Tools/Toolset.h.orig	Mon Jul 21 16:35:45 2003
++++ ./src/Tools/Toolset.h	Mon Jul 21 16:36:04 2003
+@@ -18,7 +18,8 @@
+ #include "CadView.h"
+ #include "Toolbox.h"
+ 
+-
++using std::string;
++using std::vector;
+ 
+ class Toolset
+ {
diff --git a/graphics/gsculpt/files/patch-src::TypeManager::TypeManager.h b/graphics/gsculpt/files/patch-src::TypeManager::TypeManager.h
new file mode 100644
index 0000000..bf9f4ed
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::TypeManager::TypeManager.h
@@ -0,0 +1,14 @@
+--- ./src/TypeManager/TypeManager.h.orig	Mon Jul 21 16:37:26 2003
++++ ./src/TypeManager/TypeManager.h	Mon Jul 21 16:38:08 2003
+@@ -10,7 +10,10 @@
+ #include <map>
+ #include <list>
+ 
+-
++using std::string;
++using std::vector;
++using std::map;
++using std::list;
+ 
+ 
+ 
diff --git a/graphics/gsculpt/files/patch-src::Widgets::ListManager.cpp b/graphics/gsculpt/files/patch-src::Widgets::ListManager.cpp
new file mode 100644
index 0000000..0853e22
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::ListManager.cpp
@@ -0,0 +1,11 @@
+--- ./src/Widgets/ListManager.cpp.orig	Mon Jul 21 19:25:18 2003
++++ ./src/Widgets/ListManager.cpp	Mon Jul 21 19:25:30 2003
+@@ -10,7 +10,7 @@
+ 
+ #include "ListManager.h"
+ 
+-
++using std::set;
+ 
+ 
+ ListManager::ListManager(const string& columnTitle)
diff --git a/graphics/gsculpt/files/patch-src::Widgets::ListManager.h b/graphics/gsculpt/files/patch-src::Widgets::ListManager.h
new file mode 100644
index 0000000..2b6e18d
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::ListManager.h
@@ -0,0 +1,12 @@
+--- ./src/Widgets/ListManager.h.orig	Mon Jul 21 18:41:55 2003
++++ ./src/Widgets/ListManager.h	Mon Jul 21 18:43:28 2003
+@@ -14,7 +14,8 @@
+ 
+ #include <gtk/gtkwidget.h>
+ 
+-
++using std::multiset;
++using std::string;
+ 
+ 
+ class ListManager
diff --git a/graphics/gsculpt/files/patch-src::Widgets::NameDialog.cpp b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.cpp
new file mode 100644
index 0000000..ccd764c
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.cpp
@@ -0,0 +1,13 @@
+--- ./src/Widgets/NameDialog.cpp.orig	Mon Jul 21 19:27:45 2003
++++ ./src/Widgets/NameDialog.cpp	Mon Jul 21 19:28:18 2003
+@@ -44,8 +44,8 @@
+ }
+ 
+ NameDialog::NameDialog(NameDialogListener *l,
+-							  const string& title = "Name",
+-							  const string& prompt = "name:")
++							  const string& title,
++							  const string& prompt )
+ {
+ 	listener = l;
+ 	constructorCommon(title, prompt);
diff --git a/graphics/gsculpt/files/patch-src::Widgets::NameDialog.h b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.h
new file mode 100644
index 0000000..989200a
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::NameDialog.h
@@ -0,0 +1,11 @@
+--- ./src/Widgets/NameDialog.h.orig	Mon Jul 21 19:26:12 2003
++++ ./src/Widgets/NameDialog.h	Mon Jul 21 19:26:22 2003
+@@ -15,7 +15,7 @@
+ 
+ #include "callback.h"
+ 
+-
++using std::string;
+ 
+ 
+ class NameDialog;
diff --git a/graphics/gsculpt/files/patch-src::Widgets::VectorWidget.cpp b/graphics/gsculpt/files/patch-src::Widgets::VectorWidget.cpp
new file mode 100644
index 0000000..b14e44b
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::VectorWidget.cpp
@@ -0,0 +1,12 @@
+--- ./src/Widgets/VectorWidget.cpp.orig	Mon Jul 21 19:22:12 2003
++++ ./src/Widgets/VectorWidget.cpp	Mon Jul 21 19:23:30 2003
+@@ -13,7 +13,8 @@
+ 
+ #include "VectorWidget.h"
+ 
+-
++using std::ostrstream;
++using std::istrstream;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::Widgets::messageBox.h b/graphics/gsculpt/files/patch-src::Widgets::messageBox.h
new file mode 100644
index 0000000..3629cf8
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::Widgets::messageBox.h
@@ -0,0 +1,12 @@
+--- ./src/Widgets/messageBox.h.orig	Mon Jul 21 18:59:01 2003
++++ ./src/Widgets/messageBox.h	Mon Jul 21 18:59:17 2003
+@@ -8,7 +8,8 @@
+ #include <string>
+ #include <vector>
+ 
+-
++using std::string;
++using std::vector;
+ 
+ /*
+ *******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::WorkArea::CAEH_grid.cpp b/graphics/gsculpt/files/patch-src::WorkArea::CAEH_grid.cpp
new file mode 100644
index 0000000..8d642da
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::WorkArea::CAEH_grid.cpp
@@ -0,0 +1,11 @@
+--- ./src/WorkArea/CAEH_grid.cpp.orig	Mon Jul 21 16:34:35 2003
++++ ./src/WorkArea/CAEH_grid.cpp	Mon Jul 21 16:34:54 2003
+@@ -8,7 +8,7 @@
+ #include "CAEH_grid.h"
+ 
+ #include <strstream>
+-
++using std::ostrstream;
+ 
+ 
+ CAEH_grid::CAEH_grid(CadArea *c, const CGrid& gr)
diff --git a/graphics/gsculpt/files/patch-src::WorkArea::DrawingArea.h b/graphics/gsculpt/files/patch-src::WorkArea::DrawingArea.h
new file mode 100644
index 0000000..a89c296
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::WorkArea::DrawingArea.h
@@ -0,0 +1,11 @@
+--- ./src/WorkArea/DrawingArea.h.orig	Mon Jul 21 16:32:55 2003
++++ ./src/WorkArea/DrawingArea.h	Mon Jul 21 16:33:25 2003
+@@ -27,7 +27,7 @@
+ #include "Geometry.h"
+ #include "PointerStatus.h"
+ 
+-
++using std::list;
+ 
+ /******************************************************************************
+  ******************************************************************************
diff --git a/graphics/gsculpt/files/patch-src::XformTools::ToolTransformModel.cpp b/graphics/gsculpt/files/patch-src::XformTools::ToolTransformModel.cpp
new file mode 100644
index 0000000..681ce65
--- /dev/null
+++ b/graphics/gsculpt/files/patch-src::XformTools::ToolTransformModel.cpp
@@ -0,0 +1,11 @@
+--- ./src/XformTools/ToolTransformModel.cpp.orig	Mon Jul 21 19:05:58 2003
++++ ./src/XformTools/ToolTransformModel.cpp	Mon Jul 21 19:06:20 2003
+@@ -15,7 +15,7 @@
+ 													ObjPainterManager *pman,
+ 													const string& funcName,
+ 													const string& optTitle,
+-													int tableWidth = 1)
++													int tableWidth)
+ 					: ToolModifyModel(v, pman, funcName, optTitle, tableWidth)
+ {
+ }
diff --git a/graphics/xmms-gforce/Makefile b/graphics/xmms-gforce/Makefile
index c63ada8..10d04f6 100644
--- a/graphics/xmms-gforce/Makefile
+++ b/graphics/xmms-gforce/Makefile
@@ -25,10 +25,6 @@ RESTRICTED=	"Non-commercial use only"
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 .if defined(WANT_DGA)
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	gforce-1.1.6xp3.dga.patch.gz
diff --git a/graphics/xmms-gforce/files/patch-_Unix-X::libxpce::xvhandler.c b/graphics/xmms-gforce/files/patch-_Unix-X::libxpce::xvhandler.c
new file mode 100644
index 0000000..8a07bc9
--- /dev/null
+++ b/graphics/xmms-gforce/files/patch-_Unix-X::libxpce::xvhandler.c
@@ -0,0 +1,11 @@
+--- _Unix-X/libxpce/xvhandler.c.orig	Thu Jul 24 03:04:02 2003
++++ _Unix-X/libxpce/xvhandler.c	Thu Jul 24 03:04:12 2003
+@@ -342,7 +342,7 @@
+ 
+ /* x_DCTCEDoComp() - Do one component for DCTCE */
+ int x_DCTCEDoComp(int mask, int color) {
+-  static const char cnames[] = { "red", "green", "blue" };
++  static const char *cnames[] = { "red", "green", "blue" };
+   static const char cflags[] = { DoRed, DoGreen, DoBlue }; 
+   static unsigned long int * const carrays[] = { X_redmap, 
+ 						 X_greenmap, 
diff --git a/print/gv/files/patch-source::paths.h b/print/gv/files/patch-source::paths.h
new file mode 100644
index 0000000..830cd71
--- /dev/null
+++ b/print/gv/files/patch-source::paths.h
@@ -0,0 +1,15 @@
+--- source/paths.h.orig Sun Apr  6 00:00:00 1997
++++ source/paths.h      Fri Jul 18 19:18:09 2003
+@@ -34,9 +34,9 @@
+ #   define INC_XMU(aaa) <XMU_DIRECTORY/aaa>
+ #   define INC_XAW(aaa) <XAW_DIRECTORY/aaa>
+ #else
+-#   define INC_X11(aaa) <X11/##aaa##>
+-#   define INC_XMU(aaa) <X11/Xmu/##aaa##>
+-#   define INC_XAW(aaa) <X11/Xaw3d/##aaa##>
++#   define INC_X11(aaa) <X11/aaa>
++#   define INC_XMU(aaa) <X11/Xmu/aaa>
++#   define INC_XAW(aaa) <X11/Xaw3d/aaa>
+ #endif
+
+ #endif /* _PATHS_H_ */
diff --git a/science/euler/files/patch-source::metaps.c b/science/euler/files/patch-source::metaps.c
new file mode 100644
index 0000000..f641021
--- /dev/null
+++ b/science/euler/files/patch-source::metaps.c
@@ -0,0 +1,11 @@
+--- metaps.c.orig	Sat Jul 19 02:38:38 2003
++++ metaps.c	Sat Jul 19 02:39:09 2003
+@@ -209,7 +209,7 @@
+ //	rectangle clipping
+ //	x1 y1 x2 y2 setclip
+ static char setclipmacro[]= "/setclip {\n\
+-gsave
++gsave\
+ 	/y2 exch def\n\
+ 	/x2 exch def\n\
+ 	/y1 exch def\n\
diff --git a/science/gdis/files/patch-rdf.c b/science/gdis/files/patch-rdf.c
new file mode 100644
index 0000000..5bcd877
--- /dev/null
+++ b/science/gdis/files/patch-rdf.c
@@ -0,0 +1,13 @@
+--- rdf.c.orig	Sat Jul 19 05:08:36 2003
++++ rdf.c	Sat Jul 19 05:09:00 2003
+@@ -445,8 +445,8 @@
+   printf("calculate_rdf(): a = %f b = %f c = %f alpha = %f beta = %f gamma = %f\n",
+             model->pbc[0], model->pbc[1], model->pbc[2],
+             model->pbc[3], model->pbc[4], model->pbc[5]);
+-  printf("calculate_rdf(): latmat[0] = %f latmat[1] = %f latmat[2] = %f
+-          \ncalculate_rdf(): latmat[3] = %f latmat[4] = %f latmat[5] = %f
++  printf("calculate_rdf(): latmat[0] = %f latmat[1] = %f latmat[2] = %f\
++          \ncalculate_rdf(): latmat[3] = %f latmat[4] = %f latmat[5] = %f\
+           \ncalculate_rdf(): latmat[6] = %f latmat[7] = %f latmat[8] = %f\n",
+             model->latmat[0], model->latmat[1], model->latmat[2],
+             model->latmat[3], model->latmat[4], model->latmat[5],
diff --git a/www/mod_index_rss/files/patch-mod_index_rss.c b/www/mod_index_rss/files/patch-mod_index_rss.c
new file mode 100644
index 0000000..be8be4a
--- /dev/null
+++ b/www/mod_index_rss/files/patch-mod_index_rss.c
@@ -0,0 +1,31 @@
+--- mod_index_rss.c.orig	Tue Jul 22 04:37:54 2003
++++ mod_index_rss.c	Tue Jul 22 04:39:22 2003
+@@ -11,18 +11,18 @@
+ 
+ #define TIME_FORMAT "%a %b %d %H:%M:%S %Y"
+ /* This is the XML header file */
+-#define HEADER "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+-
+-<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"
+-            \"http://www.scripting.com/dtd/rss-0_91.dtd\">
+-
+-<rss version=\"0.91\">
+-
+-<channel>
++#define HEADER "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
++\n\
++<!DOCTYPE rss PUBLIC \"-//Netscape Communications//DTD RSS 0.91//EN\"\n\
++            \"http://www.scripting.com/dtd/rss-0_91.dtd\">\n\
++\n\
++<rss version=\"0.91\">\n\
++\n\
++<channel>\n\
+ "
+ 
+-#define FOOTER "</channel>
+-</rss>
++#define FOOTER "</channel>\n\
++</rss>\n\
+ "
+ 
+ 
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index e5611da..6e6aa6d 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -30,10 +30,6 @@ USE_MOTIF=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/^CFLAGS=/CFLAGS+=/g ; \
 		 s/^CXXFLAGS=/CXXFLAGS+=/g ; \
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h b/x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h
new file mode 100644
index 0000000..8482b44
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkAlignmentGroup.h
@@ -0,0 +1,12 @@
+--- ./Vk/VkAlignmentGroup.h.orig	Wed Jul 23 02:43:07 2003
++++ ./Vk/VkAlignmentGroup.h	Wed Jul 23 02:45:35 2003
+@@ -24,6 +24,9 @@
+ 
+ #include <Vk/VkWidgetList.h>
+ #include <Vk/VkOptionMenu.h>
++#include <iostream>
++
++using std::ostream;
+ 
+ class VkAlignmentGroup : public VkWidgetList {
+ public:
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h
new file mode 100644
index 0000000..3e8aaa3
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackList.h
@@ -0,0 +1,12 @@
+--- ./Vk/VkCallbackList.h.orig	Wed Jul 23 02:06:54 2003
++++ ./Vk/VkCallbackList.h	Wed Jul 23 02:07:15 2003
+@@ -44,6 +44,9 @@
+ #include <Vk/VkComponent.h>
+ #include <Vk/VkCallbackObject.h>
+ 
++using std::vector;
++using std::string;
++
+ struct VkCallbackListEntry {
+     enum CallbackType type;
+     VkCallbackObject *component;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h
new file mode 100644
index 0000000..ba65f9b
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkCallbackObject.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkCallbackObject.h.orig	Wed Jul 23 02:07:33 2003
++++ ./Vk/VkCallbackObject.h	Wed Jul 23 02:07:48 2003
+@@ -42,6 +42,8 @@
+ 
+ #include <Vk/VkConfig.h>
+ 
++using std::vector;
++
+ class VkCallbackObject;
+ 
+ typedef void (VkCallbackObject::*VkCallbackMethod)(
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h b/x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h
new file mode 100644
index 0000000..b61f482
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkComponentList.h
@@ -0,0 +1,24 @@
+--- ./Vk/VkComponentList.h.orig	Wed Jul 23 02:09:51 2003
++++ ./Vk/VkComponentList.h	Wed Jul 23 02:18:22 2003
+@@ -41,6 +41,8 @@
+ 
+ #include <Vk/VkConfig.h>
+ 
++using std::vector;
++
+ class VkComponent;
+ 
+ class VkComponentList {
+@@ -59,10 +61,10 @@
+     VkComponent* operator[](int indx) const { return elements[indx]; }
+ 
+ 	void insert(int pos, VkComponent* c)
+-		{ elements.insert(&elements[pos], c); }
++		{ elements.insert(elements.begin () + pos, c); }
+     
+ 	void remove(int pos)
+-		{ elements.erase(&elements[pos]); }
++		{ elements.erase(elements.begin () + pos); }
+     
+ private:
+     vector<VkComponent*> elements;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h b/x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h
new file mode 100644
index 0000000..58fdc4a
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkDialogManager.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkDialogManager.h.orig	Wed Jul 23 02:13:42 2003
++++ ./Vk/VkDialogManager.h	Wed Jul 23 02:13:57 2003
+@@ -49,6 +49,8 @@
+ #include <Vk/VkResource.h>
+ #include <Vk/VkSimpleWindow.h>
+ 
++using std::string;
++
+ class VkDialogManager : public VkComponent {
+ public:
+     typedef enum {OK, APPLY, CANCEL} VkDialogReason;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h b/x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h
new file mode 100644
index 0000000..864ac9c
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkMenuItem.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkMenuItem.h.orig	Wed Jul 23 02:22:17 2003
++++ ./Vk/VkMenuItem.h	Wed Jul 23 02:22:29 2003
+@@ -41,6 +41,8 @@
+ #include <Vk/VkComponent.h>
+ #include <Vk/VkWidgetList.h>
+ 
++using std::string;
++
+ typedef enum {ACTION, ACTIONWIDGET, CONFIRMFIRSTACTION, TOGGLE, LABEL,
+ 			  SEPARATOR, SUBMENU, RADIOSUBMENU, BAR, OPTION, POPUP, OBJECT,
+ 			  END} VkMenuItemType;
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkNameList.h b/x11-toolkits/viewklass/files/patch-Vk::VkNameList.h
new file mode 100644
index 0000000..7634a25
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkNameList.h
@@ -0,0 +1,12 @@
+--- ./Vk/VkNameList.h.orig	Wed Jul 23 02:23:57 2003
++++ ./Vk/VkNameList.h	Wed Jul 23 02:24:28 2003
+@@ -43,6 +43,9 @@
+ #include <Xm/Xm.h>
+ #include <Vk/VkConfig.h>
+ 
++using std::vector;
++using std::string;
++
+ class VkNameList {
+  public:
+     VkNameList();
diff --git a/x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h b/x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h
new file mode 100644
index 0000000..2625a02
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-Vk::VkPrefItem.h
@@ -0,0 +1,11 @@
+--- ./Vk/VkPrefItem.h.orig	Wed Jul 23 02:40:46 2003
++++ ./Vk/VkPrefItem.h	Wed Jul 23 02:41:01 2003
+@@ -45,6 +45,8 @@
+ 
+ #include <string>
+ 
++using std::string;
++
+ class VkPrefItem : public VkComponent {
+ public:
+     enum VkPrefItemType {PI_group, PI_list, PI_radio, PI_text, PI_toggle,
diff --git a/x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C b/x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C
new file mode 100644
index 0000000..73dec33
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkAlignmentGroup.C
@@ -0,0 +1,11 @@
+--- ./VkAlignmentGroup.C.orig	Wed Jul 23 02:44:15 2003
++++ ./VkAlignmentGroup.C	Wed Jul 23 02:45:22 2003
+@@ -36,6 +36,8 @@
+ 
+ #include <Vk/VkAlignmentGroup.h>
+ 
++using std::endl;
++
+ VkAlignmentGroup::VkAlignmentGroup()
+ 	: VkWidgetList(),
+ 	  _maxWidth(0),
diff --git a/x11-toolkits/viewklass/files/patch-VkCallbackObject.C b/x11-toolkits/viewklass/files/patch-VkCallbackObject.C
new file mode 100644
index 0000000..548ab5e
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkCallbackObject.C
@@ -0,0 +1,12 @@
+--- ./VkCallbackObject.C.orig	Wed Jul 23 02:08:26 2003
++++ ./VkCallbackObject.C	Wed Jul 23 02:09:04 2003
+@@ -45,6 +45,9 @@
+ #include <Vk/VkCallbackObject.h>
+ #include <Vk/VkCallbackList.h>
+ 
++using std::cerr;
++using std::endl;
++
+ VkCallbackObject::VkCallbackObject()
+ {
+ }
diff --git a/x11-toolkits/viewklass/files/patch-VkComponent.C b/x11-toolkits/viewklass/files/patch-VkComponent.C
new file mode 100644
index 0000000..630cbf4
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkComponent.C
@@ -0,0 +1,13 @@
+--- ./VkComponent.C.orig	Wed Jul 23 02:12:18 2003
++++ ./VkComponent.C	Wed Jul 23 02:13:09 2003
+@@ -46,6 +46,10 @@
+ #include <Vk/VkComponent.h>
+ #include <Vk/VkApp.h>
+ 
++using std::string;
++using std::cerr;
++using std::endl;
++
+ const char *const VkComponent::deleteCallback = "VkComponentDeleteCallback";
+ 
+ VkComponent::VkComponent(const char *name)
diff --git a/x11-toolkits/viewklass/files/patch-VkNameList.C b/x11-toolkits/viewklass/files/patch-VkNameList.C
new file mode 100644
index 0000000..d3653c9
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkNameList.C
@@ -0,0 +1,11 @@
+--- ./VkNameList.C.orig	Wed Jul 23 02:39:09 2003
++++ ./VkNameList.C	Wed Jul 23 02:39:23 2003
+@@ -105,7 +105,7 @@
+ }
+ 
+ void
+-VkNameList::remove(int index, int count=1)
++VkNameList::remove(int index, int count)
+ {
+ 	_contents.erase(_contents.begin() + index,
+ 					_contents.begin() + index + count);
diff --git a/x11-toolkits/viewklass/files/patch-VkPipe.C b/x11-toolkits/viewklass/files/patch-VkPipe.C
new file mode 100644
index 0000000..5bcad5f
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkPipe.C
@@ -0,0 +1,11 @@
+--- ./VkPipe.C.orig	Wed Jul 23 02:33:13 2003
++++ ./VkPipe.C	Wed Jul 23 03:05:28 2003
+@@ -67,7 +67,7 @@
+     _input->attach(pipefd[0], XtInputReadMask);
+     _input->addCallback(VkInput::inputCallback, 
+ 						this,
+-						(VkCallbackMethod)&(VkPipe::handleInput));
++						(VkCallbackMethod)(&VkPipe::handleInput));
+ }
+ 
+ VkPipe::~VkPipe()
diff --git a/x11-toolkits/viewklass/files/patch-VkPrefRadio.C b/x11-toolkits/viewklass/files/patch-VkPrefRadio.C
new file mode 100644
index 0000000..fa35b84
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkPrefRadio.C
@@ -0,0 +1,13 @@
+--- ./VkPrefRadio.C.orig	Wed Jul 23 02:42:07 2003
++++ ./VkPrefRadio.C	Wed Jul 23 02:42:38 2003
+@@ -40,6 +40,10 @@
+ #include <Xm/Form.h>
+ 
+ #include <Vk/VkPrefRadio.h>
++#include <iostream>
++
++using std::cerr;
++using std::endl;
+ 
+ // A VkPrefRadio is a vertical VkPrefGroup with no label
+ VkPrefRadio::VkPrefRadio(const char *name,
diff --git a/x11-toolkits/viewklass/files/patch-VkRadioGroup.C b/x11-toolkits/viewklass/files/patch-VkRadioGroup.C
new file mode 100644
index 0000000..0393d8c
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkRadioGroup.C
@@ -0,0 +1,31 @@
+--- ./VkRadioGroup.C.orig	Wed Jul 23 02:25:08 2003
++++ ./VkRadioGroup.C	Wed Jul 23 02:31:58 2003
+@@ -47,11 +47,15 @@
+ #include <Xm/ToggleBG.h>
+ #include <Xm/PushB.h>
+ #include <Xm/PushBG.h>
++#include <iostream>
++
++using std::cerr;
++using std::endl;
+ 
+ VkRadioGroup::VkRadioGroup()
+ 	: VkWidgetList()
+ {
+-    _currentlySelected = 0;
++    //_currentlySelected = 0;
+ }
+ 
+ void 
+@@ -77,9 +81,9 @@
+ void 
+ VkRadioGroup::remove(Widget item)
+ {
+-    if (*_currentlySelected == item)
++    /*if (*_currentlySelected == item)
+         _currentlySelected = 0;
+-    else if (_currentlySelected > VkWidgetList::find(item))
++    else */ if (_currentlySelected > VkWidgetList::find(item))
+         _currentlySelected --;
+ 
+ 	XtRemoveCallback(item, XmNvalueChangedCallback,
diff --git a/x11-toolkits/viewklass/files/patch-VkSimpleWindow.C b/x11-toolkits/viewklass/files/patch-VkSimpleWindow.C
new file mode 100644
index 0000000..87d0ab1
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkSimpleWindow.C
@@ -0,0 +1,13 @@
+--- ./VkSimpleWindow.C.orig	Wed Jul 23 02:18:56 2003
++++ ./VkSimpleWindow.C	Wed Jul 23 02:20:37 2003
+@@ -44,6 +44,10 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xmu/Editres.h>
+ 
++using std::cerr;
++using std::endl;
++using std::exception;
++
+ static char* rcsid
+ #ifdef __GNUC__
+ __attribute__ ((unused))
diff --git a/x11-toolkits/viewklass/files/patch-VkSubProcess.C b/x11-toolkits/viewklass/files/patch-VkSubProcess.C
new file mode 100644
index 0000000..2be8e0e
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkSubProcess.C
@@ -0,0 +1,13 @@
+--- ./VkSubProcess.C.orig	Wed Jul 23 02:39:49 2003
++++ ./VkSubProcess.C	Wed Jul 23 02:40:21 2003
+@@ -40,6 +40,10 @@
+ #include <signal.h>
+ #include <stdio.h>
+ #include <unistd.h> // for exec*
++#include <iostream>
++
++using std::cerr;
++using std::endl;
+ 
+ VkSubProcess::VkSubProcess(char *prog,
+ 						   VkNameList *given,
diff --git a/x11-toolkits/viewklass/files/patch-VkTrace.C b/x11-toolkits/viewklass/files/patch-VkTrace.C
index 7c44913..abeb95f 100644
--- a/x11-toolkits/viewklass/files/patch-VkTrace.C
+++ b/x11-toolkits/viewklass/files/patch-VkTrace.C
@@ -1,10 +1,16 @@
---- VkTrace.C.orig	Wed Jun  5 00:04:51 2002
-+++ VkTrace.C	Wed Jun  5 00:05:25 2002
-@@ -28,6 +28,7 @@
+--- VkTrace.C.orig	Thu Jul 11 08:46:58 2002
++++ VkTrace.C	Wed Jul 23 03:22:53 2003
+@@ -28,8 +28,13 @@
  #include <stdio.h>
  #include <time.h>
  #include <string.h>
 +#include <stdarg.h>
  
  #include <Vk/VkTrace.h>
++#include <fstream>
++
++using std::ofstream;
++using std::endl;
+ 
+ ofstream* vkTraceOut = 0;
  
diff --git a/x11-toolkits/viewklass/files/patch-VkWindow.C b/x11-toolkits/viewklass/files/patch-VkWindow.C
new file mode 100644
index 0000000..059f9bf
--- /dev/null
+++ b/x11-toolkits/viewklass/files/patch-VkWindow.C
@@ -0,0 +1,13 @@
+--- ./VkWindow.C.orig	Wed Jul 23 02:21:06 2003
++++ ./VkWindow.C	Wed Jul 23 02:21:39 2003
+@@ -42,6 +42,10 @@
+ #include <Vk/VkWindow.h>
+ #include <iostream.h>
+ 
++using std::cerr;
++using std::endl;
++using std::exception;
++
+ VkWindow::VkWindow(const char* name,
+ 				   ArgList args,
+ 				   Cardinal argCount)