upgrade to 0.9.1

8 files changed, 37 insertions, 95 deletions

diff --git a/graphics/aqsis/files/patch-aqsis::aqsis.cpp b/graphics/aqsis/files/patch-aqsis::aqsis.cpp
index 50246cd58430..71113a973afb 100644
--- a/graphics/aqsis/files/patch-aqsis::aqsis.cpp
+++ b/graphics/aqsis/files/patch-aqsis::aqsis.cpp
@@ -1,13 +1,13 @@
---- aqsis/aqsis.cpp.orig	Sun Feb 16 23:36:02 2003
-+++ aqsis/aqsis.cpp	Sat Apr 19 22:56:01 2003
-@@ -82,8 +82,8 @@
- 		return ;
- 	}
+--- aqsis/aqsis.cpp.orig	Mon Apr 12 13:45:33 2004
++++ aqsis/aqsis.cpp	Mon Apr 12 13:46:02 2004
+@@ -113,8 +113,8 @@
+         return ;
+     }
  
--	static long tick = 0;
--	long now;
-+	static time_t tick = 0;
-+	time_t now;
+-    static long tick = 0;
+-    long now;
++    static time_t tick = 0;
++    time_t now;
  
- 	if ( tick == 0 )
- 		time( &tick );
+     if ( tick == 0 )
+         time( &tick );
diff --git a/graphics/aqsis/files/patch-aqsltell::Makefile.in b/graphics/aqsis/files/patch-aqsltell::Makefile.in
deleted file mode 100644
index cef06b1ac5d5..000000000000
--- a/graphics/aqsis/files/patch-aqsltell::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- aqsltell/Makefile.in.orig	Sun Sep 21 05:17:44 2003
-+++ aqsltell/Makefile.in	Sun Sep 28 23:19:14 2003
-@@ -103,7 +103,7 @@
- bin_PROGRAMS = aqsltell 
- 
- aqsltell_SOURCES = aqsltell.cpp
--aqsltell_LDADD = $(top_builddir)/libslxargs/libslxargs.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libargparse/libargparse.la
-+aqsltell_LDADD = $(top_builddir)/render/libaqsis.la $(top_builddir)/libslxargs/libslxargs.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libargparse/libargparse.la
- 
- INCLUDES = -I$(top_srcdir)/libaqsistypes -I$(top_srcdir)/libaqsistypes/posix -I$(top_srcdir)/libshadervm -I$(top_srcdir)/libshaderexecenv -I$(top_srcdir)/libslxargs -I$(top_srcdir)/libargparse
- 
diff --git a/graphics/aqsis/files/patch-libdd::dd.cpp b/graphics/aqsis/files/patch-libdd::dd.cpp
new file mode 100644
index 000000000000..1026f2a65bee
--- /dev/null
+++ b/graphics/aqsis/files/patch-libdd::dd.cpp
@@ -0,0 +1,11 @@
+--- libdd/dd.cpp.orig	Mon Apr 12 16:13:20 2004
++++ libdd/dd.cpp	Mon Apr 12 16:02:24 2004
+@@ -26,6 +26,8 @@
+ 
+ #include <iostream>
+ #include <memory>
++#include <string>
++#include <errno.h>
+ 
+ #include "aqsis.h"
+ #include <logging.h>
diff --git a/graphics/aqsis/files/patch-libddmsock::ddmsock.cpp b/graphics/aqsis/files/patch-libddmsock::ddmsock.cpp
deleted file mode 100644
index 8bb8b122836c..000000000000
--- a/graphics/aqsis/files/patch-libddmsock::ddmsock.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- libddmsock/ddmsock.cpp.orig	Sat Sep  6 03:37:58 2003
-+++ libddmsock/ddmsock.cpp	Sun Sep 28 22:22:06 2003
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <netinet/in.h>
- #include <sys/types.h>
-+#include <sys/signal.h>
- #include <sys/socket.h>
- #include <sys/wait.h>
- #include <errno.h>
diff --git a/graphics/aqsis/files/patch-libslparse::parsenode.cpp b/graphics/aqsis/files/patch-libslparse::parsenode.cpp
deleted file mode 100644
index 319ed9bce0c6..000000000000
--- a/graphics/aqsis/files/patch-libslparse::parsenode.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libslparse/parsenode.cpp.orig	Tue May 14 12:53:14 2002
-+++ libslparse/parsenode.cpp	Sat Oct 12 14:11:49 2002
-@@ -118,7 +118,7 @@
- 	for ( i = 0; i < Type_Last; i++ )
- 	{
- 		if ( gVariableTypeIdentifiers[ i ][ 0 ] == Id ||
--#if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS)
-+#if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS) || defined(__FreeBSD__)
- 		        gVariableTypeIdentifiers[ i ][ 0 ] == tolower( Id ) )
- #else
- 				gVariableTypeIdentifiers[ i ][ 0 ] == _tolower( Id ) )
diff --git a/graphics/aqsis/files/patch-ltmain.sh b/graphics/aqsis/files/patch-ltmain.sh
index 83d7767c39ef..c30a9110600d 100644
--- a/graphics/aqsis/files/patch-ltmain.sh
+++ b/graphics/aqsis/files/patch-ltmain.sh
@@ -1,36 +1,10 @@
---- ltmain.sh.orig	Sun Sep 21 05:17:09 2003
-+++ ltmain.sh	Sun Sep 28 23:27:28 2003
-@@ -1056,14 +1056,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2499,7 +2499,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4286,10 +4286,12 @@
+--- ltmain.sh.orig	Mon Apr 12 13:48:59 2004
++++ ltmain.sh	Mon Apr 12 13:49:22 2004
+@@ -4394,10 +4394,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
++	if /usr/bin/false ; then
  	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
  	instname="$dir/$name"i
  	$show "$install_prog $instname $destdir/$name"
