Index: audio/linux-f10-alsa-lib/Makefile =================================================================== --- audio/linux-f10-alsa-lib/Makefile (revision 361601) +++ audio/linux-f10-alsa-lib/Makefile (working copy) @@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} MAINTAINER= emulation@FreeBSD.org COMMENT= Advanced Linux Sound Architecture libraries (Linux Fedora 10) +RUN_DEPENDS= ${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib + CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* ONLY_FOR_ARCHS= i386 amd64 @@ -21,4 +23,12 @@ RPMVERSION= 2.fc10 BRANDELF_FILES= usr/bin/aserver USE_LDCONFIG= yes +# We will use native configuration file, so delete a linux one +post-extract: + @${RM} -r ${WRKSRC}/etc + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc + @${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc + .include Index: audio/linux-f10-alsa-plugins-oss/Makefile =================================================================== --- audio/linux-f10-alsa-plugins-oss/Makefile (revision 361601) +++ audio/linux-f10-alsa-plugins-oss/Makefile (working copy) @@ -13,7 +13,6 @@ COMMENT= OSS plugin for ALSA (Linux Fedora 10) ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes -NO_STAGE= yes USE_LINUX_APPS= alsalib LINUX_DIST_VER= 10 RPMVERSION= 3.fc10 @@ -20,16 +19,4 @@ 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 Index: audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf =================================================================== --- audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf (revision 361601) +++ audio/linux-f10-alsa-plugins-oss/files/patch-pcm-oss.conf (working copy) @@ -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" -+ } -+} Index: audio/linux-f10-alsa-plugins-oss/pkg-deinstall =================================================================== --- audio/linux-f10-alsa-plugins-oss/pkg-deinstall (revision 361601) +++ audio/linux-f10-alsa-plugins-oss/pkg-deinstall (working copy) @@ -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 Index: audio/linux-f10-alsa-plugins-oss/pkg-install =================================================================== --- audio/linux-f10-alsa-plugins-oss/pkg-install (revision 361601) +++ audio/linux-f10-alsa-plugins-oss/pkg-install (working copy) @@ -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 Index: audio/linux-f10-alsa-plugins-oss/pkg-plist =================================================================== --- audio/linux-f10-alsa-plugins-oss/pkg-plist (revision 361601) +++ audio/linux-f10-alsa-plugins-oss/pkg-plist (working copy) @@ -1,6 +1,4 @@ -@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 +etc/alsa/pcm/pcm-oss.conf 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 @@ -10,4 +8,3 @@ usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-o @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 diff --git audio/linux-c6-alsa-lib/Makefile audio/linux-c6-alsa-lib/Makefile index 35a9d92..092dc2e 100644 --- audio/linux-c6-alsa-lib/Makefile +++ audio/linux-c6-alsa-lib/Makefile @@ -11,6 +11,8 @@ COMMENT= Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_ LICENSE= GPLv3 +RUN_DEPENDS= ${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib + CONFLICTS= linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]* BRANDELF_FILES= usr/bin/aserver @@ -21,4 +23,12 @@ USE_LINUX_RPM= yes RPMVERSION= 3.el6 USE_LDCONFIG= yes +# We will use native configuration file, so delete a linux one +post-extract: + @${RM} -r ${WRKSRC}/etc + +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc + @${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc + .include diff --git audio/linux-c6-alsa-plugins-oss/Makefile audio/linux-c6-alsa-plugins-oss/Makefile index fc2ed4c..3b9809f 100644 --- audio/linux-c6-alsa-plugins-oss/Makefile +++ audio/linux-c6-alsa-plugins-oss/Makefile @@ -25,15 +25,4 @@ RPMVERSION= 3.el6 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 diff --git audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf deleted file mode 100644 index bfb6e4e..0000000 --- audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf +++ /dev/null @@ -1,21 +0,0 @@ ---- ./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" -+ } -+} diff --git audio/linux-c6-alsa-plugins-oss/pkg-deinstall audio/linux-c6-alsa-plugins-oss/pkg-deinstall deleted file mode 100644 index 22b3172..0000000 --- audio/linux-c6-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 audio/linux-c6-alsa-plugins-oss/pkg-install audio/linux-c6-alsa-plugins-oss/pkg-install deleted file mode 100644 index b77ca3d..0000000 --- audio/linux-c6-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 audio/linux-c6-alsa-plugins-oss/pkg-plist audio/linux-c6-alsa-plugins-oss/pkg-plist index d8cbdfe..48c82e1 100644 --- audio/linux-c6-alsa-plugins-oss/pkg-plist +++ audio/linux-c6-alsa-plugins-oss/pkg-plist @@ -1,6 +1,4 @@ -@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 +etc/alsa/pcm/pcm-oss.conf 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 @@ -10,4 +8,3 @@ usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss @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