From owner-svn-ports-head@FreeBSD.ORG Mon Oct 27 12:41:42 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D95F2167; Mon, 27 Oct 2014 12:41:42 +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 AB9B6DA; Mon, 27 Oct 2014 12:41:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9RCfgUg043989; Mon, 27 Oct 2014 12:41:42 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9RCfgpD043824; Mon, 27 Oct 2014 12:41:42 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201410271241.s9RCfgpD043824@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Mon, 27 Oct 2014 12:41:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371565 - 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Oct 2014 12:41:43 -0000 Author: xmj Date: Mon Oct 27 12:41:41 2014 New Revision: 371565 URL: https://svnweb.freebsd.org/changeset/ports/371565 QAT: https://qat.redports.org/buildarchive/r371565/ Log: audio/linux-c6-alsa-plugins-oss: fix plist issues - Fix /compat/linux/etc/alsa/pcm/pcm-oss.conf being orphaned Submitted by: antoine Differential Revision: https://reviews.freebsd.org/D985 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 Mon Oct 27 12:39:32 2014 (r371564) +++ head/audio/linux-c6-alsa-plugins-oss/Makefile Mon Oct 27 12:41:41 2014 (r371565) @@ -29,11 +29,5 @@ 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 Modified: head/audio/linux-c6-alsa-plugins-oss/pkg-plist ============================================================================== --- head/audio/linux-c6-alsa-plugins-oss/pkg-plist Mon Oct 27 12:39:32 2014 (r371564) +++ head/audio/linux-c6-alsa-plugins-oss/pkg-plist Mon Oct 27 12:41:41 2014 (r371565) @@ -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 +@sample 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