Ticket #36522: commons-daemon-1.0.15.patch

Portfile

@@ -4 +4 @@
 PortGroup  java 1.0
 
 name                            commons-daemon
-version                         1.0.10
+version                         1.0.15
 license             Apache-2
 
 categories                      java
@@ -19 +19 @@
 distname                        ${name}-${version}-src
 master_sites            apache:commons/daemon/source/
 
-checksums           rmd160  975d28ee016928842693e68d61e82cb5700975cf \
-                    sha256  2b60b28523cbd28497a02a298a341c51cabbe45983ec9e93616e6c91fbb5280c
+checksums           rmd160  806009c8490cc891baf67a9bcd013ccea85bc2c6 \
+                    sha256 11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432 
 
 patchfiles                      patch-native-dso-dyld.c \
-                                        patch-configure.diff
+                                        patch-location.c \
+                                        patch-java.c
 
 depends_build           bin:ant:apache-ant
 depends_lib                     bin:java:kaffe \

files/patch-configure.diff

@@ -1 @@
---- src/native/unix/configure.orig      2012-02-06 16:21:27.000000000 -0800
-+++ src/native/unix/configure   2012-02-06 16:25:41.000000000 -0800
-@@ -2718,67 +2718,6 @@
-    { (exit 1); exit 1; }; }
-   fi
- 
--if test -d $JAVA_HOME/Headers
--then
--  JAVA_INC=Headers
--else
--  JAVA_INC=include
--fi
--
--  tempval=""
--  JAVA_OS=""
--
--# Check whether --with-os-type or --without-os-type was given.
--if test "${with_os_type+set}" = set; then
--  withval="$with_os_type"
--
--    tempval=$withval
--    if test ! -d "$JAVA_HOME/$tempval"
--    then
--      { { echo "$as_me:$LINENO: error: Not a directory: ${JAVA_HOME}/${tempval}" >&5
--echo "$as_me: error: Not a directory: ${JAVA_HOME}/${tempval}" >&2;}
--   { (exit 1); exit 1; }; }
--    fi
--    JAVA_OS=$tempval
--
--else
--
--    echo "$as_me:$LINENO: checking for JDK os include directory" >&5
--echo $ECHO_N "checking for JDK os include directory... $ECHO_C" >&6
--    JAVA_OS=NONE
--    if test -f $JAVA_HOME/$JAVA_INC/jni_md.h
--    then
--      JAVA_OS=""
--    else
--      for f in $JAVA_HOME/$JAVA_INC/*/jni_md.h
--      do
--        if test -f $f; then
--            JAVA_OS=`dirname $f`
--            JAVA_OS=`basename $JAVA_OS`
--            echo " $JAVA_OS"
--            break
--        fi
--      done
--      if test "x$JAVA_OS" = "xNONE"; then
--        echo "$as_me:$LINENO: result: Cannot find jni_md.h in ${JAVA_HOME}/${OS}" >&5
--echo "${ECHO_T}Cannot find jni_md.h in ${JAVA_HOME}/${OS}" >&6
--        { { echo "$as_me:$LINENO: error: You should retry --with-os-type=SUBDIR" >&5
--echo "$as_me: error: You should retry --with-os-type=SUBDIR" >&2;}
--   { (exit 1); exit 1; }; }
--      fi
--    fi
--
--fi;
--
--if test -z "${JAVA_OS}"
--then
--  echo "$as_me:$LINENO: result: jni_md.h found in $JAVA_HOME/$JAVA_INC" >&5
--echo "${ECHO_T}jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6
--  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
--else
--  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
--fi
--
- if test "$GCC" = "yes"
- then
-    CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"

files/patch-java.c

@@ +1 @@
+--- src/native/unix/native/java.c.orig
++++ src/native/unix/native/java.c
+@@ -197,7 +197,7 @@
+         }
+     }
+     if (stat(appf, &sb)) {
+-        if (replace(appf, 1024, "$JAVA_HOME/../Libraries/libverify.dylib",
++        if (replace(appf, 1024, "$JAVA_HOME/jre/lib/libverify.dylib",
+                     "$JAVA_HOME", data->path) != 0) {
+             log_error("Cannot replace values in loader library");
+             return false;

files/patch-location.c

@@ +1 @@
+--- src/native/unix/native/location.c.orig
++++ src/native/unix/native/location.c
+@@ -73,6 +73,7 @@
+  */
+ char *location_jvm_default[] = {
+ #if defined(OS_DARWIN)
++    "$JAVA_HOME/jre/lib/server/libjvm.dylib",
+     "$JAVA_HOME/../Libraries/libjvm.dylib",
+ #elif defined(OS_CYGWIN)
+     "$JAVA_HOME/jre/bin/classic/jvm.dll",               /* Sun JDK 1.3 */
+@@ -131,6 +132,7 @@
+  */
+ char *location_jvm_configured[] = {
+ #if defined(OS_DARWIN)
++    "$JAVA_HOME/jre/lib/$VM_NAME/libjvm.dylib",
+     "$JAVA_HOME/../Libraries/lib$VM_NAME.dylib",
+ #elif defined(OS_CYGWIN)
+     "$JAVA_HOME/jre/bin/$VM_NAME/jvm.dll",              /* Sun JDK 1.3 */