diff --git a/graphics/aqsis/files/patch-render::ri.cpp b/graphics/aqsis/files/patch-render::ri.cpp
index 5e5948caef64..f092bdeb5995 100644
--- a/graphics/aqsis/files/patch-render::ri.cpp
+++ b/graphics/aqsis/files/patch-render::ri.cpp
@@ -1,11 +1,11 @@
---- render/ri.cpp.orig	Fri Sep 19 17:03:14 2003
-+++ render/ri.cpp	Mon Sep 29 11:33:21 2003
-@@ -3271,7 +3271,7 @@
- 				TqInt iElem;
- 				for( iElem = 0; iElem < fvcount; iElem++ )
- 				{
--					const unsigned char* pval = static_cast<const unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
-+					unsigned char* pval = static_cast<unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
- 					memcpy( pNew, pval, elem_size );
- 					pNew += elem_size;
- 				}
+--- render/ri.cpp.orig	Mon Apr 12 13:49:57 2004
++++ render/ri.cpp	Mon Apr 12 13:51:26 2004
+@@ -3608,7 +3608,7 @@
+                 TqInt iElem;
+                 for( iElem = 0; iElem < fvcount; ++iElem )
+                 {
+-                    const unsigned char* pval = static_cast<const unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
++                    unsigned char* pval = static_cast<unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
+                     memcpy( pNew, pval, elem_size );
+                     pNew += elem_size;
+                 }
diff --git a/graphics/aqsis/files/patch-shaders::Makefile.in b/graphics/aqsis/files/patch-shaders::Makefile.in
deleted file mode 100644
index 15f52ca6d78e..000000000000
--- a/graphics/aqsis/files/patch-shaders::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- shaders/Makefile.in.orig	Sun Sep 21 05:18:05 2003
-+++ shaders/Makefile.in	Mon Sep 29 00:21:58 2003
-@@ -237,7 +237,7 @@
- 	$(mkinstalldirs) $(shaderdir)
- 	$(INSTALL_DATA) $(srcdir)/*.h $(shaderdir)
- 	$(INSTALL_DATA) $(srcdir)/*.sl $(shaderdir)
--	PATH=$$PATH:$(bindir); cd $(shaderdir); for file in $$(find . -name "*.sl"); do $(bindir)/aqsl $$file; done
-+#	PATH=$$PATH:$(bindir); cd $(shaderdir); for file in $$(find . -name "*.sl"); do $(bindir)/aqsl $$file; done
- 
- uninstall-local:
- 	rm -f $(shaderdir)/*.h