--- jogl/make/build-common.xml.orig	2015-10-10 01:08:14 UTC
+++ jogl/make/build-common.xml
@@ -130,8 +130,8 @@
         <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
           <istrue value="${isWindowsX86}" />
         </condition>
-        <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
-          <istrue value="${isFreeBSDAMD64}" />
+        <condition property="swt.jar" value="%%JAVALIBDIR%%/swt.jar">
+          <istrue value="${isFreeBSD}" />
         </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
           <istrue value="${isLinuxAMD64}" />
@@ -213,7 +213,7 @@
         <property name="gluegen.build.xml"          value="${gluegen.make}/build.xml" />
         <property name="build.gluegen"              value="${gluegen.root}/${rootrel.build}" />
         <property name="obj.gluegen"                value="${build.gluegen}/obj"/>
-        <property name="gluegen.jar"                value="${build.gluegen}/gluegen.jar" />
+        <property name="gluegen.jar"                value="${build.gluegen}/gluegen2.jar" />
 
         <property name="build.joal"                 value="${joal.root}/${rootrel.build}" /> <!-- optional -->
 
@@ -438,7 +438,7 @@
         </path>
 
         <!-- JavaSE combinations -->
-        <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen-rt.jar" />
+        <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen2-rt.jar" />
         <property name="gluegen-rt-android.jar"         value="${build.gluegen}/gluegen-rt-android.jar" />
         <property name="gluegen-test-util.jar"          value="${build.gluegen}/gluegen-test-util.jar" />
         <property name="jogl-test.jar"                  value="${jar}/jogl-test.jar"/>