FreeBSD Bugzilla – Attachment 243809 Details for
Bug 272899
devel/maven: improve port for multiple parallel versions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Git-formatted patch
0001-devel-maven-improve-port-for-multiple-parallel-versi.patch (text/plain), 2.62 KB, created by
Michael Osipov
on 2023-08-02 20:04:01 UTC
(
hide
)
Description:
Git-formatted patch
Filename:
MIME Type:
Creator:
Michael Osipov
Created:
2023-08-02 20:04:01 UTC
Size:
2.62 KB
patch
obsolete
>From b8cdd40cc166a026fee9f2fb73c62e06560b4e07 Mon Sep 17 00:00:00 2001 >From: Michael Osipov <michaelo@apache.org> >Date: Wed, 2 Aug 2023 20:40:49 +0200 >Subject: [PATCH] devel/maven: improve port for multiple parallel versions > >--- > devel/maven/Makefile | 23 +++++++++++++---------- > devel/maven/pkg-plist | 3 +-- > 2 files changed, 14 insertions(+), 12 deletions(-) > >diff --git a/devel/maven/Makefile b/devel/maven/Makefile >index 2946e8d18566..38876c6aace3 100644 >--- a/devel/maven/Makefile >+++ b/devel/maven/Makefile >@@ -1,8 +1,9 @@ > PORTNAME= maven > DISTVERSION= 3.8.8 >+PORTREVISION= 1 > CATEGORIES= devel java > MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries >-DISTNAME= apache-maven-${DISTVERSION}-bin >+DISTNAME= apache-${PORTNAME}-${DISTVERSION}-bin > > MAINTAINER= michaelo@apache.org > COMMENT= Java project management tool >@@ -17,17 +18,19 @@ CPE_VENDOR= apache > CPE_PRODUCT= maven > USE_JAVA= yes > >-DATADIR= ${JAVASHAREDIR}/${PORTNAME} >+DATADIR= ${JAVASHAREDIR}/${INSTANCE_ID} > NO_ARCH= yes > NO_BUILD= yes >-WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} >-PLIST_SUB= PORTVERSION=${PORTVERSION} >-INSTANCE_FILE= ${PORTNAME}-${PORTVERSION} >-INSTANCES_DIR= etc/maven-wrapper/instances.d/ >+WRKSRC= ${WRKDIR}/${DISTNAME:S/-bin//} >+PLIST_SUB= PORTVERSION=${PORTVERSION} \ >+ INSTANCE_ID=${INSTANCE_ID} \ >+ INSTANCES_DIR=${INSTANCES_DIR} >+INSTANCE_ID= ${DISTNAME:S/-bin//:R} >+INSTANCES_DIR= ${LOCALBASE}/etc/maven-wrapper/instances.d > > post-extract: > ${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.cmd >- ${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE} >+ ${ECHO_CMD} "${DATADIR}" > ${WRKDIR}/${INSTANCE_ID} > > post-patch: > @${REINPLACE_CMD} \ >@@ -47,8 +50,8 @@ do-install: > ${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${STAGEDIR}${DATADIR}/bin > ${INSTALL_SCRIPT} ${WRKSRC}/bin/mvnDebug ${STAGEDIR}${DATADIR}/bin > ${INSTALL_SCRIPT} ${WRKSRC}/bin/mvnyjp ${STAGEDIR}${DATADIR}/bin >- @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} >- ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \ >- ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} >+ @${MKDIR} ${STAGEDIR}${INSTANCES_DIR} >+ ${INSTALL_DATA} ${WRKDIR}/${INSTANCE_ID} \ >+ ${STAGEDIR}${INSTANCES_DIR} > > .include <bsd.port.mk> >diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist >index 478dcab1dcd5..6bfdd1781c00 100644 >--- a/devel/maven/pkg-plist >+++ b/devel/maven/pkg-plist >@@ -1,4 +1,4 @@ >-%%ETCDIR%%-wrapper/instances.d/maven-%%PORTVERSION%% >+%%INSTANCES_DIR%%/%%INSTANCE_ID%% > %%DATADIR%%/LICENSE > %%DATADIR%%/NOTICE > %%DATADIR%%/README.txt >@@ -67,4 +67,3 @@ > %%DATADIR%%/lib/wagon-http-3.5.3-shaded.jar > %%DATADIR%%/lib/wagon-provider-api-3.5.3.jar > %%DATADIR%%/lib/ext/README.txt >-%%DATADIR%%/maven-%%PORTVERSION%% >-- >2.41.0 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=243809">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 272899
: 243809