From owner-dev-commits-ports-branches@freebsd.org Wed Apr 14 16:43:59 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 285FB5E0FA1; Wed, 14 Apr 2021 16:43:59 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FL7bM0dlXz3kXV; Wed, 14 Apr 2021 16:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08D292150E; Wed, 14 Apr 2021 16:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13EGhw6u012050; Wed, 14 Apr 2021 16:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13EGhwJa012049; Wed, 14 Apr 2021 16:43:58 GMT (envelope-from git) Date: Wed, 14 Apr 2021 16:43:58 GMT Message-Id: <202104141643.13EGhwJa012049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jung-uk Kim Subject: git: 067ec283a981 - 2021Q2 - graphics/opencv: Fix JAVA option and correct Apache Ant usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 067ec283a98153d2d3de02f9465faac38ac0c561 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 16:43:59 -0000 The branch 2021Q2 has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=067ec283a98153d2d3de02f9465faac38ac0c561 commit 067ec283a98153d2d3de02f9465faac38ac0c561 Author: Jung-uk Kim AuthorDate: 2021-04-14 16:13:30 +0000 Commit: Jung-uk Kim CommitDate: 2021-04-14 16:43:24 +0000 graphics/opencv: Fix JAVA option and correct Apache Ant usage JAVA option did not work because the actual build knob was wrong. Especially, on a system where devel/apache-ant was installed, ant and java binaries were automatically detected and enabled even if the JAVA option was disabled. While I am here, fix Apache Ant usage by setteing JAVACMD variable. Without it, it may pick up java binary from JRE via javavm(1) from java/javavmwrapper. If ant script is used with java from JRE, build fails because it cannot find jar. Approved by: tcberner (maintainer) (cherry picked from commit 71117cddc9fc29c1e83c14e94c4b04179c0158d3) --- graphics/opencv/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 2f421789f279..aa417c0fe142 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -72,8 +72,11 @@ OPTIONS_SUB= yes HARDENING_CMAKE_BOOL= ENABLE_BUILD_HARDENING HARDENING_DESC= Enable hardening of the resulting binaries -JAVA_CMAKE_BOOL= BUILD_openv_java +JAVA_CMAKE_BOOL= BUILD_JAVA JAVA_BUILD_DEPENDS= ant:devel/apache-ant +JAVA_MAKE_ENV= JAVACMD=${JAVA} +JAVA_USE= JAVA=yes +JAVA_VARS= JAVA_BUILD=yes PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY}