- add DragonFly support and fix OSS audio for !Linux platforms

- fix 'label at end of compound statement'

5 files changed, 73 insertions, 17 deletions

diff --git a/audio/amp/distinfo b/audio/amp/distinfo
index 471121331da..52c0bbb0779 100644
--- a/audio/amp/distinfo
+++ b/audio/amp/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.5 2005/05/31 21:44:42 rillig Exp $
+$NetBSD: distinfo,v 1.6 2005/11/18 14:52:44 joerg Exp $
 
 SHA1 (amp-0.7.6.tgz) = 6c49d027754615677ad398c1eea858536ec804c2
 RMD160 (amp-0.7.6.tgz) = 34053f8a050ff3aafb2e723c283ac2aa0f4e2a67
 Size (amp-0.7.6.tgz) = 100337 bytes
 SHA1 (patch-aa) = 56696e88276b770d24b20076e780bc28798d5f8c
-SHA1 (patch-ab) = 9f14872524bb4f451e5cd8c5cc5d48f74c38c2f2
+SHA1 (patch-ab) = ebc50cdbad38f3099c633659ecb47d5b99924bc7
 SHA1 (patch-ac) = 9d63992ce148b978b2a6b5179d97e23154e18833
-SHA1 (patch-ad) = 96946cc2fb7a17ca5b7e693370224e903b0a381b
+SHA1 (patch-ad) = 2ef2d0b7c5357309c462261e2c669cc39a774add
 SHA1 (patch-ae) = c084fa45bc144c29ed7548ffc609fb964d375ac8
-SHA1 (patch-af) = d0f8561557277d6674cb956dca42b793cb63ae2c
+SHA1 (patch-af) = bba8fafa25e516df77905865a677667a9d48a152
+SHA1 (patch-ag) = 30198a34d1998630c9bea4d7d1242d3e46d099db
diff --git a/audio/amp/patches/patch-ab b/audio/amp/patches/patch-ab
index 4ec8fa71d88..37c29a1152f 100644
--- a/audio/amp/patches/patch-ab
+++ b/audio/amp/patches/patch-ab
@@ -1,8 +1,27 @@
-$NetBSD: patch-ab,v 1.3 2003/03/22 05:44:38 dillo Exp $
+$NetBSD: patch-ab,v 1.4 2005/11/18 14:52:44 joerg Exp $
 
---- audioIO.h.old	Sun Oct 26 10:57:10 1997
-+++ audioIO.h	Fri Oct 31 06:43:07 1997
-@@ -27,3 +27,7 @@
+--- audioIO.h.orig	1997-05-31 19:47:58.000000000 +0200
++++ audioIO.h
+@@ -7,12 +7,16 @@
+   #define AUSIZ 32768
+ #endif
+ 
+-#ifdef OS_Linux
++#if defined(OS_Linux) || defined(OS_BSD)
+ extern int AUSIZ;
+ #endif
+ 
++#ifdef OS_Linux
++#define DEFAULT_AUSIZ 0
++#endif
++
+ #ifdef OS_BSD
+-  #define AUSIZ 32768
++  #define DEFAULT_AUSIZ 32768
+ #endif
+ 
+ #if defined(OS_IRIX) || defined(OS_IRIX64)
+@@ -26,3 +30,7 @@ extern int AUSIZ;
  #ifdef OS_SunOS
    #define AUSIZ 4096
  #endif
diff --git a/audio/amp/patches/patch-ad b/audio/amp/patches/patch-ad
index 600f10842e9..e38021e78c6 100644
--- a/audio/amp/patches/patch-ad
+++ b/audio/amp/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2005/05/31 21:44:42 rillig Exp $
+$NetBSD: patch-ad,v 1.4 2005/11/18 14:52:44 joerg Exp $
 
---- guicontrol.c.orig	Sat Aug 23 13:30:51 1997
-+++ guicontrol.c	Tue May 31 23:42:01 2005
+--- guicontrol.c.orig	1997-08-23 11:30:51.000000000 +0000
++++ guicontrol.c
 @@ -312,6 +312,14 @@ void gui_control(void)
        if (quit_flag)
  	{
@@ -26,7 +26,15 @@ $NetBSD: patch-ad,v 1.3 2005/05/31 21:44:42 rillig Exp $
  	 
  	 if(fcntl(STDIN_FILENO, F_SETFL, flags) < 0)
  	   perror("fcntl");
-@@ -394,7 +402,7 @@ int decodeMPEG_2(int inFilefd)
+@@ -376,6 +384,7 @@ int decodeMPEG_2(int inFilefd)
+       case GETHDR_SYN: warn("oops, we're out of sync.\n");
+ 	break;
+       default: 
++	break;
+       }
+       break;
+     }
+@@ -394,7 +403,7 @@ int decodeMPEG_2(int inFilefd)
                  /* Set stdin to blocking */
                  if((flags = fcntl(STDIN_FILENO, F_GETFL, 0)) < 0)
                          perror("fcntl");
diff --git a/audio/amp/patches/patch-af b/audio/amp/patches/patch-af
index 485fe8be4c5..ac4fdfaea0e 100644
--- a/audio/amp/patches/patch-af
+++ b/audio/amp/patches/patch-af
@@ -1,13 +1,23 @@
-$NetBSD: patch-af,v 1.1 2003/03/22 05:44:38 dillo Exp $
+$NetBSD: patch-af,v 1.2 2005/11/18 14:52:44 joerg Exp $
 
---- configure.old	Sun Oct 26 11:18:18 1997
-+++ configure	Sun Oct 26 11:18:45 1997
-@@ -1398,7 +1398,7 @@
+--- configure.orig	1997-08-23 11:11:24.000000000 +0000
++++ configure
+@@ -1398,7 +1398,7 @@ case "$OS_TYPE" in
      DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
      ;;
  
 -  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD)
++  Linux|FreeBSD|NetBSD|DragonFly)
      CC="gcc"
      if test "$ARCH_TYPE" = "i486" ; then
        CFLAGS_ARCH="-m486"
+@@ -1409,6 +1409,9 @@ case "$OS_TYPE" in
+     if test "$OS_TYPE" = "FreeBSD" ; then
+       OS_TYPE="BSD"
+     fi
++    if test "$OS_TYPE" = "DragonFly" ; then
++      OS_TYPE="BSD"
++    fi
+     CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}"
+     DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" 
+     ;;
diff --git a/audio/amp/patches/patch-ag b/audio/amp/patches/patch-ag
new file mode 100644
index 00000000000..850dcc6b4dc
--- /dev/null
+++ b/audio/amp/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.1 2005/11/18 14:52:44 joerg Exp $
+
+--- audioIO_Linux.c.orig	1997-05-31 19:47:58.000000000 +0200
++++ audioIO_Linux.c
+@@ -78,7 +78,12 @@ audioOpen(int frequency, int stereo, int
+ 	if (volume != -1)
+ 		audioSetVolume(volume);
+ 
+-	if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) == -1)
++#ifdef SNDCTl_DSP_GETBLKSIZE
++	if (ioctl(audio_fd, SNDCTL_DSP_GETBLKSIZE, &AUSIZ) != -1)
++		return;
++#endif	
++	AUSIZ = DEFAULT_AUSIZ;
++	if (AUSIZ == 0)
+ 		die("Unable to get fragment size\n");
+ }
+