Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Oct 2014 12:41:42 +0000 (UTC)
From:      Johannes Jost Meixner <xmj@FreeBSD.org>
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
Message-ID:  <201410271241.s9RCfgpD043824@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410271241.s9RCfgpD043824>