4 files changed, 46 insertions, 40 deletions

diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index 41448d9ab527..aeda17a36207 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -1,8 +1,7 @@
-# Created by: Matthias Petermann <matthias@petermann.it>
 # $FreeBSD$
 
 PORTNAME=	sweethome3d
-PORTVERSION=	3.6
+PORTVERSION=	4.0
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
diff --git a/cad/sweethome3d/distinfo b/cad/sweethome3d/distinfo
index 197c721974b8..4010b349a9fe 100644
--- a/cad/sweethome3d/distinfo
+++ b/cad/sweethome3d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SweetHome3D-3.6-src.zip) = 944d7c5b3b145504ad28fcc0da831e7b03855cd20770f18f6cb86b75feaecb04
-SIZE (SweetHome3D-3.6-src.zip) = 18303801
+SHA256 (SweetHome3D-4.0-src.zip) = ff0d33ec3b2b6015b0d86a0ee7b9fcb098325d08f8ad0584f0a23bc8c567085f
+SIZE (SweetHome3D-4.0-src.zip) = 26183531
diff --git a/cad/sweethome3d/files/patch-build.xml b/cad/sweethome3d/files/patch-build.xml
index 700a37dbec86..d327db0134ab 100644
--- a/cad/sweethome3d/files/patch-build.xml
+++ b/cad/sweethome3d/files/patch-build.xml
@@ -1,15 +1,16 @@
---- ./build.xml.orig	2012-09-18 23:53:21.000000000 +0200
-+++ ./build.xml	2012-09-18 23:53:37.000000000 +0200
-@@ -388,12 +388,6 @@
-       <zipfileset src="build/Textures.jar"/>
-       <zipfileset src="build/Help.jar"/>
-       <fileset dir="lib">
+--- ./build.xml.orig	2013-04-26 00:00:04.000000000 +0200
++++ ./build.xml	2013-04-26 00:00:15.000000000 +0200
+@@ -261,13 +261,6 @@
+         <include name="j3dutils.jar"/>
+         <include name="vecmath.jar"/>
+       </fileset>
+-      <fileset dir="lib">
 -        <include name="windows/**/*.dll"/>
 -        <include name="linux/**/*.so"/>
--        <include name="macosx/*.jnilib"/>
--        <include name="macosx/*.jar"/>
+-        <include name="macosx/**/*.jnilib"/>
+-        <include name="macosx/**/*.jar"/>
+-        <exclude name="macosx/*/jogl-all.jar"/>
 -      </fileset>
--      <fileset dir="lib">
-         <include name="*.jar"/>
+       <fileset dir="build">
+         <include name="macosx/java3d-1.6/jogl-java3d.jar"/>
        </fileset>
-       <fileset dir="libtest">
diff --git a/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java b/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
index 35f77a8abd60..c64b07036abb 100644
--- a/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
+++ b/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
@@ -1,37 +1,43 @@
---- ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig	2012-09-18 23:50:39.000000000 +0200
-+++ ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2012-09-18 23:52:55.000000000 +0200
-@@ -48,23 +48,12 @@
-         "jnlp.jar",
-         "j3dcore.jar", // Main Java 3D jars
-         "vecmath.jar",
--        "j3dutils.jar",
--        "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs
--        "macosx/jogl.jar",
--        "macosx/libgluegen-rt.jnilib",
--        "macosx/libjogl.jnilib",
--        "macosx/libjogl_awt.jnilib",
--        "macosx/libjogl_cg.jnilib"}));
-+        "j3dutils.jar"
-+    }));
+--- ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig	2013-04-26 00:01:12.000000000 +0200
++++ ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2013-04-26 00:03:56.000000000 +0200
+@@ -55,13 +55,8 @@
+       extensionJarsAndDlls.addAll(Arrays.asList(new String [] {
+           "j3dcore.jar", // Main Java 3D jars
+           "vecmath.jar",
+-          "j3dutils.jar",
+-          "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs
+-          "macosx/jogl.jar",
+-          "macosx/libgluegen-rt.jnilib",
+-          "macosx/libjogl.jnilib",
+-          "macosx/libjogl_awt.jnilib",
+-          "macosx/libjogl_cg.jnilib"}));
++          "j3dutils.jar"
++      }));
+     } else {
+       String message = Locale.getDefault().getLanguage().equals(Locale.FRENCH.getLanguage())
+           ? "Sweet Home 3D ne peut pas encore fonctionner avec Java %c sous Mac OS X.\n" 
+@@ -76,16 +71,9 @@
+       System.exit(1);
+     }
      if ("64".equals(System.getProperty("sun.arch.data.model"))) {
 -      extensionJarsAndDlls.add("linux/x64/libj3dcore-ogl.so"); // Linux 64 bits DLLs
 -      extensionJarsAndDlls.add("windows/x64/j3dcore-ogl.dll"); // Windows 64 bits DLLs
-+      extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/amd64/libj3dcore-ogl.so");
++	  extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/amd64/libj3dcore-ogl.so");
      } else {
--      extensionJarsAndDlls.add("linux/i386/libj3dcore-ogl.so"); // Linux 32 bits DLLs
--      extensionJarsAndDlls.add("linux/i386/libj3dcore-ogl-cg.so"); // Windows 32 bits DLLs
--      extensionJarsAndDlls.add("windows/i386/j3dcore-d3d.dll");
--      extensionJarsAndDlls.add("windows/i386/j3dcore-ogl.dll");
--      extensionJarsAndDlls.add("windows/i386/j3dcore-ogl-cg.dll");
--      extensionJarsAndDlls.add("windows/i386/j3dcore-ogl-chk.dll");
+-      extensionJarsAndDlls.addAll(Arrays.asList(new String [] {
+-          "linux/i386/libj3dcore-ogl.so", // Linux 32 bits DLLs
+-          "linux/i386/libj3dcore-ogl-cg.so", // Windows 32 bits DLLs
+-          "windows/i386/j3dcore-d3d.dll",
+-          "windows/i386/j3dcore-ogl.dll",
+-          "windows/i386/j3dcore-ogl-cg.dll",
+-          "windows/i386/j3dcore-ogl-chk.dll"}));
 +      extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/i386/libj3dcore-ogl.so");
      }
      
      String [] applicationPackages = {
-@@ -93,4 +82,4 @@
+@@ -117,4 +105,4 @@
      // Call application class main method with reflection
      applicationClassMain.invoke(null, new Object [] {args});
-   }
--}
+   }-}
 \ No newline at end of file
 +}