$OpenBSD: patch-bin_activemq,v 1.6 2015/03/15 10:08:37 jasper Exp $
--- bin/activemq.orig	Fri Feb 13 19:05:11 2015
+++ bin/activemq	Mon Mar  2 17:11:22 2015
@@ -148,10 +148,10 @@ fi
 # For using instances
 if ( basename $0 | grep "activemq-instance-" > /dev/null);then
   INST="`basename $0|sed 's/^activemq-instance-//;s/\.sh$//'`"
-  ACTIVEMQ_CONFIGS="/etc/default/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
+  ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemq-instance-${INST} $HOME/.activemqrc-instance-${INST}"
   echo "INFO: Using alternative activemq configuration files: $ACTIVEMQ_CONFIGS"
 else
-  ACTIVEMQ_CONFIGS="/etc/default/activemq $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env"
+  ACTIVEMQ_CONFIGS="${SYSCONFDIR}/activemq.conf $HOME/.activemqrc $ACTIVEMQ_HOME/bin/env"
 fi
 
 # load activemq configuration
@@ -498,7 +498,6 @@ invoke_stop(){
          echo
          echo "INFO: Regular shutdown not successful,  sending SIGKILL to process with pid '$PID'"
          kill -KILL $PID
-         RET="1"
        fi
     elif [ -f "$ACTIVEMQ_PIDFILE" ];then
        echo "ERROR: No or outdated process id in '$ACTIVEMQ_PIDFILE'"
@@ -558,7 +557,7 @@ The configuration of this script is read from the foll
 
     To use additional configurations for running multiple instances on the same operating system
     rename or symlink script to a name matching to activemq-instance-<INSTANCENAME>.
-    This changes the configuration location to /etc/default/activemq-instance-<INSTANCENAME> and
+    This changes the configuration location to ${SYSCONFDIR}/activemq-instance-<INSTANCENAME> and
     \$HOME/.activemqrc-instance-<INSTANCENAME>.
 EOF
   exit 1
@@ -595,4 +594,4 @@ case "$1" in
     ;;
   *)
     invoke_task
-esac
\ No newline at end of file
+esac
