diff options
| -rw-r--r-- | net/openmq/Makefile | 4 | ||||
| -rw-r--r-- | net/openmq/distinfo | 4 | ||||
| -rw-r--r-- | net/openmq/files/imq.in | 79 |
3 files changed, 49 insertions, 38 deletions
diff --git a/net/openmq/Makefile b/net/openmq/Makefile index 5c5ca45c4140..b5d93c1e7c94 100644 --- a/net/openmq/Makefile +++ b/net/openmq/Makefile @@ -6,10 +6,10 @@ # PORTNAME= openmq -PORTVERSION= 4.5.b.21 +PORTVERSION= 4.5.b.22 PORTEPOCH= 1 CATEGORIES= net java -MASTER_SITES= http://download.java.net/mq/open-mq/4.5/b21/ \ +MASTER_SITES= http://download.java.net/mq/open-mq/4.5/b22/ \ http://download.java.net/maven/2/javax/javaee-api/6.0/:2 \ http://download.java.net/maven/2/com/sun/grizzly/grizzly-nio-framework/1.9.18a/:3 \ http://download.java.net/maven/2/com/sun/woodstock/dependlibs/jhall/2.0/:4 diff --git a/net/openmq/distinfo b/net/openmq/distinfo index d2a454255927..bf4f6fec748a 100644 --- a/net/openmq/distinfo +++ b/net/openmq/distinfo @@ -1,5 +1,5 @@ -SHA256 (openmq4_5-source.zip) = 4a66b9b8a9b240b059a4727e10fca4c5f3088d37c16b013a221ae4f63c334758 -SIZE (openmq4_5-source.zip) = 6676302 +SHA256 (openmq4_5-source.zip) = 0b6f31a02b6c52d672df3afb35aad180dabcbc949de5e75dc513b670f6abb67a +SIZE (openmq4_5-source.zip) = 6679372 SHA256 (javaee-api-6.0.jar) = a045eac0ff80c5c0fd29b680599f27598abff16b1e6c9df46ce962a4e0b1390e SIZE (javaee-api-6.0.jar) = 979616 SHA256 (grizzly-nio-framework-1.9.18a.jar) = 7613172e7f3b6012f3cb6f7f25c3e562742e8ac6490062938015e6d60c22e2e9 diff --git a/net/openmq/files/imq.in b/net/openmq/files/imq.in index ac2d88e1b1e7..f51eb8171dfe 100644 --- a/net/openmq/files/imq.in +++ b/net/openmq/files/imq.in @@ -25,7 +25,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id$ +# $FreeBSD$ # PROVIDE: imq # REQUIRE: DAEMON @@ -50,7 +50,8 @@ rcvar=`set_rcvar` load_rc_config $name pidfile=/var/run/imq.pid start_cmd="${name}_start" -command=/usr/local/imq/bin/imqbrokerd +start_precmd="${name}_build_cmdline" +command=%%PREFIX%%/imq/bin/imqbrokerd command_args="-bgnd -silent" command_interpreter="/bin/sh" sigstop=INT @@ -66,38 +67,6 @@ if ! checkyesno ${rcvar}; then fi fi -#check if RESTART feature is enabled -if [ -f $CONF_FILE -a -r $CONF_FILE ]; then - autorestart=`grep "^RESTART=" $CONF_FILE | cut -c9-` - autoargs=`grep "^ARGS=" $CONF_FILE | cut -c6-` - if checkyesno autorestart; then - command_args="$command_args -autorestart" - fi -fi - -#add vmargs if needed -if [ -n "$imq_vmargs" ]; then - command_args="$command_args -vmargs \"$imq_vmargs\"" -fi - -#load aditional command line arguments from broker config file -if [ -n $autoargs ]; then - echo "$autoargs" | grep -q -- '-varhome' - if [ ! $? -eq 0 ]; then - command_args="$command_args -varhome $imq_data $autoargs" - else - command_args="$command_args $autoargs" - fi -fi - -#add brokerlist if not yet defined -if [ -n "$imq_brokerlist" ]; then - echo "$command_args" | grep -q -- '-cluster ' - if [ ! $? -eq 0 ]; then - command_args="$command_args -cluster $imq_brokerlist" - fi -fi - imq_start() { if [ -z "$rc_pid" ]; then @@ -110,4 +79,46 @@ imq_start() fi } +imq_build_cmdline() +{ + # add imq_flags + if [ -n "$imq_flags" ]; then + command_args="$command_args $imq_flags" + fi + + #check if RESTART feature is enabled + if [ -f $CONF_FILE -a -r $CONF_FILE ]; then + autorestart=`grep "^RESTART=" $CONF_FILE | cut -c9-` + autoargs=`grep "^ARGS=" $CONF_FILE | cut -c6-` + if checkyesno autorestart; then + command_args="$command_args -autorestart" + fi + fi + + #add imq_vmargs if needed + if [ -n "$imq_vmargs" ]; then + command_args="$command_args -vmargs \"$imq_vmargs\"" + fi + + #load aditional command line arguments from broker config file + if [ -n $autoargs ]; then + echo "$autoargs" | grep -q -- '-varhome' + if [ ! $? -eq 0 ]; then + command_args="$command_args -varhome $imq_data $autoargs" + else + command_args="$command_args $autoargs" + fi + fi + + #add brokerlist if not yet defined + if [ -n "$imq_brokerlist" ]; then + echo "$command_args" | grep -q -- '-cluster ' + if [ ! $? -eq 0 ]; then + command_args="$command_args -cluster $imq_brokerlist" + fi + fi + + return 0 +} + run_rc_command "$1" |