diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-24 16:27:22 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-24 16:27:22 +0000 |
| commit | e6f358905a7e95899b11aab8d3e96b9ec6a3e077 (patch) | |
| tree | 3745fca2ca32e28852e0c889f55f92771122f780 | |
| parent | 19c0db694e462c6aa1ae01919e7ee31dd895655b (diff) | |
| download | pkgsrc-e6f358905a7e95899b11aab8d3e96b9ec6a3e077.tar.gz | |
apache-ivy: Use apache-ant 1.9.x with JDK 7.x
Bump PKGREVISION.
| -rw-r--r-- | devel/apache-ivy/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/devel/apache-ivy/Makefile b/devel/apache-ivy/Makefile index 6142b1d8e94..03eeffd7a3e 100644 --- a/devel/apache-ivy/Makefile +++ b/devel/apache-ivy/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2018/06/14 11:32:37 fhajny Exp $ +# $NetBSD: Makefile,v 1.4 2018/07/24 16:27:22 jperkin Exp $ # DISTNAME= apache-ivy-2.4.0-bin +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/-bin//} CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE:=ant/ivy/${PKGNAME:S/apache-ivy-//}/} @@ -11,8 +12,15 @@ HOMEPAGE= http://ant.apache.org/ivy/ COMMENT= "Apache Project's Java-Based agile dependency manager" LICENSE= apache-2.0 +.include "../../mk/java-vm.mk" + +.if ${PKG_JVM} == "openjdk7" || ${PKG_JVM} == "sun-jdk7" +DEPENDS+= apache-ant>=1.9<1.10:../../devel/apache-ant19 +.else +DEPENDS+= apache-ant>=1.10:../../devel/apache-ant +.endif + WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -DEPENDS+= apache-ant>=1.6:../../devel/apache-ant USE_JAVA= run USE_JAVA2= yes @@ -27,5 +35,4 @@ do-install: cd ${WRKSRC}/doc && pax -rw -pmp * ${DESTDIR}${PREFIX}/share/doc/java/ivy cd ${WRKSRC}/src/example && pax -rw -pmp * ${DESTDIR}${PREFIX}/share/examples/ivy -.include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" |