Add sound support, as proposed in pkg/13899 by rxg.

Bump to 2.4nb1.
Add MESSAGE explaining that with XFree86-4.x.x, you probably need
to start xboing with -usedefcmap. Thanks to uwe for finding that out!

8 files changed, 129 insertions, 32 deletions

diff --git a/games/xboing/MESSAGE b/games/xboing/MESSAGE
new file mode 100644
index 00000000000..3ca2b648f51
--- /dev/null
+++ b/games/xboing/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/07/15 09:01:42 wiz Exp $
+
+	With XFree86-4.x.x, you probably need to start xboing with
+	the -usedefcmap option to get it to work.
+
+===========================================================================
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 5a534915af2..51e638ee99b 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:11:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/15 09:01:42 wiz Exp $
 #
 
 DISTNAME=		xboing2.4
 PKGNAME=		xboing-2.4
+PKGREVISION=		1
 CATEGORIES=		games x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=games/}
 
@@ -11,7 +12,6 @@ HOMEPAGE=		http://www.techrescue.org/xboing/
 COMMENT=		Breakout style game for X11
 
 USE_IMAKE=		YES
-USE_XPM=		YES
 
 NO_INSTALL_MANPAGES=	YES
 WRKSRC=			${WRKDIR}/xboing
@@ -21,4 +21,6 @@ post-install:
 	${CHMOD} 2755 ${X11PREFIX}/bin/xboing
 	${INSTALL_MAN} ${WRKSRC}/xboing.man ${X11PREFIX}/man/man6/xboing.6
 
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboing/PLIST b/games/xboing/PLIST
index 5ceb5b19391..111cd032cb5 100644
--- a/games/xboing/PLIST
+++ b/games/xboing/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:56:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/07/15 09:01:42 wiz Exp $
 bin/xboing
 man/man6/xboing.6
-share/xboing/problems.doc
 share/xboing/levels/demo.data
 share/xboing/levels/editor.data
 share/xboing/levels/level01.data
@@ -85,5 +84,53 @@ share/xboing/levels/level78.data
 share/xboing/levels/level79.data
 share/xboing/levels/level80.data
 share/xboing/levels/new.data
+share/xboing/problems.doc
+share/xboing/sounds/Doh1.au
+share/xboing/sounds/Doh2.au
+share/xboing/sounds/Doh3.au
+share/xboing/sounds/Doh4.au
+share/xboing/sounds/ammo.au
+share/xboing/sounds/applause.au
+share/xboing/sounds/ball2ball.au
+share/xboing/sounds/balllost.au
+share/xboing/sounds/ballshot.au
+share/xboing/sounds/boing.au
+share/xboing/sounds/bomb.au
+share/xboing/sounds/bonus.au
+share/xboing/sounds/buzzer.au
+share/xboing/sounds/click.au
+share/xboing/sounds/ddloo.au
+share/xboing/sounds/evillaugh.au
+share/xboing/sounds/game_over.au
+share/xboing/sounds/gate.au
+share/xboing/sounds/hithere.au
+share/xboing/sounds/hypspc.au
+share/xboing/sounds/intro.au
+share/xboing/sounds/key.au
+share/xboing/sounds/looksbad.au
+share/xboing/sounds/metal.au
+share/xboing/sounds/mgun.au
+share/xboing/sounds/ouch.au
+share/xboing/sounds/paddle.au
+share/xboing/sounds/ping.au
+share/xboing/sounds/shark.au
+share/xboing/sounds/shoot.au
+share/xboing/sounds/shotgun.au
+share/xboing/sounds/spring.au
+share/xboing/sounds/stamp.au
+share/xboing/sounds/sticky.au
+share/xboing/sounds/supbons.au
+share/xboing/sounds/toggle.au
+share/xboing/sounds/tone.au
+share/xboing/sounds/touch.au
+share/xboing/sounds/wallsoff.au
+share/xboing/sounds/warp.au
+share/xboing/sounds/weeek.au
+share/xboing/sounds/whizzo.au
+share/xboing/sounds/whoosh.au
+share/xboing/sounds/wzzz.au
+share/xboing/sounds/wzzz2.au
+share/xboing/sounds/youagod.au
+@dirrm share/xboing/sounds
 @dirrm share/xboing/levels
 @dirrm share/xboing
