From owner-svn-ports-all@freebsd.org  Tue Apr 25 02:23:07 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A599D4E8AD;
 Tue, 25 Apr 2017 02:23:07 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 2C24D1901;
 Tue, 25 Apr 2017 02:23:07 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3P2N6jA005943;
 Tue, 25 Apr 2017 02:23:06 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3P2N6Uq005942;
 Tue, 25 Apr 2017 02:23:06 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201704250223.v3P2N6Uq005942@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 25 Apr 2017 02:23:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r439352 - head/databases/libcouchbase/files
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Apr 2017 02:23:07 -0000

Author: danfe
Date: Tue Apr 25 02:23:06 2017
New Revision: 439352
URL: https://svnweb.freebsd.org/changeset/ports/439352

Log:
  Do not pass `-f' when removing temporary directory: it is not needed,
  and rm(1) command call looks safer without it.

Modified:
  head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl

Modified: head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl
==============================================================================
--- head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl	Tue Apr 25 02:13:34 2017	(r439351)
+++ head/databases/libcouchbase/files/patch-cmake_dtrace-instr-link.pl	Tue Apr 25 02:23:06 2017	(r439352)
@@ -16,7 +16,7 @@
 +# Copy .o files to a temporary location before DTrace messes with them
 +chomp(my $tmpdir = `mktemp -d -t $$`);
 +if (system("tar cf - @O_FILES | tar xf - -C $tmpdir") != 0) {
-+    system("rm -rf $tmpdir");
++    system("rm -r $tmpdir");
 +    exit(1);
 +}
 +
@@ -38,7 +38,7 @@
  
  print "$HDR: Creating instrumented DTrace object: @args";
  if (system(@args) != 0) {
-+    system("rm -rf $tmpdir");
++    system("rm -r $tmpdir");
      exit(1);
  }
  
@@ -47,5 +47,5 @@
  print "$HDR: Linking with instrumented DTrace object: @ARGV";
 -exit(system(@ARGV));
 +my $rc = system(@ARGV);
-+system("rm -rf $tmpdir");
++system("rm -r $tmpdir");
 +exit($rc);