Index: files/patch-plugins-sound_oss-sound_oss_cxx
===================================================================
RCS file: /home/pcvs/ports/devel/pwlib/files/patch-plugins-sound_oss-sound_oss_cxx,v
retrieving revision 1.2
diff -u -r1.2 patch-plugins-sound_oss-sound_oss_cxx
--- files/patch-plugins-sound_oss-sound_oss_cxx	13 Apr 2008 12:43:55 -0000	1.2
+++ files/patch-plugins-sound_oss-sound_oss_cxx	12 Jul 2008 07:38:36 -0000
@@ -1,22 +1,18 @@
---- plugins/sound_oss/sound_oss.orig	2008-04-08 13:54:44.000000000 -0400
-+++ plugins/sound_oss/sound_oss.cxx	2008-04-08 13:57:40.000000000 -0400
-@@ -399,6 +399,15 @@
+--- ./plugins/sound_oss/sound_oss.cxx.orig	2007-10-19 14:22:33.000000000 +0800
++++ ./plugins/sound_oss/sound_oss.cxx	2008-07-12 15:27:26.000000000 +0800
+@@ -399,7 +399,11 @@
              PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
              // If we have not yet inserted something for this cardnum, insert it
              if (dsp.GetAt(cardnum+1) == NULL) {
 +#if defined P_FREEBSD
-+		// in FreeBSD the file name should be used via the devfs(5) and
-+		// is just "/dev/dsp0" and devfs(5) takes care of virtual channels,
-+		// like /dev/dsp0.0 /dev/dsp0.1 ...
-+		// everything else would conflict with other KDE apps using the
-+		// audio
-+		devname = devdir + "dsp0";
-+		PTRACE(1, "OSS\tCollectSoundDevices FreeBSD devname set to devfs(5) name:" << devname );
-+ #endif
++              dsp.SetAt(cardnum+1, "dsp" + numbers);
++#else
                dsp.SetAt(cardnum+1, devname);
++#endif
              }
            }
-@@ -643,6 +652,7 @@
+         }
+@@ -643,6 +647,7 @@
          arg = val = (entry.numChannels == 2) ? 1 : 0;
          if (ConvertOSError(::ioctl(os_handle, SNDCTL_DSP_STEREO, &arg)) || (arg != val)) {