git: 1bd3448790c6 - main - textproc/apache-solr: udpate to 10.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 11 Apr 2026 04:55:29 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1bd3448790c64f54ffa363815661f667ee78bfd2
commit 1bd3448790c64f54ffa363815661f667ee78bfd2
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2026-04-11 04:53:47 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2026-04-11 04:55:27 +0000
textproc/apache-solr: udpate to 10.0.0
Changes: https://solr.apache.org/docs/10_0_0/changes/Changes.html
---
textproc/apache-solr/Makefile | 11 ++++++-----
textproc/apache-solr/distinfo | 6 +++---
textproc/apache-solr/files/patch-bin_solr | 20 ++++++++++----------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 78fd73de1a00..9cc3d200ef99 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -1,6 +1,5 @@
PORTNAME= apache-solr
-PORTVERSION= 9.9.0
-PORTREVISION= 2
+PORTVERSION= 10.0.0
PORTEPOCH= 1
CATEGORIES= textproc java
MASTER_SITES= https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
@@ -17,7 +16,7 @@ RUN_DEPENDS= bash:shells/bash
USES= cpe java tar:tgz
CPE_VENDOR= apache
CPE_PRODUCT= solr
-JAVA_VERSION= 11+
+JAVA_VERSION= 21+
USE_RC_SUBR= solr
NO_ARCH= yes
@@ -42,8 +41,8 @@ JTS_RUN_DEPENDS= jts>0:math/jts
do-install:
${FIND} ${WRKSRC} -name '*.orig' -delete
cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/post ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/postlogs ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
+ #${INSTALL_SCRIPT} ${WRKSRC}/bin/post ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
+ #${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
@@ -64,6 +63,8 @@ do-install-JTS-on:
post-install:
${FIND} -s ${STAGEDIR}${PREFIX}/${CPE_PRODUCT} -not -type d | ${SORT} | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
+ @${ECHO_CMD} "@dir solr/server/solr-webapp/webapp/ui/composeResources/com.arkivanov.decompose.extensions_compose.generated.resources" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dir solr/server/solr-webapp/webapp/ui/composeResources/components.resources.library.generated.resources" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(solr,solr) /var/db/solr" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(solr,solr) /var/log/solr" >> ${TMPPLIST}
@${ECHO_CMD} "@sample etc/solr.in.sh.sample" >> ${TMPPLIST}
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index 253bf2f45c63..d4313fc6c4fa 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1753417265
-SHA256 (solr-9.9.0.tgz) = eb4a888593a58c8415ed959148dd70ae7379a14199195f9bb3743a5bb10a9169
-SIZE (solr-9.9.0.tgz) = 388557950
+TIMESTAMP = 1775814972
+SHA256 (solr-10.0.0.tgz) = 07c180970f60d13776be13ccb60c707d041e5e1a8b914d197d1358ac25f804b5
+SIZE (solr-10.0.0.tgz) = 359361698
diff --git a/textproc/apache-solr/files/patch-bin_solr b/textproc/apache-solr/files/patch-bin_solr
index 9184b2f8ba45..aac6e4e2d636 100644
--- a/textproc/apache-solr/files/patch-bin_solr
+++ b/textproc/apache-solr/files/patch-bin_solr
@@ -1,6 +1,6 @@
---- bin/solr.orig 2024-08-06 17:02:34 UTC
+--- bin/solr.orig 2026-01-02 20:59:41 UTC
+++ bin/solr
-@@ -2027,13 +2027,20 @@ function start_solr() {
+@@ -1352,13 +1352,20 @@ function start_solr() {
fi
# no lsof on cygwin though
@@ -10,24 +10,24 @@
+ elif which -s sockstat; then
+ check_command="sockstat -q46lp$SOLR_PORT"
+ fi
-+
++
+ if [[ "${check_command}" != "" ]]; then
- echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT"
+ echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT_LISTEN"
# Launch in a subshell to show the spinner
(loops=0
while true
do
-- running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN || :)
+- running=$(lsof -t -PniTCP:$SOLR_PORT_LISTEN -sTCP:LISTEN || :)
+ running=$(${check_command} || :)
if [ -z "${running:-}" ]; then
slept=$((loops * 2))
if [ $slept -lt $SOLR_START_WAIT ]; then
-@@ -2052,7 +2059,7 @@ function start_solr() {
+@@ -1377,7 +1384,7 @@ function start_solr() {
done) &
spinner $!
else
-- echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT."
-+ echo -e "NOTE: Please install lsof or sockstat as this script needs it to determine if Solr is listening on port $SOLR_PORT."
+- echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT_LISTEN."
++ echo -e "NOTE: Please install lsof or sockstat as this script needs it to determine if Solr is listening on port $SOLR_PORT_LISTEN."
sleep 10
- SOLR_PID=$(ps auxww | grep start\.jar | awk "/\-Djetty\.port=$SOLR_PORT/"' {print $2}' | sort -r)
- echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
+ SOLR_PID=$(ps auxww | grep start\.jar | awk "/\-Dsolr\.port\.listen=$SOLR_PORT_LISTEN/"' {print $2}' | sort -r)
+ echo -e "\nStarted Solr server on port $SOLR_PORT_LISTEN (pid=$SOLR_PID). Happy searching!\n"