Update to 4.2 build 2000.

Feature safe:	yes

5 files changed, 50 insertions, 114 deletions

diff --git a/audio/oss/files/patch-cmd-ossplay-ossplay_parser.c b/audio/oss/files/patch-cmd-ossplay-ossplay_parser.c
new file mode 100644
index 000000000000..97e8579ec43f
--- /dev/null
+++ b/audio/oss/files/patch-cmd-ossplay-ossplay_parser.c
@@ -0,0 +1,11 @@
+--- cmd/ossplay/ossplay_parser.c.bak	2009-09-03 06:14:34.000000000 -0400
++++ cmd/ossplay/ossplay_parser.c	2009-09-22 15:17:49.000000000 -0400
+@@ -91,7 +91,7 @@
+     {
+       *vft = (dlopen_funcs_t *)ossplay_malloc (sizeof (dlopen_funcs_t));
+ 
+-      (*vft)->vorbisfile_handle = ossplay_dlopen ("libvorbisfile.so.3");
++      (*vft)->vorbisfile_handle = ossplay_dlopen ("libvorbisfile.so.6");
+ 
+       if ((*vft)->vorbisfile_handle == NULL)
+         {
diff --git a/audio/oss/files/patch-configure b/audio/oss/files/patch-configure
new file mode 100644
index 000000000000..40eef2cdd201
--- /dev/null
+++ b/audio/oss/files/patch-configure
@@ -0,0 +1,28 @@
+--- configure.orig	2009-08-10 13:16:21.000000000 -0400
++++ configure	2009-09-22 14:38:20.000000000 -0400
+@@ -2,7 +2,7 @@
+ 
+ CONFIGURE=YES
+ COPY_OPTIONS=
+-OSSLIBDIR="/usr/lib/oss"
++OSSLIBDIR="%%PREFIX%%/lib/oss"
+ TARGETOS=
+ 
+ unset USE_PHPMAKE
+@@ -24,11 +24,11 @@
+ 
+ unset CDPATH >/dev/null 2>&1
+ 
+-if test -f /usr/include/vorbis/vorbisfile.h || test -f /usr/local/include/vorbisfile.h
+-then
+-	OGG_SUPPORT=YES
+-	export OGG_SUPPORT
+-fi
++#if test -f /usr/include/vorbis/vorbisfile.h || test -f /usr/local/include/vorbisfile.h
++#then
++#	OGG_SUPPORT=YES
++#	export OGG_SUPPORT
++#fi
+ 
+ DIR=`pwd`
+ SRCDIR=`dirname $0`
diff --git a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
deleted file mode 100644
index 3284eab654a2..000000000000
--- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c
+++ /dev/null
@@ -1,86 +0,0 @@
---- kernel/OS/FreeBSD/os_freebsd.c.orig	2009-01-04 00:05:36.000000000 -0500
-+++ kernel/OS/FreeBSD/os_freebsd.c	2009-02-16 15:07:32.000000000 -0500
-@@ -652,7 +652,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, flags);
- #else
-   struct fileinfo * fi;
-@@ -686,7 +690,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, flags);
- #else
-   struct fileinfo * fi;
-@@ -714,7 +722,11 @@
- static int
- oss_open (struct cdev *bsd_dev, int flags, int mode, struct thread *p)
- {
-+#if __FreeBSD_version >= 800062
-+  int dev = dev2unit (bsd_dev);
-+#else
-   int dev = minor (bsd_dev);
-+#endif
-   oss_cdev_t *cdev;
-   struct fileinfo fi;
-   int tmpdev, retval;
-@@ -759,7 +771,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, flags);
- #else
-   struct fileinfo * fi;
-@@ -792,7 +808,11 @@
-   oss_cdev_t *cdev;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, mode);
- #else
-   struct fileinfo * fi;
-@@ -827,7 +847,11 @@
-   int err;
- #ifndef VDEV_SUPPORT
-   struct fileinfo _fi, * fi = &_fi;
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
-   init_fileinfo (fi, 0);
- #else
-   struct fileinfo * fi;
-@@ -870,7 +894,11 @@
-   dmap_p dmap = NULL;
-   int err;
- #ifndef VDEV_SUPPORT
-+#if __FreeBSD_version >= 800062
-+  dev = dev2unit (bsd_dev);
-+#else
-   dev = minor (bsd_dev);
-+#endif
- #else
-   struct fileinfo * fi;
-   if (oss_file_get_private ((void **)&fi)) return ENXIO;
diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
deleted file mode 100644
index 1946cbece015..000000000000
--- a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- setup/FreeBSD/oss/build/osscore.c.orig	2008-12-14 16:35:26.000000000 -0500
-+++ setup/FreeBSD/oss/build/osscore.c	2009-07-10 16:14:12.000000000 -0400
-@@ -419,20 +419,20 @@
-   if (!(flags_reg & FLAGS_ID))
-     return 0;
- 
--#define CPUID_FXSR	(1<<24)
--#define CPUID_SSE	(1<<25)
--#define CPUID_SSE2	(1<<26)
-+#define OSS_CPUID_FXSR	(1<<24)
-+#define OSS_CPUID_SSE	(1<<25)
-+#define OSS_CPUID_SSE2	(1<<26)
- 
-   cpuid (1, &eax, &ebx, &ecx, &edx);
- 
--  if (!(edx & CPUID_FXSR))
-+  if (!(edx & OSS_CPUID_FXSR))
-     return 0;
- 
-   /*
-    * Older machines require different FP handling than the latest ones. Use the SSE
-    * instruction set as an indicator.
-    */
--  if (!(edx & CPUID_SSE))
-+  if (!(edx & OSS_CPUID_SSE))
-     old_arch = 1;
- 
-   return 1;
diff --git a/audio/oss/files/patch-setup-srcconf.c b/audio/oss/files/patch-setup-srcconf.c
new file mode 100644
index 000000000000..ae52511a309b
--- /dev/null
+++ b/audio/oss/files/patch-setup-srcconf.c
@@ -0,0 +1,11 @@
+--- setup/srcconf.c.orig	2009-09-03 06:14:33.000000000 -0400
++++ setup/srcconf.c	2009-09-22 14:52:03.000000000 -0400
+@@ -195,7 +195,7 @@
+ 	{
+ 	  parms = "";
+ 	  if (getenv ("OGG_SUPPORT") != NULL)
+-	    parms = "-DOGG_SUPPORT";
++	    parms = "-DOGG_SUPPORT -I%%PREFIX%%/include";
+ 	}
+ 
+       if (strcmp (line, "project") == 0)