Ticket #2322: commons-daemon.diffs

Index: patch-native-java.c.diff
===================================================================
RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/java/commons-daemon/files/patch-native-java.c.diff,v
retrieving revision 1.1
diff -u -r1.1 patch-native-java.c.diff
--- patch-native-java.c.diff    11 Oct 2004 19:39:14 -0000      1.1
+++ patch-native-java.c.diff    14 Oct 2004 21:37:20 -0000
@@ -1,21 +1,6 @@
---- src/native/unix/native/java.c.orig Sun Oct 10 12:39:11 2004
-+++ src/native/unix/native/java.c      Sun Oct 10 13:08:48 2004
-@@ -13,12 +13,13 @@
-    See the License for the specific language governing permissions and
-    limitations under the License.
- */
--/* @version $Id: patch-native-java.c.diff,v 1.1 2004/10/11 19:39:14 mww Exp $ */
-+/* @version $Id: patch-native-java.c.diff,v 1.1 2004/10/11 19:39:14 mww Exp $ */
- #include "jsvc.h"
- 
- #ifdef OS_CYGWIN
- typedef long long __int64;
- #endif
-+
- #include <jni.h>
- 
- #ifdef CHARSET_EBCDIC
-@@ -44,6 +45,11 @@
+--- src/native/unix/native/java.c.orig Mon Feb  9 07:55:21 2004
++++ src/native/unix/native/java.c      Thu Oct 14 14:19:34 2004
+@@ -44,6 +44,11 @@
      if (reload==TRUE) main_reload();
      else main_shutdown();
  }
@@ -27,7 +12,7 @@
  
  char *java_library(arg_data *args, home_data *data) {
      char *libf=NULL;
-@@ -118,12 +124,29 @@
+@@ -118,12 +123,29 @@
  
  #ifdef OS_DARWIN
      /* MacOS/X actually has two libraries, one with the REAL vm, and one for
@@ -59,7 +44,7 @@
      apph=dso_link(appf);
      if (apph==NULL) {
          log_error("Cannot load required shell library %s",appf);
-@@ -146,20 +169,28 @@
+@@ -146,20 +168,28 @@
      log_debug("JVM library entry point found (0x%08X)",symb);
  
      /* Prepare the VM initialization arguments */
Index: patch-native-jsvc-unix.c.diff
===================================================================
RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/java/commons-daemon/files/patch-native-jsvc-unix.c.diff,v
retrieving revision 1.1
diff -u -r1.1 patch-native-jsvc-unix.c.diff
--- patch-native-jsvc-unix.c.diff       11 Oct 2004 19:39:14 -0000      1.1
+++ patch-native-jsvc-unix.c.diff       14 Oct 2004 21:37:20 -0000
@@ -1,14 +1,5 @@
---- src/native/unix/native/jsvc-unix.c.orig    Sun Oct 10 12:39:25 2004
-+++ src/native/unix/native/jsvc-unix.c Sun Oct 10 13:09:38 2004
-@@ -13,7 +13,7 @@
-    See the License for the specific language governing permissions and
-    limitations under the License.
- */
--/* @version $Id: patch-native-jsvc-unix.c.diff,v 1.1 2004/10/11 19:39:14 mww Exp $ */
-+/* @version $Id: patch-native-jsvc-unix.c.diff,v 1.1 2004/10/11 19:39:14 mww Exp $ */
- #include "jsvc.h"
- 
- #include <signal.h>
+--- src/native/unix/native/jsvc-unix.c.orig    Mon Feb  9 07:55:21 2004
++++ src/native/unix/native/jsvc-unix.c Thu Oct 14 14:28:07 2004
 @@ -46,7 +46,6 @@
              } else {
                  stopping=true;