*/*: properly depend on Maven package

devel/maven and devel/maven39 do not provide mvn(1) from LOCALBASE that one comes from devel/maven-wrapper instead. Therefore, one should depend on the package rather than a non-existing executable/script. Approved by: jrm (mentor), otis (mentor), vvd Differential Revision: https://reviews.freebsd.org/D44229
freebsd · Mar 11, 2024 · 90e4477 · 90e4477
1 parent ed253dd
commit 90e4477
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 18 deletions.
diff --git a/cad/digital/Makefile b/cad/digital/Makefile
@@ -10,7 +10,7 @@ WWW=		https://github.com/hneemann/Digital
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USES=		desktop-file-utils
 

diff --git a/devel/spark/Makefile b/devel/spark/Makefile
@@ -16,7 +16,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java \
 		bash:shells/bash \
-		mvn:devel/maven
+		maven>0:devel/maven
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe python shebangfix

diff --git a/games/coronapoker/Makefile b/games/coronapoker/Makefile
@@ -10,7 +10,7 @@ WWW=		https://tonikelope.github.io/coronapoker/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	11+
 USE_GITHUB=	yes

diff --git a/games/jinput/Makefile b/games/jinput/Makefile
@@ -10,7 +10,7 @@ WWW=		https://github.com/jinput/jinput
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils \
-		mvn:devel/maven
+		maven>0:devel/maven
 RUN_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils
 
 # Using a fork because of maven dependencies

diff --git a/games/jutils/Makefile b/games/jutils/Makefile
@@ -10,7 +10,7 @@ WWW=		https://github.com/jinput/jutils
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 # Using a fork because of maven dependencies
 USE_GITLAB=	yes

diff --git a/games/lizzie/Makefile b/games/lizzie/Makefile
@@ -11,7 +11,7 @@ WWW=		https://github.com/featurecat/lizzie
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 RUN_DEPENDS=	leelaz:games/leela-zero
 
 USE_JAVA=	yes

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
@@ -18,7 +18,7 @@ LICENSE=	EPL
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	git:devel/git@lite \
-		${LOCALBASE}/share/java/apache-maven-3.8/bin/mvn:devel/maven \
+		maven>0:devel/maven \
 		zip:archivers/zip
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3

diff --git a/math/jacop/Makefile b/math/jacop/Makefile
@@ -12,7 +12,7 @@ WWW=		https://github.com/radsz/jacop
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	yes
 

diff --git a/math/jts/Makefile b/math/jts/Makefile
@@ -10,7 +10,7 @@ WWW=		https://github.com/locationtech/jts
 LICENSE=	EPL
 #LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	locationtech

diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile
@@ -10,7 +10,7 @@ LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jitsi

diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile
@@ -11,7 +11,7 @@ LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USE_GITHUB=	yes

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
@@ -13,7 +13,7 @@ WWW=		https://www.igniterealtime.org/projects/openfire/index.jsp
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USES=		cpe
 CPE_VENDOR=	igniterealtime

diff --git a/science/cdk/Makefile b/science/cdk/Makefile
@@ -11,7 +11,7 @@ WWW=		https://cdk.github.io/
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	yes
 USE_GITHUB=	yes

diff --git a/science/opsin/Makefile b/science/opsin/Makefile
@@ -12,7 +12,7 @@ WWW=		https://bitbucket.org/dan2097/opsin/src/default/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	yes
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=29730, tid=0x000000000002d236 guarantee(val < (1U << nbits)) failed: Field too big for insn

diff --git a/security/owasp-dependency-check/Makefile b/security/owasp-dependency-check/Makefile
@@ -18,7 +18,7 @@ WWW=		https://jeremylong.github.io/DependencyCheck \
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeremylong

diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile
@@ -80,8 +80,8 @@ JAVA_DESC=	Enable Java bindings
 
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_USE=		java=yes
-JAVA_BUILD_DEPENDS=	mvn:devel/maven
-JAVA_FETCH_DEPENDS=	mvn:devel/maven
+JAVA_BUILD_DEPENDS=	maven>0:devel/maven
+JAVA_FETCH_DEPENDS=	maven>0:devel/maven
 JAVA_CONFIGURE_ENV=	PROTOBUF_JAR="${MAVEN_REPO}/com/google/protobuf/protobuf-java/${PROTOBUF_VERSION}/protobuf-java-${PROTOBUF_VERSION}.jar"
 JAVA_MAKE_ENV=		MAVEN_OPTS="${MAVEN_OPTS}"
 JAVA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_java_mesos.pom.in

diff --git a/sysutils/jvmtop/Makefile b/sysutils/jvmtop/Makefile
@@ -12,7 +12,7 @@ WWW=		https://github.com/patric-r/jvmtop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_JAVA=	yes