Attachment #126178 for bug #169896

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

(-)audio/linux-f10-alsa-lib/Makefile (+9 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 the linux one
		27	post-extract:
		28	@${RM} -r ${WRKSRC}/etc
		29
		30	post-install:
		31	@${LN} -fs ${LOCALBASE}/etc/asound.conf ${PREFIX}/etc
		32
24	.include <bsd.port.mk>	33	.include <bsd.port.mk>




SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
USE_LDCONFIG=	yes

# We will use native configuration file, so delete the linux one
post-extract:
	@${RM} -r ${WRKSRC}/etc

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




@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
etc/alsa/pcm/pcm-oss.conf-dist
@exec if [ ! -f %D/etc/alsa/pcm/pcm-oss.conf ] ; then cp -p %D/%F %B/pcm-oss.conf; fi
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
@dirrm usr/share/doc/alsa-plugins-oss-1.0.21
@dirrmtry etc/alsa/pcm
@dirrmtry etc/alsa
@dirrmtry usr/lib/alsa-lib
@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 23-38 RPMVERSION= 3.fc10 Link Here

(-)audio/linux-f10-alsa-plugins-oss/Makefile (-11 / +3 lines)
23	SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}	23	SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25		25
26	CONF_FILE= etc/alsa/pcm/pcm-oss.conf	26	# We will use native configuration file, so delete the linux one
		27	post-extract:
		28	@${RM} -r ${WRKSRC}/etc
27		29
28	post-patch:
29	@${RM} ${WRKSRC}/${CONF_FILE}.orig
30	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
31
32	post-install:
33	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
34	${CP} -p ${PREFIX}/${CONF_FILE}-dist ${PREFIX}/${CONF_FILE} ; \
35	fi
36	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
37
38	.include <bsd.port.mk>	30	.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 1-13 Link Here

(-)audio/linux-f10-alsa-plugins-oss/pkg-plist (-6 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
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	1	usr/lib/alsa-lib/libasound_module_ctl_oss.so
5	usr/lib/alsa-lib/libasound_module_pcm_oss.so	2	usr/lib/alsa-lib/libasound_module_pcm_oss.so
6	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING	3	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
7	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL	4	usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
8	usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss	5	usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
9	@dirrm usr/share/doc/alsa-plugins-oss-1.0.21	6	@dirrm usr/share/doc/alsa-plugins-oss-1.0.21
10	@dirrmtry etc/alsa/pcm
11	@dirrmtry etc/alsa
12	@dirrmtry usr/lib/alsa-lib	7	@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