Date: Thu, 7 Aug 2014 23:20:40 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364329 - in head/cad/sweethome3d: . files Message-ID: <53e409c9.29f4.37574db7@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Aug 7 23:20:40 2014 New Revision: 364329 URL: http://svnweb.freebsd.org/changeset/ports/364329 QAT: https://qat.redports.org/buildarchive/r364329/ Log: Update to 4.4 PR: 192354 Submitted by: Matthias Petermann <matthias@petermann-it.de> (maintainer) Modified: head/cad/sweethome3d/Makefile head/cad/sweethome3d/distinfo head/cad/sweethome3d/files/patch-build.xml head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java Modified: head/cad/sweethome3d/Makefile ============================================================================== --- head/cad/sweethome3d/Makefile Thu Aug 7 23:09:46 2014 (r364328) +++ head/cad/sweethome3d/Makefile Thu Aug 7 23:20:40 2014 (r364329) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sweethome3d -PORTVERSION= 4.2 +PORTVERSION= 4.4 CATEGORIES= cad java MASTER_SITES= SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/ DISTNAME= SweetHome3D-${PORTVERSION}-src Modified: head/cad/sweethome3d/distinfo ============================================================================== --- head/cad/sweethome3d/distinfo Thu Aug 7 23:09:46 2014 (r364328) +++ head/cad/sweethome3d/distinfo Thu Aug 7 23:20:40 2014 (r364329) @@ -1,2 +1,2 @@ -SHA256 (SweetHome3D-4.2-src.zip) = 7fb590afe00f43331dba388c5dab5d6f8ab0fe6cf9b1ddf9547965cf107c0313 -SIZE (SweetHome3D-4.2-src.zip) = 26463955 +SHA256 (SweetHome3D-4.4-src.zip) = 85444c1d13004095f2d18bf171cdf54350220d150f86d3264992be390efc9ad9 +SIZE (SweetHome3D-4.4-src.zip) = 25068092 Modified: head/cad/sweethome3d/files/patch-build.xml ============================================================================== --- head/cad/sweethome3d/files/patch-build.xml Thu Aug 7 23:09:46 2014 (r364328) +++ head/cad/sweethome3d/files/patch-build.xml Thu Aug 7 23:20:40 2014 (r364329) @@ -1,6 +1,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 @@ +--- ./build.xml.orig 2014-08-03 13:58:31.000000000 +0200 ++++ ./build.xml 2014-08-03 13:58:41.000000000 +0200 +@@ -221,13 +221,6 @@ <include name="j3dutils.jar"/> <include name="vecmath.jar"/> </fileset> Modified: head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java ============================================================================== --- head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java Thu Aug 7 23:09:46 2014 (r364328) +++ head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java Thu Aug 7 23:20:40 2014 (r364329) @@ -1,9 +1,30 @@ ---- ./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", +--- ./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 @@ + String operatingSystemName = System.getProperty("os.name"); + String javaVersion = System.getProperty("java.version"); + String java7Prefix = "1.7.0_"; +- if (operatingSystemName.startsWith("Mac OS X") +- && javaVersion.startsWith("1.6") +- && System.getProperty("com.eteks.sweethome3d.deploymentInformation", "").startsWith("Java Web Start")) { +- // Refuse to let Sweet Home 3D run under Mac OS X with Java Web Start 6 +- String message = Locale.getDefault().getLanguage().equals(Locale.FRENCH.getLanguage()) +- ? "Sweet Home 3D ne peut pas fonctionner avec Java\n" +- + "Web Start 6 sous Mac OS X de façon fiable.\n" +- + "Merci de télécharger le programme d'installation depuis\n" +- + "http://www.sweethome3d.com/fr/download.jsp" +- : "Sweet Home 3D can't reliably run with Java Web Start 6\n" +- + "under Mac OS X.\n" +- + "Please download the installer version from\n" +- + "http://www.sweethome3d.com/download.jsp"; +- JOptionPane.showMessageDialog(null, message); +- System.exit(1); +- } else if (!operatingSystemName.startsWith("Mac OS X") +- || javaVersion.startsWith("1.5") +- || javaVersion.startsWith("1.6")) { +- 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 for Java 5 or 6 - "macosx/jogl.jar", @@ -11,31 +32,72 @@ - "macosx/libjogl.jnilib", - "macosx/libjogl_awt.jnilib", - "macosx/libjogl_cg.jnilib"})); -+ "j3dutils.jar" -+ })); - } 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"))) { +- } else if (javaVersion.startsWith(java7Prefix) +- && javaVersion.length() >= java7Prefix.length() + 1 +- && Character.isDigit(javaVersion.charAt(java7Prefix.length())) +- && (javaVersion.length() >= java7Prefix.length() + 2 // Test version on 2 digits +- && Character.isDigit(javaVersion.charAt(java7Prefix.length() + 1)) +- && Integer.parseInt(javaVersion.substring(java7Prefix.length(), java7Prefix.length() + 2)) < 40 +- || javaVersion.length() == java7Prefix.length() + 1 // Test whether version is on 1 digit (i.e. < 40) +- || !Character.isDigit(javaVersion.charAt(java7Prefix.length() + 1)))) { +- // Refuse to let Sweet Home 3D run under Mac OS X with Java 7 before version 7u40 +- String message = Locale.getDefault().getLanguage().equals(Locale.FRENCH.getLanguage()) +- ? "Sous Mac OS X, Sweet Home 3D ne peut fonctionner avec Java 7\n" +- + "qu'à partir de la version Java 7u40. Merci de mettre à jour\n" +- + "votre version de Java ou de lancer Sweet Home 3D sous Java 6." +- : "Under Mac OS X, Sweet Home 3D can run with Java 7 only\n" +- + "from version Java 7u40. Please, update you Java version\n" +- + "or run Sweet Home 3D under Java 6."; +- JOptionPane.showMessageDialog(null, message); +- System.exit(1); +- } else { // Java >= 1.7.0_40 +- extensionJarsAndDlls.addAll(Arrays.asList(new String [] { +- "macosx/java3d-1.6/j3dcore.jar", // Mac OS X Java 3D 1.6 jars and DLLs +- "macosx/java3d-1.6/vecmath.jar", +- "macosx/java3d-1.6/j3dutils.jar", +- "macosx/java3d-1.6/gluegen.jar", +- "macosx/java3d-1.6/jogl-java3d.jar", +- "macosx/java3d-1.6/libgluegen-rt.jnilib", +- "macosx/java3d-1.6/libjogl_desktop.jnilib", +- "macosx/java3d-1.6/libnativewindow_awt.jnilib", +- "macosx/java3d-1.6/libnativewindow_macosx.jnilib"})); +- // Disable JOGL library loader +- System.setProperty("jogamp.gluegen.UseTempJarCache", "false"); +- } +- 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"); ++ ++ Boolean amd64 = "64".equals(System.getProperty("sun.arch.data.model")); ++ Boolean java7 = (null!=javaVersion && javaVersion.startsWith(java7Prefix)); ++ ++ if (!amd64 && !java7) { ++ extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/i386/libj3dcore-ogl.so"); ++ } else if (amd64 && !java7) { ++ extensionJarsAndDlls.add("/usr/local/openjdk6/jre/lib/amd64/libj3dcore-ogl.so"); ++ } else if (!amd64 && java7) { ++ extensionJarsAndDlls.add("/usr/local/openjdk7/jre/lib/i386/libj3dcore-ogl.so"); ++ } else if (amd64 && java7) { ++ extensionJarsAndDlls.add("/usr/local/openjdk7/jre/lib/amd64/libj3dcore-ogl.so"); } else { - 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", +- "linux/i386/libj3dcore-ogl-cg.so", +- "windows/i386/j3dcore-d3d.dll", // Windows 32 bits DLLs - "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 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 = { -@@ -164,4 +152,4 @@ +@@ -163,4 +112,4 @@ // Call application class main method with reflection applicationClassMain.invoke(null, new Object [] {args}); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e409c9.29f4.37574db7>