--- build.xml.orig	2009-06-11 16:19:56.000000000 +0200
+++ build.xml	2009-06-11 16:24:58.000000000 +0200
@@ -8,6 +8,10 @@
               value="true"
               description="Whether to halt the build if the tests fail"/>
 
+    <property name="prefix"
+              value="@PREFIX@"
+              description="The MacPorts prefix"/>
+
     <property name="debug"
               value="true"
               description="Whether to build with debug information"/>
@@ -68,18 +72,18 @@
     </target>
 
     <target name="library"
-            depends="core,generator"
+            depends="generator"
             description="Build library of matchers">
         <mkdir dir="build/temp/hamcrest-library/generated-code"/>
         <java-to-jar srcdir="hamcrest-library/src/main/java"
                      destjar="build/hamcrest-library-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
+                     classpath="${prefix}/share/java/hamcrest-core.jar"/>
         <!-- Generate one class with all static imports -->
         <java classname="org.hamcrest.generator.config.XmlConfigurator"
               fork="yes"
               failonerror="yes"
               classpath="
-                build/hamcrest-core-${version}.jar;
+                ${prefix}/share/java/hamcrest-core.jar;
                 build/hamcrest-generator-${version}.jar;
                 build/hamcrest-library-${version}.jar;
               ">
@@ -91,7 +95,7 @@
         <!-- Append to library jar -->
         <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
                      destjar="build/hamcrest-library-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
+                     classpath="${prefix}/share/java/hamcrest-core.jar"/>
     </target>
 
     <target name="integration"