Date: Mon, 19 Jun 2023 05:51:12 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b09601725892 - main - textproc/apache-solr: make sure SOLR_HOME points to /var/db/solr Message-ID: <202306190551.35J5pCv0020547@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b096017258921ba1a86a9f5479b4a2f65967299c commit b096017258921ba1a86a9f5479b4a2f65967299c Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2023-06-19 05:49:23 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2023-06-19 05:51:07 +0000 textproc/apache-solr: make sure SOLR_HOME points to /var/db/solr The new solr.in.sh has the last newline removed which caused the SOLR_HOME line not to be added on a new line. Re-added CPE definition, as this was not part of apache-solr9. --- textproc/apache-solr/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile index 5517c348c1e0..0e189ac93f18 100644 --- a/textproc/apache-solr/Makefile +++ b/textproc/apache-solr/Makefile @@ -1,6 +1,6 @@ PORTNAME= apache-solr PORTVERSION= 9.2.1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc java MASTER_SITES= https://archive.apache.org/dist/solr/solr/${PORTVERSION}/ @@ -30,6 +30,9 @@ SUB_FILES= pkg-message USERS= solr GROUPS= ${USERS} +CPE_PRODUCT= solr +CPE_VENDOR= apache + PLIST_SUB+= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= JTS @@ -45,6 +48,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/postlogs ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin ${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin ${INSTALL_DATA} ${WRKSRC}/bin/solr.in.sh ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample + ${ECHO} '' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample ${ECHO} 'SOLR_HOME="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample ${ECHO} '# LOG4J_PROPS="/var/db/solr/log4j2.xml"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample ${ECHO} 'SOLR_LOGS_DIR="/var/log/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306190551.35J5pCv0020547>