- Update to version 4.2

- Allow staging

PR:		ports/184156
Submitted by:	maintainer

4 files changed, 20 insertions, 21 deletions

diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index b11a2816c96e..52bee67eee75 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sweethome3d
-PORTVERSION=	4.1
+PORTVERSION=	4.2
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -32,11 +32,10 @@ PLIST_FILES=	bin/sweethome3d \
 
 DESKTOP_ENTRIES="Sweet Home 3D" "" "${PORTNAME}-icon" "${PORTNAME}" "" false
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} ${JAVAJARDIR}/${JARNAME}
-	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh ${PREFIX}/bin/sweethome3d
+	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} ${STAGEDIR}${JAVAJARDIR}/${JARNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh ${STAGEDIR}${PREFIX}/bin/sweethome3d
 	${INSTALL_DATA} ${WRKSRC}/deploy/SweetHome3DIcon32x32.png \
-		${PREFIX}/share/pixmaps/sweethome3d-icon.png
+		${STAGEDIR}${PREFIX}/share/pixmaps/sweethome3d-icon.png
 
 .include <bsd.port.mk>
diff --git a/cad/sweethome3d/distinfo b/cad/sweethome3d/distinfo
index 1d44f30a1b71..c77604e684bb 100644
--- a/cad/sweethome3d/distinfo
+++ b/cad/sweethome3d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SweetHome3D-4.1-src.zip) = 6d7e49c9a9d86eed3216f5b8b11ae284605259420b1a347e9d8c2dc1030e4c09
-SIZE (SweetHome3D-4.1-src.zip) = 26230166
+SHA256 (SweetHome3D-4.2-src.zip) = 7fb590afe00f43331dba388c5dab5d6f8ab0fe6cf9b1ddf9547965cf107c0313
+SIZE (SweetHome3D-4.2-src.zip) = 26463955
diff --git a/cad/sweethome3d/files/patch-build.xml b/cad/sweethome3d/files/patch-build.xml
index 7441d7f6558e..d20abac7dcb6 100644
--- a/cad/sweethome3d/files/patch-build.xml
+++ b/cad/sweethome3d/files/patch-build.xml
@@ -1,6 +1,6 @@
---- ./build.xml.orig	2013-05-31 16:51:26.000000000 +0200
-+++ ./build.xml	2013-07-11 21:20:16.000000000 +0200
-@@ -269,13 +269,6 @@
+--- ./build.xml.orig	2013-11-01 23:41:18.000000000 +0100
++++ ./build.xml	2013-11-18 18:39:59.000000000 +0100
+@@ -219,13 +219,6 @@
          <include name="j3dutils.jar"/>
          <include name="vecmath.jar"/>
        </fileset>
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 9f5245f7b121..5a96aec598d7 100644
--- a/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
+++ b/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
@@ -1,11 +1,11 @@
---- ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig	2013-05-31 16:51:26.000000000 +0200
-+++ ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2013-07-11 21:24:10.000000000 +0200
-@@ -56,13 +56,8 @@
+--- ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig	2013-11-01 23:41:20.000000000 +0100
++++ ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2013-11-18 18:43:37.000000000 +0100
+@@ -75,13 +75,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/gluegen-rt.jar", // Mac OS X jars and DLLs for Java 5 or 6
 -          "macosx/jogl.jar",
 -          "macosx/libgluegen-rt.jnilib",
 -          "macosx/libjogl.jnilib",
@@ -13,16 +13,16 @@
 -          "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" 
-@@ -77,16 +72,9 @@
-       System.exit(1);
+     } else if (javaVersion.startsWith(java7Prefix)
+                && javaVersion.length() >= java7Prefix.length() + 1
+                && Character.isDigit(javaVersion.charAt(java7Prefix.length()))
+@@ -116,16 +111,9 @@
+       System.setProperty("com.eteks.sweethome3d.j3d.useOffScreen3DView", "true");
      }
      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.addAll(Arrays.asList(new String [] {
 -          "linux/i386/libj3dcore-ogl.so", // Linux 32 bits DLLs
@@ -35,7 +35,7 @@
      }
      
      String [] applicationPackages = {
-@@ -125,4 +113,4 @@
+@@ -164,4 +152,4 @@
      // Call application class main method with reflection
      applicationClassMain.invoke(null, new Object [] {args});
    }