From nobody Tue Dec 24 20:04:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHm7b1nHFz5hmV0; Tue, 24 Dec 2024 20:04:27 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHm7b0rB0z4Dx5; Tue, 24 Dec 2024 20:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735070667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPNmWj3hnuNPL3qkz1pIp50dLUFlh8s9H0DnC9smamc=; b=bteZBAG/gX3SuUCTMbGhArAuIAwbuWfPMEh4xUdXAM4BjCWPsHCA9gHMhsV1UT9icvf/9H U86hSt5IsXULjTlv1SAkhzTLyObQV5xS6rYcg1x1N0Ol9QrgCiXvMN0pHtrQwXEtten3RT S44NgePPaUso5NYkRhS5GZgJisKBL97IPXLE00H1y811vAy21wHXCJqV4rXUsPwNkFpEz2 /guRzWZ3mZnP6hoCvPX9bbcdkcRzYVBy0VRGCI+VPxO7XL4T2//Dcwp/5rtfApJnWspCu3 XzakfUlL7b59fHTzrS1UKsSoxVCC7ciiKSJ6Kq2DHheQAFH2+tRc0QXP9PM+0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735070667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MPNmWj3hnuNPL3qkz1pIp50dLUFlh8s9H0DnC9smamc=; b=iCrUCY6EJvlNjONfuIK4lJE75/FW3lpNzBinIIdHQZuH07YLZ0U5IkhEZzskHW991Ap0YD WUlkGWgKltL9r+l6qgLoQjn7WiF0jBMnVnRZsTMt1L8NG4Eh8QsqQlCaDqLSbeBBSa4qmW s+RBNa7AA3+CmIvgjBo8I2E6xiO2ox3bGdEmKFCsrM64V0tXwuPNFEENyFdeVJPqSrZ1A1 sn+pm7Tf2j2LZG57IWP/zgGiDUfbJjAj3QcgNXXUYWWym19ahWaa8lsZY6W+RIMIJ7b0bB fu03zbC80wOh5EbStBZ9H4C7xq6LMxsPyQFP9yyRLNdSuUqPLSNrFegqsSieOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735070667; a=rsa-sha256; cv=none; b=FxGhrWNBsQyikyr7EKCpvg1z109F6pQVbRyUy+BC/aOY9bPqjX1J9JEpYukSY50ZwxLDvM lxUmgs7W92DHNVUWhY/X0j2FKdtUVZZmfNDQu12ZjZRy21SW9hhAk26K7AFtg+EKbmAO98 9QVOhh5AXWY0etf28v35d2JfotR4+YWBlilnuzAGhVzXd76uhm80wMRIfKiLhKifRTi3VB 9PRjhxDZDrZ8By6HaJkHRQIkYRFQZdhjSrrnV2PrOsex3O22NJ3dVQUdRMkkn4nR5u9z07 mKweMoz9yQDrophYdnjAERK16Cekz9D3pbt2O01krccQ3iz0oXcnQgKFu+w6wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHm7b0DZsztbW; Tue, 24 Dec 2024 20:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BOK4QvZ088016; Tue, 24 Dec 2024 20:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BOK4Q7g088013; Tue, 24 Dec 2024 20:04:26 GMT (envelope-from git) Date: Tue, 24 Dec 2024 20:04:26 GMT Message-Id: <202412242004.4BOK4Q7g088013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: ae65bcdddf1a - main - textproc/apache-solr8: Remove expired port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae65bcdddf1a8fb96394af0afbdeffc2036b96f1 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae65bcdddf1a8fb96394af0afbdeffc2036b96f1 commit ae65bcdddf1a8fb96394af0afbdeffc2036b96f1 Author: Rene Ladan AuthorDate: 2024-12-24 20:04:14 +0000 Commit: Rene Ladan 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 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: < - -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: <