From owner-svn-ports-head@freebsd.org Sun Jul 31 19:13:27 2016 Return-Path: Delivered-To: svn-ports-head@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 7F4CBBAAE34; Sun, 31 Jul 2016 19:13:27 +0000 (UTC) (envelope-from pawel@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 4FD601380; Sun, 31 Jul 2016 19:13:27 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VJDQad006031; Sun, 31 Jul 2016 19:13:26 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VJDQAX006030; Sun, 31 Jul 2016 19:13:26 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201607311913.u6VJDQAX006030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 31 Jul 2016 19:13:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419408 - head/misc/lr 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.22 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: Sun, 31 Jul 2016 19:13:27 -0000 Author: pawel Date: Sun Jul 31 19:13:26 2016 New Revision: 419408 URL: https://svnweb.freebsd.org/changeset/ports/419408 Log: Register conflict with newly added sysutils/lr Modified: head/misc/lr/Makefile Modified: head/misc/lr/Makefile ============================================================================== --- head/misc/lr/Makefile Sun Jul 31 19:10:54 2016 (r419407) +++ head/misc/lr/Makefile Sun Jul 31 19:13:26 2016 (r419408) @@ -13,6 +13,8 @@ COMMENT= Lazyread can auto-scroll files USES= ncurses OPTIONS_DEFINE= DOCS +CONFLICTS_INSTALL= lrfiles-[0-9]* + .include .if exists(/usr/bin/lesspipe.sh)