From owner-svn-ports-all@FreeBSD.ORG Tue Nov 11 14:53:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99696C7E; Tue, 11 Nov 2014 14:53:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BE91780; Tue, 11 Nov 2014 14:53:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABErk4O034945; Tue, 11 Nov 2014 14:53:46 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABErkO0034940; Tue, 11 Nov 2014 14:53:46 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201411111453.sABErkO0034940@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Tue, 11 Nov 2014 14:53:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372449 - head/audio/linux-c6-alsa-plugins-oss X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 14:53:46 -0000 Author: xmj Date: Tue Nov 11 14:53:45 2014 New Revision: 372449 URL: https://svnweb.freebsd.org/changeset/ports/372449 QAT: https://qat.redports.org/buildarchive/r372449/ Log: audio/linux-c6-alsa-plugins-oss: fix sample file - fix @sample file not being found - revert adding @dirs Reported by: bapt Differential Revision: https://reviews.freebsd.org/D1108 Approved by: swills (mentor) Modified: head/audio/linux-c6-alsa-plugins-oss/Makefile head/audio/linux-c6-alsa-plugins-oss/pkg-plist Modified: head/audio/linux-c6-alsa-plugins-oss/Makefile ============================================================================== --- head/audio/linux-c6-alsa-plugins-oss/Makefile Tue Nov 11 14:00:43 2014 (r372448) +++ head/audio/linux-c6-alsa-plugins-oss/Makefile Tue Nov 11 14:53:45 2014 (r372449) @@ -3,7 +3,7 @@ PORTNAME= alsa-plugins-oss PORTVERSION= 1.0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio linux PKGNAMEPREFIX= linux-${USE_LINUX}- @@ -30,5 +30,6 @@ CONF_FILE= etc/alsa/pcm/pcm-oss.conf post-patch: @${RM} ${WRKSRC}/${CONF_FILE}.orig + @${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}.sample .include Modified: head/audio/linux-c6-alsa-plugins-oss/pkg-plist ============================================================================== --- head/audio/linux-c6-alsa-plugins-oss/pkg-plist Tue Nov 11 14:00:43 2014 (r372448) +++ head/audio/linux-c6-alsa-plugins-oss/pkg-plist Tue Nov 11 14:53:45 2014 (r372449) @@ -1,9 +1,7 @@ -@sample etc/alsa/pcm/pcm-oss.conf +@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 -@dir etc/alsa/pcm -@dir etc/alsa