From nobody@FreeBSD.org  Fri Nov 22 01:37:29 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 4CB47BB6
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Nov 2013 01:37:29 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 2CCB429E5
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Nov 2013 01:37:29 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rAM1bS8p088172
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 22 Nov 2013 01:37:28 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rAM1bS4b088118;
	Fri, 22 Nov 2013 01:37:28 GMT
	(envelope-from nobody)
Message-Id: <201311220137.rAM1bS4b088118@oldred.freebsd.org>
Date: Fri, 22 Nov 2013 01:37:28 GMT
From: Matthias Petermann <matthias@petermann-it.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] cad/sweethome3d version upgrade 4.1 -> 4.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         184156
>Category:       ports
>Synopsis:       [PATCH] cad/sweethome3d version upgrade 4.1 -> 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 22 01:40:00 UTC 2013
>Closed-Date:    Sat Nov 23 00:38:22 UTC 2013
>Last-Modified:  Sat Nov 23 00:40:00 UTC 2013
>Originator:     Matthias Petermann
>Release:        9.2
>Organization:
>Environment:
FreeBSD workstation.local 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013     root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Sweet Home 3D 4.2 is a service release, delivering a bunch of improvements and bug fixes. Details can be found in the version history [1].

The attached patch:

  * upgrades to Sweet Home 3D 4.2
  * introduces staging support

[1] http://www.sweethome3d.com/history.jsp

>How-To-Repeat:
N/A
>Fix:
Please apply the attached patch

Patch attached with submission follows:

diff -ruN sweethome3d.orig/Makefile sweethome3d/Makefile
--- sweethome3d.orig/Makefile	2013-11-18 18:04:24.000000000 +0100
+++ sweethome3d/Makefile	2013-11-18 18:59:13.000000000 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: cad/sweethome3d/Makefile 327711 2013-09-20 15:58:41Z bapt $
 
 PORTNAME=	sweethome3d
