From owner-svn-ports-all@freebsd.org Fri Feb 26 19:31:59 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8943954C5B1; Fri, 26 Feb 2021 19:31:59 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DnKXv3YsVz4msy; Fri, 26 Feb 2021 19:31:59 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D225105C0; Fri, 26 Feb 2021 19:31:59 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11QJVxDI000847; Fri, 26 Feb 2021 19:31:59 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11QJVxZA000845; Fri, 26 Feb 2021 19:31:59 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202102261931.11QJVxZA000845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 26 Feb 2021 19:31:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566633 - head/textproc/apache-solr X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: head/textproc/apache-solr X-SVN-Commit-Revision: 566633 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2021 19:31:59 -0000 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 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 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