From owner-svn-ports-all@FreeBSD.ORG  Sat Jun 28 20:00:08 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D2BC27BF;
 Sat, 28 Jun 2014 20:00:08 +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 BFEA4234A;
 Sat, 28 Jun 2014 20:00:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5SK08Du043598;
 Sat, 28 Jun 2014 20:00:08 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5SK08Vw043597;
 Sat, 28 Jun 2014 20:00:08 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201406282000.s5SK08Vw043597@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 28 Jun 2014 20:00:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359711 - head/sysutils/cdrtools
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
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2014 20:00:08 -0000

Author: miwi
Date: Sat Jun 28 20:00:08 2014
New Revision: 359711
URL: http://svnweb.freebsd.org/changeset/ports/359711
QAT: https://qat.redports.org/buildarchive/r359711/

Log:
  - Fix build with Q/A tests

Modified:
  head/sysutils/cdrtools/pkg-plist

Modified: head/sysutils/cdrtools/pkg-plist
==============================================================================
--- head/sysutils/cdrtools/pkg-plist	Sat Jun 28 18:30:41 2014	(r359710)
+++ head/sysutils/cdrtools/pkg-plist	Sat Jun 28 20:00:08 2014	(r359711)
@@ -73,12 +73,8 @@ man/man8/mkisofs.8.gz
 @dirrm lib/siconv
 %%RSCSI%%sbin/rscsi
 %%RSCSI%%@exec chmod u+s %B/%f
-@unexec if cmp -s %D/etc/cdrecord.sample %D/etc/cdrecord; then rm -f %D/etc/cdrecord; else echo "If permanently deleting this package, %D/etc/cdrecord must be removed manually."; fi
-etc/cdrecord.sample
-@exec [ -f %B/cdrecord ] || cp %B/%f %B/cdrecord
-%%RSCSI%%@unexec if cmp -s %D/etc/rscsi.sample %D/etc/rscsi; then rm -f %D/etc/rscsi; else echo "If permanently deleting this package, %D/etc/rscsi must be removed manually."; fi
-%%RSCSI%%etc/rscsi.sample
-%%RSCSI%%@exec [ -f %B/rscsi ] || cp %B/%f %B/rscsi
+@sample etc/cdrecord.sample
+%%RSCSI%%@sample etc/rscsi.sample
 %%RSCSI%%@unexec if pw usershow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, user \"rscsi\" and its homedirectory must be removed manually."; fi
 %%RSCSI%%@unexec if pw groupshow rscsi >/dev/null 2>&1; then echo "If permanently deleting this package, group \"rscsi\" must be removed manually."; fi
 %%RSCSI%%man/man1/rscsi.1.gz