textproc/apache-solr: switch to version 9

For more details look on 20230618 in UPDATING

13 files changed, 57 insertions, 42 deletions

diff --git a/MOVED b/MOVED
index de78541930eb..ac4e1dd3e6f2 100644
--- a/MOVED
+++ b/MOVED
@@ -7646,3 +7646,4 @@ x11/deforaos-panel||2023-06-18|Has expired: Broken on all supported versions
 x11/deforaos-desktop||2023-06-18|Removed, needs expired x11/deforaos-panel
 x11/deforaos-locker||2023-06-18|Removed, needs expired x11/deforaos-panel
 comms/deforaos-phone||2023-06-18|Removed, needs expired x11/deforaos-panel
+textproc/apache-solr9|textproc/apache-solr|2023-06-18|New stable release
diff --git a/UPDATING b/UPDATING
index b8b56619cfd3..4d8406807203 100644
--- a/UPDATING
+++ b/UPDATING
@@ -42,6 +42,19 @@ you update your ports collection, before attempting any port upgrades.
   Another variable is introduced in rc.d script, soft_serve_data_path,
   indicating the path to data directory used by soft-serve.
 
+20230618:
+  AFFECTS: textproc/apache-solr*
+  AUTHOR: mfechner@FreeBSD.org
+
+  Apache solr is upgraded to version 9.
+  Data migration is required, examples for dovecot data can be found here:
+  https://dovecot.org/pipermail/dovecot/2022-May/124701.html
+  https://dovecot.org/pipermail/dovecot/2022-May/124711.html
+
+  If you like to stay on version8:
+  # pkg delete apache-solr
+  # pkg install apache-solr8
+
 20230609:
   AFFECTS: users of security/sequoia
   AUTHOR: vishwin@FreeBSD.org
diff --git a/textproc/Makefile b/textproc/Makefile
index 3abe9a238d4c..8d8917cf94b0 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -52,7 +52,7 @@
     SUBDIR += apache-commons-digester
     SUBDIR += apache-poi
     SUBDIR += apache-solr
-    SUBDIR += apache-solr9
+    SUBDIR += apache-solr8
     SUBDIR += apache-xmlbeans
     SUBDIR += apertium
     SUBDIR += apertium-eng
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index 8e864555dd08..7bc5ef3b5cb2 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	apache-solr
-PORTVERSION=	8.11.2
+PORTVERSION=	9.2.0
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	textproc java
-MASTER_SITES=	https://archive.apache.org/dist/lucene/solr/${PORTVERSION}/
+MASTER_SITES=	https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
 DISTNAME=	solr-${PORTVERSION}
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -15,19 +15,22 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe tar:tgz
+CPE_VENDOR=	apache
+CPE_PRODUCT=	solr
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 JAVA_RUN=	yes
-NO_BUILD=	yes
+USE_RC_SUBR=	solr
+
 NO_ARCH=	yes
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+NO_BUILD=	yes
+
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	solr
+
 USERS=		solr
 GROUPS=		${USERS}
 
-CPE_PRODUCT=	solr
-CPE_VENDOR=	apache
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	JTS
 OPTIONS_SUB=	yes
@@ -38,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-solr/distinfo b/textproc/apache-solr/distinfo
index e72f763a3c70..1072d03ea14c 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655708783
-SHA256 (solr-8.11.2.tgz) = 54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6
-SIZE (solr-8.11.2.tgz) = 218171227
+TIMESTAMP = 1682234904
+SHA256 (solr-9.2.0.tgz) = 8b134a13a3e7598f68565b01e755a47e24b37a88141cd2f489fc2812c96f21af
+SIZE (solr-9.2.0.tgz) = 278193419
diff --git a/textproc/apache-solr/files/pkg-message.in b/textproc/apache-solr/files/pkg-message.in
index 9a5826983431..bfbc748d17b9 100644
--- a/textproc/apache-solr/files/pkg-message.in
+++ b/textproc/apache-solr/files/pkg-message.in
@@ -14,11 +14,6 @@ http://lucene.apache.org/solr/resources.html#documentation
 
 The port is configured to listen only on localhost, port 8983.
 
-To have a working initial config, use:
-
-cp -R %%LOCALBASE%%/solr/example/example-DIH/solr/solr /var/db/solr/
-chown -R solr /var/db/solr/solr
-
 To rotate solr log files include /var/log/solr/ to your log rotation
 configuration.
 
@@ -37,9 +32,18 @@ If you would like to change logging, copy:
 cp %%LOCALBASE%%/solr/server/resources/log4j2.xml /var/db/solr/
 Change it and make sure it is loaded in %%LOCALBASE%%/etc/solr.in.sh.
 
