--- nbproject/build-impl.xml.orig	2010-10-25 13:08:12.000000000 -0400
+++ nbproject/build-impl.xml	2010-10-25 13:59:56.000000000 -0400
@@ -98,7 +98,7 @@ is divided into following sections:
             <and>
                 <isset property="libs.CopyLibs.classpath"/>
                 <not>
-                    <istrue value="${mkdist.disabled}"/>
+                    <istrue value="true"/>
                 </not>
             </and>
         </condition>
@@ -413,8 +413,6 @@ is divided into following sections:
         </propertyfile>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.jaffl}" name="call.subproject"/>
-            <param location="${project.jaffl}/build.xml" name="call.script"/>
             <param name="call.target" value="jar"/>
             <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
         </antcall>
@@ -513,14 +511,6 @@ is divided into following sections:
                 <globmapper from="*" to="lib/*"/>
             </chainedmapper>
         </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
         <echo>To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo>java -jar "${dist.jar.resolved}"</echo>
@@ -538,13 +528,6 @@ is divided into following sections:
                 <globmapper from="*" to="lib/*"/>
             </chainedmapper>
         </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
     </target>
     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
@@ -559,13 +542,6 @@ is divided into following sections:
                 <globmapper from="*" to="lib/*"/>
             </chainedmapper>
         </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
     </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
@@ -810,8 +786,6 @@ is divided into following sections:
         </propertyfile>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-clean.properties}"/>
-            <param location="${project.jaffl}" name="call.subproject"/>
-            <param location="${project.jaffl}/build.xml" name="call.script"/>
             <param name="call.target" value="clean"/>
             <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
         </antcall>
@@ -834,11 +808,5 @@ is divided into following sections:
         </condition>
     </target>
     <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
-        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
-            <propertyset>
-                <propertyref prefix="transfer."/>
-                <mapper from="transfer.*" to="*" type="glob"/>
-            </propertyset>
-        </ant>
     </target>
 </project>
--- lib/nblibraries.properties.orig	2010-10-25 13:17:04.000000000 -0400
+++ lib/nblibraries.properties	2010-10-25 13:18:19.000000000 -0400
@@ -1,11 +1,11 @@
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.junit.classpath=\
-    ${base}/junit/junit-3.8.2.jar
+    ${base}/junit.jar
 libs.junit.javadoc=\
     ${base}/junit/junit-3.8.2-api.zip
 libs.junit_4.classpath=\
-    ${base}/junit_4/junit-4.5.jar
+    ${base}/junit4.jar
 libs.junit_4.javadoc=\
     ${base}/junit_4/junit-4.5-api.zip
 libs.junit_4.src=\
--- nbproject/project.properties.orig	2010-10-25 13:50:06.000000000 -0400
+++ nbproject/project.properties	2010-10-25 14:27:13.000000000 -0400
@@ -22,11 +22,12 @@ dist.jar=${dist.dir}/jnr-netdb.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jffi-complete.jar=../jffi.git/dist/jffi-complete.jar
+file.reference.jffi-complete.jar=lib/jffi.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${reference.jaffl.jar}
+    ${reference.jaffl.jar}: \
+    ${reference.objectweb.asm.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked
 javac.deprecation=false
@@ -50,7 +51,8 @@ javadoc.windowtitle=
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform
 project.jaffl=../jaffl.git
-reference.jaffl.jar=${project.jaffl}/dist/jaffl.jar
+reference.jaffl.jar=lib/jaffl.jar
+reference.objectweb.asm.jar=lib/objectweb-asmasm.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}