upgrade to 4.3.2

6 files changed, 15 insertions, 79 deletions

diff --git a/graphics/opendx/files/patch-GARCommand.C b/graphics/opendx/files/patch-GARCommand.C
deleted file mode 100644
index ae978ea280f2..000000000000
--- a/graphics/opendx/files/patch-GARCommand.C
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/uipp/prompter/GARCommand.C.orig	Sat Nov 30 02:48:50 2002
-+++ src/uipp/prompter/GARCommand.C	Sat Nov 30 02:46:44 2002
-@@ -18,6 +18,7 @@
- #elif defined(HAVE_STRSTREA_H)
- #include <strstrea.h>
- #endif
-+#include <strstream>
- 
- #include "NoUndoCommand.h"
- #include "GARApplication.h"
-@@ -50,9 +51,9 @@
-     char	  *fname;
-     unsigned long mode;
-     int dirty;
--    strstream tmpstr;
-+    std::strstream tmpstr;
- #ifdef aviion
--    strstream tmpstr2;
-+    std::strstream tmpstr2;
- #endif
- 
-     switch (this->option)
diff --git a/graphics/opendx/files/patch-NumberInput.h b/graphics/opendx/files/patch-NumberInput.h
deleted file mode 100644
index a0b668545e80..000000000000
--- a/graphics/opendx/files/patch-NumberInput.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/uipp/widgets/NumberInput.h.orig	Wed Mar 12 22:56:49 2003
-+++ src/uipp/widgets/NumberInput.h	Wed Mar 12 23:06:33 2003
-@@ -12,7 +12,7 @@
- #include <stdlib.h>	/*  strtod()  */
- #include <errno.h>	/*  errno, ERANGE  */
- #define XK_MISCELLANY 1
--#include <X11/keysymdef.h>
-+#include <X11/keysym.h>
- 
- #if defined(__cplusplus) || defined(c_plusplus)
- extern "C" {
diff --git a/graphics/opendx/files/patch-ah b/graphics/opendx/files/patch-ah
deleted file mode 100644
index 7a5214f28fb5..000000000000
--- a/graphics/opendx/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/ORIG/dxworker.in	Tue May  8 11:01:28 2001
-+++ bin/dxworker.in	Wed Jun 20 20:11:39 2001
-@@ -15,7 +15,7 @@
- set thismach=`uname  -m`
- set thishost=`hostname | sed -e 's/\..*$//'` 
- set thisver=`uname  -r`
--set remote=/usr/bin/rsh
-+set remote=/usr/bin/ssh
- set showversion=0
- 
- 
diff --git a/graphics/opendx/files/patch-ltmain.sh b/graphics/opendx/files/patch-ltmain.sh
new file mode 100644
index 000000000000..e501c8fd5cfa
--- /dev/null
+++ b/graphics/opendx/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Thu Jan  8 13:51:00 2004
++++ ltmain.sh	Thu Jan  8 13:51:11 2004
+@@ -5425,10 +5425,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/opendx/files/patch-src:exec:dpexec:yuiif.y b/graphics/opendx/files/patch-src:exec:dpexec:yuiif.y
deleted file mode 100644
index 816f264d2fb7..000000000000
--- a/graphics/opendx/files/patch-src:exec:dpexec:yuiif.y
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/exec/dpexec/yuiif.y-orig	Mon Jul 31 10:10:38 2000
-+++ src/exec/dpexec/yuiif.y	Tue Nov 26 14:31:53 2002
-@@ -1550,18 +1550,21 @@
- 		    if (! _dxd_exUIPacket)
- 			yyerrok;
- 		}
-+		;
- 
- rightparen	: T_RPAR
- 		{
- 		    if (! _dxd_exUIPacket)
- 			yyerrok;
- 		}
-+		;
- 
- rightbracket	: T_RBRA
- 		{
- 		    if (! _dxd_exUIPacket)
- 			yyerrok;
- 		}
-+		;
- 
- id		: T_ID
- 		{
diff --git a/graphics/opendx/files/patch-src:exec:mklib b/graphics/opendx/files/patch-src:exec:mklib
deleted file mode 100644
index 35e54f409b0d..000000000000
--- a/graphics/opendx/files/patch-src:exec:mklib
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/exec/ORIG/mklib	Thu Jan 11 12:08:51 2001
-+++ src/exec/mklib	Wed Jun 20 20:19:45 2001
-@@ -33,7 +33,7 @@
-    for i in $FMT_LIBS "" ; do
- 	if test "$i" != "" ; then
- 		lib=""
--		for j in /lib /usr/lib /usr/local/lib -lnsl -ldl -lm -lSM -lICE -lXm -lGL -lm -lXext -lXt -lX11 -lSM -lICE -lpthread ;  do
-+		for j in /lib /usr/lib /usr/local/lib -lnsl -ldl -lm -lSM -lICE ${MOTIFLIB} -lGL -lm -lXext -lXt -lX11 -lSM -lICE -lpthread ;  do
- 			k=`echo $j | sed -e "s/-L//"` 
- 			if test -f $k/$i ; then
- 				lib=$k/$i