From owner-svn-ports-all@freebsd.org Wed May 6 13:11:50 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 9D67C2C48AE; Wed, 6 May 2020 13:11:50 +0000 (UTC) (envelope-from tobik@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 49HH6t3lLfz4clY; Wed, 6 May 2020 13:11:50 +0000 (UTC) (envelope-from tobik@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 61E3927D6F; Wed, 6 May 2020 13:11:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 046DBo66093522; Wed, 6 May 2020 13:11:50 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 046DBnc8093519; Wed, 6 May 2020 13:11:49 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202005061311.046DBnc8093519@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 6 May 2020 13:11:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534171 - in head: biology/gatk devel devel/gradle62 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: biology/gatk devel devel/gradle62 X-SVN-Commit-Revision: 534171 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.30 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: Wed, 06 May 2020 13:11:50 -0000 Author: tobik Date: Wed May 6 13:11:49 2020 New Revision: 534171 URL: https://svnweb.freebsd.org/changeset/ports/534171 Log: Preserve Gradle 6.2.2 for biology/gatk It fails to build with newer Gradle versions again. Added: head/devel/gradle62/ - copied from r534112, head/devel/gradle/ Modified: head/biology/gatk/Makefile head/devel/Makefile head/devel/gradle62/Makefile Modified: head/biology/gatk/Makefile ============================================================================== --- head/biology/gatk/Makefile Wed May 6 12:24:49 2020 (r534170) +++ head/biology/gatk/Makefile Wed May 6 13:11:49 2020 (r534171) @@ -11,7 +11,7 @@ COMMENT= Variant discovery in high-throughput sequenci LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -BUILD_DEPENDS= gradle:devel/gradle +BUILD_DEPENDS= gradle62:devel/gradle62 USES= gettext-runtime USE_GITHUB= yes @@ -54,7 +54,7 @@ post-extract: # need a separate extract step because t do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \ + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle62 \ --gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \ ${GRADLE_ARGS} --build-cache localJar Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Wed May 6 12:24:49 2020 (r534170) +++ head/devel/Makefile Wed May 6 13:11:49 2020 (r534171) @@ -869,6 +869,7 @@ SUBDIR += gradle SUBDIR += gradle4 SUBDIR += gradle5 + SUBDIR += gradle62 SUBDIR += grantlee5 SUBDIR += graphql.el SUBDIR += grpc Modified: head/devel/gradle62/Makefile ============================================================================== --- head/devel/gradle/Makefile Wed May 6 02:27:39 2020 (r534112) +++ head/devel/gradle62/Makefile Wed May 6 13:11:49 2020 (r534171) @@ -5,9 +5,10 @@ PORTNAME= gradle PORTVERSION= 6.2.2 CATEGORIES= devel java MASTER_SITES= https://downloads.gradle.org/distributions/ +PKGNAMESUFFIX= 62 EXTRACT_SUFX= -bin.zip -MAINTAINER= tobik@FreeBSD.org +MAINTAINER= yuri@FreeBSD.org COMMENT= Project automation tool LICENSE= APACHE20 BSD3CLAUSE CDDL EPL LGPL21+ MIT MPL20 @@ -16,16 +17,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= zip USE_JAVA= yes +DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} NO_ARCH= yes NO_BUILD= yes +PORTSCOUT= ignore:1 SUB_FILES= gradle SUB_LIST= JAVA=${JAVA} \ PORTVERSION=${PORTVERSION} -PLIST_FILES= bin/gradle +PLIST_FILES= bin/gradle${PKGNAMESUFFIX} PORTDATA= * do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle + ${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle${PKGNAMESUFFIX} (cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR}) .include