From owner-svn-ports-head@freebsd.org Fri Dec 25 21:58:44 2020 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 7CAA44CAFA0; Fri, 25 Dec 2020 21:58:44 +0000 (UTC) (envelope-from thierry@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4D2gnJ33pVz3w91; Fri, 25 Dec 2020 21:58:44 +0000 (UTC) (envelope-from thierry@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 579E41AB3; Fri, 25 Dec 2020 21:58:44 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BPLwiOs072615; Fri, 25 Dec 2020 21:58:44 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BPLwh50072614; Fri, 25 Dec 2020 21:58:43 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202012252158.0BPLwh50072614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Fri, 25 Dec 2020 21:58:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559259 - in head/science: cgnslib xcrysden X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/science: cgnslib xcrysden X-SVN-Commit-Revision: 559259 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.34 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: Fri, 25 Dec 2020 21:58:44 -0000 Author: thierry Date: Fri Dec 25 21:58:43 2020 New Revision: 559259 URL: https://svnweb.freebsd.org/changeset/ports/559259 Log: Register a conflict. Modified: head/science/cgnslib/Makefile head/science/xcrysden/Makefile Modified: head/science/cgnslib/Makefile ============================================================================== --- head/science/cgnslib/Makefile Fri Dec 25 20:46:24 2020 (r559258) +++ head/science/cgnslib/Makefile Fri Dec 25 21:58:43 2020 (r559259) @@ -22,6 +22,8 @@ GH_PROJECT= CGNS USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes +CONFLICTS_INSTALL= xcrysden-1.* # bin/unitconv + TEST_TARGET= test FFLAGS+= -std=legacy Modified: head/science/xcrysden/Makefile ============================================================================== --- head/science/xcrysden/Makefile Fri Dec 25 20:46:24 2020 (r559258) +++ head/science/xcrysden/Makefile Fri Dec 25 21:58:43 2020 (r559259) @@ -24,6 +24,8 @@ USES= fortran gl gmake localbase:ldflags tcl tk xorg USE_GL= gl glu USE_XORG= x11 xmu +CONFLICTS_INSTALL= cgnslib-4.* # bin/unitconv + MAKE_ARGS= prefix=${STAGEDIR}${PREFIX} CFLAGS+= -fcommon # notified xcrysden ML on Sep 20, 2020