4 files changed, 66 insertions, 4 deletions

diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile
index 823d9d4e96c7..d1f9703e3d8b 100644
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	commons-daemon
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE:S,$,:src,} \
 		${MASTER_SITE_APACHE_COMMONS_BINARIES:S,$,:bin,}
diff --git a/devel/jakarta-commons-daemon/files/patch-man_jsvc.1.xml b/devel/jakarta-commons-daemon/files/patch-man_jsvc.1.xml
new file mode 100644
index 000000000000..769a60dea111
--- /dev/null
+++ b/devel/jakarta-commons-daemon/files/patch-man_jsvc.1.xml
@@ -0,0 +1,10 @@
+--- man/jsvc.1.xml.orig	2012-06-13 12:42:23.000000000 +0200
++++ man/jsvc.1.xml	2012-06-13 12:43:29.000000000 +0200
+@@ -142,7 +142,6 @@
+         <term><option>-wait</option> waittime</term>
+         <listitem>
+           <para>wait up to waittime seconds for the service to start
+-                                       waittime should multiple of 10 (min=10)
+           </para>
+         </listitem>
+       </varlistentry>
diff --git a/devel/jakarta-commons-daemon/files/patch-native_arguments.c b/devel/jakarta-commons-daemon/files/patch-native_arguments.c
new file mode 100644
index 000000000000..94afca5a0eeb
--- /dev/null
+++ b/devel/jakarta-commons-daemon/files/patch-native_arguments.c
@@ -0,0 +1,22 @@
+--- native/arguments.c.orig	2012-02-24 00:24:02.000000000 +0100
++++ native/arguments.c	2012-06-13 13:15:57.000000000 +0200
+@@ -158,7 +158,7 @@
+     args->help    = false;        /* Don't display help */
+     args->chck    = false;        /* Don't do a check-only startup */
+     args->stop    = false;        /* Stop a running jsvc */
+-    args->wait    = 0;            /* Wait until jsvc has started the JVM */
++    args->wait    = 10;           /* Wait until jsvc has started the JVM */
+     args->install = false;        /* Don't install as a service */
+     args->remove  = false;        /* Don't remove the installed service */
+     args->service = false;        /* Don't run as a service */
+@@ -262,10 +262,6 @@
+             temp = optional(argc, argv, x++);
+             if (temp)
+                 args->wait = atoi(temp);
+-            if (args->wait < 10) {
+-                log_error("Invalid wait time specified (min=10)");
+-                return NULL;
+-            }
+         }
+         else if (!strcmp(argv[x], "-umask")) {
+             temp = optional(argc, argv, x++);
diff --git a/devel/jakarta-commons-daemon/files/patch-native_jsvc-unix.c b/devel/jakarta-commons-daemon/files/patch-native_jsvc-unix.c
index 52cd465db73b..da9d4999acfc 100644
--- a/devel/jakarta-commons-daemon/files/patch-native_jsvc-unix.c
+++ b/devel/jakarta-commons-daemon/files/patch-native_jsvc-unix.c
@@ -1,6 +1,35 @@
 --- native/jsvc-unix.c.orig	2012-02-24 00:24:02.000000000 +0100
-+++ native/jsvc-unix.c	2012-03-26 14:14:26.000000000 +0200
-@@ -801,11 +801,11 @@ static int child(arg_data *args, home_da
++++ native/jsvc-unix.c	2012-06-13 12:40:54.000000000 +0200
+@@ -621,18 +621,13 @@
+  */
+ static int wait_child(arg_data *args, int pid)
+ {
+-    int count = 10;
++    int count = args->wait;
+     bool havejvm = false;
+     int fd;
+     char buff[80];
+-    int i, status, waittime;
++    int i, status;
+ 
+     log_debug("wait_child %d", pid);
+-    waittime = args->wait / 10;
+-    if (waittime > 10) {
+-        count = waittime;
+-        waittime = 10;
+-    }
+     while (count > 0) {
+         sleep(1);
+         /* check if the controler is still running */
+@@ -671,7 +666,6 @@
+                 }
+             }
+         }
+-        sleep(waittime);
+         count--;
+     }
+     /* It takes more than the wait time to start,
+@@ -801,11 +795,11 @@
      create_tmp_file(args);
      while (!stopping) {
  #if defined(OSD_POSIX)
@@ -14,7 +43,7 @@
  #endif
          if(doreopen) {
              doreopen = false;
-@@ -824,7 +824,7 @@ static int child(arg_data *args, home_da
+@@ -824,7 +818,7 @@
          return 6;
  
      if (doreload == true)
@@ -23,7 +52,7 @@
      else
          ret = 0;
  
-@@ -1212,12 +1212,12 @@ static int run_controller(arg_data *args
+@@ -1212,12 +1206,12 @@
              if (args->vers != true && args->chck != true && status != 122)
                  unlink(args->pidf);