From ecb1b4674e65fff30d0a420d42542b0e80f2c22c Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sat, 18 Oct 2003 11:27:11 +0000
Subject: make this work on FreeBSD by setting ALL_TARGET to a sensible default
 if we don't have an override, and using sys/soundcard.h instead of
 machine/soundcard.h.

---
 audio/mpg123/Makefile.common  | 10 +++++-----
 audio/mpg123/distinfo         |  3 ++-
 audio/mpg123/patches/patch-ap | 13 +++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 audio/mpg123/patches/patch-ap

(limited to 'audio')

diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index 800a143a726..cfbc69a2af1 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2003/10/18 11:17:40 grant Exp $ -*- Makefile -*-
+# $NetBSD: Makefile.common,v 1.9 2003/10/18 11:27:11 grant Exp $ -*- Makefile -*-
 DISTNAME=	mpg123-0.59r
 MPG123_VERSION=	0.59.18
 CATEGORIES=	audio
@@ -32,7 +32,7 @@ ALL_TARGET=	linux-ppc
 .  else
 ALL_TARGET=	${LOWER_OPSYS}-${MACHINE_ARCH}
 .  endif
-.else
+.elif ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
 .    if ${OBJECT_FMT} == "ELF"
 ALL_TARGET=	netbsd-i386-elf${TARGET_SUFFIX}
@@ -47,10 +47,10 @@ ALL_TARGET=	netbsd-arm${TARGET_SUFFIX}
 .    endif # MPG123_ARM_FIXED64
 .  elif ${MACHINE_ARCH} == "m68k"
 ALL_TARGET=	netbsd-m68k${TARGET_SUFFIX}
-.  else
+.  endif
+.else
 ALL_TARGET=	${LOWER_OPSYS}${TARGET_SUFFIX}
-.  endif # MACHINE_ARCH
-.endif # OPSYS
+.endif
 
 .if defined(USE_INET6) && ${USE_INET6} == "YES"
 CPPFLAGS+=	-DINET6
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 4db5db4eada..c82c0eb0c79 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/11/28 12:24:06 markd Exp $
+$NetBSD: distinfo,v 1.15 2003/10/18 11:27:11 grant Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
@@ -19,3 +19,4 @@ SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
 SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822
 SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
 SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304
+SHA1 (patch-ap) = b35e7f6739a8b4979412793c7b3f2f7f5a9f15a7
diff --git a/audio/mpg123/patches/patch-ap b/audio/mpg123/patches/patch-ap
new file mode 100644
index 00000000000..043ae956961
--- /dev/null
+++ b/audio/mpg123/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2003/10/18 11:27:11 grant Exp $
+
+--- audio_oss.c.orig	1998-02-01 01:14:08.000000000 +1100
++++ audio_oss.c
+@@ -28,7 +28,7 @@ extern int outburst;
+ #include <sys/ioctl.h>
+ #ifdef LINUX
+ #include <linux/soundcard.h>
+-#elif defined(__bsdi__)
++#elif defined(__bsdi__) || defined(__FreeBSD__)
+ #include <sys/soundcard.h>
+ #else
+ #include <machine/soundcard.h>
-- 
cgit v1.2.3