Attachment #144609 for bug #169896

Lines 12-17 DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} Link Here

(-)audio/linux-f10-alsa-lib/Makefile (+10 lines)
12	MAINTAINER= emulation@FreeBSD.org	12	MAINTAINER= emulation@FreeBSD.org
13	COMMENT= Advanced Linux Sound Architecture libraries (Linux Fedora 10)	13	COMMENT= Advanced Linux Sound Architecture libraries (Linux Fedora 10)
14		14
		15	RUN_DEPENDS= ${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
		16
15	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*	17	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
16		18
17	ONLY_FOR_ARCHS= i386 amd64	19	ONLY_FOR_ARCHS= i386 amd64
Lines 21-24 RPMVERSION= 2.fc10 Link Here
21	BRANDELF_FILES= usr/bin/aserver	23	BRANDELF_FILES= usr/bin/aserver
22	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
23		25
		26	# We will use native configuration file, so delete a linux one
		27	post-extract:
		28	@${RM} -r ${WRKSRC}/etc
		29
		30	post-install:
		31	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
		32	@${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
		33
24	.include <bsd.port.mk>	34	.include <bsd.port.mk>





ONLY_FOR_ARCHS=	i386 amd64
USE_LINUX_RPM=	yes
NO_STAGE=	yes
USE_LINUX_APPS=	alsalib
LINUX_DIST_VER=	10
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:
	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
		${CP} -p ${PREFIX}/${CONF_FILE}-dist ${PREFIX}/${CONF_FILE} ; \
	fi
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

.include <bsd.port.mk>




--- 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"
+	}
+}




#!/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




#!/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

Lines 1-6 Link Here

(-)audio/linux-f10-alsa-plugins-oss/pkg-plist (-4 / +1 lines)
1	@unexec if cmp -s %D/etc/alsa/pcm/pcm-oss.conf-dist %D/etc/alsa/pcm/pcm-oss.conf; then rm -f %D/etc/alsa/pcm/pcm-oss.conf; fi	1	etc/alsa/pcm/pcm-oss.conf
2	etc/alsa/pcm/pcm-oss.conf-dist
3	@exec if [ ! -f %D/etc/alsa/pcm/pcm-oss.conf ] ; then cp -p %D/%F %B/pcm-oss.conf; fi
4	usr/lib/alsa-lib/libasound_module_ctl_oss.so	2	usr/lib/alsa-lib/libasound_module_ctl_oss.so
5	usr/lib/alsa-lib/libasound_module_pcm_oss.so	3	usr/lib/alsa-lib/libasound_module_pcm_oss.so
6	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING	4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
Lines 10-13 usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-o Link Here
10	@dirrmtry etc/alsa/pcm	8	@dirrmtry etc/alsa/pcm
11	@dirrmtry etc/alsa	9	@dirrmtry etc/alsa
12	@dirrmtry usr/lib/alsa-lib	10	@dirrmtry usr/lib/alsa-lib
13	@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

Lines 11-16 COMMENT= Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_ Link Here

