From owner-dev-commits-ports-main@freebsd.org Sun Jun 27 09:30:51 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 12C276636B2; Sun, 27 Jun 2021 09:30:51 +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 4GCQTQ6y4kz3Qwf; Sun, 27 Jun 2021 09:30:50 +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 D76B87CD8; Sun, 27 Jun 2021 09:30:50 +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 15R9Uobg003201; Sun, 27 Jun 2021 09:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15R9UoR9003200; Sun, 27 Jun 2021 09:30:50 GMT (envelope-from git) Date: Sun, 27 Jun 2021 09:30:50 GMT Message-Id: <202106270930.15R9UoR9003200@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: 389294d2b118 - main - biology/jalview: Fix build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 389294d2b118284d007bf6a6df9b2530e4d6348a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2021 09:30:51 -0000 The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=389294d2b118284d007bf6a6df9b2530e4d6348a commit 389294d2b118284d007bf6a6df9b2530e4d6348a Author: Guangyuan Yang AuthorDate: 2021-06-27 09:30:39 +0000 Commit: Guangyuan Yang CommitDate: 2021-06-27 09:30:39 +0000 biology/jalview: Fix build When switching the build dependency from devel/gradle to devel/gradle6, the build is accidentally broken. This attempts to revert part of the change and fix build. Fixes: 55044a2200a4c42b6b653349f0a65dfca3f96f36 Approved by: lwhsu (mentor, implicit), portmgr (fix build) --- biology/jalview/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile index f3810e2415e8..b41d1b9abf27 100644 --- a/biology/jalview/Makefile +++ b/biology/jalview/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_11= gradle daemon systematically fails on 11: The message received from the daemon indicates that the daemon has disappeared. -BUILD_DEPENDS= gradle6:devel/gradle6 +BUILD_DEPENDS= gradle:devel/gradle6 USE_JAVA= yes JAVA_VERSION= 11 @@ -61,7 +61,7 @@ PLIST_FILES= bin/jalview \ ${DATADIR}/jalview.jar do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle6 \ + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \ --gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \ ${GRADLE_ARGS} --build-cache shadowJar