Update to 2.10.4:

    * fixed: client segfault on some disconnects
    * fixed: server segfault after end of rated games
    * fixed: reusable server listen socket
    * added some features to XILE

Pkgsrc:

  Added xblast-mini package option to use a 480x392 window instead of the
  default 960x784 window.  Makes the window fit on an EeePC's screen :)

3 files changed, 52 insertions, 52 deletions

diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index e8da348bddc..4306bd77916 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2008/05/28 13:18:30 dsainty Exp $
+# $NetBSD: Makefile,v 1.28 2008/06/06 07:45:56 dsainty Exp $
 #
 
-DISTNAME=		xblast-2.10.2
-PKGREVISION=		1
+DISTNAME=		xblast-2.10.4
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xblast/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
@@ -19,18 +18,27 @@ COMMENT=		2-6 player kill the other guy with bombs game. A real blast!
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-sound
 CONFIGURE_ARGS+=	--enable-SMPF
-#CONFIGURE_ARGS+=	--enable-mini
 CONFIGURE_ARGS+=	--with-otherdatadir=${PREFIX}/share/xblast
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xblast
+PKG_SUPPORTED_OPTIONS=	xblast-mini
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mxblast-mini)
+# Use a 480x392 window instead of the default 960x784 window
+CONFIGURE_ARGS+=	--enable-mini
+.endif
+
 SUBST_CLASSES+=		ossaudio
 SUBST_STAGE.ossaudio=	pre-configure
-SUBST_MESSAGE.ossaudio=	"Linking ossaudio library"
+SUBST_MESSAGE.ossaudio=	Linking ossaudio library
 SUBST_FILES.ossaudio=	Makefile.in
-SUBST_SED.ossaudio=-e 's|xbsndsrv_LDFLAGS =|xbsndsrv_LDFLAGS = ${LIBOSSAUDIO}|'
+SUBST_SED.ossaudio=	-e 's|xbsndsrv_LDADD =|& ${LIBOSSAUDIO}|'
 
 SUBST_CLASSES+=		xbsndsrv
 SUBST_STAGE.xbsndsrv=	pre-configure
-SUBST_MESSAGE.xbsndsrv=	"Qualify path to xbsndsrv"
+SUBST_MESSAGE.xbsndsrv=	Qualify path to xbsndsrv
 SUBST_FILES.xbsndsrv=	x11_sound.c
 SUBST_SED.xbsndsrv=	-e 's|"xbsndsrv"|"${PREFIX}/bin/xbsndsrv"|'
 
diff --git a/games/xblast/distinfo b/games/xblast/distinfo
index 353d554a192..0ec442a4393 100644
--- a/games/xblast/distinfo
+++ b/games/xblast/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2008/05/28 12:10:26 dsainty Exp $
+$NetBSD: distinfo,v 1.7 2008/06/06 07:45:56 dsainty Exp $
 
-SHA1 (xblast-2.10.2.tar.gz) = 1ff0b26ac003aa68df964ad6a8e44505d82de5fd
-RMD160 (xblast-2.10.2.tar.gz) = b958fe9d130e1cbb13fe71119411f6ad50420f74
-Size (xblast-2.10.2.tar.gz) = 590442 bytes
 SHA1 (images-2005-01-06.tar.gz) = 3fd597a68e96c325654a3772e07528a5b0edc802
 RMD160 (images-2005-01-06.tar.gz) = 3c26c9d570002d6334389055c4651a90841f0ec8
 Size (images-2005-01-06.tar.gz) = 860830 bytes
@@ -18,4 +15,7 @@ Size (musics-2005-01-06.tar.gz) = 5317575 bytes
 SHA1 (sounds.tar.gz) = 8875628de0dda4d4f79ffe324f7e8e560c4e0471
 RMD160 (sounds.tar.gz) = 9a8e0b488f80a9e54a1492368a68ffd7d2562acc
 Size (sounds.tar.gz) = 1612625 bytes