+Data Import Handler (DIH) has been removed from the base solr and is
+available as independent module which can be installed with solr
+package manager. The current repo is available at:
+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/8_9/solr-upgrade-notes.html
+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
 }
 ]
diff --git a/textproc/apache-solr9/Makefile b/textproc/apache-solr8/Makefile
index 23be209eeba8..40d1d758b648 100644
--- a/textproc/apache-solr9/Makefile
+++ b/textproc/apache-solr8/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	apache-solr
-PORTVERSION=	9.2.0
+PORTVERSION=	8.11.2
 PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	textproc java
-MASTER_SITES=	https://archive.apache.org/dist/solr/solr/${PORTVERSION}/
+MASTER_SITES=	https://archive.apache.org/dist/lucene/solr/${PORTVERSION}/
 DISTNAME=	solr-${PORTVERSION}
-PKGNAMESUFFIX=	9
+PKGNAMESUFFIX=	8
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	High performance search server built using Lucene Java
@@ -15,22 +16,19 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe tar:tgz
-CPE_VENDOR=	apache
-CPE_PRODUCT=	solr
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 JAVA_RUN=	yes
-USE_RC_SUBR=	solr
-
-NO_ARCH=	yes
 NO_BUILD=	yes
-
+NO_ARCH=	yes
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 SUB_FILES=	pkg-message
-
+USE_RC_SUBR=	solr
 USERS=		solr
 GROUPS=		${USERS}
 
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+CPE_PRODUCT=	solr
+CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=	JTS
 OPTIONS_SUB=	yes
@@ -41,6 +39,7 @@ 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-solr8/distinfo b/textproc/apache-solr8/distinfo
new file mode 100644
index 000000000000..e72f763a3c70
--- /dev/null
+++ b/textproc/apache-solr8/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1655708783
+SHA256 (solr-8.11.2.tgz) = 54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6
+SIZE (solr-8.11.2.tgz) = 218171227
diff --git a/textproc/apache-solr/files/patch-bin_solr b/textproc/apache-solr8/files/patch-bin_solr
index 0ea5bdcbddd3..0ea5bdcbddd3 100644
--- a/textproc/apache-solr/files/patch-bin_solr
+++ b/textproc/apache-solr8/files/patch-bin_solr
diff --git a/textproc/apache-solr9/files/pkg-message.in b/textproc/apache-solr8/files/pkg-message.in
index bfbc748d17b9..9a5826983431 100644
--- a/textproc/apache-solr9/files/pkg-message.in
+++ b/textproc/apache-solr8/files/pkg-message.in
@@ -14,6 +14,11 @@ http://lucene.apache.org/solr/resources.html#documentation
 
 The port is configured to listen only on localhost, port 8983.
 
+To have a working initial config, use:
+
+cp -R %%LOCALBASE%%/solr/example/example-DIH/solr/solr /var/db/solr/
+chown -R solr /var/db/solr/solr
+
 To rotate solr log files include /var/log/solr/ to your log rotation
 configuration.
 
@@ -32,18 +37,9 @@ If you would like to change logging, copy:
 cp %%LOCALBASE%%/solr/server/resources/log4j2.xml /var/db/solr/
 Change it and make sure it is loaded in %%LOCALBASE%%/etc/solr.in.sh.
 
-Data Import Handler (DIH) has been removed from the base solr and is
-available as independent module which can be installed with solr
-package manager. The current repo is available at:
-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
+https://solr.apache.org/guide/8_9/solr-upgrade-notes.html
 EOM
 }
 ]
diff --git a/textproc/apache-solr9/files/solr.in b/textproc/apache-solr8/files/solr.in
index 9a73d64362ce..9a73d64362ce 100644
--- a/textproc/apache-solr9/files/solr.in
+++ b/textproc/apache-solr8/files/solr.in
diff --git a/textproc/apache-solr9/pkg-descr b/textproc/apache-solr8/pkg-descr
index ba1ba6e03733..ba1ba6e03733 100644
--- a/textproc/apache-solr9/pkg-descr
+++ b/textproc/apache-solr8/pkg-descr
diff --git a/textproc/apache-solr9/distinfo b/textproc/apache-solr9/distinfo
deleted file mode 100644
index 1072d03ea14c..000000000000
--- a/textproc/apache-solr9/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1682234904
-SHA256 (solr-9.2.0.tgz) = 8b134a13a3e7598f68565b01e755a47e24b37a88141cd2f489fc2812c96f21af
-SIZE (solr-9.2.0.tgz) = 278193419