From 79d02242b24f2b6f43ef46af3cf86350f2508bbc Mon Sep 17 00:00:00 2001
From: Matthias Fechner <mfechner@FreeBSD.org>
Date: Sun, 23 Apr 2023 11:26:41 +0300
Subject: [PATCH] textproc/apache-solr9: update from 9.1.1 -> 9.2.0

Changelog:
https://solr.apache.org/news.html#apache-solrtm-920-available
---
 textproc/apache-solr9/Makefile             |  3 +--
 textproc/apache-solr9/distinfo             |  6 ++---
 textproc/apache-solr9/files/patch-bin_solr | 31 ----------------------
 textproc/apache-solr9/files/pkg-message.in |  4 +++
 4 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 textproc/apache-solr9/files/patch-bin_solr

diff --git a/textproc/apache-solr9/Makefile b/textproc/apache-solr9/Makefile
index fb41a287b8b81..23be209eeba8e 100644
--- a/textproc/apache-solr9/Makefile
+++ b/textproc/apache-solr9/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	apache-solr
-PORTVERSION=	9.1.1
+PORTVERSION=	9.2.0
 PORTREVISION=	0
 CATEGORIES=	textproc java
 MASTER_SITES=	https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
@@ -41,7 +41,6 @@ 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/oom_solr.sh ${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
diff --git a/textproc/apache-solr9/distinfo b/textproc/apache-solr9/distinfo
index 157bdf0ee4a8c..1072d03ea14c2 100644
--- a/textproc/apache-solr9/distinfo
+++ b/textproc/apache-solr9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676718132
-SHA256 (solr-9.1.1.tgz) = 3d66aadb0afa69360da05a9124e7724539c7d5e41adecb7a736921baf6b97575
-SIZE (solr-9.1.1.tgz) = 229955064
+TIMESTAMP = 1682234904
+SHA256 (solr-9.2.0.tgz) = 8b134a13a3e7598f68565b01e755a47e24b37a88141cd2f489fc2812c96f21af
+SIZE (solr-9.2.0.tgz) = 278193419
diff --git a/textproc/apache-solr9/files/patch-bin_solr b/textproc/apache-solr9/files/patch-bin_solr
deleted file mode 100644
index 1c15691df53ed..0000000000000
--- a/textproc/apache-solr9/files/patch-bin_solr
+++ /dev/null
@@ -1,31 +0,0 @@
---- bin/solr.orig	2022-04-25 20:37:26 UTC
-+++ bin/solr
-@@ -2269,13 +2269,12 @@ function start_solr() {
- 	echo ""
-     fi
-     # no lsof on cygwin though
--    if lsof -v 2>&1 | grep -q revision; then
-       echo -n "Waiting up to $SOLR_START_WAIT seconds to see Solr running on port $SOLR_PORT"
-       # Launch in a subshell to show the spinner
-       (loops=0
-       while true
-       do
--        running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN || :)
-+        running=$(sockstat -ls -P tcp -p $SOLR_PORT | grep LISTEN)
-         if [ -z "${running:-}" ]; then
-           slept=$((loops * 2))
-           if [ $slept -lt $SOLR_START_WAIT ]; then
-@@ -2293,13 +2292,6 @@ function start_solr() {
-         fi
-       done) &
-       spinner $!
--    else
--      echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT."
--      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"
--      return;
--    fi
-   fi
- }
- 
diff --git a/textproc/apache-solr9/files/pkg-message.in b/textproc/apache-solr9/files/pkg-message.in
index 4ff8a03f0ec2c..bfbc748d17b97 100644
--- a/textproc/apache-solr9/files/pkg-message.in
+++ b/textproc/apache-solr9/files/pkg-message.in
@@ -40,6 +40,10 @@ https://github.com/rohitbemax/dataimporthandler
 Make also sure to always check the manual if you need to modify your
 configs or schemas:
 https://solr.apache.org/guide/9_0/solr-upgrade-notes.html
+
+Maybe you want also to check some examples:
+https://dovecot.org/pipermail/dovecot/2022-May/124701.html
+https://dovecot.org/pipermail/dovecot/2022-May/124711.html
 EOM
 }
 ]