From nobody Sat Jan 18 21:14:13 2025 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 4Yb8VY6kVhz5ktD9; Sat, 18 Jan 2025 21:14:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yb8VY5dv6z3KCg; Sat, 18 Jan 2025 21:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737234853; 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=0+j6jOdvwq0iN2cL2Kkhyg58Up8nIEDeOilEmiHCjkA=; b=o9n3KzzckzNfRC+czOJoqk867zfCN26K3uhC+0S+SwAWhPI2bIs5A9LoVbRbU9JJnHAiNj GBLX7KytYPAvzEb5R7QM9QA6OXA9x39O49To2Gh0bHfxqJDGqb2wCU+KDdpfOuquZ/AKHy yb80xayHA6X2DyYITfG6XRPlwfp0EElyL7Ig8XjeJJlufWXfcLgqbrqGI0/5N6Bzd+a/wE DAk9pWasQ+lOZjXIopUCUuKr+kHrvf4Mpbaxq+mkdYPPsHn5p3CG4jg1vT8EcDSxFECi7Z DE3SgDIojo2xaXU/joteYcizCkIkkh6EZIT0/6s5V5Dj6dcfYVUcf7MoF+pqHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737234853; 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=0+j6jOdvwq0iN2cL2Kkhyg58Up8nIEDeOilEmiHCjkA=; b=SoFN5eIHx65m5LIzzT8oBlrkpCYJFX4mxXtxH8y5oDYLNQ8L2ulc5YIYAL27UTC4cTy8eW 1iJvIOOvioGg/FtTQsX2qLel3cmMvTB2Gv5N/Xg9Z2hGz7uts/09XslKsXXm9cjpbcamNN 03NvIPZiq6KIOLyplg/xJUQL4pblWbNPDNg7CRQhKvvSOfM/Jid2GoB4ltgrSSGW4po8Lr Tv0VQu0Q37/bN4GXjGiw4dOpR0X63cGNKoIbz/USpzcIfoyZWJscbjsoCuXRpO28etrudo Wkw0VgYwJLKVapXA+Lo7n4utootfL0c+nBV6Av5+HxneKeA1myw8V+oE450Efg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737234853; a=rsa-sha256; cv=none; b=IaAQu94SnXX6Tpev96mIMoRP/F7TZl1V4AXpLhA4FulUde0Tdq1SMK2T8q0GK51piL3KrT ieGBNVzQEphgKwIgncAcbNzFkkP2dflEPYzsChyfNzCRKmvrB67EK+X1SrCtV/8BhTuWsf WubZmp9o64gJ2oX7qyDiLaLFF62b3kZmD9/4On0t5GdOdba1oHu3Xgb6DXXDELNALgnwbl VgOzJDo+O7jy/5TBx3kft8GCMD0i8mO/qP9j9OjiFrGfSsmMBn1CueWWHmg/RAntUweasC lNW946eeMybJ7FZgY/1SOO/oJ58RXVvkj4kQy4LlavvJcEd/Qgk0TvmOH1zpAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yb8VY54VNz5mk; Sat, 18 Jan 2025 21:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50ILEDWp073999; Sat, 18 Jan 2025 21:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ILEDcp073996; Sat, 18 Jan 2025 21:14:13 GMT (envelope-from git) Date: Sat, 18 Jan 2025 21:14:13 GMT Message-Id: <202501182114.50ILEDcp073996@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: b1a9f601c2c9 - main - textproc/opensearch*: Add new entry to CONFLICTS 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: b1a9f601c2c95ee393cff39926119a75e0175532 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1a9f601c2c95ee393cff39926119a75e0175532 commit b1a9f601c2c95ee393cff39926119a75e0175532 Author: Jose Alonso Cardenas Marquez AuthorDate: 2025-01-18 21:05:50 +0000 Commit: Jose Alonso Cardenas Marquez 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}