. Update to 8u60.

3 files changed, 28 insertions, 6 deletions

diff --git a/java/linux-oracle-jdk18/Makefile b/java/linux-oracle-jdk18/Makefile
index 4bba6395adec..4a32e1540a14 100644
--- a/java/linux-oracle-jdk18/Makefile
+++ b/java/linux-oracle-jdk18/Makefile
@@ -30,7 +30,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 JDK_VENDOR=		oracle
 JDK_VERSION=		8
 JDK_INTERNAL_VERSION=	1.${JDK_VERSION}.0
-JDK_UPDATE_VERSION=	51
+JDK_UPDATE_VERSION=	60
 .if ${JDK_UPDATE_VERSION} == 0
 DL_JDK_VERSION=		${JDK_INTERNAL_VERSION}
 .elif ${JDK_UPDATE_VERSION} <= 9
diff --git a/java/linux-oracle-jdk18/distinfo b/java/linux-oracle-jdk18/distinfo
index ddbed86522fd..ee5ad0237c78 100644
--- a/java/linux-oracle-jdk18/distinfo
+++ b/java/linux-oracle-jdk18/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jdk-8u51-linux-i586.tar.gz) = 3fd43a5d88ea759bf12502980aa956c683d9df058ad25a94914c5890807e9f2b
-SIZE (jdk-8u51-linux-i586.tar.gz) = 175056840
-SHA256 (jdk-8u51-linux-i586-demos.tar.gz) = 08014bd53b4519890e7b82cb3d1b69c959e8bef08cd43cfd80b3043e6263d136
-SIZE (jdk-8u51-linux-i586-demos.tar.gz) = 54797997
+SHA256 (jdk-8u60-linux-i586.tar.gz) = e6a36b458351ed35bd7943739ba93d9a246e08a86433e148ff68b1b40d74c2e5
+SIZE (jdk-8u60-linux-i586.tar.gz) = 183321048
+SHA256 (jdk-8u60-linux-i586-demos.tar.gz) = 243b78d0ac472ce7da297f39df79e04c7b19c51f3879e366e93900f0153ccee5
+SIZE (jdk-8u60-linux-i586-demos.tar.gz) = 55057546
diff --git a/java/linux-oracle-jdk18/pkg-plist b/java/linux-oracle-jdk18/pkg-plist
index b992049a717a..7220e27f512e 100644
--- a/java/linux-oracle-jdk18/pkg-plist
+++ b/java/linux-oracle-jdk18/pkg-plist
@@ -563,7 +563,6 @@
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/Jfx3dViewerApp.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/MainController.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/NavigationController.java
-%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/OldTestViewer.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SessionManager.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SettingsController.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/SimpleViewerApp.java
@@ -581,6 +580,28 @@
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/SymbolicPolygonMesh.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/shape3d/symbolic/SymbolicSubdivisionBuilder.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/DragSupport.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/animation/NumberTangentInterpolator.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/animation/SplineInterpolator.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/animation/TickCalculation.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/BaseBounds.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/BoxBounds.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/Dimension2D.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/Point2D.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/RectBounds.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/Rectangle.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/Vec2f.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/Vec3d.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/Vec3f.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/Affine2D.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/Affine3D.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/AffineBase.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/BaseTransform.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/CanTransformVec3d.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/Identity.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/NoninvertibleTransformException.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/SingularMatrixException.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/TransformHelper.java
+%%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/java/com/javafx/experiments/utils3d/geom/transform/Translate2D.java
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/blue.jpg
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/carbon.jpg
 %%DEMO%%%%T%%/demo/javafx_samples/src/3DViewer/src/main/resources/com/javafx/experiments/jfx3dviewer/carbon2.jpg
@@ -1667,6 +1688,7 @@
 %%T%%/jre/lib/desktop/mime/packages/x-java-jnlp-file.xml
 %%T%%/jre/lib/ext/cldrdata.jar
 %%T%%/jre/lib/ext/dnsns.jar
+%%T%%/jre/lib/ext/jaccess.jar
 %%T%%/jre/lib/ext/jfxrt.jar
 %%T%%/jre/lib/ext/localedata.jar
 %%T%%/jre/lib/ext/meta-index