Use sun audio only on NetBSD and SunOS. Link with LIBOSSAUDIO.

Add DragonFly support.

4 files changed, 31 insertions, 10 deletions

diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 1426401f0b2..39fd681ab9b 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/11 21:22:41 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/15 19:32:44 joerg Exp $
 
 DISTNAME=	fMSX24.tar
 PKGNAME=	fmsx-2.4
@@ -19,7 +19,11 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 WRKSRC= 	${WRKDIR}/MSX
 
 .include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 USE_SUN_AUDIO?=	YES
+.else
+USE_SUN_AUDIO?=	NO
+.endif
 DEFS=		-DFontDir=\"${PREFIX:Q}/share/fmsx/\"
 DEFS+=		-DRomDir=\"${PREFIX:Q}/share/fmsx/\"
 DEFS+=		-DMITSHM -D${CUR_DEPTH} -DSOUND
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
index e280f32b926..713d2f58976 100644
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/01/15 19:32:44 joerg Exp $
 
 SHA1 (fMSX24.tar.Z) = ea44eb273b9532ad0fb388e5ffbebdf348d00467
 RMD160 (fMSX24.tar.Z) = 1df5673271ed354ccc6ee720ad06ccbb07e60a91
 Size (fMSX24.tar.Z) = 506755 bytes
-SHA1 (patch-aa) = ef2c0ce0039633afa1df7b0118a5159f1bb547f4
-SHA1 (patch-ab) = d59c7bb5d709ae1d125c642990f8f7c7191f0fd5
+SHA1 (patch-aa) = 07ee581d3dc3aab51a311c7504c2616f39e3409b
+SHA1 (patch-ab) = 58d44910dbae52ebecb42854f477f32b7a75e20b
 SHA1 (patch-ac) = 884f137a757be514a87005c82f2f3a0c4031190d
 SHA1 (patch-ad) = 8d0db8cc68283e1a98e355672db4cb7ca0de42e9
diff --git a/emulators/fmsx/patches/patch-aa b/emulators/fmsx/patches/patch-aa
index 7f4acf63670..6592bf5789e 100644
--- a/emulators/fmsx/patches/patch-aa
+++ b/emulators/fmsx/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/06/03 17:34:57 kei Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/15 19:32:44 joerg Exp $
 
 --- Makefile.orig	Mon May 14 07:38:23 2001
 +++ Makefile	Sun Jun  3 04:48:12 2001
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/03 17:34:57 kei Exp $
 +.if defined(USE_SUN_AUDIO)
 +	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lXext -lX11
 +.else
-+	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lossaudio -lXext -lX11
++	${CC} ${CFLAGS} -o fmsx ${OBJECTS} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib ${LIBOSSAUDIO} -lXext -lX11
 +.endif
  
  # Clean up.
diff --git a/emulators/fmsx/patches/patch-ab b/emulators/fmsx/patches/patch-ab
index c030c4e6c35..8914b46b7a6 100644
--- a/emulators/fmsx/patches/patch-ab
+++ b/emulators/fmsx/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2001/06/03 17:34:58 kei Exp $
+$NetBSD: patch-ab,v 1.4 2006/01/15 19:32:44 joerg Exp $
 
---- SndUnix.c.orig	Thu Mar  8 04:15:16 2001
-+++ SndUnix.c	Sun Jun  3 10:10:59 2001
+--- SndUnix.c.orig	2001-03-07 19:15:16.000000000 +0000
++++ SndUnix.c
 @@ -31,7 +31,9 @@
  
  #include <sys/audioio.h>
@@ -12,7 +12,24 @@ $NetBSD: patch-ab,v 1.3 2001/06/03 17:34:58 kei Exp $
  
  #define AUDIO_CONV(A) (ULAW[0xFF&(128+(A))]) 
  
-@@ -236,7 +238,7 @@
+@@ -73,15 +75,11 @@ static unsigned char ULAW[256] =
+ 
+ #else /* SUN_AUDIO */
+ 
+-#ifdef __FreeBSD__
+-#include <machine/soundcard.h>
+-#endif
+- 
+ #ifdef __NetBSD__
+ #include <soundcard.h>
+ #endif
+  
+-#ifdef __linux__
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__)
+ #include <sys/soundcard.h>
+ #endif
+     
+@@ -236,7 +234,7 @@ static void SoundSignal(int SIG)
      case SIGUSR1:
        /* Suspend execution, until SIGUSR2 catched */
  #ifndef SUN_AUDIO