From 269cd77072702237e6030dde7be98e222257a362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 2 Sep 2020 16:49:04 -0300
Subject: [PATCH] apache-maven: add which, install in /usr/lib, remove noarch.

Also add replaces for apache-maven-bin.
---
 srcpkgs/apache-maven/INSTALL.msg           |  5 -----
 srcpkgs/apache-maven/files/apache-maven.sh |  3 ---
 srcpkgs/apache-maven/template              | 19 ++++++++++---------
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/apache-maven/INSTALL.msg
 delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh

diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg
deleted file mode 100644
index d49b2df7f77..00000000000
--- a/srcpkgs/apache-maven/INSTALL.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Maven makes use of shell variables which you could set
-by logging out and logging back in. Alternatively you may source
-/etc/profile.d/apache-maven.sh in your shell.
-Additionally note that the primary installation, including configuration
-files, is under /usr/share/apache-maven/
diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh
deleted file mode 100644
index c5e1cd0f192..00000000000
--- a/srcpkgs/apache-maven/files/apache-maven.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-export PATH=$PATH:/usr/share/apache-maven/bin
diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index a6c9fd3e5a2..c9603329c2c 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -1,10 +1,9 @@
 # Template file for 'apache-maven'
 pkgname=apache-maven
 version=3.6.3
-revision=1
-archs=noarch
+revision=2
 hostmakedepends="openjdk8"
-depends="virtual?java-environment"
+depends="virtual?java-environment which"
 short_desc="Software project management and comprehension tool"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
@@ -13,19 +12,21 @@ distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgn
  https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
 checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
  26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5"
+replaces="apache-maven-bin>=0"
 
 do_build() {
 	source /etc/profile.d/10_openjdk8.sh
-	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/
+	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname}
 }
 
 do_install() {
 	# contains bundled native libraries that might not match the platform
 	# disables ansi color support
-	rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native
-	rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar
+	rm -r ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-native
+	rm ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-*.jar
 
-	mkdir -p ${DESTDIR}/etc/profile.d
-	vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/
-	vlicense LICENSE
+	vmkdir usr/bin
+	ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin
+	ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin
+	ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin
 }