diff --git a/games/xboing/distinfo b/games/xboing/distinfo
index 0b5a27d928b..e30606c5ea7 100644
--- a/games/xboing/distinfo
+++ b/games/xboing/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:37 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/07/15 09:01:42 wiz Exp $
 
 SHA1 (xboing2.4.tar.gz) = 57fad37ab99e6a3ff87ff814d0de1baad3b93b91
 Size (xboing2.4.tar.gz) = 588811 bytes
-SHA1 (patch-aa) = 60a6e56737b8e33be805dfbc50ea5acc3ed334fc
-SHA1 (patch-ab) = cf4c2c721a84e202fd25543a6fc36c1c3a4eec02
-SHA1 (patch-ac) = bde011905eb18420c988465e06108e60f4d1c61f
+SHA1 (patch-aa) = 25dd6c91c5ffbdd28dab1b2bdbfa850955720032
+SHA1 (patch-ab) = 94b232e173ad7bb39e37d4287669bd0842ef5610
+SHA1 (patch-ac) = c8b7d1b323be04c2456768eabf24da43707c4b98
+SHA1 (patch-ad) = 1bb064fda1baebd314e0d65703e7775e9072f43b
diff --git a/games/xboing/patches/patch-aa b/games/xboing/patches/patch-aa
index da351f053db..be802ffe192 100644
--- a/games/xboing/patches/patch-aa
+++ b/games/xboing/patches/patch-aa
@@ -1,20 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2000/05/31 14:49:14 dmcmahill Exp $
---- Imakefile.orig	Thu Nov 21 18:28:46 1996
-+++ Imakefile	Mon Sep 14 16:23:07 1998
+$NetBSD: patch-aa,v 1.4 2002/07/15 09:01:43 wiz Exp $
+
+--- Imakefile.orig	Fri Nov 22 02:28:46 1996
++++ Imakefile
 @@ -24,23 +24,23 @@
  XCOMM This is the directory where the highscore, level & sound data will be 
  XCOMM placed. Default will be the current directory.
  
 -    XBOING_DIR = .
-+    XBOING_DIR = $(X11BASE)/share/xboing
++    XBOING_DIR = $(X11PREFIX)/share/xboing
  
  XCOMM These are some defines that must be set. Some may be overwritten in the
  XCOMM machine arch section.
  
 -    XPMLIB 				= -L/usr/X11/lib -lXpm
 -    XPMINCLUDE 			= -I/usr/X11/include/X11
-+    XPMLIB 			= -L$(X11BASE)/lib -lXpm
-+    XPMINCLUDE 			= -I$(X11BASE)/include/X11
++    XPMLIB 			= -L$(BUILDLINK_X11_DIR)/lib -lXpm
++    XPMINCLUDE 			= -I$(BUILDLINK_X11_DIR)/include/X11
      XBOINGINCLUDE 		= -I./include
 -    LEVEL_INSTALL_DIR 	= $(XBOING_DIR)/levels
 +    LEVEL_INSTALL_DIR 		= $(XBOING_DIR)/levels
@@ -28,10 +29,24 @@ $NetBSD: patch-aa,v 1.3 2000/05/31 14:49:14 dmcmahill Exp $
      AUDIO_INCLUDE 		=
      AUDIO_LIB 			=
 -	CDEBUGFLAGS         = -g
-+    CDEBUGFLAGS         	= -O
++    CDEBUGFLAGS         	= -O -g
  
  XCOMM Uncomment this if you want to use ANY of the AUDIO sound systems
  #define COMPILE_IN_AUDIO    
