From nobody Fri Jun 7 04:42:32 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VwT885Wnfz5MDL7; Fri, 07 Jun 2024 04:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwT88545Fz4c8C; Fri, 7 Jun 2024 04:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717735352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PPxeM0i5dn/R7LhEmUmUYR8CFkDcMJx7vJvfsmJDufI=; b=xxMuNNnynV9JxwuPtunaamH1Z+VwpS77dnejOWXPQMV3AJm3eAYX5p0ElQo5jljhstSIzH sa/TSnD/AiBgH71WFS95qph2YciumtkvoJqrcXFp1pwttqv5CqP65xvB2wvMH9dOIPVIqK 0NCuxhtUY/plE7VPfhHdfQ8EUOTDv9aUbAOhDxduBTjMbSWaHdC6Jwaiy8SkDG/Bac/f5y /ka5WfqWjPxn2g7yOIlZN8vcT7qdSqKa0GaQPXnbPthIIZAqhSlTQ0HVpkg23CB3PJKdCf KEad8CUGDyKDl8+EDq1HwQMpKadj0pb99GMk/fODITx+RA/Pn4HEZE0lcN4rvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717735352; a=rsa-sha256; cv=none; b=uWFXJB6FewUDKVm0YXQk3MqXUyTyr7svQQJ2G7zQgTTgliksPaMZJzc4SFijOKFM87DsJQ rG/tzvggp5WpuYtXA5oSp5YylB81x9M1HgEtNj/8HfA/25gB8gJbWDMuqQPkf2EBhpzCbD X4pph+jDmhSWSlFQe3v3uL9dYPsUtnyHDMfFn9H4rCVxKO2jr/yFyDDkct72PqAngpSKo7 p+OJu/rEMwdmuUzlhwT2wIOheO188wYA9RTkBH6WWQyd4hMq5NYtheS70qzzKOSm8yPEib yngNOxa1SModNT66V9Ru10eXi7wV5U7J6/Sx0G3FDDpal65l7lHYKX6BLuKbXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717735352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PPxeM0i5dn/R7LhEmUmUYR8CFkDcMJx7vJvfsmJDufI=; b=SST80RVfOwPrV+WT5xypqOEc4u34NhT1Xv92OC8jvK+huUOglqpdhG4R8FUWin3tqndn55 Do0XTaDz0JoIJBWKrA7H7qqKvXG5M44dszHe6Qh9vh7FDf1GYkNw0r+pFfRtooBuWcBhTk NgYIULRZ9Jc6MPRfuDMdSCEAaMlpYRpRTDEkRZPzUr5YwqlcCnEs5m1O2SdFFNO1h9BIdz CmGekIO8d7KE3/rebGCH6gC8If3NgxC0wpOFrke0OFGzzQf1QT4C9ZnWGp0lSKWGZKBxA9 ujYHWMNlexQiqCpW9AXDpqSJX2ugLGyFtNOL2l/l4k/nzJWraAReXHDRT7gd6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VwT884gXTz1F68; Fri, 7 Jun 2024 04:42:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4574gWQ1056750; Fri, 7 Jun 2024 04:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4574gWbE056747; Fri, 7 Jun 2024 04:42:32 GMT (envelope-from git) Date: Fri, 7 Jun 2024 04:42:32 GMT Message-Id: <202406070442.4574gWbE056747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 560360477376 - main - textproc/opensearch*: Fix openserach210 PORTREVISION List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 560360477376327f00e563389576d7b11b29f28c Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=560360477376327f00e563389576d7b11b29f28c commit 560360477376327f00e563389576d7b11b29f28c Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-06-07 04:38:25 +0000 Commit: Jose Alonso Cardenas Marquez 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