Date: Fri, 7 Jun 2024 04:42:32 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: 560360477376 - main - textproc/opensearch*: Fix openserach210 PORTREVISION Message-ID: <202406070442.4574gWbE056747@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=560360477376327f00e563389576d7b11b29f28c commit 560360477376327f00e563389576d7b11b29f28c Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2024-06-07 04:38:25 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2024-06-07 04:42:12 +0000 textproc/opensearch*: Fix openserach210 PORTREVISION - Fix installation issues on textproc/opensearch210 With hat: opensearch --- textproc/opensearch/Makefile | 23 ++++++++++++++++++++++- textproc/opensearch210/Makefile | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/textproc/opensearch/Makefile b/textproc/opensearch/Makefile index 51e4933e2898..e2bc8d849b13 100644 --- a/textproc/opensearch/Makefile +++ b/textproc/opensearch/Makefile @@ -3,6 +3,7 @@ DISTVERSION?= 2.14.0 DISTVERSIONSUFFIX= -linux-x64 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ +PKGNAMESUFFIX?= # MAINTAINER= opensearch@FreeBSD.org COMMENT?= Full-text search engine for Java @@ -43,7 +44,20 @@ CONFIG_FILES= opensearch.yml jvm.options log4j2.properties PLUGINS_CONFIG_FILES?= \ opensearch-notifications-core/notifications-core.yml \ opensearch-notifications/notifications.yml \ - opensearch-observability/observability.yml \ + opensearch-observability/observability.yml +.if ${PKGNAMESUFFIX} == "210" +PLUGINS_CONFIG_FILES+= \ + opensearch-performance-analyzer/agent-stats-metadata \ + opensearch-performance-analyzer/log4j2.xml \ + opensearch-performance-analyzer/opensearch_security.policy \ + opensearch-performance-analyzer/performance-analyzer.properties \ + opensearch-performance-analyzer/plugin-stats-metadata \ + opensearch-performance-analyzer/rca.conf \ + opensearch-performance-analyzer/rca_idle_cluster_manager.conf \ + opensearch-performance-analyzer/rca_cluster_manager.conf \ + opensearch-performance-analyzer/supervisord.conf +.endif +PLUGINS_CONFIG_FILES+= \ opensearch-reports-scheduler/reports-scheduler.yml \ opensearch-security/action_groups.yml \ opensearch-security/allowlist.yml \ @@ -101,6 +115,10 @@ do-install-PLUGINS-on: ${STAGEDIR}${ETCDIR}/opensearch-observability \ ${STAGEDIR}${ETCDIR}/opensearch-reports-scheduler \ ${STAGEDIR}${ETCDIR}/opensearch-security +.if ${PKGNAMESUFFIX} == "210" + ${MKDIR} ${STAGEDIR}${ETCDIR}/opensearch-performance-analyzer +.endif + .for f in ${PLUGINS_CONFIG_FILES} ${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample ${ECHO} "@sample(opensearch,opensearch,640) ${ETCDIR}/${f}.sample" >> ${TMPPLIST} @@ -125,6 +143,9 @@ 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" + ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-performance-analyzer" >> ${TMPPLIST} +.endif ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-reports-scheduler" >> ${TMPPLIST} ${ECHO} "@dir(opensearch,opensearch,0750) ${ETCDIR}/opensearch-security" >> ${TMPPLIST} .endif diff --git a/textproc/opensearch210/Makefile b/textproc/opensearch210/Makefile index 091541361b16..d9b0568d14ac 100644 --- a/textproc/opensearch210/Makefile +++ b/textproc/opensearch210/Makefile @@ -1,4 +1,5 @@ DISTVERSION= 2.10.0 +PORTREVISION= 1 PKGNAMESUFFIX= 210
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406070442.4574gWbE056747>