From owner-svn-ports-head@freebsd.org Thu Nov 15 06:10:04 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57A981126F2B; Thu, 15 Nov 2018 06:10:04 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C4167845B8; Thu, 15 Nov 2018 06:10:03 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4D462464; Thu, 15 Nov 2018 06:10:03 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAF6A3PQ035858; Thu, 15 Nov 2018 06:10:03 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAF6A34S035857; Thu, 15 Nov 2018 06:10:03 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811150610.wAF6A34S035857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Thu, 15 Nov 2018 06:10:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485002 - head/devel/liblas X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/devel/liblas X-SVN-Commit-Revision: 485002 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C4167845B8 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.10)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 15 Nov 2018 06:10:04 -0000 Author: tobik Date: Thu Nov 15 06:10:03 2018 New Revision: 485002 URL: https://svnweb.freebsd.org/changeset/ports/485002 Log: devel/liblas: Remove conflict with liblas12 The conflict was solved in ports r467861 by suffixing all files installed by liblas12 with 12. PR: 227985 Submitted by: rhurlin@gwdg.de (maintainer of liblas12) Approved by: wen (maintainer timeout, 6 months) Modified: head/devel/liblas/Makefile Modified: head/devel/liblas/Makefile ============================================================================== --- head/devel/liblas/Makefile Thu Nov 15 04:23:38 2018 (r485001) +++ head/devel/liblas/Makefile Thu Nov 15 06:10:03 2018 (r485002) @@ -16,8 +16,6 @@ BROKEN_aarch64= fails to compile: file liblas/detail/ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libgeotiff.so:graphics/libgeotiff -CONFLICTS= liblas12-1.2* - PORTSCOUT= skipv:progress-20071229 USES= cmake compiler:c++11-lang libtool