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

[nox at macports.org]

Revision: 64734
          http://trac.macports.org/changeset/64734
Author:   nox at macports.org
Date:     2010-03-15 06:13:19 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
Update commons-daemon to 1.0.2 and fix universal variant

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

Modified: trunk/dports/java/commons-daemon/Portfile
===================================================================
--- trunk/dports/java/commons-daemon/Portfile	2010-03-15 13:13:05 UTC (rev 64733)
+++ trunk/dports/java/commons-daemon/Portfile	2010-03-15 13:13:19 UTC (rev 64734)
@@ -3,7 +3,8 @@
 PortSystem 1.0
 
 name				commons-daemon
-version				1.0.1
+version				1.0.2
+license             Apache-2.0
 
 categories			java
 maintainers			jberry openmaintainer
@@ -14,38 +15,42 @@
 					java code.
 homepage			http://commons.apache.org/daemon/
 
-distname			daemon-${version}
+distname			${name}-${version}-src
 master_sites		apache:commons/daemon/source/
-checksums			md5 df3eb5aafa53ca530843a09d40b8a1c0
 
+checksums           md5     a6c68eed204bc9f1ef3b77488edfcfeb \
+                    sha1    a4e7e267c6accfeae5226f3a64ad2d7bd19993d1 \
+                    rmd160  afad8e7608f342ea576efde374511e50d269ae84
+
 patchfiles			patch-native-dso-dyld.c
 
 depends_build		bin:ant:apache-ant
 depends_lib			bin:java:kaffe \
 					port:junit
 
-use_configure		no
+configure.dir       ${worksrcpath}/src/native/unix
 
-build {
-	# First build the java code
-	system "cd ${worksrcpath} && \
-		ant dist -Djunit.jar=${prefix}/share/java/junit.jar"		
+build.dir           ${configure.dir}
+build.target        clean all
 
-	# Then build the native code jsvc tool
-	system "cd ${worksrcpath}/src/native/unix && \
-		./configure && make"
+use_parallel_build  no
+
+pre-build {
+    system "cd ${worksrcpath} && \
+        ant dist -Djunit.jar=${prefix}/share/java/junit.jar"
 }
 
 destroot {
-	xinstall -m 755 -d ${destroot}${prefix}/share/java \
-		${destroot}${prefix}/share/doc \
-		${destroot}${prefix}/bin
-	xinstall -m 644 ${worksrcpath}/dist/commons-daemon.jar \
-		${destroot}${prefix}/share/java/
-	xinstall -m 755 ${worksrcpath}/src/native/unix/jsvc \
-		${destroot}${prefix}/bin/
-	file copy ${worksrcpath}/dist/docs \
-		${destroot}${prefix}/share/doc/${name}
+    xinstall -d ${destroot}${prefix}/share/java \
+        ${destroot}${prefix}/share/doc
+    xinstall -m 644 ${worksrcpath}/dist/commons-daemon-${version}.jar \
+        ${destroot}${prefix}/share/java/commons-daemon.jar
+    xinstall ${worksrcpath}/src/native/unix/jsvc \
+        ${destroot}${prefix}/bin
+    set docdir ${prefix}/share/doc/${name}
+    file copy ${worksrcpath}/dist/docs ${destroot}${docdir}
+    xinstall -m 644 -W ${worksrcpath} LICENSE.txt NOTICE.txt PROPOSAL.html \
+        RELEASE-NOTES.txt ${destroot}${docdir}
 }
 
 livecheck.type  regex

Modified: trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c
===================================================================
--- trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c	2010-03-15 13:13:05 UTC (rev 64733)
+++ trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c	2010-03-15 13:13:19 UTC (rev 64734)
@@ -1,13 +1,5 @@
 --- 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
-@@ -17 +16,0 @@
--#include "jsvc.h"
-@@ -21,0 +21,5 @@
-+/* dyld.h hauls in stdbool, which jsvc doesn't expect; undo that */
-+#undef false
-+#undef true
-+#undef bool
-+#include "jsvc.h"
-@@ -109 +113 @@
+@@ -118 +118 @@
 -    while(x>=0) und[x+1]=nam[x--];
 +    for(; x>=0; --x) und[x+1]=nam[x];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100315/c1f4bd4a/attachment.html>