From owner-dev-commits-ports-all@freebsd.org Sun Jun 27 01:51:27 2021 Return-Path: Delivered-To: dev-commits-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 A3B8565E1A4; Sun, 27 Jun 2021 01:51:27 +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 4GCDHM4H9Fz4chC; Sun, 27 Jun 2021 01:51:27 +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 7BC0A1A13; Sun, 27 Jun 2021 01:51:27 +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 15R1pRHH092775; Sun, 27 Jun 2021 01:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15R1pRs1092774; Sun, 27 Jun 2021 01:51:27 GMT (envelope-from git) Date: Sun, 27 Jun 2021 01:51:27 GMT Message-Id: <202106270151.15R1pRs1092774@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: 55044a2200a4 - main - devel/gradle6: New port 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: 55044a2200a4c42b6b653349f0a65dfca3f96f36 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2021 01:51:27 -0000 The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=55044a2200a4c42b6b653349f0a65dfca3f96f36 commit 55044a2200a4c42b6b653349f0a65dfca3f96f36 Author: Guangyuan Yang AuthorDate: 2021-06-27 01:51:07 +0000 Commit: Guangyuan Yang CommitDate: 2021-06-27 01:51:07 +0000 devel/gradle6: New port devel/gradle needs to be updated to 7.x, while some ports build failed under the newer version, including: - biology/jalview - biology/igv Updated them to use this devel/gradle6 until they officially support 7.x. No functional changes for these ports. Approved by: lwhsu (mentor) --- biology/igv/Makefile | 4 ++-- biology/jalview/Makefile | 4 ++-- devel/Makefile | 1 + devel/gradle6/Makefile | 29 +++++++++++++++++++++++++++++ devel/gradle6/distinfo | 3 +++ devel/gradle6/files/gradle.in | 2 ++ devel/gradle6/pkg-descr | 16 ++++++++++++++++ 7 files changed, 55 insertions(+), 4 deletions(-) diff --git a/biology/igv/Makefile b/biology/igv/Makefile index d514583cb41a..39bd21a96377 100644 --- a/biology/igv/Makefile +++ b/biology/igv/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/license.txt BUILD_DEPENDS= openjfx14>0:java/openjfx14 \ - gradle:devel/gradle + gradle6:devel/gradle6 RUN_DEPENDS= openjfx14>0:java/openjfx14 USES= gettext-runtime @@ -62,7 +62,7 @@ post-extract: # need a separate extract step because the cache is in /tmp, and n .endif do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \ + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle6 \ --gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \ ${GRADLE_ARGS} --build-cache --stacktrace createDist diff --git a/biology/jalview/Makefile b/biology/jalview/Makefile index 67bee6fe6514..f3810e2415e8 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= gradle:devel/gradle +BUILD_DEPENDS= gradle6: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} gradle \ + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle6 \ --gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \ ${GRADLE_ARGS} --build-cache shadowJar diff --git a/devel/Makefile b/devel/Makefile index e4f7782fd531..e50ec46d2d02 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -885,6 +885,7 @@ SUBDIR += gradle SUBDIR += gradle-completion SUBDIR += gradle5 + SUBDIR += gradle6 SUBDIR += gradle62 SUBDIR += grantlee5 SUBDIR += grcov diff --git a/devel/gradle6/Makefile b/devel/gradle6/Makefile new file mode 100644 index 000000000000..e54a53479b18 --- /dev/null +++ b/devel/gradle6/Makefile @@ -0,0 +1,29 @@ +PORTNAME= gradle +PORTVERSION= 6.9 +CATEGORIES= devel java +MASTER_SITES= https://downloads.gradle.org/distributions/ +PKGNAMESUFFIX= 6 +EXTRACT_SUFX= -bin.zip + +MAINTAINER= ygy@FreeBSD.org +COMMENT= Project automation tool + +LICENSE= APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20 +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= zip +USE_JAVA= yes +NO_ARCH= yes +NO_BUILD= yes +SUB_FILES= gradle +SUB_LIST= JAVA=${JAVA} \ + PORTVERSION=${PORTVERSION} +PLIST_FILES= bin/gradle +PORTDATA= * + +do-install: + ${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle + (cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR}) + +.include diff --git a/devel/gradle6/distinfo b/devel/gradle6/distinfo new file mode 100644 index 000000000000..377857ed10c6 --- /dev/null +++ b/devel/gradle6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1624750882 +SHA256 (gradle-6.9-bin.zip) = 765442b8069c6bee2ea70713861c027587591c6b1df2c857a23361512560894e +SIZE (gradle-6.9-bin.zip) = 108129558 diff --git a/devel/gradle6/files/gradle.in b/devel/gradle6/files/gradle.in new file mode 100644 index 000000000000..25d4d31d87f5 --- /dev/null +++ b/devel/gradle6/files/gradle.in @@ -0,0 +1,2 @@ +#!/bin/sh +exec "java" -Dorg.gradle.native=false $JAVA_OPTS -classpath "%%DATADIR%%/lib/gradle-launcher-%%PORTVERSION%%.jar" org.gradle.launcher.GradleMain "$@" diff --git a/devel/gradle6/pkg-descr b/devel/gradle6/pkg-descr new file mode 100644 index 000000000000..9ca5da488bc7 --- /dev/null +++ b/devel/gradle6/pkg-descr @@ -0,0 +1,16 @@ +Gradle is build automation evolved. + +Gradle can automate the building, testing, publishing, deployment +and more of software packages or other types of projects such as +generated static websites, generated documentation or indeed anything +else. + +Gradle combines the power and flexibility of Ant with the dependency +management and conventions of Maven into a more effective way to +build. Powered by a Groovy DSL and packed with innovation, Gradle +provides a declarative way to describe all kinds of builds through +sensible defaults. Gradle is quickly becoming the build system of +choice for many open source projects, leading edge enterprises and +legacy automation challenges. + +WWW: https://www.gradle.org/