From owner-svn-ports-all@freebsd.org Tue Aug 22 16:35:26 2017 Return-Path: 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 6E769DD295D; Tue, 22 Aug 2017 16:35:26 +0000 (UTC) (envelope-from amdmi3@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 3BE9B69967; Tue, 22 Aug 2017 16:35:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7MGZPcw089770; Tue, 22 Aug 2017 16:35:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7MGZPiZ089769; Tue, 22 Aug 2017 16:35:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201708221635.v7MGZPiZ089769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 22 Aug 2017 16:35:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448546 - head/sysutils/lr X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/sysutils/lr X-SVN-Commit-Revision: 448546 X-SVN-Commit-Repository: ports 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Aug 2017 16:35:26 -0000 Author: amdmi3 Date: Tue Aug 22 16:35:25 2017 New Revision: 448546 URL: https://svnweb.freebsd.org/changeset/ports/448546 Log: - Remove conflicts on misc/lr which was renamed Approved by: portmgr blanket Modified: head/sysutils/lr/Makefile Modified: head/sysutils/lr/Makefile ============================================================================== --- head/sysutils/lr/Makefile Tue Aug 22 16:33:59 2017 (r448545) +++ head/sysutils/lr/Makefile Tue Aug 22 16:35:25 2017 (r448546) @@ -16,8 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= chneukirchen -CONFLICTS_INSTALL= lr-[0-9]* - MAKE_ARGS= CFLAGS="${CFLAGS}" \ MANDIR="${PREFIX}/man"