From nobody Fri Mar 13 02:34:17 2026 X-Original-To: dev-commits-ports-main@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 4fX7px4MVvz6VBpw for ; Fri, 13 Mar 2026 02:34:17 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fX7px3V1xz3PS4 for ; Fri, 13 Mar 2026 02:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773369257; 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=bvWK47EyMUCQXNiyxvMB24+HX4yHoXaE6CyXQD6P33E=; b=iyPoJaVF37HKDTC7mCSyU4BBZAtHdfbVUT4A2oCCdxpqez+jhe9nj75dE1HtiV8kK9kJGR +v/I2/Ce4zcMG0EVwqNNCEvxwP2o7h5ezE0G++2Gfui7BrMPZ/cd9Hs/byA33mPgDEUXHh VyGjbrC2almly/btRPBYLvBogBUDRBw8Sfe28aABpFskdjnUotaAh2cTPCLHQUmeBsP691 rIXar49zYt5sPc91f50gdiEBpm8AdzAOjNIRjI1hyZm+cKTjIhdk5Gg86ezgrkLKk5YNTQ YvX1ivvf86stuvBIhFe3Vh7QB/gg4b2yK+N9AHbrsh/7Mu0aPGUyEICmLn+rZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773369257; a=rsa-sha256; cv=none; b=io8Tr9xBtXfemH9inVjyHryGEsIg7NqB0azfMiZ5HClnpZnxEaU769Ds5sKSk427GWfQ0B 28FcENvnqA4AsRTpqYPvDzQ73/okG/lcwOU5U2vaIoCc5P7Tf3JY8WX9t3YJMhC51GyDuW qUXAiK9E1MKTVRoYOuOYbIHI33R18r4WmQVFGP4w7PLgYUdfPIcY5OPBzUYDbyRoGDSwhy vWLIAkbALraYoWVKEIxg1C09g5MkQEBHIAYii0SSrl2Ulay3OVj6J4xG1pdANR8E9bGJmA awvR75AdNnT9sryb/E6zhcKdX5mKyzUT1AW+7sfY0R1jJbCsS/R669Y0ncO5nA== 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=1773369257; 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=bvWK47EyMUCQXNiyxvMB24+HX4yHoXaE6CyXQD6P33E=; b=SbGAweMqm9/6AJ5Emq8osefgwGjk2nUFQf4exw0SL+WnCrR/2TJaE/pU2kjtHgoDem43/k JmsQFl9KsAFBl/0if/9/blz2wIXnZJH92RlCsnXPd7SHM/Cc3ILtwmpyPvbpcdkCF5+cOF nuc/uPCLq6WydoC5jDkAgWEnoLNcOZRlYvt6o6RfokHSU72UvLy+e3cJckSecj/uokCwlB iWKZAjffwDCkoJXa4Td+bZ0F0GHfRX+E8e71atDfjGaRGnl+pwowMRvvhfVR3mwA7V9uKq sS6QN9fQyjG701ERS5/WQCfrscsDv4BXx9xSYDbY3MPkG0HeFoLOMkTMxe4DQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fX7px2vp3z1Bw5 for ; Fri, 13 Mar 2026 02:34:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b9c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 02:34:17 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 33d68c58fb58 - main - textproc/elasticsearch7: Fix build with non-default USERS/GROUPS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33d68c58fb5855aab6fe665b7f380aa42a2c6672 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 02:34:17 +0000 Message-Id: <69b377a9.3b9c0.2f60c541@gitrepo.freebsd.org> The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=33d68c58fb5855aab6fe665b7f380aa42a2c6672 commit 33d68c58fb5855aab6fe665b7f380aa42a2c6672 Author: Vladimir Druzenko AuthorDate: 2026-03-13 02:32:52 +0000 Commit: Vladimir Druzenko CommitDate: 2026-03-13 02:32:52 +0000 textproc/elasticsearch7: Fix build with non-default USERS/GROUPS Also use ${ETCDIR} instead of ${PREFIX}/etc/elasticsearch. Approved by: blanket (fix build) MFH: 2026Q1 --- textproc/elasticsearch7/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile index 0128d84994b4..897904e7d900 100644 --- a/textproc/elasticsearch7/Makefile +++ b/textproc/elasticsearch7/Makefile @@ -77,7 +77,7 @@ post-patch: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/elasticsearch-env do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch \ + ${MKDIR} ${STAGEDIR}${ETCDIR} \ ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin \ ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins \ ${STAGEDIR}${PREFIX}/libexec/elasticsearch @@ -104,6 +104,6 @@ post-install: ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST} ${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST} - ${ECHO} "@dir(elasticsearch,elasticsearch,0755) ${ETCDIR}" >> ${TMPPLIST} + ${ECHO} "@dir(${SEARCHUSER},${SEARCHGROUP},0755) ${ETCDIR}" >> ${TMPPLIST} .include