Remove expired ports:

2020-11-30 databases/datamodeler: depends on expiring java/openjfx8-devel
2020-11-30 devel/gradle4: only needed for expiring biology/igv and java/openjfx8-devel
2020-11-30 devel/py-astroid1: Use devel/py-astroid instead
2020-11-30 devel/pylint1: Use devel/pylint instead
2020-11-30 german/mediathekview: depends on expiring java/openjfx8-devel
2020-11-30 java/openjfx8-devel: No longer maintained upstream
2020-11-30 java/openjfx8-scenebuilder: depends on expiring java/openjfx8-devel
2020-11-30 net-im/py-sleekxmpp: Upstream archived and advices to use net-im/py-slixmpp
2020-12-01 net-mgmt/zabbix44-agent: End of Life
2020-12-01 net-mgmt/zabbix44-frontend: End of Life
2020-12-01 net-mgmt/zabbix44-java: End of Life
2020-12-01 net-mgmt/zabbix44-proxy: End of Life
2020-12-01 net-mgmt/zabbix44-server: End of Life
2020-11-30 print/jabref: depends on expiring java/openjfx8-devel
2020-11-30 science/datawarrior: depends on expiring java/openjfx8-devel

58 files changed, 0 insertions, 2229 deletions

diff --git a/java/Makefile b/java/Makefile
index 039b5f1ec5e8..8f3adf59562c 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -101,8 +101,6 @@
     SUBDIR += openjdk8
     SUBDIR += openjdk8-jre
     SUBDIR += openjfx14
-    SUBDIR += openjfx8-devel
-    SUBDIR += openjfx8-scenebuilder
     SUBDIR += phpeclipse
     SUBDIR += proguard
     SUBDIR += sablevm
diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
deleted file mode 100644
index 5d0df7e425aa..000000000000
--- a/java/openjfx8-devel/Makefile
+++ /dev/null
@@ -1,151 +0,0 @@
-# Created by: Tobias Kortkamp <t@tobik.me>
-# $FreeBSD$
-
-PORTNAME=	openjfx8
-DISTVERSION=	8u202-b07
-PORTREVISION=	8
-PORTEPOCH=	1
-CATEGORIES=	java x11-toolkits devel
-MASTER_SITES=	https://github.com/t6/openjfx/releases/download/release/ \
-		http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	JavaFX SDK overlay for OpenJDK 8
-
-BROKEN=		Does not build with glib 2.66.0
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	No longer maintained upstream
-EXPIRATION_DATE=	2020-11-30
-ONLY_FOR_ARCHS=	amd64 i386
-
-BUILD_DEPENDS=	apache-ant>0:devel/apache-ant \
-		antlr3>0:devel/antlr3 \
-		gradle4>=4.8:devel/gradle4 \
-		${JAVALIBDIR}/junit.jar:java/junit
-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
-
-USES=		gettext-runtime gl gnome jpeg localbase:ldflags pkgconfig \
-		sqlite xorg
-USE_GL=		gl
-USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
-USE_JAVA=	yes
-JAVA_VERSION=	1.8
-USE_LDCONFIG=	yes
-USE_XORG=	x11 xtst xxf86vm
-
-CFLAGS+=	-fcommon -Wno-unused-command-line-argument
-
-WRKSRC=		${WRKDIR}/rt-${DISTVERSION}
-
-PLIST_SUB=	ARCH=${ARCH} \
-		JAVA_HOME=${JAVA_HOME}
-
-OPTIONS_DEFINE=	MEDIA SWT TEST WEBKIT
-OPTIONS_DEFAULT=	MEDIA WEBKIT
-OPTIONS_SUB=	yes
-
-MEDIA_DESC=	Media module
-SWT_DESC=	SWT support
-
-MEDIA_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
-			libsndio.so:audio/sndio
-MEDIA_USES=	gmake
-MEDIA_VARS=	COMPILE_MEDIA=true
-
-SWT_BUILD_DEPENDS=	swt>0:x11-toolkits/swt
-SWT_RUN_DEPENDS=	swt>0:x11-toolkits/swt
-SWT_VARS=	COMPILE_SWT=true
-
-TEST_USES=	display:test
-TEST_VARS=	AWT_TEST=true FULL_TEST=true
-
-# Gradle calls CMake during the build
-WEBKIT_IMPLIES=	MEDIA
-WEBKIT_BUILD_DEPENDS=	cmake:devel/cmake
-WEBKIT_LIB_DEPENDS=	libicui18n.so:devel/icu
-WEBKIT_USES=	bison compiler:c++14-lang gmake gperf perl5 python:2.7,build
-WEBKIT_USE=	GNOME=libxslt,libxml2 \
-		PERL5=build \
-		RUBY=yes \
-		XORG=xcomposite,xdamage,xfixes,xrender,xt
-WEBKIT_VARS=	RUBY_NO_RUN_DEPENDS=yes COMPILE_WEBKIT=true
-
-# Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
-_GRADLE_ENV=	CC=${WRKDIR}/bin/ccwrapper \
-		CXX=${WRKDIR}/bin/cxxwrapper \
-		GRADLE_USER_HOME=${WRKDIR}/gradle-home
-_GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle4 --no-daemon
-
-# NOTE: This port won't build if ${JAVA_HOME}/jre/lib/ext/jfxrt.jar
-# already exists on your system.  This is not a problem in Poudriere
-# or Synth but something to be aware of if you're trying to build this
-# port in a non-pristine environment.
-
-# The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the
-# Linux versions.  Prepare the tree, so that we only see the changes
-# from Linux's Makefile in our own patches.
-pre-patch:
-	@${CP} -r ${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/linux \
-		${WRKSRC}/modules/media/src/main/native/jfxmedia/projects/bsd
-	@${CP} -r ${WRKSRC}/modules/media/src/main/native/gstreamer/projects/linux \
-		${WRKSRC}/modules/media/src/main/native/gstreamer/projects/bsd
-
-post-patch:
-	@${MKDIR} ${WRKDIR}/bin
-	@${PRINTF} '#!/bin/sh\nexec ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
-	@${PRINTF} '#!/bin/sh\nexec ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
-	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
-	@${SED} -e 's@/linux@/freebsd@g' -e 's@-DLINUX@-DFREEBSD@g' -e 's@LINUX@BSD@g' \
-		-e 's@linux_@bsd_@g' -e 's@"-static-libgcc", "-static-libstdc++",@@g' \
-		-e 's@"gcc"@"${WRKDIR}/bin/ccwrapper"@g' -e 's@"g\+\+"@"${WRKDIR}/bin/cxxwrapper"@g' \
-		${WRKSRC}/buildSrc/linux.gradle > ${WRKSRC}/buildSrc/bsd.gradle
-# Add a *BSD native audio sink to GStreamer-lite instead of using the
-# bundled ALSA sink.  Currently we add an sndio sink, but this is an extension
-# point for eventually adding an OSS backend (or others) as an option as well.
-# If you add a new one make sure it registers itself as "bsdaudiosink" as defined
-# in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
-	@${MKDIR} ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
-	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
-		${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
-	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
-		${LN} -s gstsndio.c gstbsdaudio.c && \
-		${LN} -s sndiosink.c bsdaudiosink.c
-# Pull Java dependencies from LOCALBASE
-	@${REINPLACE_CMD} 's@/usr/local@${LOCALBASE}@g' \
-		${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
-# Remove bundled libraries.  We use the system's versions instead.
-	@cd ${WRKSRC}/modules/web/src/main/native/Source/ThirdParty && \
-		${RM} -r icu libxml libxslt sqlite
-	@${RM} -r ${WRKSRC}/modules/web/src/main/native/Source/WTF/icu
-	@cd ${WRKSRC}/modules/media/src/main/native/gstreamer/3rd_party && \
-		${RM} -r glib libffi
-
-post-patch-SWT-off:
-	@${RM} -r ${WRKSRC}/modules/graphics/src/main/java/com/sun/glass/ui/swt
-
-do-configure:
-	@${MKDIR} ${WRKDIR}/gradle-home
-	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties
-.for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST
-	@${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties
-.endfor
-	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
-
-do-build:
-	@cd ${WRKSRC} && ${_GRADLE_RUN} zips
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${JAVA_HOME}
-	@${TAR} -C ${STAGEDIR}${JAVA_HOME} \
-		-xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip
-	@${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \;
-
-do-test-TEST-on:
-	@cd ${WRKSRC} && ${_GRADLE_RUN} check test
-
-.include <bsd.port.mk>
diff --git a/java/openjfx8-devel/distinfo b/java/openjfx8-devel/distinfo
deleted file mode 100644
index 7f707e3ee585..000000000000
--- a/java/openjfx8-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1563779003
-SHA256 (openjfx8-8u202-b07.tar.gz) = ca98b6d0721a0e4b91d62672e81594c80a47cfb5ded241de50f10ade9884c400
-SIZE (openjfx8-8u202-b07.tar.gz) = 70669594
diff --git a/java/openjfx8-devel/files/gstsndio.c b/java/openjfx8-devel/files/gstsndio.c
deleted file mode 100644
index 4ef2cf1b5fdc..000000000000
--- a/java/openjfx8-devel/files/gstsndio.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
- * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include "gstsndio.h"
-
-GST_DEBUG_CATEGORY (gst_sndio_debug);
-#define GST_CAT_DEFAULT gst_sndio_debug
-
-GType gst_sndiosink_get_type (void);
-
-gboolean
-plugin_init_alsa (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (gst_sndio_debug, "sndio", 0, "sndio plugins");
-
-  /* prefer sndiosink over pulsesink (GST_RANK_PRIMARY + 10) */
-  if (!gst_element_register (plugin, "bsdaudiosink", GST_RANK_PRIMARY + 20,
-          gst_sndiosink_get_type()))
-    return FALSE;
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    sndio,
-    "sndio plugin library",
-    plugin_init_alsa, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
-
-/*
- * common code to src and sink
- */
-
-void
-gst_sndio_init (struct gstsndio *sio, GObject *obj)
-{
-  sio->obj = obj;
-  sio->hdl = NULL;
-  sio->device = g_strdup (SIO_DEVANY);
-}
-
-void
-gst_sndio_finalize (struct gstsndio *sio)
-{
-  gst_caps_replace (&sio->cur_caps, NULL);
-  g_free (sio->device);
-}
-
-GstCaps *
-gst_sndio_getcaps (struct gstsndio *sio, GstCaps * filter)
-{
-  if (sio->cur_caps == NULL) {
-    /* XXX */
-    GST_LOG_OBJECT (sio->obj, "getcaps called, returning template caps");
-    return NULL;
-  }
-
-  GST_LOG_OBJECT (sio->obj, "returning %" GST_PTR_FORMAT, sio->cur_caps);
-
-  if (filter) {
-    return gst_caps_intersect_full (filter,
-      sio->cur_caps, GST_CAPS_INTERSECT_FIRST);
-  } else {
-    return gst_caps_ref (sio->cur_caps);
-  }
-}
-
-static void
-gst_sndio_onvol (void *arg, unsigned int vol)
-{
-  struct gstsndio *sio = arg;
-  sio->volume = vol;
-  g_object_notify (G_OBJECT (sio->obj), "mute");
-  g_object_notify (G_OBJECT (sio->obj), "volume");
-}
-
-gboolean
-gst_sndio_open (struct gstsndio *sio, gint mode)
-{
-  GValue list = G_VALUE_INIT, item = G_VALUE_INIT;
-  GstStructure *s;
-  GstCaps *caps;
-  struct sio_enc *enc;
-  struct sio_cap cap;
-  char fmt[16];
-  int i, chan;
-
-  GST_DEBUG_OBJECT (sio->obj, "open");
-
-  sio->hdl = sio_open (sio->device, mode, 0);
-  if (sio->hdl == NULL) {
-    GST_ELEMENT_ERROR (sio->obj, RESOURCE, OPEN_READ_WRITE,
-	("Couldn't open sndio device"), (NULL));
-    return FALSE;
-  }
-  sio->mode = mode;
-
-  if (!sio_getcap(sio->hdl, &cap)) {
-    GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
-	("Couldn't get device capabilities"), (NULL));
-    sio_close(sio->hdl);
-    sio->hdl = NULL;
-    return FALSE;
-  }
-  if (cap.nconf == 0) {
-    GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
-	("Device has empty capabilities"), (NULL));
-    sio_close(sio->hdl);
-    sio->hdl = NULL;
-    return FALSE;
-  }
-  sio_onvol (sio->hdl, gst_sndio_onvol, sio);
-
-  caps = gst_caps_new_empty ();
-  s = gst_structure_new ("audio/x-raw", (char *)NULL, (void *)NULL);
-
-  /*
-   * scan supported rates
-   */
-  g_value_init (&list, GST_TYPE_LIST);
-  g_value_init (&item, G_TYPE_INT);
-  for (i = 0; i < SIO_NRATE; i++) {
-      if ((cap.confs[0].rate & (1 << i)) == 0)
-	  continue;
-      g_value_set_int(&item, cap.rate[i]);
-      gst_value_list_append_value (&list, &item);
-  }
-  gst_structure_set_value (s, "rate", &list);
-  g_value_unset (&item);
-  g_value_unset (&list);
-
-  /*
-   * scan supported channels
-   */
-  g_value_init (&list, GST_TYPE_LIST);
-  g_value_init (&item, G_TYPE_INT);
-  chan = (mode == SIO_PLAY) ? cap.confs[0].pchan : cap.confs[0].rchan;
-  for (i = 0; i < SIO_NCHAN; i++) {
-      if ((chan & (1 << i)) == 0)
-	  continue;
-      g_value_set_int(&item, (mode == SIO_PLAY) ? cap.pchan[i] : cap.rchan[i]);
-      gst_value_list_append_value (&list, &item);
-  }
-  gst_structure_set_value (s, "channels", &list);
-  g_value_unset (&item);
-  g_value_unset (&list);
-
-  /*
-   * scan supported encodings
-   */
-  g_value_init (&list, GST_TYPE_LIST);
-  g_value_init (&item, G_TYPE_STRING);
-  for (i = 0; i < SIO_NENC; i++) {
-      if ((cap.confs[0].enc & (1 << i)) == 0)
-	  continue;
-      enc = cap.enc + i;
-      if (enc->bits % 8 != 0)
-	  continue;
-      if (enc->bits < enc->bps * 8 && enc->msb)
-	  continue;
-      if (enc->bits == enc->bps * 8) {
-	  snprintf(fmt, sizeof(fmt), "%s%u%s",
-		   enc->sig ? "S" : "U",
-		   enc->bits,
-		   enc->bps > 1 ? (enc->le ? "LE" : "BE") : "");
-      } else {
-	  snprintf(fmt, sizeof(fmt), "%s%u_%u%s",
-		   enc->sig ? "S" : "U",
-		   enc->bits,
-		   enc->bps * 8,
-		   enc->bps > 1 ? (enc->le ? "LE" : "BE") : "");
-      }
-      g_value_set_string(&item, fmt);
-      gst_value_list_append_value (&list, &item);
-  }
-  gst_structure_set_value (s, "format", &list);
-  g_value_unset (&item);
-  g_value_unset (&list);
-
-  /*
-   * add the only supported layout: interleaved
-   */
-  g_value_init (&item, G_TYPE_STRING);
-  g_value_set_string(&item, "interleaved");
-  gst_structure_set_value (s, "layout", &item);
-  g_value_unset (&item);
-
-  gst_caps_append_structure (caps, s);
-  sio->cur_caps = caps;
-  GST_DEBUG ("caps are %s", gst_caps_to_string(caps));
-  return TRUE;
-}
-
-gboolean
-gst_sndio_close (struct gstsndio *sio)
-{
-  GST_DEBUG_OBJECT (sio->obj, "close");
-
-  gst_caps_replace (&sio->cur_caps, NULL);
-  sio_close (sio->hdl);
-  sio->hdl = NULL;
-  return TRUE;
-}
-
-static void
-gst_sndio_cb (void *addr, int delta)
-{
-  struct gstsndio *sio = addr;
-
-  delta *= sio->bpf;
-  if (sio->mode == SIO_PLAY)
-      sio->delay -= delta;
-  else
-      sio->delay += delta;
-}
-
-gboolean
-gst_sndio_prepare (struct gstsndio *sio, GstAudioRingBufferSpec *spec)
-{
-  struct sio_par par, retpar;
-  unsigned nchannels;
-
-  GST_DEBUG_OBJECT (sio, "prepare");
-
-  if (spec->type != GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW) {
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
-	("Only raw buffer format supported by sndio"), (NULL));
-      return FALSE;
-  }
-  if (!GST_AUDIO_INFO_IS_INTEGER(&spec->info)) {
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
-	("Only integer format supported"), (NULL));
-      return FALSE;
-  }
-  if (GST_AUDIO_INFO_DEPTH(&spec->info) % 8) {
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
-	("Only depths multiple of 8 are supported"), (NULL));
-      return FALSE;
-  }
-
-  sio_initpar (&par);
-  switch (GST_AUDIO_INFO_FORMAT (&spec->info)) {
-  case GST_AUDIO_FORMAT_S8:
-  case GST_AUDIO_FORMAT_U8:
-  case GST_AUDIO_FORMAT_S16LE:
-  case GST_AUDIO_FORMAT_S16BE:
-  case GST_AUDIO_FORMAT_U16LE:
-  case GST_AUDIO_FORMAT_U16BE:
-  case GST_AUDIO_FORMAT_S32LE:
-  case GST_AUDIO_FORMAT_S32BE:
-  case GST_AUDIO_FORMAT_U32LE:
-  case GST_AUDIO_FORMAT_U32BE:
-  case GST_AUDIO_FORMAT_S24_32LE:
-  case GST_AUDIO_FORMAT_S24_32BE:
-  case GST_AUDIO_FORMAT_U24_32LE:
-  case GST_AUDIO_FORMAT_U24_32BE:
-  case GST_AUDIO_FORMAT_S24LE:
-  case GST_AUDIO_FORMAT_S24BE:
-  case GST_AUDIO_FORMAT_U24LE:
-  case GST_AUDIO_FORMAT_U24BE:
-      break;
-  default:
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_READ_WRITE,
-	  ("Unsupported audio format"),
-	  ("format = %d", GST_AUDIO_INFO_FORMAT (&spec->info)));
-      return FALSE;
-  }
-  par.sig = GST_AUDIO_INFO_IS_SIGNED(&spec->info);
-  par.bits = GST_AUDIO_INFO_WIDTH(&spec->info);
-  par.bps = GST_AUDIO_INFO_DEPTH(&spec->info) / 8;
-  if (par.bps > 1)
-      par.le = GST_AUDIO_INFO_IS_LITTLE_ENDIAN(&spec->info);
-  if (par.bits < par.bps * 8)
-      par.msb = 0;
-  par.rate = GST_AUDIO_INFO_RATE(&spec->info);
-  if (sio->mode == SIO_PLAY)
-      par.pchan = GST_AUDIO_INFO_CHANNELS(&spec->info);
-  else
-      par.rchan = GST_AUDIO_INFO_CHANNELS(&spec->info);
-  par.round = par.rate / 1000000. * spec->latency_time;
-  par.appbufsz = par.rate / 1000000. * spec->buffer_time;
-
-  if (!sio_setpar (sio->hdl, &par)) {
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
-	("Unsupported audio encoding"), (NULL));
-      return FALSE;
-  }
-  if (!sio_getpar (sio->hdl, &retpar)) {
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
-	("Couldn't get audio device parameters"), (NULL));
-      return FALSE;
-  }
-#if 0
-  GST_DEBUG ("format = %s, "
-         "requested: sig = %d, bits = %d, bps = %d, le = %d, msb = %d, "
-	 "rate = %d, pchan = %d, round = %d, appbufsz = %d; "
-	 "returned: sig = %d, bits = %d, bps = %d, le = %d, msb = %d, "
-	 "rate = %d, pchan = %d, round = %d, appbufsz = %d, bufsz = %d",
-	 GST_AUDIO_INFO_NAME(&spec->info),
-	 par.sig, par.bits, par.bps, par.le, par.msb,
-	 par.rate, par.pchan, par.round, par.appbufsz,
-	 retpar.sig, retpar.bits, retpar.bps, retpar.le, retpar.msb,
-	 retpar.rate, retpar.pchan, retpar.round, retpar.appbufsz, retpar.bufsz);
-#endif
-  if (par.bits != retpar.bits ||
-      par.bps != retpar.bps ||
-      par.rate != retpar.rate ||
-      (sio->mode == SIO_PLAY && par.pchan != retpar.pchan) ||
-      (sio->mode == SIO_REC && par.rchan != retpar.rchan) ||
-      (par.bps > 1 && par.le != retpar.le) ||
-      (par.bits < par.bps * 8 && par.msb != retpar.msb)) {
-      GST_ELEMENT_ERROR (sio, RESOURCE, OPEN_WRITE,
-	("Audio device refused requested parameters"), (NULL));
-      return FALSE;
-  }
-
-  nchannels = (sio->mode == SIO_PLAY) ? retpar.pchan : retpar.rchan;
-  spec->segsize = retpar.round * retpar.bps * nchannels;
-  spec->segtotal = retpar.bufsz / retpar.round;
-  sio->bpf = retpar.bps * nchannels;
-  sio->delay = 0;
-  sio_onmove (sio->hdl, gst_sndio_cb, sio);
-
-  if (!sio_start (sio->hdl)) {
-    GST_ELEMENT_ERROR (sio->obj, RESOURCE, OPEN_READ_WRITE,
-      ("Could not start sndio"), (NULL));
-    return FALSE;
-  }
-  return TRUE;
-}
-
-gboolean
-gst_sndio_unprepare (struct gstsndio *sio)
-{
-  if (sio->hdl)
-    sio_stop (sio->hdl);
-  return TRUE;
-}
-
-void
-gst_sndio_set_property (struct gstsndio *sio, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  switch (prop_id) {
-    case PROP_DEVICE:
-      g_free (sio->device);
-      sio->device = g_value_dup_string (value);
-      break;
-    case PROP_VOLUME:
-      sio_setvol (sio->hdl, g_value_get_double (value) * SIO_MAXVOL);
-      break;
-    case PROP_MUTE:
-      if (g_value_get_boolean (value))
-        sio_setvol (sio->hdl, 0);
-      break;
-    default:
-      break;
-  }
-}
-
-void
-gst_sndio_get_property (struct gstsndio *sio, guint prop_id,
-    GValue * value,  GParamSpec * pspec)
-{
-  switch (prop_id) {
-    case PROP_DEVICE:
-      g_value_set_string (value, sio->device);
-      break;
-    case PROP_VOLUME:
-      g_value_set_double (value, (gdouble)sio->volume / SIO_MAXVOL);
-      break;
-    case PROP_MUTE:
-      g_value_set_boolean (value, (sio->volume == 0));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (sio->obj, prop_id, pspec);
-  }
-}
diff --git a/java/openjfx8-devel/files/gstsndio.h b/java/openjfx8-devel/files/gstsndio.h
deleted file mode 100644
index 77ec4e6f86a5..000000000000
--- a/java/openjfx8-devel/files/gstsndio.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifndef __GST_SNDIO_H__
-#define __GST_SNDIO_H__
-
-#include <sndio.h>
-#include <gst/gst.h>
-#include <gst/audio/gstaudiosink.h>
-#include <gst/audio/gstaudiosrc.h>
-#include <gst/audio/streamvolume.h>
-
-enum
-{
-  PROP_0,
-  PROP_DEVICE,
-  PROP_VOLUME,
-  PROP_MUTE
-};
-
-#define GST_SNDIO_CAPS_STRING					\
-	"audio/x-raw, "						\
-        "format = (string) { "					\
-		     "S8, U8, "					\
-		     "S16LE, S16BE, U16LE, U16BE, "		\
-		     "S32LE, S32BE, U32LE, U32BE, "		\
-		     "S24_32LE, S24_32BE, U24_32LE, "		\
-		     "U24_32BE, S24LE, S24BE, U24LE, U24BE "	\
-	"}, "							\
-        "layout = (string) interleaved, "			\
-        "rate = (int) [ 8000, 192000 ], "			\
-        "channels = (int) [1, 16]"
-
-/*
- * data common to src and sink
- */
-struct gstsndio {
-    struct sio_hdl *hdl;
-    gchar *device;
-    gint mode;
-    gint bpf;		/* bytes per frame */
-    gint delay;		/* bytes stored in the audio fifo */
-    guint volume;	/* volume level */
-    GstCaps *cur_caps;  /* saved capabilities of opened device */
-    GObject *obj;	/* for logging */
-};
-
-#define GST_SNDIO_DELAY(s) ((s)->delay / (s)->bpf)
-
-void gst_sndio_init (struct gstsndio *sio, GObject *obj);
-void gst_sndio_finalize (struct gstsndio *sio);
-GstCaps *gst_sndio_getcaps (struct gstsndio *sio, GstCaps * filter);
-gboolean gst_sndio_open (struct gstsndio *sio, gint mode);
-gboolean gst_sndio_close (struct gstsndio *sio);
-gboolean gst_sndio_prepare (struct gstsndio *sio, GstAudioRingBufferSpec *spec);
-gboolean gst_sndio_unprepare (struct gstsndio *sio);
-void gst_sndio_set_property (struct gstsndio *sio, guint prop_id,
-     const GValue * value, GParamSpec * pspec);
-void gst_sndio_get_property (struct gstsndio *sio, guint prop_id,
-     GValue * value,  GParamSpec * pspec);
-
-int gst_sndio_setpar(gpointer sio, GstAudioRingBufferSpec * spec,
-     int mode, struct sio_hdl *hdl);
-GstCaps *gst_sndio_caps (gpointer sio, int mode, struct sio_hdl *hdl);
-
-#endif
diff --git a/java/openjfx8-devel/files/patch-build.gradle b/java/openjfx8-devel/files/patch-build.gradle
deleted file mode 100644
index d5a071b3e4c5..000000000000
--- a/java/openjfx8-devel/files/patch-build.gradle
+++ /dev/null
@@ -1,337 +0,0 @@
---- build.gradle.orig	2018-12-10 16:30:22 UTC
-+++ build.gradle
-@@ -253,6 +253,7 @@ ext.IS_64 = OS_ARCH.toLowerCase().contains("64")
- ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin")
- ext.IS_WINDOWS = OS_NAME.contains("windows")
- ext.IS_LINUX = OS_NAME.contains("linux")
-+ext.IS_BSD = OS_NAME.contains("freebsd") || OS_NAME.contains("dragonfly")
- 
- // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
- // use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, and/or JAVAH, all of which may be specified
-@@ -313,7 +314,7 @@ defineProperty("COMPILE_MEDIA", "false")
- ext.IS_COMPILE_MEDIA = Boolean.parseBoolean(COMPILE_MEDIA)
- 
- // COMPILE_PANGO specifies whether to build javafx_font_pango.
--defineProperty("COMPILE_PANGO", "${IS_LINUX}")
-+defineProperty("COMPILE_PANGO", "${IS_LINUX || IS_BSD}")
- ext.IS_COMPILE_PANGO = Boolean.parseBoolean(COMPILE_PANGO)
- 
- // COMPILE_HARFBUZZ specifies whether to use Harfbuzz.
-@@ -344,7 +345,8 @@ ext.SWT_FILE_NAME = IS_MAC ? "org.eclipse.swt.cocoa.ma
-     IS_WINDOWS && IS_64 ? "org.eclipse.swt.win32.win32.x86_64_3.105.3.v20170228-0512" :
-     IS_WINDOWS && !IS_64 ? "org.eclipse.swt.win32.win32.x86_3.105.3.v20170228-0512" :
-     IS_LINUX && IS_64 ? "org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512" :
--    IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" : ""
-+    IS_LINUX && !IS_64 ? "org.eclipse.swt.gtk.linux.x86_3.105.3.v20170228-0512" :
-+    IS_BSD ? "/usr/local/share/java/classes/swt.jar" : ""
- 
- // Build javadocs only if BUILD_JAVADOC=true
- defineProperty("BUILD_JAVADOC", "false")
-@@ -404,6 +406,12 @@ if (IS_MAC) {
-     defineProperty("NUM_COMPILE_THREADS", "${Runtime.runtime.availableProcessors()}")
- }
- 
-+if (IS_BSD) {
-+    ext.MAKE_CMD = "gmake"
-+} else {
-+    ext.MAKE_CMD = "make"
-+}
-+
- //
- // The next three sections of properties are used to generate the
- // VersionInfo class, and the Windows DLL manifest.
-@@ -444,7 +452,7 @@ defineProperty("RELEASE_MILESTONE", jfxReleaseMileston
- // Check whether the COMPILE_TARGETS property has been specified (if so, it was done by
- // the user and not by this script). If it has not been defined then default
- // to building the normal desktop build for this machine
--project.ext.set("defaultHostTarget", IS_MAC ? "mac" : IS_WINDOWS ? "win" : IS_LINUX ? "linux" : "");
-+project.ext.set("defaultHostTarget", IS_MAC ? "mac" : IS_WINDOWS ? "win" : IS_LINUX ? "linux" : IS_BSD ? "bsd" : "");
- defineProperty("COMPILE_TARGETS", "$defaultHostTarget")
- 
- // Flag indicating whether to import cross compile tools
-@@ -551,7 +559,7 @@ void fetchExternalTools(String configName, List packag
-                 def File pkgdir = file("$destdir/$basename")
- 
-                 if (pkgname.endsWith(".tgz")) {
--                    if (IS_LINUX || IS_MAC) {
-+                    if (IS_BSD || IS_LINUX || IS_MAC) {
-                         // use native tar to support symlinks
-                         pkgdir.mkdirs()
-                         exec {
-@@ -676,7 +684,7 @@ compileTargets { t ->
-     if (!targetProperties.containsKey('includeMonocle')) targetProperties.includeMonocle = false
-     if (!targetProperties.containsKey('includeEGL')) targetProperties.includeEGL = false
- 
--    if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX
-+    if (!targetProperties.containsKey('includeGTK')) targetProperties.includeGTK = IS_LINUX || IS_BSD
- 
-     // This value is used to under ./build/${sdkDirName} to allow for
-     // a common name for the hosted build (for use when building apps)
-@@ -708,7 +716,7 @@ compileTargets { t ->
- // at present building on PI is not supported, but we would only need to make
- // some changes on assumptions on what should be built (like SWT / Swing) and
- // such and we could probably make it work.
--if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
-+if (!IS_MAC && !IS_WINDOWS && !IS_LINUX && !IS_BSD) logger.error("Unsupported build OS ${OS_NAME}")
- if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
-     throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
- } else if (IS_MAC && OS_ARCH != "x86_64") {
-@@ -1165,7 +1173,8 @@ allprojects {
-     // By default all of our projects require junit for testing so we can just
-     // setup this dependency here.
-     dependencies {
--        testCompile group: "junit", name: "junit", version: "4.8.2"
-+        testCompile files("/usr/local/share/java/classes/junit4.jar",
-+                          "/usr/local/share/java/classes/hamcrest.jar")
-         if (BUILD_CLOSED && DO_JCOV)  {
-             testCompile name: "jcov"
-         }
-@@ -1303,12 +1312,15 @@ project(":graphics") {
- 
-     dependencies {
-         compile project(":base"), BUILD_SRC
--        compile name: SWT_FILE_NAME
--        stubCompile group: "junit", name: "junit", version: "4.8.2",
-+        if (IS_BSD) {
-+             compile files(SWT_FILE_NAME)
-+	} else {
-+             compile name: SWT_FILE_NAME
-+	}
-+        stubCompile files("/usr/local/share/java/classes/junit4.jar",
-+                          "/usr/local/share/java/classes/hamcrest.jar"),
-         project(":base").sourceSets.test.output, sourceSets.main.output
--        antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
--        antlr3 group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
--        antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
-+        antlr3 files("/usr/local/share/java/classes/antlr-3.5.2-complete.jar")
-     }
- 
-     // Create a single "native" task which will depend on all the individual native tasks for graphics
-@@ -1599,9 +1611,7 @@ project(":graphics") {
-                 copy {
-                     into libsDir
-                     from f.getParentFile()
--                    include "**/antlr-3.1.3.jar"
--                    include "**/stringtemplate-3.2.jar"
--                    include "**/antlr-runtime-3.1.3.jar"
-+                    include "**/antlr-3.5.2-complete.jar"
-                     includeEmptyDirs = false
-                 }
-                 // Have to rename the swt jar because it is some platform specific name but
-@@ -1688,7 +1698,11 @@ project(":swt") {
-     }
-     dependencies {
-         compile BUILD_SRC, project(":base"), project(":graphics")
--        compile name: SWT_FILE_NAME
-+        if (IS_BSD) {
-+            compile files(SWT_FILE_NAME)
-+        } else {
-+            compile name: SWT_FILE_NAME
-+        }
-     }
- }
- 
-@@ -1794,7 +1808,7 @@ project(":fxpackager") {
-     }
- 
-     dependencies {
--        compile group: "org.apache.ant", name: "ant", version: "1.8.2"
-+        compile files("/usr/local/share/java/apache-ant/lib/ant.jar")
-     }
- 
-     // When producing the jar, we need to relocate a few class files
-@@ -2055,23 +2069,6 @@ project(":fxpackager") {
-     jar.dependsOn buildJavaPackager
-     jar.dependsOn packagerJar
- 
--    classes {
--        doLast {
--            // Copy all of the download libraries to libs directory for the sake of the IDEs
--            File libsDir = rootProject.file("build/libs");
--            File antLib = new File(libsDir, "ant-1.8.2.jar")
--            libsDir.mkdirs();
--            for (File f : configurations.compile.files) {
--                copy {
--                    into libsDir
--                    from f.getParentFile()
--                    include "**/ant-1.8.2.jar"
--                    includeEmptyDirs = false
--                }
--            }
--        }
--    }
--
-     task packagerFakeJar(type: Jar) {
-         dependsOn compileTestJava
-         from compileTestJava.destinationDir
-@@ -2250,7 +2247,7 @@ project(":media") {
- 
-             doLast {
-                 exec {
--                    commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")
-+                    commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/jfxmedia/projects/${projectDir}")
-                     args("JAVA_HOME=${JDK_HOME}", "GENERATED_HEADERS_DIR=${generatedHeadersDir}",
-                          "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=jfxmedia",
-                          "COMPILE_PARFAIT=${compileParfait}")
-@@ -2260,7 +2257,7 @@ project(":media") {
-                         args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.jfxmediaRcFile}")
-                     } else {
-                         args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
--                        if (t.name == "linux") {
-+                        if (t.name == "linux" || t.name == "bsd") {
-                             args(IS_64 ? "ARCH=x64" : "ARCH=x32")
-                         }
- 
-@@ -2282,7 +2279,7 @@ project(":media") {
-                 enabled = IS_COMPILE_MEDIA
-                 doLast {
-                     exec {
--                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
-+                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/gstreamer-lite")
-                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=gstreamer-lite")
- 
-                         if (t.name == "win") {
-@@ -2290,7 +2287,7 @@ project(":media") {
-                             args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.gstreamerRcFile}")
-                         } else {
-                             args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
--                            if (t.name == "linux") {
-+                            if (t.name == "linux" || t.name == "bsd") {
-                                 args(IS_64 ? "ARCH=x64" : "ARCH=x32")
-                             }
-                         }
-@@ -2311,7 +2308,7 @@ project(":media") {
- 
-                 doLast {
-                     exec {
--                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
-+                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/fxplugins")
-                         args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=fxplugins",
-                              "ON2_SRCDIR=${project.ext.ON2_SRCDIR}", "ON2_LIB=${project.ext.ON2_LIB}")
- 
-@@ -2328,7 +2325,7 @@ project(":media") {
-                             args(IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.fxpluginsRcFile}")
-                         } else {
-                             args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
--                            if (t.name == "linux") {
-+                            if (t.name == "linux" || t.name == "bsd") {
-                                 args(IS_64 ? "ARCH=x64" : "ARCH=x32")
-                             }
-                         }
-@@ -2338,7 +2335,7 @@ project(":media") {
- 
-             buildNative.dependsOn buildPlugins
- 
--            if (t.name == "linux") {
-+            if (t.name == "linux" || t.name == "bsd") {
-                 def buildAVPlugin = task( "buildAVPlugin", dependsOn: [buildPlugins]) {
-                     enabled = IS_COMPILE_MEDIA
- 
-@@ -2349,7 +2346,7 @@ project(":media") {
-                                 File dir = file(libavDir)
-                                 if (dir.exists()) {
-                                     exec {
--                                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
-+                                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${t.name}/avplugin")
-                                         args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
-                                              "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}",
-                                              "SUFFIX=", IS_64 ? "ARCH=x64" : "ARCH=x32")
-@@ -2362,7 +2359,7 @@ project(":media") {
-                                 File dir = file(libavDir)
-                                 if (dir.exists()) {
-                                     exec {
--                                        commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
-+                                        commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${t.name}/avplugin")
-                                         args("CC=${mediaProperties.compiler}", "LINKER=${mediaProperties.linker}",
-                                              "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
-                                              "BASE_NAME=avplugin", "VERSION=${version}", "LIBAV_DIR=${libavDir}",
-@@ -2373,7 +2370,7 @@ project(":media") {
-                         } else {
-                             // Building fxavcodec plugin (libav plugin)
-                             exec {
--                                commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/linux/avplugin")
-+                                commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${t.name}/avplugin")
-                                 args("CC=${mediaProperties.compiler}", "OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}",
-                                      "BASE_NAME=avplugin", IS_64 ? "ARCH=x64" : "ARCH=x32")
-                             }
-@@ -2423,7 +2420,7 @@ project(":media") {
-                     doLast {
-                         exec {
-                             environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
--                            commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
-+                            commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
-                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite",
-                                  IS_64 ? "ARCH=x64" : "ARCH=x32", "RESOURCE=${nativeOutputDir}/${buildType}/${WIN.media.glibRcFile}")
-                         }
-@@ -2442,7 +2439,7 @@ project(":media") {
-                         }
- 
-                         exec {
--                            commandLine ("make", "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
-+                            commandLine (MAKE_CMD, "${makeJobsFlag}", "-C", "${nativeSrcDir}/gstreamer/projects/${projectDir}/glib-lite")
-                             args("OUTPUT_DIR=${nativeOutputDir}", "BUILD_TYPE=${buildType}", "BASE_NAME=glib-lite")
-                             args ("CC=${mediaProperties.compiler}", "LINK=${mediaProperties.linker}", "LIB=${mediaProperties.lib}")
-                         }
-@@ -2562,7 +2559,7 @@ project(":web") {
-     compileTargets { t ->
-         def targetProperties = project.rootProject.ext[t.upper]
-         def webkitProperties = targetProperties.webkit
--        def classifier = (t.name != "linux" && t.name != "win") ? t.name :
-+        def classifier = (t.name != "linux" && t.name != "bsd" && t.name != "win") ? t.name :
-                           IS_64 ? "${t.name}-amd64" : "${t.name}-i586"
- 
-         def webkitOutputDir = cygpath("$buildDir/${t.name}")
-@@ -2638,6 +2635,9 @@ project(":web") {
-                     }
- 
-                     cmakeArgs += " -DJAVAFX_RELEASE_VERSION=8.0"
-+                    cmakeArgs += " -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
-+                    cmakeArgs += " -DCMAKE_C_COMPILER:STRING=${System.getenv("CC")}"
-+                    cmakeArgs += " -DCMAKE_CXX_COMPILER:STRING=${System.getenv("CXX")}"
-                     commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit",
-                         "--java", "--icu-unicode", targetCpuBitDepthSwitch,
-                         "--cmakeargs=${cmakeArgs}")
-@@ -3132,7 +3132,7 @@ compileTargets { t ->
-                         // OSX media natives
-                         [ "jfxmedia_qtkit", "jfxmedia_avf" ].each { name ->
-                             from ("modules/media/build/native/${t.name}/${mediaBuildType}/${library(name)}") }
--                    } else if (t.name == "linux") {
-+                    } else if (t.name == "linux" || t.name == "bsd") {
-                         from("modules/media/build/native/${t.name}/${mediaBuildType}") { include "libavplugin*.so" }
-                     }
-                 } else {
-@@ -3145,7 +3145,7 @@ compileTargets { t ->
-                         // copy libjfxmedia_{avf,qtkit}.dylib if they exist
-                         [ "jfxmedia_qtkit", "jfxmedia_avf" ].each { name ->
-                             from ("$LIBRARY_STUB/${library(name)}") }
--                    } else if (t.name == "linux") {
-+                    } else if (t.name == "linux" || t.name == "bsd") {
-                         from(LIBRARY_STUB) { include "libavplugin*.so" }
-                     }
-                 }
-@@ -3207,7 +3207,7 @@ compileTargets { t ->
-             }
- 
-             // Copy over the javapackager executable
--            if (t.name == "win" || t.name == "linux" || t.name == "mac") {
-+            if (t.name == "win" || t.name == "linux" || t.name == "bsd" || t.name == "mac") {
-                 copy {
-                     from "modules/fxpackager/build/javapackager"
-                     into "build/${sdkDirName}/bin"
-@@ -3264,6 +3264,7 @@ ext.JFXRT_CP =
-             "modules/web/build/classes/java/main",
-     )
- 
-+/*
- project(":apps") {
-     // The apps build is Ant based, and gradle lets us "import" ant build.xml
-     // into our configuration.
-@@ -3341,7 +3342,7 @@ project(":apps") {
-         }
-         rootProject.clean.dependsOn(appsClean)
-     }
--}
-+} */
- 
- /******************************************************************************
-  *                                                                            *
diff --git a/java/openjfx8-devel/files/patch-buildSrc_build.gradle b/java/openjfx8-devel/files/patch-buildSrc_build.gradle
deleted file mode 100644
index bb4201fd6f0a..000000000000
--- a/java/openjfx8-devel/files/patch-buildSrc_build.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
---- buildSrc/build.gradle.orig	2017-09-08 16:56:55 UTC
-+++ buildSrc/build.gradle
-@@ -81,11 +81,10 @@ sourceSets {
- getConfigurations().create("antlr3");
- 
- dependencies {
--    compile     group: "org.antlr", name: "antlr",          version: "3.1.3"
--    testCompile group: "junit",     name: "junit",          version: "4.8.2"
--    antlr3      group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
--    antlr3      group: "org.antlr", name: "stringtemplate", version: "3.2"
--    antlr3      group: "org.antlr", name: "antlr",          version: "3.1.3"
-+    compile files("/usr/local/share/java/classes/antlr-3.5.2-complete.jar")
-+    testCompile files("/usr/local/share/java/classes/junit4.jar",
-+                      "/usr/local/share/java/classes/hamcrest.jar")
-+    antlr3 files("/usr/local/share/java/classes/antlr-3.5.2-complete.jar")
- }
- 
- // At the moment the ASM library shipped with Gradle that is used to
diff --git a/java/openjfx8-devel/files/patch-git_c3cf651 b/java/openjfx8-devel/files/patch-git_c3cf651
deleted file mode 100644
index a033eeac8a01..000000000000
--- a/java/openjfx8-devel/files/patch-git_c3cf651
+++ /dev/null
@@ -1,77 +0,0 @@
-Partial backport of:
-
-From c3cf651016e4cdcb4350598d4a586821071f91bf Mon Sep 17 00:00:00 2001
-From: "cturner@igalia.com"
- <cturner@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Thu, 30 Apr 2020 15:12:36 +0000
-Subject: [PATCH] [clang 11] fix build errors due to -WWc++11-narrowing
- https://bugs.webkit.org/show_bug.cgi?id=211193
-
-Reviewed by Adrian Perez de Castro.
-
-Fixes the following errors,
-
-Source/WebCore/html/MediaElementSession.cpp:1059:9: error: type 'WebCore::RenderMedia *' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
-m_element.renderer(),
-^~~~~~~~~~~~~~~~~~~~
-
-Source/WebCore/style/StyleResolver.cpp:106:55: error: type 'const char [4]' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
-m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
-                                              ^~~~~
-Source/WebCore/style/StyleResolver.cpp:106:55: note: insert an explicit cast to silence this issue
-m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
-                                              ^~~~~
-                                              static_cast<bool>( )
-
-* html/HTMLMediaElement.h:
-(WebCore::HTMLMediaElement::hasRenderer const):
-MediaElementSession was implicitly casting a pointer to a bool,
-which is not allowed with modern Clang checks. Add a helper method
-to encapsulate the now required static_cast<bool>.
-* html/MediaElementSession.cpp: Use the new helper method to see
-if the HTMLMediaElement has an associated renderer.
-(WebCore::MediaElementSession::updateMediaUsageIfChanged):
-* style/StyleResolver.cpp: This was calling MediaQueryEvaluator {
-"all" }; and seemingly expecting to cast a const char[] to a bool,
-or maybe String? It's confusing because of the MediaQueryEvaluator
-API. If it was implicitly converting to bool then that could be
-unintentional. Such casts are not allowed either now. The
-MediaQueryEvaluator's default constructor says it returns true for
-"all", which appears to be the original intent of this call, so I
-replaced it with that.
-(WebCore::Style::Resolver::Resolver):
-
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260951 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/ChangeLog                    | 39 +++++++++++++++++++++
- Source/WebCore/html/HTMLMediaElement.h      |  1 +
- Source/WebCore/html/MediaElementSession.cpp |  2 +-
- Source/WebCore/style/StyleResolver.cpp      |  2 +-
- 4 files changed, 42 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
-index b466dfc139d7..444f349df87b 100644
---- modules/web/src/main/native/Source/WebCore/html/HTMLMediaElement.h
-+++ modules/web/src/main/native/Source/WebCore/html/HTMLMediaElement.h
-@@ -155,6 +155,7 @@ class HTMLMediaElement
-     virtual bool isVideo() const { return false; }
-     bool hasVideo() const override { return false; }
-     bool hasAudio() const override;
-+    bool hasRenderer() const { return static_cast<bool>(renderer()); }
- 
-     static HashSet<HTMLMediaElement*>& allMediaElements();
- 
-diff --git a/Source/WebCore/style/StyleResolver.cpp b/Source/WebCore/style/StyleResolver.cpp
-index 651f8f1e2d78..9333b83913a4 100644
---- modules/web/src/main/native/Source/WebCore/css/StyleResolver.cpp
-+++ modules/web/src/main/native/Source/WebCore/css/StyleResolver.cpp
-@@ -103,7 +103,7 @@ Resolver::Resolver(Document& document)
-     if (view)
-         m_mediaQueryEvaluator = MediaQueryEvaluator { view->mediaType() };
-     else
--        m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
-+        m_mediaQueryEvaluator = MediaQueryEvaluator { };
- 
-     if (root) {
-         m_rootDefaultStyle = styleForElement(*root, m_document.renderStyle(), nullptr, RuleMatchingBehavior::MatchOnlyUserAgentRules).renderStyle;
diff --git a/java/openjfx8-devel/files/patch-modules_base_src_main_java_com_sun_javafx_PlatformUtil.java b/java/openjfx8-devel/files/patch-modules_base_src_main_java_com_sun_javafx_PlatformUtil.java
deleted file mode 100644
index b397e4e53163..000000000000
--- a/java/openjfx8-devel/files/patch-modules_base_src_main_java_com_sun_javafx_PlatformUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
---- modules/base/src/main/java/com/sun/javafx/PlatformUtil.java.orig	2017-09-08 16:56:55 UTC
-+++ modules/base/src/main/java/com/sun/javafx/PlatformUtil.java
-@@ -69,6 +69,7 @@ public class PlatformUtil {
-     private static final boolean WINDOWS_7_OR_LATER = WINDOWS && versionNumberGreaterThanOrEqualTo(6.1f);
-     private static final boolean MAC = os.startsWith("Mac");
-     private static final boolean LINUX = os.startsWith("Linux") && !ANDROID;
-+    private static final boolean FREEBSD = os.startsWith("FreeBSD");
-     private static final boolean SOLARIS = os.startsWith("SunOS");
-     private static final boolean IOS = os.startsWith("iOS");
- 
-@@ -124,6 +125,13 @@ public class PlatformUtil {
-         return LINUX;
-     }
- 
-+    /**
-+     * Returns true if the operating system is a form of FreeBSD.
-+     */
-+    public static boolean isFreeBSD(){
-+        return FREEBSD;
-+    }
-+
-     public static boolean useEGL() {
-         return useEGL;
-     }
-@@ -150,10 +158,10 @@ public class PlatformUtil {
-     }
- 
-     /**
--     * Returns true if the operating system is a form of Linux or Solaris
-+     * Returns true if the operating system is a form of Unix
-      */
-     public static boolean isUnix(){
--        return LINUX || SOLARIS;
-+        return LINUX || SOLARIS || FREEBSD;
-     }
- 
-     /**
diff --git a/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBehavior.java b/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBehavior.java
deleted file mode 100644
index 2ec15ad0ea0e..000000000000
--- a/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBehavior.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java.orig	2019-07-22 19:05:36 UTC
-+++ modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java
-@@ -362,7 +362,7 @@ public abstract class TextInputControlBehavior<T exten
- 
-     protected void selectNextWord() {
-         TextInputControl textInputControl = getControl();
--        if (isMac() || isLinux()) {
-+        if (isMac() || isLinux() || isFreeBSD()) {
-             textInputControl.selectEndOfNextWord();
-         } else {
-             textInputControl.selectNextWord();
-@@ -401,7 +401,7 @@ public abstract class TextInputControlBehavior<T exten
- 
-     protected void nextWord() {
-         TextInputControl textInputControl = getControl();
--        if (isMac() || isLinux()) {
-+        if (isMac() || isLinux() || isFreeBSD()) {
-             textInputControl.endOfNextWord();
-         } else {
-             textInputControl.nextWord();
diff --git a/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBindings.java b/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBindings.java
deleted file mode 100644
index 58a16694bb8d..000000000000
--- a/java/openjfx8-devel/files/patch-modules_controls_src_main_java_com_sun_javafx_scene_control_behavior_TextInputControlBindings.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBindings.java.orig	2019-07-22 19:06:01 UTC
-+++ modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBindings.java
-@@ -134,7 +134,7 @@ public class TextInputControlBindings {
-             BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "SelectRightWord").ctrl().shift());
-             BINDINGS.add(new KeyBinding(A, KEY_PRESSED,          "SelectAll").ctrl());
-             BINDINGS.add(new KeyBinding(BACK_SLASH, KEY_PRESSED, "Unselect").ctrl());
--            if (PlatformUtil.isLinux()) {
-+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
-                 BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Undo").ctrl());
-                 BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Redo").ctrl().shift());
-             } else {  // Windows
diff --git a/java/openjfx8-devel/files/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp b/java/openjfx8-devel/files/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
deleted file mode 100644
index 1d65dd73face..000000000000
--- a/java/openjfx8-devel/files/patch-modules_fxpackager_src_main_native_library_common_PosixPlatform.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/rpms/openjfx.git/tree/0001-Fix-wait-call-in-PosixPlatform.patch
-
---- modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp.orig	2018-12-10 16:30:22 UTC
-+++ modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
-@@ -231,13 +231,7 @@ bool PosixProcess::Wait() {
-     int status = 0;
-     pid_t wpid = 0;
- 
--    //TODO Use waitpid instead of wait
--#ifdef LINUX
--    wait(&status);
--#endif
--#ifdef MAC
-     wpid = wait(&status);
--#endif
- 
-     if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
-         if (errno != EINTR){
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_glass_ui_Platform.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_glass_ui_Platform.java
deleted file mode 100644
index 4e68db313d7f..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_glass_ui_Platform.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/graphics/src/main/java/com/sun/glass/ui/Platform.java.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/java/com/sun/glass/ui/Platform.java
-@@ -52,6 +52,8 @@ final class Platform {
-                    type = WINDOWS;
-                 else if (userPlatform.equals("linux"))
-                    type = GTK;
-+                else if (userPlatform.equals("freebsd"))
-+                    type = GTK;
-                 else if (userPlatform.equals("gtk"))
-                    type = GTK;
-                 else if (userPlatform.equals("ios"))
-@@ -68,6 +70,8 @@ final class Platform {
-             } else if (osNameLowerCase.startsWith("wind")) {
-                 type = WINDOWS;
-             } else if (osNameLowerCase.startsWith("linux")) {
-+                type = GTK;
-+            } else if (osNameLowerCase.startsWith("freebsd")) {
-                 type = GTK;
-             }
-         }
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_glass_utils_NativeLibLoader.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_glass_utils_NativeLibLoader.java
deleted file mode 100644
index bfbd3bd91156..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_glass_utils_NativeLibLoader.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/java/com/sun/glass/utils/NativeLibLoader.java
-@@ -173,7 +173,7 @@ public class NativeLibLoader {
-                     relativeDir = "../../bin";
-                 } else if (osName.startsWith("Mac")) {
-                     relativeDir = "..";
--                } else if (osName.startsWith("Linux")) {
-+                } else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
-                     relativeDir = "../" + System.getProperty("os.arch");
-                 }
- 
-@@ -189,7 +189,7 @@ public class NativeLibLoader {
-                 } else if (osName.startsWith("Mac")) {
-                     libPrefix = "lib";
-                     libSuffix = ".dylib";
--                } else if (osName.startsWith("Linux")) {
-+                } else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
-                     libPrefix = "lib";
-                     libSuffix = ".so";
-                 }
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_LogicalFont.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_LogicalFont.java
deleted file mode 100644
index 68225ceebc98..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_LogicalFont.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/graphics/src/main/java/com/sun/javafx/font/LogicalFont.java.orig	2019-07-22 19:00:13 UTC
-+++ modules/graphics/src/main/java/com/sun/javafx/font/LogicalFont.java
-@@ -175,7 +175,7 @@ public class LogicalFont implements CompositeFontResou
-             styleName = STYLE_BOLD_ITALIC;
-         }
-         fullName = familyName + " " + styleName;
--        if (PrismFontFactory.isLinux) {
-+        if (PrismFontFactory.isLinux || PrismFontFactory.isFreeBSD) {
-             FontConfigManager.FcCompFont fcCompFont =
-                 FontConfigManager.getFontConfigFont(family, bold, italic);
-             physicalFullName = fcCompFont.firstFont.fullName;
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_PrismFontFactory.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_PrismFontFactory.java
deleted file mode 100644
index 17c1be9d10f0..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_font_PrismFontFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
---- modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java.orig	2018-12-10 16:30:22 UTC
-+++ modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java
-@@ -51,6 +51,7 @@ public abstract class PrismFontFactory implements Font
-     public static final boolean debugFonts;
-     public static final boolean isWindows;
-     public static final boolean isLinux;
-+    public static final boolean isFreeBSD;
-     public static final boolean isMacOSX;
-     public static final boolean isIOS;
-     public static final boolean isAndroid;
-@@ -90,6 +91,7 @@ public abstract class PrismFontFactory implements Font
-         isWindows = PlatformUtil.isWindows();
-         isMacOSX  = PlatformUtil.isMac();
-         isLinux   = PlatformUtil.isLinux();
-+        isFreeBSD = PlatformUtil.isFreeBSD();
-         isIOS     = PlatformUtil.isIOS();
-         isAndroid = PlatformUtil.isAndroid();
-         isEmbedded = PlatformUtil.isEmbedded();
-@@ -136,7 +138,7 @@ public abstract class PrismFontFactory implements Font
-                         }
-                     }
- 
--                    useNativeRasterizer = isMacOSX || isWindows || isLinux;
-+                    useNativeRasterizer = isMacOSX || isWindows || isLinux || isFreeBSD;
-                     String defPrismText = useNativeRasterizer ? "native" : "t2k";
-                     String prismText = System.getProperty("prism.text", defPrismText);
-                     if (useNativeRasterizer) {
-@@ -173,7 +175,7 @@ public abstract class PrismFontFactory implements Font
-     private static String getNativeFactoryName() {
-         if (isWindows) return DW_FACTORY;
-         if (isMacOSX || isIOS) return CT_FACTORY;
--        if (isLinux || isAndroid) return FT_FACTORY;
-+        if (isLinux || isAndroid || isFreeBSD) return FT_FACTORY;
-         return null;
-     }
- 
-@@ -858,7 +860,7 @@ public abstract class PrismFontFactory implements Font
-                         break;
-                     }
-                 }
--                if (fontResource == null && isLinux) {
-+                if (fontResource == null && (isLinux || isFreeBSD)) {
-                     String path = FontConfigManager.getDefaultFontPath();
-                     if (path != null) {
-                         fontResource = createFontResource(jreDefaultFontLC,
-@@ -1742,7 +1744,7 @@ public abstract class PrismFontFactory implements Font
-                                                       familyToFontListMap,
-                                                       Locale.ENGLISH);
- 
--            } else if (isLinux) {
-+            } else if (isLinux || isFreeBSD) {
-                 FontConfigManager.populateMaps(tmpFontToFileMap,
-                                                fontToFamilyNameMap,
-                                                familyToFontListMap,
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_Toolkit.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_Toolkit.java
deleted file mode 100644
index 3dcded07766b..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_Toolkit.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/java/com/sun/javafx/tk/Toolkit.java
-@@ -185,6 +185,8 @@ public abstract class Toolkit {
-             return DEFAULT_TOOLKIT;
-         } else if (PlatformUtil.isLinux()) {
-             return DEFAULT_TOOLKIT;
-+        } else if (PlatformUtil.isFreeBSD()) {
-+            return DEFAULT_TOOLKIT;
-         } else if (PlatformUtil.isIOS()) {
-             return DEFAULT_TOOLKIT;
-         } else if (PlatformUtil.isAndroid()) {
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_GlassSystemMenu.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_GlassSystemMenu.java
deleted file mode 100644
index 5d5c29f0eafc..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_GlassSystemMenu.java
+++ /dev/null
@@ -1,35 +0,0 @@
---- modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java.orig	2019-07-22 19:03:56 UTC
-+++ modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassSystemMenu.java
-@@ -317,13 +317,13 @@ class GlassSystemMenu implements TKSystemMenu {
-         } else if (accelerator instanceof KeyCodeCombination) {
-             KeyCodeCombination kcc  = (KeyCodeCombination)accelerator;
-             KeyCode            code = kcc.getCode();
--            assert PlatformUtil.isMac() || PlatformUtil.isLinux();
-+            assert PlatformUtil.isMac() || PlatformUtil.isLinux() || PlatformUtil.isFreeBSD();
-             int modifier = glassModifiers(kcc);
-             if (PlatformUtil.isMac()) {
-                 int finalCode = code.isLetterKey() ? code.impl_getChar().toUpperCase().charAt(0)
-                         : code.impl_getCode();
-                 glassSubMenuItem.setShortcut(finalCode, modifier);
--            } else if (PlatformUtil.isLinux()) {
-+            } else if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
-                 String lower = code.impl_getChar().toLowerCase();
-                 if ((modifier & KeyEvent.MODIFIER_CONTROL) != 0) {
-                     glassSubMenuItem.setShortcut(lower.charAt(0), modifier);
-@@ -352,14 +352,14 @@ class GlassSystemMenu implements TKSystemMenu {
-             ret += KeyEvent.MODIFIER_ALT;
-         }
-         if (kcc.getShortcut() == KeyCombination.ModifierValue.DOWN) {
--            if (PlatformUtil.isLinux()) {
-+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
-                 ret += KeyEvent.MODIFIER_CONTROL;
-             } else if (PlatformUtil.isMac()) {
-                 ret += KeyEvent.MODIFIER_COMMAND;
-             }
-         }
-         if (kcc.getMeta() == KeyCombination.ModifierValue.DOWN) {
--            if (PlatformUtil.isLinux()) {
-+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) {
-                 ret += KeyEvent.MODIFIER_WINDOWS;   // RT-19326 - Linux shortcut support
-             } else if (PlatformUtil.isMac()) {
-                 ret += KeyEvent.MODIFIER_COMMAND;
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_WindowStage.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_WindowStage.java
deleted file mode 100644
index 0f723724e2fc..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_javafx_tk_quantum_WindowStage.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java.orig	2019-07-22 19:05:13 UTC
-+++ modules/graphics/src/main/java/com/sun/javafx/tk/quantum/WindowStage.java
-@@ -432,7 +432,7 @@ class WindowStage extends GlassStage {
-         } else if (PlatformUtil.isWindows()) { //Windows Sized Icons
-             SMALL_ICON_HEIGHT = 32;
-             SMALL_ICON_WIDTH = 32;
--        } else if (PlatformUtil.isLinux()) { //Linux icons
-+        } else if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) { //Linux icons
-             SMALL_ICON_HEIGHT = 128;
-             SMALL_ICON_WIDTH = 128;
-         }
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_prism_impl_PrismSettings.java b/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_prism_impl_PrismSettings.java
deleted file mode 100644
index 95344b078542..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_java_com_sun_prism_impl_PrismSettings.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java.orig	2018-12-10 16:30:22 UTC
-+++ modules/graphics/src/main/java/com/sun/prism/impl/PrismSettings.java
-@@ -212,6 +212,8 @@ public final class PrismSettings {
-                     tryOrderArr = new String[] { "es2" };
-             } else if (PlatformUtil.isLinux()) {
-                 tryOrderArr = new String[] { "es2", "sw" };
-+            } else if (PlatformUtil.isFreeBSD()) {
-+                tryOrderArr = new String[] { "es2", "sw" };
-             } else {
-                 tryOrderArr = new String[] { "sw" };
-             }
-@@ -221,7 +223,7 @@ public final class PrismSettings {
- 
-         String npprop = systemProperties.getProperty("prism.nativepisces");
-         if (npprop == null) {
--            doNativePisces = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux();
-+            doNativePisces = PlatformUtil.isEmbedded() || !PlatformUtil.isLinux() || !PlatformUtil.isFreeBSD();
-         } else {
-             doNativePisces = Boolean.parseBoolean(npprop);
-         }
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_fontpath__linux.c b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_fontpath__linux.c
deleted file mode 100644
index 3afbe712be22..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_fontpath__linux.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/graphics/src/main/native-font/fontpath_linux.c.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/native-font/fontpath_linux.c
-@@ -23,7 +23,7 @@
-  * questions.
-  */
- 
--#if defined (__linux__) && ! defined (ANDROID_NDK)
-+#if (defined (__linux__) && ! defined (ANDROID_NDK)) || defined(__FreeBSD__)
- 
- #include <string.h>
- #include <stdio.h>
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_freetype.c b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_freetype.c
deleted file mode 100644
index 8c0b323bd012..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_freetype.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/graphics/src/main/native-font/freetype.c.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/native-font/freetype.c
-@@ -23,7 +23,6 @@
-  * questions.
-  */
- 
--#if defined __linux__ || ANDROID_NDK
- #if defined _ENABLE_PANGO || _ENABLE_HARFBUZZ
- 
- #include <jni.h>
-@@ -646,4 +645,3 @@ JNIEXPORT jboolean JNICALL JNICALL OS_NATIVE(isHarfbuz
- }
- 
- #endif /* ENABLE_PANGO || ENABLE_HARFBUZZ */
--#endif /* __linux__ || ANDROID_NDK */
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_pango.c b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_pango.c
deleted file mode 100644
index 637ecd86602e..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-font_pango.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/graphics/src/main/native-font/pango.c.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/native-font/pango.c
-@@ -23,7 +23,6 @@
-  * questions.
-  */
- 
--#if defined __linux__
- #if defined _ENABLE_PANGO
- 
- #include <jni.h>
-@@ -410,4 +409,3 @@ JNIEXPORT void JNICALL OS_NATIVE(pango_1font_1descript
- }
- 
- #endif /* ENABLE_PANGO */
--#endif /* __linux__ */
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_GlassApplication.cpp b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_GlassApplication.cpp
deleted file mode 100644
index d8d0e0446185..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_GlassApplication.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/graphics/src/main/native-glass/gtk/GlassApplication.cpp.orig	2019-07-22 07:18:58 UTC
-+++ modules/graphics/src/main/native-glass/gtk/GlassApplication.cpp
-@@ -101,6 +101,7 @@ JNIEXPORT jint JNICALL Java_com_sun_glass_ui_gtk_GtkAp
- 
-     gdk_threads_enter();
-     gtk_init(NULL, NULL);
-+    gdk_threads_leave();
- 
-     return JNI_TRUE;
- }
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__evloop.cpp b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__evloop.cpp
deleted file mode 100644
index 9f0b4e256453..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__evloop.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- modules/graphics/src/main/native-glass/gtk/glass_evloop.cpp.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/native-glass/gtk/glass_evloop.cpp
-@@ -25,7 +25,8 @@
- #include "glass_evloop.h"
- 
- #include <glib.h>
--#include <malloc.h>
-+#include <sys/param.h>
-+#include <stdlib.h>
- 
- static GSList * evloopHookList;
- 
-@@ -85,4 +86,3 @@ glass_evloop_hook_remove(GevlHookRegistration hookReg)
-     evloopHookList = g_slist_remove(evloopHookList, hookReg);
-     free(hookReg);
- }
--
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
deleted file mode 100644
index ad05d792416a..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_glass__window.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- modules/graphics/src/main/native-glass/gtk/glass_window.h.orig	2018-12-10 16:30:22 UTC
-+++ modules/graphics/src/main/native-glass/gtk/glass_window.h
-@@ -365,7 +365,7 @@ class WindowContextChild: public WindowContextBase { (
- class WindowContextTop: public WindowContextBase {
-     jlong screen;
-     WindowFrameType frame_type;
--    struct WindowContext *owner;
-+    WindowContext *owner;
-     WindowGeometry geometry;
-     struct _Resizable{// we can't use set/get gtk_window_resizable function
-         _Resizable(): request(REQUEST_NONE), value(true), prev(false),
-@@ -455,4 +455,3 @@ class EventsCounterHelper { (public)
- };
- 
- #endif        /* GLASS_WINDOW_H */
--
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_launcher.c b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_launcher.c
deleted file mode 100644
index 7e9ef50a07ba..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_launcher.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/graphics/src/main/native-glass/gtk/launcher.c.orig	2019-07-22 07:33:51 UTC
-+++ modules/graphics/src/main/native-glass/gtk/launcher.c
-@@ -25,7 +25,6 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <linux/fb.h>
- #include <fcntl.h>
- #ifndef __USE_GNU       // required for dladdr() & Dl_info
- #define __USE_GNU
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_wrapped.c b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_wrapped.c
deleted file mode 100644
index fff612e73e08..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-glass_gtk_wrapped.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/graphics/src/main/native-glass/gtk/wrapped.c.orig	2019-07-22 07:33:14 UTC
-+++ modules/graphics/src/main/native-glass/gtk/wrapped.c
-@@ -24,7 +24,6 @@
-  */
- 
- #include <stdio.h>
--#include <linux/fb.h>
- #include <fcntl.h>
- #ifndef __USE_GNU       // required for dladdr() & Dl_info
- #define __USE_GNU
diff --git a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-prism-es2_PrismES2Defs.h b/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-prism-es2_PrismES2Defs.h
deleted file mode 100644
index fa24df290f0c..000000000000
--- a/java/openjfx8-devel/files/patch-modules_graphics_src_main_native-prism-es2_PrismES2Defs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/graphics/src/main/native-prism-es2/PrismES2Defs.h.orig	2017-09-08 16:56:55 UTC
-+++ modules/graphics/src/main/native-prism-es2/PrismES2Defs.h
-@@ -26,7 +26,7 @@
- #ifndef _Prism_es2_defs_h_
- #define _Prism_es2_defs_h_
- 
--#if defined(SOLARIS) || defined(LINUX) || defined(ANDROID_NDK) /* SOLARIS || LINUX */
-+#if defined(SOLARIS) || defined(LINUX) || defined(ANDROID_NDK) || defined(FREEBSD) /* SOLARIS || LINUX */
- #define GLX_GLEXT_PROTOTYPES
- #define GLX_GLXEXT_PROTOTYPES
- #define UNIX
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_HostUtils.java b/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_HostUtils.java
deleted file mode 100644
index 7df72a648511..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_HostUtils.java
+++ /dev/null
@@ -1,13 +0,0 @@
---- modules/media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java.orig	2019-07-22 19:01:46 UTC
-+++ modules/media/src/main/java/com/sun/media/jfxmediaimpl/HostUtils.java
-@@ -66,6 +66,10 @@ public class HostUtils {
-         return osName.startsWith("linux");
-     }
- 
-+    public static boolean isFreeBSD() {
-+        return osName.startsWith("freebsd");
-+    }
-+
-     public static boolean isIOS() {
-         return osName.startsWith("ios");
-     }
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_NativeMediaManager.java b/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_NativeMediaManager.java
deleted file mode 100644
index 79401c1b9000..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_java_com_sun_media_jfxmediaimpl_NativeMediaManager.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java.orig	2019-07-22 19:02:57 UTC
-+++ modules/media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java
-@@ -108,7 +108,7 @@ public class NativeMediaManager {
-                     NativeLibLoader.loadLibrary("glib-lite");
-                 }
- 
--                if (!HostUtils.isLinux() && !HostUtils.isIOS()) {
-+                if (!HostUtils.isFreeBSD() && !HostUtils.isLinux() && !HostUtils.isIOS()) {
-                     NativeLibLoader.loadLibrary("gstreamer-lite");
-                 }
- 
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c b/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c
deleted file mode 100644
index 073b3f7bfd41..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_gstreamer_gst_gstregistry.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c.orig	2019-07-23 04:09:55 UTC
-+++ modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c
-@@ -143,7 +143,7 @@ static const int AVCODEC_LIBAV_EXPLICIT_VERSIONS[] = {
- // For ffmpeg (libavcodec-ffmpeg.so)
- static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
- // For libav or ffmpeg (libavcodec.so)
--static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57 };
-+static const int AVCODEC_EXPLICIT_VERSIONS[] = { 58, 57 };
- 
- /*
-  * Callback passed to dl_iterate_phdr(): finds the path of
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_projects_build_linux_common_config.h b/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_projects_build_linux_common_config.h
deleted file mode 100644
index 47b03d595243..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_gstreamer-lite_projects_build_linux_common_config.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- modules/media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h.orig	2019-07-22 15:39:06 UTC
-+++ modules/media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h
-@@ -264,7 +264,7 @@
- #define HAVE_SYS_POLL_H 1
- 
- /* Define to 1 if you have the <sys/prctl.h> header file. */
--#define HAVE_SYS_PRCTL_H 1
-+#undef HAVE_SYS_PRCTL_H
- 
- /* Define to 1 if you have the <sys/socket.h> header file. */
- #define HAVE_SYS_SOCKET_H 1
-@@ -430,4 +430,4 @@
- /* Define to `unsigned int' if <sys/types.h> does not define. */
- /* #undef size_t */
- 
--#define DISABLE_ORC
-\ No newline at end of file
-+#define DISABLE_ORC
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_avplugin_Makefile b/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_avplugin_Makefile
deleted file mode 100644
index a635fa4cb392..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_avplugin_Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- modules/media/src/main/native/gstreamer/projects/bsd/avplugin/Makefile.orig	2019-07-22 15:50:27 UTC
-+++ modules/media/src/main/native/gstreamer/projects/bsd/avplugin/Makefile
-@@ -43,19 +43,23 @@ else
-     CFLAGS += -g -Wall
- endif
- 
-+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+
- INCLUDES= -I../../../plugins                          \
-           -I../../../plugins/av                       \
-           -I../../../gstreamer-lite/gstreamer         \
-           -I../../../gstreamer-lite/gstreamer/libs    \
-           -I$(GLIB_DIR)                               \
-           -I$(GLIB_DIR)/glib                          \
--          -I$(GLIB_DIR)/gmodule
-+          -I$(GLIB_DIR)/gmodule \
-+          $(PACKAGES_INCLUDES)
- 
- LDFLAGS = -L$(BUILD_DIR)    \
-           -z relro          \
-           -lgstreamer-lite  \
--          -lglib-lite  \
--          -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+          $(PACKAGES_LIBS) \
-+          -Wl,--gc-sections
- 
- ifneq ($(strip $(LIBAV_DIR)),)
- INCLUDES += -I$(LIBAV_DIR)/include
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile b/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile
deleted file mode 100644
index 476af3b93c8e..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_fxplugins_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- modules/media/src/main/native/gstreamer/projects/bsd/fxplugins/Makefile.orig	2019-07-22 15:43:47 UTC
-+++ modules/media/src/main/native/gstreamer/projects/bsd/fxplugins/Makefile
-@@ -45,17 +45,21 @@ else
- endif
- 
- 
-+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+
- INCLUDES = -I$(SRCBASE_DIR) \
- 	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-            -I../../../gstreamer-lite/gstreamer       \
-            -I../../../gstreamer-lite/gstreamer/libs  \
-            -I$(GLIB_DIR)                             \
-            -I$(GLIB_DIR)/glib                        \
--           -I$(GLIB_DIR)/gmodule
-+           -I$(GLIB_DIR)/gmodule \
-+           $(PACKAGES_INCLUDES)
- 
--LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
--          -z relro \
--          -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite \
-+          -z relro -Wl,--gc-sections \
-+          $(PACKAGES_LIBS)
- 
- ifeq ($(ARCH), x32)
-     CFLAGS += -m32
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_gstreamer-lite_Makefile b/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_gstreamer-lite_Makefile
deleted file mode 100644
index 364c7a6557ac..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_gstreamer_projects_bsd_gstreamer-lite_Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- modules/media/src/main/native/gstreamer/projects/bsd/gstreamer-lite/Makefile.orig	2019-07-22 07:19:58 UTC
-+++ modules/media/src/main/native/gstreamer/projects/bsd/gstreamer-lite/Makefile
-@@ -31,7 +31,7 @@ DIRLIST = gstreamer/gst \
-           gst-plugins-base/gst/volume \
-           gst-plugins-good/gst/audioparsers \
-           gst-plugins-good/gst/isomp4 \
--          gst-plugins-base/ext/alsa \
-+          gst-plugins-base/ext/bsdaudio \
-           gst-plugins-good/gst/audiofx \
-           gst-plugins-good/gst/equalizer \
-           gst-plugins-good/gst/spectrum \
-@@ -80,13 +80,11 @@ INCLUDES = -I$(BASE_DIR)/plugins                      
-            -I$(GLIB_DIR)/glib                             \
-            -I$(GLIB_DIR)/gmodule           
- 
--PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
--PACKAGES_LIBS := $(shell pkg-config --libs alsa)
-+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+ 
-+LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) -l sndio -z relro
- 
--LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
--          -z relro \
--          -static-libgcc -static-libstdc++ -Wl,--gc-sections
--
- ifeq ($(ARCH), x32)
-     CFLAGS += -m32
-     LDFLAGS += -m32
-@@ -264,10 +262,8 @@ SOURCES = \
-             gstreamer/plugins/elements/gsttypefindelement.c \
-             gst-plugins-base/gst/volume/gstvolume.c \
-             gst-plugins-base/gst/volume/gstvolumeorc-dist.c \
--            gst-plugins-base/ext/alsa/gstalsaplugin.c \
--            gst-plugins-base/ext/alsa/gstalsa.c \
--            gst-plugins-base/ext/alsa/gstalsadeviceprobe.c \
--            gst-plugins-base/ext/alsa/gstalsasink.c \
-+            gst-plugins-base/ext/bsdaudio/gstbsdaudio.c \
-+            gst-plugins-base/ext/bsdaudio/bsdaudiosink.c \
-             projects/plugins/gstplugins-lite.c
- 
- OBJ_DIRS = $(addprefix $(OBJBASE_DIR)/,$(DIRLIST))
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_platform_gstreamer_GstPipelineFactory.cpp b/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_platform_gstreamer_GstPipelineFactory.cpp
deleted file mode 100644
index 6e8aff262d97..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_platform_gstreamer_GstPipelineFactory.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp.orig	2017-09-08 16:56:55 UTC
-+++ modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
-@@ -351,6 +351,8 @@ GstElement* CGstPipelineFactory::CreateAudioSinkElemen
-     return CreateElement("directsoundsink");
- #elif  TARGET_OS_MAC
-     return CreateElement("osxaudiosink");
-+#elif TARGET_OS_BSD
-+    return CreateElement("bsdaudiosink");
- #elif  TARGET_OS_LINUX
-     return CreateElement("alsasink");
- #else
diff --git a/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_projects_bsd_Makefile b/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_projects_bsd_Makefile
deleted file mode 100644
index 031dd1ba9c6a..000000000000
--- a/java/openjfx8-devel/files/patch-modules_media_src_main_native_jfxmedia_projects_bsd_Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
---- modules/media/src/main/native/jfxmedia/projects/bsd/Makefile.orig	2019-07-22 15:35:34 UTC
-+++ modules/media/src/main/native/jfxmedia/projects/bsd/Makefile
-@@ -1,5 +1,5 @@
- #
--# Linux/ARM jfxmedia makefile
-+# BSD jfxmedia makefile
- #
- 
- BUILD_DIR = $(OUTPUT_DIR)/$(BUILD_TYPE)
-@@ -18,6 +18,7 @@ DIRLIST = jni                \
- TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
- 
- CFLAGS = -DTARGET_OS_LINUX=1     \
-+         -DTARGET_OS_BSD=1       \
-          -D_GNU_SOURCE           \
-          -DGST_REMOVE_DEPRECATED \
-          -DGST_DISABLE_GST_DEBUG \
-@@ -34,6 +35,9 @@ CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sectio
- BASE_INCLUDES = -I$(SRCBASE_DIR) \
- 		-I$(GENERATED_HEADERS_DIR)
- 
-+PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gio-2.0 gobject-2.0 gthread-2.0)
-+
- ifdef HOST_COMPILE
- 	GSTREAMER_LITE_DIR = ../../../gstreamer/gstreamer-lite
- 	GLIB_LITE_DIR = ../../../gstreamer/3rd_party/glib/glib-2.56.1
-@@ -49,17 +53,17 @@ ifdef HOST_COMPILE
- 
- 	INCLUDES = $(BASE_INCLUDES) \
- 		   -I$(JAVA_HOME)/include \
--		   -I$(JAVA_HOME)/include/linux \
-+		   -I$(JAVA_HOME)/include/freebsd \
- 	           -I$(GSTREAMER_LITE_DIR)/gstreamer \
- 		   -I$(GSTREAMER_LITE_DIR)/gst-plugins-base/gst-libs \
- 	           -I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
- 	           -I$(GLIB_LITE_DIR)/ \
- 	           -I$(GLIB_LITE_DIR)/glib \
--	           -I$(GLIB_LITE_DIR)/gmodule
-+	           -I$(GLIB_LITE_DIR)/gmodule \
-+	           $(PACKAGES_INCLUDES)
- 
--	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
--            -z relro \
--            -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+	LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite \
-+            -z relro $(PACKAGES_LIBS) -Wl,--gc-sections
- else
- 	CFLAGS += $(EXTRA_CFLAGS)
- 	INCLUDES = $(BASE_INCLUDES)
diff --git a/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_JFXPanel.java b/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_JFXPanel.java
deleted file mode 100644
index edaf8a97af43..000000000000
--- a/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_JFXPanel.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java.orig	2019-07-22 18:59:20 UTC
-+++ modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
-@@ -995,7 +995,7 @@ public class JFXPanel extends JComponent {
-         public boolean grabFocus() {
-             // On X11 grab is limited to a single XDisplay connection,
-             // so we can't delegate it to another GUI toolkit.
--            if (PlatformUtil.isLinux()) return true;
-+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) return true;
- 
-             invokeOnClientEDT(() -> {
-                 Window window = SwingUtilities.getWindowAncestor(JFXPanel.this);
-@@ -1013,7 +1013,7 @@ public class JFXPanel extends JComponent {
-         public void ungrabFocus() {
-             // On X11 grab is limited to a single XDisplay connection,
-             // so we can't delegate it to another GUI toolkit.
--            if (PlatformUtil.isLinux()) return;
-+            if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) return;
- 
-             invokeOnClientEDT(() -> {
-                 Window window = SwingUtilities.getWindowAncestor(JFXPanel.this);
diff --git a/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_SwingNode.java b/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_SwingNode.java
deleted file mode 100644
index 3108ce911230..000000000000
--- a/java/openjfx8-devel/files/patch-modules_swing_src_main_java_javafx_embed_swing_SwingNode.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/swing/src/main/java/javafx/embed/swing/SwingNode.java.orig	2019-07-22 18:58:46 UTC
-+++ modules/swing/src/main/java/javafx/embed/swing/SwingNode.java
-@@ -860,7 +860,7 @@ public class SwingNode extends Node {
-             SwingFXUtils.runOnFxThread(() -> {
-                 // On X11 grab is limited to a single XDisplay connection,
-                 // so we can't delegate it to another GUI toolkit.
--                if (PlatformUtil.isLinux()) return;
-+                if (PlatformUtil.isLinux() || PlatformUtil.isFreeBSD()) return;
- 
-                 SwingNode swingNode = swingNodeRef.get();
-                 if (swingNode != null) {
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake
deleted file mode 100644
index 56662a20f53d..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_PlatformJava.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
---- modules/web/src/main/native/Source/PlatformJava.cmake.orig	2018-03-23 23:53:57 UTC
-+++ modules/web/src/main/native/Source/PlatformJava.cmake
-@@ -1,4 +1 @@
--add_subdirectory(ThirdParty/sqlite)
--add_subdirectory(ThirdParty/icu)
--add_subdirectory(ThirdParty/libxml)
--add_subdirectory(ThirdParty/libxslt)
-+
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt
deleted file mode 100644
index 17ced47ed03e..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt.orig	2018-07-27 01:38:45 UTC
-+++ modules/web/src/main/native/Source/WTF/wtf/CMakeLists.txt
-@@ -464,6 +464,7 @@ list(APPEND WTF_SOURCES
- )
- set(WTF_SYSTEM_INCLUDE_DIRECTORIES
-     ${ICU_INCLUDE_DIRS}
-+    ${CMAKE_INSTALL_PREFIX}/include
- )
- list(APPEND WTF_LIBRARIES
-     ${ICU_DATA_LIBRARIES}
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h
deleted file mode 100644
index 43b6422f2d5d..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- modules/web/src/main/native/Source/WTF/wtf/Optional.h.orig	2018-12-10 16:30:22 UTC
-+++ modules/web/src/main/native/Source/WTF/wtf/Optional.h
-@@ -291,12 +291,14 @@ struct nullopt_t
- constexpr nullopt_t nullopt{nullopt_t::init()};
- 
- 
-+# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
- // 20.5.8, class bad_optional_access
- class bad_optional_access : public std::logic_error {
- public:
-   explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
-   explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
- };
-+# endif // _LIBCPP_VERSION < 7000
- 
- 
- template <class T>
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_unicode_java_UnicodeJava.h b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_unicode_java_UnicodeJava.h
deleted file mode 100644
index 01f03348c8a8..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_unicode_java_UnicodeJava.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h.orig	2018-01-16 01:40:56 UTC
-+++ modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-@@ -15,21 +15,6 @@
- 
- #define CharProp(p) com_sun_webkit_dom_CharacterDataImpl_##p
- 
--#if PLATFORM(JAVA) && OS(WINDOWS)
--typedef wchar_t UChar;
--#else
--typedef uint16_t UChar;
--#endif
--
--// #ifdef UChar32
--// #undef UChar32
--// #endif
--
--#ifndef __UMACHINE_H__ //XXX: recheck
--typedef uint32_t UChar32;
--#endif
--
--#define U_MASK(x) ((uint32_t)1<<(x))
- #define USE_FAST_PATH(c, fast, slow) ((c) <= 0x7F ? fast((char)c) : slow(c))
- 
- #define CHECK_PROPERTY(c, mask, isSet) \
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_dom_Document.cpp b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_dom_Document.cpp
deleted file mode 100644
index 59340d13e632..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WebCore_dom_Document.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652
-
-In file included from modules/web/build/bsd/Release/DerivedSources/WebCore/unified-sources/UnifiedSource220.cpp:4:
-modules/web/src/main/native/Source/WebCore/dom/Document.cpp:4707:39: error: expected ';' after do/while statement
-    U16_NEXT(characters, i, length, c)
-                                      ^
-                                      ;
-modules/web/src/main/native/Source/WebCore/dom/Document.cpp:4712:43: error: expected ';' after do/while statement
-        U16_NEXT(characters, i, length, c)
-                                          ^
-                                          ;
-modules/web/src/main/native/Source/WebCore/dom/Document.cpp:4772:46: error: expected ';' after do/while statement
-        U16_NEXT(qualifiedName, i, length, c)
-                                             ^
-                                             ;
-
---- modules/web/src/main/native/Source/WebCore/dom/Document.cpp.orig	2018-12-10 16:30:22 UTC
-+++ modules/web/src/main/native/Source/WebCore/dom/Document.cpp
-@@ -4704,12 +4704,12 @@ static bool isValidNameNonASCII(const UChar* character
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -4769,7 +4769,7 @@ ExceptionOr<std::pair<AtomicString, AtomicString>> Doc
- 
-     for (unsigned i = 0; i < length; ) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon)
-                 return Exception { InvalidCharacterError };
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake
deleted file mode 100644
index 9c44785b7b68..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_OptionsJava.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
---- modules/web/src/main/native/Source/cmake/OptionsJava.cmake.orig	2018-12-10 16:30:22 UTC
-+++ modules/web/src/main/native/Source/cmake/OptionsJava.cmake
-@@ -26,14 +26,10 @@ endif ()
- set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
- set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
- 
--set(SQLITE_LIBRARIES SqliteJava)
--set(LIBXML2_LIBRARIES XMLJava)
--set(LIBXSLT_LIBRARIES XSLTJava)
--
--set(ICU_LIBRARIES icuuc icudata)
--set(ICU_I18N_LIBRARIES icui18n icuuc icudata)
--set(ICU_DATA_LIBRARIES icudata)
--
-+find_package(LibXml2 2.8.0 REQUIRED)
-+find_package(LibXslt REQUIRED)
-+find_package(Sqlite REQUIRED)
-+find_package(ICU REQUIRED)
- find_package(JNI REQUIRED)
- find_package(Threads REQUIRED)
- 
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_WebKitCompilerFlags.cmake b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_WebKitCompilerFlags.cmake
deleted file mode 100644
index 3d9c6bc1b652..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_cmake_WebKitCompilerFlags.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake.orig	2019-07-22 23:29:21 UTC
-+++ modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
-@@ -176,10 +176,6 @@ if (NOT MSVC)
-     string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS})
- endif ()
- 
--if (UNIX AND NOT APPLE AND NOT ENABLED_COMPILER_SANITIZERS)
--    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
--endif ()
--
- 
- # CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
- # version, -P does not output empty lines, which currently breaks make_names.pl in
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp
deleted file mode 100644
index 51ce7bac8d53..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_TestRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp.orig	2018-12-10 16:30:22 UTC
-+++ modules/web/src/main/native/Tools/DumpRenderTree/TestRunner.cpp
-@@ -2415,7 +2415,7 @@ void TestRunner::runUIScript(JSContextRef context, JSS
-     if (!m_UIScriptContext)
-         m_UIScriptContext = std::make_unique<WTR::UIScriptContext>(*this);
- 
--    String scriptString(JSStringGetCharactersPtr(script), JSStringGetLength(script));
-+    String scriptString(reinterpret_cast<const UChar*>(JSStringGetCharactersPtr(script)), JSStringGetLength(script));
-     m_UIScriptContext->runUIScript(scriptString, callbackID);
- }
- 
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt
deleted file mode 100644
index 7a390db949ff..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_DumpRenderTree_java_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt.orig	2019-07-22 18:32:25 UTC
-+++ modules/web/src/main/native/Tools/DumpRenderTree/java/CMakeLists.txt
-@@ -72,9 +72,5 @@ add_library(DumpRenderTreeJava SHARED ${DumpRenderTree
- add_definitions(-DWEBCORE_EXPORT=WTF_IMPORT -DWEBCORE_TESTSUPPORT_EXPORT=WTF_IMPORT)
- add_dependencies(DumpRenderTreeJava DumpRenderTreeBindings)
- 
--if (UNIX AND NOT APPLE)
--  set_target_properties(DumpRenderTreeJava PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
--endif ()
--
- set_target_properties(DumpRenderTreeJava PROPERTIES OUTPUT_NAME "DumpRenderTreeJava")
- target_link_libraries(DumpRenderTreeJava ${DumpRenderTree_LIBRARIES})
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm
deleted file mode 100644
index 5d1abb8af296..000000000000
--- a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Tools_Scripts_webkitdirs.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/web/src/main/native/Tools/Scripts/webkitdirs.pm.orig	2018-07-27 01:38:45 UTC
-+++ modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
-@@ -2148,7 +2148,7 @@ sub generateBuildSystemFromCMakeProject
-     chdir($buildPath) or die;
- 
-     # We try to be smart about when to rerun cmake, so that we can have faster incremental builds.
--    my $willUseNinja = canUseNinja();
-+    my $willUseNinja = 0; # canUseNinja();
-     if (-e cmakeCachePath() && -e cmakeGeneratedBuildfile($willUseNinja)) {
-         return 0;
-     }
diff --git a/java/openjfx8-devel/files/sndiosink.c b/java/openjfx8-devel/files/sndiosink.c
deleted file mode 100644
index cc68bd29d807..000000000000
--- a/java/openjfx8-devel/files/sndiosink.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
- * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * SECTION:element-sndiosink
- * @see_also: #GstAutoAudioSink
- *
- * <refsect2>
- * <para>
- * This element outputs sound to a sound card using sndio.
- * </para>
- * <para>
- * Simple example pipeline that plays an Ogg/Vorbis file via sndio:
- * <programlisting>
- * gst-launch -v filesrc location=foo.ogg ! decodebin ! audioconvert ! audioresample ! sndiosink
- * </programlisting>
- * </para>
- * </refsect2>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "sndiosink.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gst_sndio_debug);
-#define GST_CAT_DEFAULT gst_sndio_debug
-
-#define gst_sndiosink_parent_class parent_class
-
-static GstStaticPadTemplate sndiosink_factory =
-    GST_STATIC_PAD_TEMPLATE ("sink",
-	GST_PAD_SINK,
-	GST_PAD_ALWAYS,
-	GST_STATIC_CAPS (GST_SNDIO_CAPS_STRING)
-    );
-
-G_DEFINE_TYPE_WITH_CODE (GstSndioSink, gst_sndiosink, GST_TYPE_AUDIO_SINK,
-	G_IMPLEMENT_INTERFACE (GST_TYPE_STREAM_VOLUME, NULL));
-
-static void gst_sndiosink_finalize (GObject * object);
-static GstCaps *gst_sndiosink_getcaps (GstBaseSink * bsink,
-    GstCaps * filter);
-static gboolean gst_sndiosink_open (GstAudioSink * asink);
-static gboolean gst_sndiosink_close (GstAudioSink * asink);
-static gboolean gst_sndiosink_prepare (GstAudioSink * asink,
-    GstAudioRingBufferSpec * spec);
-static gboolean gst_sndiosink_unprepare (GstAudioSink * asink);
-static gint gst_sndiosink_write (GstAudioSink * asink, gpointer data,
-    guint length);
-static guint gst_sndiosink_delay (GstAudioSink * asink);
-static void gst_sndiosink_reset (GstAudioSink * asink);
-static void gst_sndiosink_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_sndiosink_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void
-gst_sndiosink_init (GstSndioSink * sink)
-{
-  gst_sndio_init (&sink->sndio, G_OBJECT(sink));
-}
-
-static void
-gst_sndiosink_finalize (GObject * object)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (object);
-
-  gst_sndio_finalize (&sink->sndio);
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static GstCaps *
-gst_sndiosink_getcaps (GstBaseSink * bsink, GstCaps * filter)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (bsink);
-
-  return gst_sndio_getcaps (&sink->sndio, filter);
-}
-
-static gboolean
-gst_sndiosink_open (GstAudioSink * asink)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (asink);
-
-  return gst_sndio_open (&sink->sndio, SIO_PLAY);
-}
-
-static gboolean
-gst_sndiosink_close (GstAudioSink * asink)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (asink);
-
-  return gst_sndio_close (&sink->sndio);
-}
-
-static gboolean
-gst_sndiosink_prepare (GstAudioSink * asink, GstAudioRingBufferSpec * spec)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (asink);
-
-  return gst_sndio_prepare (&sink->sndio, spec);
-}
-
-static gboolean
-gst_sndiosink_unprepare (GstAudioSink * asink)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (asink);
-
-  return gst_sndio_unprepare (&sink->sndio);
-}
-
-static gint
-gst_sndiosink_write (GstAudioSink * asink, gpointer data, guint length)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (asink);
-  guint done;
-
-  if (length == 0)
-    return 0;
-  done = sio_write (sink->sndio.hdl, data, length);
-  if (done == 0) {
-      GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
-	("Failed to write data to sndio"), (NULL));
-      return 0;
-  }
-  sink->sndio.delay += done;
-  return done;
-}
-
-static guint
-gst_sndiosink_delay (GstAudioSink * asink)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (asink);
-
-  return GST_SNDIO_DELAY(&sink->sndio);
-}
-
-static void
-gst_sndiosink_reset (GstAudioSink * asink)
-{
-}
-
-static void
-gst_sndiosink_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (object);
-
-  gst_sndio_set_property (&sink->sndio, prop_id, value, pspec);
-}
-
-static void
-gst_sndiosink_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
-{
-  GstSndioSink *sink = GST_SNDIOSINK (object);
-
-  gst_sndio_get_property (&sink->sndio, prop_id, value, pspec);
-}
-
-static void
-gst_sndiosink_class_init (GstSndioSinkClass * klass)
-{
-  GObjectClass *gobject_class;
-  GstElementClass *gstelement_class;
-  GstBaseSinkClass *gstbasesink_class;
-  GstAudioBaseSinkClass *gstbaseaudiosink_class;
-  GstAudioSinkClass *gstaudiosink_class;
-
-  gobject_class = (GObjectClass *) klass;
-  gstelement_class = (GstElementClass *) klass;
-  gstbasesink_class = (GstBaseSinkClass *) klass;
-  gstbaseaudiosink_class = (GstAudioBaseSinkClass *) klass;
-  gstaudiosink_class = (GstAudioSinkClass *) klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class->finalize = gst_sndiosink_finalize;
-  gobject_class->get_property = gst_sndiosink_get_property;
-  gobject_class->set_property = gst_sndiosink_set_property;
-
-  gst_element_class_set_static_metadata (gstelement_class,
-      "Audio sink (sndio)", "Sink/Audio",
-      "Output to a sound card via sndio",
-      "Jacob Meuser <jakemsr@sdf.lonestar.org>");
-
-  gst_element_class_add_pad_template (gstelement_class,
-      gst_static_pad_template_get (&sndiosink_factory));
-
-  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sndiosink_getcaps);
-  gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_sndiosink_open);
-  gstaudiosink_class->prepare = GST_DEBUG_FUNCPTR (gst_sndiosink_prepare);
-  gstaudiosink_class->unprepare = GST_DEBUG_FUNCPTR (gst_sndiosink_unprepare);
-  gstaudiosink_class->close = GST_DEBUG_FUNCPTR (gst_sndiosink_close);
-  gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_sndiosink_write);
-  gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_sndiosink_delay);
-  gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_sndiosink_reset);
-
-  g_object_class_install_property (gobject_class, PROP_DEVICE,
-      g_param_spec_string ("device", "Device",
-          "sndio device as defined in sndio(7)",
-          SIO_DEVANY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class, PROP_VOLUME,
-      g_param_spec_double ("volume", "Volume",
-	  "Linear volume of this stream, 1.0=100%", 0.0, 1.0,
-	  1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class, PROP_MUTE,
-      g_param_spec_boolean ("mute", "Mute",
-	  "Mute state of this stream", FALSE,
-	  G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
diff --git a/java/openjfx8-devel/files/sndiosink.h b/java/openjfx8-devel/files/sndiosink.h
deleted file mode 100644
index 314e62210c54..000000000000
--- a/java/openjfx8-devel/files/sndiosink.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
- * Copyright (C) 2012 Alexandre Ratchov <alex@caoua.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-#ifndef __GST_SNDIOSINK_H__
-#define __GST_SNDIOSINK_H__
-
-#include <sndio.h>
-
-#include <gst/gst.h>
-#include <gst/audio/gstaudiosink.h>
-#include "gstsndio.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_SNDIOSINK \
-  (gst_sndiosink_get_type())
-#define GST_SNDIOSINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SNDIOSINK,GstSndioSink))
-#define GST_SNDIOSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SNDIOSINK,GstSndioSinkClass))
-#define GST_IS_SNDIOSINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SNDIOSINK))
-#define GST_IS_SNDIOSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SNDIOSINK))
-
-typedef struct _GstSndioSink GstSndioSink;
-typedef struct _GstSndioSinkClass GstSndioSinkClass;
-
-struct _GstSndioSink {
-  GstAudioSink sink;
-  struct gstsndio sndio;
-};
-
-struct _GstSndioSinkClass {
-  GstAudioSinkClass parent_class;
-};
-
-GType gst_sndiosink_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GST_SNDIOSINK_H__ */
diff --git a/java/openjfx8-devel/pkg-descr b/java/openjfx8-devel/pkg-descr
deleted file mode 100644
index b5f5bb7d7c39..000000000000
--- a/java/openjfx8-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-OpenJFX is an open source, next generation client application platform for
-desktop and embedded systems based on JavaSE. It is a collaborative effort by
-many individuals and companies with the goal of producing a modern, efficient,
-and fully featured toolkit for developing rich client applications.
-
-WWW: https://openjdk.java.net/projects/openjfx/
diff --git a/java/openjfx8-devel/pkg-plist b/java/openjfx8-devel/pkg-plist
deleted file mode 100644
index 4ee0836a4d38..000000000000
--- a/java/openjfx8-devel/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-%%JAVA_HOME%%/bin/javafxpackager
-%%JAVA_HOME%%/bin/javapackager
-%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libavplugin.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libdecora_sse.so
-%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libfxplugins.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglass.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglassgtk2.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libglassgtk3.so
-%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libgstreamer-lite.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_freetype.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_font_pango.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjavafx_iio.so
-%%MEDIA%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjfxmedia.so
-%%WEBKIT%%%%JAVA_HOME%%/jre/lib/%%ARCH%%/libjfxwebkit.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_common.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_es2.so
-%%JAVA_HOME%%/jre/lib/%%ARCH%%/libprism_sw.so
-%%JAVA_HOME%%/jre/lib/ext/jfxrt.jar
-%%JAVA_HOME%%/jre/lib/javafx.properties
-%%SWT%%%%JAVA_HOME%%/jre/lib/jfxswt.jar
-%%JAVA_HOME%%/lib/ant-javafx.jar
-%%JAVA_HOME%%/lib/javafx-mx.jar
-%%JAVA_HOME%%/lib/packager.jar
diff --git a/java/openjfx8-scenebuilder/Makefile b/java/openjfx8-scenebuilder/Makefile
deleted file mode 100644
index 8a1c13b78052..000000000000
--- a/java/openjfx8-scenebuilder/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	openjfx8
-DISTVERSION=	8u202-b07
-CATEGORIES=	java x11-toolkits devel
-MASTER_SITES=	https://github.com/t6/openjfx/releases/download/release/ \
-		http://hg.openjdk.java.net/openjfx/8u/rt/archive/${DISTVERSION}${EXTRACT_SUFX}?dummy=/
-PKGNAMESUFFIX=	-scenebuilder
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	JavaFX Scene Builder
-
-LICENSE=	BSD3CLAUSE
-
-DEPRECATED=	depends on expiring java/openjfx8-devel
-EXPIRATION_DATE=	2020-11-30
-
-BUILD_DEPENDS=	openjfx8-devel>0:java/openjfx8-devel
-RUN_DEPENDS=	openjfx8-devel>0:java/openjfx8-devel
-
-USE_ANT=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	1.8+
-
-ALL_TARGET=	jar-sb
-DESKTOP_ENTRIES=	"JavaFX Scene Builder" "JavaFX Scene Builder" \
-			"" "scenebuilder" "Development;GUIDesigner;" false
-NO_ARCH=	yes
-PLIST_FILES=	bin/scenebuilder \
-		${JAVAJARDIR}/SceneBuilderApp.jar \
-		${JAVAJARDIR}/SceneBuilderKit.jar
-SUB_FILES=	scenebuilder
-WRKSRC=		${WRKDIR}/rt-${DISTVERSION}/apps/scenebuilder
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/SceneBuilderApp/dist/SceneBuilderApp.jar \
-		${WRKSRC}/SceneBuilderKit/dist/SceneBuilderKit.jar \
-		${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/scenebuilder ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/java/openjfx8-scenebuilder/distinfo b/java/openjfx8-scenebuilder/distinfo
deleted file mode 100644
index 7f707e3ee585..000000000000
--- a/java/openjfx8-scenebuilder/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1563779003
-SHA256 (openjfx8-8u202-b07.tar.gz) = ca98b6d0721a0e4b91d62672e81594c80a47cfb5ded241de50f10ade9884c400
-SIZE (openjfx8-8u202-b07.tar.gz) = 70669594
diff --git a/java/openjfx8-scenebuilder/files/scenebuilder.in b/java/openjfx8-scenebuilder/files/scenebuilder.in
deleted file mode 100644
index 60eb8f016220..000000000000
--- a/java/openjfx8-scenebuilder/files/scenebuilder.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "%%LOCALBASE%%/bin/java" ${SCENEBUILDER_JAVA_ARGS} -cp "%%JAVAJARDIR%%/SceneBuilderKit.jar:%%JAVAJARDIR%%/SceneBuilderApp.jar" com.oracle.javafx.scenebuilder.app.SceneBuilderApp "$@"
diff --git a/java/openjfx8-scenebuilder/pkg-descr b/java/openjfx8-scenebuilder/pkg-descr
deleted file mode 100644
index 4f09ede53e64..000000000000
--- a/java/openjfx8-scenebuilder/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-JavaFX Scene Builder provides a visual layout environment that lets
-you quickly design user interfaces for JavaFX applications without
-needing to write any code.
-
-It allows simple drag-and-drop positioning of GUI components onto a
-JavaFX scene.  As you build the layout of your UI, the FXML code for
-the layout is automatically generated.  It provides a simple yet
-intuitive interface that can help even non-programmers to quickly
-prototype interactive applications that connect GUI components to the
-application logic.
-
-WWW: https://openjdk.java.net/projects/openjfx/