From owner-svn-ports-head@freebsd.org Sat Aug 31 11:21:19 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C494DCE8A4; Sat, 31 Aug 2019 11:21:19 +0000 (UTC) (envelope-from sunpoet@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 46LDSF5TNtz4NhN; Sat, 31 Aug 2019 11:21:17 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F399180C8; Sat, 31 Aug 2019 11:21:17 +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 x7VBLHvI026100; Sat, 31 Aug 2019 11:21:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7VBLHYf026098; Sat, 31 Aug 2019 11:21:17 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201908311121.x7VBLHYf026098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 31 Aug 2019 11:21:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510377 - in head/science: eccodes grib_api X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/science: eccodes grib_api X-SVN-Commit-Revision: 510377 X-SVN-Commit-Repository: ports 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.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: Sat, 31 Aug 2019 11:21:20 -0000 Author: sunpoet Date: Sat Aug 31 11:21:16 2019 New Revision: 510377 URL: https://svnweb.freebsd.org/changeset/ports/510377 Log: Mark CONFLICTS_INSTALL between science/eccodes and science/grib_api PR: 235602 Submitted by: Robert Kruus Modified: head/science/eccodes/Makefile head/science/grib_api/Makefile Modified: head/science/eccodes/Makefile ============================================================================== --- head/science/eccodes/Makefile Sat Aug 31 11:21:11 2019 (r510376) +++ head/science/eccodes/Makefile Sat Aug 31 11:21:16 2019 (r510377) @@ -17,6 +17,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libnetcdf.so:science/netcdf \ libpng.so:graphics/png +CONFLICTS_INSTALL= grib_api + OPTIONS_DEFINE= AEC OPTIONS_SINGLE= JPEG OPTIONS_SINGLE_JPEG= JASPER OPENJPEG Modified: head/science/grib_api/Makefile ============================================================================== --- head/science/grib_api/Makefile Sat Aug 31 11:21:11 2019 (r510376) +++ head/science/grib_api/Makefile Sat Aug 31 11:21:16 2019 (r510377) @@ -18,6 +18,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libnetcdf.so:science/netcdf \ libpng.so:graphics/png +CONFLICTS_INSTALL= eccodes + OPTIONS_SINGLE= JPEG OPTIONS_SINGLE_JPEG= JASPER OPENJPEG OPTIONS_DEFAULT=OPENJPEG