- Update to 4.1

- Update maintainer address

PR:		ports/180479
Submitted by:	Matthias Petermann <matthias@petermann-it.de> (maintainer)

4 files changed, 17 insertions, 13 deletions

diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index aeda17a36207..961319cc164b 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -1,12 +1,13 @@
+# Created by: Matthias Petermann <matthias@petermann-it.de>
 # $FreeBSD$
 
 PORTNAME=	sweethome3d
-PORTVERSION=	4.0
+PORTVERSION=	4.1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
 
-MAINTAINER=	matthias@petermann.it
+MAINTAINER=	matthias@petermann-it.de
 COMMENT=	Free interior design application
 
 LICENSE=	GPLv2
diff --git a/cad/sweethome3d/distinfo b/cad/sweethome3d/distinfo
index 4010b349a9fe..1d44f30a1b71 100644
--- a/cad/sweethome3d/distinfo
+++ b/cad/sweethome3d/distinfo
@@ -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 --git a/cad/sweethome3d/files/patch-build.xml b/cad/sweethome3d/files/patch-build.xml
index d327db0134ab..7441d7f6558e 100644
--- a/cad/sweethome3d/files/patch-build.xml
+++ b/cad/sweethome3d/files/patch-build.xml
@@ -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 --git a/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java b/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
index d9342f2f18d8..9f5245f7b121 100644
--- a/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
+++ b/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
@@ -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
++}