ports/180479: [PATCH] Please upgrade cad/sweethome3d from version 4.0 to 4.1

[Matthias Petermann]

>Number:         180479
>Category:       ports
>Synopsis:       [PATCH] Please upgrade cad/sweethome3d from version 4.0 to 4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 11 20:00:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Petermann
>Release:        9.1
>Organization:
>Environment:
>Description:
The attached patch upgrades SweetHome3D to the newest version 4.1.

Changes relevant to the FreeBSD version:

* Optimized Export to OBJ format feature for big exports.
* Moved the aerial view point of view closer to the first piece of furniture added to an empty home.
* Fixed a printing bug that didn't always show the expected pages.
* Automatically deleted the private working folder of Sweet Home 3D at program end when it stops normally.
* Accepted absolute paths in com.eteks.sweethome3d.tools.temporarySubFolder system property to simplify the way to specify where the private working folder of Sweet Home 3D should be.
* Added com.eteks.sweethome3d.swing.fixedPrintMargin system property to be able to force a print margin (expressed in centimeters) when customized margins entered in page format dialog box aren't taken into account.
* Fixed a bug that kept displaying the available updates of a library even once it wasinstalled.
* Fixed an issue that prevented program launch when the name of imported libraries contained a very long string of digits.
* Updated Spanish help pages.
* Other minor bugs fixes and enhancements.

The full list of changes (also for other platforms) can be found at:

http://www.sweethome3d.com/history.jsp#version4point1
>How-To-Repeat:

>Fix:
Please apply the attached patch.

e.g.

cd /usr/ports/cad
patch -p0 < /path/to/patch.txt

Patch attached with submission follows:

diff -ruN sweethome3d.orig/Makefile sweethome3d/Makefile
--- sweethome3d.orig/Makefile	2013-07-11 21:41:43.000000000 +0200
+++ sweethome3d/Makefile	2013-07-11 21:44:33.000000000 +0200
@@ -1,12 +1,13 @@
+# Created by: Matthias Petermann <matthias at petermann-it.de>
 # $FreeBSD: cad/sweethome3d/Makefile 316664 2013-04-27 13:43:58Z madpilot $
 
 PORTNAME=	sweethome3d
-PORTVERSION=	4.0
+PORTVERSION=	4.1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
 
-MAINTAINER=	matthias at petermann.it
+MAINTAINER=	matthias at petermann-it.de
 COMMENT=	Free interior design application
 
 LICENSE=	GPLv2
diff -ruN sweethome3d.orig/distinfo sweethome3d/distinfo
--- sweethome3d.orig/distinfo	2013-07-11 21:41:43.000000000 +0200
+++ sweethome3d/distinfo	2013-07-11 21:43:40.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (SweetHome3D-4.0-src.zip) = ff0d33ec3b2b6015b0d86a0ee7b9fcb098325d08f8ad0584f0a23bc8c567085f
-SIZE (SweetHome3D-4.0-src.zip) = 26183531
+SHA256 (SweetHome3D-4.1-src.zip) = 6d7e49c9a9d86eed3216f5b8b11ae284605259420b1a347e9d8c2dc1030e4c09
+SIZE (SweetHome3D-4.1-src.zip) = 26230166
diff -ruN sweethome3d.orig/files/patch-build.xml sweethome3d/files/patch-build.xml
--- sweethome3d.orig/files/patch-build.xml	2013-07-11 21:41:43.000000000 +0200
+++ sweethome3d/files/patch-build.xml	2013-07-11 21:43:40.000000000 +0200
@@ -1,6 +1,6 @@
---- ./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 @@
+--- ./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 @@
          <include name="j3dutils.jar"/>
          <include name="vecmath.jar"/>
        </fileset>
diff -ruN sweethome3d.orig/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
--- sweethome3d.orig/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java	2013-07-11 21:41:43.000000000 +0200
+++ sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java	2013-07-11 21:43:40.000000000 +0200
@@ -1,6 +1,6 @@
---- ./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 @@
+--- ./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 @@
        extensionJarsAndDlls.addAll(Arrays.asList(new String [] {
            "j3dcore.jar", // Main Java 3D jars
            "vecmath.jar",
@@ -16,13 +16,13 @@
      } 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 @@
+@@ -77,16 +72,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.addAll(Arrays.asList(new String [] {
 -          "linux/i386/libj3dcore-ogl.so", // Linux 32 bits DLLs
@@ -35,7 +35,10 @@
      }
      
      String [] applicationPackages = {
-@@ -117,4 +105,4 @@
+@@ -125,4 +113,4 @@
      // Call application class main method with reflection
      applicationClassMain.invoke(null, new Object [] {args});
    }
+-}
+\ No newline at end of file
++}


>Release-Note:
>Audit-Trail:
>Unformatted: