--- plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig	2009-02-15 09:36:21.377637363 -0500
+++ plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml	2009-02-15 10:02:04.923231253 -0500
@@ -272,7 +272,12 @@
 
 	<target name="build.cfiles" depends="build.jars">
 		<!-- generate the C code from the (64 bit) SWT PI java classes -->
-		<!-- assumes the swt.jar has already been built  -->
+		<!-- We can't assume that swttools.jar as already been built, so force a rebuild -->
+		<ant dir="${toolsplugindir}" inheritAll="false">
+			<target name="clean" />
+			<target name="build.jars" />
+		</ant>
+
 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
 		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
@@ -294,6 +299,7 @@
 			<fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/>
 			<fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library"/>
 			<fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/>
+			<fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
 			<fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/>
 			<fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/>
 			<fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/>
@@ -302,21 +308,11 @@
 	</target>
 
 	<target name="build.nativeLibraries" depends="build.cfiles" description="Build 64 bit native libraries without changing the content of org.eclipse.swt">
-		<property name="sourcedir" value="${basedir}/src/bin/library" />
-	    <property name="lib_destdir" value="${sourcedir}/../../../../${fragment}" />
-		<tstamp/>
-		<exec dir="${sourcedir}" executable="sh">
-			<arg line="./build.sh"/>
-			<arg line="clean"/>
+		<exec dir="${build.result.folder}/src/bin/library" executable="sh">
+			<env key="OUTPUT_DIR" value="${build.result.folder}"/>
+			<arg line="${build.result.folder}/src/bin/library/build.sh"/>
+			<arg line="install"/>
 		</exec>
-		<mkdir dir="${lib_destdir}" />
-		<exec dir="${sourcedir}" executable="sh">
-			<arg line="./build.sh"/>
-			<arg line="all"/>
-		</exec>
-		<copy todir="${lib_destdir}">
-			<fileset dir="${sourcedir}/" includes="*.so"/>
-		</copy>
 	</target>
 
 	<target name="build.zips" depends="init">