Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Mar 2026 02:35:12 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 0b690433aea6 - 2026Q1 - textproc/elasticsearch7: Fix build with non-default USERS/GROUPS
Message-ID:  <69b377e0.3a2ec.50ba6bb6@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch 2026Q1 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b690433aea60eef332f49853e017e567a239666

commit 0b690433aea60eef332f49853e017e567a239666
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-03-13 02:32:52 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-13 02:35:02 +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
    
    (cherry picked from commit 33d68c58fb5855aab6fe665b7f380aa42a2c6672)
---
 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 <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69b377e0.3a2ec.50ba6bb6>