Convert to use ossaudio.buildlink3.mk to build on more platforms.

Bump PKGREVISION because the sound device path was corrected.

4 files changed, 48 insertions, 18 deletions

diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index f85da431d32..9c8318e9d8d 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/06/07 05:10:50 minskim Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/07 05:33:20 minskim Exp $
 #
 
 DISTNAME=		nighthawk-2.1
+PKGREVISION=		1
 CATEGORIES=		x11 games
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=		.tgz
@@ -19,6 +20,11 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
 MAKE_ENV+=		OSTYPE=${OPSYS}
+CPPFLAGS+=		-DPREFIX="\"${PREFIX}\"" \
+			-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
+
+.include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 
 post-build:
 	cd ${WRKSRC}/src_sound && \
@@ -39,5 +45,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/nighthawk/README
 	${INSTALL} -o ${ROOT_USER} -g games -m 664 /dev/null /var/games/nighthawk.scores
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nighthawk/distinfo b/games/nighthawk/distinfo
index e741735489e..c2741e6aa05 100644
--- a/games/nighthawk/distinfo
+++ b/games/nighthawk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/06/07 05:00:19 minskim Exp $
+$NetBSD: distinfo,v 1.7 2005/06/07 05:33:20 minskim Exp $
 
 SHA1 (nighthawk-2.1.tgz) = 117cd7d2c496a0d9e44b1b6d02523ad1cb0de1bf
 RMD160 (nighthawk-2.1.tgz) = 3973ff63c4525de65ae4dd3803d355c102968997
@@ -11,6 +11,6 @@ SHA1 (patch-ab) = c1085e131ae6f4563e966c5bed8083b1c0e24f92
 SHA1 (patch-ac) = e51ee631a604a38570328b2472f958a64e39f169
 SHA1 (patch-ad) = e59c729c4700d36ca61809e40721f88d2d22c09d
 SHA1 (patch-ae) = 1699979e5013e86dc158722faef525b46ce30076
-SHA1 (patch-ba) = c4669336ea8fdeb1352390e4109513c01915bd54
-SHA1 (patch-bb) = f1d5bfb5985fbd41c57e719c86303f714344c14f
+SHA1 (patch-ba) = 3bf82814d23305a686317ea36ff03698d65157ee
+SHA1 (patch-bb) = beb63b9e3400c774534dd8b9832cfb314bc684ff
 SHA1 (patch-bc) = 8bbcd9bd7bcde579a9b7ddb26ef60ffc05362b7e
diff --git a/games/nighthawk/patches/patch-ba b/games/nighthawk/patches/patch-ba
index 155c7f8a80e..411634a4197 100644
--- a/games/nighthawk/patches/patch-ba
+++ b/games/nighthawk/patches/patch-ba
@@ -1,19 +1,20 @@
-$NetBSD: patch-ba,v 1.2 1999/02/10 15:09:56 frueauf Exp $
+$NetBSD: patch-ba,v 1.3 2005/06/07 05:33:20 minskim Exp $
 
---- src_sound/Makefile.BAK	Sun Feb  7 02:23:38 1999
-+++ src_sound/Makefile	Sun Feb  7 02:29:38 1999
-@@ -2,8 +2,8 @@
+--- src_sound/Makefile.orig	2005-06-07 00:15:11.000000000 -0500
++++ src_sound/Makefile
+@@ -1,9 +1,8 @@
+ ############################################################################
  # nighthawk sound engine
  ############################################################################
- CC	= gcc
+-CC	= gcc
 -OPTIONS = -Wall -g -pipe -fomit-frame-pointer
 -LIB	= -lm
-+OPTIONS = -Wall -g -pipe -fomit-frame-pointer -DPREFIX=\"${PREFIX}\"
-+LIB	= -lm -lossaudio
++OPTIONS = ${CPPFLAGS} ${CFLAGS} -Wall -pipe -fomit-frame-pointer
++LIB	= -lm ${LIBOSSAUDIO}
  
  ifeq ($(OSTYPE),Linux)
    OPTIONS += -DLinux
-@@ -11,11 +11,11 @@
+@@ -11,11 +10,11 @@ else
    ifeq ($(OSTYPE),FreeBSD)
      OPTIONS += -DFreeBSD
    else
diff --git a/games/nighthawk/patches/patch-bb b/games/nighthawk/patches/patch-bb
index 3f5d4b92017..72506a4927c 100644
--- a/games/nighthawk/patches/patch-bb
+++ b/games/nighthawk/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.2 1999/02/10 15:09:56 frueauf Exp $
+$NetBSD: patch-bb,v 1.3 2005/06/07 05:33:20 minskim Exp $
 
---- src_sound/dsp_mixxer.c.BAK	Sun Feb  7 02:24:23 1999
-+++ src_sound/dsp_mixxer.c	Sun Feb  7 02:26:49 1999
+--- src_sound/dsp_mixxer.c.orig	1998-06-22 05:41:31.000000000 -0500
++++ src_sound/dsp_mixxer.c
 @@ -23,6 +23,8 @@
   #include <sys/soundcard.h>
  #elif FreeBSD
@@ -11,7 +11,7 @@ $NetBSD: patch-bb,v 1.2 1999/02/10 15:09:56 frueauf Exp $
  #endif
  #include "funktracker_defs.h"
  #include "funktracker.h"
-@@ -91,7 +93,7 @@
+@@ -91,7 +93,7 @@ void init_dsp_buffers(void)
    register int x;
  
    calc_mix_buffer(funk_info.bpm_rate);
@@ -20,7 +20,7 @@ $NetBSD: patch-bb,v 1.2 1999/02/10 15:09:56 frueauf Exp $
    for(x = 0;x < mix_buffer_size;x++)
    {
      *(left_mix_buffer + x) = 0;
-@@ -187,7 +189,7 @@
+@@ -187,7 +189,7 @@ void close_dsp(void)
  {
    if(dsp_fp != -1)
    {
@@ -29,3 +29,27 @@ $NetBSD: patch-bb,v 1.2 1999/02/10 15:09:56 frueauf Exp $
      close(dsp_fp);
    }
  }
+@@ -247,12 +249,12 @@ int open_dsp(int srate,int prec,int st)
+   if(dsp_alloc_bufs())
+   {
+     printf("Allocated dsp buffers..\n");
+-    dsp_fp = open("/dev/dsp",O_WRONLY,0);
++    dsp_fp = open(DEVOSSAUDIO,O_WRONLY,0);
+     if(dsp_fp != -1)
+     {
+       int frag;
+ 
+-      printf("Opened /dev/dsp: %d bit %s, %d Hz (%d frames @ %d bytes)\n",
++      printf("Opened " DEVOSSAUDIO ": %d bit %s, %d Hz (%d frames @ %d bytes)\n",
+         funk_info.precision,
+         funk_info.stereo == 8 ? "mono" : "stereo",
+         funk_info.sampling_rate,
+@@ -265,7 +267,7 @@ int open_dsp(int srate,int prec,int st)
+       return 1;
+     }
+     else
+-      printf("Error: Couldn't open /dev/dsp. Program aborted.\n");
++      printf("Error: Couldn't open " DEVOSSAUDIO". Program aborted.\n");
+     dsp_dealloc_bufs();
+   }
+   else