audio/linux-f10-alsa-lib: Use OSS plugin by default

This patch makes alsa work by default with OSS plugin, similar to
audio/alsa-lib.  Uses system asound.conf now (f10 and c6), v1.1

  - fixes aplay(1) from non-existent audio/linux-f10-alsa-utils
  - fixes HTML5 audio for www/linux-firefox (when USE_LINUX=f10)

untested:
  - if non-existent "Open Sound System" plugin graciously falls back to
    default plugin if present in application configuration
  - if audio capture works the same in net-im/skype
  - if audio capture works the same in www/linux-*-flashplugin11
  - webcam

PR:		169896
Submitted by:	Jan Beich
Approved by:	maintainer timeout (16 months?)

5 files changed, 3 insertions, 58 deletions

diff --git a/audio/linux-f10-alsa-plugins-oss/Makefile b/audio/linux-f10-alsa-plugins-oss/Makefile
index 2b01183807b0..3d337df612f5 100644
--- a/audio/linux-f10-alsa-plugins-oss/Makefile
+++ b/audio/linux-f10-alsa-plugins-oss/Makefile
@@ -18,13 +18,8 @@ RPMVERSION=	3.fc10
 SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes
 
-CONF_FILE=	etc/alsa/pcm/pcm-oss.conf
-
-post-patch:
-	@${RM} ${WRKSRC}/${CONF_FILE}.orig
-	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
-
-post-install:
-	${MV} ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE}.sample
+# We will use native configuration file, so delete a linux one
+post-extract:
+	@${RM} -r ${WRKSRC}/etc
 
 .include <bsd.port.mk>
diff --git a/audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf b/audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf
deleted file mode 100644
index ca58f1b46e34..000000000000
--- a/audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf
+++ /dev/null
@@ -1,14 +0,0 @@
---- etc/alsa/pcm/pcm-oss.conf.orig	2010-03-23 10:56:41.000000000 +0900
-+++ etc/alsa/pcm/pcm-oss.conf	2010-03-23 10:57:30.000000000 +0900
-@@ -7,3 +7,11 @@
- 		description "Open Sound System"
- 	}
- }
-+
-+ctl.oss {
-+	type oss
-+	device /dev/mixer
-+	hint {
-+		description "Open Sound System"
-+	}
-+}
diff --git a/audio/linux-f10-alsa-plugins-oss/pkg-deinstall b/audio/linux-f10-alsa-plugins-oss/pkg-deinstall
deleted file mode 100644
index 22b3172b23f6..000000000000
--- a/audio/linux-f10-alsa-plugins-oss/pkg-deinstall
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$2" in
-	POST-DEINSTALL)
-		conf=${PKG_PREFIX}/etc/asound.conf
-		if [ ! -f "$conf" ]; then
-			exit 1
-		fi
-		grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
-		;;
-	*)
-		exit 0
-		;;
-esac
-
-exit 0
diff --git a/audio/linux-f10-alsa-plugins-oss/pkg-install b/audio/linux-f10-alsa-plugins-oss/pkg-install
deleted file mode 100644
index b77ca3d001c3..000000000000
--- a/audio/linux-f10-alsa-plugins-oss/pkg-install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case "$2" in
-	POST-INSTALL)
-		conf=${PKG_PREFIX}/etc/asound.conf
-		if [ ! -f "$conf" ]; then
-			exit 1
-		fi
-		awk '{print $0}; /files/ { print "\t\t\t\"/etc/alsa/pcm/pcm-oss.conf\""}' <$conf >/tmp/asound.conf.new
-		mv /tmp/asound.conf.new $conf
-		exit 0
-		;;
-	*)
-		exit 0
-		;;
-esac
-
-exit 0
diff --git a/audio/linux-f10-alsa-plugins-oss/pkg-plist b/audio/linux-f10-alsa-plugins-oss/pkg-plist
index 9591870fca5b..0cc8ce6ecf39 100644
--- a/audio/linux-f10-alsa-plugins-oss/pkg-plist
+++ b/audio/linux-f10-alsa-plugins-oss/pkg-plist
@@ -1,7 +1,5 @@
-@sample etc/alsa/pcm/pcm-oss.conf.sample
 usr/lib/alsa-lib/libasound_module_ctl_oss.so
 usr/lib/alsa-lib/libasound_module_pcm_oss.so
 usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
 usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
 usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
-@unexec if [ -f %D/etc/asound.conf ]; then fgrep -v '/etc/alsa/pcm/pcm-oss.conf' <%D/etc/asound.conf >/tmp/asound.conf.new; mv /tmp/asound.conf.new %D/etc/asound.conf; fi