Date: Sat, 18 Jan 2025 21:14:13 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b1a9f601c2c9 - main - textproc/opensearch*: Add new entry to CONFLICTS Message-ID: <202501182114.50ILEDcp073996@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1a9f601c2c95ee393cff39926119a75e0175532 commit b1a9f601c2c95ee393cff39926119a75e0175532 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2025-01-18 21:05:50 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2025-01-18 21:14:04 +0000 textproc/opensearch*: Add new entry to CONFLICTS - Add some new changes for include opensearch216 and opensearch-dashboards216 ports - Bump PORTREVISION --- textproc/opensearch/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 29e6984dda6b..2615dd2843a5 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -1,5 +1,6 @@ PORTNAME= opensearch DISTVERSION?= 2.17.1 +PORTREVISION?= 1 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ @@ -15,7 +16,7 @@ BUILD_DEPENDS= jna>0:devel/jna RUN_DEPENDS= bash>0:shells/bash \ jna>0:devel/jna -CONFLICTS?= opensearch13 opensearch210 opensearch213 +CONFLICTS?= opensearch13 opensearch210 opensearch213 opensearch216 USES= cpe java shebangfix JAVA_VERSION= 17+ @@ -44,7 +45,7 @@ PLUGINS_CONFIG_FILES?= \ opensearch-notifications-core/notifications-core.yml \ opensearch-notifications/notifications.yml \ opensearch-observability/observability.yml -.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" +.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216" PLUGINS_CONFIG_FILES+= \ opensearch-performance-analyzer/agent-stats-metadata \ opensearch-performance-analyzer/log4j2.xml \ @@ -114,7 +115,7 @@ do-install-PLUGINS-on: ${STAGEDIR}${ETCDIR}/opensearch-observability \ ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \ ${STAGEDIR}${ETCDIR}/opensearch-security -.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" +.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216" ${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-performance-analyzer .endif @@ -142,7 +143,7 @@ post-install: ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-notifications-core" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-notifications" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-observability" >> ${TMPPLIST} -.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" +.if ${PKGNAMESUFFIX} == "210" || ${PKGNAMESUFFIX} == "213" || ${PKGNAMESUFFIX} == "216" ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-performance-analyzer" >> ${TMPPLIST} .endif ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-reports-scheduler" >> ${TMPPLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501182114.50ILEDcp073996>