6 files changed, 15 insertions, 58 deletions

diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index e090d85ce664..2937045ce2b8 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	oss
-DISTVERSION=	4.0-build1006
-PORTREVISION=	3
+DISTVERSION=	4.0-build1008
 CATEGORIES=	audio kld
 MASTER_SITES=	http://developer.opensound.com/sources/stable/
 DISTNAME=	${PORTNAME}-v${DISTVERSION}-src-cddl
@@ -28,7 +27,7 @@ SUB_FILES=	pkg-install
 ONLY_FOR_ARCHS=	amd64 i386
 
 MAN1=		ossinfo.1 ossmix.1 ossplay.1 ossrecord.1 osstest.1 ossxmix.1
-MAN8=		ossctl.8 ossdevlinks.8 savemixer.8 ossdetect.8
+MAN8=		ossdevlinks.8 savemixer.8 ossdetect.8
 
 .if !exists(${SRC_BASE}/sys/Makefile)
 IGNORE=		requires kernel source to be installed
@@ -73,7 +72,6 @@ do-install:
 	${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_PROGRAM} ${WRKSRC}/prototype/usr/sbin/ossctl ${PREFIX}/sbin/
 	${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 6c061c45ddd0..00413980c637 100644
--- a/audio/oss/distinfo
+++ b/audio/oss/distinfo
@@ -1,3 +1,3 @@
-MD5 (oss-v4.0-build1006-src-cddl.tar.bz2) = 23b7b473bdbd8ab7598a01cf1b4fa8a8
-SHA256 (oss-v4.0-build1006-src-cddl.tar.bz2) = c6beda4aba1c50526e2faf26cee95b7a3c0b64b4c7a82cb1b958b0e0f5eec047
-SIZE (oss-v4.0-build1006-src-cddl.tar.bz2) = 1400519
+MD5 (oss-v4.0-build1008-src-cddl.tar.bz2) = 4c193547a583bc6e2ba1997cc3243a65
+SHA256 (oss-v4.0-build1008-src-cddl.tar.bz2) = e83736e0881249348076b5572b038a7ddb1ecb851e54d9f31a26426cd91f9a3b
+SIZE (oss-v4.0-build1008-src-cddl.tar.bz2) = 1305465
diff --git a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h
deleted file mode 100644
index b056c5e4942e..000000000000
--- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- kernel/OS/FreeBSD/os_freebsd.h.orig	2007-06-12 17:32:57.000000000 -0400
-+++ kernel/OS/FreeBSD/os_freebsd.h	2007-07-11 20:07:40.000000000 -0400
-@@ -16,7 +16,6 @@
-  * distribution. Please contact sales@opensound.com for further info.
-  *
-  */
--#define OS_VERSION "6"
- #define __inline__ inline
- #define __inline inline
- #define EXTERN_C extern "C"
-@@ -55,6 +54,16 @@
- #include <vm/pmap.h>
- #include <sys/selinfo.h>
- 
-+#define	__FreeBSD_version_major	((__FreeBSD_version) / 100000)
-+
-+#if (__FreeBSD_version_major == 7)
-+#define OS_VERSION	"7"
-+#elif (__FreeBSD_version_major == 6)
-+#define OS_VERSION	"6"
-+#else
-+#error Unsupported OS version
-+#endif
-+
- #undef timeout
- #define timeout oss_timeout
- #undef untimeout
diff --git a/audio/oss/files/patch-kernel-drv-audigyls-audigyls.c b/audio/oss/files/patch-kernel-drv-audigyls-audigyls.c
deleted file mode 100644
index 36ce0c03b194..000000000000
--- a/audio/oss/files/patch-kernel-drv-audigyls-audigyls.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- kernel/drv/audigyls/audigyls.c.orig	2007-08-30 18:07:30.000000000 -0400
-+++ kernel/drv/audigyls/audigyls.c	2007-09-19 12:55:02.000000000 -0400
-@@ -1577,6 +1577,7 @@
-       if (IOC_IS_OUTPUT (cmd))
- 	switch (cmd & 0xff)
- 	  {
-+	  case SOUND_MIXER_RECMASK:
- 	  case SOUND_MIXER_RECSRC:
- 	    return *arg = 0;
- 	    break;
-@@ -1596,6 +1597,7 @@
-       else
- 	switch (cmd & 0xff)	/* Return Parameter */
- 	  {
-+	  case SOUND_MIXER_RECMASK:
- 	  case SOUND_MIXER_RECSRC:
- 	    return *arg = 0;
- 	    break;
diff --git a/audio/oss/files/patch-setup-FreeBSD-build.sh b/audio/oss/files/patch-setup-FreeBSD-build.sh
index 00bd698d4d00..6316866bfbac 100644
--- a/audio/oss/files/patch-setup-FreeBSD-build.sh
+++ b/audio/oss/files/patch-setup-FreeBSD-build.sh
@@ -1,11 +1,16 @@
---- setup/FreeBSD/build.sh.orig	Fri Jun 22 15:55:18 2007
-+++ setup/FreeBSD/build.sh	Fri Jun 22 15:56:34 2007
-@@ -23,7 +23,7 @@
- mkdir prototype/usr/man/man1
- mkdir prototype/usr/man/man8
+--- setup/FreeBSD/build.sh.orig	2007-10-25 17:48:59.000000000 -0400
++++ setup/FreeBSD/build.sh	2007-10-25 17:59:18.000000000 -0400
+@@ -23,11 +23,11 @@
+ mkdir -p prototype/usr/man/man1
+ mkdir -p prototype/usr/man/man8
  
 -echo "OSSLIBDIR=/usr/lib/oss" > prototype/etc/oss.conf
 +echo "OSSLIBDIR=%%PREFIX%%/lib/oss" > prototype/etc/oss.conf
  
  cp -r $SRCDIR/setup/FreeBSD/oss prototype/usr/lib/
  cp $SRCDIR/kernel/OS/FreeBSD/wrapper/bsddefs.h prototype/usr/lib/oss/build/
+-cp $SRCDIR/include/ossddk/oss_exports.h prototype/usr/lib/oss/build/
++cp $SRCDIR/kernel/framework/include/ossddk/oss_exports.h prototype/usr/lib/oss/build/
+ 
+ cp $SRCDIR/include/soundcard.h prototype/usr/lib/oss/include/sys/
+ #cp $SRCDIR/lib/libOSSlib/midiparser.h prototype/usr/lib/oss/include/
diff --git a/audio/oss/pkg-plist b/audio/oss/pkg-plist
index 09718d22affd..7da9ebe2f4c6 100644
--- a/audio/oss/pkg-plist
+++ b/audio/oss/pkg-plist
@@ -47,7 +47,6 @@ lib/oss/modules/ymf7xx.ko
 lib/oss/version.dat
 lib/oss/sysfiles.list
 @dirrmtry lib/oss
-sbin/ossctl
 sbin/ossdetect
 sbin/ossdevlinks
 sbin/savemixer