--- jogl/make/build-common.xml.orig	2025-08-30 10:26:30 UTC
+++ jogl/make/build-common.xml
@@ -165,9 +165,11 @@ -->
               <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
               <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
               <istrue value="${isIOS}" /> <!-- FIXME JAU .. hack -->
-              <istrue value="${isFreeBSD}" /> <!-- FIXME JAU .. hack -->
           </or>
         </condition>
+        <condition property="swt.jar" value="%%JAVALIBDIR%%/swt.jar">
+          <istrue value="${isFreeBSD}" />
+        </condition>
         <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt.jar">
           <and>
             <istrue value="${isOSX}" />
@@ -237,7 +239,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 -->
 
@@ -508,7 +510,7 @@ -->
 
 
         <!-- 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-natives.jar"         value="${build.gluegen}/gluegen-rt-natives-${os.and.arch}.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" />