Adapt this package to tk-8.3.2.

6 files changed, 29 insertions, 26 deletions

diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index b1cda0400f2..8fe482463fb 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/02/05 18:39:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/31 17:26:15 jwise Exp $
 #
 
 DISTNAME=		xblast-2.6.beta-sound
@@ -10,8 +10,7 @@ MASTER_SITES=		http://www.ikp.uni-koeln.de/~vogel/archive/
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.ikp.uni-koeln.de/~vogel/xblast/xblast.html
 
-DEPENDS+=		tcl-8.0.5:../../lang/tcl80
-DEPENDS+=		tk-8.0.5:../../x11/tk80
+DEPENDS+=		tk-8.3.2:../../x11/tk
 
 USE_IMAKE=		yes
 
@@ -28,6 +27,9 @@ post-patch:
 		done; \
 	done
 
+post-build:
+	cd ${WRKSRC}/tkXBlast && ${MAKE_ENV} ${MAKE}
+
 post-install:
 	${RM} ${PREFIX}/man/cat1/xbsndsrv.0
 
diff --git a/games/xblast/files/patch-sum b/games/xblast/files/patch-sum
index 16d5ddcafb7..19faf9f4a7a 100644
--- a/games/xblast/files/patch-sum
+++ b/games/xblast/files/patch-sum
@@ -1,9 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:00 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/31 17:26:15 jwise Exp $
 
 MD5 (patch-aa) = 1221735ed449f5be25a65fd205a4552a
 MD5 (patch-ab) = b440d2eb1a5464b66099775e56086305
 MD5 (patch-ac) = 1670c6c72c0973777a5d1c60d71cc732
 MD5 (patch-ad) = a8815217485b35db8bf8e1f751bce859
-MD5 (patch-ae) = a2cdac9035aa95d1dc58c818916c3855
-MD5 (patch-af) = d64213d51d5c3aedd6e6ea342aaea1e8
-MD5 (patch-ag) = 2c66197332f36bf91cb14612bfd0a45f
+MD5 (patch-ae) = 5619fcfd478e26401c0335e32f597954
+MD5 (patch-ag) = 9c64a1182b60675f297d4d8996b386d8
diff --git a/games/xblast/patches/patch-ae b/games/xblast/patches/patch-ae
index dcd4d8ddb6c..634a586b548 100644
--- a/games/xblast/patches/patch-ae
+++ b/games/xblast/patches/patch-ae
@@ -1,6 +1,6 @@
-$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
+$NetBSD: patch-ae,v 1.2 2000/08/31 17:26:15 jwise Exp $
+--- tkXBlast/Imakefile.orig	Wed Dec 11 16:14:49 1996
++++ tkXBlast/Imakefile	Wed Aug 30 15:08:48 2000
 @@ -11,7 +11,7 @@
  /*
   * XBlast directories
@@ -10,3 +10,12 @@ $NetBSD: patch-ae,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
  TKXBLASTDIR=$(XBLASTDIR)/tkXBlast
  TKXBLAST=tkXBlast
  
+@@ -22,7 +22,7 @@
+  * rules to build valid tkXBlast script
+  */
+ $(TKXBLAST): tkXBlast.tcl
+-	./setup $(LIBDIR) $(BINDIR) $(TKXBLASTDIR) 
++	./setup $(LIBDIR) $(PREFIX)/bin $(TKXBLASTDIR) $(LOCALBASE)/bin
+ InstallNamedProg($(TKXBLAST),$(TKXBLAST),$(BINDIR))
+ InstallManPage($(TKXBLAST),$(MANDIR))
+ 
diff --git a/games/xblast/patches/patch-af b/games/xblast/patches/patch-af
deleted file mode 100644
index 847526c15ee..00000000000
--- a/games/xblast/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$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
index af41576f286..9a749b85ecb 100644
--- a/games/xblast/patches/patch-ag
+++ b/games/xblast/patches/patch-ag
@@ -1,9 +1,11 @@
-$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 @@
+$NetBSD: patch-ag,v 1.2 2000/08/31 17:26:15 jwise Exp $
+--- tkXBlast/setup.tcl.orig	Wed Dec 11 16:26:43 1996
++++ tkXBlast/setup.tcl	Thu Aug 31 13:02:19 2000
+@@ -47,20 +47,9 @@
+ set libPath [lindex $argv 0]
  set binPath [lindex $argv 1]
  set tkLibPath [lindex $argv 2]
++set wishPath [lindex $argv 3]
  
 -set wishCmd [testWish wish]
 -puts "Enter the path for \"wish\" on your system (default is \"$wishCmd\"):" 
@@ -18,7 +20,7 @@ $NetBSD: patch-ag,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
 -	exit 1
 -    }
 -}
-+set wishCmd [testWish wish8.0]
++set wishCmd [file join $wishPath wish]
  
  set version [versionWish $wishCmd]
  puts "tk version is $version"
diff --git a/games/xblast/pkg/PLIST b/games/xblast/pkg/PLIST
index 15d16d74f3c..2c34003c512 100644
--- a/games/xblast/pkg/PLIST
+++ b/games/xblast/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 1998/11/10 08:34:54 garbled Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/31 17:26:16 jwise Exp $
 man/cat1/xblast.0
+man/cat1/tkXBlast.0
 lib/X11/app-defaults/XBlast
 share/xblast/bitmap/block/air_pump.pbm
 share/xblast/bitmap/block/bomb.pbm