4 files changed, 218 insertions, 139 deletions

diff --git a/math/javaview/Makefile b/math/javaview/Makefile
index 45688b27c614..75e192ea7e77 100644
--- a/math/javaview/Makefile
+++ b/math/javaview/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	javaview-lite
-PORTVERSION=	3.90
+PORTVERSION=	3.95
 CATEGORIES=	math java graphics
 MASTER_SITES=	http://www.javaview.de/download/data/
 DISTFILES=	javaview.zip jv_models.zip jv_tutor.zip
-DIST_SUBDIR=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	nivit@email.it
 COMMENT=	A 3D viewer and a mathematical visualization software
@@ -26,10 +26,12 @@ USE_REINPLACE=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
+SUB_FILES=	pkg-message
+
 SCRIPT=		bin/javaview
 FIND_DIRS=	\( -type d -not -empty \)
 FIND_DATA=	-not -type d
-FIND_EXCLUDE=	-not \( -name "*.bat" -or -name "*.bak" -or -name "*.orig" -or -name ".*" -or -name $$(${BASENAME} ${SCRIPT}) \)
+FIND_EXCLUDE=	-not \( -name "*.bat" -or -name "*.bak" -or -name "*.orig" -or -name ".*" -or -name $$(${BASENAME} ${SCRIPT}) -or -name ${SUB_FILES} \)
 
 LINK_OPTS?=	-sf
 
diff --git a/math/javaview/distinfo b/math/javaview/distinfo
index 3a4a7f161ada..cabd98c9428e 100644
--- a/math/javaview/distinfo
+++ b/math/javaview/distinfo
@@ -1,6 +1,6 @@
-MD5 (javaview-lite/javaview.zip) = 63e8edf8cde2e2696dbb4dc622de67bf
-SIZE (javaview-lite/javaview.zip) = 2961853
-MD5 (javaview-lite/jv_models.zip) = 1b11a67018210947429f4ab359be3df0
-SIZE (javaview-lite/jv_models.zip) = 5819478
-MD5 (javaview-lite/jv_tutor.zip) = c570d42da8b3287e17e938a7410dab92
-SIZE (javaview-lite/jv_tutor.zip) = 480855
+MD5 (javaview-lite/3.95/javaview.zip) = 467ac7bacc4157ceb90b4a1b66955306
+SIZE (javaview-lite/3.95/javaview.zip) = 2996982
+MD5 (javaview-lite/3.95/jv_models.zip) = f1aa3add7bc96a4d19e88fc4bfccad2c
+SIZE (javaview-lite/3.95/jv_models.zip) = 5938127
+MD5 (javaview-lite/3.95/jv_tutor.zip) = 893b4930662105f2fce809ee30956945
+SIZE (javaview-lite/3.95/jv_tutor.zip) = 485329
diff --git a/math/javaview/pkg-message b/math/javaview/files/pkg-message.in
index 7be590e329d0..f7164686476c 100644
--- a/math/javaview/pkg-message
+++ b/math/javaview/files/pkg-message.in
@@ -8,6 +8,8 @@
 
         Without a registration JavaView will be fully functional
         but displays a "missing license" statement in the display.
-        JavaView applets do not require a license.
+	JavaView applets do not require a license.
+
+	(Save the obtained license file as %%DATADIR%%/rsrc/jv-lic.lic)
 
       *********************************************************************
diff --git a/math/javaview/pkg-plist b/math/javaview/pkg-plist
index 897ceb743334..cedec239223a 100644
--- a/math/javaview/pkg-plist
+++ b/math/javaview/pkg-plist
@@ -1,20 +1,9 @@
 @comment $FreeBSD$
 bin/javaview
-%%DATADIR%%/jars/javaview.jar
-%%DATADIR%%/jars/jvx.jar
-%%DATADIR%%/jars/jvxGeom.jar
-%%DATADIR%%/jars/vgpapp.jar
-%%DATADIR%%/jars/jvLite.jar
-%%DATADIR%%/jars/browserProps.html
-%%DATADIR%%/jars/contact.html
-%%DATADIR%%/jars/copyright.html
-%%DATADIR%%/jars/help.html
-%%DATADIR%%/jars/mac.html
-%%DATADIR%%/jars/requirements.html
-%%DATADIR%%/jars/shortcuts.html
-%%DATADIR%%/jars/systemFonts.html
+%%DATADIR%%/_jarVersion.txt
 %%DATADIR%%/bin/javaview
 %%DATADIR%%/bin/vssver.scc
+%%DATADIR%%/deploy/_jarVersion.txt
 %%DATADIR%%/images/AutumnTriangle_fill3_med.jpg
 %%DATADIR%%/images/BlackWhiteTilesRepeat_fill4.gif
 %%DATADIR%%/images/ColorPicker.jpg
@@ -27,45 +16,48 @@ bin/javaview
 %%DATADIR%%/images/HolzMatteNoise_fill4.gif
 %%DATADIR%%/images/JavaViewLogo.gif
 %%DATADIR%%/images/JavaViewLogoWide4.gif
+%%DATADIR%%/images/MetallNieten_fill4.jpg
+%%DATADIR%%/images/RedBorderWithBricks_fill4.jpg
+%%DATADIR%%/images/RedBorder_fill4.jpg
+%%DATADIR%%/images/TileIrregularRepeat_fill4.jpg
+%%DATADIR%%/images/Wood_fill4.gif
+%%DATADIR%%/images/ZebraRepeat_fill4.jpg
 %%DATADIR%%/images/jv.ico
 %%DATADIR%%/images/jvBackground.jpg
 %%DATADIR%%/images/jvFrameDefaultOpaque_med.jpg
-%%DATADIR%%/images/jvIcon.gif
 %%DATADIR%%/images/jvFrameDefault_sgl.gif
+%%DATADIR%%/images/jvIcon.gif
 %%DATADIR%%/images/jvLaunch.jpg
 %%DATADIR%%/images/jvTextureBlocks.jpg
 %%DATADIR%%/images/jvTextureDijkstra.gif
 %%DATADIR%%/images/jvTextureSquareOpaque_sgl.gif
 %%DATADIR%%/images/jvTextureTriangleOpaque_med.jpg
 %%DATADIR%%/images/jvTextureTriangleTransp_med.gif
-%%DATADIR%%/images/MetallNieten_fill4.jpg
 %%DATADIR%%/images/pspbrwse.jbf
-%%DATADIR%%/images/RedBorderWithBricks_fill4.jpg
-%%DATADIR%%/images/RedBorder_fill4.jpg
-%%DATADIR%%/images/TileIrregularRepeat_fill4.jpg
 %%DATADIR%%/images/vssver.scc
-%%DATADIR%%/images/Wood_fill4.gif
-%%DATADIR%%/images/ZebraRepeat_fill4.jpg
-%%DATADIR%%/rsrc/Messages_jvlite_bg.properties
-%%DATADIR%%/rsrc/Messages_jvlite_de.properties
-%%DATADIR%%/rsrc/Messages_jvlite_fr.properties
-%%DATADIR%%/rsrc/Messages_jvlite_sr.properties
-%%DATADIR%%/rsrc/Messages_jvx_bg.properties
-%%DATADIR%%/rsrc/Messages_jvx_de.properties
-%%DATADIR%%/rsrc/Messages_jvx_fr.properties
-%%DATADIR%%/rsrc/Messages_jvx_sr.properties
-%%DATADIR%%/rsrc/Messages_jv_bg.properties
-%%DATADIR%%/rsrc/Messages_jv_de.properties
-%%DATADIR%%/rsrc/Messages_jv_fr.properties
-%%DATADIR%%/rsrc/Messages_jv_sr.properties
-%%DATADIR%%/rsrc/Messages_vgp_bg.properties
-%%DATADIR%%/rsrc/Messages_vgp_de.properties
-%%DATADIR%%/rsrc/Messages_vgp_fr.properties
-%%DATADIR%%/rsrc/Messages_vgp_sr.properties
-%%DATADIR%%/rsrc/egSample.xml
-%%DATADIR%%/rsrc/egTemplate.xml
-%%DATADIR%%/rsrc/jvdSample.jvd
-%%DATADIR%%/rsrc/jvxSample.jvx
+%%DATADIR%%/jars/browserProps.html
+%%DATADIR%%/jars/contact.html
+%%DATADIR%%/jars/copyright.html
+%%DATADIR%%/jars/help.html
+%%DATADIR%%/jars/javaview.jar
+%%DATADIR%%/jars/jvLite.jar
+%%DATADIR%%/jars/jvx.jar
+%%DATADIR%%/jars/jvxGeom.jar
+%%DATADIR%%/jars/mac.html
+%%DATADIR%%/jars/requirements.html
+%%DATADIR%%/jars/shortcuts.html
+%%DATADIR%%/jars/systemFonts.html
+%%DATADIR%%/jars/vgpapp.jar
+%%DATADIR%%/javaview.html
+%%DATADIR%%/jvLite.html
+%%DATADIR%%/models/_modelAllList.xml
+%%DATADIR%%/models/_modelList.xml
+%%DATADIR%%/models/animation/_modelList.xml
+%%DATADIR%%/models/animation/flow.1.jvx
+%%DATADIR%%/models/animation/flow.2.jvx
+%%DATADIR%%/models/animation/flow.3.jvx
+%%DATADIR%%/models/animation/flowAnim.jvd
+%%DATADIR%%/models/animation/sinAnim.mpl
 %%DATADIR%%/models/bd/4noid.bd
 %%DATADIR%%/models/bd/Cube.bd
 %%DATADIR%%/models/bd/Cube_soap.bd
@@ -90,22 +82,26 @@ bin/javaview
 %%DATADIR%%/models/byu/Brezel_1920.byu
 %%DATADIR%%/models/byu/Brezel_480.byu
 %%DATADIR%%/models/byu/Brezel_96.byu
+%%DATADIR%%/models/byu/Cow_100.byu
+%%DATADIR%%/models/byu/Cow_250.byu
+%%DATADIR%%/models/byu/Cow_400.byu
+%%DATADIR%%/models/byu/Cow_5804.byu
+%%DATADIR%%/models/byu/Cow_88.byu
 %%DATADIR%%/models/byu/Gauss_1152.byu
 %%DATADIR%%/models/byu/Gauss_200.byu
 %%DATADIR%%/models/byu/Gauss_3042.byu
 %%DATADIR%%/models/byu/Gauss_8.byu
 %%DATADIR%%/models/byu/Genus1_Helicoid3.byu
-%%DATADIR%%/models/byu/hyperboloid.byu
 %%DATADIR%%/models/byu/Pseudosphere_400.byu
 %%DATADIR%%/models/byu/RoundedCone_1128.byu
 %%DATADIR%%/models/byu/WeirdTriangle.byu
 %%DATADIR%%/models/byu/_modelList.xml
+%%DATADIR%%/models/byu/hyperboloid.byu
 %%DATADIR%%/models/cmc/Lawson_3_90_60_Anim.1.byu
 %%DATADIR%%/models/cmc/Lawson_3_90_60_Anim.2.byu
 %%DATADIR%%/models/cmc/Lawson_3_90_60_Anim.3.byu
 %%DATADIR%%/models/cmc/Lawson_3_90_60_Anim.4.byu
 %%DATADIR%%/models/cmc/Lawson_3_90_60_Anim.5.byu
-%%DATADIR%%/models/cmc/penta_segment.byu
 %%DATADIR%%/models/cmc/Quadro_Fund.byu
 %%DATADIR%%/models/cmc/Wente_Anim.1.byu
 %%DATADIR%%/models/cmc/Wente_Anim.2.byu
@@ -115,6 +111,11 @@ bin/javaview
 %%DATADIR%%/models/cmc/Wente_Fund4.byu
 %%DATADIR%%/models/cmc/Wente_Fund5.byu
 %%DATADIR%%/models/cmc/_modelList.xml
+%%DATADIR%%/models/cmc/penta_segment.byu
+%%DATADIR%%/models/contour/_modelList.xml
+%%DATADIR%%/models/contour/contourPlot.jvd
+%%DATADIR%%/models/contour/contourPlot.jvx
+%%DATADIR%%/models/curves/_modelList.xml
 %%DATADIR%%/models/curves/coloredCurve.jvd
 %%DATADIR%%/models/curves/coloredCurve.jvx
 %%DATADIR%%/models/curves/edgeThickness.jvd
@@ -122,35 +123,51 @@ bin/javaview
 %%DATADIR%%/models/curves/polynomial_x4.jvd
 %%DATADIR%%/models/curves/polynomial_x4.jvx
 %%DATADIR%%/models/curves/simpleCurve.jvx
-%%DATADIR%%/models/curves/_modelList.xml
+%%DATADIR%%/models/display/EtchedChrome_frame4_med.gif
+%%DATADIR%%/models/display/HolzMatteNoise_fill4.gif
+%%DATADIR%%/models/display/JavaViewLogo.gif
+%%DATADIR%%/models/display/_modelList.xml
+%%DATADIR%%/models/display/backgroundImage.jvd
+%%DATADIR%%/models/display/backgroundImage.jvx
+%%DATADIR%%/models/display/frameAndBackground.jvd
+%%DATADIR%%/models/display/frameAndBackground.jvx
+%%DATADIR%%/models/display/frameAndBackground_texture.gif
 %%DATADIR%%/models/diverse/HyperAndSphere.obj
+%%DATADIR%%/models/diverse/_modelList.xml
 %%DATADIR%%/models/diverse/nefertiti.jvx
 %%DATADIR%%/models/diverse/origamiAirplane.jvx
 %%DATADIR%%/models/diverse/simpleJet.jvx
-%%DATADIR%%/models/diverse/_modelList.xml
+%%DATADIR%%/models/dxf/_modelList.xml
 %%DATADIR%%/models/dxf/maple_rect.dxf
 %%DATADIR%%/models/dxf/mech.dxf
 %%DATADIR%%/models/dxf/nefertiti.dxf
 %%DATADIR%%/models/dxf/pipes.dxf
 %%DATADIR%%/models/dxf/venus.dxf
-%%DATADIR%%/models/dxf/_modelList.xml
-%%DATADIR%%/models/fe/catenoidUnstable.fe
 %%DATADIR%%/models/fe/_modelList.xml
+%%DATADIR%%/models/fe/catenoidUnstable.fe
+%%DATADIR%%/models/fractal/_modelList.xml
+%%DATADIR%%/models/fractal/mandelbrot.jvd
+%%DATADIR%%/models/fractal/mandelbrot.jvx
+%%DATADIR%%/models/graph/EtchedChrome_frame4_med.gif
+%%DATADIR%%/models/graph/_modelList.xml
+%%DATADIR%%/models/graph/graphWithDomain.jvd
+%%DATADIR%%/models/graph/graphWithDomain.jvx
 %%DATADIR%%/models/jvd/Cylinder_256.html
 %%DATADIR%%/models/jvd/Cylinder_256.jvd
 %%DATADIR%%/models/jvd/Cylinder_256.jvx
-%%DATADIR%%/models/jvd/pspbrwse.jbf
-%%DATADIR%%/models/jvd/vssver.scc
 %%DATADIR%%/models/jvd/_modelList.xml
+%%DATADIR%%/models/jvd/vssver.scc
 %%DATADIR%%/models/jvx/BrezelWithBnd_Geodesics.jvx
 %%DATADIR%%/models/jvx/Brezel_Geodesics.jvx
+%%DATADIR%%/models/jvx/ConnectedDisks.jvx
+%%DATADIR%%/models/jvx/Snail.jvx
+%%DATADIR%%/models/jvx/_modelList.xml
 %%DATADIR%%/models/jvx/closedPolygon.jvx
 %%DATADIR%%/models/jvx/closedPolygonAll.jvx
 %%DATADIR%%/models/jvx/closedPolygonMultiple.jvx
 %%DATADIR%%/models/jvx/colorGlobalBack.jvx
 %%DATADIR%%/models/jvx/colorLocal.jvx
 %%DATADIR%%/models/jvx/colorLocalBack.jvx
-%%DATADIR%%/models/jvx/ConnectedDisks.jvx
 %%DATADIR%%/models/jvx/flowWithElementTexture.gif
 %%DATADIR%%/models/jvx/flowWithElementTexture.jvx
 %%DATADIR%%/models/jvx/geomDirect.jvx
@@ -163,17 +180,15 @@ bin/javaview
 %%DATADIR%%/models/jvx/neighbourInfo.jvx
 %%DATADIR%%/models/jvx/nonconvexDomain.jvx
 %%DATADIR%%/models/jvx/openPolygon.jvx
-%%DATADIR%%/models/jvx/pspbrwse.jbf
-%%DATADIR%%/models/jvx/Snail.jvx
 %%DATADIR%%/models/jvx/venus.jvx
 %%DATADIR%%/models/jvx/vertexSizes.jvd
 %%DATADIR%%/models/jvx/vertexSizes.jvx
 %%DATADIR%%/models/jvx/withLabels.jvx
 %%DATADIR%%/models/jvx/world.jvx
-%%DATADIR%%/models/jvx/_modelList.xml
 %%DATADIR%%/models/knots/HopfPlus.jvx
 %%DATADIR%%/models/knots/TrefoilLeft.jvx
 %%DATADIR%%/models/knots/_modelList.xml
+%%DATADIR%%/models/maple/_modelList.xml
 %%DATADIR%%/models/maple/archimedean.mpl
 %%DATADIR%%/models/maple/archimedean2Color.mpl
 %%DATADIR%%/models/maple/archimedeanIndividual.mpl
@@ -213,49 +228,39 @@ bin/javaview
 %%DATADIR%%/models/maple/sinAxesNone.mpl
 %%DATADIR%%/models/maple/sinAxesNormal.mpl
 %%DATADIR%%/models/maple/sinColor.mpl
-%%DATADIR%%/models/maple/singularity.mpl
-%%DATADIR%%/models/maple/singularityKnot.jvd
-%%DATADIR%%/models/maple/singularityKnot.jvx
-%%DATADIR%%/models/maple/singularityKnot.mpl
 %%DATADIR%%/models/maple/sinMultiple.mpl
 %%DATADIR%%/models/maple/sinStylePoint.mpl
 %%DATADIR%%/models/maple/sinThickness.mpl
 %%DATADIR%%/models/maple/sinTitle.mpl
 %%DATADIR%%/models/maple/sinTitleMultiLine.mpl
 %%DATADIR%%/models/maple/sin_xy.mpl
+%%DATADIR%%/models/maple/singularity.mpl
 %%DATADIR%%/models/maple/snail.mpl
 %%DATADIR%%/models/maple/sphereWhite.mpl
 %%DATADIR%%/models/maple/spiral.mpl
 %%DATADIR%%/models/maple/testQuotes.html
 %%DATADIR%%/models/maple/testQuotes.mpl
 %%DATADIR%%/models/maple/transparentPlot.mpl
-%%DATADIR%%/models/maple/tree.jvd
-%%DATADIR%%/models/maple/tree.jvx
 %%DATADIR%%/models/maple/tree.mpl
-%%DATADIR%%/models/maple/treeManyModels.jvd
-%%DATADIR%%/models/maple/treeManyModels.jvx
-%%DATADIR%%/models/maple/treeManyModels.mpl
 %%DATADIR%%/models/maple/trinocular.mpl
 %%DATADIR%%/models/maple/unity.mpl
 %%DATADIR%%/models/maple/vfield.mpl
-%%DATADIR%%/models/maple/vssver.scc
-%%DATADIR%%/models/maple/_modelList.xml
 %%DATADIR%%/models/math/Animation.mgs
-%%DATADIR%%/models/math/animMgs.mgs
-%%DATADIR%%/models/math/catenoidAnim.mgs
 %%DATADIR%%/models/math/DodecahedralStar.mgs
 %%DATADIR%%/models/math/KeyAnimation.mgs
+%%DATADIR%%/models/math/Santa.mgs
+%%DATADIR%%/models/math/_modelList.xml
+%%DATADIR%%/models/math/animMgs.mgs
+%%DATADIR%%/models/math/catenoidAnim.mgs
 %%DATADIR%%/models/math/polygonSet.mgs
 %%DATADIR%%/models/math/sampleAnimation.mgs
 %%DATADIR%%/models/math/sampleDensityAnim.mgs
 %%DATADIR%%/models/math/sampleGraphics.mgs
-%%DATADIR%%/models/math/Santa.mgs
 %%DATADIR%%/models/math/sin.html
 %%DATADIR%%/models/math/torus.mgs
 %%DATADIR%%/models/math/vssver.scc
 %%DATADIR%%/models/math/world.html
 %%DATADIR%%/models/math/world.mgs
-%%DATADIR%%/models/math/_modelList.xml
 %%DATADIR%%/models/minimal/CatenoidEnneper_800.byu
 %%DATADIR%%/models/minimal/Catenoid_162.byu
 %%DATADIR%%/models/minimal/Costa.byu
@@ -272,7 +277,6 @@ bin/javaview
 %%DATADIR%%/models/minimal/Enneper_748.jvx
 %%DATADIR%%/models/minimal/Enneper_Test.obj
 %%DATADIR%%/models/minimal/Gackstatter_2048.byu
-%%DATADIR%%/models/minimal/Trinoid_240.obj
 %%DATADIR%%/models/minimal/Gackstatter_fund.byu
 %%DATADIR%%/models/minimal/Gergonne_Degenerate.bd
 %%DATADIR%%/models/minimal/Gergonne_Dual.jvx
@@ -284,16 +288,20 @@ bin/javaview
 %%DATADIR%%/models/minimal/MaxPrinciple.jvd
 %%DATADIR%%/models/minimal/MaxPrinciple.jvx
 %%DATADIR%%/models/minimal/Schwarz_Block.jvx
+%%DATADIR%%/models/minimal/Trinoid_240.obj
 %%DATADIR%%/models/minimal/Trinoid_720.jvx
 %%DATADIR%%/models/minimal/Trinoid_768.byu
 %%DATADIR%%/models/minimal/Trinoid_fund.byu
 %%DATADIR%%/models/minimal/_modelList.xml
+%%DATADIR%%/models/numeric/Octahedron_noisy_512.jvx
+%%DATADIR%%/models/numeric/Ring_noisy.jvx
+%%DATADIR%%/models/numeric/_modelList.xml
 %%DATADIR%%/models/obj/PartialCube_2.obj
-%%DATADIR%%/models/obj/snailWithTexture.obj
 %%DATADIR%%/models/obj/Triangle.obj
 %%DATADIR%%/models/obj/VertexStar.obj
 %%DATADIR%%/models/obj/_Format.obj
 %%DATADIR%%/models/obj/_modelList.xml
+%%DATADIR%%/models/obj/snailWithTexture.obj
 %%DATADIR%%/models/off/Teapot.off
 %%DATADIR%%/models/off/_modelList.xml
 %%DATADIR%%/models/polytope/24-cell.jvx
@@ -313,12 +321,12 @@ bin/javaview
 %%DATADIR%%/models/polytope/Octahedron.jvx
 %%DATADIR%%/models/polytope/RandomPolytope.jvx
 %%DATADIR%%/models/polytope/RhombIcosiDodecahedron.jvx
-%%DATADIR%%/models/polytope/SharirCube.jvx
 %%DATADIR%%/models/polytope/RhombiCubeOctahedron.jvx
 %%DATADIR%%/models/polytope/RhombiTruncatedCube.jvx
 %%DATADIR%%/models/polytope/RhombiTruncatedIcosahedron.jvx
 %%DATADIR%%/models/polytope/SchoenhardtOctahedron.jvd
 %%DATADIR%%/models/polytope/SchoenhardtOctahedron.jvx
+%%DATADIR%%/models/polytope/SharirCube.jvx
 %%DATADIR%%/models/polytope/SnubCube.jvx
 %%DATADIR%%/models/polytope/SnubDodecahedron.jvx
 %%DATADIR%%/models/polytope/SoccerBall.jvd
@@ -337,10 +345,10 @@ bin/javaview
 %%DATADIR%%/models/primitive/CubeWithEdges.jvx
 %%DATADIR%%/models/primitive/Cube_192.byu
 %%DATADIR%%/models/primitive/Cylinder_256.jvx
-%%DATADIR%%/models/primitive/DisksConnectedSymm_408.jvx
-%%DATADIR%%/models/primitive/DisksConnected_1000.jvx
 %%DATADIR%%/models/primitive/Disk_200.jvx
 %%DATADIR%%/models/primitive/Disk_500.jvx
+%%DATADIR%%/models/primitive/DisksConnectedSymm_408.jvx
+%%DATADIR%%/models/primitive/DisksConnected_1000.jvx
 %%DATADIR%%/models/primitive/Dodecahedron.jvd
 %%DATADIR%%/models/primitive/Dodecahedron.jvx
 %%DATADIR%%/models/primitive/Dodecahedron.obj
@@ -348,7 +356,6 @@ bin/javaview
 %%DATADIR%%/models/primitive/Dodecahedron_Transp.jvx
 %%DATADIR%%/models/primitive/Icosahedron.jvx
 %%DATADIR%%/models/primitive/Octahedron.byu
-%%DATADIR%%/models/primitive/planeRefine.byu
 %%DATADIR%%/models/primitive/Pyramid_4.byu
 %%DATADIR%%/models/primitive/Quadr_242.byu
 %%DATADIR%%/models/primitive/Rectangle2d_3triang.jvx
@@ -371,128 +378,203 @@ bin/javaview
 %%DATADIR%%/models/primitive/TriangleSet3.jvx
 %%DATADIR%%/models/primitive/TriangleSet4.jvx
 %%DATADIR%%/models/primitive/_modelList.xml
-%%DATADIR%%/models/stl/cadPart.stl
+%%DATADIR%%/models/primitive/planeRefine.byu
+%%DATADIR%%/models/sample/DodecahedralStar.mgs
+%%DATADIR%%/models/sample/_modelList.xml
+%%DATADIR%%/models/sample/archimedean.mpl
+%%DATADIR%%/models/sample/catenoid.jvd
+%%DATADIR%%/models/sample/catenoid.jvx
 %%DATADIR%%/models/stl/_modelList.xml
+%%DATADIR%%/models/stl/cadPart.stl
+%%DATADIR%%/models/surfaces/BoyPolyhedral.jvd
+%%DATADIR%%/models/surfaces/BoyPolyhedral.jvx
+%%DATADIR%%/models/surfaces/CrossCap.jvx
+%%DATADIR%%/models/surfaces/Heptaeder.jvd
+%%DATADIR%%/models/surfaces/Heptaeder.jvx
+%%DATADIR%%/models/surfaces/Pseudosphere_3200.byu
+%%DATADIR%%/models/surfaces/_modelList.xml
+%%DATADIR%%/models/surfaces/kleinBottleRaw.jvd
+%%DATADIR%%/models/surfaces/kleinBottleRaw.jvx
+%%DATADIR%%/models/texture/EtchedChrome_frame4_med.gif
+%%DATADIR%%/models/texture/_modelList.xml
+%%DATADIR%%/models/texture/punchedTorus_elementTexture.jvx
+%%DATADIR%%/models/texture/punchedTorus_elementTexture_texture.gif
+%%DATADIR%%/models/texture/transparentTexture.jvd
+%%DATADIR%%/models/texture/transparentTexture.jvx
+%%DATADIR%%/models/unfold/Boy2CutToUnfold.jvx
+%%DATADIR%%/models/unfold/Boy2Unfold.jvx
+%%DATADIR%%/models/unfold/DodeUnfoldPath.jvx
+%%DATADIR%%/models/unfold/_modelList.xml
+%%DATADIR%%/models/unfold/horseUnfold.jvd
+%%DATADIR%%/models/unfold/horseUnfold.jvx
+%%DATADIR%%/models/unfold/soccerUnfold.jvx
+%%DATADIR%%/models/vector/VertexStar_with_ElementVectors.jvx
+%%DATADIR%%/models/vector/_modelList.xml
+%%DATADIR%%/models/vector/flowSamedir.gif
+%%DATADIR%%/models/vector/flowSamedir.jvd
+%%DATADIR%%/models/vector/flowSamedir.jvx
+%%DATADIR%%/models/vector/pretzel.jvx
+%%DATADIR%%/models/vector/pretzel_divfree.jvx
+%%DATADIR%%/models/vector/pretzel_harmonic.jvx
+%%DATADIR%%/models/vector/pretzel_rotfree.jvx
 %%DATADIR%%/models/wrl/TorusFaceColor.wrl
 %%DATADIR%%/models/wrl/TorusVertexColor.wrl
 %%DATADIR%%/models/wrl/_modelList.xml
-%%DATADIR%%/models/_modelAllList.xml
-%%DATADIR%%/models/_modelList.xml
-%%DATADIR%%/deploy/_jarVersion.txt
-%%DATADIR%%/JavaViewLib/_jarVersion.txt
+%%DATADIR%%/models/xyz/CdSe_nanocrystal.xyz
+%%DATADIR%%/models/xyz/SN1_reaction.xyz
+%%DATADIR%%/models/xyz/_modelList.xml
+%%DATADIR%%/models/xyz/azt.xyz
+%%DATADIR%%/models/xyz/caffeine.xyz
+%%DATADIR%%/models/xyz/cyclohexane_movie.xyz
+%%DATADIR%%/models/xyz/dna.xyz
+%%DATADIR%%/readme.txt
+%%DATADIR%%/readme_linux.txt
+%%DATADIR%%/rsrc/Messages_jv_bg.properties
+%%DATADIR%%/rsrc/Messages_jv_de.properties
+%%DATADIR%%/rsrc/Messages_jv_fr.properties
+%%DATADIR%%/rsrc/Messages_jv_sr.properties
+%%DATADIR%%/rsrc/Messages_jvlite_bg.properties
+%%DATADIR%%/rsrc/Messages_jvlite_de.properties
+%%DATADIR%%/rsrc/Messages_jvlite_fr.properties
+%%DATADIR%%/rsrc/Messages_jvlite_sr.properties
+%%DATADIR%%/rsrc/Messages_jvx_bg.properties
+%%DATADIR%%/rsrc/Messages_jvx_de.properties
+%%DATADIR%%/rsrc/Messages_jvx_fr.properties
+%%DATADIR%%/rsrc/Messages_jvx_sr.properties
+%%DATADIR%%/rsrc/Messages_vgp_bg.properties
+%%DATADIR%%/rsrc/Messages_vgp_de.properties
+%%DATADIR%%/rsrc/Messages_vgp_fr.properties
+%%DATADIR%%/rsrc/Messages_vgp_sr.properties
+%%DATADIR%%/rsrc/egSample.xml
+%%DATADIR%%/rsrc/egTemplate.xml
+%%DATADIR%%/rsrc/jvdSample.jvd
+%%DATADIR%%/rsrc/jvxSample.jvx
+%%DATADIR%%/sample.html
+%%DATADIR%%/sample.jvx
+%%DATADIR%%/sample.mgs
+%%DATADIR%%/sample.mpl
+%%DATADIR%%/sample.obj
+%%DATADIR%%/sampleTorus.jvx
 %%DATADIR%%/vgp/tutor/animationPanel/AnimPanel.html
-%%DATADIR%%/vgp/tutor/color/package.html
 %%DATADIR%%/vgp/tutor/color/PaColorDemo.html
 %%DATADIR%%/vgp/tutor/color/PaColorDemo.java
+%%DATADIR%%/vgp/tutor/color/package.html
 %%DATADIR%%/vgp/tutor/displaySettings/index.html
 %%DATADIR%%/vgp/tutor/displaySettings/indexLite.html
 %%DATADIR%%/vgp/tutor/domain/Domain.html
-%%DATADIR%%/vgp/tutor/eventCamera/package.html
 %%DATADIR%%/vgp/tutor/eventCamera/PaEventCamera.html
 %%DATADIR%%/vgp/tutor/eventCamera/PaEventCamera.java
 %%DATADIR%%/vgp/tutor/eventCamera/PjEventCamera.java
 %%DATADIR%%/vgp/tutor/eventCamera/PjEventCamera_IP.java
+%%DATADIR%%/vgp/tutor/eventCamera/package.html
 %%DATADIR%%/vgp/tutor/expr/Expressions.html
+%%DATADIR%%/vgp/tutor/firstApplet/MyApplet.java
 %%DATADIR%%/vgp/tutor/firstApplet/index.html
 %%DATADIR%%/vgp/tutor/firstApplet/package.html
-%%DATADIR%%/vgp/tutor/firstApplet/MyApplet.java
+%%DATADIR%%/vgp/tutor/firstApplication/MyApplication.java
 %%DATADIR%%/vgp/tutor/firstApplication/index.html
 %%DATADIR%%/vgp/tutor/firstApplication/package.html
-%%DATADIR%%/vgp/tutor/firstApplication/MyApplication.java
+%%DATADIR%%/vgp/tutor/firstGraph/MyGraph.java
 %%DATADIR%%/vgp/tutor/firstGraph/index.html
 %%DATADIR%%/vgp/tutor/firstGraph/package.html
-%%DATADIR%%/vgp/tutor/firstGraph/MyGraph.java
-%%DATADIR%%/vgp/tutor/firstProject/index.html
-%%DATADIR%%/vgp/tutor/firstProject/package.html
 %%DATADIR%%/vgp/tutor/firstProject/MyApplet.java
 %%DATADIR%%/vgp/tutor/firstProject/MyProject.java
 %%DATADIR%%/vgp/tutor/firstProject/MyProject_IP.java
 %%DATADIR%%/vgp/tutor/firstProject/MySurface.java
-%%DATADIR%%/vgp/tutor/fractal/package.html
+%%DATADIR%%/vgp/tutor/firstProject/index.html
+%%DATADIR%%/vgp/tutor/firstProject/package.html
 %%DATADIR%%/vgp/tutor/fractal/PaFractalImage.html
 %%DATADIR%%/vgp/tutor/fractal/PaFractalImage.java
 %%DATADIR%%/vgp/tutor/fractal/PjFractalImage.java
 %%DATADIR%%/vgp/tutor/fractal/PjFractalImage_IP.java
-%%DATADIR%%/vgp/tutor/height/package.html
+%%DATADIR%%/vgp/tutor/fractal/package.html
 %%DATADIR%%/vgp/tutor/height/PaHeight.html
 %%DATADIR%%/vgp/tutor/height/PaHeight.java
 %%DATADIR%%/vgp/tutor/height/PjHeight.java
 %%DATADIR%%/vgp/tutor/height/PjHeight_IP.java
-%%DATADIR%%/vgp/tutor/key/package.html
+%%DATADIR%%/vgp/tutor/height/package.html
+%%DATADIR%%/vgp/tutor/index.html
 %%DATADIR%%/vgp/tutor/key/PaKeyframe.html
 %%DATADIR%%/vgp/tutor/key/PaKeyframe.java
 %%DATADIR%%/vgp/tutor/key/PjKeyframe.java
 %%DATADIR%%/vgp/tutor/key/PjKeyframe_IP.java
-%%DATADIR%%/vgp/tutor/linear/package.html
+%%DATADIR%%/vgp/tutor/key/package.html
 %%DATADIR%%/vgp/tutor/linear/PaLinear.html
 %%DATADIR%%/vgp/tutor/linear/PaLinear.java
 %%DATADIR%%/vgp/tutor/linear/PjLinear.java
 %%DATADIR%%/vgp/tutor/linear/PjLinear_IP.java
-%%DATADIR%%/vgp/tutor/loader/package.html
+%%DATADIR%%/vgp/tutor/linear/package.html
 %%DATADIR%%/vgp/tutor/loader/PaLoader.html
 %%DATADIR%%/vgp/tutor/loader/PaLoader.java
 %%DATADIR%%/vgp/tutor/loader/PgAbcLoader.java
 %%DATADIR%%/vgp/tutor/loader/cube.abc
 %%DATADIR%%/vgp/tutor/loader/cubePoints.abc
-%%DATADIR%%/vgp/tutor/lsystem/package.html
-%%DATADIR%%/vgp/tutor/lsystem/PaLSystem.html
+%%DATADIR%%/vgp/tutor/loader/package.html
 %%DATADIR%%/vgp/tutor/lsystem/LSystem.java
+%%DATADIR%%/vgp/tutor/lsystem/PaLSystem.html
 %%DATADIR%%/vgp/tutor/lsystem/PaLSystem.java
 %%DATADIR%%/vgp/tutor/lsystem/PjLSystem.java
 %%DATADIR%%/vgp/tutor/lsystem/PjLSystem_IP.java
-%%DATADIR%%/vgp/tutor/model/package.html
+%%DATADIR%%/vgp/tutor/lsystem/package.html
 %%DATADIR%%/vgp/tutor/model/PaModel.html
 %%DATADIR%%/vgp/tutor/model/PaModel.java
 %%DATADIR%%/vgp/tutor/model/PjModel.java
 %%DATADIR%%/vgp/tutor/model/PjModel_IP.java
-%%DATADIR%%/vgp/tutor/ode/package.html
+%%DATADIR%%/vgp/tutor/model/package.html
 %%DATADIR%%/vgp/tutor/ode/PaExprOde.html
 %%DATADIR%%/vgp/tutor/ode/PaExprOde.java
 %%DATADIR%%/vgp/tutor/ode/PjExprOde.java
 %%DATADIR%%/vgp/tutor/ode/PjExprOde_IP.java
-%%DATADIR%%/vgp/tutor/parm/package.html
+%%DATADIR%%/vgp/tutor/ode/package.html
 %%DATADIR%%/vgp/tutor/parm/PaParmSurface.html
 %%DATADIR%%/vgp/tutor/parm/PaParmSurface.java
 %%DATADIR%%/vgp/tutor/parm/PjParmSurface.java
 %%DATADIR%%/vgp/tutor/parm/PjParmSurface_IP.java
-%%DATADIR%%/vgp/tutor/parmCurve/package.html
+%%DATADIR%%/vgp/tutor/parm/package.html
 %%DATADIR%%/vgp/tutor/parmCurve/PaParmCurve.html
 %%DATADIR%%/vgp/tutor/parmCurve/PaParmCurve.java
 %%DATADIR%%/vgp/tutor/parmCurve/PjParmCurve.java
 %%DATADIR%%/vgp/tutor/parmCurve/PjParmCurve_IP.java
-%%DATADIR%%/vgp/tutor/pick/package.html
+%%DATADIR%%/vgp/tutor/parmCurve/package.html
 %%DATADIR%%/vgp/tutor/pick/PaPickEvent.html
 %%DATADIR%%/vgp/tutor/pick/PaPickEvent.java
 %%DATADIR%%/vgp/tutor/pick/PjPickEvent.java
 %%DATADIR%%/vgp/tutor/pick/PjPickEvent_IP.java
-%%DATADIR%%/vgp/tutor/polygonSet/package.html
+%%DATADIR%%/vgp/tutor/pick/package.html
 %%DATADIR%%/vgp/tutor/polygonSet/PaPolygonSet.html
 %%DATADIR%%/vgp/tutor/polygonSet/PaPolygonSet.java
 %%DATADIR%%/vgp/tutor/polygonSet/PjPolygonSet.java
-%%DATADIR%%/vgp/tutor/rivara/package.html
+%%DATADIR%%/vgp/tutor/polygonSet/package.html
 %%DATADIR%%/vgp/tutor/rivara/PaRivara.html
 %%DATADIR%%/vgp/tutor/rivara/PaRivara.java
 %%DATADIR%%/vgp/tutor/rivara/PjRivara.java
 %%DATADIR%%/vgp/tutor/rivara/PjRivara_IP.java
-%%DATADIR%%/vgp/tutor/rootFinder/package.html
+%%DATADIR%%/vgp/tutor/rivara/package.html
 %%DATADIR%%/vgp/tutor/rootFinder/PaRootFinder.html
 %%DATADIR%%/vgp/tutor/rootFinder/PaRootFinder.java
 %%DATADIR%%/vgp/tutor/rootFinder/PjRootFinder.java
 %%DATADIR%%/vgp/tutor/rootFinder/PjRootFinder_IP.java
-%%DATADIR%%/vgp/tutor/ruler/package.html
+%%DATADIR%%/vgp/tutor/rootFinder/package.html
 %%DATADIR%%/vgp/tutor/ruler/PaRuler.html
 %%DATADIR%%/vgp/tutor/ruler/PaRuler.java
 %%DATADIR%%/vgp/tutor/ruler/PjRuler.java
 %%DATADIR%%/vgp/tutor/ruler/PjRuler_IP.java
-%%DATADIR%%/vgp/tutor/slider/package.html
+%%DATADIR%%/vgp/tutor/ruler/package.html
 %%DATADIR%%/vgp/tutor/slider/PaSlider.html
 %%DATADIR%%/vgp/tutor/slider/PaSlider.java
 %%DATADIR%%/vgp/tutor/slider/PjSlider.java
 %%DATADIR%%/vgp/tutor/slider/PjSlider_IP.java
-%%DATADIR%%/vgp/tutor/subdivision/package.html
+%%DATADIR%%/vgp/tutor/slider/package.html
 %%DATADIR%%/vgp/tutor/subdivision/PaSubdivision.html
 %%DATADIR%%/vgp/tutor/subdivision/PaSubdivision.java
 %%DATADIR%%/vgp/tutor/subdivision/PjSubdivision.java
+%%DATADIR%%/vgp/tutor/subdivision/package.html
+%%DATADIR%%/vgp/tutor/texture/PaTextureCube.java
+%%DATADIR%%/vgp/tutor/texture/PaTexturedSurface.html
+%%DATADIR%%/vgp/tutor/texture/PaTexturedSurface.java
+%%DATADIR%%/vgp/tutor/texture/PjTextureCube.java
+%%DATADIR%%/vgp/tutor/texture/PjTexturedSurface.java
+%%DATADIR%%/vgp/tutor/texture/PjTexturedSurface_IP.java
 %%DATADIR%%/vgp/tutor/texture/images/Auge.jpg
 %%DATADIR%%/vgp/tutor/texture/images/City2.jpg
 %%DATADIR%%/vgp/tutor/texture/images/CubeFlow.jpg
@@ -501,68 +583,61 @@ bin/javaview
 %%DATADIR%%/vgp/tutor/texture/images/T_Rex.jpg
 %%DATADIR%%/vgp/tutor/texture/images/Water.jpg
 %%DATADIR%%/vgp/tutor/texture/package.html
-%%DATADIR%%/vgp/tutor/texture/PaTexturedSurface.html
-%%DATADIR%%/vgp/tutor/texture/PaTextureCube.java
-%%DATADIR%%/vgp/tutor/texture/PaTexturedSurface.java
-%%DATADIR%%/vgp/tutor/texture/PjTextureCube.java
-%%DATADIR%%/vgp/tutor/texture/PjTexturedSurface.java
-%%DATADIR%%/vgp/tutor/texture/PjTexturedSurface_IP.java
-%%DATADIR%%/vgp/tutor/torusknot/package.html
 %%DATADIR%%/vgp/tutor/torusknot/PaTorusKnot.html
 %%DATADIR%%/vgp/tutor/torusknot/PaTorusKnot.java
 %%DATADIR%%/vgp/tutor/torusknot/PjTorusKnot.java
 %%DATADIR%%/vgp/tutor/torusknot/PjTorusKnot_IP.java
-%%DATADIR%%/vgp/tutor/transform/package.html
+%%DATADIR%%/vgp/tutor/torusknot/package.html
 %%DATADIR%%/vgp/tutor/transform/PaTransform.html
 %%DATADIR%%/vgp/tutor/transform/PaTransform.java
 %%DATADIR%%/vgp/tutor/transform/PjTransform.java
 %%DATADIR%%/vgp/tutor/transform/PjTransform_IP.java
-%%DATADIR%%/vgp/tutor/updatePanel/package.html
+%%DATADIR%%/vgp/tutor/transform/package.html
 %%DATADIR%%/vgp/tutor/updatePanel/MyClass.java
 %%DATADIR%%/vgp/tutor/updatePanel/MyClass_IP.java
-%%DATADIR%%/vgp/tutor/vectorField/package.html
+%%DATADIR%%/vgp/tutor/updatePanel/package.html
 %%DATADIR%%/vgp/tutor/vectorField/PaVectorField.html
 %%DATADIR%%/vgp/tutor/vectorField/PaVectorField.java
 %%DATADIR%%/vgp/tutor/vectorField/PjVectorField.java
 %%DATADIR%%/vgp/tutor/vectorField/PjVectorField_IP.java
-%%DATADIR%%/vgp/tutor/index.html
-%%DATADIR%%/_jarVersion.txt
-%%DATADIR%%/readme.txt
-%%DATADIR%%/readme_linux.txt
-%%DATADIR%%/sample.html
-%%DATADIR%%/sample.jvx
-%%DATADIR%%/sample.mgs
-%%DATADIR%%/sample.mpl
-%%DATADIR%%/sample.obj
-%%DATADIR%%/sampleTorus.jvx
-%%DATADIR%%/javaview.html
-%%DATADIR%%/jvLite.html
-@dirrm %%DATADIR%%/jars
+%%DATADIR%%/vgp/tutor/vectorField/package.html
 @dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/deploy
 @dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/rsrc
+@dirrm %%DATADIR%%/jars
+@dirrm %%DATADIR%%/models/animation
 @dirrm %%DATADIR%%/models/bd
 @dirrm %%DATADIR%%/models/byu
 @dirrm %%DATADIR%%/models/cmc
+@dirrm %%DATADIR%%/models/contour
 @dirrm %%DATADIR%%/models/curves
+@dirrm %%DATADIR%%/models/display
 @dirrm %%DATADIR%%/models/diverse
 @dirrm %%DATADIR%%/models/dxf
 @dirrm %%DATADIR%%/models/fe
+@dirrm %%DATADIR%%/models/fractal
+@dirrm %%DATADIR%%/models/graph
 @dirrm %%DATADIR%%/models/jvd
 @dirrm %%DATADIR%%/models/jvx
 @dirrm %%DATADIR%%/models/knots
 @dirrm %%DATADIR%%/models/maple
 @dirrm %%DATADIR%%/models/math
 @dirrm %%DATADIR%%/models/minimal
+@dirrm %%DATADIR%%/models/numeric
 @dirrm %%DATADIR%%/models/obj
 @dirrm %%DATADIR%%/models/off
 @dirrm %%DATADIR%%/models/polytope
 @dirrm %%DATADIR%%/models/primitive
+@dirrm %%DATADIR%%/models/sample
 @dirrm %%DATADIR%%/models/stl
+@dirrm %%DATADIR%%/models/surfaces
+@dirrm %%DATADIR%%/models/texture
+@dirrm %%DATADIR%%/models/unfold
+@dirrm %%DATADIR%%/models/vector
 @dirrm %%DATADIR%%/models/wrl
+@dirrm %%DATADIR%%/models/xyz
 @dirrm %%DATADIR%%/models
-@dirrm %%DATADIR%%/deploy
-@dirrm %%DATADIR%%/JavaViewLib
+@dirrm %%DATADIR%%/rsrc
 @dirrm %%DATADIR%%/vgp/tutor/animationPanel
 @dirrm %%DATADIR%%/vgp/tutor/color
 @dirrm %%DATADIR%%/vgp/tutor/displaySettings