svn commit: r517997 - in head: biology/gatk devel devel/ghidra devel/gradle5 misc/elki

[Tobias Kortkamp]

Author: tobik
Date: Wed Nov 20 09:51:43 2019
New Revision: 517997
URL: https://svnweb.freebsd.org/changeset/ports/517997

Log:
  Create devel/gradle5 in preparation of devel/gradle update
  
  Many consumers fail to build with newer Gradle versions.
  
  PR:		239875, 239900, 239901, 239902

Added:
  head/devel/gradle5/
     - copied from r517991, head/devel/gradle/
Modified:
  head/biology/gatk/Makefile
  head/devel/Makefile
  head/devel/ghidra/Makefile
  head/devel/gradle5/Makefile
  head/devel/gradle5/pkg-plist
  head/misc/elki/Makefile

Modified: head/biology/gatk/Makefile
==============================================================================
--- head/biology/gatk/Makefile	Wed Nov 20 09:39:57 2019	(r517996)
+++ head/biology/gatk/Makefile	Wed Nov 20 09:51:43 2019	(r517997)
@@ -12,7 +12,7 @@ COMMENT=	Variant discovery in high-throughput sequenci
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-BUILD_DEPENDS=	gradle:devel/gradle
+BUILD_DEPENDS=	gradle5:devel/gradle5
 
 USES=		gettext-runtime
 USE_GITHUB=	yes
@@ -53,7 +53,7 @@ post-extract: # need a separate extract step because t
 
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle5 \
 		--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 Nov 20 09:39:57 2019	(r517996)
+++ head/devel/Makefile	Wed Nov 20 09:51:43 2019	(r517997)
@@ -889,6 +889,7 @@
     SUBDIR += gputils
     SUBDIR += gradle
     SUBDIR += gradle4
+    SUBDIR += gradle5
     SUBDIR += grantlee5
     SUBDIR += graphql.el
     SUBDIR += grpc

Modified: head/devel/ghidra/Makefile
==============================================================================
--- head/devel/ghidra/Makefile	Wed Nov 20 09:39:57 2019	(r517996)
+++ head/devel/ghidra/Makefile	Wed Nov 20 09:51:43 2019	(r517997)
@@ -25,7 +25,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	amd64
 
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
-BUILD_DEPENDS=	gradle>=5.0:devel/gradle \
+BUILD_DEPENDS=	gradle5>=5.0:devel/gradle5 \
 	bash:shells/bash \
 	flex:textproc/flex \
 	fop:textproc/fop \
@@ -51,7 +51,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	NationalSecurityAgency
 
 GRADLE_HOME_BASE=	/tmp	# Gradle cache path must be absolute (see https://github.com/gradle/gradle/issues/1338)
-GRADLE_RUN=	${SETENV} ${MAKE_ENV} gradle \
+GRADLE_RUN=	${SETENV} ${MAKE_ENV} gradle5 \
 			--gradle-user-home ${GRADLE_HOME_BASE}/gradle-${PORTNAME} \
 			--no-daemon
 

Modified: head/devel/gradle5/Makefile
==============================================================================
--- head/devel/gradle/Makefile	Tue Nov 19 22:39:53 2019	(r517991)
+++ head/devel/gradle5/Makefile	Wed Nov 20 09:51:43 2019	(r517997)
@@ -6,8 +6,9 @@ PORTVERSION=	5.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://downloads.gradle.org/distributions/
 EXTRACT_SUFX=	-bin.zip
+PKGNAMESUFFIX=	5
 
-MAINTAINER=	gasol.wu at gmail.com
+MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	Project automation tool
 
 LICENSE=	APACHE20
@@ -17,12 +18,15 @@ USES=		zip
 JAVA_VERSION=	1.7+
 USE_JAVA=	yes
 NO_BUILD=	yes
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+PORTSCOUT=	ignore:1
+PLIST_SUB=	PKGNAMESUFFIX=${PKGNAMESUFFIX}
 SUB_LIST=	PORTVERSION=${PORTVERSION} \
 		JAVA=${JAVA}
 SUB_FILES=	gradle
 
 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>

Modified: head/devel/gradle5/pkg-plist
==============================================================================
--- head/devel/gradle/pkg-plist	Tue Nov 19 22:39:53 2019	(r517991)
+++ head/devel/gradle5/pkg-plist	Wed Nov 20 09:51:43 2019	(r517997)
@@ -1,4 +1,4 @@
-bin/gradle
+bin/gradle%%PKGNAMESUFFIX%%
 %%DATADIR%%/lib/annotations-13.0.jar
 %%DATADIR%%/lib/ant-1.9.13.jar
 %%DATADIR%%/lib/ant-launcher-1.9.13.jar

Modified: head/misc/elki/Makefile
==============================================================================
--- head/misc/elki/Makefile	Wed Nov 20 09:39:57 2019	(r517996)
+++ head/misc/elki/Makefile	Wed Nov 20 09:51:43 2019	(r517997)
@@ -15,7 +15,7 @@ COMMENT=	Data mining toolkit
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	gradle:devel/gradle
+BUILD_DEPENDS=	gradle5:devel/gradle5
 
 USE_JAVA=	yes
 USE_GITHUB=	yes
@@ -41,7 +41,7 @@ post-extract:
 	@cd ${DEPS_CACHE_DIR} && ${TAR} xzf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gradle5 \
 		--gradle-user-home ${DEPS_CACHE_DIR}/gradle-${PORTNAME} --project-cache-dir ${DEPS_CACHE_DIR}/gradle-${PORTNAME} \
 		--offline --build-cache shadowJar