[89702] trunk/dports/java/commons-daemon

7 Feb 2012

Revision: 89702
          http://trac.macports.org/changeset/89702
Author:   jberry@macports.org
Date:     2012-02-06 20:49:06 -0800 (Mon, 06 Feb 2012)
Log Message:
-----------
Update commons-daemon 1.02 -> 1.0.8

Modified Paths:
--------------
    trunk/dports/java/commons-daemon/Portfile
    trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c

Added Paths:
-----------
    trunk/dports/java/commons-daemon/files/patch-configure.diff

Modified: trunk/dports/java/commons-daemon/Portfile
===================================================================

--- trunk/dports/java/commons-daemon/Portfile	2012-02-07 03:49:50 UTC (rev 89701)
+++ trunk/dports/java/commons-daemon/Portfile	2012-02-07 04:49:06 UTC (rev 89702)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 
 name				commons-daemon
-version				1.0.2
+version				1.0.8
 license             Apache-2.0
 
 categories			java
@@ -18,11 +18,12 @@
 distname			${name}-${version}-src
 master_sites		apache:commons/daemon/source/
 
-checksums           md5     a6c68eed204bc9f1ef3b77488edfcfeb \
-                    sha1    a4e7e267c6accfeae5226f3a64ad2d7bd19993d1 \
-                    rmd160  afad8e7608f342ea576efde374511e50d269ae84
+checksums           md5     323a0bd9e2786256f02c5aed4e887fed \
+                    sha1    824075ec63d6c1588e95d3e7f068683d2a80c176 \
+                    rmd160  a0bc1996f098f076c2569612c3bf98fd405c1bc1
 
-patchfiles			patch-native-dso-dyld.c
+patchfiles			patch-native-dso-dyld.c \
+					patch-configure.diff
 
 depends_build		bin:ant:apache-ant
 depends_lib			bin:java:kaffe \

Added: trunk/dports/java/commons-daemon/files/patch-configure.diff
===================================================================
--- trunk/dports/java/commons-daemon/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/java/commons-daemon/files/patch-configure.diff	2012-02-07 04:49:06 UTC (rev 89702)
@@ -0,0 +1,70 @@
+--- 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"

Modified: trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c
===================================================================
--- trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c	2012-02-07 03:49:50 UTC (rev 89701)
+++ trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c	2012-02-07 04:49:06 UTC (rev 89702)
@@ -1,5 +1,13 @@
---- src/native/unix/native/dso-dyld.c.orig	2004-02-09 07:55:21.000000000 -0800
-+++ src/native/unix/native/dso-dyld.c	2005-01-22 08:27:20.000000000 -0800
-@@ -118 +118 @@
--    while(x>=0) und[x+1]=nam[x--];
-+    for(; x>=0; --x) und[x+1]=nam[x];
+--- src/native/unix/native/dso-dyld.c.orig	2010-03-11 02:03:32.000000000 -0800
++++ src/native/unix/native/dso-dyld.c	2012-02-06 07:59:47.000000000 -0800
+@@ -124,8 +124,8 @@
+     while (nam[x] != '\0')
+         x++;
+     und = (char *)malloc(sizeof(char) * (x + 2));
+-    while (x >= 0)
+-        und[x + 1] = nam[x--];
++    for (; x >= 0; --x)
++    	und[x + 1] = nam[x];
+     und[0] = '_';
+ 
+     /* Find the symbol */

    

jberry＠macports.org

tags

participants (1)