[19954] trunk/dports/java/dom4j

[source_changes at macosforge.org]

Revision: 19954
          http://trac.macosforge.org/projects/macports/changeset/19954
Author:   jberry at macports.org
Date:     2006-10-06 08:56:24 -0700 (Fri, 06 Oct 2006)

Log Message:
-----------
Fix patch for dom4j

Modified Paths:
--------------
    trunk/dports/java/dom4j/Portfile
    trunk/dports/java/dom4j/files/patch-build.xml.diff

Modified: trunk/dports/java/dom4j/Portfile
===================================================================
--- trunk/dports/java/dom4j/Portfile	2006-10-06 14:05:30 UTC (rev 19953)
+++ trunk/dports/java/dom4j/Portfile	2006-10-06 15:56:24 UTC (rev 19954)
@@ -4,6 +4,7 @@
 
 name				dom4j
 version				1.6.1
+revision			1
 
 categories			java
 maintainers			jberry at macports.org
@@ -31,6 +32,11 @@
 build.target		all
 build.args			-Djunit.jar=${prefix}/share/java/junit.jar
 
+pre-patch {
+	# Convert build.xml to unix line feeds before we try to patch it
+	system "cat ${worksrcpath}/build.xml | tr -d '\r' > ${worksrcpath}/build.xml.tmp && mv ${worksrcpath}/build.xml.tmp ${worksrcpath}/build.xml"
+}
+
 destroot {
 	xinstall -m 755 -d ${destroot}${prefix}/share/java \
 		${destroot}${prefix}/share/doc

Modified: trunk/dports/java/dom4j/files/patch-build.xml.diff
===================================================================
--- trunk/dports/java/dom4j/files/patch-build.xml.diff	2006-10-06 14:05:30 UTC (rev 19953)
+++ trunk/dports/java/dom4j/files/patch-build.xml.diff	2006-10-06 15:56:24 UTC (rev 19954)
@@ -1,11 +1,11 @@
---- build.xml	2005-05-16 06:28:41.000000000 -0700
-+++ build.xml.latest	2005-11-22 12:47:51.000000000 -0800
+--- build.xml.orig	2006-10-06 08:53:02.000000000 -0700
++++ build.xml	2006-10-06 08:54:24.000000000 -0700
 @@ -146,6 +146,8 @@
             source="1.3"
             deprecation="${deprecation}"
             classpathref="compile.classpath">
-+     <compilerarg compiler="javac1.5" value="-endorseddirs"/>
-+     <compilerarg compiler="javac1.5" value="./lib/endorsed"/> 
++		<compilerarg compiler="javac1.5" value="-endorseddirs"/>
++		<compilerarg compiler="javac1.5" value="./lib/endorsed"/> 
      </javac>
    </target>
  

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061006/9526b718/attachment.html