Sun Mar 25 21:59:40 2018 UTC ()
Fix reference to gradle-launcher-....jar by using PKGVERSION_NOREV. Bump PKGREVISION


(abs)
diff -r1.12 -r1.13 pkgsrc/devel/gradle/Makefile
cvs diff -r1.12 -r1.13 pkgsrc/devel/gradle/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gradle/Makefile 2018/03/08 21:00:29 1.12
+++ pkgsrc/devel/gradle/Makefile 2018/03/25 21:59:40 1.13
@@ -1,45 +1,45 @@ @@ -1,45 +1,45 @@
1# $NetBSD: Makefile,v 1.12 2018/03/08 21:00:29 maya Exp $ 1# $NetBSD: Makefile,v 1.13 2018/03/25 21:59:40 abs Exp $
2 2
3DISTNAME= gradle-4.6-bin 3DISTNAME= gradle-4.6-bin
4PKGNAME= ${DISTNAME:S/-bin//} 4PKGNAME= ${DISTNAME:S/-bin//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= devel java 6CATEGORIES= devel java
7MASTER_SITES= http://services.gradle.org/distributions/ 7MASTER_SITES= http://services.gradle.org/distributions/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= asiekierka@gmail.com 10MAINTAINER= asiekierka@gmail.com
11HOMEPAGE= https://gradle.org/ 11HOMEPAGE= https://gradle.org/
12COMMENT= Groovy-based Java build system 12COMMENT= Groovy-based Java build system
13LICENSE= apache-2.0 13LICENSE= apache-2.0
14 14
15WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//}
16 16
17USE_JAVA= run 17USE_JAVA= run
18USE_JAVA2= yes 18USE_JAVA2= yes
19USE_TOOLS+= bash:run pax:build 19USE_TOOLS+= bash:run pax:build
20NO_BUILD= yes 20NO_BUILD= yes
21 21
22pre-configure: 22pre-configure:
23 ${CP} ${FILESDIR}/gradle-launcher ${WRKSRC}/gradle-launcher 23 ${CP} ${FILESDIR}/gradle-launcher ${WRKSRC}/gradle-launcher
24 24
25REPLACE_BASH+= gradle-launcher 25REPLACE_BASH+= gradle-launcher
26 26
27SUBST_CLASSES+= launcher 27SUBST_CLASSES+= launcher
28SUBST_FILES.launcher= gradle-launcher 28SUBST_FILES.launcher= gradle-launcher
29SUBST_STAGE.launcher= post-configure 29SUBST_STAGE.launcher= post-configure
30SUBST_SED.launcher= -e 's,@APP_HOME@,${PREFIX}/lib/java/gradle,g' 30SUBST_SED.launcher= -e 's,@APP_HOME@,${PREFIX}/lib/java/gradle,g'
31SUBST_SED.launcher+= -e 's,@PREFIX@,${PREFIX},g' 31SUBST_SED.launcher+= -e 's,@PREFIX@,${PREFIX},g'
32SUBST_SED.launcher+= -e 's,@APP_LAUNCHER@,lib/gradle-launcher-${PKGVERSION}\.jar,g' 32SUBST_SED.launcher+= -e 's,@APP_LAUNCHER@,lib/gradle-launcher-${PKGVERSION_NOREV}\.jar,g'
33SUBST_SED.launcher+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' 33SUBST_SED.launcher+= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
34 34
35INSTALLATION_DIRS= bin lib/java/gradle/lib lib/java/gradle/lib/plugins 35INSTALLATION_DIRS= bin lib/java/gradle/lib lib/java/gradle/lib/plugins
36INSTALLATION_DIRS+= lib/java/gradle/media share/doc/java/gradle 36INSTALLATION_DIRS+= lib/java/gradle/media share/doc/java/gradle
37 37
38do-install: 38do-install:
39 ${INSTALL_SCRIPT} ${WRKSRC}/gradle-launcher ${DESTDIR}${PREFIX}/bin/gradle 39 ${INSTALL_SCRIPT} ${WRKSRC}/gradle-launcher ${DESTDIR}${PREFIX}/bin/gradle
40 cd ${WRKSRC}/lib && ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/java/gradle/lib 40 cd ${WRKSRC}/lib && ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/java/gradle/lib
41 ${INSTALL_DATA} ${WRKSRC}/media/*.icns ${DESTDIR}${PREFIX}/lib/java/gradle/media 41 ${INSTALL_DATA} ${WRKSRC}/media/*.icns ${DESTDIR}${PREFIX}/lib/java/gradle/media
42 ${INSTALL_DATA} ${WRKSRC}/getting-started.html ${DESTDIR}${PREFIX}/share/doc/java/gradle 42 ${INSTALL_DATA} ${WRKSRC}/getting-started.html ${DESTDIR}${PREFIX}/share/doc/java/gradle
43 43
44.include "../../mk/java-vm.mk" 44.include "../../mk/java-vm.mk"
45.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"