ports/153407: [PATCH] net/openmq: update to 4.5.b.22
Radim Kolar
hsn at sendmail.cz
Thu Dec 23 18:30:12 UTC 2010
>Number: 153407
>Category: ports
>Synopsis: [PATCH] net/openmq: update to 4.5.b.22
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 23 18:30:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Radim Kolar
>Release: FreeBSD 8.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD fbsd8.localdomain 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Mon Dec 6 17:46:22 CET
>Description:
- Update to 4.5.b.22
reworked startup rc.d script a bit
support for imq_flags
Port maintainer (hsn at sendmail.cz) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- openmq-4.5.b.22,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/openmq/Makefile /home/hsn/ports/openmq/Makefile
--- /usr/ports/net/openmq/Makefile 2010-12-17 11:37:04.000000000 +0100
+++ /home/hsn/ports/openmq/Makefile 2010-12-23 18:01:57.479642394 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/net/openmq/distinfo /home/hsn/ports/openmq/distinfo
--- /usr/ports/net/openmq/distinfo 2010-12-17 11:37:04.000000000 +0100
+++ /home/hsn/ports/openmq/distinfo 2010-12-23 18:03:07.786113747 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/net/openmq/files/imq.in /home/hsn/ports/openmq/files/imq.in
--- /usr/ports/net/openmq/files/imq.in 2010-12-17 11:37:04.000000000 +0100
+++ /home/hsn/ports/openmq/files/imq.in 2010-12-23 18:28:14.893211437 +0100
@@ -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 @@
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 @@
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 @@
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"
--- openmq-4.5.b.22,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list