4 files changed, 20 insertions, 29 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index dcea0429e402..e1b139e52946 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	oss
-DISTVERSION=	4.0-build1009
+DISTVERSION=	4.0-build1012
 CATEGORIES=	audio kld
-MASTER_SITES=	http://developer.opensound.com/sources/stable/
-DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-cddl
+MASTER_SITES=	http://www.opensound.com/developer/sources/stable/bsd/
+DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-bsd
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Open Sound System
@@ -66,8 +66,8 @@ do-install:
 	-@${MKDIR} ${PREFIX}/lib/oss/logs 2>/dev/null
 	@${MKDIR} ${PREFIX}/lib/oss/modules
 	${INSTALL_KLD} ${WRKSRC}/prototype/usr/lib/oss/modules/*.ko ${PREFIX}/lib/oss/modules/
-	${INSTALL_MAN} ${WRKSRC}/prototype/usr/man/man1/*.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/prototype/usr/man/man8/*.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/prototype/usr/share/man/man1/*.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/prototype/usr/share/man/man8/*.8 ${PREFIX}/man/man8/
 	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdetect ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossdevlinks ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/prototype/usr/sbin/savemixer ${PREFIX}/sbin/
diff --git a/audio/oss/distinfo b/audio/oss/distinfo
index a2c771ad056c..460dfd3f9ea6 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,3 +1,3 @@
-MD5 (oss-v4.0-build1009-src-cddl.tar.bz2) = 71fea560909c37a32f3d275dea50c0c5
-SHA256 (oss-v4.0-build1009-src-cddl.tar.bz2) = 7ac24df0af4cefa45af31656a6347bb25f94ed89fa8aef58debc95a4e3881234
-SIZE (oss-v4.0-build1009-src-cddl.tar.bz2) = 1309912
+MD5 (oss-v4.0-build1012-src-bsd.tar.bz2) = dd09303b4b59646885ee5f575e780774
+SHA256 (oss-v4.0-build1012-src-bsd.tar.bz2) = 49bbd9a6e8b2d3815b8d030408dd1455554a5232e1c97768975078bf9d85ac67
+SIZE (oss-v4.0-build1012-src-bsd.tar.bz2) = 1273559
diff --git a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
index 72a2c7d98168..50177823fc3f 100644
--- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
+++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
@@ -1,6 +1,6 @@
---- kernel/OS/FreeBSD/os_freebsd.c.orig	2007-11-12 15:40:51.000000000 -0500
-+++ kernel/OS/FreeBSD/os_freebsd.c	2007-11-12 15:42:12.000000000 -0500
-@@ -28,6 +28,7 @@
+--- kernel/OS/FreeBSD/os_freebsd.c.orig	2008-01-04 17:47:28.000000000 -0500
++++ kernel/OS/FreeBSD/os_freebsd.c	2008-01-04 17:47:30.000000000 -0500
+@@ -21,6 +21,7 @@
  #include <sys/proc.h>
  #include <sys/sx.h>
  #include <sys/mman.h>
@@ -8,12 +8,3 @@
  #include <fs/devfs/devfs.h>
  #include <sys/poll.h>
  
-@@ -153,7 +154,7 @@
-     return 0;
- 
-   wq->flags = 0;
--  flag = msleep (wq, *mutex, PRIBIO | PCATCH, "oss", ticks);
-+  flag = msleep_spin (wq, *mutex, "oss", ticks);
- 
-   if (flag == EWOULDBLOCK)	/* Timeout */
-     {
diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
index 5f566a22d772..812441bf4df9 100644
--- a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
+++ b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
@@ -1,19 +1,19 @@
---- setup/FreeBSD/oss/build/osscore.c.orig	2007-12-11 15:01:24.000000000 -0500
-+++ setup/FreeBSD/oss/build/osscore.c	2007-12-11 15:06:33.000000000 -0500
-@@ -163,9 +163,13 @@
+--- setup/FreeBSD/oss/build/osscore.c.orig	2008-01-04 17:53:49.000000000 -0500
++++ setup/FreeBSD/oss/build/osscore.c	2008-01-04 17:55:26.000000000 -0500
+@@ -163,12 +163,12 @@
        return -EIO;
      }
  
 -  intr->irq == bus_setup_intr (osdev->dip, intr->irqres,
--			       INTR_TYPE_AV | INTR_MPSAFE, ossintr, intr,
--			       &(intr->cookie));
+-			       INTR_TYPE_AV | INTR_MPSAFE,
 +  intr->irq = bus_setup_intr (osdev->dip, intr->irqres,
 +			      INTR_TYPE_AV | INTR_MPSAFE,
-+#if __FreeBSD_version >= 700031
+ #if __FreeBSD_version >= 700031
+-			       NULL,
 +			      NULL,
-+#endif
-+			      ossintr, intr,
-+			      &(intr->cookie));
+ #endif
+-			       ossintr, intr, &(intr->cookie));
++			      ossintr, intr, &(intr->cookie));
  
    nintrs++;