ports/156154: [patch] graphics/geoserver start script conflicts with net-im/openfire

[Alexey Illarionov]

>Number:         156154
>Category:       ports
>Synopsis:       [patch] graphics/geoserver start script conflicts with net-im/openfire
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 03 15:30:16 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Alexey Illarionov
>Release:        8.1
>Organization:
>Environment:
>Description:
geoserver-2.0.2
openfire-3.6.4

Can not run geoserver when openfire is running:

# /usr/local/etc/rc.d/openfire status
openfire is running as pid 1601
# /usr/local/etc/rc.d/geoserver status
geoserver is running as pid 1601.
# ps dww 1601
  PID  TT  STAT      TIME COMMAND
 1601  ??  SsJ    4:32,47 /usr/local/diablo-jdk1.6.0/bin/java -server -jar -Xmx256M -Dopenfire.lib.dir=/usr/local/share/java/classes -DopenfireHome=/usr/local/share/java/openfire /usr/local/share/java/classes/startup.jar

# /usr/local/etc/rc.d/geoserver start
geoserver already running? (pid=1601).
# /usr/local/etc/rc.d/geoserver stop
Stopping geoserver.
Waiting for PIDS: 1601.
# /usr/local/etc/rc.d/openfire status
openfire not running? (check /var/run/openfire.pid).

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN graphics/geoserver.orig/Makefile graphics/geoserver/Makefile
--- graphics/geoserver.orig/Makefile	2011-04-03 15:05:25.000000000 +0400
+++ graphics/geoserver/Makefile	2011-04-03 15:08:03.000000000 +0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	geoserver
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
diff -ruN graphics/geoserver.orig/files/geoserver.in graphics/geoserver/files/geoserver.in
--- graphics/geoserver.orig/files/geoserver.in	2011-04-03 15:05:25.000000000 +0400
+++ graphics/geoserver/files/geoserver.in	2011-04-03 15:06:53.000000000 +0400
@@ -24,12 +24,16 @@
 : ${geoserver_user="root"}
 : ${geoserver_chdir="%%GEOSERVERDIR%%"}
 
+pidfile=${geoserver_pidfile:-"/var/run/geoserver.pid"}
+
+java="%%JAVA%%"
 java_args="-DGEOSERVER_DATA_DIR=%%GEOSERVERDIR%%/data_dir -Djava.awt.headless=true \
 		-DSTOP.PORT=8079 -DSTOP.KEY=geoserver -jar start.jar"
 log_args=">> ${geoserver_stdout_log} 2>> ${geoserver_stderr_log}"
 
-command="%%JAVA%%"
-command_args="${java_args} ${geoserver_flags} ${log_args} &"
+command="/usr/sbin/daemon"
+command_args="-p ${pidfile} ${java} ${java_args} ${geoserver_flags} ${log_args}"
+procname="${java}"
 
 start_precmd=logs_touch
 


>Release-Note:
>Audit-Trail:
>Unformatted: