svn commit: r534171 - in head: biology/gatk devel devel/gradle62

[Tobias Kortkamp]

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 at FreeBSD.org
+MAINTAINER=	yuri at 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 <bsd.port.mk>