--- src/etc/script/sympa	2003/11/28 18:16:39
+++ src/etc/script/sympa	2004/05/04 21:05:38
@@ -35,6 +35,8 @@
 sympaconf="--CONFIG--"
 wwsympaconf="--WWSCONFIG--"
 
+lockdir="--LOCKDIR--"
+
 ##'echo -n' not supported with SH on Solaris
 if [ ${OSTYPE} = "SunOS" ]; then
   echo_opt=""
@@ -42,6 +44,10 @@
   echo_opt="-n"
 fi
 
+if [ ${OSTYPE} = "FreeBSD" ]; then
+  lockdir="/var/spool/lock"
+fi
+
 # End of parameters
 
 # Current state of the module
@@ -60,7 +66,7 @@
        if [ -f --PIDDIR--/$1.pid ] ; then
              pid=`head -1 --PIDDIR--/$1.pid`
              if [ "$pid" != "" ] ; then
-                 running=`ps -A | grep "$pid"`
+                 running=`ps -ax | grep perl | grep $pid`
                  if [ "$running" != "" ]; then
                      echo "$1 (pid $pid) is active..."
                      return 0
@@ -88,7 +94,7 @@
 #		startparam=""
 #	fi
  
-	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" ]; then
+	if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "SunOS" -o ${OSTYPE} = "FreeBSD" ]; then
 		$sympadir/$1.pl $startparam && echo "success" || echo "failure"
 	else
 		$sympadir/$1.pl $startparam && success || failure
@@ -144,9 +150,9 @@
 	if [ -f --PIDDIR--/$1.pid ]; then
 		echo $echo_opt "Stopping module $1.pl: "
 		pid=`head -1 --PIDDIR--/$1.pid`
-		running=`ps -A | grep "$pid"`
+		running=`ps -ax | grep perl | grep "$pid"`
 		if [ "$running" != "" ]; then
-		    if [ ${OSTYPE} = "IRIX" ]; then
+		    if [ ${OSTYPE} = "IRIX" -o ${OSTYPE} = "FreeBSD" ]; then
 			kill -TERM $pid && echo "success" || echo "failure"
 		    elif [ ${OSTYPE} = "SunOS" ]; then
 			echo "Stopping module $1.pl: terminated"
@@ -180,13 +186,13 @@
 # See how we were called.
 case "$1" in
   start)
-	if [ ! -f --LOCKDIR--/sympa ]; then
+	if [ ! -f "$lockdir/sympa" ]; then
 		echo "Starting Sympa subsystem: "
 		sympa_start sympa
 		sympa_start archived
 		sympa_start bounced
 		sympa_start task_manager
-		touch --LOCKDIR--/sympa
+		touch "$lockdir/sympa"
 		echo
 	else
 
@@ -201,13 +207,13 @@
 	sympa_stop archived
 	sympa_stop sympa
 	sympa_stop task_manager
-	if [ -f --LOCKDIR--/sympa ]; then
-		rm -f --LOCKDIR--/sympa
+	if [ -f "$lockdir/sympa" ]; then
+		rm -f "$lockdir/sympa"
 	fi
 	;;
   status)
 	echo "Status of Sympa subsystem: "
-	if [ -f --LOCKDIR--/sympa ]; then
+	if [ -f "$lockdir/sympa" ]; then
 		echo "Status file for subsystem found."
 	else
 		echo "Status file for subsystem NOT found."