Attachment 235062 Details for Bug 265028 – Git-formatted patch

[patch] Git-formatted patch

maven-wrapper-2.patch (text/plain), 3.12 KB, created by Michael Osipov on 2022-07-04 10:14:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2022-07-04 10:14:51 UTC

Size: 3.12 KB

patch

obsolete

>diff --git a/devel/maven-wrapper/Makefile b/devel/maven-wrapper/Makefile
>index da4f64c65881..d7505dce4dd2 100644
>--- a/devel/maven-wrapper/Makefile
>+++ b/devel/maven-wrapper/Makefile
>@@ -1,21 +1,20 @@
>-# Created by: Herve Quiroz <hq@FreeBSD.org>
>-
> PORTNAME=	maven-wrapper
>-PORTVERSION=	1
>-PORTREVISION=	2
>+PORTVERSION=	2
> CATEGORIES=	devel java
> MASTER_SITES=	# none
> DISTFILES=	# none
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	michaelo@apache.org
> COMMENT=	Wrapper script for the various installations of Maven
> 
> NO_BUILD=	yes
> SUB_FILES=	mvn.sh
>-SUB_LIST=	CAT=${CAT} FIND=${FIND} TAIL=${TAIL}
>+SUB_LIST=	ETCDIR=${ETCDIR} CAT=${CAT} FIND=${FIND} TAIL=${TAIL}
>+PLIST_SUB=	ETCDIR=${ETCDIR}
> 
> do-install:
>-	${MKDIR} "${STAGEDIR}${PREFIX}/etc/maven-wrapper/instances.d"
>+	${MKDIR} "${STAGEDIR}${ETCDIR}/instances.d"
> 	${INSTALL_SCRIPT} "${WRKDIR}/mvn.sh" "${STAGEDIR}${PREFIX}/bin/mvn"
>+	${INSTALL_SCRIPT} "${WRKDIR}/mvn.sh" "${STAGEDIR}${PREFIX}/bin/mvnDebug"
> 
> .include <bsd.port.mk>
>diff --git a/devel/maven-wrapper/files/mvn.sh.in b/devel/maven-wrapper/files/mvn.sh.in
>index 16506f407246..a822dfef5819 100644
>--- a/devel/maven-wrapper/files/mvn.sh.in
>+++ b/devel/maven-wrapper/files/mvn.sh.in
>@@ -2,26 +2,23 @@
> 
> set -e
> 
>-if [ -f "%%PREFIX%%/etc/maven/setenv.sh" ] ; then
>-	. "%%PREFIX%%/etc/maven/setenv.sh"
>-fi
>+SCRIPT_NAME="$(basename $0)"
> 
>-if [ -z "${M2_HOME}" ] ; then
>-	INSTANCES_DIRECTORY="/usr/local/etc/maven-wrapper/instances.d"
>-	INSTANCE="`%%FIND%% -s "${INSTANCES_DIRECTORY}" -type f -mindepth 1 -maxdepth 1 | %%TAIL%% -n 1`"
>+if [ -z "${MAVEN_HOME}" ] ; then
>+	INSTANCES_DIRECTORY="%%ETCDIR%%/instances.d"
>+	INSTANCE="$(%%FIND%% -s "${INSTANCES_DIRECTORY}" -type f -mindepth 1 -maxdepth 1 | %%TAIL%% -n 1)"
> 
> 	if [ -z "${INSTANCE}" ] ; then
>-		echo "could not find a Maven instance! (${INSTANCES_DIRECTORY})" >&2
>+		echo "Could not find a Maven instance in ${INSTANCES_DIRECTORY}" >&2
> 		exit 1
> 	fi
> 
>-	M2_HOME="`%%CAT%% "${INSTANCE}"`"
>+	MAVEN_HOME="$(%%CAT%% "${INSTANCE}")"
> 
>-	if [ ! -d "${M2_HOME}" ] ; then
>-		echo "not a directory: ${M2_HOME}" >&2
>+	if [ ! -d "${MAVEN_HOME}" ] ; then
>+		echo "Not a directory: ${MAVEN_HOME}" >&2
> 		exit 2
> 	fi
> fi
> 
>-export M2_HOME
>-exec "${M2_HOME}/bin/mvn" "$@"
>+exec "${MAVEN_HOME}/bin/${SCRIPT_NAME}" "$@"
>diff --git a/devel/maven-wrapper/pkg-descr b/devel/maven-wrapper/pkg-descr
>index a75f8cd0d9a7..febfe74f39ac 100644
>--- a/devel/maven-wrapper/pkg-descr
>+++ b/devel/maven-wrapper/pkg-descr
>@@ -1,7 +1,7 @@
> The maven-wrapper provides a convenient way to switch between several Maven
> installations.
> 
>-- By setting the M2_HOME environment variable the user can select the Maven
>+- By setting the MAVEN_HOME environment variable the user can select the Maven
>   instance to use.
> - A default Maven instance is selected according to the files in
>-  /usr/local/etc/maven/instances.d/
>+  /usr/local/etc/maven-wrapper/instances.d/
>diff --git a/devel/maven-wrapper/pkg-plist b/devel/maven-wrapper/pkg-plist
>index 08a1b2b15539..01389ee11108 100644
>--- a/devel/maven-wrapper/pkg-plist
>+++ b/devel/maven-wrapper/pkg-plist
>@@ -1,2 +1,3 @@
> bin/mvn
>-@dir etc/maven-wrapper/instances.d
>+bin/mvnDebug
>+@dir %%ETCDIR%%/instances.d

Actions: View | Diff

Attachments on bug 265028: 235062