svn commit: r387606 - in head/cad/sweethome3d: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed May 27 13:43:20 2015
New Revision: 387606
URL: https://svnweb.freebsd.org/changeset/ports/387606

Log:
  - Update to 4.6
  - While here, clearify license and add LICENSE_FILE
  
  Changes: http://www.sweethome3d.com/history.jsp
  
  PR:		200427
  Submitted by:	matthias at petermann-it.de (maintainer)

Added:
  head/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java
     - copied, changed from r387513, head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
Deleted:
  head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java
Modified:
  head/cad/sweethome3d/Makefile
  head/cad/sweethome3d/distinfo
  head/cad/sweethome3d/files/patch-build.xml
  head/cad/sweethome3d/pkg-descr

Modified: head/cad/sweethome3d/Makefile
==============================================================================
--- head/cad/sweethome3d/Makefile	Wed May 27 13:40:45 2015	(r387605)
+++ head/cad/sweethome3d/Makefile	Wed May 27 13:43:20 2015	(r387606)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sweethome3d
-PORTVERSION=	4.4
-PORTREVISION=	1
+PORTVERSION=	4.6
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -11,7 +10,8 @@ DISTNAME=	SweetHome3D-${PORTVERSION}-src
 MAINTAINER=	matthias at petermann-it.de
 COMMENT=	Free interior design application
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING.TXT
 
 BUILD_DEPENDS=	java3d>=0:${PORTSDIR}/java/java3d
 RUN_DEPENDS=	java3d>=0:${PORTSDIR}/java/java3d

Modified: head/cad/sweethome3d/distinfo
==============================================================================
--- head/cad/sweethome3d/distinfo	Wed May 27 13:40:45 2015	(r387605)
+++ head/cad/sweethome3d/distinfo	Wed May 27 13:43:20 2015	(r387606)
@@ -1,2 +1,2 @@
-SHA256 (SweetHome3D-4.4-src.zip) = 85444c1d13004095f2d18bf171cdf54350220d150f86d3264992be390efc9ad9
-SIZE (SweetHome3D-4.4-src.zip) = 25068092
+SHA256 (SweetHome3D-4.6-src.zip) = 772176b111ee269e98b28aca6c7642d514afa7b62325cb705ebd447845935715
+SIZE (SweetHome3D-4.6-src.zip) = 25660762

Modified: head/cad/sweethome3d/files/patch-build.xml
==============================================================================
--- head/cad/sweethome3d/files/patch-build.xml	Wed May 27 13:40:45 2015	(r387605)
+++ head/cad/sweethome3d/files/patch-build.xml	Wed May 27 13:43:20 2015	(r387606)
@@ -1,5 +1,5 @@
---- ./build.xml.orig	2014-08-03 13:58:31.000000000 +0200
-+++ ./build.xml	2014-08-03 13:58:41.000000000 +0200
+--- build.xml.orig	2015-05-21 23:38:04 UTC
++++ build.xml
 @@ -221,13 +221,6 @@
          <include name="j3dutils.jar"/>
          <include name="vecmath.jar"/>

Copied and modified: head/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java (from r387513, head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java)
==============================================================================
--- head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java	Tue May 26 19:56:58 2015	(r387513, copy source)
+++ head/cad/sweethome3d/files/patch-src_com_eteks_sweethome3d_SweetHome3DBootstrap.java	Wed May 27 13:43:20 2015	(r387606)
@@ -1,6 +1,6 @@
---- ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig	2014-08-03 13:59:08.000000000 +0200
-+++ ./src/com/eteks/sweethome3d/SweetHome3DBootstrap.java	2014-08-03 15:16:26.000000000 +0200
-@@ -54,77 +54,26 @@
+--- src/com/eteks/sweethome3d/SweetHome3DBootstrap.java.orig	2015-05-21 23:38:24 UTC
++++ src/com/eteks/sweethome3d/SweetHome3DBootstrap.java
+@@ -53,77 +53,26 @@ public class SweetHome3DBootstrap {
      String operatingSystemName = System.getProperty("os.name");
      String javaVersion = System.getProperty("java.version");
      String java7Prefix = "1.7.0_";
@@ -87,17 +87,17 @@
 -          "windows/i386/j3dcore-ogl.dll",
 -          "windows/i386/j3dcore-ogl-cg.dll",
 -          "windows/i386/j3dcore-ogl-chk.dll"}));
-+        String message = "Your combination of JDK version and\n" 
++        String message = "Your combination of JDK version and\n"
 +            + "hardware architecture is not supported.\n"
 +            + "If you think that this is an error, please\n"
 +            + "contact the port maintainer.";
-+            
++
 +        JOptionPane.showMessageDialog(null, message);
 +        System.exit(1);
      }
      
      String [] applicationPackages = {
-@@ -163,4 +112,4 @@
+@@ -162,4 +111,4 @@ public class SweetHome3DBootstrap {
      // Call application class main method with reflection
      applicationClassMain.invoke(null, new Object [] {args});
    }

Modified: head/cad/sweethome3d/pkg-descr
==============================================================================
--- head/cad/sweethome3d/pkg-descr	Wed May 27 13:40:45 2015	(r387605)
+++ head/cad/sweethome3d/pkg-descr	Wed May 27 13:43:20 2015	(r387606)
@@ -1,4 +1,4 @@
 Sweet Home 3D is a free interior design application that helps you place your
 furniture on a house 2D plan, with a 3D preview.
 
-WWW: http://www.sweethome3d.com
+WWW: http://www.sweethome3d.com/