Importing patches for update of xblast to 2.6

7 files changed, 106 insertions, 0 deletions

diff --git a/games/xblast/patches/patch-aa b/games/xblast/patches/patch-aa
new file mode 100644
index 00000000000..3f08617694c
--- /dev/null
+++ b/games/xblast/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- Imakefile.orig	Thu Oct 16 02:54:01 1997
++++ Imakefile	Tue Nov 10 00:41:26 1998
+@@ -12,9 +12,9 @@
+  */
+ 
+ #define IHaveSubdirs
+-SUBDIRS=bitmap image sounds
++SUBDIRS=bitmap image sounds tkXBlast
+ 
+-XBLASTDIR=$(LIBDIR)/xblast
++XBLASTDIR=$(PREFIX)/share/xblast
+ /*
+  * If you want to have sound, comment the following line
+  * Set SOUND_DIR to the directory, where the sounds can be found
+@@ -65,7 +65,7 @@
+ SRCS2  = xbsndsrv.c
+ OBJS2  = xbsndsrv.o
+ 
+-ComplexProgramTarget_2(xbsndsrv,NullParameter,NullParameter)
++ComplexProgramTarget_2(xbsndsrv,-lossaudio,NullParameter)
+ 
+ /*
+  * Part 3: install Application Defaults
diff --git a/games/xblast/patches/patch-ab b/games/xblast/patches/patch-ab
new file mode 100644
index 00000000000..963a10932b9
--- /dev/null
+++ b/games/xblast/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- xbsndsrv.c.orig	Mon Nov  9 23:01:52 1998
++++ xbsndsrv.c	Mon Nov  9 23:02:26 1998
+@@ -100,7 +100,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+-#include <linux/soundcard.h>
++#include <soundcard.h>
+ #include <signal.h>
+ #include "sound.h"
+ 
diff --git a/games/xblast/patches/patch-ac b/games/xblast/patches/patch-ac
new file mode 100644
index 00000000000..86b86fd6080
--- /dev/null
+++ b/games/xblast/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- sound.c.orig	Mon Nov  9 23:01:48 1998
++++ sound.c	Mon Nov  9 23:02:10 1998
+@@ -80,7 +80,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+-#include <linux/soundcard.h>
++#include <soundcard.h>
+ #include <signal.h>
+ #include "sound.h"
+ 
diff --git a/games/xblast/patches/patch-ad b/games/xblast/patches/patch-ad
new file mode 100644
index 00000000000..58303fa2e50
--- /dev/null
+++ b/games/xblast/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- sounds/Imakefile.orig	Mon Nov  9 23:45:14 1998
++++ sounds/Imakefile	Mon Nov  9 23:45:29 1998
+@@ -11,7 +11,7 @@
+  * common part 
+  */
+ 
+-XBLASTDIR=$(LIBDIR)/xblast
++XBLASTDIR=$(PREFIX)/share/xblast
+ SOUNDDIR=$(XBLASTDIR)/sounds
+ 
+ /*
diff --git a/games/xblast/patches/patch-ae b/games/xblast/patches/patch-ae
new file mode 100644
index 00000000000..dcd4d8ddb6c
--- /dev/null
+++ b/games/xblast/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- tkXBlast/Imakefile.orig	Tue Nov 10 00:37:31 1998
++++ tkXBlast/Imakefile	Tue Nov 10 00:37:59 1998
+@@ -11,7 +11,7 @@
+ /*
+  * XBlast directories
+  */
+-XBLASTDIR=$(LIBDIR)/xblast
++XBLASTDIR=$(PREFIX)/share/xblast
+ TKXBLASTDIR=$(XBLASTDIR)/tkXBlast
+ TKXBLAST=tkXBlast
+ 
diff --git a/games/xblast/patches/patch-af b/games/xblast/patches/patch-af
new file mode 100644
index 00000000000..847526c15ee
--- /dev/null
+++ b/games/xblast/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- tkXBlast/setup.orig	Tue Nov 10 00:37:39 1998
++++ tkXBlast/setup	Tue Nov 10 00:39:36 1998
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ 
+-tclsh setup.tcl $*
+-exit 0
++tclsh8.0 setup.tcl $*
++exit 0
diff --git a/games/xblast/patches/patch-ag b/games/xblast/patches/patch-ag
new file mode 100644
index 00000000000..af41576f286
--- /dev/null
+++ b/games/xblast/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+--- tkXBlast/setup.tcl.orig	Wed Dec 11 14:26:43 1996
++++ tkXBlast/setup.tcl	Tue Nov 10 01:07:26 1998
+@@ -48,19 +48,7 @@
+ set binPath [lindex $argv 1]
+ set tkLibPath [lindex $argv 2]
+ 
+-set wishCmd [testWish wish]
+-puts "Enter the path for \"wish\" on your system (default is \"$wishCmd\"):" 
+-
+-gets file0 newWishCmd
+-if {$newWishCmd != {}} {
+-    set wishCmd $newWishCmd
+-} else {
+-    if {$wishCmd == {}} {
+-	puts "Error: path for \"wish\" not defined."
+-	puts "Aborting programm"
+-	exit 1
+-    }
+-}
++set wishCmd [testWish wish8.0]
+ 
+ set version [versionWish $wishCmd]
+ puts "tk version is $version"