6 files changed, 98 insertions, 16 deletions

diff --git a/graphics/tulip/files/patch-CirculantGraph.cpp b/graphics/tulip/files/patch-CirculantGraph.cpp
new file mode 100644
index 000000000000..a61bebc0610e
--- /dev/null
+++ b/graphics/tulip/files/patch-CirculantGraph.cpp
@@ -0,0 +1,10 @@
+--- plugins/import/CirculantGraph.cpp.orig	Thu Apr  3 04:49:37 2003
++++ plugins/import/CirculantGraph.cpp	Mon May 26 08:01:03 2003
+@@ -1,5 +1,6 @@
++#include <sys/types.h>
+ #include <sys/timeb.h>
+-#include<qinputdialog.h>
++#include <qinputdialog.h>
+ #include <tulip/TulipPlugin.h>
+ 
+ using namespace std;
diff --git a/graphics/tulip/files/patch-FileSystem.cpp b/graphics/tulip/files/patch-FileSystem.cpp
index c64324f43660..f412cd672986 100644
--- a/graphics/tulip/files/patch-FileSystem.cpp
+++ b/graphics/tulip/files/patch-FileSystem.cpp
@@ -1,13 +1,12 @@
---- plugins/import/FileSystem.cpp.orig	Fri Nov  1 00:55:42 2002
-+++ plugins/import/FileSystem.cpp	Sun Apr 20 01:10:32 2003
+--- plugins/import/FileSystem.cpp.orig	Sat Dec  7 00:39:53 2002
++++ plugins/import/FileSystem.cpp	Mon May 26 01:24:45 2003
 @@ -1,8 +1,8 @@
 +#include <sys/types.h>
  #include <sys/timeb.h>
--#include<qfiledialog.h>
-+#include <qfiledialog.h>
+ #include <qfiledialog.h>
  #include <tulip/TulipPlugin.h>
  #include <sys/stat.h>
 -#include <sys/types.h>
  #include <dirent.h>
  
- struct FileSystem:public ImportModule
+ using namespace std;
diff --git a/graphics/tulip/files/patch-IdLabels.cpp b/graphics/tulip/files/patch-IdLabels.cpp
new file mode 100644
index 000000000000..8600f5866fdb
--- /dev/null
+++ b/graphics/tulip/files/patch-IdLabels.cpp
@@ -0,0 +1,9 @@
+--- plugins/string/IdLabels.cpp.orig	Thu Apr 10 21:57:47 2003
++++ plugins/string/IdLabels.cpp	Mon May 26 10:27:11 2003
+@@ -1,5 +1,6 @@
+ //-*-c++-*-
+ #include <tulip/TulipPlugin.h>
++#include <cstdio>
+ #include <string>
+ using namespace std;
+ 
diff --git a/graphics/tulip/files/patch-TemplateFactory.cxx b/graphics/tulip/files/patch-TemplateFactory.cxx
index e727c2624816..9150a2943481 100644
--- a/graphics/tulip/files/patch-TemplateFactory.cxx
+++ b/graphics/tulip/files/patch-TemplateFactory.cxx
@@ -1,11 +1,20 @@
---- library/tulip/include/tulip/cxx/TemplateFactory.cxx.orig	Sat Nov  9 02:52:54 2002
-+++ library/tulip/include/tulip/cxx/TemplateFactory.cxx	Sat Apr 19 23:03:33 2003
-@@ -39,7 +39,7 @@
- 	else
- 	  {
- 	    createObj =(func) dlsym(handle, "_creator");
--	    if ((error=dlerror())!=0)
-+	    if ((error=(char*)dlerror())!=0)
- 	      {
- 		dlclose(handle);
- 		if (loader!=0) loader->aborted(std::string(namelist[n]->d_name),std::string(error));
+--- library/tulip/include/tulip/cxx/TemplateFactory.cxx.orig	Wed Apr  2 23:46:09 2003
++++ library/tulip/include/tulip/cxx/TemplateFactory.cxx	Mon May 26 14:31:29 2003
+@@ -13,7 +13,7 @@
+ #include <dirent.h>
+ 
+ //implemented in TlpTools.cpp
+-int __tulip_selectSO(const struct dirent *ent);
++int __tulip_selectSO(struct dirent *ent);
+ 
+ template<class ObjectFactory, class ObjectType, class Parameter>
+ bool TemplateFactory<ObjectFactory, ObjectType, Parameter>::exists(const std::string &pluginName) {
+@@ -43,7 +43,7 @@
+       }
+       else {
+ 	createObj =(func) dlsym(handle, "_creator");
+-	if ((error=dlerror())!=0) {
++	if ((error=(char*)dlerror())!=0) {
+ 	  dlclose(handle);
+ 	  if (loader!=0) loader->aborted(std::string(namelist[n]->d_name),std::string(error));
+ 	}
diff --git a/graphics/tulip/files/patch-TlpTools.cpp b/graphics/tulip/files/patch-TlpTools.cpp
new file mode 100644
index 000000000000..6a74201d6b5b
--- /dev/null
+++ b/graphics/tulip/files/patch-TlpTools.cpp
@@ -0,0 +1,11 @@
+--- library/tulip/src/TlpTools.cpp.orig	Wed Apr  2 23:46:09 2003
++++ library/tulip/src/TlpTools.cpp	Mon May 26 14:32:25 2003
+@@ -36,7 +36,7 @@
+ }
+ //=========================================================
+ // accepts only file names ending with ".so"
+-int __tulip_selectSO(const struct dirent *ent) {
++int __tulip_selectSO(struct dirent *ent) {
+   const char *SO = ".so";
+   int idx = strlen(ent->d_name) - 3;
+   if (idx < 0) return 0;
diff --git a/graphics/tulip/files/patch-tlprender.cpp b/graphics/tulip/files/patch-tlprender.cpp
new file mode 100644
index 000000000000..deb703c33bb1
--- /dev/null
+++ b/graphics/tulip/files/patch-tlprender.cpp
@@ -0,0 +1,44 @@
+--- software/tlprender/src/tlprender.cpp.orig	Tue Apr  8 18:34:14 2003
++++ software/tlprender/src/tlprender.cpp	Mon May 26 10:46:44 2003
+@@ -8,6 +8,9 @@
+ #include <queue>
+ 
+ #include <stdio.h>
++#ifdef __FreeBSD__
++#include <libgen.h>
++#endif
+ #include <getopt.h>
+   /* from man 3 basename, #include <libgen.h>. However we want to use GNU's basename.
+    * see: info libc, libgen.h and string.h for more information. libgen.h is required for dirname,
+@@ -54,7 +57,9 @@
+ static const int BUFFERSIZE(64 * 1024 * 1024);
+ static GLfloat *buffer;
+ 
++#ifdef HAVE_ON_EXIT
+ static void exitManager(int, void *);
++#endif
+ static void parseCommandLine(int, char **);
+ static void help() __attribute__ ((noreturn));
+ 
+@@ -318,7 +323,9 @@
+ /***************************************************************************************************/
+ int main (int argc, char **argv)
+ {
++#ifdef HAVE_ON_EXIT
+   on_exit(exitManager, NULL);
++#endif
+ 
+   parseCommandLine(argc, argv);
+   
+@@ -401,9 +408,11 @@
+ /*
+  *
+  */
++#ifdef HAVE_ON_EXIT
+ void exitManager(int exitStatus, void *arg)
+ {
+ }
++#endif
+ 
+ /*
+  * command line parser and help() functions below this line, nothing else should be added after