Date: Mon, 13 Jul 2009 23:33:48 +1200 (NZST) From: Jonathan Chen <jonc@chen.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/136711: update java/java3d Message-ID: <20090713113348.2AABA2841B@chen.org.nz> Resent-Message-ID: <200907131140.n6DBe0hq070885@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 @@
<echo message="version_file = ${version_file}"/>
</target>
@@ -12,12 +12,13 @@
+ <property name="platformname" value="freebsd-${os.arch}"/>
+ <property name="platform" value="freebsd"/>
+ <property name="install.bin" value="lib/${os.arch}"/>
++ <property name="ports.prefix" value="/usr/local"/>
+ </target>
+
<target name="setupSolaris" if="isSolarisOnSparc">
<property name="isUnix" value="true"/>
<property name="shell" value="/usr/bin/ksh"/>
-@@ -232,7 +241,7 @@
+@@ -232,7 +242,7 @@
</target>
<target name="setupPlatform"
@@ -26,9 +27,9 @@
<property name="build-debug-gen" location="${build}/${platform}/debug/gen"/>
<property name="build-opt-gen" location="${build}/${platform}/opt/gen"/>
<property name="docname" value="${build.relprefix}-${version_file}-doc"/>
-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 @@
<javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-opt-gen}/classes" destdir="${build}/${platform}/opt/classes"
source="1.5"
@@ -46,9 +47,9 @@
destdir="${build}/${platform}/javadocs/docs-public"
bottom="${javadoc.bottom}"
windowtitle="${build.javadoc.name} ${version}">
-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 @@
<!-- Ant file for building native files -->
<project name="j3d-core native" default="compile-opt">
@@ -87,9 +88,9 @@
<property name="bldType" value="opt"/>
<property name="javahCoreSrc"
location="${src}/classes/share/javax/media/j3d"/>
-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 @@
+<?xml version="1.0"?>
+
@@ -117,12 +118,12 @@
+
+ <!-- Compile the c source files-->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
-+ <arg line="-fPIC -march=k8 -I${oglsrc} -I/usr/local/include -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
++ <arg line="-fPIC -march=k8 -I${oglsrc} -I${ports.prefix}/include -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
+ </exec>
+
+ <!-- Create the library file-->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/local/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
++ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L${ports.prefix}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
+ </exec>
+
+ </target>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090713113348.2AABA2841B>