update to 2.10.0.

help and ok alek@

games/xblast/Makefile

@@ -1,27 +1,29 @@
-# $OpenBSD: Makefile,v 1.17 2004/11/28 22:41:23 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.18 2005/07/17 08:53:54 aanriot Exp $
 
 COMMENT=	"graphical multi-player real-time strategy game for X11"
 
-DISTNAME=       xblast-2.6.beta
-PKGNAME=	xblast-2.6b
+DISTNAME=       xblast-complete-sounds-2.10.0
+PKGNAME=	xblast-2.10.0
 CATEGORIES=	games
 
-# License: GPL
+HOMEPAGE=	http://xblast.sourceforge.net/
+
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext c
+WANTLIB=		c ICE m ossaudio X11
 
-# after end of beta test period:
-# MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-# MASTER_SITE_SUBDIR= games/multiplayer
-# but right now only available from:
-MASTER_SITES=   http://www.ikp.uni-koeln.de/~vogel/archive/
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xblast/}
 
-WRKDIST=	${WRKDIR}/XBlast-2.6.beta
-CONFIGURE_STYLE=imake
+USE_X11=	Yes
+WRKDIST=	${WRKDIR}/${DISTNAME:S/complete-sounds-//}
+
+CONFIGURE_STYLE=	autoconf
+AUTOCONF_VERSION=	2.59
+CONFIGURE_ENV=		LDFLAGS="-lossaudio"
+CONFIGURE_ARGS=		--enable-sound
 
 NO_REGRESS=	Yes
 

games/xblast/distinfo

@@ -1,4 +1,4 @@
-MD5 (xblast-2.6.beta.tar.gz) = 21c9a84ccbe9094ee75fc3cc9e83fbea
-RMD160 (xblast-2.6.beta.tar.gz) = cda698d9e24325449d2678ccee24dd585be36a44
-SHA1 (xblast-2.6.beta.tar.gz) = aee745c119c779588799482493aa7cfcb566f3f3
-SIZE (xblast-2.6.beta.tar.gz) = 972195
+MD5 (xblast-complete-sounds-2.10.0.tar.gz) = 3377d3532f872b44ef82b0a7f9578d5b
+RMD160 (xblast-complete-sounds-2.10.0.tar.gz) = 505c88b3389991f229d839680d18e3eebdf73dbb
+SHA1 (xblast-complete-sounds-2.10.0.tar.gz) = 08315f5709d93664b789663a5900da0fdad9c7df
+SIZE (xblast-complete-sounds-2.10.0.tar.gz) = 10377957

games/xblast/patches/patch-aa

@@ -1,34 +0,0 @@
-*** Imakefile~	Sat Nov  8 10:13:29 1997
---- Imakefile	Sat Nov  8 10:14:54 1997
-***************
-*** 16,20 ****
-   * Set SOUND_DIR to the directory, where the sounds can be found
-   */
-! EXTRA_DEFINES=-DXBLASTDIR=\"$(XBLASTDIR)\"
-  
-  /*
---- 16,21 ----
-   * Set SOUND_DIR to the directory, where the sounds can be found
-   */
-! EXTRA_DEFINES=-DXBLASTDIR=\"$(DESTDIR)$(XBLASTDIR)\" \
-! 		-DAPPLDEFFILE=\"$(DESTDIR)$(XAPPLOADDIR)/XBlast\"
-  
-  /*
-*** defaults.h~	Thu Oct 16 10:48:26 1997
---- defaults.h	Sat Nov  8 10:10:42 1997
-***************
-*** 30,34 ****
-   * file for setups and defaults
-   */
-! static char *file_appl_def   ="/usr/lib/X11/app-defaults/XBlast";
-  static char *file_setup      ="/.xblast";
-  static char *file_setup_dir  ="/.xblast-setups";
---- 30,37 ----
-   * file for setups and defaults
-   */
-! #ifndef APPLDEFFILE
-! #define APPLDEFFILE "/usr/lib/X11/app-defaults/XBlast"
-! #endif
-! static char *file_appl_def   =APPLDEFFILE;
-  static char *file_setup      ="/.xblast";
-  static char *file_setup_dir  ="/.xblast-setups";

games/xblast/patches/patch-configure_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure_in,v 1.1 2005/07/17 08:53:54 aanriot Exp $
+--- configure.in.orig	Sat Jul 16 17:54:35 2005
++++ configure.in	Sat Jul 16 17:55:30 2005
+@@ -40,7 +40,7 @@ AH_TEMPLATE([GAME_DATADIR], [for packed]
+ AC_ARG_ENABLE([admin],[  --enable-admin, data will be installed (and can be only started from) $prefix/share/XBlast-TNT/], MY_EXPAND_DIR(game_datadir, "$datadir"))
+  AC_ARG_WITH([otherdatadir],[  --with-otherdatadir=OTHERDATADIR            If you dont want that the data go to: $prefix/share/XBlast-TNT/],
+ game_datadir="$with_otherdatadir",
+-game_datadir="./")
++game_datadir="\$(PREFIX)/share/xblast")
+ 
+ dnl AC_DEFINE_UNQUOTED( [GAME_DATADIR]  , ["$game_datadir"] , ["a comment here"] )
+ datadir=$game_datadir;

games/xblast/patches/patch-xbsndsrv_c

@@ -0,0 +1,28 @@
+$OpenBSD: patch-xbsndsrv_c,v 1.1 2005/07/17 08:53:54 aanriot Exp $
+--- xbsndsrv.c.orig	Wed Jan  5 18:12:00 2005
++++ xbsndsrv.c	Sun Jul 17 10:21:04 2005
+@@ -46,8 +46,12 @@
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #else
++#ifdef __OpenBSD__
++#include <soundcard.h>
++#else
+ #include <linux/soundcard.h>
+ #endif
++#endif
+ #include <signal.h>
+ #include "snd.h"
+ 
+@@ -174,7 +178,11 @@ static struct _sound_name {
+ #define SUBSIZE          2048
+ #define FRAGSIZE         0x0004000a
+ 
++#ifdef __OpenBSD__
++#define SOUND_DEVICE "/dev/sound"
++#else
+ #define SOUND_DEVICE "/dev/dsp"
++#endif
+ #define SAMPLE_RATE     22050
+ #define SAMPLE_CHANNELS     1
+ #define SAMPLE_SIZE         8

games/xblast/pkg/DESCR

@@ -1,7 +1,7 @@
-XBlast is a multi-player arcade game for X11R5/R6. The
-game can be played with at least two players and up to 
-six players. It was inspired by the video/computer game
-Bomberman(Dynablaster), which was to my knowledge first
-programmed for NEC's PC Engine/Turbo Grafx. Other (com-
-mercial) versions of the original game exist for IBM-PC,
-Atari ST, Amiga, NES, GameBoy and Super NES.
+XBlast is a multi-player arcade game for X11R5/R6. The game can be
+played with at least two players and up to six players. It was inspired
+by the video/computer game Bomberman(Dynablaster), which was to my
+knowledge first programmed for NEC's PC Engine/Turbo Grafx. Other (com-
+mercial) versions of the original game exist for IBM-PC, Atari ST,
+Amiga, NES, GameBoy and Super NES.
+