-SHA1 (patch-ab) = a89cbe895f83c553948f0e61eb9d48a6c001a79a
+SHA1 (xblast-2.10.4.tar.gz) = 27ea96ac25a00f77dc962981970e92a90d78e8e4
+RMD160 (xblast-2.10.4.tar.gz) = c78c3ae95df366f927f95f051ef835b3243dee85
+Size (xblast-2.10.4.tar.gz) = 684965 bytes
+SHA1 (patch-ab) = 71cee479d75f92c1947992b565a3279c213fb7a3
diff --git a/games/xblast/patches/patch-ab b/games/xblast/patches/patch-ab
index 44edb6e107d..3fdce926e8f 100644
--- a/games/xblast/patches/patch-ab
+++ b/games/xblast/patches/patch-ab
@@ -1,55 +1,47 @@
-$NetBSD: patch-ab,v 1.4 2008/05/28 12:10:26 dsainty Exp $
+$NetBSD: patch-ab,v 1.5 2008/06/06 07:45:56 dsainty Exp $
 
 Purge the unnecessary complication of PID_FORMAT, and add NetBSD support.  Use
 OSS for sound for NetBSD, because the Sun support is a bit too Sun-centric.
 
---- xbsndsrv.c.orig	2005-03-09 06:27:15.000000000 +1300
-+++ xbsndsrv.c	2006-05-06 19:09:29.000000000 +1200
-@@ -44,9 +44,7 @@
- #include <sys/ioctl.h>
- #include <sys/time.h>
+--- xbsndsrv.c.orig	2008-05-29 03:32:37.000000000 +1200
++++ xbsndsrv.c	2008-05-29 03:37:13.000000000 +1200
+@@ -48,8 +48,6 @@
+ 
+ #ifdef __sun__
  
--#ifdef __sun__
 -/* format for pids on sun */
 -#define PID_FORMAT "%lu"
-+#if defined(__sun__)
  /* needed for bzero(), open()*/
  #include <strings.h>
  #include <fcntl.h>
-@@ -58,11 +56,9 @@
- #include <sys/stropts.h>
- #endif
+@@ -63,8 +61,6 @@
+ 
  #else
+ 
 -/* format for pids, non-sun */
 -#define PID_FORMAT "%u"
  /* non-sun audio includes */
--#ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <sys/soundcard.h>
- #else
- #include <linux/soundcard.h>
- #endif
-@@ -499,18 +495,18 @@
-   ptr=fopen(userPath ,"r+");
-   if(ptr==NULL){
-     ptr=fopen(userPath ,"w+");
--    sprintf(tmp, PID_FORMAT, getpid());
-+    sprintf(tmp, "%u", (unsigned int)getpid());
-     fwrite(tmp,1,strlen(tmp),ptr);
-     fclose(ptr);
-     return 0;
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ #include <sys/soundcard.h>
+@@ -550,17 +546,17 @@
+ 	ptr = fopen (userPath, "r+");
+ 	if (ptr == NULL) {
+ 		ptr = fopen (userPath, "w+");
+-		sprintf (tmp, PID_FORMAT, getpid ());
++		sprintf (tmp, "%u", (unsigned int)getpid ());
+ 		fwrite (tmp, 1, strlen (tmp), ptr);
+ 		fclose (ptr);
+ 		return 0;
  
-   }
--  fscanf(ptr, PID_FORMAT, &pid);
--  fprintf(stderr," "PID_FORMAT" \n",pid);
-+  fscanf(ptr, "%u", &pid);
-+  fprintf(stderr," %u \n", pid);
-   if(kill(pid,0)==-1 || pid<=0)
-     {
-       fseek(ptr,0,SEEK_SET);
--      sprintf(tmp, PID_FORMAT, getpid());
-+      sprintf(tmp, "%u", (unsigned int)getpid());
-       fwrite(tmp,1,strlen(tmp),ptr);
-       fclose(ptr);
-       return 0;
+ 	}
+-	fscanf (ptr, PID_FORMAT, &pid);
+-	fprintf (stderr, " " PID_FORMAT " \n", pid);
++	fscanf (ptr, "%u", &pid);
++	fprintf (stderr, " %u \n", pid);
+ 	if (kill (pid, 0) == -1 || pid <= 0) {
+ 		fseek (ptr, 0, SEEK_SET);
+-		sprintf (tmp, PID_FORMAT, getpid ());
++		sprintf (tmp, "%u", (unsigned int)getpid ());
+ 		fwrite (tmp, 1, strlen (tmp), ptr);
+ 		fclose (ptr);
+ 		return 0;