From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 13 11:40:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2212F1065672 for ; Mon, 13 Jul 2009 11:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F3A228FC1C for ; Mon, 13 Jul 2009 11:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6DBe0cR070886 for ; Mon, 13 Jul 2009 11:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6DBe0hq070885; Mon, 13 Jul 2009 11:40:00 GMT (envelope-from gnats) Resent-Date: Mon, 13 Jul 2009 11:40:00 GMT Resent-Message-Id: <200907131140.n6DBe0hq070885@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, Jonathan Chen Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72220106567A for ; Mon, 13 Jul 2009 11:33:57 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: from chen.org.nz (ip-58-28-152-174.static-xdsl.xnet.co.nz [58.28.152.174]) by mx1.freebsd.org (Postfix) with ESMTP id 9EBB18FC0C for ; Mon, 13 Jul 2009 11:33:51 +0000 (UTC) (envelope-from jonc@chen.org.nz) Received: by chen.org.nz (Postfix, from userid 1000) id 2AABA2841B; Mon, 13 Jul 2009 23:33:48 +1200 (NZST) Message-Id: <20090713113348.2AABA2841B@chen.org.nz> Date: Mon, 13 Jul 2009 23:33:48 +1200 (NZST) From: Jonathan Chen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/136711: update java/java3d X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jonathan Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2009 11:40:01 -0000 >Number: 136711 >Category: ports >Synopsis: update java/java3d >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 13 11:40:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jonathan Chen >Release: FreeBSD 7.2-STABLE amd64 >Organization: >Environment: System: FreeBSD osiris.chen.org.nz 7.2-STABLE FreeBSD 7.2-STABLE #0: Sat Jun 27 08:22:54 NZST 2009 root@osiris.chen.org.nz:/usr/obj/usr/src/sys/OSIRIS amd64 >Description: Allow java/java3d to build with a Custom PREFIX and LOCALBASE. No portrevision bump required, as it wouldn't custom PREFIX and LOCALBASE wouldn't work installed without this patch. >How-To-Repeat: >Fix: diff -ruN /usr/ports/java/java3d/Makefile ./Makefile --- /usr/ports/java/java3d/Makefile 2009-06-13 18:56:08.000000000 +1200 +++ ./Makefile 2009-07-13 23:24:15.000000000 +1200 @@ -21,6 +21,7 @@ USE_GL= gl USE_XORG= xt JAVA_VERSION= 1.5+ +JAVA_VENDOR= freebsd bsdjava USE_ANT= yes PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH} @@ -32,7 +33,7 @@ do-build: cd ${WRKSRC}/vecmath && ${ANT} dist - cd ${WRKSRC}/j3d-core && ${ANT} -Dbuild.type=fcs -Dis${OPSYS}=yes jar-opt + cd ${WRKSRC}/j3d-core && ${ANT} -Dbuild.type=fcs -Dis${OPSYS}=yes -Dports.prefix=${PREFIX} jar-opt .if !defined(NOPORTDOCS) cd ${WRKSRC}/j3d-core && ${ANT} -Dbuild.type=fcs -Dis${OPSYS}=yes docs-public .endif diff -ruN /usr/ports/java/java3d/files/patch-freebsd ./files/patch-freebsd --- /usr/ports/java/java3d/files/patch-freebsd 2008-09-04 02:41:58.000000000 +1200 +++ ./files/patch-freebsd 2009-07-13 23:24:37.000000000 +1200 @@ -1,7 +1,7 @@ -diff -ruN ./j3d-core/build.xml ../java3d-1.5.2/j3d-core/build.xml ---- ./j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 -+++ ../java3d-1.5.2/j3d-core/build.xml 2008-07-21 23:00:14.000000000 +1200 -@@ -142,6 +142,15 @@ +diff -ruN ../java3d-1.5.2/j3d-core/build.xml ./j3d-core/build.xml +--- ../java3d-1.5.2/j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 ++++ ./j3d-core/build.xml 2009-07-12 13:20:26.000000000 +1200 +@@ -142,6 +142,16 @@ @@ -12,12 +12,13 @@ + + + ++ + + -@@ -232,7 +241,7 @@ +@@ -232,7 +242,7 @@ -diff -ruN ./j3d-core/src/classes/build.xml ../java3d-1.5.2/j3d-core/src/classes/build.xml ---- ./j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 -+++ ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-07-21 23:02:37.000000000 +1200 +diff -ruN ../java3d-1.5.2/j3d-core/src/classes/build.xml ./j3d-core/src/classes/build.xml +--- ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 ++++ ./j3d-core/src/classes/build.xml 2009-07-12 13:19:17.000000000 +1200 @@ -95,6 +95,7 @@ -diff -ruN ./j3d-core/src/native/build.xml ../java3d-1.5.2/j3d-core/src/native/build.xml ---- ./j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 -+++ ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-07-21 23:00:14.000000000 +1200 +diff -ruN ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/build.xml +--- ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 ++++ ./j3d-core/src/native/build.xml 2009-07-12 13:19:17.000000000 +1200 @@ -3,6 +3,19 @@ @@ -87,9 +88,9 @@ -diff -ruN ./j3d-core/src/native/ogl/build-freebsd.xml ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ---- ./j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 -+++ ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 2008-07-21 23:00:14.000000000 +1200 +diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml +--- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 ++++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.000000000 +1200 @@ -0,0 +1,74 @@ + + @@ -117,12 +118,12 @@ + + + -+ ++ + + + + -+ ++ + + + >Release-Note: >Audit-Trail: >Unformatted: