git: ae65bcdddf1a - main - textproc/apache-solr8: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Dec 2024 20:04:26 UTC
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae65bcdddf1a8fb96394af0afbdeffc2036b96f1 commit ae65bcdddf1a8fb96394af0afbdeffc2036b96f1 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2024-12-24 20:04:14 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2024-12-24 20:04:14 +0000 textproc/apache-solr8: Remove expired port 2024-12-24 textproc/apache-solr8: Deprecated upstream 2024-10-25, upgrade to version 9 in textproc/apache-solr instead --- MOVED | 1 + textproc/Makefile | 1 - textproc/apache-solr8/Makefile | 72 ------------------------------ textproc/apache-solr8/distinfo | 3 -- textproc/apache-solr8/files/patch-bin_solr | 31 ------------- textproc/apache-solr8/files/pkg-message.in | 45 ------------------- textproc/apache-solr8/files/solr.in | 67 --------------------------- textproc/apache-solr8/pkg-descr | 5 --- 8 files changed, 1 insertion(+), 224 deletions(-) diff --git a/MOVED b/MOVED index 0ef976d3c2d3..e2bdd384d03c 100644 --- a/MOVED +++ b/MOVED @@ -3757,3 +3757,4 @@ devel/ocaml-seq|lang/ocaml|2024-12-10|Has expired: Seq is provided by lang/ocaml textproc/mdocml|textproc/mandoc|2024-12-17|Upstream reanamed www/shellinabox|sysutils/ttyd|2024-12-24|Has expired: Abandonware and outdated, last release in 2016. Use sysutils/ttyd instead audio/spiralsynth|audio/spiralsynthmodular|2024-12-24|Has expired: SpiralSynth isn't being supported any more, use audio/spiralsynthmodular +textproc/apache-solr8|textproc/apache-solr|2024-12-24|Has expired: Deprecated upstream 2024-10-25, upgrade to version 9 in textproc/apache-solr instead diff --git a/textproc/Makefile b/textproc/Makefile index 9985c63deb25..9c034bb69f0d 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -57,7 +57,6 @@ SUBDIR += apache-commons-digester SUBDIR += apache-poi SUBDIR += apache-solr - SUBDIR += apache-solr8 SUBDIR += apache-xmlbeans SUBDIR += apertium SUBDIR += apertium-eng diff --git a/textproc/apache-solr8/Makefile b/textproc/apache-solr8/Makefile deleted file mode 100644 index 883f140d462f..000000000000 --- a/textproc/apache-solr8/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -PORTNAME= apache-solr -PORTVERSION= 8.11.4 -PORTREVISION= 0 -PORTEPOCH= 1 -CATEGORIES= textproc java -MASTER_SITES= https://archive.apache.org/dist/lucene/solr/${PORTVERSION}/ -DISTNAME= solr-${PORTVERSION} -PKGNAMESUFFIX= 8 - -MAINTAINER= mfechner@FreeBSD.org -COMMENT= High performance search server built using Lucene Java -WWW= https://lucene.apache.org/solr/ - -LICENSE= APACHE20 - -DEPRECATED= Deprecated upstream 2024-10-25, upgrade to version 9 in textproc/apache-solr instead -EXPIRATION_DATE= 2024-12-24 - -RUN_DEPENDS= bash:shells/bash - -USES= cpe tar:tgz -USE_JAVA= yes -JAVA_VERSION= 11+ -JAVA_RUN= yes -NO_BUILD= yes -NO_ARCH= yes -PLIST_SUB+= PORTVERSION="${PORTVERSION}" -SUB_FILES= pkg-message -USE_RC_SUBR= solr -USERS= solr -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: - ${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 - ${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 - ${ECHO} '# LOG4J_PROPS="/var/db/solr/log4j2.xml"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample - ${ECHO} 'SOLR_LOGS_DIR="/var/log/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample - ${ECHO} 'SOLR_PORT="8983"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample - ${ECHO} 'SOLR_PID_DIR="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample - ${ECHO} 'SOLR_OPTS="$$SOLR_OPTS -Djetty.host=localhost -Dlog4j2.formatMsgNoLookups=true"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh.sample - - ${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/ - -post-install: - ${FIND} -s ${STAGEDIR}${PREFIX}/${CPE_PRODUCT} -not -type d | ${SORT} | \ - ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${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} - @${ECHO_CMD} "@sample(solr,solr) /var/db/solr/solr.xml.sample" >> ${TMPPLIST} - -.include <bsd.port.mk> diff --git a/textproc/apache-solr8/distinfo b/textproc/apache-solr8/distinfo deleted file mode 100644 index 3e8c5ec51f13..000000000000 --- a/textproc/apache-solr8/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1733319881 -SHA256 (solr-8.11.4.tgz) = 163fbdf246bbd78910bc36c3257ad50cdf31ccc3329a5ef885c23c9ef69e0ebe -SIZE (solr-8.11.4.tgz) = 225264820 diff --git a/textproc/apache-solr8/files/patch-bin_solr b/textproc/apache-solr8/files/patch-bin_solr deleted file mode 100644 index 0ea5bdcbddd3..000000000000 --- a/textproc/apache-solr8/files/patch-bin_solr +++ /dev/null @@ -1,31 +0,0 @@ ---- bin/solr.orig 2020-10-28 09:40:06 UTC -+++ bin/solr -@@ -2255,13 +2255,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 -@@ -2279,13 +2278,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 | grep -w "\-Djetty\.port=$SOLR_PORT" | grep -v grep | awk '{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-solr8/files/pkg-message.in b/textproc/apache-solr8/files/pkg-message.in deleted file mode 100644 index 9a5826983431..000000000000 --- a/textproc/apache-solr8/files/pkg-message.in +++ /dev/null @@ -1,45 +0,0 @@ -[ -{ type: install - message: <<EOM -Make sure to edit the following files to adapt to your setup: - -%%LOCALBASE%%/etc/solr.in.sh -/var/db/solr/solr.xml - -All files are configured to have your solr instances running in -/var/db/solr/<instancename> - -For more information how to configure solr check the manual: -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. - -To enable the port execute: -sysrc solr_enable="YES" - -And start it with: -service solr start -EOM -} -{ type: upgrade - message: <<EOM -If you update, make sure you update your %%LOCALBASE%%/etc/solr.in.sh -The LOG4J_PROPS has changed. -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. - -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 -EOM -} -] diff --git a/textproc/apache-solr8/files/solr.in b/textproc/apache-solr8/files/solr.in deleted file mode 100644 index 9a73d64362ce..000000000000 --- a/textproc/apache-solr8/files/solr.in +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2014, Radim Kolar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -# DAMAGE. - -# -# PROVIDE: solr -# REQUIRE: LOGIN -# KEYWORD: shutdown - -. /etc/rc.subr - -name=solr -rcvar=solr_enable -load_rc_config $name - -: ${solr_enable:=NO} -: ${solr_instance:=/var/db/solr} - -solr_start () -{ - su -m solr -c "${command} start" -} - -solr_stop () -{ - su -m solr -c "${command} stop" -} - -solr_status () -{ - su -m solr -c "${command} status" -} - -# add %%LOCALBASE%%/bin to path -export PATH=$PATH:%%LOCALBASE%%/bin -# let the start script read some custom settings -export SOLR_INCLUDE=/usr/local/etc/solr.in.sh - -required_files="${solr_instance}/solr.xml /usr/local/etc/solr.in.sh" -command=%%PREFIX%%/solr/bin/solr -start_cmd=solr_start -stop_cmd=solr_stop -status_cmd=solr_status - -run_rc_command "$1" diff --git a/textproc/apache-solr8/pkg-descr b/textproc/apache-solr8/pkg-descr deleted file mode 100644 index ba1ba6e03733..000000000000 --- a/textproc/apache-solr8/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Solr is an open source enterprise search server based on the Lucene -Java search library, with XML/HTTP and JSON APIs, hit highlighting, -faceted search, caching, replication, a web administration interface -and many more features. It runs in a Java servlet container such as -Tomcat.