Use ossaudio.buildlink3.mk to build on more platforms.

4 files changed, 17 insertions, 13 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index c1b327869ff..c30026019a4 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/01 18:13:15 minskim Exp $
 
 DISTNAME=		dap-2.1.2
 PKGREVISION=		5
@@ -26,6 +26,7 @@ do-install:
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/dap/distinfo b/audio/dap/distinfo
index 336095a4ac5..f1ae833ae94 100644
--- a/audio/dap/distinfo
+++ b/audio/dap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2002/04/17 04:45:06 fredb Exp $
+$NetBSD: distinfo,v 1.6 2005/01/01 18:13:15 minskim Exp $
 
 SHA1 (dap-2.1.2.tgz) = 42bfc1a79507fe5f5d175fd2d27a7a5264f1398b
 Size (dap-2.1.2.tgz) = 290292 bytes
-SHA1 (patch-aa) = c081de78507a3bd03ab1b8e739c1da5340d6dae8
-SHA1 (patch-ab) = 0ccf4aa10dfc059eb45f60794c10844b28c2fd1a
+SHA1 (patch-aa) = 0addbbf0c0be3065a2126c703ef1e37ee4402e8a
+SHA1 (patch-ab) = 3708354e3e5ac3681cd443bbbcbbb4b280a737c3
 SHA1 (patch-ad) = 01d6e14e7e9fffb9e16a85ddfaf60c96cb98afab
 SHA1 (patch-af) = 28d7ef813ea4147b0a2413bbfc3d9fc1bb90993c
 SHA1 (patch-ao) = 121724ac62a0879720cd8a9649676cf47a29a316
diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa
index 80457dce0ee..0a715c6ecc6 100644
--- a/audio/dap/patches/patch-aa
+++ b/audio/dap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2002/04/17 04:45:07 fredb Exp $
+$NetBSD: patch-aa,v 1.7 2005/01/01 18:13:15 minskim Exp $
 
---- main/Makefile.netbsd.orig	Mon May 22 18:07:21 2000
+--- main/Makefile.netbsd.orig	2000-05-22 18:07:21.000000000 -0500
 +++ main/Makefile.netbsd
-@@ -8,13 +8,13 @@
+@@ -8,13 +8,13 @@ AUDIO   = ../libaudio
  AUDIOF  = ../libaudiofile
  BACKDIR = ../bak/main
  HOMEDIR = $(HOME)
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.6 2002/04/17 04:45:07 fredb Exp $
 +DEBUG   = #-g3
  OPTIM   = -O1
 -LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio
-+LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -ljpeg -lXpm -lX11 -lm -lossaudio
++LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -ljpeg -lXpm -lX11 -lm ${LIBOSSAUDIO}
  
  PROGS =	DAP
  OBJS  = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
diff --git a/audio/dap/patches/patch-ab b/audio/dap/patches/patch-ab
index 2b81445452b..c871faa121f 100644
--- a/audio/dap/patches/patch-ab
+++ b/audio/dap/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.2 2000/02/29 16:57:45 scw Exp $
+$NetBSD: patch-ab,v 1.3 2005/01/01 18:13:15 minskim Exp $
 
---- sound/Makefile.netbsd.orig	Mon Nov 15 13:28:16 1999
-+++ sound/Makefile.netbsd	Fri Dec  3 21:35:18 1999
-@@ -10,7 +10,7 @@
+--- sound/Makefile.netbsd.orig	2000-05-22 18:18:15.000000000 -0500
++++ sound/Makefile.netbsd
+@@ -10,9 +10,9 @@ HOMEDIR = $(HOME)
  INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
  LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
  CCFLAGS = $(DEBUG) $(OPTIM) -DNOFORMS -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
 +DEBUG   = #-g3
  OPTIM   = -O1
- LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm -lossaudio
+-LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm -lossaudio
++LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm ${LIBOSSAUDIO}
  
+ PROGS =	SampleTest
+ OBJS  = DPSample.o DPResample.o DPMixPlay.o SampleTest.o