Changeset 64734 for trunk/dports/java


Ignore:
Timestamp:
Mar 15, 2010, 1:13:19 PM (10 years ago)
Author:
nox@…
Message:

Update commons-daemon to 1.0.2 and fix universal variant

Location:
trunk/dports/java/commons-daemon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/commons-daemon/Portfile

    r64733 r64734  
    44
    55name                            commons-daemon
    6 version                         1.0.1
     6version                         1.0.2
     7license             Apache-2.0
    78
    89categories                      java
     
    1516homepage                        http://commons.apache.org/daemon/
    1617
    17 distname                        daemon-${version}
     18distname                        ${name}-${version}-src
    1819master_sites            apache:commons/daemon/source/
    19 checksums                       md5 df3eb5aafa53ca530843a09d40b8a1c0
     20
     21checksums           md5     a6c68eed204bc9f1ef3b77488edfcfeb \
     22                    sha1    a4e7e267c6accfeae5226f3a64ad2d7bd19993d1 \
     23                    rmd160  afad8e7608f342ea576efde374511e50d269ae84
    2024
    2125patchfiles                      patch-native-dso-dyld.c
     
    2529                                        port:junit
    2630
    27 use_configure           no
     31configure.dir       ${worksrcpath}/src/native/unix
    2832
    29 build {
    30         # First build the java code
    31         system "cd ${worksrcpath} && \
    32                 ant dist -Djunit.jar=${prefix}/share/java/junit.jar"           
     33build.dir           ${configure.dir}
     34build.target        clean all
    3335
    34         # Then build the native code jsvc tool
    35         system "cd ${worksrcpath}/src/native/unix && \
    36                 ./configure && make"
     36use_parallel_build  no
     37
     38pre-build {
     39    system "cd ${worksrcpath} && \
     40        ant dist -Djunit.jar=${prefix}/share/java/junit.jar"
    3741}
    3842
    3943destroot {
    40         xinstall -m 755 -d ${destroot}${prefix}/share/java \
    41                 ${destroot}${prefix}/share/doc \
    42                 ${destroot}${prefix}/bin
    43         xinstall -m 644 ${worksrcpath}/dist/commons-daemon.jar \
    44                 ${destroot}${prefix}/share/java/
    45         xinstall -m 755 ${worksrcpath}/src/native/unix/jsvc \
    46                 ${destroot}${prefix}/bin/
    47         file copy ${worksrcpath}/dist/docs \
    48                 ${destroot}${prefix}/share/doc/${name}
     44    xinstall -d ${destroot}${prefix}/share/java \
     45        ${destroot}${prefix}/share/doc
     46    xinstall -m 644 ${worksrcpath}/dist/commons-daemon-${version}.jar \
     47        ${destroot}${prefix}/share/java/commons-daemon.jar
     48    xinstall ${worksrcpath}/src/native/unix/jsvc \
     49        ${destroot}${prefix}/bin
     50    set docdir ${prefix}/share/doc/${name}
     51    file copy ${worksrcpath}/dist/docs ${destroot}${docdir}
     52    xinstall -m 644 -W ${worksrcpath} LICENSE.txt NOTICE.txt PROPOSAL.html \
     53        RELEASE-NOTES.txt ${destroot}${docdir}
    4954}
    5055
  • trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c

    r21485 r64734  
    11--- src/native/unix/native/dso-dyld.c.orig      2004-02-09 07:55:21.000000000 -0800
    22+++ src/native/unix/native/dso-dyld.c   2005-01-22 08:27:20.000000000 -0800
    3 @@ -17 +16,0 @@
    4 -#include "jsvc.h"
    5 @@ -21,0 +21,5 @@
    6 +/* dyld.h hauls in stdbool, which jsvc doesn't expect; undo that */
    7 +#undef false
    8 +#undef true
    9 +#undef bool
    10 +#include "jsvc.h"
    11 @@ -109 +113 @@
     3@@ -118 +118 @@
    124-    while(x>=0) und[x+1]=nam[x--];
    135+    for(; x>=0; --x) und[x+1]=nam[x];
Note: See TracChangeset for help on using the changeset viewer.