Use ossaudio.buildlink2.mk to get the right OSS library and device. Patch

provided by collver1@comcast.net in PR pkg/22174.
While here, fix build when using gcc3.

5 files changed, 38 insertions, 25 deletions

diff --git a/audio/gmodplay/Makefile b/audio/gmodplay/Makefile
index 91aa73f3cac..934bb0dd90e 100644
--- a/audio/gmodplay/Makefile
+++ b/audio/gmodplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/22 05:14:44 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/22 19:34:30 jmmv Exp $
 
 DISTNAME=	gmodplay-0.08
 PKGREVISION=	2
@@ -18,8 +18,9 @@ ONLY_FOR_PLATFORM=	*-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 
-# for libslang
-LDFLAGS+=	-lossaudio -lcurses
+# for libslang and ossaudio
+CFLAGS+=	-DAUDIO_DEV="\"\\\"$(DEVOSSAUDIO)\\\"\""
+LDFLAGS+=	${LIBOSSAUDIO} -lcurses
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gmodplay ${PREFIX}/bin/gmodplay
@@ -29,4 +30,5 @@ do-install:
 
 .include "../../devel/libslang/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmodplay/distinfo b/audio/gmodplay/distinfo
index 1ebc285c3bf..b8d06406c5c 100644
--- a/audio/gmodplay/distinfo
+++ b/audio/gmodplay/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:29 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/07/22 19:34:30 jmmv Exp $
 
 SHA1 (gmodplay-0.08.tar.gz) = fb19c21cfd08b96e5a4ef5bb802127803260c3bd
 Size (gmodplay-0.08.tar.gz) = 104056 bytes
-SHA1 (patch-aa) = fcf30254b109cc6b9d0cf5c54758421dca1be73b
+SHA1 (patch-aa) = 9017c2645ff85792f606007270ec2cbf31eca4b1
 SHA1 (patch-ab) = bb3ab618f39109d9c528770feaf1ae8516c9162f
-SHA1 (patch-ac) = 9b40f06f51d509da4a03b219209c8aa7b6f5e6a7
+SHA1 (patch-ac) = cf92a3f02d14c2670b6f29c924db67dfddbe5077
 SHA1 (patch-ad) = 3cd04b588226e2e5f2fb2c899ca6c61297a5ccbf
 SHA1 (patch-ae) = 9ecff7f878ecbcb49241d0df19291813173826e3
-SHA1 (patch-af) = 1ff33b7a6ef109e1c6505f26d2d4137ac66dcebf
+SHA1 (patch-af) = 6f5614591a9a544958ad6f4541db217da47c203b
 SHA1 (patch-ag) = a8e1e1d54ecb17dfb8fbd438b5b7a81bf73c085b
 SHA1 (patch-ah) = 44073bbefd4b48414588e15e5eb2da073b815007
diff --git a/audio/gmodplay/patches/patch-aa b/audio/gmodplay/patches/patch-aa
index baebc7e8664..113da0cbf27 100644
--- a/audio/gmodplay/patches/patch-aa
+++ b/audio/gmodplay/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/19 19:35:51 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/22 19:34:31 jmmv Exp $
 
---- cmdline/cmdline.cpp.orig	Sat Oct  3 04:29:20 1998
-+++ cmdline/cmdline.cpp	Sun Jan 28 14:00:33 2001
-@@ -213,7 +213,7 @@
+--- cmdline/cmdline.cpp.orig	1998-10-03 13:29:20.000000000 +0200
++++ cmdline/cmdline.cpp
+@@ -10,6 +10,7 @@
+ #include <slang.h>
+ #include <math.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #include <string.h>
+ 
+@@ -213,7 +214,7 @@ InitTextMode(int argc, char **argv, Play
  	char *modfile;
  
  	_player = Player;
@@ -11,7 +19,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/19 19:35:51 wiz Exp $
  	CMD_INFO(Player)->first_visible_instrument = 0;
  	CMD_INFO(Player)->last_visible_instrument = 0;
  
-@@ -415,9 +415,11 @@
+@@ -415,9 +416,11 @@ InitTextMode(int argc, char **argv, Play
  					Player->repeat = !Player->repeat;
  					goto update_info;
  				case '+':
diff --git a/audio/gmodplay/patches/patch-ac b/audio/gmodplay/patches/patch-ac
index 3076444f8b6..353fcec91b0 100644
--- a/audio/gmodplay/patches/patch-ac
+++ b/audio/gmodplay/patches/patch-ac
@@ -1,17 +1,19 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2003/07/22 19:34:31 jmmv Exp $
 
---- common/devices.cpp.orig	Mon Sep 28 14:59:27 1998
-+++ common/devices.cpp	Sun Jan 28 14:22:54 2001
-@@ -14,7 +14,7 @@
+--- common/devices.cpp.orig	1998-09-28 23:59:27.000000000 +0200
++++ common/devices.cpp
+@@ -13,8 +13,9 @@
+ #include <unistd.h>
  #include <fcntl.h>
  #include <stdio.h>
++#include <stdlib.h>
  #include <sys/ioctl.h>
 -#include <sys/soundcard.h>
 +#include <soundcard.h>
  
  #include "modplay.h"
  
-@@ -24,13 +24,26 @@
+@@ -24,13 +25,26 @@ OpenDSP(DSPInfo * DSP)
  	int val;
  
  	//DSP->fd = open(AUDIO_DEV, O_WRONLY|O_NONBLOCK);
@@ -39,7 +41,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
  	if (ioctl(DSP->fd, SNDCTL_DSP_SETFMT, &val) == -1) {
  		perror("ioctl SNDCTL_DSP_SETFMT failed");
  		exit(-1);
-@@ -76,7 +89,7 @@
+@@ -76,7 +90,7 @@ OpenDSP(DSPInfo * DSP)
  	}
  	DSP->sample_rate = val;
  
diff --git a/audio/gmodplay/patches/patch-af b/audio/gmodplay/patches/patch-af
index 2ab237669b6..977a1380713 100644
--- a/audio/gmodplay/patches/patch-af
+++ b/audio/gmodplay/patches/patch-af
@@ -1,19 +1,20 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
+$NetBSD: patch-af,v 1.2 2003/07/22 19:34:31 jmmv Exp $
 
---- common/modplay.h.orig	Sun Jan 28 11:21:12 2001
-+++ common/modplay.h	Sun Jan 28 11:21:56 2001
-@@ -12,8 +12,9 @@
+--- common/modplay.h.orig	Fri Oct  2 23:44:25 1998
++++ common/modplay.h
+@@ -12,8 +12,11 @@
  #define MODPLAY_H
  
  #include <sys/types.h>
 +#include <glib.h>
  
--#define AUDIO_DEV "/dev/dsp"
-+#define AUDIO_DEV "/dev/audio"
++#ifndef AUDIO_DEV
+ #define AUDIO_DEV "/dev/dsp"
++#endif
  #define MIXER_DEV "/dev/mixer"
  
  #define MIXER_CHANNEL SOUND_MIXER_PCM
-@@ -39,7 +40,7 @@
+@@ -39,7 +42,7 @@
  	int bits_per_sample;
  	int sample_rate;
  	bool stereo_support;