From owner-svn-ports-all@freebsd.org  Mon Jun  5 23:23:58 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 B9A2BB7C413;
 Mon,  5 Jun 2017 23:23:58 +0000 (UTC)
 (envelope-from sunpoet@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 7AF9E7110B;
 Mon,  5 Jun 2017 23:23:58 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v55NNvnZ062147;
 Mon, 5 Jun 2017 23:23:57 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v55NNvjI062145;
 Mon, 5 Jun 2017 23:23:57 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201706052323.v55NNvjI062145@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 5 Jun 2017 23:23:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r442693 - head/sysutils/timelimit
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: Mon, 05 Jun 2017 23:23:58 -0000

Author: sunpoet
Date: Mon Jun  5 23:23:57 2017
New Revision: 442693
URL: https://svnweb.freebsd.org/changeset/ports/442693

Log:
  Update CONFLICTS_INSTALL

Modified:
  head/sysutils/timelimit/Makefile
  head/sysutils/timelimit/pkg-descr

Modified: head/sysutils/timelimit/Makefile
==============================================================================
--- head/sysutils/timelimit/Makefile	Mon Jun  5 23:02:26 2017	(r442692)
+++ head/sysutils/timelimit/Makefile	Mon Jun  5 23:23:57 2017	(r442693)
@@ -12,7 +12,8 @@ COMMENT=	Limit the absolute execution time of a proces
 
 LICENSE=	BSD2CLAUSE
 
-CONFLICTS_INSTALL=	netpipes-[0-9]*
+# bin/timelimit man/man1/timelimit.1.gz
+CONFLICTS_INSTALL=	netpipes
 
 NO_ARCH=	yes
 USES=		tar:xz

Modified: head/sysutils/timelimit/pkg-descr
==============================================================================
--- head/sysutils/timelimit/pkg-descr	Mon Jun  5 23:02:26 2017	(r442692)
+++ head/sysutils/timelimit/pkg-descr	Mon Jun  5 23:23:57 2017	(r442693)
@@ -1,5 +1,5 @@
 timelimit executes a command and terminates the spawned process after a given
-time with a given signal.  A 'warning' signal is sent first, then, after a
+time with a given signal. A 'warning' signal is sent first, then, after a
 timeout, a 'kill' signal, similar to the way init(8) operates on shutdown.
 
 WWW: http://devel.ringlet.net/sysutils/timelimit/