Make this package build on non-NetBSD platforms by using variables

defined on ossaudio.buildlink3.mk.

4 files changed, 25 insertions, 30 deletions

diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index e7e80c846f9..7c5c93cfa47 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/20 12:07:43 agc Exp $
+# $NetBSD: Makefile,v 1.29 2004/07/10 16:33:01 minskim Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp
 #
 
@@ -17,8 +17,9 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
+USE_BUILDLINK3=		yes
 WRKSRC=			${WRKDIR}/tracker
-MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
+MAKE_FLAGS=		MACHINE=${LOWER_OPSYS} CC=${CC} INSTALL="${INSTALL}" \
 		INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
 		INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
 		COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \
@@ -31,6 +32,8 @@ CONF_FILES=	${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods
 USE_MAKEINFO=	YES
 INFO_FILES=	tracker.info
 
+.include "../../mk/ossaudio.buildlink3.mk"
+
 pre-install:
 	cd ${WRKSRC}/Docs && \
 	${MAKEINFO} --no-split tracker.texinfo -o tracker.info && \
diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo
index c9c497eed56..a478eed7ee2 100644
--- a/audio/tracker/distinfo
+++ b/audio/tracker/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2004/07/10 16:11:59 minskim Exp $
+$NetBSD: distinfo,v 1.5 2004/07/10 16:33:01 minskim Exp $
 
 SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323
 Size (tracker-5.3.tgz) = 454803 bytes
-SHA1 (patch-aa) = 40ecc42387e858b9e43262f642d3abfa2caf3976
+SHA1 (patch-aa) = 9274dcc7d394638325da08b85fa57974f9d13577
 SHA1 (patch-ab) = d12637496bb73192c25a67d6eae4da1775798c4e
 SHA1 (patch-ac) = 8627c4b530957e056d791a94f935f818970f1dc0
-SHA1 (patch-ad) = a65c37143113c5eef8dae67c55f9fcdb58a31db2
+SHA1 (patch-ad) = 98bc1802a888159ea9e4d779ac781ce9865b4311
 SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b
 SHA1 (patch-af) = e159f31d04f3e1ced666197d303ff0aa39a474b6
diff --git a/audio/tracker/patches/patch-aa b/audio/tracker/patches/patch-aa
index 5e9311c9b1a..7693399d532 100644
--- a/audio/tracker/patches/patch-aa
+++ b/audio/tracker/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2004/07/10 16:11:59 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2004/07/10 16:33:01 minskim Exp $
 
---- Makefile.orig	2004-07-10 11:05:04.000000000 -0500
+--- Makefile.orig	1996-05-07 10:20:50.000000000 -0500
 +++ Makefile
 @@ -20,7 +20,7 @@ CC = gcc
  
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.4 2004/07/10 16:11:59 minskim Exp $
  SHELL_freebsd = /bin/sh
  
 +CFLAGS_netbsd = -O2 -funroll-loops -finline-functions
-+LIBS_netbsd = -lm -lossaudio
++LIBS_netbsd = -lm
 +AUDIODIR_netbsd=PCux/
 +CONFIG_netbsd = PCux/netbsd_
 +O_netbsd = .o
@@ -36,6 +36,18 @@ $NetBSD: patch-aa,v 1.4 2004/07/10 16:11:59 minskim Exp $
  CFLAGS_aix = -O
  LIBS_aix = -lm
  AUDIODIR_aix = Aix/
+@@ -220,9 +229,9 @@ EXE_sbos2 = .exe
+ UI_sbos2 = OS2/./
+ SHELL_sbos2 = /bin/sh
+ 
+-CFLAGS = $(CFLAGS_${MACHINE})
++CFLAGS = $(CFLAGS_${MACHINE}) -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
+ COPTS = $(OPTS) $(CFLAGS)
+-LIBS = $(LIBS_${MACHINE})
++LIBS = $(LIBS_${MACHINE}) ${LIBOSSAUDIO}
+ CONFIG = Arch/$(CONFIG_${MACHINE})
+ AUDIODIR = Arch/$(AUDIODIR_${MACHINE})
+ AUDIONAME = $(AUDIONAME_${MACHINE})
 @@ -250,7 +259,7 @@ OBJ_SPLITMOD = split$O time$O st_read$O 
  display$O prefs$O autoinit$O $(UI)ui$O empty$O color$O version$O \
  st_virt$O automaton$O
@@ -57,4 +69,3 @@ $NetBSD: patch-aa,v 1.4 2004/07/10 16:11:59 minskim Exp $
  
  # no manpage available, use the texinfo manual.
  install.man:
--
diff --git a/audio/tracker/patches/patch-ad b/audio/tracker/patches/patch-ad
index 64239bb9758..aea6e6dd452 100644
--- a/audio/tracker/patches/patch-ad
+++ b/audio/tracker/patches/patch-ad
@@ -1,32 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2004/07/10 16:11:59 minskim Exp $
+$NetBSD: patch-ad,v 1.4 2004/07/10 16:33:01 minskim Exp $
 
 --- ../../work/tracker/Arch/PCux/audio.c.orig	2004-07-10 11:05:07.000000000 -0500
 +++ ../../work/tracker/Arch/PCux/audio.c
-@@ -28,10 +28,18 @@ struct options_set *port_options=0;
- #include "/usr/src/linux/drivers/sound/soundcard.h"
- #else
- #ifndef __FreeBSD__
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#define DEV "/dev/audio"
-+#else
- /*	This should be sys/soundcard.h	*/
- #include <sys/soundcard.h>
-+#define DEV "/dev/dsp"
-+#endif
- #else
- #include <machine/soundcard.h>
-+#define DEV "/dev/dsp"
- #endif
- #endif
- 
 @@ -53,7 +61,7 @@ unsigned long open_audio(unsigned long f
  	int buf_max;
  	unsigned long possible, current;
  
 -   audio = open("/dev/dsp", O_WRONLY, 0);
-+   audio = open(DEV, O_WRONLY, 0);
++   audio = open(DEVOSSAUDIO, O_WRONLY, 0);
     if (audio == -1)
  		end_all("Error opening audio device");