Ticket #36522: commons-daemon-1.0.15.patch

File commons-daemon-1.0.15.patch, 4.6 KB (added by auke@…, 11 years ago)
  • Portfile

     
    44PortGroup  java 1.0
    55
    66name                            commons-daemon
    7 version                         1.0.10
     7version                         1.0.15
    88license             Apache-2
    99
    1010categories                      java
     
    1919distname                        ${name}-${version}-src
    2020master_sites            apache:commons/daemon/source/
    2121
    22 checksums           rmd160  975d28ee016928842693e68d61e82cb5700975cf \
    23                     sha256  2b60b28523cbd28497a02a298a341c51cabbe45983ec9e93616e6c91fbb5280c
     22checksums           rmd160  806009c8490cc891baf67a9bcd013ccea85bc2c6 \
     23                    sha256 11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432
    2424
    2525patchfiles                      patch-native-dso-dyld.c \
    26                                         patch-configure.diff
     26                                        patch-location.c \
     27                                        patch-java.c
    2728
    2829depends_build           bin:ant:apache-ant
    2930depends_lib                     bin:java:kaffe \
  • files/patch-configure.diff

     
    1 --- src/native/unix/configure.orig      2012-02-06 16:21:27.000000000 -0800
    2 +++ src/native/unix/configure   2012-02-06 16:25:41.000000000 -0800
    3 @@ -2718,67 +2718,6 @@
    4     { (exit 1); exit 1; }; }
    5    fi
    6  
    7 -if test -d $JAVA_HOME/Headers
    8 -then
    9 -  JAVA_INC=Headers
    10 -else
    11 -  JAVA_INC=include
    12 -fi
    13 -
    14 -  tempval=""
    15 -  JAVA_OS=""
    16 -
    17 -# Check whether --with-os-type or --without-os-type was given.
    18 -if test "${with_os_type+set}" = set; then
    19 -  withval="$with_os_type"
    20 -
    21 -    tempval=$withval
    22 -    if test ! -d "$JAVA_HOME/$tempval"
    23 -    then
    24 -      { { echo "$as_me:$LINENO: error: Not a directory: ${JAVA_HOME}/${tempval}" >&5
    25 -echo "$as_me: error: Not a directory: ${JAVA_HOME}/${tempval}" >&2;}
    26 -   { (exit 1); exit 1; }; }
    27 -    fi
    28 -    JAVA_OS=$tempval
    29 -
    30 -else
    31 -
    32 -    echo "$as_me:$LINENO: checking for JDK os include directory" >&5
    33 -echo $ECHO_N "checking for JDK os include directory... $ECHO_C" >&6
    34 -    JAVA_OS=NONE
    35 -    if test -f $JAVA_HOME/$JAVA_INC/jni_md.h
    36 -    then
    37 -      JAVA_OS=""
    38 -    else
    39 -      for f in $JAVA_HOME/$JAVA_INC/*/jni_md.h
    40 -      do
    41 -        if test -f $f; then
    42 -            JAVA_OS=`dirname $f`
    43 -            JAVA_OS=`basename $JAVA_OS`
    44 -            echo " $JAVA_OS"
    45 -            break
    46 -        fi
    47 -      done
    48 -      if test "x$JAVA_OS" = "xNONE"; then
    49 -        echo "$as_me:$LINENO: result: Cannot find jni_md.h in ${JAVA_HOME}/${OS}" >&5
    50 -echo "${ECHO_T}Cannot find jni_md.h in ${JAVA_HOME}/${OS}" >&6
    51 -        { { echo "$as_me:$LINENO: error: You should retry --with-os-type=SUBDIR" >&5
    52 -echo "$as_me: error: You should retry --with-os-type=SUBDIR" >&2;}
    53 -   { (exit 1); exit 1; }; }
    54 -      fi
    55 -    fi
    56 -
    57 -fi;
    58 -
    59 -if test -z "${JAVA_OS}"
    60 -then
    61 -  echo "$as_me:$LINENO: result: jni_md.h found in $JAVA_HOME/$JAVA_INC" >&5
    62 -echo "${ECHO_T}jni_md.h found in $JAVA_HOME/$JAVA_INC" >&6
    63 -  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
    64 -else
    65 -  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
    66 -fi
    67 -
    68  if test "$GCC" = "yes"
    69  then
    70     CFLAGS="$CFLAGS -Wall -Wstrict-prototypes"
  • files/patch-java.c

     
     1--- src/native/unix/native/java.c.orig
     2+++ src/native/unix/native/java.c
     3@@ -197,7 +197,7 @@
     4         }
     5     }
     6     if (stat(appf, &sb)) {
     7-        if (replace(appf, 1024, "$JAVA_HOME/../Libraries/libverify.dylib",
     8+        if (replace(appf, 1024, "$JAVA_HOME/jre/lib/libverify.dylib",
     9                     "$JAVA_HOME", data->path) != 0) {
     10             log_error("Cannot replace values in loader library");
     11             return false;
  • files/patch-location.c

     
     1--- src/native/unix/native/location.c.orig
     2+++ src/native/unix/native/location.c
     3@@ -73,6 +73,7 @@
     4  */
     5 char *location_jvm_default[] = {
     6 #if defined(OS_DARWIN)
     7+    "$JAVA_HOME/jre/lib/server/libjvm.dylib",
     8     "$JAVA_HOME/../Libraries/libjvm.dylib",
     9 #elif defined(OS_CYGWIN)
     10     "$JAVA_HOME/jre/bin/classic/jvm.dll",               /* Sun JDK 1.3 */
     11@@ -131,6 +132,7 @@
     12  */
     13 char *location_jvm_configured[] = {
     14 #if defined(OS_DARWIN)
     15+    "$JAVA_HOME/jre/lib/$VM_NAME/libjvm.dylib",
     16     "$JAVA_HOME/../Libraries/lib$VM_NAME.dylib",
     17 #elif defined(OS_CYGWIN)
     18     "$JAVA_HOME/jre/bin/$VM_NAME/jvm.dll",              /* Sun JDK 1.3 */