(-)audio/linux-c6-alsa-lib/Makefile (+10 lines)
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
		14	RUN_DEPENDS= ${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
		15
14	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*	16	CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
15		17
16	BRANDELF_FILES= usr/bin/aserver	18	BRANDELF_FILES= usr/bin/aserver
Lines 21-24 USE_LINUX_RPM= yes Link Here
21	RPMVERSION= 3.el6	23	RPMVERSION= 3.el6
22	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
23		25
		26	# We will use native configuration file, so delete a linux one
		27	post-extract:
		28	@${RM} -r ${WRKSRC}/etc
		29
		30	post-install:
		31	@${MKDIR} ${STAGEDIR}${PREFIX}/etc
		32	@${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
		33
24	.include <bsd.port.mk>	34	.include <bsd.port.mk>





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:
	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
		${CP} -p ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE} ; \
	fi

.include <bsd.port.mk>




--- ./etc/alsa/pcm/pcm-oss.conf.orig	2010-11-11 02:07:08.000000000 +0200
+++ ./etc/alsa/pcm/pcm-oss.conf	2014-03-16 17:33:37.794567295 +0200
@@ -1,9 +1,17 @@
 # pcm-oss plugin configuration
 
-pcm.oss {
+pcm.!default {
 	type oss
 	device /dev/dsp
 	hint {
 		description "Open Sound System"
 	}
 }
+
+ctl.!default {
+	type oss
+	device /dev/mixer
+	hint {
+		description "Open Sound System"
+	}
+}




#!/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




#!/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

Lines 1-6 Link Here

(-)audio/linux-c6-alsa-plugins-oss/pkg-plist (-4 / +1 lines)
1	@unexec if cmp -s %D/etc/alsa/pcm/pcm-oss.conf-dist %D/etc/alsa/pcm/pcm-oss.conf; then rm -f %D/etc/alsa/pcm/pcm-oss.conf; fi	1	etc/alsa/pcm/pcm-oss.conf
2	etc/alsa/pcm/pcm-oss.conf-dist
3	@exec if [ ! -f %D/etc/alsa/pcm/pcm-oss.conf ] ; then cp -p %D/%F %B/pcm-oss.conf; fi
4	usr/lib/alsa-lib/libasound_module_ctl_oss.so	2	usr/lib/alsa-lib/libasound_module_ctl_oss.so
5	usr/lib/alsa-lib/libasound_module_pcm_oss.so	3	usr/lib/alsa-lib/libasound_module_pcm_oss.so
6	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING	4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
Lines 10-13 usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss Link Here
10	@dirrmtry etc/alsa/pcm	8	@dirrmtry etc/alsa/pcm
11	@dirrmtry etc/alsa	9	@dirrmtry etc/alsa
12	@dirrmtry usr/lib/alsa-lib	10	@dirrmtry usr/lib/alsa-lib
13	@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

Return to bug 169896

Lines 13-19 COMMENT= OSS plugin for ALSA (Linux Fedora 10) Link Here

(-)audio/linux-f10-alsa-plugins-oss/Makefile (-13 lines)
13		13
14	ONLY_FOR_ARCHS= i386 amd64	14	ONLY_FOR_ARCHS= i386 amd64
15	USE_LINUX_RPM= yes	15	USE_LINUX_RPM= yes
16	NO_STAGE= yes
17	USE_LINUX_APPS= alsalib	16	USE_LINUX_APPS= alsalib
18	LINUX_DIST_VER= 10	17	LINUX_DIST_VER= 10
19	RPMVERSION= 3.fc10	18	RPMVERSION= 3.fc10
Lines 20-35 RPMVERSION= 3.fc10 Link Here
20	SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}	19	SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22		21
23	CONF_FILE= etc/alsa/pcm/pcm-oss.conf
24
25	post-patch:
26	@${RM} ${WRKSRC}/${CONF_FILE}.orig
27	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
28
29	post-install:
30	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
31	${CP} -p ${PREFIX}/${CONF_FILE}-dist ${PREFIX}/${CONF_FILE} ; \
32	fi
33	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
34
35	.include <bsd.port.mk>	22	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf (-14 lines)
1	--- etc/alsa/pcm/pcm-oss.conf.orig 2010-03-23 10:56:41.000000000 +0900
2	+++ etc/alsa/pcm/pcm-oss.conf 2010-03-23 10:57:30.000000000 +0900
3	@@ -7,3 +7,11 @@
4	description "Open Sound System"
5	}
6	}
7	+
8	+ctl.oss {
9	+ type oss
10	+ device /dev/mixer
11	+ hint {
12	+ description "Open Sound System"
13	+ }
14	+}

Lines 1-16 Link Here

(-)audio/linux-f10-alsa-plugins-oss/pkg-deinstall (-16 lines)
1	#!/bin/sh
2
3	case "$2" in
4	POST-DEINSTALL)
5	conf=${PKG_PREFIX}/etc/asound.conf
6	if [ ! -f "$conf" ]; then
7	exit 1
8	fi
9	grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
10	;;
11	*)
12	exit 0
13	;;
14	esac
15
16	exit 0

Lines 25-39 RPMVERSION= 3.el6 Link Here

(-)audio/linux-c6-alsa-plugins-oss/Makefile (-11 lines)
25		25
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
27		27
28	CONF_FILE= etc/alsa/pcm/pcm-oss.conf
29
30	post-patch:
31	@${RM} ${WRKSRC}/${CONF_FILE}.orig
32	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
33
34	post-install:
35	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
36	${CP} -p ${STAGEDIR}${PREFIX}/${CONF_FILE}-dist ${STAGEDIR}${PREFIX}/${CONF_FILE} ; \
37	fi
38
39	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Removed Link Here

(-)audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf (-21 lines)
1	--- ./etc/alsa/pcm/pcm-oss.conf.orig 2010-11-11 02:07:08.000000000 +0200
2	+++ ./etc/alsa/pcm/pcm-oss.conf 2014-03-16 17:33:37.794567295 +0200
3	@@ -1,9 +1,17 @@
4	# pcm-oss plugin configuration
5
6	-pcm.oss {
7	+pcm.!default {
8	type oss
9	device /dev/dsp
10	hint {
11	description "Open Sound System"
12	}
13	}
14	+
15	+ctl.!default {
16	+ type oss
17	+ device /dev/mixer
18	+ hint {
19	+ description "Open Sound System"
20	+ }
21	+}

Removed Link Here

(-)audio/linux-c6-alsa-plugins-oss/pkg-deinstall (-16 lines)
1	#!/bin/sh
2
3	case "$2" in
4	POST-DEINSTALL)
5	conf=${PKG_PREFIX}/etc/asound.conf
6	if [ ! -f "$conf" ]; then
7	exit 1
8	fi
9	grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
10	;;
11	*)
12	exit 0
13	;;
14	esac
15
16	exit 0

Removed Link Here

(-)audio/linux-c6-alsa-plugins-oss/pkg-install (-18 lines)
1	#!/bin/sh
2
3	case "$2" in
4	POST-INSTALL)
5	conf=${PKG_PREFIX}/etc/asound.conf
6	if [ ! -f "$conf" ]; then
7	exit 1
8	fi
9	awk '{print $0}; /files/ { print "\t\t\t\"/etc/alsa/pcm/pcm-oss.conf\""}' <$conf >/tmp/asound.conf.new
10	mv /tmp/asound.conf.new $conf
11	exit 0
12	;;
13	*)
14	exit 0
15	;;
16	esac
17
18	exit 0