From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 25 22:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BD07FA16 for ; Thu, 25 Apr 2013 22:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 9F6911F57 for ; Thu, 25 Apr 2013 22:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3PMK0ep007335 for ; Thu, 25 Apr 2013 22:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3PMK0Zp007334; Thu, 25 Apr 2013 22:20:00 GMT (envelope-from gnats) Resent-Date: Thu, 25 Apr 2013 22:20:00 GMT Resent-Message-Id: <201304252220.r3PMK0Zp007334@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthias Petermann Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 17DC586D for ; Thu, 25 Apr 2013 22:12:50 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id EB9F11F0D for ; Thu, 25 Apr 2013 22:12:49 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r3PMCnfI058456 for ; Thu, 25 Apr 2013 22:12:49 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r3PMCnO2058455; Thu, 25 Apr 2013 22:12:49 GMT (envelope-from nobody) Message-Id: <201304252212.r3PMCnO2058455@red.freebsd.org> Date: Thu, 25 Apr 2013 22:12:49 GMT From: Matthias Petermann To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/178167: [PATCH] Please upgrade cad/sweethome3d from version 3.6 to 4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 22:20:00 -0000 >Number: 178167 >Category: ports >Synopsis: [PATCH] Please upgrade cad/sweethome3d from version 3.6 to 4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Apr 25 22:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Matthias Petermann >Release: 9.1 >Organization: >Environment: >Description: The attached patch upgrades SweetHome3D to the newest version. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN sweethome3d.orig/Makefile sweethome3d/Makefile --- sweethome3d.orig/Makefile 2013-04-25 23:16:12.000000000 +0200 +++ sweethome3d/Makefile 2013-04-25 23:16:52.000000000 +0200 @@ -1,8 +1,7 @@ -# Created by: Matthias Petermann -# $FreeBSD: cad/sweethome3d/Makefile 314867 2013-03-21 20:16:53Z pawel $ +# $FreeBSD$ PORTNAME= sweethome3d -PORTVERSION= 3.6 +PORTVERSION= 4.0 CATEGORIES= cad java MASTER_SITES= SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/ DISTNAME= SweetHome3D-${PORTVERSION}-src diff -ruN sweethome3d.orig/distinfo sweethome3d/distinfo --- sweethome3d.orig/distinfo 2013-04-25 23:16:12.000000000 +0200 +++ sweethome3d/distinfo 2013-04-25 23:17:10.000000000 +0200 @@ -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 -ruN sweethome3d.orig/files/patch-build.xml sweethome3d/files/patch-build.xml --- sweethome3d.orig/files/patch-build.xml 2013-04-25 23:16:12.000000000 +0200 +++ sweethome3d/files/patch-build.xml 2013-04-26 00:04:20.000000000 +0200 @@ -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 @@ - - - +--- ./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 @@ + + + +- - - -- -- +- +- +- - -- - + + - 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-04-25 23:16:12.000000000 +0200 +++ sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java 2013-04-26 00:04:20.000000000 +0200 @@ -1,34 +1,41 @@ ---- ./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}); } >Release-Note: >Audit-Trail: >Unformatted: