From 95cc8c43688579a64f8dc582cfee30fc53bfbc76 Mon Sep 17 00:00:00 2001
From: lawrance <lawrance@FreeBSD.org>
Date: Sat, 23 Apr 2005 14:12:36 +0000
Subject: Update math/vtk-* to version 4.4

PR:		ports/77038
Submitted by:	Mykola Khotyaintsev <ko@irfu.se> (maintainer)
Approved by:	clement (mentor)
---
 math/vtk-java/Makefile  | 33 +++++++++++++++++++++++++--------
 math/vtk-java/pkg-plist |  5 +----
 2 files changed, 26 insertions(+), 12 deletions(-)

(limited to 'math/vtk-java')

diff --git a/math/vtk-java/Makefile b/math/vtk-java/Makefile
index de6aab78b87a..78d5545f3dfd 100644
--- a/math/vtk-java/Makefile
+++ b/math/vtk-java/Makefile
@@ -15,18 +15,21 @@ LIB_DEPENDS=	vtkCommon.${LIBVER}:${PORTSDIR}/math/vtk
 MASTERDIR=	${.CURDIR}/../vtk
 
 WRAP=		Java
-BINARIES=	VTKJavaExecutable vtkParseJava vtkWrapJava
+BINARIES=	vtkParseJava vtkWrapJava
+
+USE_JAVA=       yes
+JAVA_VERSION=   1.4+
+JAVA_OS=        native
+JAVA_BUILD=     jdk
+#USE_JIKES=      no
 
-USE_JAVA=	1.4
-NEED_JAVAC=	yes
-USE_JIKES=	no
 JARFILE=	vtk.jar	#	${PORTNAME}.jar
 DESTJARFILE=	vtk.jar #	${PORTNAME}.jar
-CMAKE_DEFS=	-DVTK_WRAP_JAVA:BOOL=ON \
+CMAKE_DEFS+=	-DVTK_WRAP_JAVA:BOOL=ON \
 		-DJAVA_ARCHIVE:FILEPATH=${JAR} \
 		-DJAVA_AWT_INCLUDE_PATH:PATH=${JAVA_HOME}/include \
 		-DJAVA_AWT_LIBRARY:FILEPATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \
-		-DJAVA_COMPILE:FILEPATH=${JAVAC} \
+		-DJAVA_COMPILE:FILEPATH="${JAVAC}" \
 		-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \
 		-DJAVA_INCLUDE_PATH2:PATH=${JAVA_HOME}/include/freebsd
 
@@ -44,6 +47,20 @@ pre-everything::
 
 post-patch: patch-common
 
+post-build:
+	@${ECHO_MSG} "Building Java sources"
+	${CP} ${VTKSRCDIR}/Wrapping/Java/vtk/vtkCanvas.java ${WRKSRC}/java/vtk
+	${CP} ${VTKSRCDIR}/Wrapping/Java/vtk/vtkPanel.java ${WRKSRC}/java/vtk
+	(cd ${WRKSRC}/java;${JAVAC} vtk/*.java)
+	(cd ${WRKSRC}/java;${JAR} cvf ${WRKSRC}/bin/${JARFILE} vtk/*.class) 
+.if defined(WITH_TESTING)
+.for i in AxesActor SimpleVTK TestVTKCanvas TestInternalFrames ImagePlaneWidget TestVTKCanvas
+	(cd ${VTKSRCDIR}/Wrapping/Java; \
+	${JAVAC} -classpath .:${WRKSRC}/bin/${JARFILE} \
+	-d ${WRKSRC}/Wrapping/Java/ ${i}.java) 
+.endfor
+.endif
+
 do-install: install-cnotice install-binaries install-libs
 	@${ECHO_MSG} "Installing ${DESTJARFILE} to ${JAVAJARDIR} ..."
 	@${INSTALL_DATA} ${WRKSRC}/bin/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
@@ -53,11 +70,10 @@ do-install: install-cnotice install-binaries install-libs
 	@${MKDIR} ${TESTINGDIR}/Java
 .if defined(WITH_TESTING)
 	@${ECHO_MSG} "Installing Java tests to ${TESTINGDIR}/Java ..."
-.for i in AxesActor SimpleVTK Regression TestVTKCanvas TestInternalFrames ImagePlaneWidget
+.for i in AxesActor SimpleVTK TestVTKCanvas TestInternalFrames ImagePlaneWidget
 	@${INSTALL_DATA} ${WRKSRC}/Wrapping/Java/${i}*.class ${TESTINGDIR}/Java
 	@${INSTALL_DATA} ${VTKSRCDIR}/Wrapping/Java/${i}.java ${TESTINGDIR}/Java
 .endfor
-.endif
 
 	@${ECHO_MSG} "This directory contains VTK Java tests" > ${TESTINGDIR}/Java/README
 	@${ECHO_MSG} "" >> ${TESTINGDIR}/Java/README
@@ -65,5 +81,6 @@ do-install: install-cnotice install-binaries install-libs
 	@${ECHO_MSG} "java -classpath .:${PREFIX}/share/java/classes/vtk.jar -Djava.library.path=${PREFIX}/lib SimpleVTK" >> ${TESTINGDIR}/Java/README
 	@${ECHO_MSG} "" >> ${TESTINGDIR}/Java/README
 	@${ECHO_MSG} "Be shure to use java 1.3 or greater." >> ${TESTINGDIR}/Java/README
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/math/vtk-java/pkg-plist b/math/vtk-java/pkg-plist
index 73968a6e4ade..082bb330c1b1 100644
--- a/math/vtk-java/pkg-plist
+++ b/math/vtk-java/pkg-plist
@@ -1,4 +1,3 @@
-bin/VTKJavaExecutable
 bin/vtkParseJava
 bin/vtkWrapJava
 lib/libvtkCommonJava.so
@@ -29,8 +28,6 @@ share/java/classes/vtk.jar
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/ImagePlaneWidget$2.class
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/ImagePlaneWidget.class
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/ImagePlaneWidget.java
-%%TESTING_ONLY%%share/examples/vtk/Testing/Java/Regression.class
-%%TESTING_ONLY%%share/examples/vtk/Testing/Java/Regression.java
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/SimpleVTK$1.class
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/SimpleVTK.class
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/SimpleVTK.java
@@ -50,5 +47,5 @@ share/java/classes/vtk.jar
 %%TESTING_ONLY%%share/examples/vtk/Testing/Java/README
 @unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
 %%TESTING_ONLY%%@dirrm share/examples/vtk/Testing/Java
-%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk/testing 2>/dev/null || true
+%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk/Testing 2>/dev/null || true
 %%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk 2>/dev/null || true
-- 
cgit