Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Nov 2018 08:59:13 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486238 - in head/devel: . gradle4
Message-ID:  <201811300859.wAU8xDc8042462@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Nov 30 08:59:13 2018
New Revision: 486238
URL: https://svnweb.freebsd.org/changeset/ports/486238

Log:
  Preserve Gradle 4 in preparation of a devel/gradle update
  
  It is required for building java/openjfx8-devel.
  
  PR:		233623

Added:
  head/devel/gradle4/
     - copied from r486160, head/devel/gradle/
Modified:
  head/devel/Makefile
  head/devel/gradle4/Makefile
  head/devel/gradle4/pkg-plist

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri Nov 30 07:51:01 2018	(r486237)
+++ head/devel/Makefile	Fri Nov 30 08:59:13 2018	(r486238)
@@ -874,6 +874,7 @@
     SUBDIR += gpsim
     SUBDIR += gputils
     SUBDIR += gradle
+    SUBDIR += gradle4
     SUBDIR += grantlee
     SUBDIR += grantlee5
     SUBDIR += graphql.el

Modified: head/devel/gradle4/Makefile
==============================================================================
--- head/devel/gradle/Makefile	Thu Nov 29 09:58:05 2018	(r486160)
+++ head/devel/gradle4/Makefile	Fri Nov 30 08:59:13 2018	(r486238)
@@ -5,24 +5,28 @@ PORTNAME=	gradle
 PORTVERSION=	4.6
 CATEGORIES=	devel java
 MASTER_SITES=	https://downloads.gradle.org/distributions/
+PKGNAMESUFFIX=	4
 EXTRACT_SUFX=	-bin.zip
 
-MAINTAINER=	gasol.wu@gmail.com
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Project automation tool
 
 LICENSE=	APACHE20
 
-NO_ARCH=	yes
 USES=		zip
-JAVA_VERSION=	1.7+
 USE_JAVA=	yes
+JAVA_VERSION=	1.7+
+
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+NO_ARCH=	yes
 NO_BUILD=	yes
+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/gradle4/pkg-plist
==============================================================================
--- head/devel/gradle/pkg-plist	Thu Nov 29 09:58:05 2018	(r486160)
+++ head/devel/gradle4/pkg-plist	Fri Nov 30 08:59:13 2018	(r486238)
@@ -1,3 +1,4 @@
+bin/gradle%%PKGNAMESUFFIX%%
 %%DATADIR%%/lib/annotations-13.0.jar
 %%DATADIR%%/lib/ant-1.9.9.jar
 %%DATADIR%%/lib/ant-launcher-1.9.9.jar
@@ -190,4 +191,3 @@
 %%DATADIR%%/lib/reflectasm-1.07-shaded.jar
 %%DATADIR%%/lib/slf4j-api-1.7.16.jar
 %%DATADIR%%/lib/xml-apis-1.4.01.jar
-bin/gradle



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811300859.wAU8xDc8042462>