From owner-svn-ports-head@freebsd.org Wed Mar 13 23:40:39 2019 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 C3B5C15449F2; Wed, 13 Mar 2019 23:40:39 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 67BDB75386; Wed, 13 Mar 2019 23:40:39 +0000 (UTC) (envelope-from wen@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 5609B19B73; Wed, 13 Mar 2019 23:40:39 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2DNedih040564; Wed, 13 Mar 2019 23:40:39 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2DNedhg040555; Wed, 13 Mar 2019 23:40:39 GMT (envelope-from wen@FreeBSD.org) Message-Id: <201903132340.x2DNedhg040555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Wed, 13 Mar 2019 23:40:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495667 - head/graphics/qgis X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: head/graphics/qgis X-SVN-Commit-Revision: 495667 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 67BDB75386 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Wed, 13 Mar 2019 23:40:39 -0000 Author: wen Date: Wed Mar 13 23:40:38 2019 New Revision: 495667 URL: https://svnweb.freebsd.org/changeset/ports/495667 Log: - Mark CONFLICTS_INSTALL with qgis-ltr PR: 236451 Submitted by: lbartoletti@tuxfamily.org Approved by: maintainer Modified: head/graphics/qgis/Makefile Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Wed Mar 13 23:37:10 2019 (r495666) +++ head/graphics/qgis/Makefile Wed Mar 13 23:40:38 2019 (r495667) @@ -87,6 +87,8 @@ USE_QT= 3d buildtools_build core concurrent dbus decl USE_PYQT= core gui network qml qscintilla2 sip sql svg xml webkit_run USE_LDCONFIG= yes +CONFLICTS_INSTALL= qgis-ltr + USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu}