svn commit: r566633 - head/textproc/apache-solr

[Matthias Fechner]

Author: mfechner
Date: Fri Feb 26 19:31:58 2021
New Revision: 566633
URL: https://svnweb.freebsd.org/changeset/ports/566633

Log:
  Added an option to enable jts support for solr.
  JTS is a topology suite.
  Thanks to Stephane Marzloff <secrer at le-bar.org> for testing the patch.

Modified:
  head/textproc/apache-solr/Makefile
  head/textproc/apache-solr/pkg-plist

Modified: head/textproc/apache-solr/Makefile
==============================================================================
--- head/textproc/apache-solr/Makefile	Fri Feb 26 19:31:04 2021	(r566632)
+++ head/textproc/apache-solr/Makefile	Fri Feb 26 19:31:58 2021	(r566633)
@@ -3,6 +3,7 @@
 
 PORTNAME=	apache-solr
 PORTVERSION=	8.8.0
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/lucene/solr/${PORTVERSION}
 DISTNAME=	solr-${PORTVERSION}
@@ -29,8 +30,17 @@ GROUPS=		${USERS}
 CPE_PRODUCT=	solr
 CPE_VENDOR=	apache
 
+OPTIONS_DEFINE=	JTS
+OPTIONS_SUB=	yes
+JTS_DESC=	Enable support for JTS Topology Suite
+
+JTS_RUN_DEPENDS=	jts>0:math/jts
+
 do-install:
 	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
 	${INSTALL_DATA} ${WRKSRC}/bin/solr.in.sh ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
 	${ECHO} 'SOLR_HOME="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample
@@ -43,5 +53,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/db/solr
 	${MKDIR} ${STAGEDIR}/var/log/solr
 	${INSTALL_DATA} ${WRKSRC}/server/solr/solr.xml ${STAGEDIR}/var/db/solr/solr.xml.sample
+
+do-install-JTS-on:
+	${LN} -sf ${JAVALIBDIR}/jts-core.jar ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/server/solr-webapp/webapp/WEB-INF/lib/
 
 .include <bsd.port.mk>

Modified: head/textproc/apache-solr/pkg-plist
==============================================================================
--- head/textproc/apache-solr/pkg-plist	Fri Feb 26 19:31:04 2021	(r566632)
+++ head/textproc/apache-solr/pkg-plist	Fri Feb 26 19:31:58 2021	(r566633)
@@ -1,5 +1,6 @@
 @sample etc/solr.in.sh.sample
 @sample(solr,solr) /var/db/solr/solr.xml.sample
+%%JTS%%solr/server/solr-webapp/webapp/WEB-INF/lib/jts-core.jar
 solr/CHANGES.txt
 solr/LICENSE.txt
 solr/LUCENE_CHANGES.txt