+@@ -60,11 +60,11 @@
+     AUDIO_LIB 		= -laudio
+ #endif /* HPArchitecture */
+ 
+-#if defined(LinuxArchitecture) && defined(COMPILE_IN_AUDIO)
++#if defined(NetBSDArchitecture) && defined(COMPILE_IN_AUDIO)
+     AUDIO_AVAILABLE = True
+     AUDIO_SRC 		= audio/LINUXaudio.c
+     AUDIO_INCLUDE 	=
+-    AUDIO_LIB 		= 
++    AUDIO_LIB 		= -lossaudio
+ #endif /* linux */
+ 
+ #if defined(svr4) && defined(COMPILE_IN_AUDIO)
 @@ -81,7 +81,7 @@
      AUDIO_LIB 		= -laudio
  #endif /* SGIArchitecture */
@@ -47,7 +62,7 @@ $NetBSD: patch-aa,v 1.3 2000/05/31 14:49:14 dmcmahill Exp $
          -DSOUNDS_DIR=\"$(SOUNDS_DIR)\" \
 -        -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\"
 -XCOMM   -DUSE_FLOCK=\"True\" \
-+        -DREADMEP_FILE=\"$(XBOING_DIR)/docs/problems.doc\" \
++        -DREADMEP_FILE=\"$(XBOING_DIR)/problems.doc\" \
 +        -DUSE_FLOCK=\"True\" \
  XCOMM   -DNEED_USLEEP=\"True\" \
  XCOMM   -DNO_LOCKING=\"True\" 
diff --git a/games/xboing/patches/patch-ab b/games/xboing/patches/patch-ab
index d5d710efef1..29dfe4ad3cf 100644
--- a/games/xboing/patches/patch-ab
+++ b/games/xboing/patches/patch-ab
@@ -1,10 +1,17 @@
-$NetBSD: patch-ab,v 1.1 1998/08/18 09:25:17 frueauf Exp $
+$NetBSD: patch-ab,v 1.2 2002/07/15 09:01:43 wiz Exp $
 
---- ball.c.orig	Mon Aug 17 22:31:15 1998
-+++ ball.c	Mon Aug 17 22:31:34 1998
-@@ -52,3 +52,5 @@
- #include <math.h>
-+#ifndef __NetBSD__
- #include <values.h>
+--- audio/LINUXaudio.c.orig	Fri Nov 22 02:28:33 1996
++++ audio/LINUXaudio.c
+@@ -55,7 +55,12 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <sys/ioctl.h>
++#ifdef __NetBSD__
++#include <soundcard.h>
++#else
+ #include <linux/soundcard.h>
 +#endif
- #include <xpm.h>
+ 
+ #include "include/error.h"
+ #include "include/audio.h"
diff --git a/games/xboing/patches/patch-ac b/games/xboing/patches/patch-ac
index 105908caa04..aaed5da9e3f 100644
--- a/games/xboing/patches/patch-ac
+++ b/games/xboing/patches/patch-ac
@@ -1,10 +1,14 @@
-$NetBSD: patch-ac,v 1.1 1998/08/18 09:25:18 frueauf Exp $
+$NetBSD: patch-ac,v 1.2 2002/07/15 09:01:43 wiz Exp $
 
---- highscore.c.orig	Thu Nov 21 18:28:46 1996
-+++ highscore.c	Mon Aug 17 22:40:49 1998
-@@ -56,2 +56,5 @@
- #include <file.h>
-+#ifdef __NetBSD__
-+  #include <sys/file.h>
+--- ball.c.orig	Fri Nov 22 02:28:46 1996
++++ ball.c
+@@ -50,7 +50,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
++#ifndef __NetBSD__
+ #include <values.h>
 +#endif
- #include <sys/param.h>
+ #include <xpm.h>
+ #include <X11/Xos.h>
+ 
diff --git a/games/xboing/patches/patch-ad b/games/xboing/patches/patch-ad
new file mode 100644
index 00000000000..c100e0392a6
--- /dev/null
+++ b/games/xboing/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2002/07/15 09:01:43 wiz Exp $
+
+--- highscore.c.orig	Fri Nov 22 02:28:46 1996
++++ highscore.c
+@@ -54,6 +54,9 @@
+ #include <unistd.h>
+ #include <time.h>
+ #include <file.h>
++#ifdef __NetBSD__
++  #include <sys/file.h>
++#endif
+ #include <sys/param.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>