From owner-svn-ports-all@freebsd.org Mon Mar 16 20:01:56 2020 Return-Path: Delivered-To: svn-ports-all@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 6CD0726E287; Mon, 16 Mar 2020 20:01:56 +0000 (UTC) (envelope-from swills@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 48h6dc2GS4z47ty; Mon, 16 Mar 2020 20:01:56 +0000 (UTC) (envelope-from swills@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 462E225BE0; Mon, 16 Mar 2020 20:01:56 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02GK1uVA038850; Mon, 16 Mar 2020 20:01:56 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02GK1usN038849; Mon, 16 Mar 2020 20:01:56 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202003162001.02GK1usN038849@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 16 Mar 2020 20:01:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528543 - head/devel/ocaml-lacaml/files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: head/devel/ocaml-lacaml/files X-SVN-Commit-Revision: 528543 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.29 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: Mon, 16 Mar 2020 20:01:56 -0000 Author: swills Date: Mon Mar 16 20:01:55 2020 New Revision: 528543 URL: https://svnweb.freebsd.org/changeset/ports/528543 Log: devel/ocaml-lacaml: fix patch to make REINPLACE_CMD effective Modified: head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml (contents, props changed) Modified: head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml ============================================================================== --- head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml Mon Mar 16 19:59:27 2020 (r528542) +++ head/devel/ocaml-lacaml/files/patch-myocamlbuild.ml Mon Mar 16 20:01:55 2020 (r528543) @@ -5,14 +5,14 @@ [ (OASISExpr.EBool true, - S [A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]); -+ S [A "-cclib"; A "-L/usr/local/lib"; A "-cclib"; A "-lblas"; A "-cclib"; A "-llapack"]); ++ S [A "-cclib"; A "-L%%LOCALBASE%%/lib"; A "-cclib"; A "%%BLASLIB%%"; A "-cclib"; A "%%LAPACKLIB%%"]); (OASISExpr.ETest ("system", "macosx"), S [A "-cclib"; A "-framework"; A "-cclib"; A "Accelerate"]) ]); (["oasis_library_lacaml_cclib"; "ocamlmklib"; "c"], [ - (OASISExpr.EBool true, S [A "-lblas"; A "-llapack"]); -+ (OASISExpr.EBool true, S [A "-L/usr/local/lib"; A "-lblas"; A "-llapack"]); ++ (OASISExpr.EBool true, S [A "-L%%LOCALBASE%%/lib"; A "%%BLASLIB%%"; A "%%LAPACKLIB%%"]); (OASISExpr.ETest ("system", "macosx"), S [A "-framework"; A "Accelerate"]) ])