Page MenuHomeFreeBSD
Files F109656816

D10416.diff
No OneTemporary
Actions

D10416.diff
View Options

Index: head/textproc/apache-solr/Makefile
===================================================================
--- head/textproc/apache-solr/Makefile
+++ head/textproc/apache-solr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= apache-solr
PORTVERSION= 6.5.0
+PORTREVISION= 1
CATEGORIES= textproc java
MASTER_SITES= APACHE/lucene/solr/${PORTVERSION}
DISTNAME= solr-${PORTVERSION}
@@ -12,10 +13,9 @@
LICENSE= APACHE20
-CONFLICTS_INSTALL= apache-solr3-* apache-solr-4* apache-solr-5*
+RUN_DEPENDS= bash:shells/bash
-RUN_DEPENDS= bash:shells/bash \
- lsof:sysutils/lsof
+CONFLICTS_INSTALL= apache-solr3-* apache-solr-4* apache-solr-5*
USES= cpe tar:tgz
USE_JAVA= yes
Index: head/textproc/apache-solr/files/patch-bin_solr
===================================================================
--- head/textproc/apache-solr/files/patch-bin_solr
+++ head/textproc/apache-solr/files/patch-bin_solr
@@ -0,0 +1,31 @@
+--- bin/solr.orig 2017-04-15 09:06:51 UTC
++++ bin/solr
+@@ -1757,13 +1757,12 @@ function launch_solr() {
+ 1>"$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log" 2>&1 & echo $! > "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
+
+ # no lsof on cygwin though
+- if hash lsof 2>/dev/null ; then # hash returns true if lsof is on the path
+ echo -n "Waiting up to $SOLR_STOP_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 -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_STOP_WAIT ]; then
+@@ -1781,13 +1780,6 @@ function launch_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
+ }
+
Index: head/textproc/apache-solr/files/solr.in
===================================================================
--- head/textproc/apache-solr/files/solr.in
+++ head/textproc/apache-solr/files/solr.in
@@ -54,8 +54,8 @@
su -m solr -c "${command} status"
}
-# add %%LOCALBASE%%/[bin|sbin] to path
-export PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
+# 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

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 12:45 AM (20 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16538188
Default Alt Text
D10416.diff (2 KB)

Event Timeline