-PORTVERSION=	4.1
+PORTVERSION=	4.2
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
@@ -32,11 +32,10 @@
 
 DESKTOP_ENTRIES="Sweet Home 3D" "" "${PORTNAME}-icon" "${PORTNAME}" "" false
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} ${JAVAJARDIR}/${JARNAME}
-	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh ${PREFIX}/bin/sweethome3d
+	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} ${STAGEDIR}${JAVAJARDIR}/${JARNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh ${STAGEDIR}${PREFIX}/bin/sweethome3d
 	${INSTALL_DATA} ${WRKSRC}/deploy/SweetHome3DIcon32x32.png \
-		${PREFIX}/share/pixmaps/sweethome3d-icon.png
+		${STAGEDIR}${PREFIX}/share/pixmaps/sweethome3d-icon.png
 
 .include <bsd.port.mk>
diff -ruN sweethome3d.orig/distinfo sweethome3d/distinfo
--- sweethome3d.orig/distinfo	2013-11-18 18:04:24.000000000 +0100
+++ sweethome3d/distinfo	2013-11-18 18:05:13.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (SweetHome3D-4.1-src.zip) = 6d7e49c9a9d86eed3216f5b8b11ae284605259420b1a347e9d8c2dc1030e4c09
-SIZE (SweetHome3D-4.1-src.zip) = 26230166
+SHA256 (SweetHome3D-4.2-src.zip) = 7fb590afe00f43331dba388c5dab5d6f8ab0fe6cf9b1ddf9547965cf107c0313
+SIZE (SweetHome3D-4.2-src.zip) = 26463955
diff -ruN sweethome3d.orig/files/patch-build.xml sweethome3d/files/patch-build.xml
--- sweethome3d.orig/files/patch-build.xml	2013-11-18 18:04:24.000000000 +0100
+++ sweethome3d/files/patch-build.xml	2013-11-18 18:45:35.000000000 +0100
@@ -1,6 +1,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 @@
+--- ./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 @@
          <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-11-18 18:04:24.000000000 +0100
+++ sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java	2013-11-18 18:45:35.000000000 +0100
@@ -1,11 +1,11 @@
---- ./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 @@
+--- ./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",
 -          "j3dutils.jar",
--          "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs
+-          "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs for Java 5 or 6
 -          "macosx/jogl.jar",
 -          "macosx/libgluegen-rt.jnilib",
 -          "macosx/libjogl.jnilib",
@@ -13,16 +13,16 @@
 -          "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" 
-@@ -77,16 +72,9 @@
-       System.exit(1);
+     } 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"))) {
 -      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,7 @@
      }
      
      String [] applicationPackages = {
-@@ -125,4 +113,4 @@
+@@ -164,4 +152,4 @@
      // Call application class main method with reflection
      applicationClassMain.invoke(null, new Object [] {args});
    }


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: change-request->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Fri Nov 22 01:40:08 UTC 2013 
Class-Changed-Why:  
Fix category (submitter is maintainer) (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184156 
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Nov 22 21:46:03 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184156 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Sat Nov 23 00:38:22 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184156 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184156: commit references a PR
Date: Sat, 23 Nov 2013 00:38:10 +0000 (UTC)

 Author: pawel
 Date: Sat Nov 23 00:38:02 2013
 New Revision: 334628
 URL: http://svnweb.freebsd.org/changeset/ports/334628
 
 Log:
   - Update to version 4.2
   - Allow staging
   
   PR:		ports/184156
   Submitted by:	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	Sat Nov 23 00:24:00 2013	(r334627)
 +++ head/cad/sweethome3d/Makefile	Sat Nov 23 00:38:02 2013	(r334628)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	sweethome3d
 -PORTVERSION=	4.1
 +PORTVERSION=	4.2
  CATEGORIES=	cad java
  MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
  DISTNAME=	SweetHome3D-${PORTVERSION}-src
 @@ -32,11 +32,10 @@ PLIST_FILES=	bin/sweethome3d \
  
  DESKTOP_ENTRIES="Sweet Home 3D" "" "${PORTNAME}-icon" "${PORTNAME}" "" false
  
 -NO_STAGE=	yes
  do-install:
 -	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} ${JAVAJARDIR}/${JARNAME}
 -	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh ${PREFIX}/bin/sweethome3d
 +	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} ${STAGEDIR}${JAVAJARDIR}/${JARNAME}
 +	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh ${STAGEDIR}${PREFIX}/bin/sweethome3d
  	${INSTALL_DATA} ${WRKSRC}/deploy/SweetHome3DIcon32x32.png \
 -		${PREFIX}/share/pixmaps/sweethome3d-icon.png
 +		${STAGEDIR}${PREFIX}/share/pixmaps/sweethome3d-icon.png
  
  .include <bsd.port.mk>
 
 Modified: head/cad/sweethome3d/distinfo
 ==============================================================================
 --- head/cad/sweethome3d/distinfo	Sat Nov 23 00:24:00 2013	(r334627)
 +++ head/cad/sweethome3d/distinfo	Sat Nov 23 00:38:02 2013	(r334628)
 @@ -1,2 +1,2 @@
 -SHA256 (SweetHome3D-4.1-src.zip) = 6d7e49c9a9d86eed3216f5b8b11ae284605259420b1a347e9d8c2dc1030e4c09
 -SIZE (SweetHome3D-4.1-src.zip) = 26230166
 +SHA256 (SweetHome3D-4.2-src.zip) = 7fb590afe00f43331dba388c5dab5d6f8ab0fe6cf9b1ddf9547965cf107c0313
 +SIZE (SweetHome3D-4.2-src.zip) = 26463955
 
 Modified: head/cad/sweethome3d/files/patch-build.xml
 ==============================================================================
 --- head/cad/sweethome3d/files/patch-build.xml	Sat Nov 23 00:24:00 2013	(r334627)
 +++ head/cad/sweethome3d/files/patch-build.xml	Sat Nov 23 00:38:02 2013	(r334628)
 @@ -1,6 +1,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 @@
 +--- ./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 @@
           <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	Sat Nov 23 00:24:00 2013	(r334627)
 +++ head/cad/sweethome3d/files/patch-src__com__eteks__sweethome3d__SweetHome3DBootstrap.java	Sat Nov 23 00:38:02 2013	(r334628)
 @@ -1,11 +1,11 @@
 ---- ./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 @@
 +--- ./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",
  -          "j3dutils.jar",
 --          "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs
 +-          "macosx/gluegen-rt.jar", // Mac OS X jars and DLLs for Java 5 or 6
  -          "macosx/jogl.jar",
  -          "macosx/libgluegen-rt.jnilib",
  -          "macosx/libjogl.jnilib",
 @@ -13,16 +13,16 @@
  -          "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" 
 -@@ -77,16 +72,9 @@
 -       System.exit(1);
 +     } 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"))) {
  -      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,7 @@
       }
       
       String [] applicationPackages = {
 -@@ -125,4 +113,4 @@
 +@@ -164,4 +152,4 @@
       // Call application class main method with reflection
       applicationClassMain.invoke(null, new Object [] {args});
     }
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
